blacklight 7.34.0 → 8.0.0.beta1

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -1,309 +1,11 @@
 # frozen_string_literal: true
-module Blacklight::FacetsHelperBehavior
-  extend Deprecation
-  self.deprecation_horizon = 'blacklight 8.0'
-
-  include Blacklight::Facet
-
-  ##
-  # Check if any of the given fields have values
-  #
-  # @deprecated
-  # @param [Array<String>] fields
-  # @return [Boolean]
-  def has_facet_values? fields = facet_field_names, response = nil
-    deprecated_method(:has_facet_values?)
-    unless response
-      Deprecation.warn(self, 'Calling has_facet_values? without passing the ' \
-        'second argument (response) is deprecated and will be removed in Blacklight ' \
-        '8.0.0')
-      response = @response
-    end
-    Deprecation.silence(Blacklight::FacetsHelperBehavior) do
-      Deprecation.silence(Blacklight::Facet) do
-        facets_from_request(fields, response).any? { |display_facet| should_render_facet?(display_facet) }
-      end
-    end
-  end
-
-  ##
-  # Render a collection of facet fields.
-  # @see #render_facet_limit
-  #
-  # @deprecated
-  # @param [Array<String>] fields
-  # @param [Hash] options
-  # @option options [Blacklight::Solr::Response] :response the Solr response object
-  # @return String
-  def render_facet_partials fields = nil, options = {}
-    deprecated_method(:render_facet_partials)
-
-    unless fields
-      Deprecation.warn(self.class, 'Calling render_facet_partials without passing the ' \
-        'first argument (fields) is deprecated and will be removed in Blacklight ' \
-        '8.0.0')
-      fields = facet_field_names
-    end
-
-    response = options.delete(:response)
-    unless response
-      Deprecation.warn(self.class, 'Calling render_facet_partials without passing the ' \
-        'response keyword is deprecated and will be removed in Blacklight ' \
-        '8.0.0')
-      response = @response
-    end
-    Deprecation.silence(Blacklight::FacetsHelperBehavior) do
-      Deprecation.silence(Blacklight::Facet) do
-        safe_join(facets_from_request(fields, response).map do |display_facet|
-          render_facet_limit(display_facet, options)
-        end.compact, "\n")
-      end
-    end
-  end
-
-  ##
-  # Renders a single section for facet limit with a specified
-  # solr field used for faceting. Can be over-ridden for custom
-  # display on a per-facet basis.
-  #
-  # @param [Blacklight::Solr::Response::Facets::FacetField] display_facet
-  # @param [Hash] options parameters to use for rendering the facet limit partial
-  # @option options [String] :partial partial to render
-  # @option options [String] :layout partial layout to render
-  # @option options [Hash] :locals locals to pass to the partial
-  # @return [String]
-  def render_facet_limit(display_facet, options = {})
-    field_config = facet_configuration_for_field(display_facet.name)
-
-    if field_config.component
-      return render(
-        Blacklight::FacetComponent.new(
-          display_facet: display_facet,
-          field_config: field_config,
-          layout: (params[:action] == 'facet' ? false : options[:layout])
-        )
-      )
-    end
-
-    Deprecation.warn(Blacklight::FacetsHelperBehavior, 'Calling #render_facet_limit on a non-componentized'\
-      ' facet is deprecated and will be removed in Blacklight 8')
-
-    Deprecation.silence(Blacklight::FacetsHelperBehavior) do
-      return unless should_render_facet?(display_facet, field_config)
-    end
-    options = options.dup
-
-    Deprecation.silence(Blacklight::FacetsHelperBehavior) do
-      options[:partial] ||= facet_partial_name(display_facet)
-    end
-
-    options[:layout] ||= "facet_layout" unless options.key?(:layout)
-    options[:locals] ||= {}
-    options[:locals][:field_name] ||= display_facet.name
-    options[:locals][:facet_field] ||= field_config
-    options[:locals][:display_facet] ||= display_facet
-
-    render(options)
-  end
-
-  ##
-  # Renders the list of values
-  # removes any elements where render_facet_item returns a nil value. This enables an application
-  # to filter undesireable facet items so they don't appear in the UI
-  # @deprecated
-  def render_facet_limit_list(paginator, facet_field, wrapping_element = :li)
-    facet_config ||= facet_configuration_for_field(facet_field)
-
-    collection = paginator.items.map do |item|
-      facet_item_presenter(facet_config, item, facet_field)
-    end
-
-    render(facet_item_component_class(facet_config).with_collection(collection, wrapping_element: wrapping_element))
-  end
-  deprecation_deprecate :render_facet_limit_list
-
-  ##
-  # Renders a single facet item
-  # @deprecated
-  def render_facet_item(facet_field, item)
-    deprecated_method(:render_facet_item)
-    if facet_in_params?(facet_field, item.value)
-      render_selected_facet_value(facet_field, item)
-    else
-      render_facet_value(facet_field, item)
-    end
-  end
-
-  ##
-  # Determine if Blacklight should render the display_facet or not
-  #
-  # By default, only render facets with items.
-  #
-  # @deprecated
-  # @param [Blacklight::Solr::Response::Facets::FacetField] display_facet
-  # @param [Blacklight::Configuration::FacetField] facet_config
-  # @return [Boolean]
-  def should_render_facet? display_facet, facet_config = nil
-    return false if display_facet.items.blank?
-
-    # display when show is nil or true
-    facet_config ||= facet_configuration_for_field(display_facet.name)
-    should_render_field?(facet_config, display_facet)
-  end
-  deprecation_deprecate :should_render_facet?
 
-  ##
-  # Determine whether a facet should be rendered as collapsed or not.
-  #   - if the facet is 'active', don't collapse
-  #   - if the facet is configured to collapse (the default), collapse
-  #   - if the facet is configured not to collapse, don't collapse
-  #
-  # @deprecated
-  # @param [Blacklight::Configuration::FacetField] facet_field
-  # @return [Boolean]
-  def should_collapse_facet? facet_field
-    Deprecation.silence(Blacklight::FacetsHelperBehavior) do
-      !facet_field_in_params?(facet_field.key) && facet_field.collapse
-    end
-  end
-  deprecation_deprecate :should_collapse_facet?
-
-  ##
-  # The name of the partial to use to render a facet field.
-  # uses the value of the "partial" field if set in the facet configuration
-  # otherwise uses "facet_pivot" if this facet is a pivot facet
-  # defaults to 'facet_limit'
-  #
-  # @return [String]
-  def facet_partial_name(display_facet = nil)
-    config = facet_configuration_for_field(display_facet.name)
-    name = config.partial
-    name ||= "facet_pivot" if config.pivot
-    name || "facet_limit"
-  end
-  deprecation_deprecate :facet_partial_name
+module Blacklight::FacetsHelperBehavior
+  delegate :facet_configuration_for_field, to: :blacklight_config
 
   def facet_field_presenter(facet_config, display_facet)
-    (facet_config.presenter || Blacklight::FacetFieldPresenter).new(facet_config, display_facet, self)
-  end
-
-  ##
-  # Standard display of a facet value in a list. Used in both _facets sidebar
-  # partial and catalog/facet expanded list. Will output facet value name as
-  # a link to add that to your restrictions, with count in parens.
-  #
-  # @param [Blacklight::Solr::Response::Facets::FacetField] facet_field
-  # @param [Blacklight::Solr::Response::Facets::FacetItem] item
-  # @param [Hash] options
-  # @option options [Boolean] :suppress_link display the facet, but don't link to it
-  # @return [String]
-  def render_facet_value(facet_field, item, options = {})
-    deprecated_method(:render_facet_value)
-    facet_config = facet_configuration_for_field(facet_field)
-    facet_item_component(facet_config, item, facet_field, **options).render_facet_value
-  end
-
-  ##
-  # Where should this facet link to?
-  #
-  # @deprecated
-  # @param [Blacklight::Solr::Response::Facets::FacetField] facet_field
-  # @param [String] item
-  # @return [String]
-  def path_for_facet(facet_field, item, path_options = {})
-    facet_config = facet_configuration_for_field(facet_field)
-    facet_item_presenter(facet_config, item, facet_field).href(path_options)
-  end
-  deprecation_deprecate :path_for_facet
-
-  ##
-  # Standard display of a SELECTED facet value (e.g. without a link and with a remove button)
-  #
-  # @deprecated
-  # @see #render_facet_value
-  # @param [Blacklight::Solr::Response::Facets::FacetField] facet_field
-  # @param [String] item
-  def render_selected_facet_value(facet_field, item)
-    deprecated_method(:render_selected_facet_value)
-    facet_config = facet_configuration_for_field(facet_field)
-    facet_item_component(facet_config, item, facet_field).render_selected_facet_value
-  end
-
-  ##
-  # Renders a count value for facet limits. Can be over-ridden locally
-  # to change style. And can be called by plugins to get consistent display.
-  #
-  # @deprecated
-  # @param [Integer] num number of facet results
-  # @param [Hash] options
-  # @option options [Array<String>]  an array of classes to add to count span.
-  # @return [String]
-  def render_facet_count(num, options = {})
-    deprecated_method(:render_facet_count)
-    classes = (options[:classes] || []) << "facet-count"
-    tag.span(t('blacklight.search.facets.count', number: number_with_delimiter(num)), class: classes)
-  end
-
-  ##
-  # Are any facet restrictions for a field in the query parameters?
-  # @private
-  # @param [String] field
-  # @return [Boolean]
-  def facet_field_in_params? field
-    config = facet_configuration_for_field(field)
-
-    Deprecation.silence(Blacklight::SearchState) do
-      search_state.has_facet? config
-    end
+    facet_config.presenter.new(facet_config, display_facet, self)
   end
-  # Left undeprecated for the sake of temporary backwards compatibility
-  # deprecation_deprecate :facet_field_in_params?
-
-  ##
-  # Check if the query parameters have the given facet field with the
-  # given value.
-  #
-  # @deprecated
-  # @param [String] field
-  # @param [String] item facet value
-  # @return [Boolean]
-  def facet_in_params?(field, item)
-    config = facet_configuration_for_field(field)
-
-    Deprecation.silence(Blacklight::SearchState) do
-      search_state.has_facet? config, value: facet_value_for_facet_item(item)
-    end
-  end
-  deprecation_deprecate :facet_in_params?
-
-  ##
-  # Get the values of the facet set in the blacklight query string
-  # @deprecated
-  def facet_params field
-    config = facet_configuration_for_field(field)
-
-    search_state.params.dig(:f, config.key)
-  end
-  deprecation_deprecate :facet_params
-
-  ##
-  # Get the displayable version of a facet's value
-  #
-  # @param [Object] field
-  # @param [String] item value
-  # @return [String]
-  # @deprecated
-  def facet_display_value field, item
-    deprecated_method(:facet_display_value)
-    facet_config = facet_configuration_for_field(field)
-    facet_item_presenter(facet_config, item, field).label
-  end
-
-  # @deprecated
-  def facet_field_id facet_field
-    "facet-#{facet_field.key.parameterize}"
-  end
-  deprecation_deprecate :facet_field_id
 
   private
 
@@ -316,25 +18,6 @@ module Blacklight::FacetsHelperBehavior
   end
 
   def facet_item_presenter(facet_config, facet_item, facet_field)
-    (facet_config.item_presenter || Blacklight::FacetItemPresenter).new(facet_item, facet_config, self, facet_field)
-  end
-
-  def facet_item_component(facet_config, facet_item, facet_field, **args)
-    facet_item_component_class(facet_config).new(facet_item: facet_item_presenter(facet_config, facet_item, facet_field), **args).with_view_context(self)
-  end
-
-  def facet_item_component_class(facet_config)
-    default_component = facet_config.pivot ? Blacklight::FacetItemPivotComponent : Blacklight::FacetItemComponent
-    facet_config.fetch(:item_component, default_component)
-  end
-
-  # We can't use .deprecation_deprecate here, because the new components need to
-  # see the originally defined location for these methods in order to properly
-  # call back into the helpers for backwards compatibility
-  def deprecated_method(method_name)
-    Deprecation.warn(Blacklight::FacetsHelperBehavior,
-                     Deprecation.deprecated_method_warning(Blacklight::FacetsHelperBehavior,
-                                                           method_name, {}),
-                     caller)
+    facet_config.item_presenter.new(facet_item, facet_config, self, facet_field)
   end
 end

data/app/helpers/blacklight/icon_helper_behavior.rb

@@ -12,9 +12,10 @@ module Blacklight::IconHelperBehavior
   def blacklight_icon(icon_name, **kwargs)
     render "Blacklight::Icons::#{icon_name.to_s.camelize}Component".constantize.new(**kwargs)
   rescue NameError
-    Rails.cache.fetch([:blacklight_icons, icon_name, kwargs]) do
-      icon = Blacklight::Icon.new(icon_name, **kwargs)
-      tag.span(icon.svg.html_safe, **icon.options)
-    end
+    Blacklight.deprecation.warn(
+      "Falling back on the LegacyIconComponent with \"#{icon_name}\" is deprecated. Instead create the component `Blacklight::Icons::#{icon_name.to_s.camelize}Component` for this icon."
+    )
+
+    render Blacklight::Icons::LegacyIconComponent.new(name: icon_name, **kwargs)
   end
 end

data/app/helpers/blacklight/layout_helper_behavior.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Methods added to this helper will be available to all templates in the hosting
 # application
 module Blacklight

data/app/helpers/blacklight/render_partials_helper_behavior.rb

@@ -1,28 +1,16 @@
 # frozen_string_literal: true
-module Blacklight::RenderPartialsHelperBehavior
-  extend Deprecation
 
+module Blacklight::RenderPartialsHelperBehavior
   ##
   # Render the document index view
   #
   # @param [Array<SolrDocument>] documents list of documents to render
   # @param [Hash] locals to pass to the render call
   # @return [String]
-  def render_document_index documents = nil, locals = {}
-    unless documents
-      Deprecation.warn(self, "Calling render_document_index without documents is deprecated and will be removed in version 8")
-      documents = @response.documents
-    end
+  def render_document_index documents, locals = {}
     render_document_index_with_view(document_index_view_type, documents, locals)
   end
 
-  ##
-  # Render the document index for a grouped response
-  def render_grouped_document_index
-    render 'catalog/group'
-  end
-  deprecation_deprecate render_grouped_document_index: 'Removed without replacement'
-
   ##
   # Return the list of partials for a given solr document
   # @param [SolrDocument] doc solr document to render partials for
@@ -34,6 +22,8 @@ module Blacklight::RenderPartialsHelperBehavior
       render_document_partial(doc, action_name, locals)
     end, "\n")
   end
+  Blacklight.deprecation.deprecate_methods(self, render_document_partials: 'Replace this call with: "document_component = blacklight_config.view_config(:atom).summary_component
+render document_component.new(presenter: document_presenter(document), component: :div, show: true)"')
 
   ##
   # Return the list of xml for a given solr document. Doesn't safely escape for HTML.
@@ -60,7 +50,7 @@ module Blacklight::RenderPartialsHelperBehavior
   # @param [String] base_name base name for the partial
   # @param [Hash] locals local variables to pass through to the partials
   def render_document_partial(doc, base_name, locals = {})
-    format = Deprecation.silence(Blacklight::RenderPartialsHelperBehavior) { document_partial_name(doc, base_name) }
+    format = document_partial_name(doc, base_name)
 
     view_type = document_index_view_type
     template = cached_view ['show', view_type, base_name, format].join('_') do
@@ -69,7 +59,6 @@ module Blacklight::RenderPartialsHelperBehavior
     if template
       template.render(self, locals.merge(document: doc))
     else
-      logger.warn("No template was found for base_name: '#{base_name}', view_type: '#{view_type}' in render_document_partial")
       ''
     end
   end
@@ -119,6 +108,8 @@ module Blacklight::RenderPartialsHelperBehavior
     ]
   end
 
+  private
+
   ##
   # Return a normalized partial name for rendering a single document
   #
@@ -131,9 +122,6 @@ module Blacklight::RenderPartialsHelperBehavior
 
     type_field_to_partial_name(document, display_type)
   end
-  deprecation_deprecate document_partial_name: 'Moving to a private method'
-
-  private
 
   ##
   # Return a partial name for rendering a document
@@ -191,21 +179,13 @@ module Blacklight::RenderPartialsHelperBehavior
   def find_document_index_template_with_view view_type, locals
     document_index_path_templates.each do |str|
       partial = format(str, index_view_type: view_type)
+      name = partial.split('/').last
+      prefix = partial.split('/').first if partial.include?('/')
       logger&.debug "Looking for document index partial #{partial}"
-
-      template = if Rails::VERSION::MAJOR >= 6
-                   name = partial.split('/').last
-                   prefix = partial.split('/').first if partial.include?('/')
-
-                   prefixes = lookup_context.prefixes + [prefix, ""].compact
-                   lookup_context.find_all(name, prefixes, true, locals.keys + [:documents], {}).first
-                 else
-                   lookup_context.find_all(partial, lookup_context.prefixes + [""], true, locals.keys + [:documents], {}).first
-                 end
-
+      prefixes = lookup_context.prefixes + [prefix, ""].compact
+      template = lookup_context.find_all(name, prefixes, true, locals.keys + [:documents], {}).first
       return template if template
     end
-
     nil
   end
 

data/app/helpers/blacklight/url_helper_behavior.rb

@@ -1,15 +1,8 @@
 # frozen_string_literal: true
+
 ##
 # URL helper methods
 module Blacklight::UrlHelperBehavior
-  extend Deprecation
-
-  # @deprecated
-  def url_for_document(doc, options = {})
-    search_state.url_for_document(doc, options)
-  end
-  deprecation_deprecate url_for_document: 'Use SearchState#url_for_document directly'
-
   # Uses the catalog_path route to create a link to the show page for an item.
   # catalog_path accepts a hash. The solr query params are stored in the session,
   # so we only need the +counter+ param here. We also need to know if we are viewing to document as part of search results.
@@ -19,9 +12,9 @@ module Blacklight::UrlHelperBehavior
   # @param opts [Hash] the options to create the link with
   # @option opts [Number] :counter (nil) the count to set in the session (for paging through a query result)
   # @example Passing in an image
-  #   link_to_document(doc, '<img src="thumbnail.png">', counter: 3) #=> "<a href=\"catalog/123\" data-tracker-href=\"/catalog/123/track?counter=3&search_id=999\"><img src="thumbnail.png"></a>
+  #   link_to_document(doc, '<img src="thumbnail.png">', counter: 3) #=> "<a href=\"catalog/123\" data-context-href=\"/catalog/123/track?counter=3&search_id=999\"><img src="thumbnail.png"></a>
   # @example With the default document link field
-  #   link_to_document(doc, counter: 3) #=> "<a href=\"catalog/123\" data-tracker-href=\"/catalog/123/track?counter=3&search_id=999\">My Title</a>
+  #   link_to_document(doc, counter: 3) #=> "<a href=\"catalog/123\" data-context-href=\"/catalog/123/track?counter=3&search_id=999\">My Title</a>
   def link_to_document(doc, field_or_opts = nil, opts = { counter: nil })
     label = case field_or_opts
             when NilClass
@@ -29,18 +22,11 @@ module Blacklight::UrlHelperBehavior
             when Hash
               opts = field_or_opts
               document_presenter(doc).heading
-            when Proc, Symbol
-              Deprecation.warn(self, "passing a #{field_or_opts.class} to link_to_document is deprecated and will be removed in Blacklight 8")
-              Deprecation.silence(Blacklight::IndexPresenter) do
-                index_presenter(doc).label field_or_opts, opts
-              end
             else # String
               field_or_opts
             end
 
-    Deprecation.silence(Blacklight::UrlHelperBehavior) do
-      link_to label, url_for_document(doc), document_link_params(doc, opts)
-    end
+    link_to label, search_state.url_for_document(doc), document_link_params(doc, opts)
   end
 
   # @private
@@ -49,46 +35,19 @@ module Blacklight::UrlHelperBehavior
   end
   private :document_link_params
 
-  ##
-  # Link to the previous document in the current search context
-  # @deprecated
-  def link_to_previous_document(previous_document, classes: 'previous', **addl_link_opts)
-    link_opts = session_tracking_params(previous_document, search_session['counter'].to_i - 1).merge(class: classes, rel: 'prev').merge(addl_link_opts)
-    link_to_unless previous_document.nil?, raw(t('views.pagination.previous')), url_for_document(previous_document), link_opts do
-      tag.span raw(t('views.pagination.previous')), class: 'previous'
-    end
-  end
-  deprecation_deprecate link_to_previous_document: 'Moving to Blacklight::SearchContextComponent'
-
-  ##
-  # Link to the next document in the current search context
-  # @deprecated
-  def link_to_next_document(next_document, classes: 'next', **addl_link_opts)
-    link_opts = session_tracking_params(next_document, search_session['counter'].to_i + 1).merge(class: classes, rel: 'next').merge(addl_link_opts)
-    link_to_unless next_document.nil?, raw(t('views.pagination.next')), url_for_document(next_document), link_opts do
-      tag.span raw(t('views.pagination.next')), class: 'next'
-    end
-  end
-  deprecation_deprecate link_to_previous_document: 'Moving to Blacklight::SearchContextComponent'
-
   ##
   # Attributes for a link that gives a URL we can use to track clicks for the current search session
-  # @private
   # @param [SolrDocument] document
   # @param [Integer] counter
   # @example
   #   session_tracking_params(SolrDocument.new(id: 123), 7)
-  #   => { data: { :'context-href' => '/catalog/123/track?counter=7&search_id=999' } }
-  def session_tracking_params document, counter
-    path = session_tracking_path(document, per_page: params.fetch(:per_page, search_session['per_page']), counter: counter, search_id: current_search_session.try(:id), document_id: document&.id)
-
-    if path.nil?
-      return {}
-    end
+  #   => { data: { context_href: '/catalog/123/track?counter=7&search_id=999' } }
+  def session_tracking_params document, counter, per_page: search_session['per_page'], search_id: current_search_session&.id
+    path = session_tracking_path(document, per_page: params.fetch(:per_page, per_page), counter: counter, search_id: search_id, document_id: document&.id)
+    return {} if path.nil?
 
-    { data: { 'context-href': path } }
+    { data: { context_href: path } }
   end
-  private :session_tracking_params
 
   ##
   # Get the URL for tracking search sessions across pages using polymorphic routing
@@ -100,7 +59,7 @@ module Blacklight::UrlHelperBehavior
     end
 
     raise "Unable to find #{controller_tracking_method} route helper. " \
-    "Did you add `concerns :searchable` routing mixin to your `config/routes.rb`?"
+          "Did you add `concerns :searchable` routing mixin to your `config/routes.rb`?"
   end
 
   def controller_tracking_method
@@ -111,28 +70,6 @@ module Blacklight::UrlHelperBehavior
   # link based helpers ->
   #
 
-  # create link to query (e.g. spelling suggestion)
-  # @deprecated
-  def link_to_query(query)
-    p = search_state.to_h.except(:page, :action)
-    p[:q] = query
-    link_to(query, search_action_path(p))
-  end
-  deprecation_deprecate link_to_query: 'Removed without replacement'
-
-  ##
-  # Get the path to the search action with any parameters (e.g. view type)
-  # that should be persisted across search sessions.
-  # @deprecated
-  def start_over_path query_params = params
-    h = {}
-    current_index_view_type = document_index_view_type(query_params)
-    h[:view] = current_index_view_type unless current_index_view_type == default_document_index_view_type
-
-    search_action_path(h)
-  end
-  deprecation_deprecate start_over_path: 'Removed without replacement'
-
   # Create a link back to the index screen, keeping the user's facet, query and paging choices intact by using session.
   # @example
   #   link_back_to_catalog(label: 'Back to Search')
@@ -165,30 +102,9 @@ module Blacklight::UrlHelperBehavior
     link_to label, link_url, opts
   end
 
-  # Search History and Saved Searches display
+  # Use in e.g. the search history display, where we want something more like text instead of the normal constraints
   def link_to_previous_search(params)
-    Deprecation.silence(Blacklight::SearchHistoryConstraintsHelperBehavior) do
-      link_to(render_search_to_s(params), search_action_path(params))
-    end
-  end
-
-  # Get url parameters to a search within a grouped result set
-  #
-  # @deprecated
-  # @param [Blacklight::Solr::Response::Group] group
-  # @return [Hash]
-  def add_group_facet_params_and_redirect group
-    search_state.add_facet_params_and_redirect(group.field, group.key)
-  end
-  deprecation_deprecate add_group_facet_params_and_redirect: 'Removed without replacement'
-
-  # A URL to refworks export, with an embedded callback URL to this app.
-  # the callback URL is to bookmarks#export, which delivers a list of
-  # user's bookmarks in 'refworks marc txt' format -- we tell refworks
-  # to expect that format.
-  # @deprecated
-  def bookmarks_export_url(format, params = {})
-    bookmarks_url(params.merge(format: format, encrypted_user_id: encrypt_user_id(current_or_guest_user.id)))
+    search_state = controller.search_state_class.new(params, blacklight_config, self)
+    link_to(render(Blacklight::ConstraintsComponent.for_search_history(search_state: search_state)), search_action_path(params))
   end
-  deprecation_deprecate bookmarks_export_url: 'Removed without replacement'
 end

data/app/helpers/blacklight_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module BlacklightHelper
   include Blacklight::BlacklightHelperBehavior
 end

data/app/helpers/catalog_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module CatalogHelper
   include Blacklight::CatalogHelperBehavior
 end

data/app/javascript/blacklight/bookmark_toggle.js

@@ -1,25 +1,19 @@
-(function($) {
-    //change form submit toggle to checkbox
+import Blacklight from './core'
+import CheckboxSubmit from './checkbox_submit'
+
+const BookmarkToggle = (() => {
+    // change form submit toggle to checkbox
     Blacklight.doBookmarkToggleBehavior = function() {
-      if (typeof Blacklight.do_bookmark_toggle_behavior == 'function') {
-        console.warn("do_bookmark_toggle_behavior is deprecated. Use doBookmarkToggleBehavior instead.");
-        return Blacklight.do_bookmark_toggle_behavior();
-      }
-      $(Blacklight.doBookmarkToggleBehavior.selector).blCheckboxSubmit({
-         // cssClass is added to elements added, plus used for id base
-         cssClass: 'toggle-bookmark',
-         success: function(checked, response) {
-           if (response.bookmarks) {
-             $('[data-role=bookmark-counter]').text(response.bookmarks.count);
-           }
-         }
+      document.addEventListener('click', (e) => {
+        if (e.target.matches('[data-checkboxsubmit-target="checkbox"]')) {
+          const form = e.target.closest('form')
+          if (form) new CheckboxSubmit(form).clicked(e);
+        }
       });
     };
     Blacklight.doBookmarkToggleBehavior.selector = 'form.bookmark-toggle';
 
-Blacklight.onLoad(function() {
-  Blacklight.doBookmarkToggleBehavior();
-});
-
+    Blacklight.doBookmarkToggleBehavior();
+})()
 
-})(jQuery);
+export default BookmarkToggle