blacklight 8.11.0 → 9.0.0.beta2

data/app/controllers/concerns/blacklight/facetable.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# The Facetable module can be included onto classes that need to initialize a FacetSearchService.
+# There are two dependencies you must provide on the including class. Typically these
+# would be provided by Blacklight::Controller
+#  1. search_state
+#  2. blacklight_config
+#
+# Additionally, the including class may override the facet_search_service_context method to provide
+# further context to the SearchService. For example you could override this to provide the
+# currently signed in user.
+module Blacklight::Facetable
+  extend ActiveSupport::Concern
+
+  included do
+    # Which class to use for the search service. You can subclass SearchService if you
+    # want to override any of the methods (e.g. SearchService#fetch)
+    class_attribute :facet_search_service_class
+    self.facet_search_service_class = Blacklight::FacetSearchService
+  end
+
+  # @return [Blacklight::FacetSearchService]
+  def facet_search_service
+    facet_search_service_class.new(config: blacklight_config, search_state: search_state, user_params: search_state.to_h, **facet_search_service_context)
+  end
+
+  # Override this method on the class that includes Blacklight::Facetable to provide more context to the search service if necessary.
+  # For example, if your search builder needs to be aware of the current user, override this method to return a hash including the current user.
+  # Then the search builder could use some property about the current user to construct a constraint on the search.
+  # @return [Hash] a hash of context information to pass through to the search service
+  def facet_search_service_context
+    search_service_context
+  end
+end

data/app/controllers/concerns/blacklight/search_context.rb

@@ -133,21 +133,9 @@ module Blacklight::SearchContext
 
   # A list of query parameters that should not be persisted for a search
   def nonpersisted_search_session_params
-    unless method(:blacklisted_search_session_params).source_location.first.end_with?('deprecation/method_wrappers.rb')
-      # The blacklisted_search_session_params was overridden, so call it.
-      Blacklight.deprecation.warn(self, "blacklisted_search_session_params was overriden in your app, " \
-                                        "but that method should be renamed to `nonpersisted_search_session_params'. " \
-                                        "The original behavior will be removed in the next major release.")
-      return blacklisted_search_session_params
-    end
     [:commit, :counter, :total, :search_id, :page, :per_page]
   end
 
-  def blacklisted_search_session_params
-    nonpersisted_search_session_params
-  end
-  Blacklight.deprecation.deprecate_methods(self, blacklisted_search_session_params: 'use nonpersisted_search_session_params instead')
-
   # calls setup_previous_document then setup_next_document.
   # used in the show action for single view pagination.
   def setup_next_and_previous_documents

data/app/controllers/concerns/blacklight/searchable.rb

@@ -21,7 +21,7 @@ module Blacklight::Searchable
 
   # @return [Blacklight::SearchService]
   def search_service
-    search_service_class.new(config: blacklight_config, search_state: search_state, user_params: search_state.to_h, **search_service_context)
+    search_service_class.new(config: blacklight_config, search_state: search_state, **search_service_context)
   end
 
   # Override this method on the class that includes Blacklight::Searchable to provide more context to the search service if necessary.

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -41,10 +41,4 @@ module Blacklight::BlacklightHelperBehavior
   def self.blacklight_gem_path
     @blacklight_gem_path ||= Gem.loaded_specs["blacklight"].full_gem_path
   end
-
-  def partial_from_blacklight?(partial)
-    path = lookup_context.find_all(partial, lookup_context.prefixes + [""], true).first&.identifier
-
-    path.nil? ? false : path.starts_with?(Blacklight::BlacklightHelperBehavior.blacklight_gem_path)
-  end
 end

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -102,16 +102,6 @@ module Blacklight::CatalogHelperBehavior
     (blacklight_config.sort_fields.values.find { |f| f.sort == @response.sort } if @response && @response.sort.present?) || blacklight_config.sort_fields[params[:sort]] || default_sort_field
   end
 
-  ##
-  # Look up the current per page value, or the default if none if set
-  #
-  # @deprecated
-  # @return [Integer]
-  def current_per_page
-    (@response.rows if @response && @response.rows > 0) || params.fetch(:per_page, blacklight_config.default_per_page).to_i
-  end
-  Blacklight.deprecation.deprecate_methods(self, current_per_page: 'has moved to Blacklight::Search::PerPageComponent')
-
   ##
   # Should we display the sort and per page widget?
   #

data/app/helpers/blacklight/configuration_helper_behavior.rb

@@ -91,24 +91,12 @@ module Blacklight::ConfigurationHelperBehavior
     (active_sort_fields.find { |_k, config| config.respond_to?(:default) && config.default } || active_sort_fields.first)&.last
   end
 
-  ##
-  # @deprecated
-  # The available options for results per page, in the style of #options_for_select
-  def per_page_options_for_select
-    return [] if blacklight_config.per_page.blank?
-
-    blacklight_config.per_page.map do |count|
-      [t(:'blacklight.search.per_page.label', count: count).html_safe, count]
-    end
-  end
-  Blacklight.deprecation.deprecate_methods(self, per_page_options_for_select: 'has moved to Blacklight::Search::PerPageComponent')
-
   ##
   # Determine whether to render a field by evaluating :if and :unless conditions
   #
   # @param [Blacklight::Solr::Configuration::Field] field_config
   # @return [Boolean]
-  def should_render_field?(field_config, *args)
-    blacklight_configuration_context.evaluate_if_unless_configuration field_config, *args
+  def should_render_field?(field_config, *)
+    blacklight_configuration_context.evaluate_if_unless_configuration(field_config, *)
   end
 end

data/app/helpers/blacklight/document_helper_behavior.rb

@@ -24,32 +24,6 @@ module Blacklight::DocumentHelperBehavior
     'blacklight-'
   end
 
-  ##
-  # Render the sidebar partial for a document
-  # This is used as an integration point by downstream apps to add to the
-  # default sidebar.
-  # See: https://github.com/geoblacklight/geoblacklight/blob/7d3c31c7af3362879b97e2c1351a2496c728c59c/app/helpers/blacklight_helper.rb#L7
-  #
-  # @param [SolrDocument] document
-  # @deprecated
-  # @return [String]
-  def render_document_sidebar_partial(document)
-    unless @render_document_sidebar_partials_deprecation_warning_shown
-      partials = lookup_context.find_all('show_sidebar', lookup_context.prefixes, true, [], {})
-      unless partials.first.identifier.starts_with? Blacklight.root
-        Blacklight.deprecation.warn('The partial catalog/_show_sidebar.html.erb will not be rendered by #render_document_sidebar_partial in Blacklight 9.0.' \
-                                    'Configure blacklight_config.show.sidebar_component instead (default Blacklight::Search::SidebarComponent).')
-        @render_document_sidebar_partials_deprecation_warning_shown = true
-      end
-    end
-
-    render 'show_sidebar', document: document
-  end
-
-  Blacklight.deprecation.deprecate_methods(self,
-                                           render_document_sidebar_partial: 'has been replaced by calling the sidebar component (Blacklight::Search::SidebarComponent) directly. ' \
-                                                                            'Set sidebar_component in the view config.')
-
   ##
   # return the Bookmarks on a set of documents (all bookmarks on the page)
   # @private
@@ -64,10 +38,12 @@ module Blacklight::DocumentHelperBehavior
 
   ##
   # Check if the document is in the user's bookmarks
+  # Note: we do string comparison of the classes, because hot reloading in the development environment may cause each to have
+  #       separate versions of the class loaded (see document.class.object_id and Bookmark#document_type.object_id)
   # @param [Blacklight::Document] document
   # @return [Boolean]
   def bookmarked? document
-    current_bookmarks.any? { |x| x.document_id == document.id && x.document_type == document.class }
+    current_bookmarks.any? { |x| x.document_id == document.id && x.document_type.to_s == document.class.to_s }
   end
 
   ##

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -7,6 +7,15 @@ module Blacklight::FacetsHelperBehavior
     facet_config.presenter.new(facet_config, display_facet, self)
   end
 
+  def search_facet_path(options = {})
+    opts = search_state
+           .to_h
+           .merge(action: "facet", only_path: true)
+           .merge(options)
+           .except(:page)
+    url_for opts
+  end
+
   private
 
   def facet_value_for_facet_item item

data/app/helpers/blacklight/icon_helper_behavior.rb

@@ -4,18 +4,10 @@
 # Module to help generate icon helpers for SVG images
 module Blacklight::IconHelperBehavior
   ##
-  # Returns the raw SVG (String) for a Blacklight Icon located in
-  # app/assets/images/blacklight/*.svg. Caches them so we don't have to look up
-  # the svg everytime.
+  # Returns the raw SVG (String) for a Blacklight Icon
   # @param [String, Symbol] icon_name
   # @return [String]
-  def blacklight_icon(icon_name, **kwargs)
-    render "Blacklight::Icons::#{icon_name.to_s.camelize}Component".constantize.new(**kwargs)
-  rescue NameError
-    Blacklight.deprecation.warn(
-      "Falling back on the LegacyIconComponent with \"#{icon_name}\" is deprecated. Instead create the component `Blacklight::Icons::#{icon_name.to_s.camelize}Component` for this icon."
-    )
-
-    render Blacklight::Icons::LegacyIconComponent.new(name: icon_name, **kwargs)
+  def blacklight_icon(icon_name, **)
+    render "Blacklight::Icons::#{icon_name.to_s.camelize}Component".constantize.new(**)
   end
 end

data/app/helpers/blacklight/layout_helper_behavior.rb

@@ -55,8 +55,8 @@ module Blacklight
     #
     # @param [Hash] options
     # @return [String]
-    def render_nav_actions(options = {}, &block)
-      render_filtered_partials(blacklight_config.navbar.partials, options, &block)
+    def render_nav_actions(options = {}, &)
+      render_filtered_partials(blacklight_config.navbar.partials, options, &)
     end
 
     ##

data/app/helpers/blacklight/render_partials_helper_behavior.rb

@@ -11,20 +11,6 @@ module Blacklight::RenderPartialsHelperBehavior
     render_document_index_with_view(document_index_view_type, documents, locals)
   end
 
-  ##
-  # Return the list of partials for a given solr document
-  # @param [SolrDocument] doc solr document to render partials for
-  # @param [Array<String>] partials list of partials to render
-  # @param [Hash] locals local variables to pass to the render call
-  # @return [String]
-  def render_document_partials(doc, partials = [], locals = {})
-    safe_join(partials.map do |action_name|
-      render_document_partial(doc, action_name, locals)
-    end, "\n")
-  end
-  Blacklight.deprecation.deprecate_methods(self, render_document_partials: 'Replace this call with: "document_component = blacklight_config.view_config(:atom).summary_component
-render document_component.new(presenter: document_presenter(document), component: :div, show: true)"')
-
   ##
   # Return the list of xml for a given solr document. Doesn't safely escape for HTML.
   # @param [SolrDocument] doc solr document to render partials for

data/app/helpers/blacklight/url_helper_behavior.rb

@@ -114,6 +114,6 @@ module Blacklight::UrlHelperBehavior
   # Use in e.g. the search history display, where we want something more like text instead of the normal constraints
   def link_to_previous_search(params)
     search_state = controller.search_state_class.new(params, blacklight_config, self)
-    link_to(render(Blacklight::ConstraintsComponent.for_search_history(search_state: search_state)), search_action_path(params))
+    link_to(render(Blacklight::ConstraintsComponent.for_search_history(search_state: search_state, classes: 'clearfix constraints-container mb-0')), search_action_path(params))
   end
 end

data/app/javascript/{blacklight → blacklight-frontend}/bookmark_toggle.js

@@ -1,4 +1,4 @@
-import CheckboxSubmit from 'blacklight/checkbox_submit'
+import CheckboxSubmit from 'blacklight-frontend/checkbox_submit'
 
 const BookmarkToggle = (e) => {
   if (e.target.matches('[data-checkboxsubmit-target="checkbox"]')) {

data/app/javascript/{blacklight → blacklight-frontend}/checkbox_submit.js

@@ -36,6 +36,9 @@ export default class CheckboxSubmit {
     }).then((json) => {
       this.labelTarget.removeAttribute('disabled')
       this.checkboxTarget.removeAttribute('disabled')
+      // For accessibility return keyboard focus 
+      // back to the checkbox after form submission
+      this.checkboxTarget.focus()
       this.updateStateFor(!this.checked)
       this.bookmarksCounter().forEach(counter => {
         counter.innerHTML = json.bookmarks.count;

data/app/javascript/{blacklight → blacklight-frontend}/core.js

@@ -15,14 +15,6 @@ const Core = function() {
       const listeners = [];
       if (typeof Turbo !== 'undefined') {
         listeners.push('turbo:load', 'turbo:frame-load');
-      } else if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
-        // Turbolinks 5
-        if (Turbolinks.BrowserAdapter) {
-          listeners.push('turbolinks:load');
-        } else {
-          // Turbolinks < 5
-          listeners.push('page:load', 'DOMContentLoaded');
-        }
       } else {
         listeners.push('DOMContentLoaded');
       }
@@ -32,8 +24,8 @@ const Core = function() {
   };
 }();
 
-// turbolinks triggers page:load events on page transition
-// If app isn't using turbolinks, this event will never be triggered, no prob.
+// turbo triggers turbo:load events on page transition
+// If app isn't using turbo, this event will never be triggered, no prob.
 Core.listeners().forEach(function(listener) {
   document.addEventListener(listener, function() {
     Core.activate()

data/app/javascript/{blacklight → blacklight-frontend}/facet_suggest.js

@@ -1,4 +1,4 @@
-import debounce from "blacklight/debounce";
+import debounce from "blacklight-frontend/debounce";
 
 const FacetSuggest = async (e) => {
   if (e.target.matches('.facet-suggest')) {
@@ -25,8 +25,6 @@ const FacetSuggest = async (e) => {
         const blob = await response.blob()
         const text = await blob.text()
 
-        const facetArea = document.querySelector('.facet-extended-list');
-
         if (text && facetArea) {
             facetArea.innerHTML = text
         }

data/app/javascript/blacklight-frontend/index.js

@@ -0,0 +1,16 @@
+import BookmarkToggle from 'blacklight-frontend/bookmark_toggle'
+import ButtonFocus from 'blacklight-frontend/button_focus'
+import FacetSuggest from 'blacklight-frontend/facet_suggest'
+import Modal from 'blacklight-frontend/modal'
+import SearchContext from 'blacklight-frontend/search_context'
+import Core from 'blacklight-frontend/core'
+
+export default {
+  BookmarkToggle,
+  ButtonFocus,
+  FacetSuggest,
+  Modal,
+  SearchContext,
+  Core,
+  onLoad: Core.onLoad
+}

data/app/javascript/{blacklight → blacklight-frontend}/modal.js

@@ -56,9 +56,6 @@
 const Modal = (() => {
   const modal = {}
 
-  // bootstrap class that will stop body scrolling when modal is open
-  const bootstrapBodyClassOpen = "modal-open";
-
   // a Bootstrap modal div that should be already on the page hidden
   modal.modalSelector = '#blacklight-modal';
 
@@ -113,7 +110,7 @@ const Modal = (() => {
     }
     elements.forEach((el) => frag.appendChild(el))
     modal.activateScripts(frag)
-    
+
     modal.target().querySelector('.modal-content').replaceChildren(frag)
 
     // send custom event with the modal dialog div as the target
@@ -122,7 +119,6 @@ const Modal = (() => {
 
     // if they did preventDefault, don't show the dialog
     if (e.defaultPrevented) return;
-
     modal.show();
   };
 

data/app/models/concerns/blacklight/document.rb

@@ -31,17 +31,6 @@ module Blacklight::Document
     class_attribute :inspector_fields, default: [:_source]
   end
 
-  Email = Module.new do
-    def self.included(mod)
-      Blacklight.deprecation.warn("Blacklight::Document::Email is deprecated and will be removed (included in #{mod}).")
-    end
-  end
-  Sms = Module.new do
-    def self.included(mod)
-      Blacklight.deprecation.warn("Blacklight::Document::Sms is deprecated and will be removed (included in #{mod}).")
-    end
-  end
-
   attr_reader :response, :_source
   alias_method :solr_response, :response
 

data/app/models/concerns/blacklight/user.rb

@@ -5,7 +5,7 @@ module Blacklight::User
   # SEE ALSO:  The lib/blacklight/generator/user_generator.rb class for where this
   # is generated into the hosting application.
   included do
-    class_attribute :string_display_key
+    class_attribute :string_display_key, default: :email
 
     has_many :bookmarks, dependent: :destroy, as: :user
     has_many :searches,  dependent: :destroy, as: :user

data/app/models/facet_search_builder.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class FacetSearchBuilder < Blacklight::FacetSearchBuilder
+  include Blacklight::Solr::FacetSearchBuilderBehavior
+end

data/app/presenters/blacklight/facet_field_presenter.rb

@@ -4,7 +4,7 @@ module Blacklight
   class FacetFieldPresenter
     attr_reader :facet_field, :display_facet, :view_context, :search_state
 
-    delegate :key, to: :facet_field
+    delegate :key, :suggest, to: :facet_field
     delegate :field_name, to: :display_facet
 
     def initialize(facet_field, display_facet, view_context, search_state = view_context.search_state)
@@ -50,8 +50,8 @@ module Blacklight
     end
 
     # Appease rubocop rules by implementing #each_value
-    def each_value(&block)
-      values.each(&block)
+    def each_value(&)
+      values.each(&)
     end
 
     def paginator

data/app/presenters/blacklight/rendering/helper_method.rb

@@ -15,10 +15,10 @@ module Blacklight
 
       def render_helper
         context.send(config.helper_method,
-                     **options.merge(document: document,
-                                     field: config.field,
-                                     config: config,
-                                     value: values))
+                     **options, document: document,
+                                field: config.field,
+                                config: config,
+                                value: values)
       end
     end
   end

data/app/presenters/blacklight/rendering/join.rb

@@ -16,8 +16,8 @@ module Blacklight
 
       private
 
-      def html_escape(*args)
-        ERB::Util.html_escape(*args)
+      def html_escape(*)
+        ERB::Util.html_escape(*)
       end
     end
   end

data/app/services/blacklight/facet_search_service.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# FacetSearchService returns a facet list from the repository. This is for drawing the "more facets" modal
+module Blacklight
+  class FacetSearchService
+    def initialize(config:, search_state:, search_builder_class: config.facet_search_builder_class, **context)
+      @blacklight_config = config
+      @search_state = search_state
+      @user_params = @search_state.params
+      @search_builder_class = search_builder_class
+      @context = context
+    end
+
+    # The blacklight_config + controller are accessed by the search_builder
+    attr_reader :blacklight_config, :context
+
+    def search_builder
+      search_builder_class.new(self)
+    end
+
+    def search_state_class
+      @search_state.class
+    end
+
+    ##
+    # Get the solr response when retrieving only a single facet field
+    # @return [Blacklight::Solr::Response] the solr response
+    def facet_field_response(facet_field, extra_controller_params = {})
+      query = search_builder.with(search_state).facet(facet_field)
+      repository.search(params: query.merge(extra_controller_params))
+    end
+
+    def facet_suggest_response(facet_field, facet_suggestion_query, extra_controller_params = {})
+      query = search_builder.with(search_state).facet(facet_field).facet_suggestion_query(facet_suggestion_query)
+      repository.search(params: query.merge(extra_controller_params))
+    end
+
+    private
+
+    attr_reader :search_builder_class, :search_state
+
+    delegate :repository, to: :blacklight_config
+  end
+end

data/app/services/blacklight/field_retriever.rb

@@ -41,7 +41,7 @@ module Blacklight
 
     def retrieve_simple
       # regular document field
-      if field_config.default && field_config.default.is_a?(Proc)
+      if field_config.default.is_a?(Proc)
         document.fetch(field_config.field, &field_config.default)
       else
         document.fetch(field_config.field, field_config.default)

data/app/services/blacklight/search_params_yaml_coder.rb

@@ -21,7 +21,6 @@ module Blacklight
       params.with_indifferent_access
     end
 
-    # rubocop:disable Security/YAMLLoad
     if YAML.respond_to?(:unsafe_load)
       def self.yaml_load(payload)
         if ActiveRecord.try(:use_yaml_unsafe_load) || ActiveRecord::Base.try(:use_yaml_unsafe_load)
@@ -43,6 +42,5 @@ module Blacklight
         end
       end
     end
-    # rubocop:enable Security/YAMLLoad
   end
 end

data/app/services/blacklight/search_service.rb

@@ -3,9 +3,9 @@
 # SearchService returns search results from the repository
 module Blacklight
   class SearchService
-    def initialize(config:, search_state: nil, user_params: nil, search_builder_class: config.search_builder_class, **context)
+    def initialize(config:, search_state:, search_builder_class: config.search_builder_class, **context)
       @blacklight_config = config
-      @search_state = search_state || Blacklight::SearchState.new(user_params || {}, config)
+      @search_state = search_state
       @user_params = @search_state.params
       @search_builder_class = search_builder_class
       @context = context
@@ -31,7 +31,7 @@ module Blacklight
       builder.rows = search_state.per_page
 
       builder = yield(builder) if block_given?
-      response = repository.search(builder)
+      response = repository.search(params: builder)
 
       if response.grouped? && grouped_key_for_results
         response.group(grouped_key_for_results)
@@ -59,12 +59,12 @@ module Blacklight
     # @return [Blacklight::Solr::Response] the solr response
     def facet_field_response(facet_field, extra_controller_params = {})
       query = search_builder.with(search_state).facet(facet_field)
-      repository.search(query.merge(extra_controller_params))
+      repository.search(params: query.merge(extra_controller_params))
     end
 
     def facet_suggest_response(facet_field, facet_suggestion_query, extra_controller_params = {})
       query = search_builder.with(search_state).facet(facet_field).facet_suggestion_query(facet_suggestion_query)
-      repository.search(query.merge(extra_controller_params))
+      repository.search(params: query.merge(extra_controller_params))
     end
 
     # Get the previous and next document from a search result
@@ -73,7 +73,7 @@ module Blacklight
       p = previous_and_next_document_params(index)
       new_state = request_params.is_a?(Blacklight::SearchState) ? request_params : Blacklight::SearchState.new(request_params, blacklight_config)
       query = search_builder.with(new_state).start(p.delete(:start)).rows(p.delete(:rows)).merge(extra_controller_params).merge(p)
-      response = repository.search(query)
+      response = repository.search(params: query)
       document_list = response.documents
 
       # only get the previous doc if there is one

data/app/values/blacklight/types.rb

@@ -95,8 +95,8 @@ module Blacklight
     end
 
     class Selector < Array
-      def initialize(by: nil, block: nil, **kwargs)
-        super(**kwargs)
+      def initialize(by: nil, block: nil, **)
+        super(**)
         @by = by
         @block = block
       end

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

@@ -1,7 +1,5 @@
   <%= 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')
       },

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

@@ -13,7 +13,7 @@
   <% else %>
     <%= render 'sort_and_per_page' %>
     <%= render partial: 'tools', locals: { document_list: @response.documents } %>
-    <h2 class='section-heading sr-only visually-hidden'><%= t('blacklight.bookmarks.list_title') %></h2>
+    <h2 class='section-heading visually-hidden'><%= t('blacklight.bookmarks.list_title') %></h2>
     <%= render_document_index @response.documents %>
     <%= render 'results_pagination' %>
   <% end %>

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

@@ -1,3 +1,3 @@
-<%= render(Blacklight::FacetFieldListComponent.new(
+<%= render(Blacklight::Facets::ListComponent.new(
       facet_field: facet_field_presenter(facet_field.merge(item_component: Blacklight::FacetItemPivotComponent), display_facet),
       layout: false)) %>

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

@@ -1,5 +1,5 @@
-<div class="jumbotron text-center p-5 mb-4 bg-light rounded-3">
-  <h1 class="jumbotron-heading"><%= t('blacklight.welcome') %></h1>
+<div class="text-center p-5 mb-4 bg-light rounded-3">
+  <h1 class="fw-bold"><%= t('blacklight.welcome') %></h1>
 
   <p class="lead">Blacklight is a multi-institutional open-source collaboration building a better discovery platform framework.</p>
 

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

@@ -1,7 +1,4 @@
 <% if show_pagination? and @response.total_pages > 1 %>
- <div class="row record-padding">
-  <div class="col-md-12">
-    <%= render Blacklight::Response::PaginationComponent.new(response: @response) %>
-  </div>
- </div>
+  <%= render Blacklight::Response::PaginationComponent.new(response: @response,
+    classes: 'paginate-section mt-2') %>
 <% end %>

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

@@ -13,12 +13,12 @@
 
 <% content_for(:container_header) do -%>
   <%= render 'search_results_header' %>
-  <%= render 'constraints' %>
+  <%= render blacklight_config.view_config(document_index_view_type).constraints_component.new(search_state: search_state) %>
 <% end %>
 
-<%= render 'search_header' %>
+<%= render blacklight_config.view_config(document_index_view_type).search_header_component.new %>
 
-<h2 class="sr-only visually-hidden"><%= t('blacklight.search.search_results') %></h2>
+<h2 class="visually-hidden"><%= t('blacklight.search.search_results') %></h2>
 
 <%- if @response.empty? %>
   <%= render "zero_results" %>

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

@@ -1 +1 @@
-<h1 class="sr-only visually-hidden top-content-title"><%= t('blacklight.search.header') %></h1>
+<h1 class="visually-hidden top-content-title"><%= t('blacklight.search.header') %></h1>