Merge branch 'main' into #139

hotwax · Mar 20, 2024 · c30b87c · c30b87c
2 parents 48a090f + 3607bee
commit c30b87c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/.github/workflows/common-firebase-hosting-release.yml b/.github/workflows/common-firebase-hosting-release.yml
@@ -51,3 +51,16 @@ jobs:
             run: firebase deploy --token "$HOTWAX_PUBLIC_SECRET" -m "Deploying via GitHub actions"  --only hosting:uat
             env:
                 HOTWAX_PUBLIC_SECRET: ${{ secrets.HOTWAX_PUBLIC_SECRET }}
+    release:
+        runs-on: ubuntu-latest
+
+        steps:
+          - uses: actions/checkout@v2
+          - name: "Fetch release tag"
+            run: |
+              echo "LABEL=$(git describe --tags `git rev-list --tags --max-count=1`)" >> $GITHUB_ENV
+      
+          - name: "Create label"
+            run: gh label create "release-${{ env.LABEL }}" --color FF7F7E
+            env:
+              GH_TOKEN: ${{ secrets.HOTWAX_PUBLIC_SECRET }}
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.12.1",
+  "version": "1.12.2",
   "description": "",
   "type": "module",
   "main": "lib/index.cjs",

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", "productId", "sku", "title", "SHOPIFY_PROD_SKU"]
+      productIdentificationOptions: ["productId", "groupId", "groupName", "internalName", "parentProductName", "primaryProductCategoryName", "sku", "title", "SHOPIFY_PROD_SKU"]
     }
   },
   getters: {

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -2,7 +2,7 @@ import { toastController } from "@ionic/vue";
 import { translate } from "src";
 
 const goToOms = (token: string, oms: string) => {
-  const link = (oms.startsWith('http') ? oms.replace(/api\/?/, "") : `https://${oms}.hotwax.io/`) + `commerce/control/main?token=${token}`
+  const link = (oms.startsWith('http') ? oms.replace(/\/api\/?|\/$/, "") : `https://${oms}.hotwax.io`) + `/commerce/control/main?token=${token}`
 
   window.open(link, '_blank', 'noopener, noreferrer')
 }