raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-01 02:03:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace/remove a custom select2 Angular directive

Browse Source
This commit is contained in:
Matt-Yorkley
2022-01-29 20:41:48 +00:00
parent 9bce2ca64c
commit 09bd7126d8
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/directives/select2_no_search.js.coffee
View File

@@ -1,6 +0,0 @@
angular.module("ofn.admin").directive "select2NoSearch", ($timeout) ->
restrict: 'CA'
link: (scope, element, attrs) ->
$timeout ->
element.select2
minimumResultsForSearch: Infinity

4
app/views/admin/product_import/_upload_form.html.haml
View File

@@ -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

12
app/webpacker/css/admin/components/tom_select.scss
View File

@@ -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;

8
spec/system/admin/product_import_spec.rb
View File

@@ -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'