blacklight 7.14.0 → 7.16.0

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

@@ -0,0 +1,6 @@
+<div class="inclusive_or card card-body bg-light mb-3">
+  <h5><%= t('blacklight.advanced_search.any_of') %></h5>
+  <ul class="list-unstyled facet-values">
+    <%= @view_context.render(Blacklight::FacetItemComponent.with_collection(presenters.to_a)) %>
+  </ul>
+</div>

data/app/components/blacklight/facet_field_inclusive_constraint_component.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Blacklight
+  class FacetFieldInclusiveConstraintComponent < ::ViewComponent::Base
+    with_collection_parameter :facet_field
+
+    def initialize(facet_field:, values: nil)
+      @facet_field = facet_field
+      @values = values
+    end
+
+    def values
+      @values ||= @facet_field.values.find { |v| v.is_a? Array }
+      @values || []
+    end
+
+    def render?
+      values.present?
+    end
+
+    def presenters
+      return to_enum(:presenters) unless block_given?
+
+      values.each do |item|
+        yield Blacklight::FacetGroupedItemPresenter.new(values, item, @facet_field.facet_field, @view_context, @facet_field.key, @facet_field.search_state)
+      end
+    end
+  end
+end

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

@@ -3,6 +3,7 @@
     <%= @facet_field.label %>
   <% end %>
   <% component.with(:body) do %>
+    <%= @view_context.render(Blacklight::FacetFieldInclusiveConstraintComponent.new(facet_field: @facet_field)) %>
     <ul class="facet-values list-unstyled">
       <%= render_facet_limit_list @facet_field.paginator, @facet_field.key %>
     </ul>

data/app/components/blacklight/facet_field_pagination_component.rb

@@ -7,7 +7,7 @@ module Blacklight
     end
 
     def sort_facet_url(sort)
-      @facet_field.paginator.params_for_resort_url(sort, @facet_fieldsearch_state.to_h)
+      @facet_field.paginator.params_for_resort_url(sort, @facet_field.search_state.to_h)
     end
 
     def param_name

data/app/components/blacklight/facet_item_component.rb

@@ -86,8 +86,8 @@ module Blacklight
         tag.span(@label, class: "selected") +
           # remove link
           link_to(@href, class: "remove") do
-            tag.span('✖', class: "remove-icon") +
-              tag.span('[remove]', class: 'sr-only')
+            tag.span('✖', class: "remove-icon", aria: { hidden: true }) +
+              tag.span(@view_context.t(:'blacklight.search.facets.selected.remove'), class: 'sr-only')
           end
       end + render_facet_count(classes: ["selected"])
     end
@@ -103,6 +103,8 @@ module Blacklight
     def render_facet_count(options = {})
       return @view_context.render_facet_count(@hits, options) unless @view_context.method(:render_facet_count).owner == Blacklight::FacetsHelperBehavior || explicit_component_configuration?
 
+      return '' if @hits.blank?
+
       classes = (options[:classes] || []) << "facet-count"
       tag.span(t('blacklight.search.facets.count', number: number_with_delimiter(@hits)), class: classes)
     end

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

@@ -29,3 +29,7 @@
     </span>
   </div>
 <% end %>
+
+<% if presenter.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

@@ -6,12 +6,14 @@ module Blacklight
 
     # rubocop:disable Metrics/ParameterLists
     def initialize(
-      url:, params:, classes: ['search-query-form'], presenter: nil,
-      prefix: '', method: 'GET', q: nil, query_param: :q,
+      url:, advanced_search_url: nil, params:,
+      classes: ['search-query-form'], presenter: nil, prefix: '',
+      method: 'GET', q: nil, query_param: :q,
       search_field: nil, search_fields: [], autocomplete_path: nil,
       autofocus: nil, i18n: { scope: 'blacklight.search.form' }
     )
       @url = url
+      @advanced_search_url = advanced_search_url
       @q = q || params[:q]
       @query_param = query_param
       @search_field = search_field || params[:search_field]
@@ -44,7 +46,11 @@ module Blacklight
     private
 
     def presenter
-      @presenter ||= blacklight_config.index.search_bar_presenter_class.new(controller, blacklight_config)
+      @presenter ||= presenter_class.new(controller, blacklight_config)
+    end
+
+    def presenter_class
+      blacklight_config.view_config(action_name: :index).search_bar_presenter_class
     end
 
     def blacklight_config

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

@@ -25,7 +25,7 @@ module Blacklight::Bookmarks
   def action_documents
     bookmarks = token_or_current_or_guest_user.bookmarks
     bookmark_ids = bookmarks.collect { |b| b.document_id.to_s }
-    search_service.fetch(bookmark_ids)
+    search_service.fetch(bookmark_ids, rows: bookmark_ids.count)
   end
 
   def action_success_redirect_path

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

@@ -56,6 +56,12 @@ module Blacklight::Catalog
     end
   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
+  end
+
   # get a single document from the index
   def raw
     raise(ActionController::RoutingError, 'Not Found') unless blacklight_config.raw_endpoint.enabled
@@ -192,7 +198,7 @@ module Blacklight::Catalog
   # @example
   #   config.index.respond_to.txt = Proc.new { render plain: "A list of docs." }
   def additional_response_formats(format)
-    blacklight_config.index.respond_to.each do |key, config|
+    blacklight_config.view_config(action_name: :index).respond_to.each do |key, config|
       format.send key do
         case config
         when false

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -380,7 +380,7 @@ module Blacklight::BlacklightHelperBehavior
   def show_presenter_class(_document)
     Deprecation.warn(Blacklight::BlacklightHelperBehavior, '#show_presenter_class is deprecated; use #document_presenter_class instead')
 
-    blacklight_config.show.document_presenter_class
+    blacklight_config.view_config(:show, action_name: action_name).document_presenter_class
   end
 
   # @deprecated
@@ -388,13 +388,12 @@ module Blacklight::BlacklightHelperBehavior
   def index_presenter_class(_document)
     Deprecation.warn(Blacklight::BlacklightHelperBehavior, '#index_presenter_class is deprecated; use #document_presenter_class instead')
 
-    (blacklight_config.view.key?(document_index_view_type) && blacklight_config.dig(:view, document_index_view_type, :document_presenter_class)) ||
-      blacklight_config.index.document_presenter_class
+    blacklight_config.view_config(document_index_view_type, action_name: action_name).document_presenter_class
   end
 
   # @return [Class]
   def search_bar_presenter_class
-    blacklight_config.index.search_bar_presenter_class
+    blacklight_config.view_config(action_name: :index).search_bar_presenter_class
   end
 
   # @!group Layout helpers

data/app/helpers/blacklight/component_helper_behavior.rb

@@ -94,11 +94,11 @@ module Blacklight
     end
 
     def show_doc_actions?(document = @document, options = {})
-      filter_partials(blacklight_config.show.document_actions, { document: document }.merge(options)).any?
+      filter_partials(blacklight_config.view_config(:show).document_actions, { document: document }.merge(options)).any?
     end
 
     def document_actions(document, options: {})
-      filter_partials(blacklight_config.show.document_actions, { document: document }.merge(options)).map { |_k, v| v }
+      filter_partials(blacklight_config.view_config(:show).document_actions, { document: document }.merge(options)).map { |_k, v| v }
     end
 
     private

data/app/helpers/blacklight/configuration_helper_behavior.rb

@@ -101,9 +101,9 @@ module Blacklight::ConfigurationHelperBehavior
 
   # Return the label for a search view
   # @return [String]
-  def view_label view
+  def view_label(view)
     view_config = blacklight_config.view[view]
-    view_config.display_label(view)
+    view_config.display_label
   end
   deprecation_deprecate view_label: 'Moving to ViewConfig#display_label and Blacklight::Response::ViewTypeComponent'
 
@@ -189,7 +189,7 @@ module Blacklight::ConfigurationHelperBehavior
 
     field = fields.first if document.nil?
     field ||= fields.find { |f| document.has? f }
-    field &&= field.try(:to_sym)
+    field &&= field&.to_sym
 
     field
   end
@@ -198,7 +198,7 @@ module Blacklight::ConfigurationHelperBehavior
   ##
   # Default sort field
   def default_sort_field
-    (active_sort_fields.find { |_k, config| config.respond_to?(:default) && config.default } || active_sort_fields.first).try(:last)
+    (active_sort_fields.find { |_k, config| config.respond_to?(:default) && config.default } || active_sort_fields.first)&.last
   end
 
   ##

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -180,7 +180,7 @@ module Blacklight::FacetsHelperBehavior
   # @return [String]
   def facet_partial_name(display_facet = nil)
     config = facet_configuration_for_field(display_facet.name)
-    name = config.try(:partial)
+    name = config.partial
     name ||= "facet_pivot" if config.pivot
     name || "facet_limit"
   end

data/app/helpers/blacklight/render_constraints_helper_behavior.rb

@@ -88,8 +88,8 @@ module Blacklight::RenderConstraintsHelperBehavior
       return "".html_safe if search_state.filter_params.blank?
 
       Deprecation.silence(Blacklight::RenderConstraintsHelperBehavior) do
-        safe_join(search_state.filter_params.each_pair.map do |facet, values|
-          render_filter_element(facet, values, search_state)
+        safe_join(search_state.filters.map do |field|
+          render_filter_element(field.key, field.values, search_state)
         end, "\n")
       end
     end

data/app/models/concerns/blacklight/suggest/response.rb

@@ -22,7 +22,7 @@ module Blacklight
       # present
       # @return [Array]
       def suggestions
-        (response.try(:[], suggest_path).try(:[], suggester_name).try(:[], request_params[:q]).try(:[], 'suggestions') || []).uniq
+        (response.dig(suggest_path, suggester_name, request_params[:q], 'suggestions') || []).uniq
       end
     end
   end

data/app/presenters/blacklight/clause_presenter.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Blacklight
+  class ClausePresenter
+    attr_reader :key, :user_parameters, :field_config, :view_context, :search_state
+
+    def initialize(key, user_parameters, field_config, view_context, search_state = view_context.search_state)
+      @key = key
+      @user_parameters = user_parameters
+      @field_config = field_config
+      @view_context = view_context
+      @search_state = search_state
+    end
+
+    def field_label
+      field_config.display_label('search')
+    end
+
+    ##
+    # Get the displayable version of a facet's value
+    #
+    # @return [String]
+    def label
+      user_parameters[:query]
+    end
+
+    def remove_href(path = search_state)
+      view_context.search_action_path(path.reset_search(clause: path.clause_params.except(key)))
+    end
+
+    private
+
+    def facet_field_presenter
+      @facet_field_presenter ||= view_context.facet_field_presenter(facet_config, {})
+    end
+  end
+end

data/app/presenters/blacklight/document_presenter.rb

@@ -72,9 +72,9 @@ module Blacklight
       fields += Array.wrap(view_config[:"#{base_name}_display_type_field"]) if base_name && view_config.key?(:"#{base_name}_display_type_field")
       fields += Array.wrap(view_config.display_type_field)
 
-      if fields.empty?
-        fields += Array.wrap(configuration.show[:"#{base_name}_display_type_field"]) if base_name && configuration.show.key?(:"#{base_name}_display_type_field")
-        fields += Array.wrap(configuration.show.display_type_field)
+      if fields.empty? && show_view_config != view_config
+        fields += Array.wrap(show_view_config[:"#{base_name}_display_type_field"]) if base_name && show_view_config.key?(:"#{base_name}_display_type_field")
+        fields += Array.wrap(show_view_config.display_type_field)
       end
 
       fields += ['format'] if fields.empty? # backwards compatibility with the old default value for display_type_field
@@ -97,8 +97,12 @@ module Blacklight
       field_presenter(field_config, options).render
     end
 
+    def thumbnail_presenter_class
+      view_config.thumbnail_presenter || thumbnail_presenter
+    end
+
     def thumbnail
-      @thumbnail ||= thumbnail_presenter.new(document, view_context, view_config)
+      @thumbnail ||= thumbnail_presenter_class.new(document, view_context, view_config)
     end
 
     ##
@@ -114,7 +118,11 @@ module Blacklight
     end
 
     def view_config
-      @view_config ||= configuration.view_config(:show)
+      @view_config ||= show_view_config
+    end
+
+    def show_view_config
+      configuration.view_config(:show)
     end
 
     private

data/app/presenters/blacklight/facet_field_presenter.rb

@@ -40,6 +40,10 @@ module Blacklight
       view_context.facet_field_label(key)
     end
 
+    def values
+      search_state&.filter(facet_field)&.values || []
+    end
+
     # @private
     # @deprecated
     def html_id

data/app/presenters/blacklight/facet_grouped_item_presenter.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Blacklight
+  class FacetGroupedItemPresenter < Blacklight::FacetItemPresenter
+    attr_reader :group
+
+    delegate :key, to: :facet_config
+
+    def initialize(group, facet_item, facet_config, view_context, facet_field, search_state = view_context.search_state)
+      @group = group
+      @facet_item = facet_item
+      @facet_config = facet_config
+      @view_context = view_context
+      @facet_field = facet_field
+      @search_state = search_state
+    end
+
+    ##
+    # Check if the query parameters have the given facet field with the
+    # given value.
+    def selected?
+      group.include?(facet_item)
+    end
+
+    # @private
+    def remove_href(path = search_state)
+      new_state = path.filter(facet_config).remove(group)
+      new_state = new_state.filter(facet_config).add(group - [facet_item])
+
+      view_context.search_action_path(new_state)
+    end
+
+    # @private
+    def add_href(_path_options = {})
+      if facet_config.url_method
+        return view_context.public_send(facet_config.url_method, facet_config.key, facet_item)
+      end
+
+      new_state = search_state.filter(facet_config).remove(@group)
+      new_state = new_state.filter(facet_config).add(@group + [facet_item])
+
+      view_context.search_action_path(new_state)
+    end
+  end
+end

data/app/presenters/blacklight/facet_item_presenter.rb

@@ -4,7 +4,7 @@ module Blacklight
   class FacetItemPresenter
     attr_reader :facet_item, :facet_config, :view_context, :search_state, :facet_field
 
-    delegate :hits, :items, to: :facet_item
+    delegate :key, to: :facet_config
 
     def initialize(facet_item, facet_config, view_context, facet_field, search_state = view_context.search_state)
       @facet_item = facet_item
@@ -14,12 +14,24 @@ module Blacklight
       @search_state = search_state
     end
 
+    def hits
+      return unless @facet_item.respond_to? :hits
+
+      @facet_item.hits
+    end
+
+    def items
+      return unless @facet_item.respond_to? :items
+
+      @facet_item.items
+    end
+
     ##
     # Check if the query parameters have the given facet field with the
     # given value.
     def selected?
       Deprecation.silence(Blacklight::SearchState) do
-        search_state.has_facet? facet_config, value: facet_value
+        search_state.has_facet? facet_config, value: value
       end
     end
 
@@ -34,21 +46,29 @@ module Blacklight
     def label
       return @view_context.facet_display_value(@facet_field, @facet_item) unless @view_context.method(:facet_display_value).owner == Blacklight::FacetsHelperBehavior
 
-      value = if facet_item.respond_to? :label
-                facet_item.label
-              else
-                facet_value
-              end
+      label_value = if facet_item.respond_to? :label
+                      facet_item.label
+                    else
+                      value
+                    end
 
       if facet_config.helper_method
-        view_context.public_send(facet_config.helper_method, value)
-      elsif facet_config.query && facet_config.query[value]
-        facet_config.query[value][:label]
+        view_context.public_send(facet_config.helper_method, label_value)
+      elsif facet_config.query && facet_config.query[label_value]
+        facet_config.query[label_value][:label]
       elsif facet_config.date
         localization_options = facet_config.date == true ? {} : facet_config.date
-        I18n.l(Time.zone.parse(value), **localization_options)
+        I18n.l(Time.zone.parse(label_value), **localization_options)
+      else
+        label_value
+      end
+    end
+
+    def value
+      if facet_item.respond_to? :value
+        facet_item.value
       else
-        value
+        facet_item
       end
     end
 
@@ -78,14 +98,6 @@ module Blacklight
 
     private
 
-    def facet_value
-      if facet_item.respond_to? :value
-        facet_item.value
-      else
-        facet_item
-      end
-    end
-
     def facet_field_presenter
       @facet_field_presenter ||= view_context.facet_field_presenter(facet_config, {})
     end