blacklight 8.0.1 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 788296244ed7711b196967fcc206a6b7836db4b384bcbbe7e062cdf9f29d8b06
-  data.tar.gz: 4f83e1cf3421afde9db8cd8bfb7fed298c5f3c5874de2f22f7e7a48db2fe5979
+  metadata.gz: 11ad99a6e80c1f34752f093ff2313c459baf620b763c1d51d63c43e899a89445
+  data.tar.gz: 507c9d95e30e9cbb9230b7772050204ca60ea62cb68a9707e5823faa40c2a362
 SHA512:
-  metadata.gz: 193f6a74d712c28cd42a7354ff0da15b7e303b94e51a3854de54401a38ef2e444bf76a1878130fcef71d5286080943cc5635d46f3f38b8bce7c539d2af6f10fe
-  data.tar.gz: 0cf1904df3915ed93d122d54d653201b576c2b4027b182fdb88e6d02bcc9885bac69ecc9c7f6331f4dd3d9ca7f637600e869a5edcb106dad03b2c88868e77e86
+  metadata.gz: 555cbff4a1b669ef5e7f14ed415137e03158ad8ec6881c3365cb9714a6de9a6f08efc62ff2fc037b83dbbead43df14d82625dad982e0a211984b428f6f6f2b97
+  data.tar.gz: 67647433a527fb588f46c4e67f5bb23e44c0be61bde4cfcbefcf0796c44228c7c6c435c1c0e071fd812a80ce04c19701a331c7f8bc043fc6a82a618da4f82f0a

data/.env

@@ -1,6 +1,6 @@
 ALPINE_RUBY_VERSION=3.0.3
 RAILS_VERSION=6.1.4.6
-VIEW_COMPONENT_VERSION=2.6.6
+VIEW_COMPONENT_VERSION=2.66.0
 SOLR_PORT=8983
 SOLR_URL=http://solr:8983/solr/blacklight-core
 SOLR_VERSION=latest

data/.github/workflows/ruby.yml

@@ -41,8 +41,18 @@ jobs:
         additional_engine_cart_rails_options: ['']
         additional_name: ['']
         include:
+        - ruby: '3.2.2'
+          rails_version: '7.1.1'
         - ruby: '3.2.0'
           rails_version: '7.0.4'
+        - ruby: '3.2.0'
+          rails_version: '7.0.4'
+          solr_version: '9.3.0'
+          additional_name: 'Solr 9.3.0'
+        - ruby: '3.2.0'
+          rails_version: '7.0.4'
+          solr_version: '8.11.2'
+          additional_name: 'Solr 8.11.2'
         - ruby: '3.1'
           rails_version: '7.0.4'
         - ruby: '3.1'
@@ -64,6 +74,7 @@ jobs:
           additional_name: '/ API'
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
+      SOLR_VERSION: ${{ matrix.solr_version || 'latest' }}
       VIEW_COMPONENT_VERSION: ${{ matrix.view_component_version }}
       BOOTSTRAP_VERSION: ${{ matrix.bootstrap_version }}
       BLACKLIGHT_API_TEST: ${{ matrix.api }}

data/.rubocop.yml

@@ -1,4 +1,5 @@
 require:
+  - rubocop-capybara
   - rubocop-rspec
   - rubocop-rails
 
@@ -197,6 +198,9 @@ Security/IoMethods: # new in 1.22
   Enabled: true
 Style/ArgumentsForwarding: # new in 1.1
   Enabled: true
+  Exclude:
+    # This cop includes some checks specific to Ruby 3.2
+    - 'lib/blacklight/solr/response/group_response.rb'
 Style/CollectionCompact: # new in 1.2
   Enabled: true
 Style/DocumentDynamicEvalDefinition: # new in 1.1

data/.rubocop_todo.yml

@@ -1,20 +1,36 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-06-27 19:52:51 UTC using RuboCop version 1.31.0.
+# on 2023-10-06 15:10:31 UTC using RuboCop version 1.56.4.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+Capybara/CurrentPathExpectation:
+  Exclude:
+    - 'spec/features/alternate_controller_spec.rb'
+
+# Offense count: 13
+Capybara/VisibilityMatcher:
+  Exclude:
+    - 'spec/features/facets_spec.rb'
+    - 'spec/features/search_filters_spec.rb'
+    - 'spec/helpers/blacklight_helper_spec.rb'
+
 # Offense count: 5
-# Configuration parameters: AutoCorrect.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: leading, trailing
 Layout/LineContinuationLeadingSpace:
   Exclude:
     - 'lib/generators/blacklight/controller_generator.rb'
     - 'lib/generators/blacklight/user_generator.rb'
 
 # Offense count: 1
-# Configuration parameters: IgnoredMethods.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'lib/blacklight/solr/search_builder_behavior.rb'
@@ -29,7 +45,7 @@ Lint/AmbiguousOperator:
     - 'spec/models/blacklight/solr/search_builder_spec.rb'
     - 'spec/services/blacklight/search_service_spec.rb'
 
-# Offense count: 44
+# Offense count: 45
 # This cop supports safe autocorrection (--autocorrect).
 Lint/AmbiguousRegexpLiteral:
   Exclude:
@@ -75,7 +91,8 @@ Lint/EmptyFile:
   Exclude:
     - 'spec/components/blacklight/document_metadata_component_spec.rb'
 
-# Offense count: 38
+# Offense count: 46
+# Configuration parameters: AllowedParentClasses.
 Lint/MissingSuper:
   Enabled: false
 
@@ -94,14 +111,14 @@ Lint/ShadowingOuterLocalVariable:
   Exclude:
     - 'spec/models/blacklight/configuration_spec.rb'
 
-# Offense count: 74
-# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
+# Offense count: 81
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 46
 
 # Offense count: 1
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods, inherit_mode.
-# IgnoredMethods: refine
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
+# AllowedMethods: refine
 Metrics/BlockLength:
   Max: 26
 
@@ -110,32 +127,33 @@ Metrics/BlockLength:
 Metrics/BlockNesting:
   Max: 4
 
-# Offense count: 43
-# Configuration parameters: IgnoredMethods.
+# Offense count: 42
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 14
 
-# Offense count: 69
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# Offense count: 77
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 29
 
-# Offense count: 3
+# Offense count: 4
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 126
+  Max: 124
 
 # Offense count: 8
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 36
-# Configuration parameters: IgnoredMethods.
+# Offense count: 37
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 14
 
 # Offense count: 3
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyleForLeadingUnderscores.
 # SupportedStylesForLeadingUnderscores: disallowed, required, optional
 Naming/MemoizedInstanceVariableName:
@@ -146,7 +164,7 @@ Naming/MemoizedInstanceVariableName:
 
 # Offense count: 9
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to
+# AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
 Naming/MethodParameterName:
   Exclude:
     - 'app/models/concerns/blacklight/document.rb'
@@ -158,47 +176,33 @@ Naming/MethodParameterName:
 # Offense count: 9
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
 # SupportedStyles: snake_case, normalcase, non_integer
-# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339
+# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
 Naming/VariableNumber:
   Exclude:
     - 'spec/lib/blacklight/search_state_spec.rb'
     - 'spec/models/blacklight/search_builder_spec.rb'
 
-# Offense count: 7
+# Offense count: 5
 RSpec/BeforeAfterAll:
   Exclude:
     - 'spec/controllers/search_history_controller_spec.rb'
     - 'spec/models/blacklight/configurable_spec.rb'
     - 'spec/models/blacklight/document/dublin_core_spec.rb'
-    - 'spec/models/blacklight/document/email_spec.rb'
-    - 'spec/models/blacklight/document/sms_spec.rb'
     - 'spec/models/blacklight/solr/document_spec.rb'
 
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/Capybara/CurrentPathExpectation:
-  Exclude:
-    - 'spec/features/alternate_controller_spec.rb'
-
-# Offense count: 13
-RSpec/Capybara/VisibilityMatcher:
-  Exclude:
-    - 'spec/features/facets_spec.rb'
-    - 'spec/features/search_filters_spec.rb'
-    - 'spec/helpers/blacklight_helper_spec.rb'
-
-# Offense count: 98
-# Configuration parameters: Prefixes.
+# Offense count: 103
+# Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Enabled: false
 
 # Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
 RSpec/EmptyExampleGroup:
   Exclude:
     - 'spec/models/blacklight/solr/search_builder_spec.rb'
 
-# Offense count: 128
+# Offense count: 134
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 33
@@ -208,18 +212,17 @@ RSpec/ExpectInHook:
   Exclude:
     - 'spec/controllers/catalog_controller_spec.rb'
 
-# Offense count: 5
+# Offense count: 4
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
 # Include: **/*_spec*rb*, **/spec/**/*
 RSpec/FilePath:
   Exclude:
     - 'spec/controllers/blacklight/catalog/component_configuration_spec.rb'
-    - 'spec/features/sitelinks_search_box.rb'
     - 'spec/models/blacklight/solr/search_builder_spec.rb'
     - 'spec/presenters/pipeline_spec.rb'
     - 'spec/presenters/thumbnail_presenter_spec.rb'
 
-# Offense count: 128
+# Offense count: 108
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
@@ -232,7 +235,6 @@ RSpec/InstanceVariable:
     - 'spec/models/blacklight/document/dublin_core_spec.rb'
     - 'spec/models/blacklight/solr/document_spec.rb'
     - 'spec/models/record_mailer_spec.rb'
-    - 'spec/models/search_spec.rb'
     - 'spec/services/blacklight/search_service_spec.rb'
     - 'spec/views/catalog/index.atom.builder_spec.rb'
 
@@ -276,21 +278,23 @@ RSpec/MessageSpies:
     - 'spec/presenters/blacklight/field_presenter_spec.rb'
     - 'spec/presenters/thumbnail_presenter_spec.rb'
 
-# Offense count: 364
+# Offense count: 379
 RSpec/MultipleExpectations:
   Max: 16
 
-# Offense count: 258
+# Offense count: 282
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 14
 
-# Offense count: 388
-# Configuration parameters: IgnoreSharedExamples.
+# Offense count: 394
+# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
+# SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Enabled: false
 
-# Offense count: 55
+# Offense count: 59
+# Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 5
 
@@ -345,34 +349,27 @@ RSpec/SubjectStub:
     - 'spec/presenters/blacklight/document_presenter_spec.rb'
     - 'spec/services/blacklight/search_service_spec.rb'
 
-# Offense count: 77
+# Offense count: 79
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Enabled: false
 
 # Offense count: 4
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowToTime.
 # SupportedStyles: strict, flexible
 Rails/Date:
   Exclude:
     - 'spec/models/search_spec.rb'
 
-# Offense count: 1
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: slashes, arguments
-Rails/FilePath:
-  Exclude:
-    - 'lib/railties/blacklight.rake'
-
 # Offense count: 20
 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
   Exclude:
-    - 'app/helpers/blacklight/blacklight_helper_behavior.rb'
     - 'app/helpers/blacklight/catalog_helper_behavior.rb'
-    - 'app/helpers/blacklight/document_helper_behavior.rb'
     - 'app/helpers/blacklight/component_helper_behavior.rb'
+    - 'app/helpers/blacklight/document_helper_behavior.rb'
     - 'app/helpers/blacklight/layout_helper_behavior.rb'
     - 'app/helpers/blacklight/render_partials_helper_behavior.rb'
 
@@ -383,12 +380,9 @@ Rails/I18nLocaleAssignment:
   Exclude:
     - 'spec/helpers/blacklight_helper_spec.rb'
 
-# Offense count: 10
+# Offense count: 1
 Rails/OutputSafety:
   Exclude:
-    - 'app/components/blacklight/search_context/server_item_pagination_component.rb'
-    - 'app/helpers/blacklight/catalog_helper_behavior.rb'
-    - 'app/helpers/blacklight/configuration_helper_behavior.rb'
     - 'app/presenters/blacklight/rendering/join.rb'
 
 # Offense count: 14
@@ -411,11 +405,11 @@ Style/Alias:
 
 # Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
 # ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
 # FunctionalMethods: let, let!, subject, watch
-# IgnoredMethods: lambda, proc, it
+# AllowedMethods: lambda, proc, it
 Style/BlockDelimiters:
   Exclude:
     - 'app/views/catalog/index.rss.builder'
@@ -449,17 +443,16 @@ Style/DocumentDynamicEvalDefinition:
     - 'app/builders/blacklight/action_builder.rb'
     - 'lib/blacklight/configuration/fields.rb'
 
-# Offense count: 105
+# Offense count: 128
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
 
-# Offense count: 10
+# Offense count: 9
 # This cop supports safe autocorrection (--autocorrect).
 Style/ExpandPathArguments:
   Exclude:
     - 'Gemfile'
-    - 'lib/generators/blacklight/assets_generator.rb'
     - 'lib/generators/blacklight/controller_generator.rb'
     - 'lib/generators/blacklight/document_generator.rb'
     - 'lib/generators/blacklight/install_generator.rb'
@@ -471,12 +464,14 @@ Style/ExpandPathArguments:
 
 # Offense count: 16
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, IgnoredMethods.
+# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.
 # SupportedStyles: annotated, template, unannotated
+# AllowedMethods: redirect
 Style/FormatStringToken:
   EnforcedStyle: template
 
 # Offense count: 6
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
 Style/GuardClause:
   Exclude:
@@ -486,7 +481,7 @@ Style/GuardClause:
     - 'app/helpers/blacklight/catalog_helper_behavior.rb'
     - 'lib/blacklight/solr/search_builder_behavior.rb'
 
-# Offense count: 30
+# Offense count: 27
 # This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Enabled: false
@@ -501,7 +496,7 @@ Style/MultilineIfModifier:
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMethodComparison.
+# Configuration parameters: AllowMethodComparison, ComparisonsThreshold.
 Style/MultipleComparison:
   Exclude:
     - 'lib/blacklight/configuration/context.rb'
@@ -516,7 +511,7 @@ Style/MutableConstant:
 
 # Offense count: 9
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle, IgnoredMethods.
+# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
@@ -554,13 +549,12 @@ Style/PercentLiteralDelimiters:
     - 'lib/blacklight/engine.rb'
     - 'lib/blacklight/solr/request.rb'
 
-# Offense count: 7
+# Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: implicit, explicit
 Style/RescueStandardError:
   Exclude:
-    - 'app/models/record_mailer.rb'
     - 'lib/blacklight.rb'
     - 'lib/blacklight/configuration/fields.rb'
     - 'lib/railties/blacklight.rake'
@@ -594,7 +588,7 @@ Style/SoleNestedConditional:
   Exclude:
     - 'app/controllers/concerns/blacklight/controller.rb'
 
-# Offense count: 34
+# Offense count: 30
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: MinSize.
 # SupportedStyles: percent, brackets

data/VERSION

@@ -1 +1 @@
-8.0.1
+8.1.0

data/app/builders/blacklight/action_builder.rb

@@ -20,7 +20,7 @@ module Blacklight
 
     # Define a simple action handler for the tool as long as the method
     # doesn't already exist or the `:define_method` option is not `false`
-    def build
+    def build # rubocop:disable Metrics/MethodLength
       return if skip?
 
       callback = opts.fetch(:callback, nil).inspect

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

@@ -40,7 +40,7 @@
 
   <% if sort_fields_select %>
     <div class="form-group row mb-4">
-      <%= content_tag :h2, t('blacklight.advanced_search.form.sort_label'), class: 'col-md-3 col-form-label text-md-right' %>
+      <%= content_tag :h2, t('blacklight.advanced_search.form.sort_label'), id: 'advanced-search-sort-label', class: 'col-md-3 col-form-label text-md-right' %>
       <div class="col">
         <%= sort_fields_select %>
       </div>

data/app/components/blacklight/advanced_search_form_component.rb

@@ -24,14 +24,14 @@ module Blacklight
 
     def default_operator_menu
       options_with_labels = [:must, :should].index_by { |op| t(op, scope: 'blacklight.advanced_search.op') }
-      select_tag(:op, options_for_select(options_with_labels, params[:op]), class: 'input-small')
+      label_tag(:op, t('blacklight.advanced_search.op.label'), class: 'sr-only visually-hidden') + select_tag(:op, options_for_select(options_with_labels, params[:op]), class: 'input-small')
     end
 
     def sort_fields_select
       options = sort_fields.values.map { |field_config| [helpers.sort_field_label(field_config.key), field_config.key] }
       return unless options.any?
 
-      select_tag(:sort, options_for_select(options, params[:sort]), class: "form-select custom-select sort-select w-auto")
+      select_tag(:sort, options_for_select(options, params[:sort]), class: "form-select custom-select sort-select w-auto", aria: { labelledby: 'advanced-search-sort-label' })
     end
 
     private

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

@@ -1,3 +1,3 @@
-<%= content_tag :section, class: 'pagination',  **html_attr do %>
+<%= content_tag :section, class: 'paginate-section',  **html_attr do %>
   <%= pagination %>
 <% end %>

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

@@ -17,7 +17,12 @@ module Blacklight
       end
 
       def pagination
-        helpers.paginate @response, **Blacklight::Engine.config.blacklight.default_pagination_options, **@pagination_args
+        args = configured_options.merge(@pagination_args).compact
+        helpers.paginate @response, **args
+      end
+
+      def configured_options
+        controller.blacklight_config.index.pagination_options
       end
     end
   end

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

@@ -1,4 +1,4 @@
-<%= form_with url: @url, local: true, method: @method, class: @classes.join(' '), scope: @prefix, role: 'search', aria: { label: scoped_t('submit') }, **@form_options do |f| %>
+<%= form_with url: @url, local: true, method: @method, class: @classes.join(' '), scope: @prefix, role: 'search', **@form_options do |f| %>
   <%= render Blacklight::HiddenSearchStateComponent.new(params: @params) %>
   <% if search_fields.length > 1 %>
     <%= f.label :search_field, scoped_t('search_field.label'), class: 'sr-only visually-hidden' %>

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

@@ -86,7 +86,7 @@ module Blacklight::Bookmarks
     end
 
     if request.xhr?
-      success ? render(json: { bookmarks: { count: current_or_guest_user.bookmarks.count } }) : render(json: current_or_guest_user.errors.full_messages, status: "500")
+      success ? render(json: { bookmarks: { count: current_or_guest_user.bookmarks.count } }) : render(json: current_or_guest_user.errors.full_messages, status: :internal_server_error)
     else
       if @bookmarks.any? && success
         flash[:notice] = I18n.t('blacklight.bookmarks.add.success', count: @bookmarks.length)

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

@@ -29,6 +29,16 @@ module Blacklight::Document
       def find id
         repository.find(id).documents.first
       end
+
+      # In Rails 7.1+, needs this method
+      def composite_primary_key?
+        false
+      end
+
+      # In Rails 7.1+, needs this method
+      def has_query_constraints?
+        false
+      end
     end
 
     ##

data/app/models/search.rb

@@ -3,7 +3,12 @@
 class Search < ApplicationRecord
   belongs_to :user, optional: true
 
-  serialize :query_params, Blacklight::SearchParamsYamlCoder
+  if ::Rails.version.to_f >= 7.1
+    # non-deprecated coder: keyword arg for Rails 7.1+
+    serialize :query_params, coder: Blacklight::SearchParamsYamlCoder
+  else
+    serialize :query_params, Blacklight::SearchParamsYamlCoder
+  end
 
   # A Search instance is considered a saved search if it has a user_id.
   def saved?

data/app/services/blacklight/field_retriever.rb

@@ -22,17 +22,19 @@ module Blacklight
 
     # @return [Array]
     def fetch
-      Array.wrap(
-        if field_config.highlight
-          retrieve_highlight
-        elsif field_config.accessor
-          retieve_using_accessor
-        elsif field_config.values
-          retrieve_values
-        else
-          retrieve_simple
-        end
-      )
+      if field_config.highlight
+        value = retrieve_highlight
+      end
+      if value.blank?
+        value = if field_config.accessor
+                  retieve_using_accessor
+                elsif field_config.values
+                  retrieve_values
+                else
+                  retrieve_simple
+                end
+      end
+      Array.wrap(value)
     end
 
     private

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

@@ -1,2 +1,2 @@
-<% Blacklight.deprecation.warn('The partial _show_tools.html.erb will be removed in 9.0. Configure blacklight_config.show.show_tools_component instead (default Blacklight::Document::ShowToolsComponent).') unless local_assigns[:silence_deprecation] %>
+<% Blacklight.deprecation.warn('The partial _show_tools.html.erb will be removed in Blacklight 9.0. Configure blacklight_config.show.show_tools_component instead (default Blacklight::Document::ShowToolsComponent).') unless local_assigns[:silence_deprecation] %>
 <%= render Blacklight::Document::ShowToolsComponent.new(document: document) %>

data/blacklight.gemspec

@@ -31,14 +31,13 @@ Gem::Specification.new do |s|
   s.add_dependency "kaminari", ">= 0.15" # the pagination (page 1,2,3, etc..) of our search results
   s.add_dependency "i18n", '>= 1.7.0' # added named parameters
   s.add_dependency "ostruct", '>= 0.3.2'
-  s.add_dependency "view_component", '>= 2.66', '< 3.1'
+  s.add_dependency "view_component", '>= 2.66', '< 4'
 
   s.add_development_dependency "rsolr", ">= 1.0.6", "< 3"  # Library for interacting with rSolr.
   s.add_development_dependency "rspec-rails", "~> 6.0"
   s.add_development_dependency "rspec-collection_matchers", ">= 1.0"
   s.add_development_dependency 'axe-core-rspec'
   s.add_development_dependency "capybara", '~> 3'
-  s.add_development_dependency 'webdrivers'
   s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'engine_cart', '~> 2.1'
   s.add_development_dependency "equivalent-xml"

data/config/locales/blacklight.en.yml

@@ -244,6 +244,7 @@ en:
       more_options: More options
       any_of: 'Any of:'
       op:
+        label: search operator
         must: all
         should: any
       page_title: Advanced search - %{application_name}

data/lib/blacklight/component.rb

@@ -47,7 +47,7 @@ module Blacklight
 
           component_class.sidecar_files(extensions).each_with_object([]) do |path, memo|
             pieces = File.basename(path).split(".")
-            app_path = "#{Rails.root}/#{path.slice(path.index(component_class.view_component_path)..-1)}"
+            app_path = Rails.root.join(path.slice(path.index(component_class.view_component_path)..-1).to_s).to_s
 
             memo << {
               path: File.exist?(app_path) ? app_path : path,

data/lib/blacklight/configuration.rb

@@ -87,6 +87,10 @@ module Blacklight
       # @since v5.2.0
       # @return [String] The url path (relative to the solr base url) to use when requesting only a single document
       property :document_solr_path, default: 'get'
+      # @!attribute json_solr_path
+      # @since v7.34.0
+      # @return [String] The url path (relative to the solr base url) to use when using Solr's JSON Query DSL (as with the advanced search)
+      property :json_solr_path, default: 'advanced'
       # @!attribute document_unique_id_param
       # @since v5.2.0
       # @return [Symbol] The solr query parameter used for sending the unique identifiers for one or more documents
@@ -171,7 +175,9 @@ module Blacklight
         # component class used to render the search bar
         search_bar_component: nil,
         # component class used to render the header above the documents
-        search_header_component: Blacklight::SearchHeaderComponent
+        search_header_component: Blacklight::SearchHeaderComponent,
+        # pagination parameters to pass to kaminari
+        pagination_options: Blacklight::Engine.config.blacklight.default_pagination_options.dup
       )
 
       # @!attribute show