Merge pull request #668 from globe-and-citizen/667-bug-load-more-butt…

…on-visible fix:#667 - Fixed load more button visible
globe-and-citizen · Dec 12, 2024 · a0347cb · a0347cb
2 parents 742a65b + a2615e1
commit a0347cb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/pages/SearchPage.vue b/src/pages/SearchPage.vue
@@ -46,7 +46,13 @@
       </TransitionGroup>
       <div v-if="showHasMore" class="row justify-center q-mt-md">
         <q-spinner v-if="promptStore.isLoading && promptStore.getPrompts?.length" color="primary" size="70px" :thickness="5" />
-        <q-btn v-else @click="loadMorePrompts" label="Load More" data-test="load-more-btn" color="primary" />
+        <q-btn
+          v-else-if="promptStore.getPrompts?.length"
+          @click="loadMorePrompts"
+          label="Load More"
+          data-test="load-more-btn"
+          color="primary"
+        />
       </div>
     </q-page>
   </q-page-container>

diff --git a/src/stores/prompts.js b/src/stores/prompts.js
@@ -113,10 +113,9 @@ export const usePromptStore = defineStore('prompts', {
 
         if (newPrompts.length > 0) {
           this._lastVisible = querySnapshot.docs[querySnapshot.docs.length - 1]
-          this._hasMore = true
-        } else {
-          this._hasMore = false
         }
+        if (newPrompts.length > 4) this._hasMore = true
+        else this._hasMore = false
 
         this._prompts = loadMore ? [...(this._prompts || []), ...newPrompts] : newPrompts