Refactor advanced search component a bit

javierm · Jun 16, 2020 · 3cf2fd6 · 3cf2fd6
1 parent 149845e
commit 3cf2fd6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/app/components/advanced_search_component.rb b/app/components/advanced_search_component.rb
@@ -10,7 +10,7 @@ def initialize(search_path)
 
     def official_level_search_options
       options_for_select((1..5).map { |i| [setting["official_level_#{i}_name"], i] },
-                         params[:advanced_search].try(:[], :official_level))
+                         advanced_search_terms[:official_level])
     end
 
     def date_range_options
@@ -24,10 +24,18 @@ def date_range_options
     end
 
     def selected_date_range
-      custom_date_range? ? "custom" : params[:advanced_search].try(:[], :date_min)
+      date_max.present? ? "custom" : date_min
     end
 
-    def custom_date_range?
-      params[:advanced_search].try(:[], :date_max).present?
+    def date_min
+      advanced_search_terms[:date_min]
+    end
+
+    def date_max
+      advanced_search_terms[:date_max]
+    end
+
+    def advanced_search_terms
+      params[:advanced_search] || {}
     end
 end
diff --git a/app/components/advanced_search_component/advanced_search_component.html.erb b/app/components/advanced_search_component/advanced_search_component.html.erb
@@ -4,7 +4,7 @@
 
 <div class="row advanced-search-form">
   <%= form_tag search_path, id: "advanced_search_form", method: :get do %>
-    <div id="js-advanced-search" data-advanced-search-terms="<%= params[:advanced_search].present? %>" style="display: none">
+    <div id="js-advanced-search" data-advanced-search-terms="<%= advanced_search_terms.present? %>" style="display: none">
 
       <div class="small-12 column">
         <label for="search">
@@ -35,15 +35,15 @@
                 <%= t("shared.advanced_search.from") %> (<%= t("shared.advanced_search.date_placeholder") %>)
               </label>
               <%= text_field_tag "advanced_search[date_min]",
-                                  params[:advanced_search].try(:[], :date_min),
+                                  date_min,
                                   class: "js-calendar" %>
             </div>
             <div class="small-12 large-6 column">
               <label for="advanced_search_date_max">
                 <%= t("shared.advanced_search.to") %> (<%= t("shared.advanced_search.date_placeholder") %>)
               </label>
               <%= text_field_tag "advanced_search[date_max]",
-                                  params[:advanced_search].try(:[], :date_max),
+                                  date_max,
                                   class: "js-calendar" %>
             </div>
           </div>