From 94c7ee3ae3afa39043c8e058695043c4a756a47f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Nov 2024 10:36:42 +0100
Subject: [PATCH] fix: arrayData store shared

---
 src/components/CrudModel.vue                   | 2 +-
 src/components/VnTable/VnFilter.vue            | 2 +-
 src/components/VnTable/VnOrder.vue             | 2 +-
 src/components/ui/VnFilterPanel.vue            | 2 +-
 src/components/ui/VnPaginate.vue               | 9 ++++++---
 src/components/ui/VnSearchbar.vue              | 2 +-
 src/composables/useArrayData.js                | 2 +-
 src/pages/Account/AccountList.vue              | 6 +++---
 src/pages/Account/Role/AccountRoles.vue        | 4 ++--
 src/pages/Account/Role/Card/RoleCard.vue       | 2 +-
 src/pages/Claim/ClaimFilter.vue                | 2 +-
 src/pages/Customer/CustomerFilter.vue          | 2 +-
 src/pages/Customer/CustomerList.vue            | 6 +++---
 src/pages/InvoiceIn/InvoiceInList.vue          | 2 +-
 src/pages/InvoiceOut/InvoiceOutList.vue        | 6 +++---
 src/pages/Ticket/Card/TicketDescriptorMenu.vue | 1 -
 src/pages/Ticket/TicketFilter.vue              | 2 +-
 src/pages/Ticket/TicketList.vue                | 6 +++---
 src/pages/Travel/TravelFilter.vue              | 2 +-
 src/pages/Worker/Card/WorkerCard.vue           | 1 +
 src/pages/Worker/WorkerList.vue                | 6 +++---
 src/pages/Zone/Card/ZoneSearchbar.vue          | 2 +-
 src/pages/Zone/ZoneFilterPanel.vue             | 1 -
 src/pages/Zone/ZoneList.vue                    | 4 ++--
 src/stores/useArrayDataStore.js                | 2 +-
 25 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index a4cb55a2c..0de5d3aa2 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -77,7 +77,7 @@ const isLoading = ref(false);
 const hasChanges = ref(false);
 const originalData = ref();
 const vnPaginateRef = ref();
-const formData = ref();
+const formData = ref([]);
 const saveButtonRef = ref(null);
 const watchChanges = ref();
 const formUrl = computed(() => $props.url);
diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index 9da0b26a4..86802ee92 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -25,7 +25,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'params',
+        default: 'table',
     },
 });
 
diff --git a/src/components/VnTable/VnOrder.vue b/src/components/VnTable/VnOrder.vue
index 7fdd23b78..8ffdfe2bc 100644
--- a/src/components/VnTable/VnOrder.vue
+++ b/src/components/VnTable/VnOrder.vue
@@ -17,7 +17,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'params',
+        default: 'table',
     },
     vertical: {
         type: Boolean,
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 43d634ad9..1ed1194ea 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -49,7 +49,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'params',
+        default: 'table',
     },
     redirect: {
         type: Boolean,
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 80c607214..f5519eb01 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -44,7 +44,7 @@ const props = defineProps({
     },
     limit: {
         type: Number,
-        default: 10,
+        default: 20,
     },
     userParams: {
         type: Object,
@@ -100,7 +100,7 @@ const arrayData = useArrayData(props.dataKey, {
 const store = arrayData.store;
 
 onMounted(async () => {
-    if (props.autoLoad) await fetch();
+    if (props.autoLoad && !store.data?.length) await fetch();
     mounted.value = true;
 });
 
@@ -115,7 +115,10 @@ watch(
 
 watch(
     () => store.data,
-    (data) => emit('onChange', data)
+    (data) => {
+        emit('onChange', data);
+    },
+    { immediate: true }
 );
 
 watch(
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index dc6d4751c..da2d370fe 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -45,7 +45,7 @@ const props = defineProps({
     },
     limit: {
         type: Number,
-        default: 10,
+        default: 20,
     },
     userParams: {
         type: Object,
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 30bcac66b..7fa494349 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -269,7 +269,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
                 const pushUrl = { path: to };
                 if (to.endsWith('/list') || to.endsWith('/'))
                     pushUrl.query = newUrl.query;
-                destroy();
+                else destroy();
                 return router.push(pushUrl);
             }
         }
diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index 72c445fa9..9e750e1cb 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -104,7 +104,7 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="AccountUsers"
+        data-key="AccountList"
         :expr-builder="exprBuilder"
         :label="t('account.search')"
         :info="t('account.searchInfo')"
@@ -112,12 +112,12 @@ const exprBuilder = (param, value) => {
     />
     <RightMenu>
         <template #right-panel>
-            <AccountFilter data-key="AccountUsers" />
+            <AccountFilter data-key="AccountList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="AccountUsers"
+        data-key="AccountList"
         url="VnUsers/preview"
         :filter="filter"
         order="id DESC"
diff --git a/src/pages/Account/Role/AccountRoles.vue b/src/pages/Account/Role/AccountRoles.vue
index ea175d913..1f3c9ee5a 100644
--- a/src/pages/Account/Role/AccountRoles.vue
+++ b/src/pages/Account/Role/AccountRoles.vue
@@ -82,14 +82,14 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="Roles"
+        data-key="AccountRolesList"
         :expr-builder="exprBuilder"
         :label="t('role.searchRoles')"
         :info="t('role.searchInfo')"
     />
     <VnTable
         ref="tableRef"
-        data-key="Roles"
+        data-key="AccountRolesList"
         :url="`VnRoles`"
         :create="{
             urlCreate: 'VnRoles',
diff --git a/src/pages/Account/Role/Card/RoleCard.vue b/src/pages/Account/Role/Card/RoleCard.vue
index 35f9a1f27..a2d5710f4 100644
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ b/src/pages/Account/Role/Card/RoleCard.vue
@@ -9,7 +9,7 @@ const { t } = useI18n();
     <VnCard
         data-key="Role"
         :descriptor="RoleDescriptor"
-        search-data-key="AccountRoles"
+        search-data-key="AccountRolesList"
         :searchbar-props="{
             url: 'VnRoles',
             label: t('role.searchRoles'),
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index dc25fe4a0..f7e2ffbf6 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -23,7 +23,7 @@ defineExpose({ states });
 
 <template>
     <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 6c50cc9df..479d3e7ab 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -14,7 +14,7 @@ defineProps({
 </script>
 
 <template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 63f5149e8..55065cdcc 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -395,16 +395,16 @@ function handleLocation(data, location) {
     <VnSearchbar
         :info="t('You can search by customer id or name')"
         :label="t('Search customer')"
-        data-key="Customer"
+        data-key="CustomerList"
     />
     <RightMenu>
         <template #right-panel>
-            <CustomerFilter data-key="Customer" />
+            <CustomerFilter data-key="CustomerList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Customer"
+        data-key="CustomerList"
         url="Clients/filter"
         :create="{
             urlCreate: 'Clients/createWithUser',
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 265f95b0e..c77113d2b 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -122,7 +122,7 @@ const cols = computed(() => [
         :columns="cols"
         :right-search="false"
         :disable-option="{ card: true }"
-        :auto-load="!!$route.query.params"
+        :auto-load="!!$route.query.table"
     >
         <template #column-supplierFk="{ row }">
             <span class="link" @click.stop>
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 91477e1a4..f1b4902f2 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -182,11 +182,11 @@ watchEffect(selectedRows);
     <VnSearchbar
         :info="t('youCanSearchByInvoiceReference')"
         :label="t('searchInvoice')"
-        data-key="invoiceOut"
+        data-key="invoiceOutList"
     />
     <RightMenu>
         <template #right-panel>
-            <InvoiceOutFilter data-key="invoiceOut" />
+            <InvoiceOutFilter data-key="invoiceOutList" />
         </template>
     </RightMenu>
     <VnSubToolbar>
@@ -203,7 +203,7 @@ watchEffect(selectedRows);
     </VnSubToolbar>
     <VnTable
         ref="tableRef"
-        data-key="invoiceOut"
+        data-key="invoiceOutList"
         :url="`${MODEL}/filter`"
         :create="{
             urlCreate: 'InvoiceOuts/createManualInvoice',
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 834fced87..bf4a1efb4 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -348,7 +348,6 @@ async function hasDocuware() {
 }
 
 async function uploadDocuware(force) {
-    console.log('force: ', force);
     if (!force)
         return quasar
             .dialog({
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 7f72f9862..6f1cac83b 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -47,7 +47,7 @@ const getGroupedStates = (data) => {
     />
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
     <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index c8687ed5f..1c1fa78d4 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -455,18 +455,18 @@ function setReference(data) {
         auto-load
     />
     <VnSearchbar
-        data-key="Ticket"
+        data-key="TicketList"
         :label="t('Search ticket')"
         :info="t('You can search by ticket id or alias')"
     />
     <RightMenu>
         <template #right-panel>
-            <TicketFilter data-key="Ticket" />
+            <TicketFilter data-key="TicketList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Ticket"
+        data-key="TicketList"
         url="Tickets/filter"
         :create="{
             urlCreate: 'Tickets/new',
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index c91146257..1ac83b9e0 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -24,7 +24,7 @@ defineExpose({ states });
 
 <template>
     <FetchData url="warehouses" @on-fetch="(data) => (states = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 5f9fa0f8e..e17ea6503 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -14,6 +14,7 @@ import WorkerFilter from '../WorkerFilter.vue';
             url: 'Workers/filter',
             label: 'Search worker',
             info: 'You can search by worker id or name',
+            order: 'id DESC',
         }"
         :redirect-on-error="true"
     />
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 7a3f760bc..022cecdc6 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -169,7 +169,7 @@ async function autofillBic(worker) {
 </script>
 <template>
     <VnSearchbar
-        data-key="Worker"
+        data-key="WorkerList"
         :label="t('Search worker')"
         :info="t('You can search by worker id or name')"
     />
@@ -191,13 +191,13 @@ async function autofillBic(worker) {
     />
     <RightMenu>
         <template #right-panel>
-            <WorkerFilter data-key="Worker" />
+            <WorkerFilter data-key="WorkerList" />
         </template>
     </RightMenu>
     <VnTable
         v-if="defaultPayMethod"
         ref="tableRef"
-        data-key="Worker"
+        data-key="WorkerList"
         url="Workers/filter"
         :create="{
             urlCreate: 'Workers/new',
diff --git a/src/pages/Zone/Card/ZoneSearchbar.vue b/src/pages/Zone/Card/ZoneSearchbar.vue
index 06168eb62..f7a59e97f 100644
--- a/src/pages/Zone/Card/ZoneSearchbar.vue
+++ b/src/pages/Zone/Card/ZoneSearchbar.vue
@@ -26,7 +26,7 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="Zones"
+        data-key="ZonesList"
         url="Zones"
         :filter="{
             include: { relation: 'agencyMode', scope: { fields: ['name'] } },
diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index 98bfd35ed..1213f7515 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -32,7 +32,6 @@ const agencies = ref([]);
         :data-key="props.dataKey"
         :search-button="true"
         :hidden-tags="['search']"
-        search-url="table"
     >
         <template #tags="{ tag }">
             <div class="q-gutter-x-xs">
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index b01f8b7e7..158d985d2 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -139,12 +139,12 @@ onMounted(() => (stateStore.rightDrawer = true));
     <ZoneSearchbar />
     <RightMenu>
         <template #right-panel>
-            <ZoneFilterPanel data-key="Zones" />
+            <ZoneFilterPanel data-key="ZonesList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Zones"
+        data-key="ZonesList"
         url="Zones"
         :create="{
             urlCreate: 'Zones',
diff --git a/src/stores/useArrayDataStore.js b/src/stores/useArrayDataStore.js
index ea029bc12..6a0e7dfa8 100644
--- a/src/stores/useArrayDataStore.js
+++ b/src/stores/useArrayDataStore.js
@@ -8,7 +8,7 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
         userFilter: {},
         userParams: {},
         url: '',
-        limit: 10,
+        limit: 20,
         skip: 0,
         order: '',
         isLoading: false,