Implemented: support to fetch all facilities for admin, updated local…

…es for missing static text(#232)
hotwax · Dec 19, 2023 · ccb60a0 · ccb60a0
1 parent fa84b66
commit ccb60a0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/src/adapter/index.ts b/src/adapter/index.ts
@@ -1,9 +1,10 @@
-import { api, client, getConfig, initialise, logout, resetConfig, updateInstanceUrl, updateToken } from '@hotwax/oms-api'
+import { api, client, getConfig, getUserFacilities, initialise, logout, resetConfig, updateInstanceUrl, updateToken } from '@hotwax/oms-api'
 
 export {
   api,
   client,
   getConfig,
+  getUserFacilities,
   initialise,
   logout,
   resetConfig,

diff --git a/src/authorization/Rules.ts b/src/authorization/Rules.ts
@@ -5,5 +5,6 @@ export default {
     "APP_VARIANCE_LOG": "FULFILL_INVCUNT_ADMIN OR INV_COUNT_ADMIN",
     "APP_INVNTRY_CNT_IMPORT": "",
     "APP_QOH_STNG_UPDATE": "COMMON_ADMIN",
+    "APP_INVCUNT_ADMIN": "COMMON_ADMIN",
     "INVENTORY_APP_VIEW": "INVENTORY_APP_VIEW"
 } as any 
diff --git a/src/locales/en.json b/src/locales/en.json
@@ -2,6 +2,7 @@
   "App": "App",
   "Are you sure you want to change the time zone to?": "Are you sure you want to change the time zone to {timeZoneId}?",
   "Authenticating": "Authenticating",
+  "Back to Launchpad": "Back to Launchpad",
   "Camera permission denied.": "Camera permission denied.",
   "Cancel": "Cancel",
   "Change": "Change",
@@ -28,6 +29,7 @@
   "Location": "Location",
   "Log variance": "Log variance",
   "Login": "Login",
+  "Login failed": "Login failed",
   "Logging in": "Logging in",
   "Logging out": "Logging out",
   "Logout": "Logout",
@@ -38,6 +40,7 @@
   "OMS": "OMS",
   "OMS instance": "OMS instance",
   "Password": "Password",
+  "Please contact the administrator.": "Please contact the administrator.",
   "Quantity": "Quantity",
   "Quantity on hand": "Quantity on hand",
   "Remove": "Remove",
@@ -74,5 +77,6 @@
   "Variance reason": "Variance reason",
   "Variance updated successfully": "Variance updated successfully",
   "View": "View",
+  "You do not have permission to access the app.": "You do not have permission to access the app.",
   "You do not have permission to access this page": "You do not have permission to access this page"
 }
diff --git a/src/store/modules/user/actions.ts b/src/store/modules/user/actions.ts
@@ -6,7 +6,7 @@ import * as types from './mutation-types'
 import { hasError, showToast } from '@/utils'
 import { translate } from '@/i18n'
 import { Settings } from 'luxon';
-import { logout, updateInstanceUrl, updateToken, resetConfig } from '@/adapter'
+import { getUserFacilities, logout, updateInstanceUrl, updateToken, resetConfig } from '@/adapter'
 import {
   getServerPermissionsFromRules,
   prepareAppPermissions,
@@ -15,6 +15,7 @@ import {
 } from '@/authorization'
 import { useAuthStore } from '@hotwax/dxp-components'
 import emitter from '@/event-bus'
+import store from '@/store'
 
 const actions: ActionTree<UserState, RootState> = {
 
@@ -55,6 +56,12 @@ const actions: ActionTree<UserState, RootState> = {
 
       const userProfile = await UserService.getUserProfile(token);
 
+      //fetching user facilities
+      const isAdminUser = appPermissions.some((appPermission: any) => appPermission?.action === "APP_INVCUNT_ADMIN" );
+      const baseURL = store.getters['user/getBaseUrl'];
+      const facilities = await getUserFacilities(token, baseURL, userProfile?.partyId, "", isAdminUser);
+      userProfile.facilities = facilities;
+
       // removing duplicate records as a single user can be associated with a facility by multiple roles.
       userProfile.facilities.reduce((uniqueFacilities: any, facility: any, index: number) => {
         if(uniqueFacilities.includes(facility.facilityId)) userProfile.facilities.splice(index, 1);

diff --git a/src/views/Settings.vue b/src/views/Settings.vue
@@ -48,7 +48,7 @@
           <ion-item lines="none">
             <ion-label>{{ $t("Select facility") }}</ion-label>
             <ion-select interface="popover" v-model="currentFacilityId" @ionChange="setFacility($event)">
-              <ion-select-option v-for="facility in (userProfile ? userProfile.facilities : [])" :key="facility.facilityId" :value="facility.facilityId" >{{ facility.name }}</ion-select-option>
+              <ion-select-option v-for="facility in (userProfile ? userProfile.facilities : [])" :key="facility.facilityId" :value="facility.facilityId" >{{ facility.facilityName }}</ion-select-option>
             </ion-select>
           </ion-item>
         </ion-card>