Merge branch 'main' into #326re7p

hotwax · Dec 8, 2022 · 6269e09 · 6269e09
2 parents 82dd0c0 + bf62afd
commit 6269e09
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "import",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": true,
   "description": "Import App",
   "scripts": {

diff --git a/release-notes.md b/release-notes.md
@@ -1,3 +1,12 @@
+# Release 1.1.1
+
+## What's Changed
+* Updated the position of file name label (#31fu19p) by @k2maan in https://github.com/hotwax/import/pull/103
+* Fixed: Create new mapping should not show currently selected mapping name(#326r8mq) by @shashwatbangar in https://github.com/hotwax/import/pull/109
+* Fixed: User should not be able to select a mapping before uploading a file(#326r315) by @shashwatbangar in https://github.com/hotwax/import/pull/108
+
+
+**Full Changelog**: https://github.com/hotwax/import/compare/v1.1.0...v1.1.1
 
 # Release 1.1.0
 

diff --git a/src/views/PurchaseOrder.vue b/src/views/PurchaseOrder.vue
@@ -17,7 +17,7 @@
         </ion-item> 
         <ion-item lines="none">
           <ion-label>{{ $t("Select mapping") }}</ion-label>
-          <ion-select :disabled="!Object.keys(fieldMappings).length" interface="popover" @ionChange="mapFields">
+          <ion-select :disabled="!Object.keys(fieldMappings).length || !file" interface="popover" @ionChange="mapFields">
             <ion-select-option v-for="mapping in fieldMappings" :value="mapping" :key="mapping?.mappingPrefId">{{ mapping?.mappingPrefName }}</ion-select-option>
           </ion-select>
         </ion-item>     
@@ -204,7 +204,6 @@ export default defineComponent({
             }
           })
           this.fieldMapping = fieldMapping.mappingPrefValue;
-          this.mappingName = fieldMapping.mappingPrefName; 
         }
       },
       areAllFieldsSelected() {