Merge branch 'next' into epic/FOUR-11574

ProcessMaker · Jan 5, 2024 · f950719 · f950719
2 parents 381c3b1 + f8e6763
commit f950719
Show file tree

Hide file tree

Showing 7 changed files with 240 additions and 7,666 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/screen-builder",
-  "version": "2.79.2",
+  "version": "2.79.4",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -39,7 +39,7 @@
     "@cypress/code-coverage": "^3.8.1",
     "@fortawesome/fontawesome-free": "^5.6.1",
     "@panter/vue-i18next": "^0.15.2",
-    "@processmaker/vue-form-elements": "0.49.4",
+    "@processmaker/vue-form-elements": "0.50.1",
     "@processmaker/vue-multiselect": "^2.2.0",
     "@vue/cli-plugin-babel": "^3.6.0",
     "@vue/cli-plugin-e2e-cypress": "^4.0.3",
@@ -88,7 +88,7 @@
   },
   "peerDependencies": {
     "@panter/vue-i18next": "^0.15.0",
-    "@processmaker/vue-form-elements": "0.49.4",
+    "@processmaker/vue-form-elements": "0.50.1",
     "i18next": "^15.0.8",
     "vue": "^2.6.12",
     "vuex": "^3.1.1"
@@ -105,7 +105,7 @@
   ],
   "engines": {
     "npm": ">=8",
-    "node": ">=16 <18"
+    "node": ">=16"
   },
   "nyc": {
     "include": [

diff --git a/src/components/vue-form-builder.vue b/src/components/vue-form-builder.vue
@@ -32,6 +32,7 @@
           <template v-for="(group, index) in controlGroups">
             <b-button
               v-if="
+                !!filteredControlsGrouped &&
                 filteredControlsGrouped[group.key] &&
                 filteredControlsGrouped[group.key].length > 0
               "
@@ -55,6 +56,7 @@
             <b-collapse :id="`collapse-${index}`" class="mt-2">
               <b-list-group
                 v-if="
+                  !!filteredControlsGrouped &&
                   filteredControlsGrouped[group.key] &&
                   filteredControlsGrouped[group.key].length > 0
                 "
@@ -95,7 +97,7 @@
                     {{ $t(element.label) }}
                   </b-list-group-item>
                   <li
-                    v-if="filteredControls && !filteredControls.length"
+                    v-if="!!filteredControls && filteredControls.length > 0"
                     class="list-group-item"
                   >
                     <slot />
@@ -703,6 +705,7 @@ export default {
         { key: "Files", label: "Files" },
         { key: "Advanced", label: "Advanced" }
       ],
+      filteredControlsGrouped: {},
 
       isCollapsed: new Array(7).fill(true)
     };
@@ -835,7 +838,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
@@ -9,11 +9,11 @@ describe('File Upload', () => {
       const data = div[0].__vue__.name;
       expect(data).to.eql('file_upload_1');
     });
-    
+
     cy.get('[data-cy=mode-preview]').click();
     cy.get('[data-cy=file-upload-button]').should('not.have.attr', 'disabled');
   });
-  
+
   it('Disables when task is self service', () => {
     cy.visit('/');
     cy.openAcordeon("collapse-5");

diff --git a/tests/e2e/specs/RecordList.spec.js b/tests/e2e/specs/RecordList.spec.js
@@ -401,7 +401,7 @@ describe('Record list', () => {
     });
   });
 
-  it('Check deleting the correct record in recordlist with empty after sorting', () => {
+  it.skip('Check deleting the correct record in recordlist with empty after sorting', () => {
     cy.loadFromJson('record_list_date_input.json', 0);
     cy.get('[data-cy=mode-preview]').click();
 
@@ -420,10 +420,10 @@ describe('Record list', () => {
     //Add data
     for (let i = 0; i < 9; i++) {
       cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=add-row]').click();
-      if (data[i]['date'] != '') {
-        cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-add] [data-cy="screen-field-date"]').type(data[i]['date']);
+      if (data[i]['date'] !== '') {
+        cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-add] [data-cy="screen-field-date"] input').click().type(data[i]['date']);
       }
-      if (data[i]['name'] != '') {
+      if (data[i]['name'] !== '') {
         cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-add] [name=name]').type(data[i]['name']);
       }
       cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-add] button.btn-primary').click();
@@ -474,7 +474,7 @@ describe('Record list', () => {
     cy.get('[aria-rowindex="5"] > [aria-colindex="2"]').should('contain.text', 'F');
   });
 
-  it('Check editing records with empty from second page', () => {
+  it.skip('Check editing records with empty from second page', () => {
     cy.loadFromJson('record_list_date_input.json', 0);
     cy.get('[data-cy=mode-preview]').click();
 
@@ -494,7 +494,7 @@ describe('Record list', () => {
     for (let i = 0; i < 9; i++) {
       cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=add-row]').click();
       if (data[i]['date'] !== '') {
-        cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-add] [data-cy="screen-field-date"]').type(data[i]['date']);
+        cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-add] [data-cy="screen-field-date"] input').click().type(data[i]['date']);
       }
       if (data[i]['name'] !== '') {
         cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-add] [name=name]').type(data[i]['name']);
@@ -510,13 +510,13 @@ describe('Record list', () => {
 
     //Get record "G" and replace to "GG" and date 01/06/2022 to 06/06/2022
     cy.get('[aria-rowindex="6"] > .text-right > .actions > .btn-group > [data-cy=edit-row]').click();
-    cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-edit] [data-cy=screen-field-date] .form-control').should('have.value', '01/06/2022').clear().type('06/06/2022');
+    cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-edit] [data-cy=screen-field-date] input').should('have.value', '01/06/2022').clear().type('06/06/2022');
     cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-edit] [name=name]').should('have.value', 'G').type('G');
     cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-edit] button.btn-primary').click();
 
     //Get record empty "" and replace to "New value" and date 01/10/2022
     cy.get('[aria-rowindex="7"] > .text-right > .actions > .btn-group > [data-cy=edit-row]').click();
-    cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-edit] [data-cy=screen-field-date] .form-control').should('have.value', '').type('01/10/2022');
+    cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-edit] [data-cy=screen-field-date] input').should('have.value', '').type('01/10/2022');
     cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-edit] [name=name]').should('have.value', '').type('New value');
     cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-edit] button.btn-primary').click();
 
@@ -555,7 +555,7 @@ describe('Record list', () => {
 
     //Get record "B" and replace to "BB" and date 01/02/2022 to 02/02/2022
     cy.get('[aria-rowindex="8"] > .text-right > .actions > .btn-group > [data-cy=edit-row]').click();
-    cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-edit] [data-cy=screen-field-date] .form-control').should('have.value', '01/02/2022').clear().type('02/02/2022');
+    cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-edit] [data-cy=screen-field-date] input').should('have.value', '01/02/2022').clear().type('02/02/2022');
     cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-edit] [name=name]').should('have.value', 'B').type('B');
     cy.get('[data-cy=preview-content] [data-cy=screen-field-form_record_list_1] [data-cy=modal-edit] button.btn-primary').click();
 

diff --git a/tests/e2e/support/commands.js b/tests/e2e/support/commands.js
@@ -227,7 +227,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();
+  cy.get(`button[aria-controls='${name}']`).click({waitForAnimations: 500});
   cy.get(`div[id='${name}']`).invoke("attr", "style").should("not.equal", "display: none;");
 });
 

diff --git a/vue.config.js b/vue.config.js
@@ -12,6 +12,7 @@ if (process.env.NODE_ENV !== "production") {
 }
 
 module.exports = {
+  lintOnSave: false,
   runtimeCompiler: true,
   transpileDependencies: ["vuetable-2"],
   configureWebpack: {