From 9e23f9b9b137cfbaaa50d17e322ea565d6e4f95e Mon Sep 17 00:00:00 2001
From: Mohit Panjwani <mohit.panjvani@gmail.com>
Date: Tue, 15 Feb 2022 11:32:30 +0530
Subject: [PATCH] fix search issues

---
 .../customers/partials/CustomerViewSidebar.vue      |  6 +++---
 resources/scripts/admin/views/estimates/View.vue    |  9 ++++++---
 resources/scripts/admin/views/invoices/View.vue     | 13 +++++++------
 resources/scripts/admin/views/payments/View.vue     |  9 ++++++---
 .../partials/RecurringInvoiceViewSidebar.vue        | 13 +++++++------
 5 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/resources/scripts/admin/views/customers/partials/CustomerViewSidebar.vue b/resources/scripts/admin/views/customers/partials/CustomerViewSidebar.vue
index bc19a070..45a4e8a7 100644
--- a/resources/scripts/admin/views/customers/partials/CustomerViewSidebar.vue
+++ b/resources/scripts/admin/views/customers/partials/CustomerViewSidebar.vue
@@ -145,7 +145,7 @@
                 truncate
               "
             />
-            
+
             <BaseText
               v-if="customer.contact_name"
               :text="customer.contact_name"
@@ -170,12 +170,12 @@
       </div>
       <div class="flex justify-center p-4 items-center">
         <LoadingIcon
-          v-if="isFetching"
+          v-if="isFetching || isSearching"
           class="h-6 m-1 animate-spin text-primary-400"
         />
       </div>
       <p
-        v-if="!customerStore.customers.length && !isFetching"
+        v-if="!customerStore.customers.length && !isFetching && !isSearching"
         class="flex justify-center px-4 mt-5 text-sm text-gray-600"
       >
         {{ $t('customers.no_matching_customers') }}
diff --git a/resources/scripts/admin/views/estimates/View.vue b/resources/scripts/admin/views/estimates/View.vue
index ba4bad9a..f87b4fed 100644
--- a/resources/scripts/admin/views/estimates/View.vue
+++ b/resources/scripts/admin/views/estimates/View.vue
@@ -246,11 +246,14 @@
             </div>
           </router-link>
         </div>
-        <div v-if="isLoading" class="flex justify-center p-4 items-center">
+        <div
+          v-if="isLoading || isSearching"
+          class="flex justify-center p-4 items-center"
+        >
           <LoadingIcon class="h-6 m-1 animate-spin text-primary-400" />
         </div>
         <p
-          v-if="!estimateStore.estimates.length && !isLoading"
+          v-if="!estimateList.length && !isLoading && !isSearching"
           class="flex justify-center px-4 mt-5 text-sm text-gray-600"
         >
           {{ $t('estimates.no_matching_estimates') }}
@@ -453,7 +456,7 @@ async function onSearched() {
   let response = await estimateStore.searchEstimate(data)
   isSearching.value = false
   if (response.data) {
-    estimateStore.estimates = response.data.data
+    estimateList.value = response.data.data
   }
 }
 
diff --git a/resources/scripts/admin/views/invoices/View.vue b/resources/scripts/admin/views/invoices/View.vue
index 875b282d..c051fa46 100644
--- a/resources/scripts/admin/views/invoices/View.vue
+++ b/resources/scripts/admin/views/invoices/View.vue
@@ -125,9 +125,7 @@ async function loadInvoices(params, fromScrollListener = false) {
 
   currentPageNumber.value = params ? params.page : 1
   lastPageNumber.value = response.data.meta.last_page
-  let invoiceFound = invoiceList.value.find(
-    (inv) => inv.id == route.params.id
-  )
+  let invoiceFound = invoiceList.value.find((inv) => inv.id == route.params.id)
 
   if (
     fromScrollListener == false &&
@@ -199,7 +197,7 @@ async function onSearched() {
   let response = await invoiceStore.searchInvoice(data)
   isSearching.value = false
   if (response.data) {
-    invoiceStore.invoices = response.data.data
+    invoiceList.value = response.data.data
   }
 }
 
@@ -480,11 +478,14 @@ onSearched = debounce(onSearched, 500)
             </div>
           </router-link>
         </div>
-        <div v-if="isLoading" class="flex justify-center p-4 items-center">
+        <div
+          v-if="isLoading || isSearching"
+          class="flex justify-center p-4 items-center"
+        >
           <LoadingIcon class="h-6 m-1 animate-spin text-primary-400" />
         </div>
         <p
-          v-if="!invoiceStore.invoices.length && !isLoading"
+          v-if="!invoiceList?.length && !isLoading && !isSearching"
           class="flex justify-center px-4 mt-5 text-sm text-gray-600"
         >
           {{ $t('invoices.no_matching_invoices') }}
diff --git a/resources/scripts/admin/views/payments/View.vue b/resources/scripts/admin/views/payments/View.vue
index 4f9fcbf5..2a73616c 100644
--- a/resources/scripts/admin/views/payments/View.vue
+++ b/resources/scripts/admin/views/payments/View.vue
@@ -222,11 +222,14 @@
             </div>
           </router-link>
         </div>
-        <div v-if="isLoading" class="flex justify-center p-4 items-center">
+        <div
+          v-if="isLoading || isSearching"
+          class="flex justify-center p-4 items-center"
+        >
           <LoadingIcon class="h-6 m-1 animate-spin text-primary-400" />
         </div>
         <p
-          v-if="!paymentStore?.payments?.length && !isLoading"
+          v-if="!paymentList?.length && !isLoading && !isSearching"
           class="flex justify-center px-4 mt-5 text-sm text-gray-600"
         >
           {{ $t('payments.no_matching_payments') }}
@@ -438,7 +441,7 @@ async function onSearch() {
     isSearching.value = false
 
     if (response.data.data) {
-      paymentStore.payments = response.data.data
+      paymentList.value = response.data.data
     }
   } catch (error) {
     isSearching.value = false
diff --git a/resources/scripts/admin/views/recurring-invoices/partials/RecurringInvoiceViewSidebar.vue b/resources/scripts/admin/views/recurring-invoices/partials/RecurringInvoiceViewSidebar.vue
index 2d1b0d95..6fa60762 100644
--- a/resources/scripts/admin/views/recurring-invoices/partials/RecurringInvoiceViewSidebar.vue
+++ b/resources/scripts/admin/views/recurring-invoices/partials/RecurringInvoiceViewSidebar.vue
@@ -52,9 +52,7 @@ async function loadRecurringInvoices(params, fromScrollListener = false) {
 
   currentPageNumber.value = params ? params.page : 1
   lastPageNumber.value = response.data.meta.last_page
-  let invoiceFound = invoiceList.value.find(
-    (inv) => inv.id == route.params.id
-  )
+  let invoiceFound = invoiceList.value.find((inv) => inv.id == route.params.id)
 
   if (
     fromScrollListener == false &&
@@ -119,7 +117,7 @@ async function onSearched() {
   let response = await recurringInvoiceStore.searchRecurringInvoice(data)
   isSearching.value = false
   if (response.data) {
-    recurringInvoiceStore.recurringInvoices = response.data.data
+    invoiceList.value = response.data.data
   }
 }
 
@@ -329,11 +327,14 @@ onSearched = debounce(onSearched, 500)
           </div>
         </router-link>
       </div>
-      <div v-if="isLoading" class="flex justify-center p-4 items-center">
+      <div
+        v-if="isLoading || isSearching"
+        class="flex justify-center p-4 items-center"
+      >
         <LoadingIcon class="h-6 m-1 animate-spin text-primary-400" />
       </div>
       <p
-        v-if="!recurringInvoiceStore.recurringInvoices.length && !isLoading"
+        v-if="!invoiceList?.length && !isLoading && !isSearching"
         class="flex justify-center px-4 mt-5 text-sm text-gray-600"
       >
         {{ $t('invoices.no_matching_invoices') }}