blacklight 7.41.0 → 8.0.0.beta1

data/app/services/blacklight/search_service.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # SearchService returns search results from the repository
 module Blacklight
   class SearchService
@@ -33,17 +34,17 @@ module Blacklight
       response = repository.search(builder)
 
       if response.grouped? && grouped_key_for_results
-        [response.group(grouped_key_for_results), []]
+        response.group(grouped_key_for_results)
       elsif response.grouped? && response.grouped.length == 1
-        [response.grouped.first, []]
+        response.grouped.first
       else
-        [response, response.documents]
+        response
       end
     end
 
     # retrieve a document, given the doc id
     # @param [Array{#to_s},#to_s] id
-    # @return [Blacklight::Solr::Response, Blacklight::SolrDocument] the solr response object and the first document
+    # @return [Blacklight::SolrDocument] the solr response object and the first document
     def fetch(id = nil, extra_controller_params = {})
       if id.is_a? Array
         fetch_many(id, extra_controller_params)
@@ -123,7 +124,7 @@ module Blacklight
 
       if index > 0
         solr_params[:start] = index - window # get one before
-        solr_params[:rows] = 2 * window + 1 # and one after
+        solr_params[:rows] = (2 * window) + 1 # and one after
       else
         solr_params[:start] = 0 # there is no previous doc
         solr_params[:rows] = 2 * window # but there should be one after
@@ -146,22 +147,14 @@ module Blacklight
               .merge(blacklight_config.fetch_many_document_params)
               .merge(extra_controller_params)
 
-      # find_many was introduced in Blacklight 8.4. Before that, we used the
-      # regular search method (possibly with a find-many specific `qt` parameter).
-      # In order to support Repository implementations that may not have a find_many,
-      # we'll fall back to search if find_many isn't available.
-      solr_response = if repository.respond_to?(:find_many)
-                        repository.find_many(query)
-                      else
-                        repository.search(query)
-                      end
-
-      [solr_response, solr_response.documents]
+      solr_response = repository.search(query)
+
+      solr_response.documents
     end
 
     def fetch_one(id, extra_controller_params)
       solr_response = repository.find id, extra_controller_params
-      [solr_response, solr_response.documents.first]
+      solr_response.documents.first
     end
   end
 end

data/app/values/blacklight/types.rb

@@ -16,10 +16,6 @@ module Blacklight
         new.cast(input)
       end
 
-      def initialize(**kwargs)
-        @kwargs = kwargs
-      end
-
       def cast(input)
         if input.is_a?(::Array)
           input.first
@@ -69,19 +65,6 @@ module Blacklight
       end
     end
 
-    class Time < Value
-      def cast(input)
-        value = super
-        return if value.blank?
-
-        begin
-          ::Time.parse(value.to_s) # rubocop:disable Rails/TimeZone
-        rescue ArgumentError
-          Rails.logger&.info "Unable to parse time: #{value.inspect}"
-        end
-      end
-    end
-
     class Boolean < Value
       def cast(input)
         ActiveModel::Type::Boolean.new.cast(super)
@@ -123,7 +106,6 @@ module Blacklight
     register :boolean, Boolean
     register :string, String
     register :date, Date
-    register :time, Time
     register :array, Array
     register :json, JsonValue
     register :html, Html

data/app/views/bookmarks/_clear_bookmarks_widget.html.erb

@@ -1 +1,8 @@
-  <%= link_to t('blacklight.bookmarks.clear.action_title'), clear_bookmarks_path, :method => :delete, :data => { :confirm => t('blacklight.bookmarks.clear.action_confirm') }, :class => 'clear-bookmarks btn btn-danger' %>
+  <%= link_to t('blacklight.bookmarks.clear.action_title'), clear_bookmarks_path,
+      method: :delete, # for rails-UJS
+      data: {
+        confirm: t('blacklight.bookmarks.clear.action_confirm'), # for rails-UJS
+        turbo_method: :delete,
+        turbo_confirm: t('blacklight.bookmarks.clear.action_confirm')
+      },
+      class: 'clear-bookmarks btn btn-danger' %>

data/app/views/bookmarks/_tools.html.erb

@@ -1,12 +1,7 @@
-<% if render_show_doc_actions_method_from_blacklight? %>
-  <%= render(Blacklight::Document::ActionsComponent.new(document: nil, tag: 'div', classes: "#{controller_name}Tools", link_classes: 'btn btn-outline-primary', actions: document_actions(document_list, options: { document: nil }), options: { document_list: @response.documents }, url_opts: Blacklight::Parameters.sanitize(params.to_unsafe_h))) %>
-<% else %>
-  <% Deprecation.warn(self, '#render_show_doc_actions is deprecated; use ActionComponents instead') %>
-  <ul class="<%= controller_name %>Tools nav nav-pills">
-    <%= render_show_doc_actions document_list, document: nil, document_list: @response.documents, url_opts: Blacklight::Parameters.sanitize(params.to_unsafe_h) do |config, inner| %>
-      <li class="nav-item">
-        <%= inner %>
-      </li>
-    <% end %>
-  </ul>
-<% end %>
+<%= render Blacklight::Document::ActionsComponent.new(document: nil,
+                                                      tag: 'div',
+                                                      classes: "#{controller_name}Tools",
+                                                      link_classes: 'btn btn-outline-primary',
+                                                      actions: document_actions(document_list, options: { document: nil }),
+                                                      options: { document_list: @response.documents },
+                                                      url_opts: Blacklight::Parameters.sanitize(params.to_unsafe_h)) %>

data/app/views/catalog/_advanced_search_form.html.erb

@@ -2,6 +2,5 @@
       url: search_action_url,
       classes: ['advanced', 'form-horizontal'],
       params: search_state.params_for_search.except(:qt),
-      search_fields: Deprecation.silence(Blacklight::ConfigurationHelperBehavior) { search_fields },
       response: @response
     )) %>

data/app/views/catalog/_bookmark_control.html.erb

@@ -1 +1 @@
-<%= render Blacklight::Document::BookmarkComponent.new(document: document) if current_or_guest_user %>
+<%= render Blacklight::Document::BookmarkComponent.new(document: document, action: document_action_config) %>

data/app/views/catalog/_citation.html.erb

@@ -1,5 +1,5 @@
 <%= render Blacklight::System::ModalComponent.new do |component| %>
-  <% component.with_title { t('blacklight.tools.citation') } %>
+  <% component.title { t('blacklight.tools.citation') } %>
 
   <%= render Blacklight::Document::CitationComponent.with_collection(@documents) if @documents.present? %>
 <% end %>

data/app/views/catalog/_constraints.html.erb

@@ -1,14 +1 @@
-<% if constraints_helpers_and_partials_from_blacklight? || blacklight_config&.view_config(document_index_view_type)&.constraints_component %>
-  <%= render((blacklight_config&.view_config(document_index_view_type)&.constraints_component || Blacklight::ConstraintsComponent).new(search_state: convert_to_search_state(controller.params != params ? params : search_state))) %>
-<% else %>
-  <% Deprecation.warn(Blacklight::RenderConstraintsHelperBehavior, 'Constraints helpers or partials were overridden; not using components') %>
-  <% if Deprecation.silence(Blacklight::RenderConstraintsHelperBehavior) { query_has_constraints? } %>
-    <div id="appliedParams" class="clearfix constraints-container">
-      <h2 class="sr-only visually-hidden"><%= t('blacklight.search.search_constraints_header') %></h2>
-
-      <%= render 'start_over' %>
-      <span class="constraints-label sr-only visually-hidden"><%= t('blacklight.search.filters.title') %></span>
-      <%= render_constraints(controller.params != params ? params : search_state) %>
-    </div>
-  <% end %>
-<% end %>
+<%= render (blacklight_config&.view_config(document_index_view_type)&.constraints_component || Blacklight::ConstraintsComponent).new(search_state: search_state) %>

data/app/views/catalog/_document.atom.builder

@@ -7,14 +7,12 @@ xml.entry do
   # updated is required, for now we'll just set it to now, sorry
   xml.updated Time.current.iso8601
 
-  Deprecation.silence(Blacklight::UrlHelperBehavior) do
-    xml.link "rel" => "alternate", "type" => "text/html", "href" => polymorphic_url(url_for_document(document))
-    # add other doc-specific formats, atom only lets us have one per
-    # content type, so the first one in the list wins.
-    xml << presenter.link_rel_alternates(unique: true)
+  xml.link "rel" => "alternate", "type" => "text/html", "href" => polymorphic_url(search_state.url_for_document(document))
+  # add other doc-specific formats, atom only lets us have one per
+  # content type, so the first one in the list wins.
+  xml << presenter.link_rel_alternates(unique: true)
 
-    xml.id polymorphic_url(url_for_document(document))
-  end
+  xml.id polymorphic_url(search_state.url_for_document(document))
 
   if document.to_semantic_values.key? :author
     xml.author { xml.name(document.to_semantic_values[:author].first) }
@@ -22,13 +20,12 @@ xml.entry do
 
   with_format(:html) do
     xml.summary "type" => "html" do
-      xml.text! render_document_partials(document,
-                                         blacklight_config.view_config(:atom).summary_partials,
-                                         document_counter: document_counter)
+      document_component = blacklight_config.view_config(:atom).summary_component
+      xml.text! render document_component.new(presenter: document_presenter(document), component: :div, show: true)
     end
   end
 
-  #If they asked for a format, give it to them.
+  # If they asked for a format, give it to them.
   if (params["content_format"] &&
     document.export_formats[params["content_format"].to_sym])
 
@@ -40,14 +37,15 @@ xml.entry do
       # encode properly. See:
       # http://tools.ietf.org/html/rfc4287#section-4.1.3.3
       type = type.downcase
-      if (type.downcase =~ %r{\+|/xml$})
+      case type.downcase
+      when %r{\+|/xml$}
         # xml, just put it right in
         content_element << data
-      elsif (type.downcase =~ %r{text/})
+      when %r{text/}
         # text, escape
         content_element.text! data
       else
-        #something else, base64 encode it
+        # something else, base64 encode it
         content_element << Base64.encode64(data)
       end
     end

data/app/views/catalog/_document.html.erb

@@ -1,7 +1,9 @@
 <% # container for a single doc -%>
 <% view_config = local_assigns[:view_config] || blacklight_config.view_config(document_index_view_type) %>
-<%= render (view_config.document_component || Blacklight::DocumentComponent).new(presenter: document_presenter(document), counter: document_counter_with_offset(document_counter)) do |component| %>
-  <% component.public_send(view_config.document_component.blank? && view_config.partials.any? ? :with_body : :with_partial) do %>
-    <%= render_document_partials document, view_config.partials, component: component, document_counter: document_counter %>
+<%= render view_config.document_component.new(presenter: document_presenter(document), counter: document_counter_with_offset(document_counter)) do |component| %>
+  <% view_config.partials.each do |partial| %>
+    <% component.partial do %>
+      <%= render_document_partial document, partial, component: component, document_counter: document_counter %>
+    <% end %>
   <% end %>
 <% end %>

data/app/views/catalog/_document.rss.builder

@@ -2,8 +2,6 @@
 
 xml.item do
   xml.title(document_presenter(document).heading || (document.to_semantic_values[:title].first if document.to_semantic_values.key?(:title)))
-  Deprecation.silence(Blacklight::UrlHelperBehavior) do
-    xml.link(polymorphic_url(url_for_document(document)))
-  end
-  xml.author( document.to_semantic_values[:author].first ) if document.to_semantic_values.key? :author
+  xml.link(polymorphic_url(search_state.url_for_document(document)))
+  xml.author(document.to_semantic_values[:author].first) if document.to_semantic_values.key? :author
 end

data/app/views/catalog/_facet_layout.html.erb

@@ -1,8 +1,8 @@
 <%= render(Blacklight::FacetFieldComponent.new(facet_field: facet_field_presenter(facet_field, nil))) do |component| %>
-  <% component.with_label do %>
+  <% component.label do %>
     <%= facet_field_label(facet_field.key) %>
   <% end %>
-  <% component.with_body do %>
+  <% component.body do %>
     <%= yield %>
   <% end %>
 <% end %>

data/app/views/catalog/_facets.html.erb

@@ -1,4 +1,5 @@
-<% # container for facet groups -%>
-<% Deprecation.silence(Blacklight::Facet) { facet_group_names }.each do |groupname| %>
-  <%= render 'facet_group', groupname: groupname %>
-<% end %>
+<% # this partial is deprecated.  catalog/index now renders the component %>
+<% conf = blacklight_config.view_config(document_index_view_type) %>
+<%= render conf.sidebar_component.new(blacklight_config: blacklight_config,
+                                      response: @response,
+                                      view_config: conf) %>

data/app/views/catalog/_home_text.html.erb

@@ -5,7 +5,7 @@
 
   <p>
     <%= link_to 'Read the Documentation', 'https://github.com/projectblacklight/blacklight/wiki', class: 'btn btn-primary' %>
-    <%= link_to 'See Examples', 'http://projectblacklight.org', class: 'btn btn-light' %>
+    <%= link_to 'See Examples', 'http://projectblacklight.org', class: 'btn btn-secondary' %>
   </p>
 </div>
 
@@ -29,16 +29,4 @@
   </p>
 </div>
 
-<%# This is the same panel shown in the Rails welcome template %>
-<div id="about" class="card">
-  <h2 class='card-header collapsed collapse-toggle' data-toggle="collapse" data-bs-toggle="collapse" data-bs-target="#about-content" data-target="#about-content"><a href="/rails/info/properties">About your application&rsquo;s environment</a></h2>
-  <div id="about-content" class="card-body collapse"></div>
-</div>
-
-<script>
-  Blacklight.onLoad(function() {
-    $('#about .card-header').one('click', function() {
-      $($(this).data('target')).load($(this).find('a').attr('href'));
-    });
-  });
-</script>
+<p>Blacklight <%= Blacklight::VERSION %></p>

data/app/views/catalog/_per_page_widget.html.erb

@@ -1 +1,10 @@
-<%= render Blacklight::Search::PerPageComponent.new(search_state: search_state, blacklight_config: blacklight_config, response: @response) %>
+<% if show_sort_and_per_page? %>
+  <span class="sr-only visually-hidden"><%= t('blacklight.search.per_page.title') %></span>
+  <%= render(Blacklight::System::DropdownComponent.new(
+    param: :per_page,
+    choices: per_page_options_for_select,
+    id: 'per_page-dropdown',
+    search_state: search_state,
+    selected: current_per_page,
+    interpolation: :count)) %>
+<% end %>

data/app/views/catalog/_search_form.html.erb

@@ -1,7 +1,7 @@
-<%= warn "#{__FILE__} is a deprecated partial." %>
+<%= warn "#{__file__} is a deprecated partial." %>
 <%= render((blacklight_config&.view_config(document_index_view_type)&.search_bar_component || Blacklight::SearchBarComponent).new(
       url: search_action_url,
       advanced_search_url: search_action_url(action: 'advanced_search'),
       params: search_state.params_for_search.except(:qt),
-      search_fields: Deprecation.silence(Blacklight::ConfigurationHelperBehavior) { search_fields },
+      presenter: presenter,
       autocomplete_path: suggest_index_catalog_path)) %>

data/app/views/catalog/_search_header.html.erb

@@ -1,2 +1 @@
-<%= render 'did_you_mean' %>
-<%= render 'sort_and_per_page' %>
+<%= render blacklight_config.view_config(document_index_view_type).search_header_component.new %>

data/app/views/catalog/_search_results.html.erb

@@ -1,4 +1,4 @@
-<% @page_title = t('blacklight.search.page_title.title', constraints: render_search_to_page_title(params), application_name: application_name) %>
+<% @page_title = t('blacklight.search.page_title.title', constraints: render_search_to_page_title(search_state), application_name: application_name) %>
 
 <% content_for(:head) do -%>
   <%= render 'catalog/opensearch_response_metadata', response: @response %>
@@ -23,7 +23,7 @@
 <%- if @response.empty? %>
   <%= render "zero_results" %>
 <%- elsif render_grouped_response? %>
-  <%= Deprecation.silence(Blacklight::RenderPartialsHelperBehavior) { render_grouped_document_index } %>
+  <%= render 'catalog/group' %>
 <%- else %>
   <%= render_document_index @response.documents %>
 <%- end %>

data/app/views/catalog/_search_sidebar.html.erb

@@ -1 +1,5 @@
-<%= render 'facets' %>
+<% # this partial is deprecated.  catalog/index now renders the component %>
+<% conf = blacklight_config.view_config(document_index_view_type) %>
+<%= render conf.sidebar_component.new(blacklight_config: blacklight_config,
+                                      response: @response,
+                                      view_config: conf) %>

data/app/views/catalog/_show_main_content.html.erb

@@ -1,25 +1,20 @@
 <%= render(Blacklight::SearchContextComponent.new(search_context: @search_context, search_session: search_session)) if search_session['document_id'] == @document.id %>
 
-<% @page_title = t('blacklight.search.show.title', document_title: Deprecation.silence(Blacklight::BlacklightHelperBehavior) { document_show_html_title }, application_name: application_name).html_safe %>
+<% @page_title = t('blacklight.search.show.title', document_title: document_presenter(@document).html_title, application_name: application_name).html_safe %>
 <% content_for(:head) { render_link_rel_alternates } %>
 
-<%= render (blacklight_config.view_config(:show).document_component || Blacklight::DocumentComponent).new(presenter: document_presenter(@document), component: :div, title_component: :h1, show: true) do |component| %>
-  <% component.with_footer do %>
+<%= render (blacklight_config.view_config(:show).document_component).new(presenter: document_presenter(@document), component: :div, show: true) do |component| %>
+  <% component.title(as: 'h1', classes: '', link_to_document: false, actions: false) %>
+  <% component.footer do %>
     <% if @document.respond_to?(:export_as_openurl_ctx_kev) %>
-      <!--
-           // COinS, for Zotero among others.
-           // This document_partial_name(@document) business is not quite right,
-           // but has been there for a while.
-      -->
-      <span class="Z3988" title="<%= @document.export_as_openurl_ctx_kev(Deprecation.silence(Blacklight::RenderPartialsHelperBehavior) { document_partial_name(@document) }) %>"></span>
+      <!-- COinS, for Zotero among others. -->
+      <span class="Z3988" title="<%= @document.export_as_openurl_ctx_kev(document_presenter(@document).display_type) %>"></span>
     <% end %>
-  <%  end %>
+  <% end %>
 
-  <%# Use :body for complete backwards compatibility (overriding the component body markup),
-        but if the app explicitly  opted-in to components, make the partials data available as :partials to ease migrations pain %>
-  <% component.public_send(blacklight_config.view_config(:show).document_component.blank? && blacklight_config.view_config(:show).partials.any? ? :with_body : :with_partial) do %>
-    <div id="doc_<%= @document.id.to_s.parameterize %>">
-      <%= render_document_partials @document, blacklight_config.view_config(:show).partials, component: component %>
-    </div>
+  <% blacklight_config.view_config(:show).partials.each do |partial| %>
+    <% component.partial do %>
+      <%= render_document_partial @document, partial, component: component %>
+    <% end %>
   <% end %>
 <% end %>

data/app/views/catalog/_show_sidebar.html.erb

@@ -1,2 +1,2 @@
-<%= render 'show_tools', document: document %>
-<%= render(Blacklight::Document::MoreLikeThisComponent.new(document: document)) %>
+<% presenter = document_presenter(document) %>
+<%= render presenter.view_config.sidebar_component.new(presenter: presenter) %>

data/app/views/catalog/_show_tools.html.erb

@@ -1,20 +1,14 @@
-<% document = @document if local_assigns[:document].nil? %>
-<% if show_doc_actions? document %>
+<% if show_doc_actions? %>
   <div class="card show-tools">
     <div class="card-header">
       <h2 class="mb-0 h6"><%= t('blacklight.tools.title') %></h2>
     </div>
-    <% if render_show_doc_actions_method_from_blacklight? %>
-      <%= render(Blacklight::Document::ActionsComponent.new(document: document, tag: 'ul', classes: 'list-group list-group-flush', wrapping_tag: 'li', wrapping_classes: 'list-group-item', actions: document_actions(document), url_opts: Blacklight::Parameters.sanitize(params.to_unsafe_h))) %>
-    <% else %>
-      <% Deprecation.warn(self, '#render_show_doc_actions is deprecated; use ActionComponents instead') %>
-      <ul class="list-group list-group-flush">
-        <%= render_show_doc_actions document do |config, inner| %>
-          <li class="list-group-item <%= config.key %>">
-            <%= inner %>
-          </li>
-        <% end %>
-      </ul>
-    <% end %>
+    <%= render Blacklight::Document::ActionsComponent.new(document: document,
+                                                          tag: 'ul',
+                                                          classes: 'list-group list-group-flush',
+                                                          wrapping_tag: 'li',
+                                                          wrapping_classes: 'list-group-item list-group-item-action',
+                                                          actions: document_actions(document),
+                                                          url_opts: Blacklight::Parameters.sanitize(params.to_unsafe_h)) %>
   </div>
 <% end %>

data/app/views/catalog/_view_type_group.html.erb

@@ -2,4 +2,4 @@
       response: @response,
       views: document_index_view_controls,
       search_state: search_state,
-      selected: document_index_view_type)) if show_sort_and_per_page? -%>
+      selected: document_index_view_type)) -%>

data/app/views/catalog/email.html.erb

@@ -1,7 +1,7 @@
 <%= render Blacklight::System::ModalComponent.new do |component| %>
-  <% component.with_title { t('blacklight.email.form.title') } %>
+  <% component.title { t('blacklight.email.form.title') } %>
 
-  <% component.with_body do %>
+  <% component.body do %>
     <%= render 'email_form' %>
   <% end %>
 <% end %>

data/app/views/catalog/email_success.html.erb

@@ -1,6 +1,5 @@
-<%= render Blacklight::System::ModalComponent.new do |component| %>
-  <% component.title { t('blacklight.email.form.title') } %>
-
-  <%= render partial: '/shared/flash_msg' %>
-  <span data-blacklight-modal="close"></span>
-<% end %>
+<turbo-stream action="append" target="main-flashes">
+  <template>
+    <%= render '/shared/flash_msg' %>
+  </template>
+</turbo-stream>

data/app/views/catalog/facet.html.erb

@@ -1,20 +1,22 @@
 <%= render Blacklight::System::ModalComponent.new do |component| %>
-  <% component.with_prefix do %>
+  <% component.prefix do %>
     <div class="facet-pagination top row justify-content-between">
       <%= render :partial=>'facet_pagination' %>
     </div>
   <% end %>
 
-  <% component.with_title { facet_field_label(@facet.key) } %>
+  <% component.title { facet_field_label(@facet.key) } %>
 
   <%= render partial: 'facet_index_navigation' if @facet.index_range && @display_facet.index? %>
 
   <div class="facet-extended-list">
-    <%= render_facet_limit(@display_facet, layout: false) %>
+    <%= render Blacklight::FacetComponent.new(display_facet: @display_facet,
+                                              blacklight_config: blacklight_config,
+                                              layout: false) %>
   </div>
 
-  <% component.with_footer do %>
-    <div class="facet-pagination bottom row justify-content-between">
+  <% component.footer do %>
+    <div class="facet-pagination bottom flex-row justify-content-between">
       <%= render :partial=>'facet_pagination' %>
     </div>
   <% end %>

data/app/views/catalog/index.atom.builder

@@ -6,7 +6,7 @@ xml.instruct!(:xml, encoding: "UTF-8")
 
 xml.feed("xmlns" => "http://www.w3.org/2005/Atom",
          "xmlns:opensearch" => "http://a9.com/-/spec/opensearch/1.1/") do
-  xml.title   t('blacklight.search.page_title.title', constraints: render_search_to_page_title(params), application_name: application_name)
+  xml.title t('blacklight.search.page_title.title', constraints: render_search_to_page_title(params), application_name: application_name)
   # an author is required, so we'll just use the app name
   xml.author { xml.name application_name }
 
@@ -16,25 +16,23 @@ xml.feed("xmlns" => "http://www.w3.org/2005/Atom",
 
   # Navigational and context links
 
-  xml.link( "rel" => "next",
-            "href" => url_for(search_state.to_h.merge(only_path: false, page: @response.next_page.to_s))
-           ) if @response.next_page
+  xml.link("rel" => "next",
+           "href" => url_for(search_state.to_h.merge(only_path: false, page: @response.next_page.to_s))) if @response.next_page
 
-  xml.link( "rel" => "previous",
-            "href" => url_for(search_state.to_h.merge(only_path: false, page: @response.prev_page.to_s))
-           ) if @response.prev_page
+  xml.link("rel" => "previous",
+           "href" => url_for(search_state.to_h.merge(only_path: false, page: @response.prev_page.to_s))) if @response.prev_page
 
-  xml.link( "rel" => "first",
-            "href" => url_for(search_state.to_h.merge(only_path: false, page: "1")))
+  xml.link("rel" => "first",
+           "href" => url_for(search_state.to_h.merge(only_path: false, page: "1")))
 
-  xml.link( "rel" => "last",
-            "href" => url_for(search_state.to_h.merge(only_path: false, page: @response.total_pages.to_s)))
+  xml.link("rel" => "last",
+           "href" => url_for(search_state.to_h.merge(only_path: false, page: @response.total_pages.to_s)))
 
   # "search" doesn't seem to actually be legal, but is very common, and
   # used as an example in opensearch docs
-  xml.link( "rel" => "search",
-            "type" => "application/opensearchdescription+xml",
-            "href" => url_for(controller: 'catalog',action: 'opensearch', format: 'xml', only_path: false))
+  xml.link("rel" => "search",
+           "type" => "application/opensearchdescription+xml",
+           "href" => url_for(controller: 'catalog', action: 'opensearch', format: 'xml', only_path: false))
 
   # opensearch response elements
   xml.opensearch :totalResults, @response.total.to_s

data/app/views/catalog/index.html.erb

@@ -1,5 +1,8 @@
 <% content_for(:sidebar) do %>
-  <%= render 'search_sidebar' %>
+  <% conf = blacklight_config.view_config(document_index_view_type) %>
+  <%= render conf.sidebar_component.new(blacklight_config: blacklight_config,
+                                        response: @response,
+                                        view_config: conf) %>
 <% end %>
 
 <% unless has_search_parameters? %>

data/app/views/catalog/index.json.jbuilder

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 json.links do
   json.self url_for(search_state.to_h.merge(only_path: false))
   json.prev url_for(search_state.to_h.merge(only_path: false, page: @response.prev_page.to_s)) if @response.prev_page
@@ -13,7 +14,7 @@ end
 json.data do
   json.array! @presenter.documents do |document|
     doc_presenter = document_presenter(document)
-    document_url = Deprecation.silence(Blacklight::UrlHelperBehavior) { polymorphic_url(url_for_document(document)) }
+    document_url = polymorphic_url(search_state.url_for_document(document))
     json.id document.id
     json.type doc_presenter.display_type.first
     json.attributes do
@@ -51,14 +52,10 @@ json.included do
             json.hits item.hits
           end
           json.links do
-            Deprecation.silence(Blacklight::FacetsHelperBehavior) do
-              if facet_in_params?(facet.name, item.value)
-                Deprecation.silence(Blacklight::SearchState) do
-                  json.remove search_action_path(search_state.remove_facet_params(facet.name, item.value))
-                end
-              else
-                json.self path_for_facet(facet.name, item.value, only_path: false)
-              end
+            if search_state.filter(facet_config).include?(facet_value_for_facet_item(item.value))
+              json.remove search_action_path(search_state.filter(facet.name).remove(item.value))
+            else
+              json.self facet_item_presenter(facet_config, item.value, facet.name).href(only_path: false)
             end
           end
         end
@@ -69,16 +66,19 @@ json.included do
     end
   end
 
-  Deprecation.silence(Blacklight::ConfigurationHelperBehavior) do
-    json.array! search_fields do |(label, key)|
-      json.type 'search_field'
-      json.id key
-      json.attributes do
-        json.label label
-      end
-      json.links do
-        json.self url_for(search_state.to_h.merge(search_field: key, only_path: false))
-      end
+  search_fields = blacklight_config.search_fields
+                                   .values
+                                   .select { |field_def| should_render_field?(field_def) }
+                                   .collect { |field_def| [label_for_search_field(field_def.key), field_def.key] }
+
+  json.array! search_fields do |(label, key)|
+    json.type 'search_field'
+    json.id key
+    json.attributes do
+      json.label label
+    end
+    json.links do
+      json.self url_for(search_state.to_h.merge(search_field: key, only_path: false))
     end
   end