Merge pull request #753 from R-Sourabh/#dxp/228-facility-selector

Implemented: Added the support for using facility selector from dxp-component(#dxp/228)

package.json

@@ -16,7 +16,7 @@
     "@casl/ability": "^6.0.0",
     "@hotwax/app-version-info": "^1.0.0",
     "@hotwax/apps-theme": "^1.2.6",
-    "@hotwax/dxp-components": "^1.15.5",
+    "@hotwax/dxp-components": "^1.16.0",
     "@hotwax/oms-api": "^1.16.0",
     "@ionic/core": "^7.6.0",
     "@ionic/vue": "^7.6.0",

src/adapter/index.ts

@@ -1,6 +1,6 @@
 
-import { api, client, getConfig, getNotificationEnumIds, getNotificationUserPrefTypeIds, getProductIdentificationPref, fetchGoodIdentificationTypes, getUserFacilities, hasError, initialise, logout, removeClientRegistrationToken, resetConfig, setProductIdentificationPref, setUserLocale, storeClientRegistrationToken,
-  subscribeTopic, unsubscribeTopic, updateInstanceUrl, updateToken, setUserTimeZone, getAvailableTimeZones } from '@hotwax/oms-api'
+import { api, client, getConfig, getNotificationEnumIds, getNotificationUserPrefTypeIds, getProductIdentificationPref, fetchGoodIdentificationTypes, getUserFacilities, getUserPreference,  hasError, initialise, logout, removeClientRegistrationToken, resetConfig, setProductIdentificationPref, setUserLocale, storeClientRegistrationToken,
+  subscribeTopic, unsubscribeTopic, updateInstanceUrl, updateToken, setUserTimeZone, setUserPreference, getAvailableTimeZones } from '@hotwax/oms-api'
 
 export {
   api,
@@ -11,6 +11,7 @@ export {
   getProductIdentificationPref,
   fetchGoodIdentificationTypes,
   getUserFacilities,
+  getUserPreference,
   hasError,
   initialise,
   logout,
@@ -24,5 +25,6 @@ export {
   updateInstanceUrl,
   updateToken,
   setUserTimeZone,
+  setUserPreference,
   getAvailableTimeZones
 }

src/components/DownloadRejectedOrdersModal.vue

@@ -72,7 +72,7 @@
   } from '@ionic/vue';
   import { computed, defineComponent } from 'vue';
   import { closeOutline, cloudDownloadOutline} from 'ionicons/icons';
-  import { getProductIdentificationValue,  translate, useProductIdentificationStore } from '@hotwax/dxp-components';
+  import { getProductIdentificationValue,  translate, useProductIdentificationStore, useUserStore } from '@hotwax/dxp-components';
   import { mapGetters, useStore } from 'vuex';
   import { escapeSolrSpecialChars, prepareSolrQuery } from '@/utils/solrHelper'
   import { RejectionService } from '@/services/RejectionService'
@@ -136,8 +136,7 @@
     computed: {
       ...mapGetters({
         getProduct: 'product/getProduct',
-        rejectedOrders: 'rejection/getRejectedOrders',
-        currentFacility: 'user/getCurrentFacility',
+        rejectedOrders: 'rejection/getRejectedOrders'
       })
     },
     methods: {
@@ -297,8 +296,10 @@
     },
     setup() {
       const store = useStore()
+      const userStore = useUserStore()
       const productIdentificationStore = useProductIdentificationStore();
       let productIdentificationPref = computed(() => productIdentificationStore.getProductIdentificationPref)
+      let currentFacility: any = computed(() => userStore.getCurrentFacility) 
   
   
       return {
@@ -308,6 +309,7 @@
         productIdentificationPref,
         store,
         translate,
+        currentFacility
       }
     }
   });

src/components/Menu.vue

@@ -50,7 +50,7 @@ import { arrowBackOutline, backspaceOutline, mailUnreadOutline, mailOpenOutline,
 import { useStore } from "@/store";
 import { useRouter } from "vue-router";
 import { hasPermission } from "@/authorization";
-import { translate } from '@hotwax/dxp-components';
+import { translate, useUserStore } from '@hotwax/dxp-components';
 
 export default defineComponent({
   name: "Menu",
@@ -70,7 +70,6 @@ export default defineComponent({
   computed: {
     ...mapGetters({
       isUserAuthenticated: 'user/isUserAuthenticated',
-      currentFacility: 'user/getCurrentFacility',
     })
   },
   methods: {
@@ -81,6 +80,8 @@ export default defineComponent({
   setup() {
     const store = useStore();
     const router = useRouter();
+    const userStore = useUserStore()
+    let currentFacility: any = computed(() => userStore.getCurrentFacility) 
 
     const appPages = [
       {
@@ -189,6 +190,7 @@ export default defineComponent({
       appPages,
       backspaceOutline,
       checkmarkDoneOutline,
+      currentFacility,
       hasPermission,
       arrowBackOutline,
       mailUnreadOutline,

src/components/NotificationPreferenceModal.vue

@@ -44,10 +44,10 @@ import {
   modalController,
   alertController,
 } from "@ionic/vue";
-import { defineComponent } from "vue";
+import { defineComponent, computed } from "vue";
 import { closeOutline, save } from "ionicons/icons";
 import { mapGetters, useStore } from "vuex";
-import { translate } from '@hotwax/dxp-components'
+import { translate, useUserStore } from '@hotwax/dxp-components'
 import { showToast } from "@/utils";
 import emitter from "@/event-bus"
 import { generateTopicName } from "@/utils/firebase";
@@ -82,7 +82,6 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters({
-      currentFacility: 'user/getCurrentFacility',
       instanceUrl: 'user/getInstanceUrl',
       notificationPrefs: 'user/getNotificationPrefs'
     }),
@@ -138,7 +137,7 @@ export default defineComponent({
       }
     },
     async handleTopicSubscription() {
-      const facilityId = (this.currentFacility as any).facilityId
+      const facilityId = this.currentFacility?.facilityId
       const subscribeRequests = [] as any
       this.notificationPrefToUpdate.subscribe.map(async (enumId: string) => {
         const topicName = generateTopicName(facilityId, enumId)
@@ -182,9 +181,12 @@ export default defineComponent({
   },
   setup() {
     const store = useStore();
+    const userStore = useUserStore()
+    let currentFacility: any = computed(() => userStore.getCurrentFacility) 
 
     return {
       closeOutline,
+      currentFacility,
       translate,
       save,
       store

src/components/TransferOrderFilters.vue

@@ -46,14 +46,14 @@ import {
   IonTitle,
   IonToolbar
 } from "@ionic/vue";
-import { defineComponent } from "vue";
+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 } from '@hotwax/dxp-components';
+import { translate, useUserStore } from '@hotwax/dxp-components';
 
 export default defineComponent({
   name: "TransferOrderFilters",
@@ -77,7 +77,6 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters({
-      currentFacility: 'user/getCurrentFacility',
       transferOrders: 'transferorder/getTransferOrders',
       getStatusDesc: 'util/getStatusDesc',
       getShipmentMethodDesc: 'util/getShipmentMethodDesc',
@@ -126,7 +125,7 @@ export default defineComponent({
         filters: {
           '-orderStatusId': { value: 'ORDER_CREATED' },
           orderTypeId: { value: 'TRANSFER_ORDER' },
-          facilityId: { value: escapeSolrSpecialChars(this.currentFacility.facilityId) },
+          facilityId: { value: escapeSolrSpecialChars(this.currentFacility?.facilityId) },
           productStoreId: { value: this.currentEComStore.productStoreId }
         },
         facet: {
@@ -172,14 +171,17 @@ export default defineComponent({
   },
   setup() {
     const store = useStore();
-    
+    const userStore = useUserStore()
+    let currentFacility: any = computed(() => userStore.getCurrentFacility) 
+
     return {
       albumsOutline,
       banOutline,
       barChartOutline,
       calendarNumberOutline,
       checkmarkDoneOutline,
       closeOutline,
+      currentFacility,
       filterOutline,
       iceCreamOutline,
       libraryOutline,

src/locales/en.json

@@ -214,6 +214,7 @@
   "Failed to update shipment method detail.": "Failed to update shipment method detail.",
   "Failed to update tracking code settings.": "Failed to update tracking code settings.",
   "Failed to update variance type.": "Failed to update variance type.",
+  "Fetching facilities": "Fetching facilities",
   "Fetching gift card info.": "Fetching gift card info.",
   "Fetching time zones": "Fetching time zones",
   "Fetching order information...": "Fetching order information...",
@@ -305,6 +306,7 @@
   "No carrier found.": "No carrier found.",
   "No data available": "No data available",
   "No data found": "No data found",
+  "No facilities found": "No facilities found",
   "No rejection reasons found.": "No rejection reasons found.",
   "No shipments have been shipped yet": "No shipments have been shipped yet",
   "No shipping label error received from carrier.": "No shipping label error received from carrier",
@@ -501,6 +503,8 @@
   "Select an issue": "Select an issue",
   "Select CSV": "Select CSV",
   "Select facility": "Select facility",
+  "Select Facility": "Select Facility",
+  "Search facilities": "Search facilities",
   "Select store": "Select store",
   "Select the column for the following information in the uploaded CSV.": "Select the column for the following information in the uploaded CSV.",
   "Select the fields you want to include in your export": "Select the fields you want to include in your export",

src/locales/es.json

@@ -211,6 +211,7 @@
   "Failed to update shipment method detail.": "Error al actualziar detalles metodo de envio.",
   "Failed to update tracking code settings.": "Error al actualizar la configuracion del codigo de seguimiento.",
   "Failed to update variance type.": "Error al actualizar el tipo de variante.",
+  "Fetching facilities": "Fetching facilities",
   "Fetching gift card info.": "Obteniendo información de gift card.",
   "Fetching order information...": "Obteniendo información del pedido...",
   "Fetching pickers": "Obteniendo recolectores",
@@ -304,6 +305,7 @@
   "No channels found": "No se encontraron canales",
   "No data available": "¡No hay datos disponibles!",
   "No data found": "No se encontro dato",
+  "No facilities found": "No facilities found",
   "No rejection reasons found.": "No se encontro razon de rechazo.",
   "No shipments have been shipped yet": "Aún no se han enviado envíos",
   "No shipping label error received from carrier": "No se encontraron datos.",
@@ -498,6 +500,8 @@
   "Select an issue": "Selecciona un problema",
   "Select CSV": "Seleccionar CSV",
   "Select facility": "Seleccionar instalación",
+  "Select Facility": "Select Facility",
+  "Search facilities": "Search facilities",
   "Select store": "Seleccionar tienda",
   "Select the column for the following information in the uploaded CSV.": "Selecciona la columna para la siguiente información en el CSV cargado.",
   "Select the fields you want to include in your export": "Selecciona los campos que deseas incluir en tu exportación",

src/locales/ja.json

@@ -214,6 +214,7 @@
   "Failed to update shipment method detail.": "Failed to update shipment method detail.",
   "Failed to update tracking code settings.": "追跡コード設定の更新に失敗しました。",
   "Failed to update variance type.": "変動タイプの更新に失敗しました。",
+  "Fetching facilities": "Fetching facilities",
   "Fetching gift card info.": "Fetching gift card info.",
   "Fetching time zones": "タイムゾーンの取得中",
   "Fetching order information...": "注文情報の取得中...",
@@ -304,6 +305,7 @@
   "No carrier found.": "キャリアが見つかりません。",
   "No data available": "データがありません",
   "No data found": "何もデータが見つかりませんでした",
+  "No facilities found": "No facilities found",
   "No rejection reasons found.": "拒否理由が見つかりません。",
   "No shipments have been shipped yet": "まだ出荷された出荷はありません",
   "No shipping label error received from carrier.": "キャリアから配送ラベルエラーは受信されていません",
@@ -498,6 +500,8 @@
   "Select an issue": "問題を選択",
   "Select CSV": "CSVを選択",
   "Select facility": "施設を選択",
+  "Select Facility": "Select Facility",
+  "Search facilities": "Search facilities",
   "Select store": "ストアを選択",
   "Select the column for the following information in the uploaded CSV.": "アップロードされたCSV内の次の情報に対する列を選択。",
   "Select the fields you want to include in your export": "エクスポートに含めるフィールドを選択",

src/main.ts

@@ -31,8 +31,8 @@ import permissionRules from '@/authorization/Rules';
 import permissionActions from '@/authorization/Actions';
 import { dxpComponents } from '@hotwax/dxp-components';
 import { login, logout, loader } from '@/utils/user';
-import { getConfig, fetchGoodIdentificationTypes, getProductIdentificationPref, initialise, setProductIdentificationPref, setUserLocale, setUserTimeZone,
-  getAvailableTimeZones } from './adapter';
+import { getConfig, fetchGoodIdentificationTypes, getProductIdentificationPref, getUserFacilities, getUserPreference, initialise, setProductIdentificationPref, setUserLocale, getAvailableTimeZones, setUserTimeZone, 
+  setUserPreference } from './adapter';
 import localeMessages from '@/locales';
 import { addNotification, storeClientRegistrationToken } from '@/utils/firebase';
 
@@ -70,6 +70,9 @@ const app = createApp(App)
     setUserTimeZone,
     storeClientRegistrationToken,
     getAvailableTimeZones,
+    getUserFacilities,
+    setUserPreference,
+    getUserPreference,
     hasPermission
   });
 

src/services/UtilService.ts

@@ -1,7 +1,7 @@
 import { api, hasError } from '@/adapter';
 import logger from '@/logger';
 import store from '@/store';
-import { isPdf } from '@/utils';
+import { isPdf, getCurrentFacilityId } from '@/utils';
 
 const fetchShipmentMethods = async (query: any): Promise <any>  => {
   return api({
@@ -37,7 +37,7 @@ const findShipmentIdsForOrders = async(picklistBinIds: Array<string>, orderIds:
       "primaryOrderId_op": "in",
       "picklistBinId": picklistBinIds,
       "picklistBinId_op": "in",
-      "originFacilityId": store.state.user.currentFacility.facilityId,
+      "originFacilityId": getCurrentFacilityId(),
       "statusId": statusId,
       "statusId_op": "in"
     },

src/store/modules/carrier/actions.ts

@@ -7,7 +7,7 @@ import * as types from './mutation-types'
 import logger from '@/logger'
 import store from '@/store';
 import { translate } from '@hotwax/dxp-components';
-import { showToast, isValidCarrierCode, isValidDeliveryDays } from '@/utils';
+import { showToast, isValidCarrierCode, isValidDeliveryDays, getCurrentFacilityId } from '@/utils';
 
 
 const actions: ActionTree<CarrierState, RootState> = {
@@ -358,14 +358,14 @@ const actions: ActionTree<CarrierState, RootState> = {
   async fetchFacilityCarriers({ state, commit }, payload) {
     let facilityCarriers  = [] as any;
     let viewIndex = 0, resp, docCount = 0;
-    
+
     try {
       do {
         const params = {
           "entityName": "FacilityAndParty",
           "inputFields": {
             "roleTypeId": "CARRIER",
-            "facilityId": this.state.user.currentFacility.facilityId
+            "facilityId": getCurrentFacilityId()
           },
           "fieldList": ["facilityId", "partyId", "firstName", "lastName", "groupName", "roleTypeId", "fromDate"],
           "noConditionFind": "Y",