From 3eacee9ca000955f691f5980c9b166b9d4f0898b Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Wed, 10 Jul 2024 12:44:35 +0200
Subject: [PATCH] Small inventory fixes [SCI-10835][SCI-10847][SCI-10844]

---
 .../vue/repositories/modals/import/mapping_step.vue    |  5 ++++-
 .../modals/import/mapping_step_table_row.vue           |  1 +
 .../vue/repositories/modals/import/preview_step.vue    |  2 +-
 app/javascript/vue/shared/select_dropdown.vue          |  2 +-
 config/locales/en.yml                                  | 10 +++++-----
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/javascript/vue/repositories/modals/import/mapping_step.vue b/app/javascript/vue/repositories/modals/import/mapping_step.vue
index f2e0795d6..4b426b470 100644
--- a/app/javascript/vue/repositories/modals/import/mapping_step.vue
+++ b/app/javascript/vue/repositories/modals/import/mapping_step.vue
@@ -80,7 +80,7 @@
           <button class="btn btn-secondary ml-auto" @click="close" aria-label="Close">
             {{ i18n.t('repositories.import_records.steps.step2.cancelBtnText') }}
           </button>
-          <button class="btn btn-primary" @click="importRecords">
+          <button class="btn btn-primary" :disabled="!canSubmit" @click="importRecords">
             {{ i18n.t('repositories.import_records.steps.step2.confirmBtnText') }}
           </button>
         </div>
@@ -203,6 +203,9 @@ export default {
       const importedSum = this.selectedItems.filter((i) => i.key).length;
       const ignoredSum = this.selectedItems.length - importedSum;
       return { importedSum, ignoredSum };
+    },
+    canSubmit() {
+      return this.selectedItems.filter((i) => i.key).length > 0;
     }
   },
   created() {
diff --git a/app/javascript/vue/repositories/modals/import/mapping_step_table_row.vue b/app/javascript/vue/repositories/modals/import/mapping_step_table_row.vue
index 872b45dbb..297ff85ec 100644
--- a/app/javascript/vue/repositories/modals/import/mapping_step_table_row.vue
+++ b/app/javascript/vue/repositories/modals/import/mapping_step_table_row.vue
@@ -23,6 +23,7 @@
         :clearable="true"
         :size="'sm'"
         class="max-w-96"
+        :searchable="true"
         :class="{
           'outline-sn-alert-brittlebush outline-1 outline rounded': computeMatchNotFound
         }"
diff --git a/app/javascript/vue/repositories/modals/import/preview_step.vue b/app/javascript/vue/repositories/modals/import/preview_step.vue
index c5adc9909..75bcd6f35 100644
--- a/app/javascript/vue/repositories/modals/import/preview_step.vue
+++ b/app/javascript/vue/repositories/modals/import/preview_step.vue
@@ -72,7 +72,7 @@
             {{ i18n.t('general.back') }}
           </button>
           <button type="button" class="btn btn-primary" @click="$emit('importRows')">
-            {{ i18n.t('repositories.import_records.steps.step3.confirm') }}
+            {{ i18n.t('repositories.import_records.steps.step3.import') }}
           </button>
         </div>
       </div>
diff --git a/app/javascript/vue/shared/select_dropdown.vue b/app/javascript/vue/shared/select_dropdown.vue
index d44564b41..6fc507da2 100644
--- a/app/javascript/vue/shared/select_dropdown.vue
+++ b/app/javascript/vue/shared/select_dropdown.vue
@@ -30,7 +30,7 @@
              :placeholder="placeholderRender"
              @keyup="fetchOptions"
              @change.stop
-             class="w-full border-0 outline-none pl-0 placeholder:text-sn-grey" />
+             class="w-full bg-transparent border-0 outline-none pl-0 placeholder:text-sn-grey" />
       </template>
       <div v-else class="flex items-center gap-1 flex-wrap">
         <div v-for="tag in tags" class="px-2 py-1 rounded-sm bg-sn-super-light-grey grid grid-cols-[auto_1fr] items-center gap-1">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 958c518f3..e48b383cc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2038,7 +2038,7 @@ en:
       error_searching: "Error searching, please try again"
       button_tooltip:
         new: "Create new item"
-        import: "Update inventory"
+        import: "Import items"
         filters: "Filters"
         search: "Quick search"
       filters:
@@ -2213,7 +2213,7 @@ en:
           importTitle: 'Import'
           importBtnText: 'Import'
           cancelBtnText: 'Cancel'
-          dragAndDropSupportingText: '.xlsx, .xls, .csv or .txt file'
+          dragAndDropSupportingText: '.csv, .xlsx, .txt or .tsv file'
         step2:
           id: 'step2'
           icon: 'sn-icon-open'
@@ -2250,7 +2250,7 @@ en:
             RepositoryDateTimeValue: 'Date-time'
             RepositoryDateValue: 'Date'
             RepositoryTimeValue: 'Time'
-            RepositoryListValue: 'List'
+            RepositoryListValue: 'Dropdown'
             RepositoryStatusValue: 'Status'
             RepositoryStockValue: 'Stock'
           table:
@@ -2292,7 +2292,7 @@ en:
           name: 'Name'
           status: 'Status'
           cancel: 'Cancel import'
-          confirm: 'Confirm'
+          import: 'Import'
           status_message:
             created: 'new item'
             updated: 'updated'
@@ -2325,7 +2325,7 @@ en:
             id: 'el2'
             icon: 'sn-icon-import'
             label: 'Upload your file'
-            subtext: 'Upload your data using .xlsx, .csv, or .txt files to import new items or update existing item data.'
+            subtext: 'Upload your data using .csv, .xlsx, .txt or .tsv files to import new items or update existing item data.'
           element3:
             id: 'el3'
             icon: 'sn-icon-tables'