Merge pull request #97 from ymaheshwari1/#31a00jh

Improved code to open external links in new tab and update sample date format on clicking save button(#31a00jh)
hotwax · Nov 21, 2022 · 1139d02 · 1139d02
2 parents 4243a5d + 5f85927
commit 1139d02
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
@@ -82,10 +82,10 @@
 
           <ion-card-content>
             {{ $t('Enter a custom date time format that you want to use when uploading documents to HotWax Commerce.') }}
-            <p>{{ $t('Luxon date time formats can be found') }} <a href="https://moment.github.io/luxon/#/formatting?id=presets">{{ $t("here") }}</a></p>
+            <p>{{ $t('Luxon date time formats can be found') }} <a target="_blank" rel="noopener noreferrer" href="https://moment.github.io/luxon/#/formatting?id=presets">{{ $t("here") }}</a></p>
           </ion-card-content> 
           <ion-item>
-            <ion-input clear-input='true' @keyup.enter="dateTimeFormat = $event.target.value; parse()" v-model="dateTimeFormat" :value="dateTimeFormat" />
+            <ion-input clear-input='true' @keyup.enter="dateTimeFormat = $event.target.value; parse()" v-model="dateTimeFormat" :value="dateTimeFormat" :placeholder="defaultDateTimeFormat" />
           </ion-item>
           <ion-item>
             <ion-label>{{ sampleDateTime }}</ion-label>
@@ -140,7 +140,8 @@ export default defineComponent({
     return {
       baseURL: process.env.VUE_APP_BASE_URL,
       sampleDateTime: '',
-      dateTimeFormat: ''
+      dateTimeFormat: '',
+      defaultDateTimeFormat: process.env.VUE_APP_DATE_FORMAT ? process.env.VUE_APP_DATE_FORMAT : 'MM/dd/yyyy'
     };
   },
   computed: {
@@ -156,10 +157,12 @@ export default defineComponent({
   },
   methods: {
     goToOms(){
-      window.location.href = this.instanceUrl.startsWith('http') ? this.instanceUrl.replace('api/', "") : `https://${this.instanceUrl}.hotwax.io/`;
+      window.open(this.instanceUrl.startsWith('http') ? this.instanceUrl.replace('api/', "") : `https://${this.instanceUrl}.hotwax.io/`, '_blank', 'noopener, noreferrer');
     },
     updateDateTimeFormat(){
+      this.dateTimeFormat = this.dateTimeFormat ? this.dateTimeFormat : this.defaultDateTimeFormat
       this.store.dispatch('user/setDateTimeFormat', this.dateTimeFormat);
+      this.parse();
     },
     async changeTimeZone() {
       const timeZoneModal = await modalController.create({