[#4692] Pass a valid display_facet in the pub_date_presenter method

Co-authored-by: Jane Sandberg <[email protected]>
pulibrary · Jan 23, 2025 · 352e325 · 352e325
1 parent fa06570
commit 352e325
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 16 deletions.
diff --git a/app/assets/stylesheets/components/search--advanced.scss b/app/assets/stylesheets/components/search--advanced.scss
@@ -100,11 +100,6 @@
   white-space: normal;
 }
 
-.row .range_limit input.range_begin,
-.row .range_limit input.range_end {
-  width: 5em;
-}
-
 @include media-breakpoint-up(md) {
   .two-columns-md {
     display: flex;

diff --git a/app/components/numismatics_search_form_component.html.erb b/app/components/numismatics_search_form_component.html.erb
@@ -15,11 +15,8 @@
       <% end %>
       <div class="mb-3 advanced-search-facet row">
         <%= label_tag pub_date_field.parameterize, :class => "col-sm-4 control-label advanced-facet-label" do %>Year<% end %>
-        <div class="col-sm-8 range_limit">
-          <label for="range_pub_date_start_sort_begin" class="visually-hidden">date range (starting year)</label>
+        <div class="col-sm-8">
           <%= render BlacklightRangeLimit::RangeFormComponent.new(facet_field: pub_date_presenter) %> –
-          <label for="range_pub_date_start_sort_end" class="visually-hidden">date range (ending year)</label>
-          <%= render BlacklightRangeLimit::RangeFormComponent.new(facet_field: pub_date_presenter) %>
         </div>
       </div>
       <div class="mb-3 advanced-search-facet row">

diff --git a/app/components/numismatics_search_form_component.rb b/app/components/numismatics_search_form_component.rb
@@ -22,8 +22,12 @@ def pub_date_field
       blacklight_config.facet_fields['pub_date_start_sort']
     end
 
+    def pub_date_field_display_facet
+      @response.aggregations[pub_date_field]
+    end
+
     def pub_date_presenter
-      view_context.facet_field_presenter(pub_date_field, {})
+      view_context.facet_field_presenter(pub_date_field, pub_date_field_display_facet)
     end
 
     def initialize_constraints

diff --git a/app/components/orangelight/advanced_search_form_component.html.erb b/app/components/orangelight/advanced_search_form_component.html.erb
@@ -37,10 +37,7 @@
         <% end %>
         <div class="mb-3 advanced-search-facet row">
           <%= label_tag pub_date_field.parameterize, :class => "col-sm-4 control-label advanced-facet-label" do %>Publication year<% end %>
-          <div class="col-sm-8 range_limit">
-            <label for="range_pub_date_start_sort_begin" class="visually-hidden">Publication date range (starting year)</label>
-            <%= render BlacklightRangeLimit::RangeFormComponent.new(facet_field: pub_date_presenter) %> –
-            <label for="range_pub_date_start_sort_end" class="visually-hidden">Publication date range (ending year)</label>
+          <div class="col-sm-8">
             <%= render BlacklightRangeLimit::RangeFormComponent.new(facet_field: pub_date_presenter) %>
           </div>
         </div>

diff --git a/app/components/orangelight/advanced_search_form_component.rb b/app/components/orangelight/advanced_search_form_component.rb
@@ -15,8 +15,12 @@ def pub_date_field
     blacklight_config.facet_fields['pub_date_start_sort']
   end
 
+  def pub_date_field_display_facet
+    @response.aggregations[pub_date_field]
+  end
+
   def pub_date_presenter
-    view_context.facet_field_presenter(pub_date_field, {})
+    view_context.facet_field_presenter(pub_date_field, pub_date_field_display_facet)
   end
 
   def initialize_search_field_controls

diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
@@ -124,7 +124,6 @@ class CatalogController < ApplicationController
       segments: true,
       chart_segment_border_color: 'rgb(255, 217, 96)',
       chart_segment_bg_color: 'rgba(255, 217, 96, 0.5)',
-      chart_segment_bg_color: 'rgba(255, 217, 96, 0.5)',
       show_missing_link: false
     }
     config.add_facet_field 'language_facet', label: 'Language', limit: true, include_in_advanced_search: true