From 789dffe2e21e88ed05109542ffd7735cafc5078b Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 19 Jun 2024 12:05:21 +0200
Subject: [PATCH 01/17] refs #6898 vntable, traductions

---
 src/i18n/locale/en.yml              |   8 ++
 src/i18n/locale/es.yml              |   8 ++
 src/pages/Supplier/SupplierList.vue | 141 +++++++++++++++-------------
 3 files changed, 90 insertions(+), 67 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 4e7d7bb8a..f740ba9e0 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1015,6 +1015,14 @@ supplier:
         payDay: Pay day
         account: Account
         newSupplier: New supplier
+        tableVisibleColumns:
+            id: Id
+            name: Name
+            nif: NIF/CIF
+            nickname: Alias
+            account: Account
+            payMethod: Pay Method
+            payDay: Pay Day
     summary:
         responsible: Responsible
         notes: Notes
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 68ffc4e5b..bf3b60ffc 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1000,6 +1000,14 @@ supplier:
         payDay: Día de pago
         account: Cuenta
         newSupplier: Nuevo proveedor
+        tableVisibleColumns:
+            id: Id
+            name: Nombre
+            nif: NIF/CIF
+            nickname: Alias
+            account: Cuenta
+            payMethod: Método de pago
+            payDay: Dia de pago
     summary:
         responsible: Responsable
         notes: Notas
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index d53781a38..9491a938b 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -1,85 +1,92 @@
 <script setup>
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import CardList from 'src/components/ui/CardList.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import SupplierSummary from './Card/SupplierSummary.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
 import SupplierListFilter from './SupplierListFilter.vue';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
 
-const router = useRouter();
 const { t } = useI18n();
-const { viewSummary } = useSummaryDialog();
 
-function navigate(id) {
-    router.push({ path: `/supplier/${id}` });
-}
-
-const redirectToCreateView = () => {
-    router.push({ name: 'SupplierCreate' });
-};
+const columns = computed(() => [
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.id'),
+        name: 'id',
+        isTitle: true,
+    },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.name'),
+        name: 'name',
+        create: true,
+        component: 'input',
+    },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.nif'),
+        name: 'nif',
+        create: true,
+        component: 'input',
+    },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.nickname'),
+        name: 'nickname',
+        create: true,
+        component: 'input',
+    },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.account'),
+        name: 'account',
+        create: true,
+        component: 'input',
+    },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.payMethod'),
+        name: 'payMethodFk',
+        create: true,
+        component: 'select',
+        attrs: {
+            url: 'payMethods',
+            fields: ['id', 'name'],
+        },
+    },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.payDay'),
+        name: 'payDat',
+        create: true,
+        component: 'input',
+    },
+]);
 </script>
 
 <template>
-    <VnSearchbar data-key="SuppliersList" :limit="20" :label="t('Search suppliers')" />
     <RightMenu>
         <template #right-panel>
             <SupplierListFilter data-key="SuppliersList" />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate data-key="SuppliersList" url="Suppliers/filter">
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :title="row.socialName"
-                        :id="row.id"
-                        @click="navigate(row.id)"
-                    >
-                        <template #list-items>
-                            <VnLv label="NIF/CIF" :value="row.nif" />
-                            <VnLv label="Alias" :value="row.alias" />
-                            <VnLv
-                                :label="t('supplier.list.payMethod')"
-                                :value="row.payMethod"
-                            />
-                            <VnLv
-                                :label="t('supplier.list.payDeadline')"
-                                :title-label="t('invoiceOut.list.created')"
-                                :value="row.payDem"
-                            />
-                            <VnLv
-                                :label="t('supplier.list.payDay')"
-                                :value="row.payDay"
-                            />
-                            <VnLv
-                                :label="t('supplier.list.account')"
-                                :value="row.account"
-                            />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, SupplierSummary)"
-                                color="primary"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky :offset="[20, 20]">
-            <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
-            <QTooltip>
-                {{ t('supplier.list.newSupplier') }}
-            </QTooltip>
-        </QPageSticky>
-    </QPage>
+    <VnTable
+        ref="SuppliersRef"
+        data-key="SuppliersList"
+        :url="`Suppliers`"
+        save-url="Suppliers/crud"
+        :create="{
+            urlCreate: 'suppliers',
+            title: t('Create Supplier'),
+            onDataSaved: () => tableRef.reload(),
+        }"
+        order="id ASC"
+        :columns="columns"
+        default-mode="table"
+        auto-load
+        :right-search="false"
+        :is-editable="true"
+        :use-model="true"
+    />
 </template>
 
 <i18n>

From a803250cb913e1a821ff6a1bb2eb230ee20ecf88 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 19 Jun 2024 13:01:31 +0200
Subject: [PATCH 02/17] refs #6898 fix create

---
 src/pages/Supplier/SupplierList.vue | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index 9491a938b..89ab12a67 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -1,11 +1,12 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
-import SupplierListFilter from './SupplierListFilter.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import SupplierListFilter from './SupplierListFilter.vue';
 
 const { t } = useI18n();
+const tableRef = ref();
 
 const columns = computed(() => [
     {
@@ -25,28 +26,24 @@ const columns = computed(() => [
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.nif'),
         name: 'nif',
-        create: true,
         component: 'input',
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.nickname'),
         name: 'nickname',
-        create: true,
         component: 'input',
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.account'),
         name: 'account',
-        create: true,
         component: 'input',
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.payMethod'),
         name: 'payMethodFk',
-        create: true,
         component: 'select',
         attrs: {
             url: 'payMethods',
@@ -57,34 +54,34 @@ const columns = computed(() => [
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.payDay'),
         name: 'payDat',
-        create: true,
         component: 'input',
     },
 ]);
 </script>
 
 <template>
-    <RightMenu>
+    <!-- <RightMenu>
         <template #right-panel>
             <SupplierListFilter data-key="SuppliersList" />
         </template>
-    </RightMenu>
+    </RightMenu> -->
     <VnTable
-        ref="SuppliersRef"
+        ref="tableRef"
         data-key="SuppliersList"
         :url="`Suppliers`"
         save-url="Suppliers/crud"
+        redirect="supplier"
         :create="{
-            urlCreate: 'suppliers',
+            urlCreate: 'Suppliers/newSupplier',
             title: t('Create Supplier'),
-            onDataSaved: () => tableRef.reload(),
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {},
         }"
         order="id ASC"
         :columns="columns"
         default-mode="table"
         auto-load
         :right-search="false"
-        :is-editable="true"
         :use-model="true"
     />
 </template>

From 9956561e4c907a39d7199646c05dc4e34555bf58 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 24 Jun 2024 16:17:21 +0200
Subject: [PATCH 03/17] chore: refs #7300 wip: create reset function

---
 src/composables/useArrayData.js |  5 ++++
 src/stores/useArrayDataStore.js | 41 +++++++++++++++++++++------------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index f97ade7bf..385cb6045 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -130,6 +130,10 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         delete store[option];
     }
 
+    function reset(opts = []) {
+        if (arrayDataStore.get(key)) arrayDataStore.reset(key, opts);
+    }
+
     function cancelRequest() {
         if (canceller) {
             canceller.abort();
@@ -245,5 +249,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         updateStateParams,
         isLoading,
         deleteOption,
+        reset,
     };
 }
diff --git a/src/stores/useArrayDataStore.js b/src/stores/useArrayDataStore.js
index ebe32f8d0..0fe16d075 100644
--- a/src/stores/useArrayDataStore.js
+++ b/src/stores/useArrayDataStore.js
@@ -3,36 +3,47 @@ import { defineStore } from 'pinia';
 
 export const useArrayDataStore = defineStore('arrayDataStore', () => {
     const state = ref({});
+    const defaultOpts = {
+        filter: {},
+        userFilter: {},
+        userParams: {},
+        url: '',
+        limit: 10,
+        skip: 0,
+        order: '',
+        data: ref(),
+        isLoading: false,
+        userParamsChanged: false,
+        exprBuilder: null,
+        searchUrl: 'params',
+        navigate: null,
+    };
 
     function get(key) {
         return state.value[key];
     }
 
     function set(key) {
-        state.value[key] = {
-            filter: {},
-            userFilter: {},
-            userParams: {},
-            url: '',
-            limit: 10,
-            skip: 0,
-            order: '',
-            data: ref(),
-            isLoading: false,
-            userParamsChanged: false,
-            exprBuilder: null,
-            searchUrl: 'params',
-            navigate: null,
-        };
+        state.value[key] = defaultOpts;
     }
 
     function clear(key) {
         delete state.value[key];
     }
 
+    function reset(key, opts = []) {
+        let obj = state.value[key];
+        if (!opts.length) obj = defaultOpts;
+        else
+            for (const opt in opts) {
+                if (Object.hasOwn(obj, opt)) obj[opt] = defaultOpts[opt];
+            }
+    }
+
     return {
         get,
         set,
         clear,
+        reset,
     };
 });

From def8d4222ba886cab30bc7764ecc554d063db958 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 26 Jun 2024 11:33:02 +0200
Subject: [PATCH 04/17] refs #6898 fix warnings

---
 src/pages/Supplier/SupplierList.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index 89ab12a67..0d60e7219 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -2,8 +2,6 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import SupplierListFilter from './SupplierListFilter.vue';
 
 const { t } = useI18n();
 const tableRef = ref();

From efa8791b9d79eeb725e89e4ed3400cca998fcd5f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 26 Jun 2024 11:40:59 +0200
Subject: [PATCH 05/17] refs #6898 remove comment

---
 src/pages/Supplier/SupplierList.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index 0d60e7219..efb86b4bb 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -58,11 +58,6 @@ const columns = computed(() => [
 </script>
 
 <template>
-    <!-- <RightMenu>
-        <template #right-panel>
-            <SupplierListFilter data-key="SuppliersList" />
-        </template>
-    </RightMenu> -->
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"

From d0038d7e61a0b001664b7ae2cb5506f629dbb55a Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 27 Jun 2024 10:45:37 +0200
Subject: [PATCH 06/17] fix: refs #6943 removes duplicate toggle menu & fix
 loading animation

---
 src/pages/Customer/Card/CustomerGreuges.vue | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 0dcb3a3a9..eb35a8bdf 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -108,26 +108,9 @@ const setRows = (data) => {
 
 <template>
     <FetchData :filter="filter" @on-fetch="setRows" auto-load url="greuges" />
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="300" show-if-above>
         <QCard class="full-width q-pa-sm">
-            <h6 class="flex justify-end q-my-lg q-pr-lg" v-if="totalAmount">
+            <h6 class="flex justify-end q-my-lg q-pr-lg" v-if="totalAmount >= 0">
                 <span class="color-vn-label q-mr-md">{{ t('Total') }}:</span>
                 {{ toCurrency(totalAmount) }}
             </h6>

From d3f119fa048ded4b2d2223062cce7d9d2683bef6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 27 Jun 2024 10:48:55 +0200
Subject: [PATCH 07/17] chore:  refs #6943 check if exists

---
 src/pages/Customer/Card/CustomerGreuges.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index eb35a8bdf..e793d066b 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -75,7 +75,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        field: (value) => value.user.name,
+        field: (value) => value?.user?.name,
         label: t('Created by'),
         name: 'createdBy',
     },
@@ -87,7 +87,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        field: (value) => value.greugeType.name,
+        field: (value) => value?.greugeType?.name,
         label: t('Type'),
         name: 'type',
     },

From ffdcb285225231571771b5b99eafae7d684df530 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 28 Jun 2024 11:17:42 +0200
Subject: [PATCH 08/17] refactor: refs #6943 initialize totalAmount as
 undefined

---
 src/pages/Customer/Card/CustomerGreuges.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index e793d066b..8cca2ef23 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -13,7 +13,7 @@ const { t } = useI18n();
 const route = useRoute();
 const stateStore = computed(() => useStateStore());
 const rows = ref([]);
-const totalAmount = ref(0);
+const totalAmount = ref();
 
 const filter = {
     include: [
@@ -110,7 +110,7 @@ const setRows = (data) => {
     <FetchData :filter="filter" @on-fetch="setRows" auto-load url="greuges" />
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="300" show-if-above>
         <QCard class="full-width q-pa-sm">
-            <h6 class="flex justify-end q-my-lg q-pr-lg" v-if="totalAmount >= 0">
+            <h6 class="flex justify-end q-my-lg q-pr-lg" v-if="totalAmount !== undefined">
                 <span class="color-vn-label q-mr-md">{{ t('Total') }}:</span>
                 {{ toCurrency(totalAmount) }}
             </h6>

From 95a3043359cc30e1f4d0f6b6f87aabf66d8f9aee Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 1 Jul 2024 13:16:25 +0200
Subject: [PATCH 09/17] refs #6898 fix colmns subtoolbar

---
 src/pages/Supplier/SupplierList.vue | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index efb86b4bb..9a135f1a5 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -2,6 +2,7 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
+import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -19,24 +20,36 @@ const columns = computed(() => [
         name: 'name',
         create: true,
         component: 'input',
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.nif'),
         name: 'nif',
         component: 'input',
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.nickname'),
         name: 'nickname',
         component: 'input',
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.account'),
         name: 'account',
         component: 'input',
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
@@ -47,17 +60,24 @@ const columns = computed(() => [
             url: 'payMethods',
             fields: ['id', 'name'],
         },
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.payDay'),
         name: 'payDat',
         component: 'input',
+        columnField: {
+            component: null,
+        },
     },
 ]);
 </script>
 
 <template>
+    <VnSubToolbar />
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"

From 56017645c24f51a4295e7575393db59817051fda Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 1 Jul 2024 13:20:55 +0200
Subject: [PATCH 10/17] refs #6898 fix search

---
 src/pages/Supplier/SupplierList.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index 9a135f1a5..d7ff17ca7 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -2,7 +2,8 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
-import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import RightMenu from 'components/common/RightMenu.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -77,7 +78,12 @@ const columns = computed(() => [
 </script>
 
 <template>
-    <VnSubToolbar />
+    <VnSearchbar data-key="SuppliersList" :limit="20" :label="t('Search suppliers')" />
+    <RightMenu>
+        <template #right-panel>
+            <SupplierListFilter data-key="SuppliersList" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"

From f4a77f5030d1dfbf677ebadb834beb533a6f9d96 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 1 Jul 2024 13:31:24 +0200
Subject: [PATCH 11/17] refs #6898 fix search datakey

---
 src/pages/Supplier/SupplierList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index d7ff17ca7..c2b63e1b9 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import RightMenu from 'components/common/RightMenu.vue';
+import SupplierListFilter from './SupplierListFilter.vue';
 
 const { t } = useI18n();
 const tableRef = ref();

From 352580270b7c9c8793520f8c06bc94d0fb46e874 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 3 Jul 2024 10:25:21 +0200
Subject: [PATCH 12/17] refs #6989 fix reload

---
 src/pages/Supplier/Card/SupplierSummary.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index d007ad08f..9337724b0 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -9,8 +9,6 @@ import { dashIfEmpty } from 'src/filters';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 
-onUpdated(() => summaryRef.value.fetch());
-
 const route = useRoute();
 const roleState = useRole();
 const { t } = useI18n();

From 109544f475194b4b818f13ba03c9fbcce3406f43 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 3 Jul 2024 13:18:17 +0200
Subject: [PATCH 13/17] fix searchbar

---
 src/pages/Supplier/SupplierList.vue | 2 +-
 src/pages/Travel/TravelList.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index c2b63e1b9..b8a6f7a92 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -88,7 +88,7 @@ const columns = computed(() => [
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"
-        :url="`Suppliers`"
+        :url="`Suppliers/filter`"
         save-url="Suppliers/crud"
         redirect="supplier"
         :create="{
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 78844d4b6..12a5fafa5 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -182,7 +182,7 @@ const columns = computed(() => [
     <VnTable
         ref="tableRef"
         data-key="TravelList"
-        url="Travels"
+        url="Travels/filter"
         :create="{
             urlCreate: 'Travels',
             title: t('Create Travels'),

From 161ebdc88ad1e197b3379a22580a86ef33008c8a Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 3 Jul 2024 13:44:13 +0200
Subject: [PATCH 14/17] refs #6898  fix

---
 src/pages/Supplier/SupplierList.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index b8a6f7a92..ce7d234c8 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -19,7 +19,7 @@ const columns = computed(() => [
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.name'),
-        name: 'name',
+        name: 'socialName',
         create: true,
         component: 'input',
         columnField: {
@@ -38,7 +38,7 @@ const columns = computed(() => [
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.nickname'),
-        name: 'nickname',
+        name: 'alias',
         component: 'input',
         columnField: {
             component: null,
@@ -56,7 +56,7 @@ const columns = computed(() => [
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.payMethod'),
-        name: 'payMethodFk',
+        name: 'payMethod',
         component: 'select',
         attrs: {
             url: 'payMethods',
@@ -88,7 +88,7 @@ const columns = computed(() => [
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"
-        :url="`Suppliers/filter`"
+        url="Suppliers/filter"
         save-url="Suppliers/crud"
         redirect="supplier"
         :create="{

From 218cc47834eedff76ac444cd19fa5eed72bc3c75 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 3 Jul 2024 13:44:35 +0200
Subject: [PATCH 15/17] fix: refs #6151 searchbar

---
 src/pages/Order/Card/OrderCard.vue   | 9 ++++++---
 src/pages/Travel/Card/TravelCard.vue | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index 12b61e913..5b6896656 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -2,6 +2,7 @@
 import VnCard from 'components/common/VnCard.vue';
 import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
 import OrderFilter from './OrderFilter.vue';
+import OrderSearchbar from './OrderSearchbar.vue';
 </script>
 <template>
     <VnCard
@@ -10,7 +11,9 @@ import OrderFilter from './OrderFilter.vue';
         :descriptor="OrderDescriptor"
         :filter-panel="OrderFilter"
         search-data-key="OrderList"
-        searchbar-label="Search order"
-        searchbar-info="ypu can search by order id or name"
-    />
+    >
+        <template #searchbar>
+            <OrderSearchbar />
+        </template>
+    </VnCard>
 </template>
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index a3c1430e9..b87d2b9cc 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -37,7 +37,7 @@ const filter = {
         search-data-key="TravelList"
         searchbar-label="Search travel"
         searchbar-info="You can search by travel id or name"
-        search-url="Travels"
+        search-url="Travels/filter"
         :filter="filter"
         :descriptor="TravelDescriptor"
     />

From 95f488ba7666d37ea683667243af7ecb13f5572d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 3 Jul 2024 13:47:33 +0200
Subject: [PATCH 16/17] chore: refs #6151 rollback

---
 src/pages/Travel/Card/TravelCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index b87d2b9cc..a3c1430e9 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -37,7 +37,7 @@ const filter = {
         search-data-key="TravelList"
         searchbar-label="Search travel"
         searchbar-info="You can search by travel id or name"
-        search-url="Travels/filter"
+        search-url="Travels"
         :filter="filter"
         :descriptor="TravelDescriptor"
     />

From c2333c9455b90395ac09d956ec901f0821b27724 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 3 Jul 2024 17:53:37 +0200
Subject: [PATCH 17/17] chore: refs #7300 reset arrayData

---
 src/components/ui/VnFilterPanel.vue |  8 ++------
 src/components/ui/VnPaginate.vue    |  7 ++++---
 src/components/ui/VnSearchbar.vue   |  3 +--
 src/composables/useArrayData.js     |  9 ++++-----
 src/stores/useArrayDataStore.js     | 23 ++++++++++++++++-------
 5 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 5595d54ba..2ea51ed8b 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -112,9 +112,7 @@ async function search(evt) {
     isLoading.value = true;
     const filter = { ...userParams.value };
     store.userParamsChanged = true;
-    store.filter.skip = 0;
-    store.skip = 0;
-    store.page = 1;
+    arrayData.reset(['skip', 'filter.skip', 'page']);
     const { params: newParams } = await arrayData.addFilter({ params: userParams.value });
     userParams.value = newParams;
 
@@ -138,9 +136,7 @@ async function reload() {
 async function clearFilters() {
     isLoading.value = true;
     store.userParamsChanged = true;
-    store.filter.skip = 0;
-    store.skip = 0;
-    store.page = 1;
+    arrayData.reset(['skip', 'filter.skip', 'page']);
     // Filtrar los params no removibles
     const removableFilters = Object.keys(userParams.value).filter((param) =>
         $props.unremovableParams.includes(param)
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 9a2c06b0c..8e426b471 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, watch } from 'vue';
+import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 
@@ -95,6 +95,8 @@ onMounted(async () => {
     mounted.value = true;
 });
 
+onBeforeUnmount(() => arrayData.reset());
+
 watch(
     () => props.data,
     () => {
@@ -118,8 +120,7 @@ const addFilter = async (filter, params) => {
 
 async function fetch(params) {
     useArrayData(props.dataKey, params);
-    store.filter.skip = 0;
-    store.skip = 0;
+    arrayData.reset(['filter.skip', 'skip']);
     await arrayData.fetch({ append: false });
     if (!store.hasMoreData) {
         isLoading.value = false;
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index eab04f04c..0c7a8a3f6 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -103,8 +103,7 @@ async function search() {
     const staticParams = Object.entries(store.userParams).filter(
         ([key, value]) => value && (props.staticParams || []).includes(key)
     );
-    store.skip = 0;
-    store.page = 1;
+    arrayData.reset(['skip', 'page']);
 
     if (props.makeFetch)
         await arrayData.applyFilter({
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index b4fa66498..8111bcae4 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -18,7 +18,8 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
     onMounted(() => {
         setOptions();
-        store.skip = 0;
+        arrayDataStore.reset(['skip']);
+
         const query = route.query;
         const searchUrl = store.searchUrl;
         if (query[searchUrl]) {
@@ -153,9 +154,8 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         userParams = sanitizerParams(userParams, store?.exprBuilder);
 
         store.userParams = userParams;
-        store.skip = 0;
-        store.filter.skip = 0;
-        store.page = 1;
+        arrayDataStore.reset(['skip', 'filter.skip', 'page']);
+
         await fetch({ append: false });
         return { filter, params };
     }
@@ -191,7 +191,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         store.page += 1;
 
         await fetch({ append: true });
-        updateStateParams();
     }
 
     async function refresh() {
diff --git a/src/stores/useArrayDataStore.js b/src/stores/useArrayDataStore.js
index 0fe16d075..ea029bc12 100644
--- a/src/stores/useArrayDataStore.js
+++ b/src/stores/useArrayDataStore.js
@@ -11,12 +11,12 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
         limit: 10,
         skip: 0,
         order: '',
-        data: ref(),
         isLoading: false,
         userParamsChanged: false,
         exprBuilder: null,
         searchUrl: 'params',
         navigate: null,
+        page: 1,
     };
 
     function get(key) {
@@ -24,7 +24,7 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
     }
 
     function set(key) {
-        state.value[key] = defaultOpts;
+        state.value[key] = getDefaultState();
     }
 
     function clear(key) {
@@ -32,12 +32,21 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
     }
 
     function reset(key, opts = []) {
-        let obj = state.value[key];
-        if (!opts.length) obj = defaultOpts;
+        if (!opts.length) state.value[key] = getDefaultState();
         else
-            for (const opt in opts) {
-                if (Object.hasOwn(obj, opt)) obj[opt] = defaultOpts[opt];
-            }
+            opts.forEach((opt) => {
+                if (opt.includes('.')) {
+                    const [parent, child] = opt.split('.');
+                    state.value[key][parent][child] = defaultOpts[child];
+                } else if (Object.hasOwn(state.value[key], opt))
+                    state.value[key][opt] = defaultOpts[opt];
+            });
+    }
+
+    function getDefaultState() {
+        return Object.assign(JSON.parse(JSON.stringify(defaultOpts)), {
+            data: ref(),
+        });
     }
 
     return {