Merge pull request #247 from ymaheshwari1/#246

Improved: app to upgrade ionic to v7.6.0(#246)
hotwax · Mar 18, 2024 · 731b797 · 731b797
2 parents 5ef2594 + 883a772
commit 731b797
Show file tree

Hide file tree

Showing 15 changed files with 113 additions and 129 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,12 +16,12 @@
     "@capacitor/core": "^2.4.7",
     "@casl/ability": "^6.0.0",
     "@hotwax/app-version-info": "^1.0.0",
-    "@hotwax/apps-theme": "^1.1.0",
+    "@hotwax/apps-theme": "^1.2.6",
     "@hotwax/dxp-components": "^1.12.1",
     "@hotwax/oms-api": "^1.13.0",
-    "@ionic/core": "6.7.5",
-    "@ionic/vue": "6.7.5",
-    "@ionic/vue-router": "6.7.5",
+    "@ionic/core": "^7.6.0",
+    "@ionic/vue": "^7.6.0",
+    "@ionic/vue-router": "~7.6.0",
     "boon-js": "^2.0.3",
     "@types/file-saver": "^2.0.4",
     "@types/papaparse": "^5.3.1",

diff --git a/src/components/BulkAdjustmentModal.vue b/src/components/BulkAdjustmentModal.vue
@@ -13,26 +13,22 @@
   <ion-content>
     <ion-list>
       <ion-item lines="full">
-        <ion-label>{{ $t("Buffer days") }}</ion-label>
-        <ion-input v-model="bufferDays" type="number" :placeholder = "$t('Lead time')" min="1" /> 
+        <ion-input :label="$t('Buffer days')" v-model="bufferDays" type="number" :placeholder="$t('Lead time')" min="1" />
       </ion-item>
 
       <ion-item lines="full">
-        <ion-label>{{ $t("Order buffer") }}</ion-label>
-        <ion-input v-model="orderBuffer" type="number" :placeholder = "$t('Safety stock')" min="1" />
+        <ion-input :label="$t('Order buffer')" v-model="orderBuffer" type="number" :placeholder="$t('Safety stock')" min="1" />
       </ion-item>
 
       <ion-item>
-        <ion-label>{{ $t("Catalog") }}</ion-label>
-        <ion-select interface="popover" v-model="isNewProduct">
+        <ion-select :label="$t('Catalog')" interface="popover" v-model="isNewProduct">
           <ion-select-option value="N">{{ $t("Backorder") }}</ion-select-option>
           <ion-select-option value="Y">{{ $t("Preorder") }}</ion-select-option>
         </ion-select>
       </ion-item>
 
       <ion-item>
-        <ion-label>{{ $t("Facility") }}</ion-label>
-        <ion-select interface="popover" v-model="facilityId">
+        <ion-select :label="$t('Facility')" interface="popover" v-model="facilityId">
           <ion-select-option v-for="facility in facilities" :key="facility.facilityId" :value="facility.facilityId">{{ facility.facilityName }}</ion-select-option>
         </ion-select>
       </ion-item>
@@ -56,7 +52,6 @@ import {
   IonItem,
   IonIcon,
   IonInput,
-  IonLabel,
   IonList,
   IonSelect,
   IonSelectOption,
@@ -83,7 +78,6 @@ export default defineComponent({
     IonIcon,
     IonItem,
     IonInput,
-    IonLabel,
     IonList,
     IonSelect,
     IonSelectOption,

diff --git a/src/components/CreateMappingModal.vue b/src/components/CreateMappingModal.vue
@@ -11,25 +11,23 @@
   </ion-header>
 
   <ion-item>
-    <ion-label>{{ $t("Mapping name") }}</ion-label>
-    <ion-input :placeholder="$t('Field mapping name')" v-model="mappingName" />
+    <ion-input :label="$t('Mapping name')" :placeholder="$t('Field mapping name')" v-model="mappingName" />
   </ion-item>
 
   <ion-content class="ion-padding">
     <div>
       <ion-list>
         <ion-item :key="field" v-for="(fieldValues, field) in getFields()">
           <template v-if="field === 'productIdentification'">
-            <ion-select interface="popover" :placeholder = "$t('Select')" slot="start" v-model="identificationTypeId">
+            <ion-select aria-label="identification-type-id" interface="popover" :placeholder = "$t('Select')" v-model="identificationTypeId">
               <ion-select-option :key="goodIdentificationType.goodIdentificationTypeId" v-for="goodIdentificationType in goodIdentificationTypes">{{ goodIdentificationType.description }}</ion-select-option>
             </ion-select>
-            <ion-select interface="popover" v-if="content.length" :placeholder = "$t('Select')" slot="end" v-model="fieldMapping['productIdentification']">
+            <ion-select aria-label="identification-type-value" interface="popover" v-if="content.length" :placeholder = "$t('Select')" slot="end" v-model="fieldMapping['productIdentification']">
               <ion-select-option :key="index" v-for="(prop, index) in fileColumns">{{ prop }}</ion-select-option>
             </ion-select>
           </template>
           <template v-else>
-            <ion-label>{{ $t(fieldValues.label) }}</ion-label>
-            <ion-select interface="popover" :placeholder = "$t('Select')" v-model="fieldMapping[field]">
+            <ion-select :label="$t(fieldValues.label)" interface="popover" :placeholder = "$t('Select')" v-model="fieldMapping[field]">
               <ion-select-option :key="index" v-for="(prop, index) in fileColumns">{{ prop }}</ion-select-option>
             </ion-select>
           </template>
@@ -56,7 +54,6 @@ import {
   IonInput,
   IonTitle,
   IonToolbar,
-  IonLabel,
   IonItem,
   IonList,
   IonSelect,
@@ -84,7 +81,6 @@ export default defineComponent({
     IonSelectOption,
     IonTitle,
     IonToolbar,
-    IonLabel,
     IonItem,
     IonList
   },

diff --git a/src/components/DateTimeParseErrorModal.vue b/src/components/DateTimeParseErrorModal.vue
@@ -20,7 +20,7 @@
     </ion-item>
 
     <ion-item>
-      <ion-input clear-input='true' v-model="dateTimeFormat" :value="dateTimeFormat" />
+      <ion-input :clear-input='true' v-model="dateTimeFormat" :value="dateTimeFormat" />
     </ion-item>
 
     <ion-item>

diff --git a/src/components/MappingConfiguration.vue b/src/components/MappingConfiguration.vue
@@ -1,17 +1,13 @@
 <template>
   <section>
     <ion-item>
-      <ion-label>{{ $t("Mapping name") }}</ion-label>
-      <ion-input v-model="currentMapping.name" />
+      <ion-input :label="$t('Mapping name')" v-model="currentMapping.name" />
     </ion-item>
 
     <ion-list>
-
       <ion-item :key="field" v-for="(fieldValues, field) in getFields()">
-        <ion-label>{{ $t(fieldValues.label) }}</ion-label>
-        <ion-input v-model="currentMapping.value[field]" />
+        <ion-input :label="$t(fieldValues.label)" v-model="currentMapping.value[field]" />
       </ion-item>
-
     </ion-list>
 
     <div class="ion-padding-top actions desktop-only">
@@ -46,7 +42,6 @@ import {
   IonButton,
   IonIcon,
   IonInput,
-  IonLabel,
   IonItem,
   IonList
 } from "@ionic/vue";
@@ -62,7 +57,6 @@ export default defineComponent({
     IonButton,
     IonIcon,
     IonInput,
-    IonLabel,
     IonItem,
     IonList
   },

diff --git a/src/components/MissingFacilitiesModal.vue b/src/components/MissingFacilitiesModal.vue
@@ -13,11 +13,11 @@
   <ion-content>
     <ion-list>
       <ion-item v-for="(items, facilityId) in itemsByFacilityId" :key="facilityId" lines="full">
-        <ion-label>
-          {{ facilityId }}
-          <p>{{ items?.length }} {{ $t("line items") }}</p>
-        </ion-label>
-        <ion-select interface="popover" slot="end" :placeholder="$t('Map facility')" @ionChange="updateFacility($event, facilityId)">
+        <ion-select interface="popover" :placeholder="$t('Map facility')" @ionChange="updateFacility($event, facilityId)">
+          <ion-label slot="label">
+            {{ facilityId }}
+            <p>{{ items?.length }} {{ $t("line items") }}</p>
+          </ion-label>
           <ion-select-option v-for="facility in facilities" :key="facility.facilityId" :value="facility.facilityId">{{ facility.facilityName }}</ion-select-option>
         </ion-select>
       </ion-item>