From 11e7e8ac16d1f5443fc8af1df0efb631e1f69f74 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Tue, 26 Sep 2023 18:42:28 +0530
Subject: [PATCH 1/3] Implemented: centralized oms instance navigator in
 settings page from dxp-components (#177)

---
 src/views/Settings.vue | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index cc08a219a..05fa7cc4a 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -34,23 +34,7 @@
         <h1>{{ $t('OMS') }}</h1>
       </div>
       <section>
-        <ion-card>
-          <ion-card-header>
-            <ion-card-subtitle>
-              {{ $t("OMS instance") }}
-            </ion-card-subtitle>
-            <ion-card-title>
-              {{ instanceUrl }}
-            </ion-card-title>
-          </ion-card-header>
-          <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" fill="clear">
-            {{ $t('Go to OMS') }}
-            <ion-icon slot="end" :icon="openOutline" />
-          </ion-button>
-        </ion-card>
+        <OmsInstanceNavigator />
 
         <ion-card>
           <ion-card-header>
@@ -322,9 +306,6 @@ export default defineComponent({
     setConfigurePickerPreference (ev: any){
       this.store.dispatch('user/setUserPreference', { configurePicker: ev.detail.checked })
     },
-    goToOms(){
-      window.open(this.instanceUrl.startsWith('http') ? this.instanceUrl.replace('api/', "") : `https://${this.instanceUrl}.hotwax.io/`, '_blank', 'noopener, noreferrer');
-    },
     getDateTime(time: any) {
       return DateTime.fromMillis(time).toLocaleString(DateTime.DATETIME_MED);
     },

From 787477362d89dca9d9327acfd381af5ebbbac0a3 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Tue, 26 Sep 2023 18:51:43 +0530
Subject: [PATCH 2/3] Improved: added webpack configuration in vue.config file
 (#177)

---
 vue.config.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/vue.config.js b/vue.config.js
index 34823164b..d6c807fda 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,3 +1,4 @@
+const path = require('path')
 require("@hotwax/app-version-info")
 module.exports = {
   pluginOptions: {
@@ -12,6 +13,13 @@ module.exports = {
       enableInSFC: true
     }
   },
+  configureWebpack: {
+    resolve: {
+      alias: {
+        vue: path.resolve('./node_modules/vue')
+      }
+    }
+  },
   runtimeCompiler: true,
   transpileDependencies: ['@hotwax/dxp-components']
 }

From ca2494dcec1b4a5ac826b24939e9190c14c92c66 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 9 Oct 2023 16:56:52 +0530
Subject: [PATCH 3/3] Fixed: unused instanceUrl getter on settings page
 (dxp/177)

---
 src/views/Settings.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 05fa7cc4a..cafc7a27a 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -244,7 +244,6 @@ export default defineComponent({
       userProfile: 'user/getUserProfile',
       currentFacility: 'user/getCurrentFacility',
       currentEComStore: 'user/getCurrentEComStore',
-      instanceUrl: 'user/getInstanceUrl',
       configurePicker: "user/configurePicker",
       showShippingOrders: 'user/showShippingOrders',
       showPackingSlip: 'user/showPackingSlip',