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 1/5] 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 d0038d7e61a0b001664b7ae2cb5506f629dbb55a Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 27 Jun 2024 10:45:37 +0200
Subject: [PATCH 2/5] 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 3/5] 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 4/5] 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 c2333c9455b90395ac09d956ec901f0821b27724 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 3 Jul 2024 17:53:37 +0200
Subject: [PATCH 5/5] 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 {