conflicts

ProcessMaker · Oct 24, 2023 · 452728e · 452728e
2 parents 10d7c71 + 4474d6f
commit 452728e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/src/components/renderer/form-list-table.vue b/src/components/renderer/form-list-table.vue
@@ -21,14 +21,12 @@
               <b-dropdown-item
                 @click="handleDropdownSelection('requests_filter', 'by_me')"
               >
-                {{ $t("Requester") }}</b-dropdown-item
-              >
+                {{ $t("As Requester") }}
+              </b-dropdown-item>
               <b-dropdown-item
-                @click="
-                  handleDropdownSelection('requests_filter', 'as_participant')
-                "
+                @click="handleDropdownSelection('requests_filter', 'as_participant')"
               >
-                {{ $t("Participant") }}
+                {{ $t("As Participant") }}
               </b-dropdown-item>
             </b-dropdown>
           </template>
@@ -124,7 +122,7 @@
           </div>
         </div>
       </div>
-      <div>
+      <div v-if="listOption !== 'Start new Request'">
         <b-link @click="openExternalLink">
           <i class="fas fa-external-link-alt custom-icon" />
         </b-link>

diff --git a/src/components/renderer/form-requests.vue b/src/components/renderer/form-requests.vue
@@ -83,7 +83,7 @@ export default {
   },
   mounted() {
     this.setFields();
-    this.pmql = `(status = "In Progress") AND (requester = "${Processmaker.user.username}")`;
+    this.pmql = `requester = "${Processmaker.user.username}"`;
     this.fetch();
     this.$root.$on("dropdownSelectionRequest", this.fetchData);
     this.$root.$on("searchRequest", this.fetchSearch);

diff --git a/src/components/renderer/form-tasks.vue b/src/components/renderer/form-tasks.vue
@@ -84,7 +84,7 @@ export default {
   },
   mounted() {
     this.setFields();
-    this.pmql = `(user_id = ${ProcessMaker.user.id}) AND (status = "In Progress")`;
+    this.pmql = `(user_id = ${ProcessMaker.user.id})`;
     this.fetch();
     this.$root.$on("dropdownSelectionTask", this.fetchData);
     this.$root.$on("searchTask", this.fetchSearch);

diff --git a/src/components/vue-form-builder.vue b/src/components/vue-form-builder.vue
@@ -185,21 +185,24 @@
               <div class="ml-auto">
                 <button
                   v-if="isAiSection(element) && aiPreview(element)"
+                  data-test="apply-ai-btn"
                   class="btn btn-sm btn-primary mr-2"
                   :title="$t('Apply Changes')"
                   @click="applyAiChanges(element)"
                 >
                   {{ $t("Apply Changes") }}
                 </button>
                 <button
-                v-if="!(isAiSection(element) && aiPreview(element))"
+                  v-if="!(isAiSection(element) && aiPreview(element))"
+                  data-test="copy-control-btn"
                   class="btn btn-sm btn-secondary mr-2"
                   :title="$t('Copy Control')"
                   @click="duplicateItem(index)"
                 >
                   <i class="fas fa-copy text-light" />
                 </button>
                 <button
+                  data-test="delete-control-btn"
                   class="btn btn-sm btn-danger"
                   :title="$t('Delete Control')"
                   @click="deleteItem(index)"