Prioritize input_options over default ones. #319

bogdan · Jan 5, 2024 · c3c5394 · c3c5394
1 parent 40eff47
commit c3c5394
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 27 deletions.
diff --git a/lib/datagrid/form_builder.rb b/lib/datagrid/form_builder.rb
@@ -10,12 +10,8 @@ module FormBuilder
     #   * <tt>text_field</tt> for other filter types
     def datagrid_filter(filter_or_attribute, partials: nil, **options, &block)
       filter = datagrid_get_filter(filter_or_attribute)
-      self.send(
-        filter.form_builder_helper_name, filter,
-        **filter.input_options,
-        **add_html_classes(options, filter.name, datagrid_filter_html_class(filter)),
-        &block
-      )
+      options = add_html_classes({**filter.input_options, **options}, filter.name, datagrid_filter_html_class(filter))
+      self.send( filter.form_builder_helper_name, filter, **options, &block)
     end
 
     # @param filter_or_attribute [Datagrid::Filters::BaseFilter, String, Symbol] filter object or filter name

diff --git a/spec/datagrid/form_builder_spec.rb b/spec/datagrid/form_builder_spec.rb
@@ -260,12 +260,12 @@ class MyTemplate
     end
     context "with enum filter type" do
       let(:_filter) { :category }
+      let(:_category_filter_options) { {} }
       let(:_grid) {
+        filter_options = _category_filter_options
         test_report do
           scope {Entry}
-          filter(:category, :enum, :select => ["first", "second"])
-          filter(:category_without_include_blank, :enum, :select => ["first", "second"], :include_blank => false)
-          filter(:category_with_prompt, :enum, :select => ["first", "second"], :prompt => "My Prompt")
+          filter(:category, :enum, select: ["first", "second"], **filter_options)
         end
       }
       it { should equal_to_dom(
@@ -299,21 +299,15 @@ class MyTemplate
         )}
       end
       context "with include_blank option set to false" do
-        let(:_filter) { :category_without_include_blank }
+        let(:_category_filter_options) { { include_blank: false } }
         it { should equal_to_dom(
-          '<select class="category_without_include_blank enum_filter" name="report[category_without_include_blank]" id="report_category_without_include_blank">
+          '<select class="category enum_filter" name="report[category]" id="report_category">
          <option value="first">first</option>
          <option value="second">second</option></select>'
         )}
       end
       context "with dynamic include_blank option" do
-        let(:_grid) do
-          test_report do
-            scope {Entry}
-            filter(:category, :enum, :select => ["first", "second"], :include_blank => proc { "Choose plz" })
-          end
-        end
-        let(:_filter) { :category }
+        let(:_category_filter_options) { {include_blank: proc { "Choose plz" }} }
         it { should equal_to_dom(
           '<select class="category enum_filter" name="report[category]" id="report_category">
          <option value="">Choose plz</option>
@@ -323,21 +317,24 @@ class MyTemplate
       end
 
       context "with prompt option" do
-        let(:_filter) { :category_with_prompt }
+        let(:_category_filter_options) { {prompt: 'My Prompt'} }
         it { should equal_to_dom(
-          '<select class="category_with_prompt enum_filter" name="report[category_with_prompt]" id="report_category_with_prompt"><option value="">My Prompt</option>
+          '<select class="category enum_filter" name="report[category]" id="report_category"><option value="">My Prompt</option>
+         <option value="first">first</option>
+         <option value="second">second</option></select>'
+        )}
+      end
+
+      context "with input_options class" do
+        let(:_category_filter_options) { {input_options: {class: 'custom-class'}} }
+        it { should equal_to_dom(
+          '<select class="custom-class category enum_filter" name="report[category]" id="report_category"><option value="" label=" "></option>
          <option value="first">first</option>
          <option value="second">second</option></select>'
         )}
       end
       context "with checkboxes option" do
-        let(:_grid) do
-          test_report do
-            scope {Entry}
-            filter(:category, :enum, :select => ["first", "second"], :checkboxes => true)
-          end
-        end
-        let(:_filter) { :category }
+        let(:_category_filter_options) { {checkboxes: true} }
         it { should equal_to_dom(
           '
 <label class="category enum_filter checkboxes" for="report_category_first"><input id="report_category_first" type="checkbox" value="first" name="report[category][]" />first</label>