From c638209f0ea1d2a9128afca5e70afb69c6cd7683 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 19 Apr 2024 14:39:20 +0200
Subject: [PATCH 1/7] fix: hasMoreData

---
 src/components/ui/VnPaginate.vue | 21 ++++++++++++---------
 src/composables/useArrayData.js  |  3 +--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index f516f473d..489861ef4 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 { onMounted, ref, watch, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 
@@ -77,7 +77,7 @@ const arrayData = useArrayData(props.dataKey, {
     userParams: props.userParams,
     exprBuilder: props.exprBuilder,
 });
-const hasMoreData = ref();
+const hasMoreData = computed(() => arrayData.hasMoreData);
 const store = arrayData.store;
 
 onMounted(() => {
@@ -97,7 +97,7 @@ const addFilter = async (filter, params) => {
 
 async function fetch() {
     await arrayData.fetch({ append: false });
-    if (!arrayData.hasMoreData.value) {
+    if (!hasMoreData.value) {
         isLoading.value = false;
     }
     emit('onFetch', store.data);
@@ -110,8 +110,8 @@ async function paginate() {
 
     isLoading.value = true;
     await arrayData.loadMore();
-    if (!arrayData.hasMoreData.value) {
-        if (store.userParamsChanged) arrayData.hasMoreData.value = true;
+    if (!hasMoreData.value) {
+        if (store.userParamsChanged) hasMoreData.value = true;
         store.userParamsChanged = false;
         endPagination();
         return;
@@ -142,7 +142,7 @@ async function onLoad(index, done) {
 
     await paginate();
     let isDone = false;
-    if (store.userParamsChanged) isDone = !arrayData.hasMoreData.value;
+    if (store.userParamsChanged) isDone = !hasMoreData.value;
     done(isDone);
 }
 
@@ -182,12 +182,12 @@ defineExpose({ fetch, addFilter });
             </QCard>
         </div>
     </div>
-    
+
     <QInfiniteScroll
         v-if="store.data"
         @load="onLoad"
         :offset="offset"
-        :disable="disableInfiniteScroll || !arrayData.hasMoreData"
+        :disable="disableInfiniteScroll || !hasMoreData.value"
         class="full-width"
         v-bind="$attrs"
     >
@@ -196,7 +196,10 @@ defineExpose({ fetch, addFilter });
             <QSpinner color="orange" size="md" />
         </div>
     </QInfiniteScroll>
-    <div v-if="!isLoading && hasMoreData" class="w-full flex justify-center q-mt-md">
+    <div
+        v-if="!isLoading && hasMoreData.value"
+        class="w-full flex justify-center q-mt-md"
+    >
         <QBtn color="primary" :label="t('Load more data')" @click="paginate()" />
     </div>
 </template>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 998ee0576..128fe2db1 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -97,7 +97,6 @@ export function useArrayData(key, userOptions) {
 
         const { limit } = filter;
         hasMoreData.value = limit && response.data.length >= limit;
-        store.hasMoreData = hasMoreData.value;
 
         if (append) {
             if (!store.data) store.data = [];
@@ -169,7 +168,7 @@ export function useArrayData(key, userOptions) {
     }
 
     async function loadMore() {
-        if (!hasMoreData.value && !store.hasMoreData) return;
+        if (!hasMoreData.value) return;
 
         store.skip = store.limit * page.value;
         page.value += 1;

From ae2737673db7e18d1f56bf02747236787feaa022 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 19 Apr 2024 14:43:38 +0200
Subject: [PATCH 2/7] fix: hasMoreData

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

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 489861ef4..86918e545 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, watch, computed } from 'vue';
+import { onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 
@@ -77,7 +77,6 @@ const arrayData = useArrayData(props.dataKey, {
     userParams: props.userParams,
     exprBuilder: props.exprBuilder,
 });
-const hasMoreData = computed(() => arrayData.hasMoreData);
 const store = arrayData.store;
 
 onMounted(() => {
@@ -97,7 +96,7 @@ const addFilter = async (filter, params) => {
 
 async function fetch() {
     await arrayData.fetch({ append: false });
-    if (!hasMoreData.value) {
+    if (!arrayData.hasMoreData.value) {
         isLoading.value = false;
     }
     emit('onFetch', store.data);
@@ -110,8 +109,8 @@ async function paginate() {
 
     isLoading.value = true;
     await arrayData.loadMore();
-    if (!hasMoreData.value) {
-        if (store.userParamsChanged) hasMoreData.value = true;
+    if (!arrayData.hasMoreData.value) {
+        if (store.userParamsChanged) arrayData.hasMoreData.value = true;
         store.userParamsChanged = false;
         endPagination();
         return;
@@ -142,7 +141,7 @@ async function onLoad(index, done) {
 
     await paginate();
     let isDone = false;
-    if (store.userParamsChanged) isDone = !hasMoreData.value;
+    if (store.userParamsChanged) isDone = !arrayData.hasMoreData.value;
     done(isDone);
 }
 
@@ -187,7 +186,7 @@ defineExpose({ fetch, addFilter });
         v-if="store.data"
         @load="onLoad"
         :offset="offset"
-        :disable="disableInfiniteScroll || !hasMoreData.value"
+        :disable="disableInfiniteScroll || !arrayData.hasMoreData.value"
         class="full-width"
         v-bind="$attrs"
     >
@@ -197,7 +196,7 @@ defineExpose({ fetch, addFilter });
         </div>
     </QInfiniteScroll>
     <div
-        v-if="!isLoading && hasMoreData.value"
+        v-if="!isLoading && arrayData.hasMoreData.value"
         class="w-full flex justify-center q-mt-md"
     >
         <QBtn color="primary" :label="t('Load more data')" @click="paginate()" />

From 4f5c8ef0f683fb4d1b1926b095f78fbc60b289e5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 19 Apr 2024 16:15:10 +0200
Subject: [PATCH 3/7] fix: tests

---
 .../invoiceIn/invoiceInDueDay.spec.js            |  2 --
 .../integration/invoiceIn/invoiceInVat.spec.js   | 16 +++++-----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInDueDay.spec.js b/test/cypress/integration/invoiceIn/invoiceInDueDay.spec.js
index ee5ffe08d..f39c80809 100644
--- a/test/cypress/integration/invoiceIn/invoiceInDueDay.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInDueDay.spec.js
@@ -1,7 +1,6 @@
 /// <reference types="cypress" />
 describe('InvoiceInDueDay', () => {
     const inputs = 'label input';
-    const inputBtns = 'label button';
     const addBtn = '.q-page-sticky > div > .q-btn > .q-btn__content';
 
     beforeEach(() => {
@@ -10,7 +9,6 @@ describe('InvoiceInDueDay', () => {
     });
 
     it('should update the amount', () => {
-        cy.get(inputBtns).eq(1).click();
         cy.get(inputs).eq(3).type(23);
         cy.saveCard();
         cy.get('.q-notification__message').should('have.text', 'Data saved');
diff --git a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
index 2f045f32c..ff891399b 100644
--- a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
@@ -1,11 +1,11 @@
 /// <reference types="cypress" />
 describe('InvoiceInVat', () => {
-    const inputs = 'label input';
-    const inputBtns = 'label button';
     const thirdRow = 'tbody > :nth-child(3)';
     const firstLineVat = 'tbody > :nth-child(1) > :nth-child(4)';
     const dialogInputs = '.q-dialog label input';
     const dialogBtns = '.q-dialog button';
+    const acrossInput =
+        ':nth-child(1) > .q-td.q-table--col-auto-width > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .default-icon';
     const randomInt = Math.floor(Math.random() * 100);
 
     beforeEach(() => {
@@ -13,11 +13,8 @@ describe('InvoiceInVat', () => {
         cy.visit(`/#/invoice-in/1/vat`);
     });
 
-    it('should edit the first line', () => {
-        cy.get(inputBtns).eq(1).click();
-        cy.get(inputs).eq(2).type(23);
+    it('should edit the sage iva', () => {
         cy.selectOption(firstLineVat, 'H.P. IVA 21% CEE');
-
         cy.saveCard();
         cy.visit(`/#/invoice-in/1/vat`);
 
@@ -36,16 +33,13 @@ describe('InvoiceInVat', () => {
     });
 
     it('should throw an error if there are fields undefined', () => {
-        cy.get(inputBtns).eq(0).click();
-        cy.get(':nth-child(1) > .q-td.q-table--col-auto-width > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .default-icon').click();
+        cy.get(acrossInput).click();
         cy.get(dialogBtns).eq(2).click();
         cy.get('.q-notification__message').should('have.text', "The code can't be empty");
     });
 
     it('should correctly handle expense addition', () => {
-        cy.get(inputBtns).eq(0).click();
-
-        cy.get(':nth-child(1) > .q-td.q-table--col-auto-width > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .default-icon').click();
+        cy.get(acrossInput).click();
         cy.get(dialogInputs).eq(0).type(randomInt);
         cy.get(dialogInputs).eq(1).click();
         cy.get(dialogInputs).eq(1).type('This is a dummy expense');

From 80844e7869e6de3abfb90dbc7a50d59d35039cae Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 22 Apr 2024 12:53:09 +0200
Subject: [PATCH 4/7] fix: hasMoreData

---
 src/components/ui/VnPaginate.vue | 21 ++++++++-------------
 src/composables/useArrayData.js  |  4 ++--
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 86918e545..14e3b6420 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -78,6 +78,7 @@ const arrayData = useArrayData(props.dataKey, {
     exprBuilder: props.exprBuilder,
 });
 const store = arrayData.store;
+const hasMoreData = arrayData.hasMoreData;
 
 onMounted(() => {
     if (props.autoLoad) fetch();
@@ -96,7 +97,7 @@ const addFilter = async (filter, params) => {
 
 async function fetch() {
     await arrayData.fetch({ append: false });
-    if (!arrayData.hasMoreData.value) {
+    if (!hasMoreData.value) {
         isLoading.value = false;
     }
     emit('onFetch', store.data);
@@ -109,8 +110,8 @@ async function paginate() {
 
     isLoading.value = true;
     await arrayData.loadMore();
-    if (!arrayData.hasMoreData.value) {
-        if (store.userParamsChanged) arrayData.hasMoreData.value = true;
+    if (!hasMoreData.value) {
+        if (store.userParamsChanged) hasMoreData.value = true;
         store.userParamsChanged = false;
         endPagination();
         return;
@@ -131,9 +132,7 @@ function endPagination() {
     emit('onPaginate');
 }
 async function onLoad(index, done) {
-    if (!store.data) {
-        return done();
-    }
+    if (!store.data) return done();
 
     if (store.data.length === 0 || !props.url) return done(false);
 
@@ -141,7 +140,7 @@ async function onLoad(index, done) {
 
     await paginate();
     let isDone = false;
-    if (store.userParamsChanged) isDone = !arrayData.hasMoreData.value;
+    if (store.userParamsChanged) isDone = !hasMoreData.value;
     done(isDone);
 }
 
@@ -181,13 +180,12 @@ defineExpose({ fetch, addFilter });
             </QCard>
         </div>
     </div>
-
     <QInfiniteScroll
         v-if="store.data"
         @load="onLoad"
         :offset="offset"
-        :disable="disableInfiniteScroll || !arrayData.hasMoreData.value"
         class="full-width"
+        :disable="disableInfiniteScroll || !hasMoreData"
         v-bind="$attrs"
     >
         <slot name="body" :rows="store.data"></slot>
@@ -195,10 +193,7 @@ defineExpose({ fetch, addFilter });
             <QSpinner color="orange" size="md" />
         </div>
     </QInfiniteScroll>
-    <div
-        v-if="!isLoading && arrayData.hasMoreData.value"
-        class="w-full flex justify-center q-mt-md"
-    >
+    <div v-if="!isLoading && hasMoreData" class="w-full flex justify-center q-mt-md">
         <QBtn color="primary" :label="t('Load more data')" @click="paginate()" />
     </div>
 </template>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 128fe2db1..329d667fb 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -14,7 +14,7 @@ export function useArrayData(key, userOptions) {
     }
 
     const store = arrayDataStore.get(key);
-    const hasMoreData = ref(false);
+    const hasMoreData = computed(() => arrayDataStore.hasMoreData);
     const route = useRoute();
     let canceller = null;
 
@@ -96,7 +96,7 @@ export function useArrayData(key, userOptions) {
         });
 
         const { limit } = filter;
-        hasMoreData.value = limit && response.data.length >= limit;
+        arrayDataStore.hasMoreData = limit && response.data.length >= limit;
 
         if (append) {
             if (!store.data) store.data = [];

From 1f391dc49b12b478cac0e934c297c83e119265cd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 22 Apr 2024 13:17:05 +0200
Subject: [PATCH 5/7] fix: skip

---
 src/composables/useArrayData.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 329d667fb..3b5f7bab5 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -9,9 +9,7 @@ const arrayDataStore = useArrayDataStore();
 export function useArrayData(key, userOptions) {
     if (!key) throw new Error('ArrayData: A key is required to use this composable');
 
-    if (!arrayDataStore.get(key)) {
-        arrayDataStore.set(key);
-    }
+    if (!arrayDataStore.get(key)) arrayDataStore.set(key);
 
     const store = arrayDataStore.get(key);
     const hasMoreData = computed(() => arrayDataStore.hasMoreData);
@@ -22,6 +20,7 @@ export function useArrayData(key, userOptions) {
 
     onMounted(() => {
         setOptions();
+        store.skip = 0;
 
         const query = route.query;
         if (query.params) {
@@ -29,9 +28,7 @@ export function useArrayData(key, userOptions) {
         }
     });
 
-    if (key && userOptions) {
-        setOptions();
-    }
+    if (key && userOptions) setOptions();
 
     function setOptions() {
         const allowedOptions = [

From 13a46be85bbc2ca6863a98e9d3730fc3b0361364 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 22 Apr 2024 15:18:15 +0200
Subject: [PATCH 6/7] fix: tests

---
 test/vitest/__tests__/components/Paginate.spec.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/vitest/__tests__/components/Paginate.spec.js b/test/vitest/__tests__/components/Paginate.spec.js
index cf5e5d2ea..98925204b 100644
--- a/test/vitest/__tests__/components/Paginate.spec.js
+++ b/test/vitest/__tests__/components/Paginate.spec.js
@@ -59,13 +59,13 @@ describe('VnPaginate', () => {
 
             await vm.paginate();
 
-            expect(vm.store.skip).toEqual(3);
-            expect(vm.store.data.length).toEqual(6);
+            expect(vm.store.skip).toEqual(0);
+            expect(vm.store.data.length).toEqual(3);
 
             await vm.paginate();
 
-            expect(vm.store.skip).toEqual(6);
-            expect(vm.store.data.length).toEqual(9);
+            expect(vm.store.skip).toEqual(0);
+            expect(vm.store.data.length).toEqual(3);
         });
     });
 

From 3abc50415829099d2dc5abab67e5cc4e1915bfe2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 22 Apr 2024 16:35:34 +0200
Subject: [PATCH 7/7] fix: unit test

---
 src/components/ui/VnPaginate.vue                 | 16 +++++++++-------
 src/composables/useArrayData.js                  |  6 ++----
 .../vitest/__tests__/components/Paginate.spec.js | 10 +++++-----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 14e3b6420..4dae312ce 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -78,7 +78,6 @@ const arrayData = useArrayData(props.dataKey, {
     exprBuilder: props.exprBuilder,
 });
 const store = arrayData.store;
-const hasMoreData = arrayData.hasMoreData;
 
 onMounted(() => {
     if (props.autoLoad) fetch();
@@ -97,7 +96,7 @@ const addFilter = async (filter, params) => {
 
 async function fetch() {
     await arrayData.fetch({ append: false });
-    if (!hasMoreData.value) {
+    if (!store.hasMoreData) {
         isLoading.value = false;
     }
     emit('onFetch', store.data);
@@ -110,8 +109,8 @@ async function paginate() {
 
     isLoading.value = true;
     await arrayData.loadMore();
-    if (!hasMoreData.value) {
-        if (store.userParamsChanged) hasMoreData.value = true;
+    if (!store.hasMoreData) {
+        if (store.userParamsChanged) store.hasMoreData = true;
         store.userParamsChanged = false;
         endPagination();
         return;
@@ -140,7 +139,7 @@ async function onLoad(index, done) {
 
     await paginate();
     let isDone = false;
-    if (store.userParamsChanged) isDone = !hasMoreData.value;
+    if (store.userParamsChanged) isDone = !store.hasMoreData;
     done(isDone);
 }
 
@@ -185,7 +184,7 @@ defineExpose({ fetch, addFilter });
         @load="onLoad"
         :offset="offset"
         class="full-width"
-        :disable="disableInfiniteScroll || !hasMoreData"
+        :disable="disableInfiniteScroll || !store.hasMoreData"
         v-bind="$attrs"
     >
         <slot name="body" :rows="store.data"></slot>
@@ -193,7 +192,10 @@ defineExpose({ fetch, addFilter });
             <QSpinner color="orange" size="md" />
         </div>
     </QInfiniteScroll>
-    <div v-if="!isLoading && hasMoreData" class="w-full flex justify-center q-mt-md">
+    <div
+        v-if="!isLoading && store.hasMoreData"
+        class="w-full flex justify-center q-mt-md"
+    >
         <QBtn color="primary" :label="t('Load more data')" @click="paginate()" />
     </div>
 </template>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 3b5f7bab5..490186e77 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -12,7 +12,6 @@ export function useArrayData(key, userOptions) {
     if (!arrayDataStore.get(key)) arrayDataStore.set(key);
 
     const store = arrayDataStore.get(key);
-    const hasMoreData = computed(() => arrayDataStore.hasMoreData);
     const route = useRoute();
     let canceller = null;
 
@@ -93,7 +92,7 @@ export function useArrayData(key, userOptions) {
         });
 
         const { limit } = filter;
-        arrayDataStore.hasMoreData = limit && response.data.length >= limit;
+        store.hasMoreData = limit && response.data.length >= limit;
 
         if (append) {
             if (!store.data) store.data = [];
@@ -165,7 +164,7 @@ export function useArrayData(key, userOptions) {
     }
 
     async function loadMore() {
-        if (!hasMoreData.value) return;
+        if (!store.hasMoreData) return;
 
         store.skip = store.limit * page.value;
         page.value += 1;
@@ -207,7 +206,6 @@ export function useArrayData(key, userOptions) {
         destroy,
         loadMore,
         store,
-        hasMoreData,
         totalRows,
         updateStateParams,
         isLoading,
diff --git a/test/vitest/__tests__/components/Paginate.spec.js b/test/vitest/__tests__/components/Paginate.spec.js
index 98925204b..345903c1a 100644
--- a/test/vitest/__tests__/components/Paginate.spec.js
+++ b/test/vitest/__tests__/components/Paginate.spec.js
@@ -48,7 +48,7 @@ describe('VnPaginate', () => {
                     { id: 3, name: 'Bruce Wayne' },
                 ],
             });
-            vm.arrayData.hasMoreData.value = true;
+            vm.store.hasMoreData = true;
             await vm.$nextTick();
 
             vm.store.data = [
@@ -59,13 +59,13 @@ describe('VnPaginate', () => {
 
             await vm.paginate();
 
-            expect(vm.store.skip).toEqual(0);
-            expect(vm.store.data.length).toEqual(3);
+            expect(vm.store.skip).toEqual(3);
+            expect(vm.store.data.length).toEqual(6);
 
             await vm.paginate();
 
-            expect(vm.store.skip).toEqual(0);
-            expect(vm.store.data.length).toEqual(3);
+            expect(vm.store.skip).toEqual(6);
+            expect(vm.store.data.length).toEqual(9);
         });
     });