Remove unnecessary partial and move render conditions to component

Author: jcoyne

app/components/blacklight/facet_field_filter_component.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Blacklight
+  module Facets
+    class FilterComponent < Blacklight::Component
+      # @params [Blacklight::FacetFieldPresenter] facet_field
+      def initialize(facet_field:)
+        @facet_field = facet_field
+      end
+
+      def render?
+        @facet_field.facet_field.index_range && @facet_field.display_facet.index?
+      end
+
+      def prefix
+        @facet_field.paginator.prefix
+      end
+
+      def clear_facet_prefix_url
+        @facet_field.paginator.params_for_resort_url('index', @facet_field.search_state.to_h.except(@facet_field.paginator.request_keys[:prefix]))
+      end
+
+      def facet_prefix_url(letter)
+        @facet_field.paginator.params_for_resort_url('index', @facet_field.search_state.to_h.merge(@facet_field.paginator.request_keys[:prefix] => letter))
+      end
+    end
+  end
+end

…ht/facet_field_filter_component.html.erb …cklight/facets/filter_component.html.erbapp/components/blacklight/facet_field_filter_component.html.erb renamed to app/components/blacklight/facets/filter_component.html.erb app/components/blacklight/facet_field_filter_component.html.erb renamed to app/components/blacklight/facets/filter_component.html.erb

@@ -80,6 +80,7 @@ def track
 
   # displays values and pagination links for a single facet field
   def facet
+    # @facet is a Blacklight::Configuration::FacetField
     @facet = blacklight_config.facet_fields[params[:id]]
     raise ActionController::RoutingError, 'Not Found' unless @facet
 
@@ -88,8 +89,10 @@ def facet
                 else
                   search_service.facet_field_response(@facet.key)
                 end
+    # @display_facet is a Blacklight::Solr::Response::Facets::FacetField
     @display_facet = @response.aggregations[@facet.field]
 
+    # @presenter is a Blacklight::FacetFieldPresenter
     @presenter = @facet.presenter.new(@facet, @display_facet, view_context)
     @pagination = @presenter.paginator
     respond_to do |format|

app/components/blacklight/facets/filter_component.rb

@@ -3,7 +3,7 @@
 
   <div class="facet-filters card card-body bg-light p-3 mb-3 border-0">
     <%= render Blacklight::Search::FacetSuggestInput.new(facet: @facet, presenter: @presenter) %>
-    <%= render partial: 'facet_index_navigation' if @facet.index_range && @display_facet.index? %>
+    <%= render Blacklight::Facets::FilterComponent.new(facet_field: @presenter) %>
   </div>
 
   <div class="facet-pagination top d-flex flex-wrap w-100 justify-content-between border-bottom pb-3 mb-3">

app/controllers/concerns/blacklight/catalog.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+RSpec.describe Blacklight::Facets::FilterComponent, type: :component do
+  let(:pagination) { Blacklight::Solr::FacetPaginator.new([]) }
+  let(:facet) { Blacklight::Configuration::FacetField.new(index_range: '0'..'9', presenter: Blacklight::FacetFieldPresenter) }
+  let(:display_facet) { instance_double(Blacklight::Solr::Response::Facets::FacetField, items: [], offset: 0, prefix: '', sort: 'index', index?: true) }
+  let(:blacklight_config) { Blacklight::Configuration.new }
+
+  let(:presenter) { facet.presenter.new(facet, display_facet, vc_test_controller.view_context) }
+
+  before do
+    with_request_url "/catalog/facet/language" do
+      render_inline(described_class.new(facet_field: presenter))
+    end
+  end
+
+  it 'renders the facet index navigation range' do
+    expect(page).to have_css '.pagination'
+    expect(page).to have_link '0', href: '/catalog/facet/language.html?facet.prefix=0&facet.sort=index'
+    expect(page).to have_link '1'
+    expect(page).to have_link '8'
+    expect(page).to have_link '9'
+  end
+
+  it 'renders an "all" button' do
+    expect(page).to have_css '.page-link', text: 'All'
+  end
+
+  context 'with a selected index' do
+    let(:display_facet) { instance_double(Blacklight::Solr::Response::Facets::FacetField, items: [], offset: 0, prefix: '5', sort: 'index', index?: true) }
+
+    it 'highlights the selected index' do
+      expect(page).to have_css '.active', text: '5'
+    end
+
+    it 'enables the clear facets button' do
+      expect(page).to have_link 'All'
+    end
+  end
+end

app/views/catalog/_facet_index_navigation.html.erb

@@ -5,13 +5,17 @@
   let(:blacklight_config) { Blacklight::Configuration.new }
   let(:component) { instance_double(Blacklight::FacetComponent) }
   let(:facet_suggest_input) { instance_double(Blacklight::Search::FacetSuggestInput) }
+  let(:facet_filter) { instance_double(Blacklight::Facets::FilterComponent) }
 
   before do
     allow(Blacklight::FacetComponent).to receive(:new).and_return(component)
     allow(Blacklight::Search::FacetSuggestInput).to receive(:new).and_return(facet_suggest_input)
+    allow(Blacklight::Facets::FilterComponent).to receive(:new).and_return(facet_filter)
+
     allow(view).to receive(:render).and_call_original
     allow(view).to receive(:render).with(component)
     allow(view).to receive(:render).with(facet_suggest_input)
+    allow(view).to receive(:render).with(facet_filter)
 
     blacklight_config.add_facet_field 'xyz', label: "Facet title"
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
@@ -25,9 +29,10 @@
     expect(rendered).to have_css 'h1', text: "Facet title"
   end
 
-  it "renders the facet suggest input" do
+  it "renders the facet suggest input and filters" do
     render
     expect(view).to have_received(:render).with(facet_suggest_input)
+    expect(view).to have_received(:render).with(facet_filter)
   end
 
   it "renders facet pagination" do