Merge branch 'main' of https://github.com/hotwax/receiving into recei…

…ving/#138

package.json

@@ -1,6 +1,6 @@
 {
   "name": "receiving",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "private": true,
   "description": "HotWax Commerce Receiving App",
   "scripts": {
@@ -18,7 +18,7 @@
     "@hotwax/app-version-info": "^1.0.0",
     "@hotwax/apps-theme": "^1.1.0",
     "@hotwax/dxp-components": "file:../dxp-components",
-    "@hotwax/oms-api": "^1.6.0",
+    "@hotwax/oms-api": "^1.9.0",
     "@ionic/core": "6.7.5",
     "@ionic/vue": "6.7.5",
     "@ionic/vue-router": "6.7.5",

src/App.vue

@@ -60,7 +60,8 @@ export default defineComponent({
       }
     },
     async unauthorized() {
-      this.store.dispatch("user/logout");
+      // Mark the user as unauthorised, this will help in not making the logout api call in actions
+      this.store.dispatch("user/logout", { isUserUnauthorised: true });
       const redirectUrl = window.location.origin + '/login';
       window.location.href = `${process.env.VUE_APP_LOGIN_URL}?redirectUrl=${redirectUrl}`;
     }

src/adapter/index.ts

@@ -1,9 +1,11 @@
-import { api, client, initialise, resetConfig, updateInstanceUrl, updateToken } from '@hotwax/oms-api'
+import { api, client, getConfig, initialise, logout, resetConfig, updateInstanceUrl, updateToken } from '@hotwax/oms-api'
 
 export {
   api,
   client,
+  getConfig,
   initialise,
+  logout,
   resetConfig,
   updateInstanceUrl,
   updateToken

src/main.ts

@@ -34,6 +34,7 @@ import permissionRules from '@/authorization/Rules';
 import permissionActions from '@/authorization/Actions';
 import { dxpComponents } from '@hotwax/dxp-components'
 import { login, logout, loader } from './user-utils';
+import { getConfig, initialise } from '@/adapter'
 
 const app = createApp(App)
   .use(IonicVue, {
@@ -51,7 +52,9 @@ const app = createApp(App)
     login,
     logout,
     loader,
-    appLoginUrl: process.env.VUE_APP_LOGIN_URL as string
+    appLoginUrl: process.env.VUE_APP_LOGIN_URL as string,
+    getConfig: getConfig,
+    initialise: initialise
   });
 
 // Filters are removed in Vue 3 and global filter introduced https://v3.vuejs.org/guide/migration/filters.html#global-filters

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 { updateInstanceUrl, updateToken, resetConfig } from '@/adapter'
+import { logout, updateInstanceUrl, updateToken, resetConfig } from '@/adapter'
 import {
   getServerPermissionsFromRules,
   prepareAppPermissions,
@@ -103,7 +103,13 @@ const actions: ActionTree<UserState, RootState> = {
   /**
    * Logout user
    */
-  async logout ({ commit }) {
+  async logout ({ commit }, payload) {
+    // Calling the logout api to flag the user as logged out, only when user is authorised
+    // if the user is already unauthorised then not calling the logout api as it returns 401 again that results in a loop, thus there is no need to call logout api if the user is unauthorised
+    if(!payload?.isUserUnauthorised) {
+      await logout();
+    }
+
     const authStore = useAuthStore()
 
     // TODO add any other tasks if need

src/user-utils/index.ts

@@ -4,7 +4,7 @@ import { loadingController } from '@ionic/vue'
 
 const login = async (payload: any) => store.dispatch('user/login', payload);
 
-const logout = async () => store.dispatch('user/logout');
+const logout = async (payload: any) => store.dispatch('user/logout', payload);
 
 const loader = {
   value: null as any,

src/views/Shipments.vue

@@ -104,12 +104,14 @@ export default defineComponent({
         "inputFields": {
           "destinationFacilityId": this.user.facilityId,
           "statusId": "PURCH_SHIP_SHIPPED",
-          "shipmentTypeId_fld0_value": "INCOMING_SHIPMENT",
-          "shipmentTypeId_fld0_op": "equals",
-          "shipmentTypeId_fld0_grp": "1",
-          "parentTypeId_fld0_value": "INCOMING_SHIPMENT",
-          "parentTypeId_fld0_op": "equals",
-          "parentTypeId_fld0_grp": "2",
+          "grp_op": "AND",
+          "shipmentTypeId_value": "INCOMING_SHIPMENT",
+          "shipmentTypeId_op": "equals",
+          "shipmentTypeId_grp": "1",
+          "parentTypeId_value": "INCOMING_SHIPMENT",
+          "parentTypeId_op": "equals",
+          "parentTypeId_grp": "1",
+          "grp_op_1": "OR"
         },
         "entityName": "ShipmentAndTypeAndItemCount",
         "fieldList" : [ "shipmentId","primaryShipGroupSeqId","partyIdFrom","partyIdTo","estimatedArrivalDate","destinationFacilityId","statusId", "shipmentItemCount", "externalId", "externalOrderId", "shipmentTypeId" ],
@@ -121,11 +123,12 @@ export default defineComponent({
           payload.inputFields["shipmentId_value"] = this.queryString
           payload.inputFields["shipmentId_op"] = 'contains'
           payload.inputFields["shipmentId_ic"] = 'Y'
-          payload.inputFields["shipmentId_grp"] = '1'
+          payload.inputFields["shipmentId_grp"] = '2'
           payload.inputFields["externalOrderId_value"] = this.queryString
           payload.inputFields["externalOrderId_op"] = 'contains'
           payload.inputFields["externalOrderId_ic"] = 'Y'
           payload.inputFields["externalOrderId_grp"] = '2'
+          payload.inputFields["grp_op_2"] = 'OR'
       }
       await this.store.dispatch("shipment/findShipment", payload);
       this.fetchingShipments = false;