blacklight 7.23.0 → 7.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 982aa4e78d4586096d97f31ccfdd52bfbfe5ff7f562248454240bca9c409d910
-  data.tar.gz: b9fc47ba21552ab4f29c166f04585bbbf70b25bdbe818f70d8d3bfd2c891db58
+  metadata.gz: e758c87d1a1961258d284421d258d39a53600da0df9980f294c2174da1a2fe6f
+  data.tar.gz: cc0da20194f1a185f3847f724e89677a28ef233d5cc89b7ec73dc55dee4ee6f3
 SHA512:
-  metadata.gz: 05d918ebf0f597eaaf5950e34a74785a79a0b7f0174f9d4458c8fa5f906abefb4016f8d307548d80cdc901a7b6a8288083623f9a7db52ebeb6bcc68f29140272
-  data.tar.gz: efcc57d374d646fe0f0113298383244c85180d059db1bb4e4f24537dbf24fee5f38b3a9f8f4ea8b5cbd0bffd3a3bfaffcbf3663d667ea48f33ae26ae0f6837e9
+  metadata.gz: 7b94f8337cb6c1c5cb9747d2a5efe67144dca742418e18e15baa4cb10fcc333608f43d94d25157b2e7be8267a9aa4cef9c8b2544e574745e5c2d1ea6fdf93383
+  data.tar.gz: 85db04a2e0ab1e7736e10afa94e8fe007c2c7163dd8ab551827928a0baa5da426d8106d3b075c1e2621c5a6409d6a5c2e403891b497cf30edf497ca3b47e1d2c

data/.github/workflows/ruby.yml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.7, '3.0']
+        ruby: [2.7, '3.0', 3.1]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
@@ -103,7 +103,7 @@ jobs:
         RAILS_VERSION: 5.2.4.6
         ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
 
-  test_rails7_0:
+  test_rails6_1:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -117,11 +117,11 @@ jobs:
     - name: Install dependencies
       run: bundle install
       env:
-        RAILS_VERSION: 7.0.0
+        RAILS_VERSION: 6.1.5
     - name: Run tests
       run: bundle exec rake ci
       env:
-        RAILS_VERSION: 7.0.0
+        RAILS_VERSION: 6.1.5
         ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-keeps --skip-action-cable --skip-test'
   api_test:
     runs-on: ubuntu-latest

data/VERSION

@@ -1 +1 @@
-7.23.0
+7.25.0

data/app/assets/javascripts/blacklight/blacklight.js

@@ -441,7 +441,7 @@ Blacklight.modal.checkCloseModal = function (event) {
 };
 
 Blacklight.modal.hide = function (el) {
-  if (bootstrap.Modal.VERSION >= "5") {
+  if (typeof bootstrap !== 'undefined' && typeof bootstrap.Modal !== 'undefined' && bootstrap.Modal.VERSION >= "5") {
     bootstrap.Modal.getOrCreateInstance(el || document.querySelector(Blacklight.modal.modalSelector)).hide();
   } else {
     $(el || Blacklight.modal.modalSelector).modal('hide');
@@ -449,7 +449,7 @@ Blacklight.modal.hide = function (el) {
 };
 
 Blacklight.modal.show = function (el) {
-  if (bootstrap.Modal.VERSION >= "5") {
+  if (typeof bootstrap !== 'undefined' && typeof bootstrap.Modal !== 'undefined' && bootstrap.Modal.VERSION >= "5") {
     bootstrap.Modal.getOrCreateInstance(el || document.querySelector(Blacklight.modal.modalSelector)).show();
   } else {
     $(el || Blacklight.modal.modalSelector).modal('show');

data/app/assets/stylesheets/blacklight/_constraints.scss

@@ -12,6 +12,7 @@
     cursor: default;
     text-overflow: ellipsis;
     overflow: hidden;
+    white-space: nowrap;
 
     @media (max-width: breakpoint-min(sm)) {
       max-width: breakpoint-min(sm) * .5;

data/app/components/blacklight/constraint_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class ConstraintComponent < ::ViewComponent::Base
+  class ConstraintComponent < Blacklight::Component
     with_collection_parameter :facet_item_presenter
 
     def initialize(facet_item_presenter:, classes: 'filter', layout: Blacklight::ConstraintLayoutComponent)

data/app/components/blacklight/constraint_layout_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class ConstraintLayoutComponent < ::ViewComponent::Base
+  class ConstraintLayoutComponent < Blacklight::Component
     def initialize(value:, label: nil, remove_path: nil, classes: nil, search_state: nil)
       @value = value
       @label = label

data/app/components/blacklight/constraints_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class ConstraintsComponent < ::ViewComponent::Base
+  class ConstraintsComponent < Blacklight::Component
     include Blacklight::ContentAreasShim
 
     renders_many :query_constraints_area

data/app/components/blacklight/document/action_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Document
     # Render a bookmark widget to bookmark / unbookmark a document
-    class ActionComponent < ::ViewComponent::Base
+    class ActionComponent < Blacklight::Component
       with_collection_parameter :action
 
       # @param [Blacklight::Document] document

data/app/components/blacklight/document/actions_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Document
     # Render a bookmark widget to bookmark / unbookmark a document
-    class ActionsComponent < ::ViewComponent::Base
+    class ActionsComponent < Blacklight::Component
       renders_many :actions, (lambda do |action:, component: nil, **kwargs|
         component ||= action.component || Blacklight::Document::ActionComponent
         component.new(action: action, document: @document, options: @options, url_opts: @url_opts, link_classes: @link_classes, **kwargs)

data/app/components/blacklight/document/bookmark_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Document
     # Render a bookmark widget to bookmark / unbookmark a document
-    class BookmarkComponent < ::ViewComponent::Base
+    class BookmarkComponent < Blacklight::Component
       # @param [Blacklight::Document] document
       # @param [Boolean] checked
       # @param [Object] bookmark_path the rails route to use for bookmarks

data/app/components/blacklight/document/citation_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Document
     # Render citations for the document
-    class CitationComponent < ::ViewComponent::Base
+    class CitationComponent < Blacklight::Component
       DEFAULT_FORMATS = {
         'blacklight.citation.mla': :export_as_mla_citation_txt,
         'blacklight.citation.apa': :export_as_apa_citation_txt,
@@ -13,7 +13,7 @@ module Blacklight
       with_collection_parameter :document
 
       # @param [Blacklight::Document] document
-      # @param [Hash<String => Symbol>] map of citation format names (suspiciously, i18n keys
+      # @param [Hash<String => Symbol>] formats map of citation format names (suspiciously, i18n keys
       #   for them) to document methods that return the formatted citation.
       def initialize(document:, formats: DEFAULT_FORMATS)
         @document = document

data/app/components/blacklight/document/group_component.rb

@@ -3,10 +3,11 @@
 module Blacklight
   module Document
     # Render the 'more like this' results from the response
-    class GroupComponent < ::ViewComponent::Base
+    class GroupComponent < Blacklight::Component
       with_collection_parameter :group
 
-      # @param [Blacklight::Document] document
+      # @param [Blacklight::Solr::Response::Group] group
+      # @param [Integer] group_limit
       def initialize(group:, group_limit: -1)
         @group = group
         @group_limit = group_limit

data/app/components/blacklight/document/more_like_this_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Document
     # Render the 'more like this' results from the response
-    class MoreLikeThisComponent < ::ViewComponent::Base
+    class MoreLikeThisComponent < Blacklight::Component
       with_collection_parameter :document
 
       # @param [Blacklight::Document] document

data/app/components/blacklight/document/thumbnail_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Document
     # Render the thumbnail for the document
-    class ThumbnailComponent < ::ViewComponent::Base
+    class ThumbnailComponent < Blacklight::Component
       with_collection_parameter :presenter
 
       # @param [Blacklight::DocumentPresenter] presenter

data/app/components/blacklight/document_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class DocumentComponent < ::ViewComponent::Base
+  class DocumentComponent < Blacklight::Component
     include Blacklight::ContentAreasShim
 
     # Content appearing before the document
@@ -69,7 +69,6 @@ module Blacklight
     # @param classes [Array, String] additional HTML classes for the root element
     # @param component [Symbol, String] HTML tag type to use for the root element
     # @param title_component [Symbol, String] HTML tag type to use for the title element
-    # @param metadata_component [Blacklight::DocumentMetadataComponent]
     # @param counter [Number, nil] a pre-computed counter for the position of this document in a search result set
     # @param document_counter [Number, nil] alternatively, the document's position in a collection and,
     # @param counter_offset [Number] with `document_counter`, the offset of the start of that collection counter to the overall result set

data/app/components/blacklight/document_metadata_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class DocumentMetadataComponent < ::ViewComponent::Base
+  class DocumentMetadataComponent < Blacklight::Component
     renders_many :fields, (lambda do |component: nil, **kwargs|
       (component || Blacklight::MetadataFieldComponent).new(**kwargs)
     end)

data/app/components/blacklight/document_title_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class DocumentTitleComponent < ::ViewComponent::Base
+  class DocumentTitleComponent < Blacklight::Component
     renders_many :before_title
     renders_many :after_title
     renders_many :actions

data/app/components/blacklight/facet_field_checkboxes_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class FacetFieldCheckboxesComponent < ::ViewComponent::Base
+  class FacetFieldCheckboxesComponent < Blacklight::Component
     def initialize(facet_field:, layout: nil)
       @facet_field = facet_field
       @layout = layout == false ? FacetFieldNoLayoutComponent : Blacklight::FacetFieldComponent

data/app/components/blacklight/facet_field_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class FacetFieldComponent < ::ViewComponent::Base
+  class FacetFieldComponent < Blacklight::Component
     include Blacklight::ContentAreasShim
 
     renders_one :label

data/app/components/blacklight/facet_field_filter_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class FacetFieldFilterComponent < ::ViewComponent::Base
+  class FacetFieldFilterComponent < Blacklight::Component
     def initialize(facet_field:)
       @facet_field = facet_field
     end

data/app/components/blacklight/facet_field_inclusive_constraint_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class FacetFieldInclusiveConstraintComponent < ::ViewComponent::Base
+  class FacetFieldInclusiveConstraintComponent < Blacklight::Component
     with_collection_parameter :facet_field
 
     def initialize(facet_field:, values: nil)

data/app/components/blacklight/facet_field_list_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class FacetFieldListComponent < ::ViewComponent::Base
+  class FacetFieldListComponent < Blacklight::Component
     def initialize(facet_field:, layout: nil)
       @facet_field = facet_field
       @layout = layout == false ? FacetFieldNoLayoutComponent : Blacklight::FacetFieldComponent

data/app/components/blacklight/facet_field_no_layout_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class FacetFieldNoLayoutComponent < ::ViewComponent::Base
+  class FacetFieldNoLayoutComponent < Blacklight::Component
     include Blacklight::ContentAreasShim
 
     renders_one :label

data/app/components/blacklight/facet_field_pagination_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class FacetFieldPaginationComponent < ::ViewComponent::Base
+  class FacetFieldPaginationComponent < Blacklight::Component
     def initialize(facet_field:)
       @facet_field = facet_field
     end

data/app/components/blacklight/facet_item_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class FacetItemComponent < ::ViewComponent::Base
+  class FacetItemComponent < Blacklight::Component
     extend Deprecation
 
     with_collection_parameter :facet_item

data/app/components/blacklight/facet_item_pivot_component.rb

@@ -2,7 +2,7 @@
 
 module Blacklight
   # Render facet items and any subtree
-  class FacetItemPivotComponent < ::ViewComponent::Base
+  class FacetItemPivotComponent < Blacklight::Component
     # Somewhat arbitrary number; the only important thing is that
     # it is bigger than the number of leaf nodes in any collapsing
     # pivot facet on the page.

data/app/components/blacklight/hidden_search_state_component.rb

@@ -4,8 +4,8 @@ module Blacklight
   # Writes out zero or more <input type="hidden"> elements, completely
   # representing a hash passed in using Rails-style request parameters
   # for hashes nested with arrays and other hashes.
-  class HiddenSearchStateComponent < ::ViewComponent::Base
-    # @param [Hash] hash
+  class HiddenSearchStateComponent < Blacklight::Component
+    # @param [Hash] params
     def initialize(params:)
       Deprecation.warn(self, "Passing page as a parameter to HiddenSearchStateComponent is deprecated and will not be supported in Blacklight 8") if params.key?(:page)
       @params = params.except(:utf8)

data/app/components/blacklight/metadata_field_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class MetadataFieldComponent < ::ViewComponent::Base
+  class MetadataFieldComponent < Blacklight::Component
     with_collection_parameter :field
 
     # @param field [Blacklight::FieldPresenter]

data/app/components/blacklight/metadata_field_layout_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class MetadataFieldLayoutComponent < ::ViewComponent::Base
+  class MetadataFieldLayoutComponent < Blacklight::Component
     include Blacklight::ContentAreasShim
 
     with_collection_parameter :field

data/app/components/blacklight/response/facet_group_component.html.erb

@@ -22,7 +22,7 @@
   </div>
 
   <%= content_tag :div, id: @panel_id, class: 'facets-collapse collapse' do %>
-    <% Deprecation.silence(Blacklight::FacetsHelperBehavior) do %>
+    <% ::Deprecation.silence(Blacklight::FacetsHelperBehavior) do %>
       <%= helpers.render_facet_partials @fields, response: @response %>
     <% end %>
   <% end %>

data/app/components/blacklight/response/facet_group_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Response
     # Render a group of facet fields
-    class FacetGroupComponent < ::ViewComponent::Base
+    class FacetGroupComponent < Blacklight::Component
       # @param [Blacklight::Response] response
       # @param [Array<String>] fields facet fields to render
       # @param [String] title the title of the facet group section

data/app/components/blacklight/response/pagination_component.rb

@@ -3,17 +3,17 @@
 module Blacklight
   module Response
     # Render a pagination widget for search results
-    class PaginationComponent < ::ViewComponent::Base
+    class PaginationComponent < Blacklight::Component
       # @param [Blacklight::Response] response
       # @param [Hash] html html options for the pagination container
       def initialize(response:, html: {}, **pagination_args)
         @response = response
         @html_attr = { aria: { label: t('views.pagination.aria.container_label') } }.merge(html)
-        @pagination_args = { outer_window: 2, theme: 'blacklight' }.merge(pagination_args)
+        @pagination_args = pagination_args
       end
 
       def pagination
-        helpers.paginate @response, **@pagination_args
+        helpers.paginate @response, **Blacklight::Engine.config.blacklight.default_pagination_options, **@pagination_args
       end
     end
   end

data/app/components/blacklight/search_bar_component.html.erb

@@ -1,23 +1,23 @@
 <%= form_tag @url, method: @method, class: @classes.join(' '), role: 'search', 'aria-label' => scoped_t('submit') do %>
   <%= render_hash_as_hidden_fields(@params) %>
-  <% if @search_fields.length > 1 %>
+  <% if search_fields.length > 1 %>
     <label for="search_field" class="sr-only visually-hidden"><%= scoped_t('search_field.label') %></label>
   <% end %>
   <div class="input-group">
     <%= prepend %>
 
-    <% if @search_fields.length > 1 %>
+    <% if search_fields.length > 1 %>
         <%= select_tag(:search_field,
-                       options_for_select(@search_fields, h(@search_field)),
+                       options_for_select(search_fields, h(@search_field)),
                        title: scoped_t('search_field.title'),
                        id: "#{@prefix}search_field",
                        class: "custom-select form-select search-field") %>
-    <% elsif @search_fields.length == 1 %>
-      <%= hidden_field_tag :search_field, @search_fields.first.last %>
+    <% elsif search_fields.length == 1 %>
+      <%= hidden_field_tag :search_field, search_fields.first.last %>
     <% end %>
 
     <label for="<%= @prefix %><%= @query_param %>" class="sr-only visually-hidden"><%= scoped_t('search.label') %></label>
-    <%= text_field_tag @query_param, @q, placeholder: scoped_t('search.placeholder'), class: "search-q q form-control rounded-#{@search_fields.length > 1 ? '0' : 'left'}", id: "#{@prefix}q", autocomplete: autocomplete_path.present? ? "off" : "", autofocus: @autofocus, data: { autocomplete_enabled: autocomplete_path.present?, autocomplete_path: autocomplete_path }  %>
+    <%= text_field_tag @query_param, @q, placeholder: scoped_t('search.placeholder'), class: "search-q q form-control rounded-#{search_fields.length > 1 ? '0' : 'left'}", id: "#{@prefix}q", autocomplete: autocomplete_path.present? ? "off" : "", autofocus: @autofocus, data: { autocomplete_enabled: autocomplete_path.present?, autocomplete_path: autocomplete_path }  %>
 
     <span class="input-group-append">
       <%= append %>
@@ -30,6 +30,6 @@
   </div>
 <% end %>
 
-<% if presenter.advanced_search_enabled? %>
+<% if advanced_search_enabled? %>
   <%= link_to t('blacklight.advanced_search.more_options'), @advanced_search_url, class: 'advanced_search btn btn-secondary'%>
 <% end %>

data/app/components/blacklight/search_bar_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class SearchBarComponent < ::ViewComponent::Base
+  class SearchBarComponent < Blacklight::Component
     include Blacklight::ContentAreasShim
 
     renders_one :append
@@ -9,10 +9,11 @@ module Blacklight
 
     # rubocop:disable Metrics/ParameterLists
     def initialize(
-      url:, advanced_search_url: nil, params:,
-      classes: ['search-query-form'], presenter: nil, prefix: '',
+      url:, params:,
+      advanced_search_url: nil,
+      classes: ['search-query-form'], prefix: nil,
       method: 'GET', q: nil, query_param: :q,
-      search_field: nil, search_fields: [], autocomplete_path: nil,
+      search_field: nil, search_fields: nil, autocomplete_path: nil,
       autofocus: nil, i18n: { scope: 'blacklight.search.form' }
     )
       @url = url
@@ -23,7 +24,6 @@ module Blacklight
       @params = params.except(:q, :search_field, :utf8, :page)
       @prefix = prefix
       @classes = classes
-      @presenter = presenter
       @method = method
       @autocomplete_path = autocomplete_path
       @autofocus = autofocus
@@ -33,29 +33,34 @@ module Blacklight
     # rubocop:enable Metrics/ParameterLists
 
     def autocomplete_path
-      return nil unless presenter.autocomplete_enabled?
+      return nil unless blacklight_config.autocomplete_enabled
 
       @autocomplete_path
     end
 
     def autofocus
       if @autofocus.nil?
-        presenter.autofocus?
+        blacklight_config.enable_search_bar_autofocus &&
+          controller.is_a?(Blacklight::Catalog) &&
+          controller.action_name == "index" &&
+          !controller.has_search_parameters?
       else
         @autofocus
       end
     end
 
-    private
-
-    def presenter
-      @presenter ||= presenter_class.new(controller, blacklight_config)
+    def search_fields
+      @search_fields ||= blacklight_config.search_fields.values
+                                          .select { |field_def| helpers.should_render_field?(field_def) }
+                                          .collect { |field_def| [helpers.label_for_search_field(field_def.key), field_def.key] }
     end
 
-    def presenter_class
-      blacklight_config.view_config(action_name: :index).search_bar_presenter_class
+    def advanced_search_enabled?
+      blacklight_config.advanced_search.enabled
     end
 
+    private
+
     def blacklight_config
       helpers.blacklight_config
     end

data/app/components/blacklight/search_context_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class SearchContextComponent < ::ViewComponent::Base
+  class SearchContextComponent < Blacklight::Component
     with_collection_parameter :search_context
 
     def initialize(search_context:, search_session:)

data/app/components/blacklight/start_over_button_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Blacklight
-  class StartOverButtonComponent < ::ViewComponent::Base
+  class StartOverButtonComponent < Blacklight::Component
     def call
       link_to t('blacklight.search.start_over'), start_over_path, class: 'catalog_startOverLink btn btn-primary'
     end

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -81,6 +81,7 @@ module Blacklight::BlacklightHelperBehavior
   def render_search_bar
     search_bar_presenter.render
   end
+  deprecation_deprecate render_search_bar: "Call `render Blacklight::SearchBarComponent.new' instead"
 
   # @!group Presenter extension helpers
   ##
@@ -88,6 +89,7 @@ module Blacklight::BlacklightHelperBehavior
   def search_bar_presenter
     @search_bar ||= search_bar_presenter_class.new(controller, blacklight_config)
   end
+  deprecation_deprecate :search_bar_presenter
 
   # @!group Document helpers
   ##
@@ -361,7 +363,7 @@ module Blacklight::BlacklightHelperBehavior
 
   ##
   # Override this method if you want to use a differnet presenter for your documents
-  # @param [Blacklight::Document] optional, here for extension + backwards compatibility only
+  # @param [Blacklight::Document] document optional, here for extension + backwards compatibility only
   def document_presenter_class(document = nil)
     Deprecation.silence(Blacklight::BlacklightHelperBehavior) do
       case action_name

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -319,7 +319,7 @@ module Blacklight::CatalogHelperBehavior
   end
 
   # Render an html <title> appropriate string for a set of search parameters
-  # @param [ActionController::Parameters] params2
+  # @param [ActionController::Parameters] params
   # @return [String]
   def render_search_to_page_title(search_state_or_params)
     search_state = if search_state_or_params.is_a? Blacklight::SearchState

data/app/helpers/blacklight/render_constraints_helper_behavior.rb

@@ -84,14 +84,12 @@ module Blacklight::RenderConstraintsHelperBehavior
     Deprecation.warn(Blacklight::RenderConstraintsHelperBehavior, 'render_constraints_filters is deprecated')
     search_state = convert_to_search_state(params_or_search_state)
 
-    Deprecation.silence(Blacklight::SearchState) do
-      return "".html_safe if search_state.filter_params.blank?
+    return "".html_safe unless search_state.filters.any?
 
-      Deprecation.silence(Blacklight::RenderConstraintsHelperBehavior) do
-        safe_join(search_state.filters.map do |field|
-          render_filter_element(field.key, field.values, search_state)
-        end, "\n")
-      end
+    Deprecation.silence(Blacklight::RenderConstraintsHelperBehavior) do
+      safe_join(search_state.filters.map do |field|
+        render_filter_element(field.key, field.values, search_state)
+      end, "\n")
     end
   end
 

data/app/javascript/blacklight/modal.js

@@ -206,7 +206,7 @@ Blacklight.modal.checkCloseModal = function(event) {
 }
 
 Blacklight.modal.hide = function(el) {
-  if (bootstrap && bootstrap.Modal && bootstrap.Modal.VERSION >= "5") {
+  if (typeof bootstrap !== 'undefined' && typeof bootstrap.Modal !== 'undefined' && bootstrap.Modal.VERSION >= "5") {
     bootstrap.Modal.getOrCreateInstance(el || document.querySelector(Blacklight.modal.modalSelector)).hide();
   } else {
     $(el || Blacklight.modal.modalSelector).modal('hide');
@@ -214,7 +214,7 @@ Blacklight.modal.hide = function(el) {
 }
 
 Blacklight.modal.show = function(el) {
-  if (bootstrap && bootstrap.Modal && bootstrap.Modal.VERSION >= "5") {
+  if (typeof bootstrap !== 'undefined' && typeof bootstrap.Modal !== 'undefined' && bootstrap.Modal.VERSION >= "5") {
     bootstrap.Modal.getOrCreateInstance(el || document.querySelector(Blacklight.modal.modalSelector)).show();
   } else {
     $(el || Blacklight.modal.modalSelector).modal('show');

data/app/presenters/blacklight/search_bar_presenter.rb

@@ -2,6 +2,7 @@
 
 module Blacklight
   class SearchBarPresenter
+    extend Deprecation
     attr_reader :configuration, :view_context, :controller
 
     # Set the partial this presenter draws
@@ -17,6 +18,7 @@ module Blacklight
     def render
       view_context.render partial, presenter: self
     end
+    deprecation_deprecate render: "The SearchBarPresenter has been deprecated. Call `render Blacklight::SearchBarComponent.new' instead"
 
     ##
     # @return [Boolean] should autocomplete be enabled in the UI

data/app/services/blacklight/field_retriever.rb

@@ -4,7 +4,7 @@ module Blacklight
   class FieldRetriever
     # @param [Blacklight::Document] document
     # @param [Blacklight::Configuration::Field] field_config solr field configuration
-    # @param [ActionView::Base] Rails rendering context
+    # @param [ActionView::Base] view_context Rails rendering context
     def initialize(document, field_config, view_context = nil)
       @document = document
       @field_config = field_config