Merge branch 'next' into FOUR-12447

ProcessMaker · Jan 3, 2024 · 922f1c4 · 922f1c4
2 parents 81fc240 + fc33577
commit 922f1c4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/src/components/vue-form-builder.vue b/src/components/vue-form-builder.vue
@@ -31,7 +31,10 @@
           <!-- Accordion Bootstrap -->
           <template v-for="(group, index) in controlGroups">
             <b-button
-              v-if="filteredControlsGrouped[group.key].length > 0"
+              v-if="
+                !!filteredControlsGrouped &&
+                filteredControlsGrouped[group.key].length > 0
+              "
               v-b-toggle="`collapse-${index}`"
               class="w-100 rounded-0 text-left"
               style="
@@ -84,7 +87,10 @@
                     />
                     {{ $t(element.label) }}
                   </b-list-group-item>
-                  <li v-if="!filteredControls.length" class="list-group-item">
+                  <li
+                    v-if="!!filteredControls && filteredControls.length > 0"
+                    class="list-group-item"
+                  >
                     <slot />
                   </li>
                 </draggable>
@@ -684,6 +690,7 @@ export default {
         { key: "Files", label: "Files" },
         { key: "Advanced", label: "Advanced" }
       ],
+      filteredControlsGrouped: {},
 
       isCollapsed: new Array(6).fill(true)
     };
@@ -813,7 +820,8 @@ export default {
       handler(newVal) {
         this.groupFilteredControls(newVal);
       },
-      deep: true
+      deep: true,
+      immediate: true
     }
   },
   created() {

diff --git a/tests/e2e/specs/FileUpload.spec.js b/tests/e2e/specs/FileUpload.spec.js
@@ -2,7 +2,6 @@ describe("File Upload", () => {
   it("Automatically sets a variable name", () => {
     cy.visit("/");
     cy.openAcordeon("collapse-4");
-    // cy.openAcordeon("collapse-1");
     cy.get("[data-cy=controls-FileUpload]").drag("[data-cy=screen-drop-zone]", {
       position: "bottom"
     });
@@ -22,11 +21,11 @@ describe("File Upload", () => {
     cy.window().then((win) => {
       win.ProcessMaker.isSelfService = true;
     });
-
+    cy.openAcordeon("collapse-4");
     cy.get("[data-cy=controls-FileUpload]").drag("[data-cy=screen-drop-zone]", {
       position: "bottom"
     });
-    cy.get("[data-cy=mode-preview]").click();
-    cy.get("[data-cy=file-upload-button]").should("have.attr", "disabled");
+    cy.get('[data-cy=mode-preview]').click();
+    cy.get('[data-cy=file-upload-button]').should('have.attr', 'disabled');
   });
 });
diff --git a/tests/e2e/specs/MultiInstanceLoopContext.spec.js b/tests/e2e/specs/MultiInstanceLoopContext.spec.js
@@ -64,7 +64,11 @@ describe("FOUR-3375 FileUpload inside MultiInstance Task", () => {
       })
     ).as("uploadMainFile");
     cy.openAcordeon("collapse-4");
-    cy.uploadFile("[data-cy='screen-field-rootUpload'] input[type=file]", "avatar.jpeg", "image/jpg");
+    cy.uploadFile(
+      "[data-cy='screen-field-rootUpload'] input[type=file]",
+      "avatar.jpeg",
+      "image/jpg"
+    );
     cy.wait("@uploadMainFile");
 
     // Upload file 1