blacklight 9.0.0.beta1 → 9.0.0

data/app/javascript/blacklight-frontend/button_focus.js

@@ -2,7 +2,7 @@ const ButtonFocus = (e) => {
   // Button clicks should change focus. As of 10/3/19, Firefox for Mac and
   // Safari both do not set focus to a button on button click.
   // See https://zellwk.com/blog/inconsistent-button-behavior/ for background information
-  if (e.target.matches('[data-toggle="collapse"]') || e.target.matches('[data-bs-toggle="collapse"]')) {
+  if (e.target.matches('[data-bs-toggle="collapse"]')) {
     e.target.focus()
   }
 }

data/app/javascript/blacklight-frontend/checkbox_submit.js

@@ -10,7 +10,7 @@
        attribute (HTML5-style doc-*) that contains the id/primary key
        of the object in question -- used by plugin for a unique value for
        DOM id's.
-  Uses HTML for a checkbox compatible with Bootstrap 4.
+  Uses HTML for a checkbox compatible with Bootstrap.
    new CheckboxSubmit(document.querySelector('form.something')).render()
 */
 export default class CheckboxSubmit {
@@ -36,10 +36,16 @@ export default class CheckboxSubmit {
     }).then((json) => {
       this.labelTarget.removeAttribute('disabled')
       this.checkboxTarget.removeAttribute('disabled')
+      // For accessibility return keyboard focus
+      // back to the checkbox after form submission
+      this.checkboxTarget.focus()
       this.updateStateFor(!this.checked)
       this.bookmarksCounter().forEach(counter => {
         counter.innerHTML = json.bookmarks.count;
       });
+
+      var e = new CustomEvent('bookmark.blacklight', { detail: { checked: this.checked }, bubbles: true });
+      this.formTarget.dispatchEvent(e)
     }).catch((error) => {
       this.handleError(error)
     })
@@ -74,7 +80,8 @@ export default class CheckboxSubmit {
   }
 
   updateStateFor(state) {
-    this.checkboxTarget.checked = state
+    if (state) { this.checkboxTarget.setAttribute('checked', state) }
+    else { this.checkboxTarget.removeAttribute('checked') }
 
     if (state) {
       this.labelTarget.classList.add('checked')

data/app/javascript/blacklight-frontend/debounce.js

@@ -3,7 +3,7 @@
 // const basicFunction = (entry) => console.log(entry)
 // const debounced = debounce(basicFunction("I should only be called once"));
 //
-// debounced // does NOT print to the screen becase it is invoked again less than 200 milliseconds later
+// debounced // does NOT print to the screen because it is invoked again less than 200 milliseconds later
 // debounced // does print to the screen
 // ```
 export default function debounce(func, timeout = 200) {

data/app/javascript/blacklight-frontend/facet_suggest.js

@@ -4,20 +4,44 @@ const FacetSuggest = async (e) => {
   if (e.target.matches('.facet-suggest')) {
     const queryFragment = e.target.value?.trim();
     const facetField = e.target.dataset.facetField;
+    const facetArea = document.querySelector('.facet-extended-list');
+    const prevNextLinks = document.querySelectorAll('.prev_next_links');
+
     if (!facetField) { return; }
 
-    const urlToFetch = `/catalog/facet_suggest/${facetField}/${queryFragment}${window.location.search}`
+    // Get the search params from the current query so the facet suggestions
+    // can retain that context.
+    const facetSearchContext = e.target.dataset.facetSearchContext;
+    const url = new URL(facetSearchContext, window.location.origin);
+
+    // Drop facet.page so a filtered suggestion list will always start on page 1
+    url.searchParams.delete('facet.page');
+    // add our queryFragment for facet filtering
+    url.searchParams.append('query_fragment', queryFragment);
+
+    const facetSearchParams = url.searchParams.toString();
+    const basePathComponent = url.pathname.split('/')[1];
+
+    const urlToFetch = `/${basePathComponent}/facet_suggest/${facetField}?${facetSearchParams}`;
+
     const response = await fetch(urlToFetch);
     if (response.ok) {
         const blob = await response.blob()
         const text = await blob.text()
 
-        const facetArea = document.querySelector('.facet-extended-list');
-
         if (text && facetArea) {
             facetArea.innerHTML = text
         }
     }
+
+    // Hide the prev/next links when a user enters text in the facet
+    // suggestion input. They don't work with a filtered list.
+    prevNextLinks.forEach(element => {
+      element.classList.toggle('invisible', !!queryFragment);
+    });
+
+    // Add a class to distinguish suggested facet values vs. regular.
+    facetArea.classList.toggle('facet-suggestions', !!queryFragment);
   }
 };
 

data/app/javascript/blacklight-frontend/index.js

@@ -2,7 +2,6 @@ import BookmarkToggle from 'blacklight-frontend/bookmark_toggle'
 import ButtonFocus from 'blacklight-frontend/button_focus'
 import FacetSuggest from 'blacklight-frontend/facet_suggest'
 import Modal from 'blacklight-frontend/modal'
-import ModalForm from 'blacklight-frontend/modalForm'
 import SearchContext from 'blacklight-frontend/search_context'
 import Core from 'blacklight-frontend/core'
 
@@ -11,7 +10,6 @@ export default {
   ButtonFocus,
   FacetSuggest,
   Modal,
-  ModalForm,
   SearchContext,
   Core,
   onLoad: Core.onLoad

data/app/javascript/blacklight-frontend/modal.js

@@ -32,7 +32,7 @@
 
     <div data-blacklight-modal="container">
       <div class="modal-header">
-        <button type="button" class="close" data-bl-dismiss="modal" aria-hidden="true">×</button>
+        <button type="button" class="btn-close" data-bl-dismiss="modal" aria-hidden="true">×</button>
         <h3 class="modal-title">Request Placed</h3>
       </div>
 
@@ -56,9 +56,6 @@
 const Modal = (() => {
   const modal = {}
 
-  // bootstrap class that will stop body scrolling when modal is open
-  const bootstrapBodyClassOpen = "modal-open";
-
   // a Bootstrap modal div that should be already on the page hidden
   modal.modalSelector = '#blacklight-modal';
 
@@ -84,8 +81,7 @@ const Modal = (() => {
 
       const contents = `<div class="modal-header">
         <div class="modal-title">There was a problem with your request.</div>
-        <button type="button" class="blacklight-modal-close btn-close close" data-bl-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true" class="visually-hidden">&times;</span>
+        <button type="button" class="blacklight-modal-close btn-close" data-bl-dismiss="modal" aria-label="Close">
         </button>
         </div>
         <div class="modal-body">
@@ -137,8 +133,8 @@ const Modal = (() => {
 
   modal.modalAjaxLinkClick = function(e) {
     e.preventDefault();
-    const href = e.target.getAttribute('href')
-    fetch(href)
+    const href = e.target.closest('a').getAttribute('href')
+    fetch(href, { headers: { 'X-Requested-With': 'XMLHttpRequest' }})
       .then(response => {
          if (!response.ok) {
            throw new TypeError("Request failed");
@@ -161,6 +157,17 @@ const Modal = (() => {
       else if (e.target.matches(`${modal.modalSelector}`) || e.target.closest('[data-bl-dismiss="modal"]'))
         modal.hide()
     })
+
+    // Make sure user-agent dismissal of html 'dialog', etc `esc` key, triggers
+    // our hide logic, including events and scroll restoration.
+    const modalDom = modal.target();
+    if (modalDom) {
+      modal.target().addEventListener('cancel', (e) => {
+        e.preventDefault(); // 'hide' will close the modal unless cancelled
+
+        modal.hide();
+      });
+    }
   };
 
   modal.hide = function (el) {

data/app/javascript/blacklight-frontend/search_context.js

@@ -1,6 +1,7 @@
 const SearchContext = (e) => {
-  if (e.target.matches('[data-context-href]')) {
-    SearchContext.handleSearchContextMethod.call(e.target, e)
+  const contextLink = e.target.closest('[data-context-href]')
+  if (contextLink) {
+    SearchContext.handleSearchContextMethod.call(contextLink, e)
   }
 }
 

data/app/presenters/blacklight/constraint_presenter.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Blacklight
+  class ConstraintPresenter
+    def initialize(facet_item_presenter:, field_label:)
+      @facet_item_presenter = facet_item_presenter
+      @field_label = field_label
+    end
+
+    attr_accessor :facet_item_presenter, :field_label
+
+    delegate :key, :remove_href, to: :facet_item_presenter
+
+    # Get the displayable version of the facet's value for use
+    # in e.g. the constraints widget
+    #
+    # @return [String]
+    def constraint_label
+      facet_item_presenter.label
+    end
+  end
+end

data/app/presenters/blacklight/document_presenter.rb

@@ -44,11 +44,11 @@ module Blacklight
     #
     # @return [String]
     def heading
-      return field_value(view_config.title_field) if view_config.title_field.is_a? Blacklight::Configuration::Field
+      return field_value(view_config.title_field, join: true).first if view_config.title_field.is_a? Blacklight::Configuration::Field
 
       fields = Array.wrap(view_config.title_field) + [configuration.document_model.unique_key]
       f = fields.lazy.map { |field| field_config(field) }.detect { |field_config| field_presenter(field_config).any? }
-      f ? field_value(f, except_operations: [Rendering::HelperMethod]) : ""
+      f ? field_value(f, except_operations: [Rendering::HelperMethod], join: true).first : ""
     end
 
     ##
@@ -58,12 +58,12 @@ module Blacklight
     # @see #document_heading
     # @return [String]
     def html_title
-      return field_value(view_config.html_title_field) if view_config.html_title_field.is_a? Blacklight::Configuration::Field
+      return field_value(view_config.html_title_field, join: true).first if view_config.html_title_field.is_a? Blacklight::Configuration::Field
 
       if view_config.html_title_field
         fields = Array.wrap(view_config.html_title_field) + [configuration.document_model.unique_key]
         f = fields.lazy.map { |field| field_config(field) }.detect { |field_config| field_presenter(field_config).any? }
-        field_value(f)
+        field_value(f, join: true).first
       else
         heading
       end
@@ -93,8 +93,9 @@ module Blacklight
     # @param [Configuration::Field] field_config
     # @param [Hash] options
     # @option options [String] :value
+    # @return [Array]
     def field_value field_config, options = {}
-      field_presenter(field_config, options).render
+      Array.wrap(field_presenter(field_config, options).render)
     end
 
     def thumbnail_presenter_class

data/app/presenters/blacklight/facet_field_presenter.rb

@@ -7,11 +7,27 @@ module Blacklight
     delegate :key, to: :facet_field
     delegate :field_name, to: :display_facet
 
-    def initialize(facet_field, display_facet, view_context, search_state = view_context.search_state)
+    # @param [Blacklight::Configuration::FacetField] facet_field
+    # @param [Blacklight::Solr::Response::Facets::FacetField] display_facet
+    # @param [#search_action_path,#facet_field_presenter] view_context
+    # @param [Blacklight::SearchState] search_state
+    def initialize(facet_field, display_facet, view_context, search_state = nil)
       @facet_field = facet_field
       @display_facet = display_facet
       @view_context = view_context
-      @search_state = search_state
+      @search_state = search_state || view_context&.search_state
+    end
+
+    # @param [Blacklight::Solr::Response::Facets::FacetItem, String] facet_item
+    def item_presenter(facet_item)
+      facet_field.item_presenter.new(facet_item, facet_field, view_context, key, search_state)
+    end
+
+    # Is facet suggest feature configured on for this facet, or by global default.
+    #
+    # @return [Boolean]
+    def suggest?
+      !!(facet_field.suggest.nil? ? blacklight_config.default_facet_suggest : facet_field.suggest)
     end
 
     def collapsed?

data/app/presenters/blacklight/facet_grouped_item_presenter.rb

@@ -6,6 +6,12 @@ module Blacklight
 
     delegate :key, to: :facet_config
 
+    # @param [Array<String>] group
+    # @param [String] facet_item
+    # @param [Blacklight::Configuration::FacetField] facet_config
+    # @param [#search_action_path] view_context
+    # @param [String] facet_field
+    # @param [Blacklight::SearchState] search_state
     def initialize(group, facet_item, facet_config, view_context, facet_field, search_state = view_context.search_state)
       super(facet_item, facet_config, view_context, facet_field, search_state)
       @group = group

data/app/presenters/blacklight/facet_item_pivot_presenter.rb

@@ -13,10 +13,6 @@ module Blacklight
       selected? || facet_item_presenters.any? { |x| x.try(:shown?) }
     end
 
-    def field_label
-      facet_field_presenter.label
-    end
-
     def facet_item_presenters
       return to_enum(:facet_item_presenters) unless block_given?
       return [] unless items
@@ -25,7 +21,7 @@ module Blacklight
     end
 
     def facet_item_presenter(facet_item)
-      facet_config.item_presenter.new(facet_item, facet_config, view_context, facet_field, search_state)
+      view_context.facet_field_presenter(facet_config, {}).item_presenter(facet_item)
     end
 
     ##

data/app/presenters/blacklight/facet_item_presenter.rb

@@ -6,6 +6,11 @@ module Blacklight
 
     delegate :key, to: :facet_config
 
+    # @param [Blacklight::Solr::Response::Facets::FacetItem, String] facet_item
+    # @param [Blacklight::Configuration::FacetField] facet_config
+    # @param [#search_action_path,#facet_field_presenter] view_context
+    # @param [String] facet_field the name of the facet field. Same as facet_config.key
+    # @param [Blacklight::SearchState] search_state
     def initialize(facet_item, facet_config, view_context, facet_field, search_state = view_context.search_state)
       @facet_item = facet_item
       @facet_config = facet_config
@@ -33,10 +38,6 @@ module Blacklight
       search_state.filter(facet_config).include?(value)
     end
 
-    def field_label
-      facet_field_presenter.label
-    end
-
     ##
     # Get the displayable version of a facet's value
     #
@@ -62,14 +63,6 @@ module Blacklight
       end
     end
 
-    # Get the displayable version of the facet's value for use
-    # in e.g. the constraints widget
-    #
-    # @return [String]
-    def constraint_label
-      label
-    end
-
     def value
       if facet_item.respond_to? :value
         facet_item.value
@@ -99,11 +92,5 @@ module Blacklight
         view_context.search_action_path(search_state.add_facet_params_and_redirect(facet_config.key, facet_item).merge(path_options))
       end
     end
-
-    private
-
-    def facet_field_presenter
-      @facet_field_presenter ||= view_context.facet_field_presenter(facet_config, {})
-    end
   end
 end

data/app/presenters/blacklight/field_presenter.rb

@@ -33,9 +33,11 @@ module Blacklight
 
     delegate :key, :component, to: :field_config
 
-    # @return [String]
+    # @return [Array<String>]
     def render
-      Rendering::Pipeline.new(values, field_config, document, view_context, pipeline_steps, options).render
+      Array.wrap(
+        Rendering::Pipeline.new(values, field_config, document, view_context, pipeline_steps, options).render
+      )
     end
 
     # @return [Enumerable]

data/app/presenters/blacklight/json_presenter.rb

@@ -11,11 +11,9 @@ module Blacklight
 
     attr_reader :blacklight_config
 
-    delegate :facet_field_names, :facet_configuration_for_field, to: :blacklight_config
+    delegate :facet_fields, :facet_configuration_for_field, to: :blacklight_config
 
-    def documents
-      @response.documents
-    end
+    delegate :documents, to: :@response
 
     # @return [Array<Blacklight::Solr::Response::Facets::FacetField>]
     def search_facets
@@ -25,6 +23,12 @@ module Blacklight
         .select { |display_facet| display_facet.items.present? }
     end
 
+    # NOTE: we don't use the facet_field_names method in Blacklight::Configuration because that
+    # only returns the field names of the group where the name is nil.
+    def facet_field_names
+      facet_fields.values.map(&:field)
+    end
+
     # extract the pagination info from the response object
     def pagination_info
       h = {}

data/app/presenters/blacklight/rendering/abstract_step.rb

@@ -22,7 +22,13 @@ module Blacklight
       end
 
       def html?
-        options[:format].nil? || options[:format].to_s == 'html'
+        format.nil? || format.to_s == 'html'
+      end
+
+      def format
+        return options[:format] unless context.respond_to?(:search_state)
+
+        options[:format] || context.search_state&.params&.dig(:format)
       end
     end
   end

data/app/presenters/blacklight/rendering/helper_method.rb

@@ -15,10 +15,10 @@ module Blacklight
 
       def render_helper
         context.send(config.helper_method,
-                     **options.merge(document: document,
-                                     field: config.field,
-                                     config: config,
-                                     value: values))
+                     **options, document: document,
+                                field: config.field,
+                                config: config,
+                                value: values)
       end
     end
   end

data/app/presenters/blacklight/rendering/join.rb

@@ -5,19 +5,23 @@ module Blacklight
     class Join < AbstractStep
       def render
         options = config.separator_options || {}
-        if values.one? || values.none?
-          next_step(values.first)
-        elsif !html?
-          next_step(values.to_sentence(options))
-        else
+
+        if join? && html? && values.many?
           next_step(values.map { |x| x.html_safe? ? x : html_escape(x) }.to_sentence(options).html_safe)
+        else
+          next_step(values)
         end
       end
 
       private
 
-      def html_escape(*args)
-        ERB::Util.html_escape(*args)
+      def html_escape(*)
+        ERB::Util.html_escape(*)
+      end
+
+      # @return [Boolean]
+      def join?
+        options[:join] || config.join || config.separator_options
       end
     end
   end

data/app/presenters/blacklight/rendering/terminator.rb

@@ -4,7 +4,7 @@ module Blacklight
   module Rendering
     class Terminator < AbstractStep
       def render
-        values
+        Array.wrap values
       end
     end
   end

data/app/services/blacklight/field_retriever.rb

@@ -41,7 +41,7 @@ module Blacklight
 
     def retrieve_simple
       # regular document field
-      if field_config.default && field_config.default.is_a?(Proc)
+      if field_config.default.is_a?(Proc)
         document.fetch(field_config.field, &field_config.default)
       else
         document.fetch(field_config.field, field_config.default)

data/app/services/blacklight/search_service.rb

@@ -3,9 +3,9 @@
 # SearchService returns search results from the repository
 module Blacklight
   class SearchService
-    def initialize(config:, search_state: nil, user_params: nil, search_builder_class: config.search_builder_class, **context)
+    def initialize(config:, search_state:, search_builder_class: config.search_builder_class, **context)
       @blacklight_config = config
-      @search_state = search_state || Blacklight::SearchState.new(user_params || {}, config)
+      @search_state = search_state
       @user_params = @search_state.params
       @search_builder_class = search_builder_class
       @context = context
@@ -22,8 +22,10 @@ module Blacklight
       @search_state.class
     end
 
-    # a solr query method
-    # @yield [search_builder] optional block yields configured SearchBuilder, caller can modify or create new SearchBuilder to be used. Block should return SearchBuilder to be used.
+    # Fetch query results from solr
+    # @yield [search_builder] optional block yields configured SearchBuilder,  caller can modify or create new
+    #                         SearchBuilder to be used. Block should return SearchBuilder to be used.
+    #                         This is used in blacklight_range_limit
     # @return [Blacklight::Solr::Response] the solr response object
     def search_results
       builder = search_builder.with(search_state)
@@ -31,7 +33,7 @@ module Blacklight
       builder.rows = search_state.per_page
 
       builder = yield(builder) if block_given?
-      response = repository.search(builder)
+      response = repository.search(params: builder)
 
       if response.grouped? && grouped_key_for_results
         response.group(grouped_key_for_results)
@@ -59,12 +61,12 @@ module Blacklight
     # @return [Blacklight::Solr::Response] the solr response
     def facet_field_response(facet_field, extra_controller_params = {})
       query = search_builder.with(search_state).facet(facet_field)
-      repository.search(query.merge(extra_controller_params))
+      repository.search(params: query.merge(extra_controller_params))
     end
 
     def facet_suggest_response(facet_field, facet_suggestion_query, extra_controller_params = {})
       query = search_builder.with(search_state).facet(facet_field).facet_suggestion_query(facet_suggestion_query)
-      repository.search(query.merge(extra_controller_params))
+      repository.search(params: query.merge(extra_controller_params))
     end
 
     # Get the previous and next document from a search result
@@ -73,7 +75,7 @@ module Blacklight
       p = previous_and_next_document_params(index)
       new_state = request_params.is_a?(Blacklight::SearchState) ? request_params : Blacklight::SearchState.new(request_params, blacklight_config)
       query = search_builder.with(new_state).start(p.delete(:start)).rows(p.delete(:rows)).merge(extra_controller_params).merge(p)
-      response = repository.search(query)
+      response = repository.search(params: query)
       document_list = response.documents
 
       # only get the previous doc if there is one

data/app/values/blacklight/types.rb

@@ -95,8 +95,8 @@ module Blacklight
     end
 
     class Selector < Array
-      def initialize(by: nil, block: nil, **kwargs)
-        super(**kwargs)
+      def initialize(by: nil, block: nil, **)
+        super(**)
         @by = by
         @block = block
       end

data/app/views/blacklight/nav/_bookmark.html.erb

@@ -1,4 +1,4 @@
 <%= link_to bookmarks_path, id:'bookmarks_nav', class: 'nav-link' do %>
   <%= t('blacklight.header_links.bookmarks') %>
-<span class="badge badge-secondary bg-secondary" data-role='bookmark-counter'><%= current_or_guest_user.bookmarks.count %></span>
+<span class="badge rounded-pill text-bg-secondary bookmark-counter" data-role='bookmark-counter'><%= current_or_guest_user.bookmarks.count %></span>
 <% end %>

data/app/views/catalog/_document.atom.builder

@@ -21,7 +21,7 @@ xml.entry do
   with_format(:html) do
     xml.summary "type" => "html" do
       document_component = blacklight_config.view_config(:atom).summary_component
-      xml.text! render document_component.new(document_component.collection_parameter => document_presenter(document), component: :div, show: true)
+      xml.text! render document_component.new(document: document_presenter(document), component: :div, show: true)
     end
   end
 

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

@@ -1,4 +1,4 @@
 <% # container for a single doc -%>
 <% view_config = local_assigns[:view_config] || blacklight_config.view_config(document_index_view_type, action_name: action_name) %>
 <% document_component = view_config.document_component -%>
-<%= render document_component.new(document_component.collection_parameter => document_presenter(document), counter: document_counter_with_offset(document_counter), partials: view_config&.partials) %>
+<%= render document_component.new(document: document_presenter(document), counter: document_counter_with_offset(document_counter), partials: view_config&.partials) %>

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

@@ -6,8 +6,8 @@
 
   <div class="modal-body">
     <%= render '/shared/flash_msg' %>
-    <div class="form-group row">
-      <label class="control-label col-sm-2" for="to">
+    <div class="row">
+      <label class="col-form-label col-sm-2" for="to">
         <%= t('blacklight.email.form.to') %>
       </label>
       <div class="col-sm-10">
@@ -15,8 +15,8 @@
       </div>
     </div>
 
-    <div class="form-group row">
-      <label class="control-label col-sm-2" for="message">
+    <div class="row">
+      <label class="col-form-label col-sm-2" for="message">
         <%= t('blacklight.email.form.message') %>
       </label>
       <div class="col-sm-10">

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

@@ -1,5 +1,5 @@
-<div class="jumbotron text-center p-5 mb-4 bg-light rounded-3">
-  <h1 class="jumbotron-heading"><%= t('blacklight.welcome') %></h1>
+<div class="text-center p-5 mb-4 bg-light rounded-3">
+  <h1 class="fw-bold"><%= t('blacklight.welcome') %></h1>
 
   <p class="lead">Blacklight is a multi-institutional open-source collaboration building a better discovery platform framework.</p>
 

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

@@ -1,14 +1,18 @@
-<%= render blacklight_config.view_config(:show).document_header_component.new(document: @document, search_context: @search_context, search_session: search_session) %>
-<% @page_title = t('blacklight.search.show.title', document_title: document_presenter(@document).html_title, application_name: application_name).html_safe %>
+<%# locals: (presenter: nil) %>
+<% presenter ||= document_presenter(@document) %>
+
+<% @page_title = t('blacklight.search.show.title', document_title: presenter.html_title, application_name: application_name).html_safe %>
 <% content_for(:head) { render_link_rel_alternates } %>
 
-<% document_component = blacklight_config.view_config(:show).document_component -%>
-<%= render (document_component).new(document_component.collection_parameter => document_presenter(@document), component: :div, show: true, partials: blacklight_config.view_config(:show).partials) do |component| %>
+<%= render presenter.view_config.document_header_component.new(document: @document, search_context: @search_context, search_session: search_session) %>
+
+<% document_component = presenter.view_config.document_component -%>
+<%= render document_component.new(id: 'document', document: presenter, component: :div, show: true, partials: presenter.view_config.partials) do |component| %>
   <% component.with_title(as: 'h1', classes: '', link_to_document: false, actions: false) %>
   <% component.with_footer do %>
     <% if @document.respond_to?(:export_as_openurl_ctx_kev) %>
       <!-- COinS, for Zotero among others. -->
-      <span class="Z3988" title="<%= @document.export_as_openurl_ctx_kev(document_presenter(@document).display_type) %>"></span>
+      <span class="Z3988" title="<%= @document.export_as_openurl_ctx_kev(presenter.display_type) %>"></span>
     <% end %>
   <% end %>
 <% end %>