From 8bbe38289274d2ba1ed6fa6d07a3ff2ddaabb8c4 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Wed, 12 Oct 2022 07:48:09 -0500 Subject: [PATCH] Extract CollectionComponent and NonCollectionComponent from DocumentComponent This eliminates a number of conditionals around whether the document is a collection or not. --- ...html.erb => collection_component.html.erb} | 54 +++++------- .../arclight/collection_component.rb | 13 +++ app/components/arclight/document_component.rb | 18 ++-- .../non_collection_component.html.erb | 88 +++++++++++++++++++ .../arclight/non_collection_component.rb | 16 ++++ app/presenters/arclight/show_presenter.rb | 1 + 6 files changed, 150 insertions(+), 40 deletions(-) rename app/components/arclight/{document_component.html.erb => collection_component.html.erb} (61%) create mode 100644 app/components/arclight/collection_component.rb create mode 100644 app/components/arclight/non_collection_component.html.erb create mode 100644 app/components/arclight/non_collection_component.rb diff --git a/app/components/arclight/document_component.html.erb b/app/components/arclight/collection_component.html.erb similarity index 61% rename from app/components/arclight/document_component.html.erb rename to app/components/arclight/collection_component.html.erb index 9b977e50e..9f16252fd 100644 --- a/app/components/arclight/document_component.html.erb +++ b/app/components/arclight/collection_component.html.erb @@ -13,9 +13,6 @@ <%= render Arclight::DocumentActionsComponent.new(presenter: presenter) %> - -<%= render Arclight::MetadataSectionComponent.with_collection(blacklight_config.show.component_metadata_partials || [], metadata_attr: { layout: Arclight::UpperMetadataLayoutComponent }, presenter: presenter, classes: ['al-metadata-section', 'breadcrumb-item', "breadcrumb-item-#{document.parents.length + 3}"]) unless document.collection? %> -
<%= embed %> @@ -27,25 +24,20 @@
    '>
  • - <%= document.collection? ? t('arclight.views.show.overview') : t('arclight.views.show.context') %> + <%= t('arclight.views.show.overview') %>
    • - <% if document.collection? %>
  • - + <%= t 'arclight.views.show.no_contents' %> - +
    • - <% end %> <% if online_content? %>
  • <%= t 'arclight.views.show.online_content' %> - <% unless document.collection? %> - - <% end %>
    • <% end %> @@ -62,34 +54,32 @@
    - <% if document.collection? %> -
    -
    -
    +
    +
    +
    -
    +
    -
    +
    <%= render Arclight::MetadataSectionComponent.with_collection(blacklight_config.show.metadata_partials || [], presenter: presenter, heading: true) %> -
    - <% end %> +
    -
    ' id='<%= document.collection? ? 'contents' : 'context' %>' role='tabpanel'> - - <%= content_tag(:div, id: document.collection? ? nil : t("arclight.views.show.sections.collection_context_field").parameterize) do %> +
    + + <%= content_tag(:div) do %> <%= generic_context_navigation(@document) %> <% end %>
    @@ -106,7 +96,7 @@ name: document.collection_name, access: 'online', view: 'online_contents', - parent: document.collection? ? nil : document.reference, + parent: nil, search_field: 'within_collection' } } @@ -117,11 +107,7 @@
    - <% if @document.collection? %> - <%= render Arclight::MetadataSectionComponent.with_collection(blacklight_config.show.context_access_tab_items || [], presenter: presenter) %> - <% else %> - <%= render Arclight::MetadataSectionComponent.with_collection(blacklight_config.show.component_access_tab_items || [], presenter: presenter) %> - <% end %> + <%= render Arclight::MetadataSectionComponent.with_collection(blacklight_config.show.context_access_tab_items || [], presenter: presenter) %>
    diff --git a/app/components/arclight/collection_component.rb b/app/components/arclight/collection_component.rb new file mode 100644 index 000000000..ba6b018e2 --- /dev/null +++ b/app/components/arclight/collection_component.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +module Arclight + # Render a single collection document + class CollectionComponent < Blacklight::DocumentComponent + def blacklight_config + presenter.configuration + end + attr_reader :document + + delegate :online_content?, to: :document + end +end diff --git a/app/components/arclight/document_component.rb b/app/components/arclight/document_component.rb index 575c491af..8501887b6 100644 --- a/app/components/arclight/document_component.rb +++ b/app/components/arclight/document_component.rb @@ -3,14 +3,20 @@ module Arclight # Render a single document class DocumentComponent < Blacklight::DocumentComponent - attr_reader :document - - def online_content? - document.online_content? && (document.collection? || document.children?) + def initialize(presenter:, **kwargs) # rubocop:disable Lint/MissingSuper + @presenter = presenter + @kwargs = kwargs end - def blacklight_config - presenter.configuration + attr_reader :presenter + delegate :collection?, to: :presenter + + def call + if collection? + render CollectionComponent.new(presenter: presenter, **@kwargs) + else + render NonCollectionComponent.new(presenter: presenter, **@kwargs) + end end end end diff --git a/app/components/arclight/non_collection_component.html.erb b/app/components/arclight/non_collection_component.html.erb new file mode 100644 index 000000000..bf10bb5b4 --- /dev/null +++ b/app/components/arclight/non_collection_component.html.erb @@ -0,0 +1,88 @@ +
    +
    + +
    + + <%= render Arclight::DocumentActionsComponent.new(presenter: presenter) %> +
    + +<%= render Arclight::MetadataSectionComponent.with_collection(blacklight_config.show.component_metadata_partials || [], metadata_attr: { layout: Arclight::UpperMetadataLayoutComponent }, presenter: presenter, classes: ['al-metadata-section', 'breadcrumb-item', "breadcrumb-item-#{document.parents.length + 3}"]) %> + +
    +
    + <%= embed %> +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    + + <%= content_tag(:div, id: t("arclight.views.show.sections.collection_context_field").parameterize) do %> + <%= generic_context_navigation(@document) %> + <% end %> +
    + + <% if online_content? %> +
    + + <%= content_tag( + :div, '', + class: 'al-contents', + data: { + arclight: { + path: search_catalog_path, + name: document.collection_name, + access: 'online', + view: 'online_contents', + parent: document.reference, + search_field: 'within_collection' + } + } + ) %> +
    + <% end %> + +
    + + + <%= render Arclight::MetadataSectionComponent.with_collection(blacklight_config.show.component_access_tab_items || [], presenter: presenter) %> +
    +
    +
    +
    diff --git a/app/components/arclight/non_collection_component.rb b/app/components/arclight/non_collection_component.rb new file mode 100644 index 000000000..50ebaea2d --- /dev/null +++ b/app/components/arclight/non_collection_component.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +module Arclight + # Render a single non-collection document + class NonCollectionComponent < Blacklight::DocumentComponent + attr_reader :document + + def blacklight_config + presenter.configuration + end + + def online_content? + document.online_content? && document.children? + end + end +end diff --git a/app/presenters/arclight/show_presenter.rb b/app/presenters/arclight/show_presenter.rb index 1e2e651e6..8eaba28e1 100644 --- a/app/presenters/arclight/show_presenter.rb +++ b/app/presenters/arclight/show_presenter.rb @@ -4,6 +4,7 @@ module Arclight # Custom presentation methods for show partial class ShowPresenter < Blacklight::ShowPresenter attr_accessor :field_group + delegate :collection?, to: :document def heading document.normalized_title