From 9a631a61f90711e281244ddcb7ae2b8d93c96a55 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 3 Jan 2025 10:46:43 +0100
Subject: [PATCH 1/7] fix: refs #8197 redirection

---
 src/components/common/VnSection.vue   | 14 ++++++++++++--
 src/components/ui/VnSearchbar.vue     |  1 +
 src/pages/Order/Card/OrderSummary.vue |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnSection.vue b/src/components/common/VnSection.vue
index e69e586b5df..f55826a223b 100644
--- a/src/components/common/VnSection.vue
+++ b/src/components/common/VnSection.vue
@@ -4,6 +4,7 @@ import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnTableFilter from '../VnTable/VnTableFilter.vue';
 import { onBeforeMount, computed } from 'vue';
 import { useArrayData } from 'src/composables/useArrayData';
+import { useRoute } from 'vue-router';
 
 const $props = defineProps({
     section: {
@@ -40,8 +41,17 @@ const $props = defineProps({
     },
 });
 
-const sectionValue = computed(() => $props.section ?? $props.dataKey);
+const route = useRoute();
 let arrayData;
+const sectionValue = computed(() => $props.section ?? $props.dataKey);
+const isMainSection = computed(() => {
+    const isSame = sectionValue.value == route.name;
+    if (!isSame && arrayData) {
+        arrayData.reset(['userParams', 'userFilter']);
+    }
+    return isSame;
+});
+
 onBeforeMount(() => {
     if ($props.dataKey)
         arrayData = useArrayData($props.dataKey, {
@@ -74,6 +84,6 @@ onBeforeMount(() => {
             </slot>
         </template>
     </RightMenu>
-    <slot name="body" v-if="sectionValue == $route.name" />
+    <slot name="body" v-if="isMainSection" />
     <RouterView v-else />
 </template>
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 4e284d8e45b..a2d3b9ee124 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -126,6 +126,7 @@ async function search() {
         delete filter.params.search;
     }
     await arrayData.applyFilter(filter);
+    searchText.value = undefined;
 }
 </script>
 <template>
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index b8016abac0b..ad06dfe43c1 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -221,7 +221,7 @@ async function handleConfirm() {
                                             </span>
                                         </div>
                                     </div>
-                                    <FetchedTags :item="props.row.item" />
+                                    <FetchedTags :item="props.row.item" :columns="3" />
                                 </QTd>
                                 <QTd key="quantity" :props="props">
                                     {{ props.row.quantity }}

From dc8fe655583c22d4ae03809424de612c8c948c15 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 3 Jan 2025 13:45:07 +0100
Subject: [PATCH 2/7] fix: redirection vnTable VnTableFilter

---
 src/components/VnTable/VnTable.vue  | 2 +-
 src/components/common/VnSection.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 6bfa97e5516..3839ff0c28b 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -313,7 +313,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
         show-if-above
     >
         <QScrollArea class="fit">
-            <VnTableFilter :data-key="$attrs['data-key']" :columns="columns" />
+            <VnTableFilter :data-key="$attrs['data-key']" :columns="columns" :redirect="redirect" />
         </QScrollArea>
     </QDrawer>
     <CrudModel
diff --git a/src/components/common/VnSection.vue b/src/components/common/VnSection.vue
index e69e586b5df..76856ef9461 100644
--- a/src/components/common/VnSection.vue
+++ b/src/components/common/VnSection.vue
@@ -8,7 +8,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 const $props = defineProps({
     section: {
         type: String,
-        required: true,
+        default: null,
     },
     dataKey: {
         type: String,

From f3835a1d8355dc2749de74b8d12244e7ca3711a0 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 3 Jan 2025 15:31:00 +0100
Subject: [PATCH 3/7] fix: refs #8197 vnPaginate when change :id

---
 src/components/ui/VnPaginate.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index a2ccd5d92d1..ee6937add95 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -2,6 +2,7 @@
 import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
+import { onBeforeRouteUpdate } from 'vue-router';
 
 const { t } = useI18n();
 
@@ -110,6 +111,13 @@ onMounted(async () => {
     mounted.value = true;
 });
 
+// onBeforeRouteUpdate((to, from, next) => {
+//     if (to.name === from.name && to.path !== from.path) {
+//         arrayData.reset(['data']);
+//     }
+//     next();
+// });
+
 onBeforeUnmount(() => {
     arrayData.resetPagination();
 });

From cc4295e7223c19be0891e3a8343a55ccad015b51 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 3 Jan 2025 15:40:19 +0100
Subject: [PATCH 4/7] feat: refs #8197 keepData in VnSection

---
 src/components/common/VnSection.vue | 5 +++++
 src/components/ui/VnPaginate.vue    | 9 ++-------
 src/composables/useArrayData.js     | 1 +
 src/stores/useArrayDataStore.js     | 1 +
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/common/VnSection.vue b/src/components/common/VnSection.vue
index 76856ef9461..846717dc806 100644
--- a/src/components/common/VnSection.vue
+++ b/src/components/common/VnSection.vue
@@ -38,6 +38,10 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    keepData: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const sectionValue = computed(() => $props.section ?? $props.dataKey);
@@ -46,6 +50,7 @@ onBeforeMount(() => {
     if ($props.dataKey)
         arrayData = useArrayData($props.dataKey, {
             searchUrl: 'table',
+            keepData: $props.keepData,
             ...$props.arrayDataProps,
             navigate: $props.redirect,
         });
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index ee6937add95..5abb0d96c0a 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -111,14 +111,9 @@ onMounted(async () => {
     mounted.value = true;
 });
 
-// onBeforeRouteUpdate((to, from, next) => {
-//     if (to.name === from.name && to.path !== from.path) {
-//         arrayData.reset(['data']);
-//     }
-//     next();
-// });
-
 onBeforeUnmount(() => {
+    console.log('store.keepData: ', store.keepData);
+    if (!store.keepData) arrayData.reset(['data']);
     arrayData.resetPagination();
 });
 
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 1a91cc50b50..720a1ec88f4 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -53,6 +53,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             'searchUrl',
             'navigate',
             'mapKey',
+            'keepData',
         ];
         if (typeof userOptions === 'object') {
             for (const option in userOptions) {
diff --git a/src/stores/useArrayDataStore.js b/src/stores/useArrayDataStore.js
index e0d8b792932..8d62fdb4a22 100644
--- a/src/stores/useArrayDataStore.js
+++ b/src/stores/useArrayDataStore.js
@@ -18,6 +18,7 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
         navigate: null,
         page: 1,
         mapKey: 'id',
+        keepData: false,
     };
 
     function get(key) {

From 1a8368c4cee7b4f65cbdd427428eb25f171ec1c2 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 6 Jan 2025 18:31:19 +0100
Subject: [PATCH 5/7] fix(VnDmsList): refs #8197 add mapKey

---
 src/components/common/VnDmsList.vue | 3 ++-
 src/components/ui/VnPaginate.vue    | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 52dd6ef791b..3a143cb524e 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -297,7 +297,8 @@ defineExpose({
         ref="dmsRef"
         :data-key="$props.model"
         :url="$props.model"
-        :filter="dmsFilter"
+        map-key="dmsFk"
+        :user-filter="dmsFilter"
         :order="['dmsFk DESC']"
         :auto-load="true"
         @on-fetch="setData"
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 5abb0d96c0a..0111366f525 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -2,7 +2,6 @@
 import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
-import { onBeforeRouteUpdate } from 'vue-router';
 
 const { t } = useI18n();
 
@@ -112,7 +111,6 @@ onMounted(async () => {
 });
 
 onBeforeUnmount(() => {
-    console.log('store.keepData: ', store.keepData);
     if (!store.keepData) arrayData.reset(['data']);
     arrayData.resetPagination();
 });

From af7c6a0aafa40afec7f9da818e4e342207727843 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 6 Jan 2025 18:59:48 +0100
Subject: [PATCH 6/7] test: refs #8197 fix e2e

---
 src/components/common/VnBtnSelect.vue             |  1 +
 src/components/common/VnModule.vue                | 15 +++++++--------
 .../integration/ticket/ticketExpedition.spec.js   |  4 +++-
 .../integration/vnComponent/VnBreadcrumbs.spec.js |  1 +
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/components/common/VnBtnSelect.vue b/src/components/common/VnBtnSelect.vue
index b0616a6b23a..3d96a55a658 100644
--- a/src/components/common/VnBtnSelect.vue
+++ b/src/components/common/VnBtnSelect.vue
@@ -14,6 +14,7 @@ defineProps({
             hide-dropdown-icon
             focus-on-mount
             @update:model-value="promise"
+            data-cy="vnBtnSelect_select"
         />
     </QBtnDropdown>
 </template>
diff --git a/src/components/common/VnModule.vue b/src/components/common/VnModule.vue
index 505b3a8b56e..038ee1d60b2 100644
--- a/src/components/common/VnModule.vue
+++ b/src/components/common/VnModule.vue
@@ -20,16 +20,15 @@ const hasContent = ref();
 let observer;
 
 onMounted(() => {
-    if (teleportRef.value) {
-        const checkContent = () => {
-            hasContent.value = teleportRef.value.innerHTML.trim() !== '';
-        };
+    if (!teleportRef.value) return;
+    const checkContent = () => {
+        hasContent.value = teleportRef.value?.innerHTML?.trim() !== '';
+    };
 
-        observer = new MutationObserver(checkContent);
-        observer.observe(teleportRef.value, { childList: true, subtree: true });
+    observer = new MutationObserver(checkContent);
+    observer.observe(teleportRef.value, { childList: true, subtree: true });
 
-        checkContent();
-    }
+    checkContent();
 });
 </script>
 
diff --git a/test/cypress/integration/ticket/ticketExpedition.spec.js b/test/cypress/integration/ticket/ticketExpedition.spec.js
index d4afd401f9a..d74a122a1dc 100644
--- a/test/cypress/integration/ticket/ticketExpedition.spec.js
+++ b/test/cypress/integration/ticket/ticketExpedition.spec.js
@@ -16,7 +16,9 @@ describe('Ticket expedtion', () => {
 
         cy.wait('@show');
         cy.selectRows([1, 2]);
-        cy.selectOption('[data-cy="change-state"]', 'Perdida');
+
+        cy.dataCy('change-state').click();
+        cy.selectOption('[data-cy="vnBtnSelect_select"]', 'Perdida');
         cy.wait('@add');
 
         cy.get(`${tableContent} tr:nth-child(-n+2) ${stateTd}`).each(($el) => {
diff --git a/test/cypress/integration/vnComponent/VnBreadcrumbs.spec.js b/test/cypress/integration/vnComponent/VnBreadcrumbs.spec.js
index e996a65d5fa..9e6553ca6ef 100644
--- a/test/cypress/integration/vnComponent/VnBreadcrumbs.spec.js
+++ b/test/cypress/integration/vnComponent/VnBreadcrumbs.spec.js
@@ -16,6 +16,7 @@ describe('VnBreadcrumbs', () => {
         cy.visit('#/customer/list');
         cy.get('.q-breadcrumbs__el').should('have.length', 2);
 
+        cy.writeSearchbar('{enter}');
         cy.get(firstCard).click();
         cy.get(`${lastBreadcrumb} > .q-icon`).should('have.text', 'launch');
     });

From d23e077af080e60dbbc0937c00028be198a3ebe8 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 7 Jan 2025 07:15:40 +0100
Subject: [PATCH 7/7] fix: refs #8197 mapKey

---
 src/components/common/VnDmsList.vue | 1 -
 src/composables/useArrayData.js     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 3a143cb524e..ed3cadc6bd7 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -297,7 +297,6 @@ defineExpose({
         ref="dmsRef"
         :data-key="$props.model"
         :url="$props.model"
-        map-key="dmsFk"
         :user-filter="dmsFilter"
         :order="['dmsFk DESC']"
         :auto-load="true"
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 720a1ec88f4..fd6e3a9b305 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -303,7 +303,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             for (const row of data) {
                 const key = row[store.mapKey];
                 const val = { ...row, key };
-                if (store.map.has(key)) {
+                if (key && store.map.has(key)) {
                     const { position } = store.map.get(key);
                     val.position = position;
                     store.map.set(key, val);