Improved: regex to remove duplicate / in some cases(#268)

hotwax · Mar 18, 2024 · ce2d6c9 · ce2d6c9
1 parent 82acf5c
commit ce2d6c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/views/InventoryReview.vue b/src/views/InventoryReview.vue
@@ -258,7 +258,7 @@ export default defineComponent({
                     text: translate('View'),
                     role: 'view',
                     handler: () => {
-                      const omsURL = (this.instanceUrl.startsWith('http') ? this.instanceUrl.replace(/api\/?/, "") : `https://${this.instanceUrl}.hotwax.io`) + `/commerce/control/ImportData?configId=RESET_INVENTORY`
+                      const omsURL = (this.instanceUrl.startsWith('http') ? this.instanceUrl.replace(/\/api\/?|\/$/, "") : `https://${this.instanceUrl}.hotwax.io`) + `/commerce/control/ImportData?configId=RESET_INVENTORY`
                       window.open(omsURL, '_blank');
                     }
                   }])

diff --git a/src/views/PurchaseOrderReview.vue b/src/views/PurchaseOrderReview.vue
@@ -283,7 +283,7 @@ export default defineComponent({
                   text: translate('View'),
                   role: 'view',
                   handler: () => {
-                    const omsURL = (this.instanceUrl.startsWith('http') ? this.instanceUrl.replace(/api\/?/, "") : `https://${this.instanceUrl}.hotwax.io`) + `/commerce/control/ImportData?configId=IMP_PO`
+                    const omsURL = (this.instanceUrl.startsWith('http') ? this.instanceUrl.replace(/\/api\/?|\/$/, "") : `https://${this.instanceUrl}.hotwax.io`) + `/commerce/control/ImportData?configId=IMP_PO`
                     window.open(omsURL, '_blank');
                   }
                 }])