Merge pull request 'Hotfix[ZoneLocationsTree]: Fixed node fetching and adapted to back data' (!1589) from Hotfix-ZoneLocationsGetLeaves into master

Reviewed-on: #1589
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

cypress.config.js

@@ -30,7 +30,7 @@ export default defineConfig({
         trashAssetsBeforeRuns: false,
         requestTimeout: 10000,
         responseTimeout: 30000,
-        pageLoadTimeout: 60000,
+        pageLoadTimeout: 120000,
         defaultBrowser: 'chromium',
         fixturesFolder: 'test/cypress/fixtures',
         screenshotsFolder: 'test/cypress/screenshots',

docs/Dockerfile.dev

@@ -25,6 +25,8 @@ RUN apt-get update \
         libnss3 \
         libxss1 \
         libxtst6 \
+        mesa-vulkan-drivers \
+        vulkan-tools \
         xauth \
         xvfb \
     && apt-get clean \
@@ -39,7 +41,7 @@ ENV PNPM_HOME="/home/app/.local/share/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 
 RUN pnpm setup \
-    && pnpm install --global cypress@13.6.6 \
+    && pnpm install --global cypress@14.1.0 \
     && cypress install
 
 WORKDIR /app

package.json

@@ -47,7 +47,7 @@
         "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
         "@vue/test-utils": "^2.4.4",
         "autoprefixer": "^10.4.14",
-        "cypress": "^13.6.6",
+        "cypress": "^14.1.0",
         "cypress-mochawesome-reporter": "^3.8.2",
         "eslint": "^9.18.0",
         "eslint-config-prettier": "^10.0.1",

pnpm-lock.yaml

@@ -71,11 +71,11 @@ devDependencies:
     specifier: ^10.4.14
     version: 10.4.20(postcss@8.5.1)
   cypress:
-    specifier: ^13.6.6
+    specifier: ^14.1.0
-    version: 13.17.0
+    version: 14.1.0
   cypress-mochawesome-reporter:
     specifier: ^3.8.2
-    version: 3.8.2(cypress@13.17.0)(mocha@11.0.1)
+    version: 3.8.2(cypress@14.1.0)(mocha@11.0.1)
   eslint:
     specifier: ^9.18.0
     version: 9.18.0
@@ -3321,7 +3321,7 @@ packages:
   /csstype@3.1.3:
     resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
 
-  /cypress-mochawesome-reporter@3.8.2(cypress@13.17.0)(mocha@11.0.1):
+  /cypress-mochawesome-reporter@3.8.2(cypress@14.1.0)(mocha@11.0.1):
     resolution: {integrity: sha512-oJZkNzhNmN9ZD+LmZyFuPb8aWaIijyHyqYh52YOBvR6B6ckfJNCHP3A98a+/nG0H4t46CKTNwo+wNpMa4d2kjA==}
     engines: {node: '>=14'}
     hasBin: true
@@ -3329,7 +3329,7 @@ packages:
       cypress: '>=6.2.0'
     dependencies:
       commander: 10.0.1
-      cypress: 13.17.0
+      cypress: 14.1.0
       fs-extra: 10.1.0
       mochawesome: 7.1.3(mocha@11.0.1)
       mochawesome-merge: 4.3.0
@@ -3338,9 +3338,9 @@ packages:
       - mocha
     dev: true
 
-  /cypress@13.17.0:
+  /cypress@14.1.0:
-    resolution: {integrity: sha512-5xWkaPurwkIljojFidhw8lFScyxhtiFHl/i/3zov+1Z5CmY4t9tjIdvSXfu82Y3w7wt0uR9KkucbhkVvJZLQSA==}
+    resolution: {integrity: sha512-pPPj8Uu9NwjaaiXAEcjYZZmgsq6v9Zs1Nw6a+zRF+ANgYSNhH4S32SjFRsvMcuOHR/8dp4GBJhBPqIPSs+TxaA==}
-    engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0}
+    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
     hasBin: true
     requiresBuild: true
     dependencies:

src/pages/Zone/Card/ZoneLocationsTree.vue

@@ -72,6 +72,7 @@ const onNodeExpanded = async (nodeKeysArray) => {
         const response = await axios.get(`Zones/${route.params.id}/getLeaves`, {
             params,
         });
+        response.data = JSON.parse(response.data);
         if (response.data) {
             node.childs = response.data.map((n) => {
                 if (n.sons > 0) n.childs = [{}];
@@ -125,14 +126,17 @@ watch(
     async (val) => {
         if (!val) return;
         // // Se triggerea cuando se actualiza el store.data, el cual es el resultado del fetch de la searchbar
+        val = JSON.parse(val);
         if (!nodes.value[0]) nodes.value = [defaultNode];
         nodes.value[0].childs = [...val];
         const fetchedNodeKeys = val.flatMap(getNodeIds);
         state.set('Tree', [...fetchedNodeKeys]);
         expanded.value = [null, ...fetchedNodeKeys];
+        const fetchs = [];
         for (let n of state.get('Tree')) {
-            await fetchNodeLeaves(n);
+            fetchs.push(fetchNodeLeaves(n));
         }
+        await Promise.all(fetchs);
         previousExpandedNodes.value = new Set(expanded.value);
     },
     { immediate: true }

test/cypress/integration/client/clientBalance.spec.js

@@ -1,14 +1,14 @@
 /// <reference types="cypress" />
 describe('Client balance', () => {
     beforeEach(() => {
-        cy.viewport(1280, 720);
         cy.login('developer');
         cy.visit('#/customer/1101/balance');
     });
     it('Should create a mandate', () => {
+        cy.waitSpinner();
         cy.get('.q-page-sticky > div > .q-btn').click();
         cy.selectOption('[data-cy="paymentBank"]', 2);
-        cy.dataCy('paymentAmount_input').type('100');
+        cy.dataCy('paymentAmount_input').clear().type('100');
         cy.saveCard();
     });
 });

test/cypress/support/commands.js

@@ -92,6 +92,14 @@ Cypress.Commands.add('getValue', (selector) => {
     });
 });
 
+Cypress.Commands.add('waitSpinner', () => {
+    cy.get('body').then(($body) => {
+        if ($body.find('[data-cy="loading-spinner"]').length) {
+            cy.get('[data-cy="loading-spinner"]').should('not.be.visible');
+        }
+    });
+});
+
 // Fill Inputs
 Cypress.Commands.add('selectOption', (selector, option, timeout = 2500) => {
     cy.waitForElement(selector, timeout);
@@ -109,6 +117,7 @@ Cypress.Commands.add('selectOption', (selector, option, timeout = 2500) => {
 
 function selectItem(selector, option, ariaControl, hasWrite = true) {
     if (!hasWrite) cy.wait(100);
+    cy.waitSpinner();
 
     getItems(ariaControl).then((items) => {
         const matchingItem = items
@@ -128,6 +137,7 @@ function getItems(ariaControl, startTime = Cypress._.now(), timeout = 2500) {
         .should('exist')
         .find('.q-item')
         .should('exist')
+        .should('be.visible')
         .then(($items) => {
             if (!$items?.length || $items.first().text().trim() === '') {
                 if (Cypress._.now() - startTime > timeout) {