Merge pull request #99 from amansinghbais/facilities/#91

Fixed: facility id modal behavior on hitting enter to submit (#91)
hotwax · Dec 11, 2023 · 1af42d5 · 1af42d5
2 parents a6cb707 + cc62bd2
commit 1af42d5
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 24 deletions.
diff --git a/src/components/CustomMappingModal.vue b/src/components/CustomMappingModal.vue
@@ -22,29 +22,31 @@
         <p>{{ currentFacility.facilityName }}</p>
       </ion-item>
     </ion-list>
+    <form @keyup.enter="saveMapping" @submit.prevent>
+      <ion-list>
+        <ion-list-header>{{ translate("Custom mapping") }}</ion-list-header>
+        <ion-item>
+          <ion-label>{{ translate("Mapping ID") }}</ion-label>
+          <ion-input v-model="mappingId" placeholder="Mapping ID" />
+        </ion-item>
+        <ion-item>
+          <ion-label>{{ translate("Mapping Name") }}</ion-label>
+          <ion-input v-model="mappingName" placeholder="Mapping name" />
+        </ion-item>
+        <ion-item>
+          <ion-label>{{ translate("Identification") }}</ion-label>
+          <ion-input v-model="mappingValue" placeholder="Mapping Value" />
+        </ion-item>
+      </ion-list>
 
-    <ion-list>
-      <ion-list-header>{{ translate("Custom mapping") }}</ion-list-header>
-      <ion-item>
-        <ion-label>{{ translate("Mapping ID") }}</ion-label>
-        <ion-input v-model="mappingId" placeholder="Mapping ID" />
-      </ion-item>
-      <ion-item>
-        <ion-label>{{ translate("Mapping Name") }}</ion-label>
-        <ion-input v-model="mappingName" placeholder="Mapping name" />
-      </ion-item>
-      <ion-item>
-        <ion-label>{{ translate("Identification") }}</ion-label>
-        <ion-input v-model="mappingValue" placeholder="Mapping Value" />
-      </ion-item>
-    </ion-list>
+      <ion-fab vertical="bottom" horizontal="end" slot="fixed">
+        <ion-fab-button @click="saveMapping">
+          <ion-icon :icon="saveOutline" />
+        </ion-fab-button>
+      </ion-fab>
+    </form>
   </ion-content>
-  <ion-fab vertical="bottom" horizontal="end" slot="fixed">
-    <ion-fab-button @click="saveMapping">
-      <ion-icon :icon="saveOutline" />
-    </ion-fab-button>
-  </ion-fab>
-</template>
+  </template>
 
 <script lang="ts">
 import {

diff --git a/src/components/FacilityMappingModal.vue b/src/components/FacilityMappingModal.vue
@@ -11,7 +11,7 @@
   </ion-header>
 
   <ion-content>
-    <form @keyup.enter="saveMapping">
+    <form @keyup.enter="type && type === 'update' ? updateMapping() : saveMapping()" @submit.prevent>
       <ion-list>
         <ion-list-header>{{ translate("Facility details") }}</ion-list-header>
         <ion-item>

diff --git a/src/components/FacilityShopifyMappingModal.vue b/src/components/FacilityShopifyMappingModal.vue
@@ -11,7 +11,7 @@
   </ion-header>
 
   <ion-content>
-    <form @keyup.enter="saveMapping">
+    <form @keyup.enter="type && type === 'update' ? updateMapping() : saveMapping()" @submit.prevent>
       <ion-list>
         <ion-list-header>{{ translate("Facility details") }}</ion-list-header>
         <ion-item>
@@ -26,7 +26,7 @@
 
       <ion-list>
         <ion-list-header>{{ translate('Shopify location') }}</ion-list-header>
-        <ion-item>
+        <ion-item @keyup.enter.stop>
           <ion-label>{{ translate("Shopify store") }}</ion-label>
           <ion-label slot="end" v-if="type && type === 'update'">{{ shopifyFacilityMapping.shopId }}</ion-label>
           <ion-select v-else interface="popover" :placeholder="translate('Select')" v-model="shopId">