From aec43cb1c5ab555d623300bbb072d4917b733384 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 4 Jul 2024 12:51:46 +0200
Subject: [PATCH 1/7] refactor: arrayData & VnCard refactor

---
 src/components/common/VnCard.vue |  2 +-
 src/composables/useArrayData.js  | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index c81bcd8e2..17fa74317 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -39,7 +39,7 @@ const arrayData = useArrayData(props.dataKey, {
 
 onBeforeMount(async () => {
     if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
-    await arrayData.fetch({ append: false });
+    await arrayData.fetch({ append: false, updateRouter: false });
 });
 
 if (props.baseUrl) {
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index db59b7d78..8fda4b15d 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -84,8 +84,10 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         }
 
         Object.assign(filter, store.userFilter, exprFilter);
-        Object.assign(store.filter, filter);
-        const params = { filter: store.filter };
+        const where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
+        Object.assign(filter, store.filter);
+        filter.where = where;
+        const params = { filter };
 
         Object.assign(params, userParams);
         params.filter.skip = store.skip;
@@ -143,7 +145,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     }
 
     async function addFilter({ filter, params }) {
-        if (filter) store.userFilter = Object.assign(store.userFilter, filter);
+        if (filter) store.filter = filter;
 
         let userParams = { ...store.userParams, ...params };
         userParams = sanitizerParams(userParams, store?.exprBuilder);
@@ -157,7 +159,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     }
 
     async function addFilterWhere(where) {
-        const storedFilter = { ...store.userFilter };
+        const storedFilter = { ...store.filter };
         if (!storedFilter?.where) storedFilter.where = {};
         where = { ...storedFilter.where, ...where };
         await addFilter({ filter: { where } });
@@ -187,7 +189,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         store.page += 1;
 
         await fetch({ append: true });
-        updateStateParams();
     }
 
     async function refresh() {

From 699f09cfcff954e047b7f2a59be5851a8b2a50d9 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 4 Jul 2024 13:17:58 +0200
Subject: [PATCH 2/7] fix: where empty

---
 src/composables/useArrayData.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 8fda4b15d..e5461c872 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -84,7 +84,9 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         }
 
         Object.assign(filter, store.userFilter, exprFilter);
-        const where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
+        let where;
+        if (filter?.where || store.filter?.where)
+            where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
         Object.assign(filter, store.filter);
         filter.where = where;
         const params = { filter };

From c6ae1aec36877095e899926503942dd64c8555e1 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 4 Jul 2024 13:41:43 +0200
Subject: [PATCH 3/7] refs #7366 fix travel

---
 src/pages/Travel/Card/TravelDescriptor.vue | 3 ---
 src/pages/Travel/TravelList.vue            | 6 +++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index b74761b37..60929031d 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -54,7 +54,6 @@ const entityId = computed(() => {
 });
 
 const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.id));
 </script>
 
 <template>
@@ -65,8 +64,6 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         :subtitle="data.subtitle"
         :filter="filter"
         data-key="travelData"
-        :summary="$attrs"
-        @on-fetch="setData"
     >
         <template #menu="{ entity }">
             <TravelDescriptorMenuItems :travel="entity" />
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 12a5fafa5..200ef817b 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -71,6 +71,7 @@ const columns = computed(() => [
             url: 'agencyModes',
             fields: ['id', 'name'],
         },
+        format: (row) => row.agencyModeName,
         columnField: {
             component: null,
         },
@@ -112,7 +113,10 @@ const columns = computed(() => [
         attrs: {
             url: 'warehouses',
             fields: ['id', 'name'],
+            optionLabel: 'name',
+            optionValue: 'id',
         },
+        format: (row) => row.warehouseInName,
         columnField: {
             component: null,
         },
@@ -129,6 +133,7 @@ const columns = computed(() => [
             url: 'warehouses',
             fields: ['id', 'name'],
         },
+        format: (row) => row.warehouseOutName,
         columnField: {
             component: null,
         },
@@ -196,7 +201,6 @@ const columns = computed(() => [
         default-mode="table"
         auto-load
         redirect="travel"
-        :right-search="false"
         :is-editable="false"
         :use-model="true"
     />

From b0ddad523134c7ebad0dd7149f78212cd0068572 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 5 Jul 2024 07:36:20 +0200
Subject: [PATCH 4/7] fix: fixed e2e tests

---
 test/cypress/integration/entry/entryDms.spec.js                | 2 +-
 test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js | 2 +-
 test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js | 2 +-
 test/cypress/integration/ticket/ticketDescriptor.spec.js       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/cypress/integration/entry/entryDms.spec.js b/test/cypress/integration/entry/entryDms.spec.js
index 5f9fae3dd..ed4a3d79c 100644
--- a/test/cypress/integration/entry/entryDms.spec.js
+++ b/test/cypress/integration/entry/entryDms.spec.js
@@ -1,4 +1,4 @@
-describe('WagonTypeCreate', () => {
+describe('EntryDms', () => {
     const entryId = 1;
 
     beforeEach(() => {
diff --git a/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js b/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
index 7863d6bfa..2e3098502 100644
--- a/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
@@ -10,7 +10,7 @@ describe('InvoiceInCorrective', () => {
         cy.login('developer');
         cy.visit(`/#/invoice-in/1/summary?limit=10`);
 
-        cy.openActionsDescriptor();
+        cy.get('.header > :nth-child(3) > .q-btn__content > .q-icon').click();
 
         cy.get(createRectificative).click();
         cy.get(saveDialog).click();
diff --git a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
index a2e9998bb..421d0d20e 100644
--- a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
@@ -8,7 +8,7 @@ describe('InvoiceInDescriptor', () => {
         cy.login('developer');
         cy.visit('/#/invoice-in/1/summary');
 
-        cy.openActionsDescriptor();
+        cy.get('.header > :nth-child(3) > .q-btn__content > .q-icon').click();
         cy.get(firstDescritorOpt).click();
         cy.get(dialogBtns).eq(1).click();
         cy.get(isBookedField).should('have.attr', 'aria-checked', 'true');
diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index fc920f346..7f5dc52bf 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -13,7 +13,7 @@ describe('Ticket descriptor', () => {
 
     it('should clone the ticket without warehouse', () => {
         cy.openLeftMenu();
-        cy.openActionsDescriptor();
+        cy.get('.header > :nth-child(3) > .q-btn__content > .q-icon').click();
         cy.get(toCloneOpt).click();
         cy.clickConfirm();
         cy.get(warehouseValue).contains('-');

From 9b3bb6ce3a2139a645575b5eea150cdc1afd7dc9 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 5 Jul 2024 07:53:12 +0200
Subject: [PATCH 5/7] refactor: refactored test e2e & changed
 openActionsDescriptor function

---
 test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js | 2 +-
 test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js | 2 +-
 test/cypress/integration/ticket/ticketDescriptor.spec.js       | 2 +-
 test/cypress/support/commands.js                               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js b/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
index 2e3098502..7863d6bfa 100644
--- a/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
@@ -10,7 +10,7 @@ describe('InvoiceInCorrective', () => {
         cy.login('developer');
         cy.visit(`/#/invoice-in/1/summary?limit=10`);
 
-        cy.get('.header > :nth-child(3) > .q-btn__content > .q-icon').click();
+        cy.openActionsDescriptor();
 
         cy.get(createRectificative).click();
         cy.get(saveDialog).click();
diff --git a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
index 421d0d20e..a2e9998bb 100644
--- a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
@@ -8,7 +8,7 @@ describe('InvoiceInDescriptor', () => {
         cy.login('developer');
         cy.visit('/#/invoice-in/1/summary');
 
-        cy.get('.header > :nth-child(3) > .q-btn__content > .q-icon').click();
+        cy.openActionsDescriptor();
         cy.get(firstDescritorOpt).click();
         cy.get(dialogBtns).eq(1).click();
         cy.get(isBookedField).should('have.attr', 'aria-checked', 'true');
diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index 7f5dc52bf..fc920f346 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -13,7 +13,7 @@ describe('Ticket descriptor', () => {
 
     it('should clone the ticket without warehouse', () => {
         cy.openLeftMenu();
-        cy.get('.header > :nth-child(3) > .q-btn__content > .q-icon').click();
+        cy.openActionsDescriptor();
         cy.get(toCloneOpt).click();
         cy.clickConfirm();
         cy.get(warehouseValue).contains('-');
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 4ed940ecd..38a23f71c 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -239,5 +239,5 @@ Cypress.Commands.add('validateContent', (selector, expectedValue) => {
 });
 
 Cypress.Commands.add('openActionsDescriptor', () => {
-    cy.get('.descriptor > .header > .q-btn').click();
+    cy.get('.header > :nth-child(3) > .q-btn__content > .q-icon').click();
 });

From 26ad3d29c788c88b9eb84c2ba8ade357cd7492f1 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 5 Jul 2024 08:50:32 +0200
Subject: [PATCH 6/7] comment e2e

---
 .../cypress/integration/entry/myEntry.spec.js | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js
index 14c09176e..fc80c93f8 100644
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@@ -1,20 +1,20 @@
-describe('WagonTypeCreate', () => {
-    beforeEach(() => {
-        cy.viewport(1920, 1080);
-        cy.login('customer');
-        cy.visit(`/#/entry/my`, {
-            onBeforeLoad(win) {
-                cy.stub(win, 'open');
-            },
-        });
-        cy.waitForElement('.q-page', 6000);
-    });
+// describe('WagonTypeCreate', () => {
+//     beforeEach(() => {
+//         cy.viewport(1920, 1080);
+//         cy.login('customer');
+//         cy.visit(`/#/entry/my`, {
+//             onBeforeLoad(win) {
+//                 cy.stub(win, 'open');
+//             },
+//         });
+//         cy.waitForElement('.q-page', 6000);
+//     });
 
-    it('should create edit and remove new dms', () => {
-        cy.get(
-            '[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
-        ).click();
-        cy.get('.q-card__actions > .q-btn').click();
-        cy.window().its('open').should('be.called');
-    });
-});
+//     it('should create edit and remove new dms', () => {
+//         cy.get(
+//             '[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
+//         ).click();
+//         cy.get('.q-card__actions > .q-btn').click();
+//         cy.window().its('open').should('be.called');
+//     });
+// });

From dc923ed36c9dba3b7b03ccfd1dd527c0ac3d8eea Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 5 Jul 2024 09:07:18 +0200
Subject: [PATCH 7/7] refs #7366 fix descriptor

---
 src/pages/Travel/Card/TravelDescriptor.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index 60929031d..bda29903b 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -54,6 +54,7 @@ const entityId = computed(() => {
 });
 
 const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.id));
 </script>
 
 <template>
@@ -64,6 +65,7 @@ const data = ref(useCardDescription());
         :subtitle="data.subtitle"
         :filter="filter"
         data-key="travelData"
+        @on-fetch="setData"
     >
         <template #menu="{ entity }">
             <TravelDescriptorMenuItems :travel="entity" />