Merge remote-tracking branch 'upstream/main' into #280-i18n-update

package.json

@@ -17,7 +17,7 @@
     "@capacitor/ios": "^2.5.0",
     "@hotwax/app-version-info": "^1.0.0",
     "@hotwax/apps-theme": "^1.2.6",
-    "@hotwax/dxp-components": "^1.12.1",
+    "@hotwax/dxp-components": "^1.12.2",
     "@hotwax/oms-api": "^1.13.0",
     "@ionic/core": "~7.6.0",
     "@ionic/vue": "~7.6.0",

src/adapter/index.ts

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

src/services/UserService.ts

@@ -1,6 +1,5 @@
-import { api, client } from '@/adapter'
+import { api, client, hasError } from '@/adapter'
 import store from '@/store';
-import { hasError } from '@/utils';
 
 const login = async (username: string, password: string): Promise <any> => {
   return api({

src/store/modules/party/actions.ts

@@ -3,7 +3,7 @@ import { ActionTree } from 'vuex'
 import RootState from '@/store/RootState'
 import PartyState from './PartyState'
 import * as types from './mutation-types'
-import { hasError } from '@/utils'
+import { hasError } from '@/adapter'
 
 
 const actions: ActionTree<PartyState, RootState> = {

src/store/modules/picklist/actions.ts

@@ -3,7 +3,8 @@ import RootState from '@/store/RootState'
 import PicklistState from './PicklistState'
 import * as types from './mutation-types'
 import { PicklistService } from '@/services/PicklistService'
-import { hasError, showToast } from '@/utils'
+import { showToast } from '@/utils'
+import { hasError } from '@/adapter'
 import { translate } from '@hotwax/dxp-components'
 
 const actions: ActionTree<PicklistState, RootState> = {

src/store/modules/product/actions.ts

@@ -3,7 +3,7 @@ import RootState from '@/store/RootState'
 import ProductState from './ProductState'
 import * as types from './mutation-types'
 import { ProductService } from '@/services/ProductService'
-import { hasError } from '@/utils'
+import { hasError } from '@/adapter'
 
 const actions: ActionTree<ProductState, RootState> = {
 
@@ -12,15 +12,9 @@ const actions: ActionTree<ProductState, RootState> = {
    */
   async fetchProducts ( { commit, state }, { productIds }) {
     const cachedProductIds = Object.keys(state.cached);
-    const productIdFilter= productIds.reduce((filter: string, productId: any) => {
-      if (filter !== '') filter += ' OR '
-      // If product already exist in cached products skip
-      if (cachedProductIds.includes(productId)) {
-        return filter;
-      } else {
-        return filter += productId;
-      }
-    }, '');
+    const remainingProductIds = productIds.filter((productId: any) => !cachedProductIds.includes(productId))
+
+    const productIdFilter = remainingProductIds.join(' OR ')
 
     // If there are no products skip the API call
     if (productIdFilter === '') return;

src/store/modules/user/actions.ts

@@ -3,11 +3,10 @@ import { ActionTree } from 'vuex'
 import RootState from '@/store/RootState'
 import UserState from './UserState'
 import * as types from './mutation-types'
-import { hasError, showToast } from '@/utils'
-import { translate } from '@hotwax/dxp-components'
+import { showToast } from '@/utils'
 import { Settings } from 'luxon';
-import { logout, updateInstanceUrl, updateToken, resetConfig } from '@/adapter'
-import { useAuthStore, useProductIdentificationStore } from '@hotwax/dxp-components'
+import { hasError, logout, updateInstanceUrl, updateToken, resetConfig } from '@/adapter'
+import { useAuthStore, useProductIdentificationStore, translate} from '@hotwax/dxp-components'
 import emitter from '@/event-bus'
 import router from '@/router';
 

src/utils/index.ts

@@ -3,11 +3,6 @@ import { DateTime } from "luxon";
 
 // TODO Use separate files for specific utilities
 
-// TODO Remove it when HC APIs are fully REST compliant
-const hasError = (response: any) => {
-    return !!response.data._ERROR_MESSAGE_ || !!response.data._ERROR_MESSAGE_LIST_;
-}
-
 const showToast = async (message: string) => {
     const toast = await toastController
         .create({
@@ -26,4 +21,4 @@ const handleDateTimeInput = (dateTimeValue: any) => {
   return DateTime.fromISO(dateTime).toMillis()
 }
 
-export { showToast, hasError, handleDateTimeInput }
+export { showToast, handleDateTimeInput }

src/views/TimezoneModal.vue

@@ -67,7 +67,7 @@ import { defineComponent } from "vue";
 import { close, save } from "ionicons/icons";
 import { useStore } from "@/store";
 import { UserService } from "@/services/UserService";
-import { hasError } from '@/utils'
+import { hasError } from '@/adapter';
 import { DateTime } from 'luxon';
 import { translate } from "@hotwax/dxp-components";