blacklight 7.25.3 → 7.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ed5074249090af28b69f617baadf69238599d64f387aae61ef71478ea501573
-  data.tar.gz: 03c767a4f628e2e09cd0afbbcb84a30cb0b4161013343f6fd45ab0a9653b58e6
+  metadata.gz: 39fe32f4252deb7d8bb08a1d2781a8d1af7e387eb2bafc93fc083cd13eda9b21
+  data.tar.gz: f0b41d058163f54ca1f5a11b745077c8404eea4f8cea43d87c8ea4e6d6ed0d30
 SHA512:
-  metadata.gz: 55bab7b3b6c79e06a946650fa0be87eb273b29ef7e2967a945b4222e58edb4da63781b6011d325c9de6377fe8fcb6c6678a651dc4afa6a2d86860a81fa81ebdb
-  data.tar.gz: ccafd10839a91ef7ec21bc5838da73f4cd31d6a17320e6e20b4e052c0414b9ca16c2e6347e1ca1f9dbdaacfed26e723bed9eb6289b5e8c7c887c3867a3cbf8b7
+  metadata.gz: e02cee90b4acb73a5b3fe4883c2a076f37146200fdec169bc3bbf0012ffcd79e5244019ee703c97c601f7100bdaecacf65617dccbc2050911b0fa4e7a24eefbd
+  data.tar.gz: 80036e1203a14f9d7f90e11a8fd02309e447d29be4f1deb4250d7628a3bcfad1ed00e43d57d9152fd1fff751e27e983af0adb0747978978039a6d1d81309e688

data/VERSION

@@ -1 +1 @@
-7.25.3
+7.27.0

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

@@ -120,6 +120,21 @@
     text-align: right;
     width: 5em;
   }
+
+  .facet-checkbox {
+    display: table-cell;
+    width: 1.25rem;
+    vertical-align: top;
+  }
+
+  .label-and-count {
+    display: table;
+    width: 100%;
+  }
+
+  .label-and-count label {
+    display: table-row;
+  }
 }
 
 .facet-extended-list {

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

@@ -1,4 +1,4 @@
-<% if constraints.present? %>
+<% if constraints? %>
   <div class="constraints well search_history">
     <h4><%= t 'blacklight.advanced_search.form.search_context' %></h4>
     <% constraints.each do |constraint| %>
@@ -11,8 +11,8 @@
   <%= render_hash_as_hidden_fields(@params) %>
 
   <div class="input-criteria">
-    <div class="query-criteria">
-      <h2 class="query-criteria-heading">
+    <div class="query-criteria mb-4">
+      <h2 class="query-criteria-heading h3 mb-4">
         <%= t('blacklight.advanced_search.form.query_criteria_heading_html', select_menu: default_operator_menu) %>
       </h2>
 
@@ -23,28 +23,32 @@
       </div>
     </div>
 
-    <div class="limit-criteria">
-      <h2 class="limit-criteria-heading"><%= t('blacklight.advanced_search.form.limit_criteria_heading_html')%></h2>
+    <% if search_filter_controls? %>
+      <div class="limit-criteria mb-4">
+        <h2 class="limit-criteria-heading h3"><%= t('blacklight.advanced_search.form.limit_criteria_heading_html')%></h2>
 
-      <div id="advanced_search_facets" class="limit_input">
-        <div class="advanced-facet-limits panel-group">
-          <% search_filter_controls.each do |control| %>
-            <%= control %>
-          <% end %>
+        <div id="advanced_search_facets" class="limit_input row">
+          <div class="advanced-facet-limits panel-group col-md-9 offset-md-3">
+            <% search_filter_controls.each do |control| %>
+              <%= control %>
+            <% end %>
+          </div>
         </div>
       </div>
-    </div>
+    <% end %>
   </div>
 
-  <%= content_tag :h2, t('blacklight.advanced_search.form.sort_label') %>
-  <div class="form-group row">
-    <div class="col-sm-offset-3 col-sm-4">
-      <%= sort_fields_select %>
+  <% 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' %>
+      <div class="col">
+        <%= sort_fields_select %>
+      </div>
     </div>
-  </div>
+  <% end %>
 
   <div class="form-group row">
-    <div class="submit-buttons col-sm-offset-3 col-sm-9">
+    <div class="submit-buttons col-md-9 offset-md-3">
       <%= submit_tag t('blacklight.advanced_search.form.search_btn_html'), class: 'btn btn-primary advanced-search-submit', id: "advanced-search-submit" %>
       <%= button_tag t('blacklight.advanced_search.form.start_over_html'), type: 'reset', class: 'btn btn-link advanced-search-start-over' %>
     </div>

data/app/components/blacklight/advanced_search_form_component.rb

@@ -31,7 +31,9 @@ module Blacklight
 
     def sort_fields_select
       options = sort_fields.values.map { |field_config| [helpers.sort_field_label(field_config.key), field_config.key] }
-      select_tag(:sort, options_for_select(options, params[:sort]), class: "form-control sort-select")
+      return unless options.any?
+
+      select_tag(:sort, options_for_select(options, params[:sort]), class: "form-control sort-select w-auto")
     end
 
     private
@@ -41,7 +43,7 @@ module Blacklight
         search_field_control do
           fields_for('clause[]', i, include_id: false) do |f|
             content_tag(:div, class: 'form-group advanced-search-field row') do
-              f.label(:query, field.display_label('search'), class: "col-sm-3 col-form-label") +
+              f.label(:query, field.display_label('search'), class: "col-md-3 col-form-label text-md-right") +
                 content_tag(:div, class: 'col-sm-9') do
                   f.hidden_field(:field, value: field.key) +
                     f.text_field(:query, value: query_for_search_clause(field.key), class: 'form-control')
@@ -62,12 +64,16 @@ module Blacklight
     end
 
     def initialize_constraints
-      constraint do
-        params = helpers.search_state.params_for_search.except :page, :f_inclusive, :q, :search_field, :op, :index, :sort
+      params = helpers.search_state.params_for_search.except :page, :f_inclusive, :q, :search_field, :op, :index, :sort
+
+      adv_search_context = helpers.search_state.reset(params)
 
-        adv_search_context = helpers.search_state.reset(params)
+      constraints_text = render(Blacklight::ConstraintsComponent.for_search_history(search_state: adv_search_context))
 
-        Blacklight::ConstraintsComponent.for_search_history(search_state: adv_search_context)
+      return if constraints_text.blank?
+
+      constraint do
+        constraints_text
       end
     end
 

data/app/components/blacklight/facet_component.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Blacklight
+  ##
+  # Renders a single section for facet limit with a specified
+  # solr field used for faceting. This renders no UI of it's own, but renders
+  # the component that is configured for the facet.
+  class FacetComponent < ViewComponent::Base
+    with_collection_parameter :display_facet_or_field_config
+
+    # @param [Blacklight::Solr::Response::Facets::FacetField] display_facet
+    # @param [Blacklight::Configuration] blacklight_config
+    # @param [Boolean] layout
+    # rubocop:disable Metrics/CyclomaticComplexity
+    def initialize(display_facet_or_field_config: nil, display_facet: nil, field_config: nil, response: nil, blacklight_config: nil, **component_args)
+      if display_facet_or_field_config.is_a? Blacklight::FacetFieldPresenter
+        @facet_field_presenter = display_facet_or_field_config
+        @field_config = @facet_field_presenter.facet_field
+        @display_facet = @facet_field_presenter.display_facet
+      elsif display_facet_or_field_config.is_a?(Blacklight::Configuration::Field) || field_config
+        @facet_field_presenter = nil # we need the view context to generate this
+        @field_config = display_facet_or_field_config || field_config
+        @display_facet = display_facet ||
+                         response&.aggregations&.fetch(@field_config.field) { Blacklight::Solr::Response::Facets::NullFacetField.new(@field_config.field, response: response) }
+      elsif (display_facet || display_facet_or_field_config).respond_to?(:name)
+        @facet_field_presenter = nil # we need the view context to generate this
+        @display_facet = display_facet || display_facet_or_field_config
+        @field_config = field_config || blacklight_config&.facet_configuration_for_field(@display_facet.name)
+      else
+        raise ArgumentError, 'You must provide one of display_facet or field_config' unless @field_config
+      end
+
+      @component_args = component_args
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity
+
+    def render?
+      helpers.should_render_field?(@field_config, @display_facet)
+    end
+
+    def call
+      return render_partial if @field_config.partial
+
+      component = @field_config.component == true ? Blacklight::FacetFieldListComponent : @field_config.component
+
+      render(
+        component.new(
+          facet_field: @facet_field_presenter || helpers.facet_field_presenter(@field_config, @display_facet),
+          **@component_args
+        )
+      )
+    end
+
+    def render_partial
+      helpers.render(@field_config.partial, locals: { field_name: @field_config.field, facet_field: @field_config, display_facet: @display_facet }.merge(@component_args))
+    end
+  end
+end

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

@@ -13,7 +13,8 @@
 
           <span class="label-and-count">
             <%= label_tag "f_inclusive_#{@facet_field.key}_#{idx}" do %>
-              <%= presenter.label %>
+              <span class="facet-label"><%= presenter.label %></span>
+              <span class="facet-count"><%= t('blacklight.search.facets.count', number: number_with_delimiter(presenter.hits)) %></span>
             <% end %>
           <span>
         </li>

data/app/components/blacklight/facet_field_list_component.rb

@@ -16,7 +16,7 @@ module Blacklight
     end
 
     def render?
-      @facet_field.paginator.items.any?
+      @facet_field.paginator&.items&.any?
     end
   end
 end

data/app/components/blacklight/facet_item_component.rb

@@ -4,6 +4,8 @@ module Blacklight
   class FacetItemComponent < Blacklight::Component
     extend Deprecation
 
+    attr_reader :label, :href, :hits
+
     with_collection_parameter :facet_item
 
     def initialize(facet_item:, wrapping_element: 'li', suppress_link: false)
@@ -48,9 +50,9 @@ module Blacklight
     def overridden_helper_methods?
       return false if explicit_component_configuration?
 
-      @view_context.method(:render_facet_item).owner != Blacklight::FacetsHelperBehavior ||
-        @view_context.method(:render_facet_value).owner != Blacklight::FacetsHelperBehavior ||
-        @view_context.method(:render_selected_facet_value).owner != Blacklight::FacetsHelperBehavior
+      helpers.method(:render_facet_item).owner != Blacklight::FacetsHelperBehavior ||
+        helpers.method(:render_facet_value).owner != Blacklight::FacetsHelperBehavior ||
+        helpers.method(:render_selected_facet_value).owner != Blacklight::FacetsHelperBehavior
     end
 
     # Call out to the helper method equivalent of this component
@@ -72,7 +74,7 @@ module Blacklight
     # @private
     def render_facet_value
       tag.span(class: "facet-label") do
-        link_to_unless(@suppress_link, @label, @href, class: "facet-select", rel: "nofollow")
+        link_to_unless(@suppress_link, label, href, class: "facet-select", rel: "nofollow")
       end + render_facet_count
     end
 
@@ -83,9 +85,9 @@ module Blacklight
     # @private
     def render_selected_facet_value
       tag.span(class: "facet-label") do
-        tag.span(@label, class: "selected") +
+        tag.span(label, class: "selected") +
           # remove link
-          link_to(@href, class: "remove", rel: "nofollow") do
+          link_to(href, class: "remove", rel: "nofollow") do
             tag.span('✖', class: "remove-icon", aria: { hidden: true }) +
               tag.span(helpers.t(:'blacklight.search.facets.selected.remove'), class: 'sr-only visually-hidden')
           end
@@ -101,12 +103,12 @@ module Blacklight
     # @return [String]
     # @private
     def render_facet_count(options = {})
-      return helpers.render_facet_count(@hits, options) unless helpers.method(:render_facet_count).owner == Blacklight::FacetsHelperBehavior || explicit_component_configuration?
+      return helpers.render_facet_count(hits, options) unless helpers.method(:render_facet_count).owner == Blacklight::FacetsHelperBehavior || explicit_component_configuration?
 
-      return '' if @hits.blank?
+      return '' if hits.blank?
 
       classes = (options[:classes] || []) << "facet-count"
-      tag.span(t('blacklight.search.facets.count', number: number_with_delimiter(@hits)), class: classes)
+      tag.span(t('blacklight.search.facets.count', number: number_with_delimiter(hits)), class: classes)
     end
 
     private

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

@@ -60,9 +60,7 @@ module Blacklight::Catalog
   end
 
   def advanced_search
-    empty_service = search_service_class.new(config: blacklight_config, user_params: {}, **search_service_context)
-
-    (@response, _deprecated_document_list) = empty_service.search_results
+    (@response, _deprecated_document_list) = blacklight_advanced_search_form_search_service.search_results
   end
 
   # get a single document from the index
@@ -334,4 +332,14 @@ module Blacklight::Catalog
     flash[:notice] = flash_notice
     redirect_to search_action_url
   end
+
+  def blacklight_advanced_search_form_search_service
+    form_search_state = search_state_class.new(blacklight_advanced_search_form_params, blacklight_config, self)
+
+    search_service_class.new(config: blacklight_config, search_state: form_search_state, user_params: form_search_state.to_h, **search_service_context)
+  end
+
+  def blacklight_advanced_search_form_params
+    {}
+  end
 end

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -76,13 +76,10 @@ module Blacklight::FacetsHelperBehavior
     field_config = facet_configuration_for_field(display_facet.name)
 
     if field_config.component
-      return unless should_render_field?(field_config, display_facet)
-
-      component = field_config.component == true ? Blacklight::FacetFieldListComponent : field_config.component
-
       return render(
-        component.new(
-          facet_field: facet_field_presenter(field_config, display_facet),
+        Blacklight::FacetComponent.new(
+          display_facet: display_facet,
+          field_config: field_config,
           layout: (params[:action] == 'facet' ? false : options[:layout])
         )
       )

data/app/helpers/blacklight/render_constraints_helper_behavior.rb

@@ -35,7 +35,7 @@ module Blacklight::RenderConstraintsHelperBehavior
                              end
 
     Deprecation.silence(Blacklight::RenderConstraintsHelperBehavior) do
-      render_constraints_query(params_or_search_state) + render_constraints_filters(params_or_search_state)
+      render_constraints_query(params_or_search_state) + render_constraints_clauses(params_or_search_state) + render_constraints_filters(params_or_search_state)
     end
   end
 
@@ -60,6 +60,24 @@ module Blacklight::RenderConstraintsHelperBehavior
     end
   end
 
+  ##
+  # Render the query constraints
+  #
+  # @deprecated
+  # @param [Blacklight::SearchState,ActionController::Parameters] params_or_search_state query parameters
+  # @return [String]
+  def render_constraints_clauses(params_or_search_state = search_state)
+    search_state = convert_to_search_state(params_or_search_state)
+
+    clause_presenters = search_state.clause_params.map do |key, clause|
+      field_config = blacklight_config.search_fields[clause[:field]]
+      Blacklight::ClausePresenter.new(key, clause, field_config, self, search_state)
+    end
+
+    render(Blacklight::ConstraintComponent.with_collection(clause_presenters))
+  end
+  deprecation_deprecate :render_constraints_clauses
+
   ##
   # Provide a url for removing a particular constraint. This can be overriden
   # in the case that you want parameters other than the defaults to be removed
@@ -107,9 +125,13 @@ module Blacklight::RenderConstraintsHelperBehavior
     safe_join(Array(values).map do |val|
       next if val.blank? # skip empty string
 
-      presenter = facet_item_presenter(facet_config, val, facet)
-
       Deprecation.silence(Blacklight::RenderConstraintsHelperBehavior) do
+        presenter = if val.is_a? Array
+                      inclusive_facet_item_presenter(facet_config, val, facet)
+                    else
+                      facet_item_presenter(facet_config, val, facet)
+                    end
+
         render_constraint_element(presenter.field_label,
                                   presenter.label,
                                   remove: presenter.remove_href(search_state),
@@ -118,6 +140,10 @@ module Blacklight::RenderConstraintsHelperBehavior
     end, "\n")
   end
 
+  def inclusive_facet_item_presenter(facet_config, facet_item, facet_field)
+    Blacklight::InclusiveFacetItemPresenter.new(facet_item, facet_config, self, facet_field)
+  end
+
   # Render a label/value constraint on the screen. Can be called
   # by plugins and such to get application-defined rendering.
   #

data/app/presenters/blacklight/clause_presenter.rb

@@ -25,7 +25,7 @@ module Blacklight
     end
 
     def remove_href(path = search_state)
-      view_context.search_action_path(path.reset_search(clause: path.clause_params.except(key)))
+      view_context.search_action_path(path.reset_search(clause: path.clause_params.except(key)).to_h)
     end
 
     private

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

@@ -1,5 +1,5 @@
 <% if render_show_doc_actions_method_from_blacklight? %>
-  <%= render(Blacklight::Document::ActionsComponent.new(document: nil, tag: 'div', classes: "#{controller_name}Tools", wrapping_tag: 'span', wrapping_classes: 'btn btn-outline-primary', link_classes: '', actions: document_actions(document_list, options: { document: nil }), options: { document_list: @response.documents }, url_opts: Blacklight::Parameters.sanitize(params.to_unsafe_h))) %>
+  <%= 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">

data/lib/blacklight/solr/response/facets.rb

@@ -99,6 +99,12 @@ module Blacklight::Solr::Response::Facets
     end
   end
 
+  class NullFacetField < FacetField
+    def initialize name, items = [], response: nil, **kwargs
+      super(name, items, response: response, **kwargs)
+    end
+  end
+
   ##
   # Get all the Solr facet data (fields, queries, pivots) as a hash keyed by
   # both the Solr field name and/or by the blacklight field name

data/lib/generators/blacklight/templates/solr/conf/solrconfig.xml

@@ -17,6 +17,7 @@
   </updateHandler>
 
   <!-- solr lib dirs -->
+  <lib dir="${solr.install.dir:../../../..}/contrib/modules/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
 

data/spec/components/blacklight/facet_component_spec.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Blacklight::FacetComponent, type: :component do
+  subject(:rendered) do
+    render_inline_to_capybara_node(component)
+  end
+
+  let(:component) { described_class.new(**component_kwargs) }
+  let(:component_kwargs) { { field_config: facet_config, display_facet: display_facet } }
+  let(:items) { [{ label: "Book", value: 'Book', hits: 20 }] }
+
+  let(:display_facet) do
+    instance_double(Blacklight::Solr::Response::Facets::FacetField, name: 'field', items: items, limit: nil, sort: :index, offset: 0, prefix: nil)
+  end
+
+  let(:facet_config) { Blacklight::Configuration::FacetField.new(key: 'field', component: Blacklight::FacetFieldListComponent).normalize! }
+
+  before do
+    allow(controller).to receive(:view_context).and_return(controller.view_context)
+    allow(controller.view_context).to receive(:facet_limit_for).and_return(20)
+  end
+
+  it 'delegates to the configured component to render something' do
+    expect(rendered).to have_selector 'ul.facet-values'
+  end
+
+  context 'with a facet configured to use a partial' do
+    let(:facet_config) do
+      Blacklight::Configuration::FacetField.new(key: 'field', partial: 'catalog/facet_partial').normalize!
+    end
+
+    before do
+      controller.view_context.view_paths.unshift(RSpec::Rails::ViewExampleGroup::StubResolverCache.resolver_for('catalog/_facet_partial.html.erb' => 'facet partial'))
+    end
+
+    it 'renders the partial' do
+      expect(rendered).to have_content 'facet partial'
+    end
+  end
+
+  context 'with a field and response' do
+    let(:component_kwargs) do
+      { display_facet_or_field_config: facet_config, response: response }
+    end
+
+    let(:response) { instance_double(Blacklight::Solr::Response, aggregations: { 'field' => display_facet }) }
+
+    it 'extracts the facet data from the response to pass on to the rendering component' do
+      allow(facet_config.component).to receive(:new).and_call_original
+
+      rendered
+
+      expect(facet_config.component).to have_received(:new).with(facet_field: have_attributes(facet_field: facet_config, display_facet: display_facet))
+    end
+
+    context 'when the field is not in the response' do
+      let(:facet_config) { Blacklight::Configuration::FacetField.new(key: 'some_other_field', component: Blacklight::FacetFieldListComponent).normalize! }
+
+      it 'uses a null field to pass through the response information anyway' do
+        allow(facet_config.component).to receive(:new).and_call_original
+
+        rendered
+
+        expect(facet_config.component).to have_received(:new).with(facet_field: have_attributes(facet_field: facet_config, display_facet: have_attributes(items: [], response: response)))
+      end
+    end
+  end
+
+  context 'with a display facet and configuration' do
+    let(:component_kwargs) do
+      { display_facet_or_field_config: display_facet, blacklight_config: blacklight_config }
+    end
+
+    let(:blacklight_config) { Blacklight::Configuration.new.tap { |config| config.facet_fields['field'] = facet_config } }
+
+    it 'pulls the facet config from the blacklight config' do
+      allow(facet_config.component).to receive(:new).and_call_original
+
+      rendered
+
+      expect(facet_config.component).to have_received(:new).with(facet_field: have_attributes(facet_field: facet_config, display_facet: display_facet))
+    end
+  end
+
+  context 'with a presenter' do
+    let(:component_kwargs) do
+      { display_facet_or_field_config: presenter }
+    end
+
+    let(:presenter) { Blacklight::FacetFieldPresenter.new(facet_config, display_facet, controller.view_context) }
+
+    it 'renders the component with the provided presenter' do
+      allow(facet_config.component).to receive(:new).and_call_original
+
+      rendered
+
+      expect(facet_config.component).to have_received(:new).with(facet_field: presenter)
+    end
+  end
+end

data/spec/helpers/blacklight/facets_helper_behavior_spec.rb

@@ -199,7 +199,7 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
 
     it "lets you override the rendered partial for pivot facets" do
       mock_facet = double(name: 'component_field')
-      expect(helper).to receive(:render).with(an_instance_of(Blacklight::FacetFieldListComponent))
+      expect(helper).to receive(:render).with(an_instance_of(Blacklight::FacetComponent))
       helper.render_facet_limit(mock_facet)
     end
 

data/spec/helpers/blacklight/render_constraints_helper_behavior_spec.rb

@@ -6,6 +6,7 @@ RSpec.describe Blacklight::RenderConstraintsHelperBehavior do
   let(:config) do
     Blacklight::Configuration.new do |config|
       config.add_facet_field 'type'
+      config.add_search_field 'title'
     end
   end
 
@@ -31,6 +32,21 @@ RSpec.describe Blacklight::RenderConstraintsHelperBehavior do
     end
   end
 
+  describe '#render_constraints_clauses' do
+    subject { helper.render_constraints_clauses(params) }
+
+    let(:my_engine) { double("Engine") }
+    let(:params) { ActionController::Parameters.new(clause: { "0": { field: 'title', query: 'nature' } }, f: { type: 'journal' }) }
+
+    it 'renders the clause constraint' do
+      expect(subject).to have_selector '.constraint-value', text: /Title\s+nature/
+    end
+
+    it "has a link relative to the current url" do
+      expect(subject).to have_link 'Remove constraint Title: nature', href: '/catalog?f%5Btype%5D%5B%5D=journal'
+    end
+  end
+
   describe '#render_filter_element' do
     subject { helper.render_filter_element('type', ['journal'], path) }
 
@@ -54,6 +70,14 @@ RSpec.describe Blacklight::RenderConstraintsHelperBehavior do
         expect(subject).to have_link "Remove constraint Item Type: journal", href: "/catalog?q=biz"
       end
     end
+
+    context 'with multivalued facets' do
+      subject { helper.render_filter_element('type', [%w[journal book]], path) }
+
+      it "handles such values gracefully" do
+        expect(subject).to have_link "Remove constraint Item Type: journal OR book", href: "/catalog?q=biz"
+      end
+    end
   end
 
   describe "#render_constraints_filters" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.25.3
+  version: 7.27.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -14,10 +14,10 @@ authors:
 - Dan Funk
 - Naomi Dushay
 - Justin Coyne
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -453,6 +453,7 @@ files:
 - app/components/blacklight/document_metadata_component.rb
 - app/components/blacklight/document_title_component.html.erb
 - app/components/blacklight/document_title_component.rb
+- app/components/blacklight/facet_component.rb
 - app/components/blacklight/facet_field_checkboxes_component.html.erb
 - app/components/blacklight/facet_field_checkboxes_component.rb
 - app/components/blacklight/facet_field_component.html.erb
@@ -779,6 +780,7 @@ files:
 - spec/components/blacklight/document/group_component_spec.rb
 - spec/components/blacklight/document_component_spec.rb
 - spec/components/blacklight/document_metadata_component_spec.rb
+- spec/components/blacklight/facet_component_spec.rb
 - spec/components/blacklight/facet_field_checkboxes_component_spec.rb
 - spec/components/blacklight/facet_field_list_component_spec.rb
 - spec/components/blacklight/facet_item_component_spec.rb
@@ -931,7 +933,7 @@ homepage: http://projectblacklight.org/
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -946,8 +948,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
   index.
@@ -959,6 +961,7 @@ test_files:
 - spec/components/blacklight/document/group_component_spec.rb
 - spec/components/blacklight/document_component_spec.rb
 - spec/components/blacklight/document_metadata_component_spec.rb
+- spec/components/blacklight/facet_component_spec.rb
 - spec/components/blacklight/facet_field_checkboxes_component_spec.rb
 - spec/components/blacklight/facet_field_list_component_spec.rb
 - spec/components/blacklight/facet_item_component_spec.rb