From 5bf65ec8ac09ebea204bdd306a8b6460dee8567e Mon Sep 17 00:00:00 2001
From: pmoskrojas <69815070+pmoskrojas@users.noreply.github.com>
Date: Mon, 18 Dec 2023 11:39:04 -0400
Subject: [PATCH 01/11] FOUR-12891 Adding Display Screen Accordions and
 elements

---
 src/components/vue-form-builder.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/vue-form-builder.vue b/src/components/vue-form-builder.vue
index 925ca52ac..fe3543109 100644
--- a/src/components/vue-form-builder.vue
+++ b/src/components/vue-form-builder.vue
@@ -546,7 +546,8 @@ const controlGroups = {
     "Nested Screen"
   ],
   Navigation: ["Page Navigation"],
-  Files: ["File Upload", "File Download", "File Preview"],
+  Dashboards: ["Saved Search Chart", "Analytics Chart"],
+  Files: ["File Upload", "File Download", "File Preview", "List Table"],
   Advanced: [
     "Bootstrap Component",
     "Bootstrap Wrapper",
@@ -580,10 +581,12 @@ const popoverContentMap = {
   "Loop": "Format content in a table structure and allow for adding rows",
   "Nested Screen": "Add a repeatable section of content",
   "Page Navigation": "Add and reuse another Form within this Form",
+  "Analytics Chart": "Add a chart from the Analytics Reports",
   "File Upload":
     "Add special buttons that link between subpages within this Form",
   "File Download": "Collect files uploaded into the Form",
   "File Preview": "Offer a File download",
+  "List Table": "Create List Table",
   "Bootstrap Component":
     "Add a Preview section that displays the content of a File",
   "Bootstrap Wrapper":
@@ -681,6 +684,7 @@ export default {
         { key: "InputFields", label: "Input Fields" },
         { key: "ContentFields", label: "Content Fields" },
         { key: "Navigation", label: "Navigation" },
+        { key: "Dashboards", label: "Dashboards" },
         { key: "Files", label: "Files" },
         { key: "Advanced", label: "Advanced" }
       ],
@@ -719,9 +723,12 @@ export default {
         "Loop",
         "Nested Screen",
         "Page Navigation",
+        "Saved Search Chart",
+        "Analytics Chart",
         "File Upload",
         "File Download",
         "File Preview",
+        "List Table",
         "Bootstrap Component",
         "Bootstrap Wrapper",
         "Captcha",

From 7afa00d20a4754c982428cfb3d87799d46a55015 Mon Sep 17 00:00:00 2001
From: pmoskrojas <69815070+pmoskrojas@users.noreply.github.com>
Date: Tue, 19 Dec 2023 10:21:32 -0400
Subject: [PATCH 02/11] FOUR-12881 Fix Balloon position

---
 src/components/vue-form-builder.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/vue-form-builder.vue b/src/components/vue-form-builder.vue
index fe3543109..e67adee66 100644
--- a/src/components/vue-form-builder.vue
+++ b/src/components/vue-form-builder.vue
@@ -70,7 +70,10 @@
                       group.key
                     ]"
                     :key="elementIndex"
-                    v-b-popover.hover.top="element.popoverContent"
+                    v-b-popover.hover.right="{
+                      content: element.popoverContent,
+                      customClass: 'custom-popover'
+                    }"
                     :boundary="'viewport'"
                     :data-cy="`controls-${element.component}`"
                     :class="{
@@ -1382,6 +1385,9 @@ export default {
 </script>
 
 <style>
+.custom-popover {
+  margin-right: -400px;
+}
 .gray-text {
   color: gray;
 }

From 2a2feec57313190244678ace17270c457cf7124a Mon Sep 17 00:00:00 2001
From: pmoskrojas <69815070+pmoskrojas@users.noreply.github.com>
Date: Wed, 20 Dec 2023 10:18:11 -0400
Subject: [PATCH 03/11] Fix Accordion icon

---
 src/components/vue-form-builder.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/vue-form-builder.vue b/src/components/vue-form-builder.vue
index e67adee66..a63bcd744 100644
--- a/src/components/vue-form-builder.vue
+++ b/src/components/vue-form-builder.vue
@@ -71,7 +71,7 @@
                     ]"
                     :key="elementIndex"
                     v-b-popover.hover.right="{
-                      content: element.popoverContent,
+                      content: $t(element.popoverContent),
                       customClass: 'custom-popover'
                     }"
                     :boundary="'viewport'"
@@ -692,7 +692,7 @@ export default {
         { key: "Advanced", label: "Advanced" }
       ],
 
-      isCollapsed: new Array(6).fill(true)
+      isCollapsed: new Array(7).fill(true)
     };
   },
   computed: {
@@ -899,7 +899,7 @@ export default {
     },
     checkForCaptcha(items, insideLoop = false, nestedScreen = null) {
       items.forEach((item) => {
-        if (!item.items && item.component == "Captcha" && insideLoop) {
+        if (!item.items && item.component === "Captcha" && insideLoop) {
           if (nestedScreen && nestedScreen.config.screen) {
             this.$root.$emit("remove-nested", nestedScreen.config.screen);
             nestedScreen.config.screen = null;

From b59c61288c738046f8d6be64389ba08907b4cdc4 Mon Sep 17 00:00:00 2001
From: Carlos Camacho <carlosalbertocamachocapriles@gmail.com>
Date: Thu, 21 Dec 2023 00:01:58 -0400
Subject: [PATCH 04/11] fix two tests

---
 tests/e2e/specs/DeviceVisivilityInspector.spec.js | 4 ++--
 tests/e2e/specs/FileUpload.spec.js                | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/e2e/specs/DeviceVisivilityInspector.spec.js b/tests/e2e/specs/DeviceVisivilityInspector.spec.js
index 522b4fe7f..ba81d98b7 100644
--- a/tests/e2e/specs/DeviceVisivilityInspector.spec.js
+++ b/tests/e2e/specs/DeviceVisivilityInspector.spec.js
@@ -53,7 +53,7 @@ describe('Device Visiblility Inspector', () => {
   });
   it('Verify if a FileDownload has device visiblility settings', () => {
     cy.visit('/');
-    cy.openAcordeon("collapse-4");
+    cy.openAcordeon("collapse-5");
     cy.get('[data-cy=controls-FileDownload]').drag('[data-cy=screen-drop-zone]', 'bottom');
     cy.get('[data-cy=screen-element-container]').click();
     cy.get('[data-cy=accordion-Advanced]').click();
@@ -67,7 +67,7 @@ describe('Device Visiblility Inspector', () => {
   });
   it('Verify if a FileUpload has device visiblility settings', () => {
     cy.visit('/');
-    cy.openAcordeon("collapse-4");
+    cy.openAcordeon("collapse-5");
     cy.get('[data-cy=controls-FileUpload]').drag('[data-cy=screen-drop-zone]', 'bottom');
     cy.get('[data-cy=screen-element-container]').click();
     cy.get('[data-cy=accordion-Advanced]').click();
diff --git a/tests/e2e/specs/FileUpload.spec.js b/tests/e2e/specs/FileUpload.spec.js
index b8d878e59..d3be719c4 100644
--- a/tests/e2e/specs/FileUpload.spec.js
+++ b/tests/e2e/specs/FileUpload.spec.js
@@ -1,8 +1,7 @@
 describe('File Upload', () => {
   it('Automatically sets a variable name', () => {
     cy.visit('/');
-    cy.openAcordeon("collapse-4");
-    //cy.openAcordeon("collapse-1");
+    cy.openAcordeon("collapse-5");
     cy.get('[data-cy=controls-FileUpload]').drag('[data-cy=screen-drop-zone]', 'bottom');
     cy.get('[data-cy=screen-element-container]').click();
 
@@ -17,10 +16,10 @@ describe('File Upload', () => {
   
   it('Disables when task is self service', () => {
     cy.visit('/');
+    cy.openAcordeon("collapse-5");
     cy.window().then((win) => {
       win.ProcessMaker.isSelfService = true;
     });
-
     cy.get('[data-cy=controls-FileUpload]').drag('[data-cy=screen-drop-zone]', 'bottom');
     cy.get('[data-cy=mode-preview]').click();
     cy.get('[data-cy=file-upload-button]').should('have.attr', 'disabled');

From 29c020fcaad1a9dc865b871352f3ba42e1625d38 Mon Sep 17 00:00:00 2001
From: pmoskrojas <69815070+pmoskrojas@users.noreply.github.com>
Date: Thu, 21 Dec 2023 16:02:14 -0400
Subject: [PATCH 05/11] Fix Cypress Test

---
 src/components/vue-form-builder.vue | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/components/vue-form-builder.vue b/src/components/vue-form-builder.vue
index a63bcd744..1bfce465c 100644
--- 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[group.key] &&
+                filteredControlsGrouped[group.key].length > 0
+              "
               v-b-toggle="`collapse-${index}`"
               class="w-100 rounded-0 text-left"
               style="
@@ -51,7 +54,10 @@
             </b-button>
             <b-collapse :id="`collapse-${index}`" class="mt-2">
               <b-list-group
-                v-if="filteredControlsGrouped[group.key].length > 0"
+                v-if="
+                  filteredControlsGrouped[group.key] &&
+                  filteredControlsGrouped[group.key].length > 0
+                "
               >
                 <draggable
                   v-if="renderControls"
@@ -82,12 +88,15 @@
                     }"
                   >
                     <i
-                      v-if="element.config.icon"
+                      v-if="element.config && element.config.icon"
                       :class="element.config.icon"
                     />
                     {{ $t(element.label) }}
                   </b-list-group-item>
-                  <li v-if="!filteredControls.length" class="list-group-item">
+                  <li
+                    v-if="filteredControls && !filteredControls.length"
+                    class="list-group-item"
+                  >
                     <slot />
                   </li>
                 </draggable>
@@ -340,7 +349,7 @@
         <b-card-body class="p-0 h-100 overflow-auto">
           <template v-for="accordion in accordions">
             <b-button
-              v-if="getInspectorFields(accordion).length > 0"
+              v-if="getInspectorFields(accordion) && getInspectorFields(accordion).length > 0"
               :key="`${accordionName(accordion)}-button`"
               variant="outline"
               class="text-left card-header d-flex align-items-center w-100 outline-0 text-capitalize shadow-none"
@@ -681,6 +690,7 @@ export default {
       collator: null,
       editorContentKey: 0,
       cancelledJobs: [],
+      filteredControlsGrouped: {},
 
       controlGroups: [
         { key: "AIAssistant", label: "AI Assistant" },
@@ -873,8 +883,6 @@ export default {
       this.$set(this.isCollapsed, index, !this.isCollapsed[index]);
     },
     groupFilteredControls(controls) {
-      this.filteredControlsGrouped = {};
-
       for (const groupKey in controlGroups) {
         this.filteredControlsGrouped[groupKey] = filterControlsByLabel(
           controls,
@@ -1028,7 +1036,7 @@ export default {
               : "");
           item.config = {
             content:
-              "<div style=\"" + style + "\">" + item.config.label + "</div>",
+              '<div style="' + style + '">' + item.config.label + "</div>",
             interactive: true
           };
         }

From a350a89c2cd0418c11d482c48e3565225cb954ac Mon Sep 17 00:00:00 2001
From: Carlos Camacho <carlosalbertocamachocapriles@gmail.com>
Date: Tue, 2 Jan 2024 09:10:12 -0400
Subject: [PATCH 06/11] fix test

---
 tests/e2e/specs/MultiInstanceLoopContext.spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/e2e/specs/MultiInstanceLoopContext.spec.js b/tests/e2e/specs/MultiInstanceLoopContext.spec.js
index 18894843e..5d92d0948 100644
--- a/tests/e2e/specs/MultiInstanceLoopContext.spec.js
+++ b/tests/e2e/specs/MultiInstanceLoopContext.spec.js
@@ -65,7 +65,6 @@ describe("FOUR-3375 FileUpload inside MultiInstance Task", () => {
         fileUploadId: 1
       })
     ).as("uploadMainFile");
-    cy.openAcordeon("collapse-4");
     cy.uploadFile(
       "[data-cy='screen-field-rootUpload'] input[type=file]",
       "avatar.jpeg",

From 17397efefad99f85f892930e4f6e42e076cee4a6 Mon Sep 17 00:00:00 2001
From: pmoskrojas <69815070+pmoskrojas@users.noreply.github.com>
Date: Tue, 2 Jan 2024 14:42:09 -0400
Subject: [PATCH 07/11] Add Plaid element to Control Menu

---
 src/components/vue-form-builder.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/vue-form-builder.vue b/src/components/vue-form-builder.vue
index 1bfce465c..b7f773a7b 100644
--- a/src/components/vue-form-builder.vue
+++ b/src/components/vue-form-builder.vue
@@ -565,7 +565,8 @@ const controlGroups = {
     "Bootstrap Wrapper",
     "Captcha",
     "Google Places",
-    "Saved Search Chart"
+    "Saved Search Chart",
+    "Plaid"
   ]
 };
 

From 6b9b223825db3b8bd5ae290124440d9c6e280cd5 Mon Sep 17 00:00:00 2001
From: pmoskrojas <69815070+pmoskrojas@users.noreply.github.com>
Date: Wed, 3 Jan 2024 11:28:05 -0400
Subject: [PATCH 08/11] FOUR-13039: Fix popover translations

---
 src/components/vue-form-builder.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/vue-form-builder.vue b/src/components/vue-form-builder.vue
index b7f773a7b..38a1c1b8a 100644
--- a/src/components/vue-form-builder.vue
+++ b/src/components/vue-form-builder.vue
@@ -589,7 +589,7 @@ const popoverContentMap = {
   "Multicolumn / Table": "Organize and group your content in columns",
   // eslint-disable-next-line prettier/prettier
   "Image": "Upload an image to your screen",
-  "Record List": "Upload an image to your screen",
+  "Record List": "Format content in a table structure ",
   // eslint-disable-next-line prettier/prettier
   "Loop": "Format content in a table structure and allow for adding rows",
   "Nested Screen": "Add a repeatable section of content",
@@ -606,7 +606,7 @@ const popoverContentMap = {
     "Wrap an existing subpage within this Form into a Bootstrap Vue component	",
   // eslint-disable-next-line prettier/prettier
   "Captcha":
-    "Wrap an existing subpage within this Form into a Bootstrap Vue component	",
+    "Add a Captcha box to your Form",
   "Google Places": "Collect an address using Google's location search",
   "Saved Search Chart": "Add a chart from one of your Saved Searches"
 };
@@ -891,7 +891,7 @@ export default {
         );
 
         this.filteredControlsGrouped[groupKey].forEach((control) => {
-          const popoverContent = popoverContentMap[control.label];
+          const popoverContent = this.$t(popoverContentMap[control.label]);
           if (popoverContent) {
             control.popoverContent = popoverContent;
           }

From 8220cd5758f765080e9986c98ab7a32c90aea9a0 Mon Sep 17 00:00:00 2001
From: pmoskrojas <69815070+pmoskrojas@users.noreply.github.com>
Date: Fri, 5 Jan 2024 08:52:57 -0400
Subject: [PATCH 09/11] FOUR-13064: Sidebar header translations missing

---
 src/components/vue-form-builder.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/vue-form-builder.vue b/src/components/vue-form-builder.vue
index 38a1c1b8a..2c388a982 100644
--- a/src/components/vue-form-builder.vue
+++ b/src/components/vue-form-builder.vue
@@ -46,7 +46,7 @@
               "
               @click="toggleCollapse(index)"
             >
-              {{ group.label
+              {{ $t(group.label)
               }}<b-icon
                 :icon="isCollapsed[index] ? 'chevron-down' : 'chevron-up'"
                 class="float-right"

From 381c3b12932c267c18dd464347aeb03cc59f33cf Mon Sep 17 00:00:00 2001
From: pmoskrojas <69815070+pmoskrojas@users.noreply.github.com>
Date: Fri, 5 Jan 2024 12:38:01 -0400
Subject: [PATCH 10/11] Adding V-HTML for SVG render icons

---
 src/components/vue-form-builder.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/vue-form-builder.vue b/src/components/vue-form-builder.vue
index 2c388a982..b59c88685 100644
--- a/src/components/vue-form-builder.vue
+++ b/src/components/vue-form-builder.vue
@@ -91,6 +91,7 @@
                       v-if="element.config && element.config.icon"
                       :class="element.config.icon"
                     />
+                    <span v-html="element.config.svg" class="svg-icon"></span>
                     {{ $t(element.label) }}
                   </b-list-group-item>
                   <li

From 6bab7b160a2ccc7fa8c3eba71b291e75849d36e0 Mon Sep 17 00:00:00 2001
From: Carlos Camacho <carlosalbertocamachocapriles@gmail.com>
Date: Mon, 8 Jan 2024 19:33:32 -0400
Subject: [PATCH 11/11] update openAcordeon method

---
 tests/e2e/support/commands.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/e2e/support/commands.js b/tests/e2e/support/commands.js
index d4c986b49..371ded72b 100644
--- a/tests/e2e/support/commands.js
+++ b/tests/e2e/support/commands.js
@@ -225,10 +225,7 @@ Cypress.Commands.add('showValidationOnLoad', () => {
 })
 
 Cypress.Commands.add("openAcordeon", (name) => {
-  cy.get(`button[aria-controls='${name}']`).should("be.visible");
-  cy.get(`div[id='${name}']`).invoke("attr", "style").should("eq", "display: none;");
-  cy.get(`button[aria-controls='${name}']`).click({waitForAnimations: 500});
-  cy.get(`div[id='${name}']`).invoke("attr", "style").should("not.equal", "display: none;");
+  cy.get(`button[aria-controls='${name}']`).click({waitForAnimations: 500, force:true});
 });
 
 Cypress.Commands.add("openAllAcordeon", () => {