Merge pull request #354 from ymaheshwari1/#351

Fixed: issue of product identifier options desc not visible and incomplete options are visible on the settings page(#351)

Author: ymaheshwari1

package-lock.json

@@ -19,7 +19,7 @@
     "@casl/ability": "^6.0.0",
     "@hotwax/app-version-info": "^1.0.0",
     "@hotwax/apps-theme": "^1.2.6",
-    "@hotwax/dxp-components": "^1.15.4",
+    "@hotwax/dxp-components": "1.20.0",
     "@hotwax/oms-api": "1.14.0",
     "@ionic/core": "8.4.2",
     "@ionic/vue": "8.4.2",

package.json

@@ -35,6 +35,7 @@ import permissionActions from '@/authorization/Actions';
 import { setUserTimeZone, getAvailableTimeZones, setUserLocale} from '@/adapter'
 import localeMessages from './i18n/locales';
 import { getConfig, getProductIdentificationPref, initialise, setProductIdentificationPref } from '@/adapter'
+import { UtilService } from './services/UtilService';
 
 const app = createApp(App)
   .use(IonicVue, {
@@ -63,7 +64,8 @@ const app = createApp(App)
     getAvailableTimeZones,
     getProductIdentificationPref,
     setProductIdentificationPref,
-    hasPermission
+    hasPermission,
+    fetchGoodIdentificationTypes: UtilService.fetchGoodIdentificationTypes
   });
 
 // Filters are removed in Vue 3 and global filter introduced https://v3.vuejs.org/guide/migration/filters.html#global-filters

src/main.ts

@@ -1,5 +1,6 @@
 import { api } from '@/adapter';
 import store from '@/store';
+import { hasError } from '@hotwax/oms-api';
 
 const getServiceStatusDesc = async (payload: any): Promise<any> => {
   return api({
@@ -77,6 +78,37 @@ const fetchFacilities = async (payload: any): Promise<any> => {
   })
 }
 
+// TODO: remove this util service when the oms-api version is updated to 1.16.0
+const fetchGoodIdentificationTypes = async(parentTypeId = "HC_GOOD_ID_TYPE"): Promise<any> => {
+  const payload = {
+    "inputFields": {
+      "parentTypeId": parentTypeId,
+    },
+    "fieldList": ["goodIdentificationTypeId", "description"],
+    "viewSize": 50,
+    "entityName": "GoodIdentificationType",
+    "noConditionFind": "Y"
+  }
+  try {
+    const resp = await api({
+      url: "performFind",
+      method: "get",
+      params: payload
+    }) as any
+
+    if (!hasError(resp)) {
+      return Promise.resolve(resp.data.docs)
+    } else {
+      throw resp.data;
+    }
+  } catch (err) {
+    return Promise.reject({
+      code: 'error',
+      message: 'Something went wrong',
+      serverResponse: err
+    })
+  }
+}
 
 export const UtilService = {
   getServiceStatusDesc,
@@ -85,5 +117,6 @@ export const UtilService = {
   updateReserveInvConfig,
   updatePreOrdPhyInvHoldConfig,
   createPreOrdPhyInvHoldConfig,
-  fetchFacilities
+  fetchFacilities,
+  fetchGoodIdentificationTypes
 }