Merge pull request #3733 from projectblacklight/doc-comp

Author: jcoyne

app/components/blacklight/document_component.rb

@@ -34,27 +34,24 @@ class DocumentComponent < Blacklight::Component
 
     # The document title with some reasonable default behavior
     renders_one :title, (lambda do |component: nil, **kwargs|
-      component ||= view_config.title_component || Blacklight::DocumentTitleComponent
+      component ||= view_config.document_title_component
 
-      component.new(counter: @counter, presenter: @presenter, as: @title_component, actions: !@show, link_to_document: !@show, document_component: self, **kwargs)
+      component&.new(counter: @counter, presenter: @presenter, as: @title_component, actions: !@show, link_to_document: !@show, document_component: self, **kwargs)
     end)
 
     renders_one :embed, (lambda do |static_content = nil, component: nil, **kwargs|
       next static_content if static_content.present?
 
-      component ||= view_config.embed_component
-
-      next unless component
-
-      component.new(presenter: @presenter, document_counter: @document_counter, **kwargs)
+      component ||= view_config.document_embed_component
+      component&.new(presenter: @presenter, document_counter: @document_counter, **kwargs)
     end)
 
     # The primary metadata section
     renders_one :metadata, (lambda do |static_content = nil, component: nil, fields: nil, **kwargs|
       next static_content if static_content.present?
 
-      component ||= view_config.metadata_component || Blacklight::DocumentMetadataComponent
-      component.new(fields: fields || @presenter&.field_presenters || [], **kwargs)
+      component ||= view_config.document_metadata_component
+      component&.new(fields: fields || @presenter&.field_presenters || [], **kwargs)
     end)
 
     # Additional metadata sections
@@ -63,9 +60,9 @@ class DocumentComponent < Blacklight::Component
     renders_one :thumbnail, (lambda do |image_options_or_static_content = {}, component: nil, **kwargs|
       next image_options_or_static_content if image_options_or_static_content.is_a? String
 
-      component ||= view_config.thumbnail_component || Blacklight::Document::ThumbnailComponent
+      component ||= view_config.document_thumbnail_component
 
-      component.new(presenter: @presenter, counter: @counter, image_options: image_options_or_static_content, **kwargs)
+      component&.new(presenter: @presenter, counter: @counter, image_options: image_options_or_static_content, **kwargs)
     end)
 
     # A container for partials rendered using the view config partials configuration. Its use is discouraged, but necessary until
@@ -119,7 +116,7 @@ def classes
 
     def before_render
       with_title unless title
-      with_thumbnail unless thumbnail || show?
+      with_thumbnail unless thumbnail
       with_metadata(fields: presenter.field_presenters, show: @show) unless metadata
       with_embed unless embed
 

lib/blacklight/configuration.rb

@@ -152,6 +152,10 @@ def initialized_default_configuration?
         json_presenter_class: Blacklight::JsonPresenter,
         # component class used to render a document
         document_component: Blacklight::DocumentComponent,
+        document_embed_component: nil,
+        document_metadata_component: Blacklight::DocumentMetadataComponent,
+        document_thumbnail_component: Blacklight::Document::ThumbnailComponent,
+        document_title_component: Blacklight::DocumentTitleComponent,
         sidebar_component: Blacklight::Search::SidebarComponent,
         dropdown_component: Blacklight::System::DropdownComponent,
         # solr field to use to render a document title
@@ -189,6 +193,7 @@ def initialized_default_configuration?
         # document presenter class used by helpers and views
         document_presenter_class: nil,
         document_component: Blacklight::DocumentComponent,
+        document_thumbnail_component: nil,
         show_tools_component: Blacklight::Document::ShowToolsComponent,
         show_header_tools_component: nil,
         document_header_component: Blacklight::Document::PageHeaderComponent,

lib/blacklight/configuration/view_config.rb

@@ -8,6 +8,14 @@ class ViewConfig < Blacklight::OpenStructWithHashAccess
     #   @return [Class] document presenter class used by helpers and views
     # @!attribute document_component
     #   @return [Class] component class used to render a document; defaults to Blacklight::DocumentComponent
+    # @!attribute document_title_component
+    #   @return [Class] component class used to render a document title
+    # @!attribute document_metadata_component
+    #   @return [Class] component class used to render the document metadata
+    # @!attribute document_thumbnail_component
+    #   @return [Class] component class used to render a document thumbnail
+    # @!attribute document_embed_component
+    #   @return [Class] component class used to render a document embed
     # @!attribute title_field
     #   @return [String, Symbol] solr field to use to render a document title
     # @!attribute display_type_field
@@ -46,6 +54,28 @@ def title_field=(value)
       end
     end
 
+    # Provide backwards compatibility with the configuration keys without the document_ prefix
+    def title_component(*) = document_title_component(*)
+    def metadata_component(*) = document_metadata_component(*)
+    def thumbnail_component(*) = document_thumbnail_component(*)
+    def embed_component(*) = document_embed_component(*)
+
+    def title_component=(value)
+      self.document_title_component = value
+    end
+
+    def metadata_component=(value)
+      self.document_metadata_component = value
+    end
+
+    def thumbnail_component=(value)
+      self.document_thumbnail_component = value
+    end
+
+    def embed_component=(value)
+      self.document_embed_component = value
+    end
+
     class Show < ViewConfig
       # @!attribute route
       #   @return [Hash] Default route parameters for 'show' requests.