From 7cf81eb24e2c3465e0a7ada65c7efe58bd422b3b Mon Sep 17 00:00:00 2001
From: R-Sourabh <rsourabh002@gmail.com>
Date: Thu, 21 Nov 2024 14:44:34 +0530
Subject: [PATCH 1/3] Improved: Show TO filters if the facet has orders;
 disable if none.(#673)

---
 src/components/TransferOrderFilters.vue | 68 +----------------------
 src/views/TransferOrders.vue            | 72 +++++++++++++++++++++++--
 2 files changed, 69 insertions(+), 71 deletions(-)

diff --git a/src/components/TransferOrderFilters.vue b/src/components/TransferOrderFilters.vue
index c231ae70..319b9138 100644
--- a/src/components/TransferOrderFilters.vue
+++ b/src/components/TransferOrderFilters.vue
@@ -49,10 +49,6 @@ import {
 import { defineComponent, computed } from "vue";
 import { albumsOutline, banOutline, barChartOutline, calendarNumberOutline, checkmarkDoneOutline, closeOutline, filterOutline, iceCreamOutline, libraryOutline, pulseOutline, settings, shirtOutline, ticketOutline } from "ionicons/icons";
 import { mapGetters, useStore } from 'vuex'
-import { escapeSolrSpecialChars, prepareOrderQuery } from '@/utils/solrHelper';
-import { UtilService } from '@/services/UtilService';
-import { hasError } from '@/adapter';
-import logger from '@/logger';
 import { translate, useUserStore } from '@hotwax/dxp-components';
 
 export default defineComponent({
@@ -68,24 +64,14 @@ export default defineComponent({
     IonTitle,
     IonToolbar
   },
-  props: ["queryString"],
-  data () {
-    return {
-      shipmentMethods: [] as Array<any>,
-      statuses: [] as Array<any>
-    }
-  },
+  props: ["queryString", "shipmentMethods", "statuses"],
   computed: {
     ...mapGetters({
       transferOrders: 'transferorder/getTransferOrders',
       getStatusDesc: 'util/getStatusDesc',
       getShipmentMethodDesc: 'util/getShipmentMethodDesc',
-      currentEComStore: 'user/getCurrentEComStore',
     })
   },
-  async mounted() {
-    await this.fetchFilters();
-  },
   unmounted() {
     this.store.dispatch('transferorder/clearTransferOrderFilters');
   },
@@ -116,58 +102,6 @@ export default defineComponent({
       transferOrdersQuery.viewIndex = 0;
       await this.store.dispatch('transferorder/updateTransferOrderQuery', { ...transferOrdersQuery })
     },
-    async fetchFilters() {
-      let resp: any;
-      const payload = prepareOrderQuery({
-        docType: "ORDER",
-        queryFields: 'orderId',
-        viewSize: '0',  // passed viewSize as 0 to not fetch any data
-        filters: {
-          '-orderStatusId': { value: 'ORDER_CREATED' },
-          orderTypeId: { value: 'TRANSFER_ORDER' },
-          facilityId: { value: escapeSolrSpecialChars(this.currentFacility?.facilityId) },
-          productStoreId: { value: this.currentEComStore.productStoreId }
-        },
-        facet: {
-          "shipmentMethodTypeIdFacet":{
-            "excludeTags":"shipmentMethodTypeIdFilter",
-            "field":"shipmentMethodTypeId",
-            "mincount":1,
-            "limit":-1,
-            "sort":"index",
-            "type":"terms",
-            "facet": {
-              "ordersCount": "unique(orderId)"
-            }
-          },
-          "orderStatusIdFacet":{
-            "excludeTags":"orderStatusIdFilter",
-            "field":"orderStatusId",
-            "mincount":1,
-            "limit":-1,
-            "sort":"index",
-            "type":"terms",
-            "facet": {
-              "ordersCount": "unique(orderId)"
-            }
-          }
-        }
-      })
-
-      try {
-        resp = await UtilService.fetchTransferOrderFacets(payload);
-        if (resp.status == 200 && !hasError(resp) && resp.data.facets?.count > 0) {
-          this.shipmentMethods = resp.data.facets.shipmentMethodTypeIdFacet.buckets
-          this.statuses = resp.data.facets.orderStatusIdFacet.buckets
-          this.store.dispatch('util/fetchShipmentMethodTypeDesc', this.shipmentMethods.map((shipmentMethod: any) => shipmentMethod.val))
-          this.store.dispatch('util/fetchStatusDesc', this.statuses.map((status: any) => status.val))
-        } else {
-          throw resp.data;
-        }
-      } catch(err) {
-        logger.error('Failed to fetch transfer order filters.', err)
-      }
-    },
   },
   setup() {
     const store = useStore();
diff --git a/src/views/TransferOrders.vue b/src/views/TransferOrders.vue
index 1b77234a..86f11283 100644
--- a/src/views/TransferOrders.vue
+++ b/src/views/TransferOrders.vue
@@ -1,6 +1,6 @@
 <template>
   <ion-page>
-    <TransferOrderFilters menu-id="transfer-order-filters" content-id="transfer-order-filters" :queryString="transferOrders.query.queryString" />
+    <TransferOrderFilters menu-id="transfer-order-filters" content-id="transfer-order-filters" :queryString="transferOrders.query.queryString" :shipmentMethods="shipmentMethods" :statuses="statuses"/>
     
     <ion-header :translucent="true">
       <ion-toolbar>
@@ -78,6 +78,10 @@ import { mapGetters, useStore } from 'vuex';
 import { useRouter } from 'vue-router';
 import { translate, useUserStore } from '@hotwax/dxp-components';
 import { Actions } from '@/authorization'
+import { escapeSolrSpecialChars, prepareOrderQuery } from '@/utils/solrHelper';
+import { UtilService } from '@/services/UtilService';
+import { hasError } from '@/adapter';
+import logger from '@/logger';
 import TransferOrderFilters from '@/components/TransferOrderFilters.vue'
 
 export default defineComponent({
@@ -111,14 +115,19 @@ export default defineComponent({
   data () {
     return {
       shipmentMethods: [] as Array<any>,
+      statuses: [] as Array<any>,
       searchedQuery: '',
       isScrollingEnabled: false,
-      hasCompletedTransferOrders: true
+      hasCompletedTransferOrders: true,
+      transferOrderCount: 0
     }
   },
   async ionViewWillEnter() {
     this.isScrollingEnabled = false;
-    await this.initialiseTransferOrderQuery();
+    await this.fetchFilters(); 
+    if(this.transferOrderCount) { 
+      await this.initialiseTransferOrderQuery();
+    }
   },
   methods: {
     getErrorMessage() {
@@ -156,7 +165,7 @@ export default defineComponent({
       const transferOrdersQuery = JSON.parse(JSON.stringify(this.transferOrders.query))
       transferOrdersQuery.viewIndex = 0 // If the size changes, list index should be reintialised
       transferOrdersQuery.viewSize = process.env.VUE_APP_VIEW_SIZE
-      transferOrdersQuery.selectedStatuses = ["ORDER_COMPLETED"]
+      transferOrdersQuery.selectedStatuses = ["ORDER_COMPLETED", "ORDER_APPROVED"]
       await this.store.dispatch('transferorder/updateTransferOrderQuery', { ...transferOrdersQuery })
       this.hasCompletedTransferOrders = this.transferOrders.list.some((order: any) => order.orderStatusId === "ORDER_COMPLETED");
     },
@@ -169,6 +178,61 @@ export default defineComponent({
       await this.store.dispatch('transferorder/updateTransferOrderQuery', { ...transferOrdersQuery })
       this.searchedQuery = queryString;
     },
+    async fetchFilters() {
+      let resp: any;
+      const payload = prepareOrderQuery({
+        docType: "ORDER",
+        queryFields: 'orderId',
+        viewSize: '0',  // passed viewSize as 0 to not fetch any data
+        filters: {
+          '-orderStatusId': { value: 'ORDER_CREATED' },
+          orderTypeId: { value: 'TRANSFER_ORDER' },
+          facilityId: { value: escapeSolrSpecialChars(this.currentFacility?.facilityId) },
+          productStoreId: { value: this.currentEComStore.productStoreId }
+        },
+        facet: {
+          "shipmentMethodTypeIdFacet":{
+            "excludeTags":"shipmentMethodTypeIdFilter",
+            "field":"shipmentMethodTypeId",
+            "mincount":1,
+            "limit":-1,
+            "sort":"index",
+            "type":"terms",
+            "facet": {
+              "ordersCount": "unique(orderId)"
+            }
+          },
+          "orderStatusIdFacet":{
+            "excludeTags":"orderStatusIdFilter",
+            "field":"orderStatusId",
+            "mincount":1,
+            "limit":-1,
+            "sort":"index",
+            "type":"terms",
+            "facet": {
+              "ordersCount": "unique(orderId)"
+            }
+          }
+        }
+      })
+
+      try {
+        resp = await UtilService.fetchTransferOrderFacets(payload);
+        if(resp.status == 200 && !hasError(resp)) {
+          this.transferOrderCount = resp.data.facets?.count
+          if(this.transferOrderCount) {
+            this.shipmentMethods = resp.data.facets.shipmentMethodTypeIdFacet.buckets;
+            this.statuses = resp.data.facets.orderStatusIdFacet.buckets;
+            this.store.dispatch('util/fetchShipmentMethodTypeDesc', this.shipmentMethods.map((shipmentMethod: any) => shipmentMethod.val));
+            this.store.dispatch('util/fetchStatusDesc', this.statuses.map((status: any) => status.val));
+          }
+        } else {
+          throw resp.data;
+        }
+      } catch(err) {
+        logger.error('Failed to fetch transfer order filters.', err)
+      }
+    },
     async initialiseTransferOrderQuery() {
       const transferOrdersQuery = JSON.parse(JSON.stringify(this.transferOrders.query))
       transferOrdersQuery.viewIndex = 0 // If the size changes, list index should be reintialised

From 68bf22da3d22b275c657f07d2e878d1887ba26e7 Mon Sep 17 00:00:00 2001
From: R-Sourabh <rsourabh002@gmail.com>
Date: Thu, 21 Nov 2024 14:58:08 +0530
Subject: [PATCH 2/3] Improved: Replaced the filter disable check with facet
 order count (#673)

---
 src/views/TransferOrders.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/TransferOrders.vue b/src/views/TransferOrders.vue
index 86f11283..896bee1f 100644
--- a/src/views/TransferOrders.vue
+++ b/src/views/TransferOrders.vue
@@ -8,7 +8,7 @@
         <ion-title v-if="!transferOrders.total">{{ transferOrders.total }} {{ translate('orders') }}</ion-title>
         <ion-title v-else>{{ transferOrders.list.length }} {{ translate('of') }} {{ transferOrders.total }} {{ translate('orders') }}</ion-title>
         <ion-buttons slot="end">
-          <ion-menu-button menu="transfer-order-filters" :disabled="!transferOrders.total">
+          <ion-menu-button menu="transfer-order-filters" :disabled="!transferOrderCount">
             <ion-icon :icon="optionsOutline" />
           </ion-menu-button>
         </ion-buttons>

From 684d2ddd13a5f277fb4bead36c4d1a0d7922f918 Mon Sep 17 00:00:00 2001
From: R-Sourabh <rsourabh002@gmail.com>
Date: Thu, 21 Nov 2024 19:05:32 +0530
Subject: [PATCH 3/3] Reverted: removed the 'approved' selected status check
 for completed TO function(#)

---
 src/views/TransferOrders.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/TransferOrders.vue b/src/views/TransferOrders.vue
index 896bee1f..716627a6 100644
--- a/src/views/TransferOrders.vue
+++ b/src/views/TransferOrders.vue
@@ -165,7 +165,7 @@ export default defineComponent({
       const transferOrdersQuery = JSON.parse(JSON.stringify(this.transferOrders.query))
       transferOrdersQuery.viewIndex = 0 // If the size changes, list index should be reintialised
       transferOrdersQuery.viewSize = process.env.VUE_APP_VIEW_SIZE
-      transferOrdersQuery.selectedStatuses = ["ORDER_COMPLETED", "ORDER_APPROVED"]
+      transferOrdersQuery.selectedStatuses = ["ORDER_COMPLETED"]
       await this.store.dispatch('transferorder/updateTransferOrderQuery', { ...transferOrdersQuery })
       this.hasCompletedTransferOrders = this.transferOrders.list.some((order: any) => order.orderStatusId === "ORDER_COMPLETED");
     },