From 09bd7126d8e75f7db8b16d6ffe5305484ff55f3b Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Sat, 29 Jan 2022 20:41:48 +0000
Subject: [PATCH] Replace/remove a custom select2 Angular directive

---
 .../admin/directives/select2_no_search.js.coffee     |  6 ------
 .../admin/product_import/_upload_form.html.haml      |  4 +++-
 app/webpacker/css/admin/components/tom_select.scss   | 12 ++++++++++++
 spec/system/admin/product_import_spec.rb             |  8 ++++----
 4 files changed, 19 insertions(+), 11 deletions(-)
 delete mode 100644 app/assets/javascripts/admin/directives/select2_no_search.js.coffee

diff --git a/app/assets/javascripts/admin/directives/select2_no_search.js.coffee b/app/assets/javascripts/admin/directives/select2_no_search.js.coffee
deleted file mode 100644
index 64ded4fcc8..0000000000
--- a/app/assets/javascripts/admin/directives/select2_no_search.js.coffee
+++ /dev/null
@@ -1,6 +0,0 @@
-angular.module("ofn.admin").directive "select2NoSearch", ($timeout) ->
-  restrict: 'CA'
-  link: (scope, element, attrs) ->
-    $timeout ->
-      element.select2
-        minimumResultsForSearch: Infinity
\ No newline at end of file
diff --git a/app/views/admin/product_import/_upload_form.html.haml b/app/views/admin/product_import/_upload_form.html.haml
index 8649a04780..cbe9cc9f9c 100644
--- a/app/views/admin/product_import/_upload_form.html.haml
+++ b/app/views/admin/product_import/_upload_form.html.haml
@@ -4,7 +4,9 @@
 
     %h6= t('admin.product_import.index.choose_import_type')
     %br
-    = select_tag "settings[import_into]", options_for_select({"#{t('admin.product_import.index.product_list')}" => :product_list, "#{t('admin.product_import.index.inventories')}" => :inventories}), {class: 'select2 select2-no-search', 'ng-model' => 'settings.import_into'}
+    = select_tag "settings[import_into]",
+      options_for_select({"#{t('admin.product_import.index.product_list')}" => :product_list, "#{t('admin.product_import.index.inventories')}" => :inventories}),
+      { "data-controller": "tom-select", class: "primary inline no-search", "ng-model": "settings.import_into" }
     %br
     %br
     %br
diff --git a/app/webpacker/css/admin/components/tom_select.scss b/app/webpacker/css/admin/components/tom_select.scss
index af2d3bf731..7f91c14524 100644
--- a/app/webpacker/css/admin/components/tom_select.scss
+++ b/app/webpacker/css/admin/components/tom_select.scss
@@ -13,6 +13,18 @@
   min-height: 2.5em;
 }
 
+.ts-wrapper.single .ts-control {
+  padding-right: 2rem;
+}
+
+.ts-wrapper.inline, .ts-wrapper.inline.input-active {
+  width: fit-content;
+
+  .ts-control {
+    padding-right: 2rem;
+  }
+}
+
 .ts-wrapper.single .ts-control {
   box-shadow: none;
   background-image: none;
diff --git a/spec/system/admin/product_import_spec.rb b/spec/system/admin/product_import_spec.rb
index 8de92c0ede..843d9ff272 100644
--- a/spec/system/admin/product_import_spec.rb
+++ b/spec/system/admin/product_import_spec.rb
@@ -298,7 +298,7 @@ describe "Product Import", js: true do
       File.write('/tmp/test.csv', csv_data)
 
       visit main_app.admin_product_import_path
-      select2_select I18n.t('admin.product_import.index.inventories'), from: "settings_import_into"
+      select I18n.t('admin.product_import.index.inventories'), from: "settings_import_into"
       attach_file 'file', '/tmp/test.csv'
       click_button 'Upload'
 
@@ -359,7 +359,7 @@ describe "Product Import", js: true do
       File.write('/tmp/test.csv', csv_data)
 
       visit main_app.admin_product_import_path
-      select2_select I18n.t('admin.product_import.index.inventories'), from: "settings_import_into"
+      select I18n.t('admin.product_import.index.inventories'), from: "settings_import_into"
       attach_file 'file', '/tmp/test.csv'
       click_button 'Upload'
 
@@ -394,7 +394,7 @@ describe "Product Import", js: true do
 
       File.write('/tmp/test.csv', csv_data)
       visit main_app.admin_product_import_path
-      select2_select I18n.t('admin.product_import.index.inventories'), from: "settings_import_into"
+      select I18n.t('admin.product_import.index.inventories'), from: "settings_import_into"
       attach_file 'file', '/tmp/test.csv'
       click_button 'Upload'
       proceed_to_validation
@@ -428,7 +428,7 @@ describe "Product Import", js: true do
       File.write('/tmp/test.csv', csv_data)
 
       visit main_app.admin_product_import_path
-      select2_select I18n.t('admin.product_import.index.inventories'), from: "settings_import_into"
+      select I18n.t('admin.product_import.index.inventories'), from: "settings_import_into"
       attach_file 'file', '/tmp/test.csv'
       click_button 'Upload'