From 8ee39d4db221a7b3c4b12ed49214f1a72c10ac80 Mon Sep 17 00:00:00 2001
From: joycitta-siqueira <joycitta@gmail.com>
Date: Tue, 28 Jun 2022 17:12:43 -0300
Subject: [PATCH] Search items update

---
 src/pages/CollectionPage.vue |  3 ++-
 src/pages/ItemsPage.vue      |  3 ++-
 src/store/storeTainacan.ts   | 15 ++++-----------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/pages/CollectionPage.vue b/src/pages/CollectionPage.vue
index 0b7ff29..8e43d91 100644
--- a/src/pages/CollectionPage.vue
+++ b/src/pages/CollectionPage.vue
@@ -71,7 +71,8 @@ export default defineComponent({
         const setIsLoading = (state: boolean) => isLoading.value = state;
         const setSearch = (value: string) => search.value = value;
         const loadItemsByCollection = async (event: any, reset: boolean) => {
-            let hasMoreCollectionsItems = await tainacanStore.fetchItemsByCollection(props.id + '', { perPage: '12', orderBy: 'modified', reset: reset, search: search.value});
+            await tainacanStore.fetchItemsByCollection(props.id + '', { perPage: '12', orderBy: 'modified', reset: reset, search: search.value});
+            let hasMoreCollectionsItems = tainacanStore.totalCollectionItems && tainacanStore.totalCollectionItems !== 0;
             if (event && event.target)
                 event.target.complete();
             if (!hasMoreCollectionsItems){
diff --git a/src/pages/ItemsPage.vue b/src/pages/ItemsPage.vue
index 5e91464..5dc044f 100644
--- a/src/pages/ItemsPage.vue
+++ b/src/pages/ItemsPage.vue
@@ -52,7 +52,8 @@ export default {
         const setSearch = (value: string) => search.value = value; 
         const infiniteScroll = ref();
         const loadItems = async (event: any, reset: boolean) => {
-            let hasMoreItems = await tainacanStore.fetchItems({ perPage: '12', orderBy: 'modified', reset: reset, search: search.value});
+            await tainacanStore.fetchItems({ perPage: '12', orderBy: 'modified', reset: reset, search: search.value});
+            let hasMoreItems = tainacanStore.totalItems && tainacanStore.totalItems !== 0;
             if (event && event.target)
                 event.target.complete();
             if (!hasMoreItems){
diff --git a/src/store/storeTainacan.ts b/src/store/storeTainacan.ts
index 3a2b8f6..214d67b 100644
--- a/src/store/storeTainacan.ts
+++ b/src/store/storeTainacan.ts
@@ -101,13 +101,10 @@ const useTainacanStore = defineStore("tainacan", {
         this.collectionItems.push(...response.data.items);
         this.totalCollectionItems = response.headers['x-wp-total'];
 
-        if (!this.totalCollectionItems ||
-          this.totalCollectionItems === "0") {
-          return false;
-        } else {
-          this.nextItemsByCollectionPage++;
-          return true;
+        if (this.totalCollectionItems && this.totalCollectionItems !== "0") {
+            this.nextItemsByCollectionPage++;
         }    
+
       } catch (err) {
         this.collectionItems = [];
         this.totalCollectionItems = 0;
@@ -162,12 +159,8 @@ const useTainacanStore = defineStore("tainacan", {
         this.items.push(...response.data.items);
         this.totalItems = response.headers['x-wp-total'];
 
-        if (!this.totalItems ||
-          this.totalItems === "0") {
-          return false;
-        } else {
+        if (this.totalItems && this.totalItems !== "0") {
           this.nextItemsPage++;
-          return true;
         } 
 
       } catch (err) {