Merge pull request #626 from amansinghbais/quick-fix

Fixed: loader not dismissing in case of empty hard count
hotwax · Jan 16, 2025 · 1b63056 · 1b63056
2 parents d373134 + 663255e
commit 1b63056
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/views/CountDetail.vue b/src/views/CountDetail.vue
@@ -305,8 +305,8 @@ onIonViewDidEnter(async() => {
   previousItem = itemsList.value[0]
   await store.dispatch("product/currentProduct", itemsList.value[0])
   barcodeInput.value?.$el?.setFocus();
-  initializeObserver()
   emitter.emit("dismissLoader")
+  if(itemsList.value?.length) initializeObserver()
 })  
 
 onIonViewDidLeave(async() => {
@@ -442,7 +442,7 @@ async function updateFilteredItems() {
     store.dispatch("product/currentProduct", {});
   }
   await nextTick();
-  initializeObserver()
+  if(itemsList.value?.length) initializeObserver()
 }
 
 function initializeObserver() {

diff --git a/src/views/HardCountDetail.vue b/src/views/HardCountDetail.vue
@@ -262,8 +262,8 @@ onIonViewDidEnter(async() => {
   barcodeInputRef.value?.$el?.setFocus();
   selectedCountUpdateType.value = defaultRecountUpdateBehaviour.value
   window.addEventListener('beforeunload', handleBeforeUnload);
-  initializeObserver()
   emitter.emit("dismissLoader")
+  if(itemsList.value?.length) initializeObserver()
 })
 
 onIonViewDidLeave(async() => {
@@ -328,7 +328,7 @@ async function handleSegmentChange() {
   inputCount.value = ""
   selectedCountUpdateType.value = defaultRecountUpdateBehaviour.value
   await nextTick();
-  initializeObserver()
+  if(itemsList.value?.length) initializeObserver()
 }
 
 async function changeProduct(direction: string) {
@@ -430,7 +430,11 @@ async function addProductToItemsList() {
   const items = JSON.parse(JSON.stringify(cycleCountItems.value.itemList))
   items.push(newItem);
   await store.dispatch("count/updateCycleCountItems", items);
-  initializeObserver()
+  if(itemsList.value?.length) {
+    setTimeout(() => {
+      initializeObserver()
+    }, 0);
+  }
   findProductFromIdentifier(queryString.value.trim());
   return newItem;
 }