Merge branch 'dev' into 8440-createVehicleNotes

docs/Dockerfile.dev

@@ -25,6 +25,8 @@ RUN apt-get update \
         libnss3 \
         libxss1 \
         libxtst6 \
+        mesa-vulkan-drivers \
+        vulkan-tools \
         xauth \
         xvfb \
     && apt-get clean \

src/pages/Route/Agency/Card/AgencyWorkcenter.vue

@@ -80,6 +80,7 @@ async function deleteWorCenter(id) {
                                 color="primary"
                                 round
                                 flat
+                                data-cy="removeWorkCenterBtn"
                             />
                         </QItemSection>
                     </QItem>

src/pages/Route/RouteList.vue

@@ -11,6 +11,7 @@ import AgencyDescriptorProxy from 'src/pages/Route/Agency/Card/AgencyDescriptorP
 import VehicleDescriptorProxy from 'src/pages/Route/Vehicle/Card/VehicleDescriptorProxy.vue';
 import VnSection from 'src/components/common/VnSection.vue';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
+import RouteTickets from './RouteTickets.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -26,6 +27,12 @@ const routeFilter = {
         },
     ],
 };
+
+function redirectToTickets(id) {
+    const url = `#/route/${id}/tickets`;
+    window.open(url, '_blank');
+}
+
 const columns = computed(() => [
     {
         align: 'right',
@@ -141,6 +148,12 @@ const columns = computed(() => [
         align: 'right',
         name: 'tableActions',
         actions: [
+            {
+                title: t('globals.pageTitles.tickets'),
+                icon: 'vn:ticket',
+                action: (row) => redirectToTickets(row?.id),
+                isPrimary: true,
+            },
             {
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',

src/pages/Route/RouteTickets.vue

@@ -37,9 +37,9 @@ const columns = computed(() => [
         align: 'left',
     },
     {
-        name: 'city',
+        name: 'client',
-        label: t('City'),
+        label: t('Client'),
-        field: (row) => row?.city,
+        field: (row) => row?.nickname,
         sortable: false,
         align: 'left',
     },
@@ -51,9 +51,9 @@ const columns = computed(() => [
         align: 'center',
     },
     {
-        name: 'client',
+        name: 'city',
-        label: t('Client'),
+        label: t('City'),
-        field: (row) => row?.nickname,
+        field: (row) => row?.city,
         sortable: false,
         align: 'left',
     },

src/pages/Zone/Card/ZoneLocationsTree.vue

@@ -73,6 +73,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 = [{}];
@@ -126,14 +127,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,13 @@
 /// <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.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/integration/route/agency/agencyWorkCenter.spec.js

@@ -1,27 +1,34 @@
-describe.skip('AgencyWorkCenter', () => {
+describe('AgencyWorkCenter', () => {
+    const selectors = {
+        workCenter: 'workCenter_select',
+        popupSave: 'FormModelPopup_save',
+        popupCancel: 'FormModelPopup_cancel',
+        remove: 'removeWorkCenterBtn',
+    };
+
+    const messages = {
+        dataCreated: 'Data created',
+        alreadyAssigned: 'This workCenter is already assigned to this agency',
+        removed: 'WorkCenter removed successfully',
+    };
+
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/route/agency/11/workCenter`);
     });
-    const createButton = '.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon';
-    const workCenterCombobox = 'input[role="combobox"]';
 
-    it('check workCenter crud', () => {
+    it('Should add work center, check already assigned and remove work center', () => {
-        // create
+        cy.addBtnClick();
-        cy.get(createButton).click();
+        cy.selectOption('[data-cy="workCenter_select"]', 'workCenterOne');
-        cy.get(workCenterCombobox).type('workCenterOne{enter}');
+        cy.dataCy(selectors.popupSave).click();
         cy.checkNotification('Data created');
-
+        cy.addBtnClick();
-        // expect error when duplicate
+        cy.selectOption('[data-cy="workCenter_select"]', 'workCenterOne');
-        cy.get(createButton).click();
+        cy.dataCy(selectors.popupSave).click();
-        cy.selectOption(workCenterCombobox, 'workCenterOne');
+        cy.checkNotification(messages.alreadyAssigned);
-        cy.get('[data-cy="FormModelPopup_save"]').click();
+        cy.dataCy(selectors.popupCancel).click();
-        cy.checkNotification('This workCenter is already assigned to this agency');
+        cy.dataCy(selectors.remove).click();
-        cy.get('[data-cy="FormModelPopup_cancel"]').click();
+        cy.checkNotification(messages.removed);
-
-        // delete
-        cy.get('.q-item__section--side > .q-btn > .q-btn__content > .q-icon').click();
-        cy.checkNotification('WorkCenter removed successfully');
     });
 });

test/cypress/support/commands.js

@@ -62,12 +62,7 @@ Cypress.Commands.overwrite('visit', (originalFn, url, options, waitRequest = tru
     originalFn(url, options);
     cy.waitUntil(() => cy.document().then((doc) => doc.readyState === 'complete'));
     cy.waitUntil(() => cy.get('main').should('exist'));
-    if (waitRequest)
+    if (waitRequest) cy.waitSpinner();
-        cy.get('body').then(($body) => {
-            if ($body.find('[data-cy="loading-spinner"]').length) {
-                cy.get('[data-cy="loading-spinner"]').should('not.be.visible');
-            }
-        });
 });
 
 Cypress.Commands.add('waitForElement', (element) => {
@@ -99,6 +94,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);
@@ -116,6 +119,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
@@ -135,6 +139,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) {