Merge branch 'main' of https://github.com/hotwax/dxp-components into h…

…otwax#270
amansinghbais · Oct 14, 2024 · 3cc76f4 · 3cc76f4
2 parents 7dfbbad + be965ca
commit 3cc76f4
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hotwax/dxp-components",
-  "version": "1.15.2",
+  "version": "1.15.3",
   "description": "",
   "type": "module",
   "main": "lib/index.cjs",

diff --git a/src/components/DxpOmsInstanceNavigator.vue b/src/components/DxpOmsInstanceNavigator.vue
@@ -11,7 +11,7 @@
     <ion-card-content>
       {{ $t('This is the name of the OMS you are connected to right now. Make sure that you are connected to the right instance before proceeding.') }}
     </ion-card-content>
-    <ion-button @click="goToOms(token.value, oms)" fill="clear" :disabled="!appContext.hasPermission('APP_COMMERCE_VIEW')">
+    <ion-button @click="goToOms(token.value, oms)" fill="clear" :disabled="!appContext.hasPermission(appContext.Actions.APP_COMMERCE_VIEW)">
       {{ $t('Go to OMS') }}
       <ion-icon slot="end" :icon="openOutline" />
     </ion-button>

diff --git a/src/components/DxpProductIdentifier.vue b/src/components/DxpProductIdentifier.vue
@@ -11,12 +11,12 @@
       {{ 'Choosing a product identifier allows you to view products with your preferred identifiers.' }}
     </ion-card-content>
 
-    <ion-item>
+    <ion-item :disabled="!appContext.hasPermission(appContext.Actions.APP_PRODUCT_IDENTIFIER_UPDATE)">
       <ion-select :label="$t('Primary')" interface="popover" :placeholder="'primary identifier'" :value="productIdentificationPref.primaryId" @ionChange="setProductIdentificationPref($event.detail.value, 'primaryId')">
         <ion-select-option v-for="identification in productIdentificationOptions" :key="identification" :value="identification" >{{ identification }}</ion-select-option>
       </ion-select>
     </ion-item>
-    <ion-item lines="none">
+    <ion-item lines="none" :disabled="!appContext.hasPermission(appContext.Actions.APP_PRODUCT_IDENTIFIER_UPDATE)">
       <ion-select :label="$t('Secondary')" interface="popover" :placeholder="'secondary identifier'" :value="productIdentificationPref.secondaryId" @ionChange="setProductIdentificationPref($event.detail.value, 'secondaryId')">
         <ion-select-option v-for="identification in productIdentificationOptions" :key="identification" :value="identification" >{{ identification }}</ion-select-option>
         <ion-select-option value="">{{ "None" }}</ion-select-option>

diff --git a/src/index.ts b/src/index.ts
@@ -109,6 +109,7 @@ export let dxpComponents = {
     loginContext.getConfig = options.getConfig
     loginContext.initialise = options.initialise
 
+    appContext.Actions = options.Actions
     appContext.hasPermission = options.hasPermission
 
     // set a default locale in the state

diff --git a/src/store/productIdentification.ts b/src/store/productIdentification.ts
@@ -8,7 +8,7 @@ export const useProductIdentificationStore = defineStore('productIdentification'
         primaryId: '',
         secondaryId: ''
       },
-      productIdentificationOptions: ["productId", "groupId", "groupName", "internalName", "parentProductName", "primaryProductCategoryName", "sku", "title", "SHOPIFY_PROD_SKU"]
+      productIdentificationOptions: ["productId", "groupId", "groupName", "internalName", "parentProductName", "primaryProductCategoryName", "sku", "title", "SHOPIFY_PROD_SKU", "upc"]
     }
   },
   getters: {