Use the DocumentMetadataComponent to render email + sms fields

app/components/blacklight/document_metadata_component.rb

@@ -8,6 +8,7 @@ class DocumentMetadataComponent < Blacklight::Component
     with_collection_parameter :fields
 
     # @param fields [Enumerable<Blacklight::FieldPresenter>] Document field presenters
+    # rubocop:disable Metrics/ParameterLists
     def initialize(fields: [], tag: 'dl', classes: %w[document-metadata dl-invert row], show: false, view_type: nil, field_layout: nil, **component_args)
       @fields = fields
       @tag = tag
@@ -17,6 +18,7 @@ def initialize(fields: [], tag: 'dl', classes: %w[document-metadata dl-invert ro
       @field_layout = field_layout
       @component_args = component_args
     end
+    # rubocop:enable Metrics/ParameterLists
 
     def before_render
       return unless fields

app/components/blacklight/metadata_field_plain_text_layout_component.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Blacklight
+  class MetadataFieldPlainTextLayoutComponent < Blacklight::MetadataFieldLayoutComponent
+    with_collection_parameter :field
+
+    def initialize(field:, **kwargs)
+      super(field: field, **kwargs, value_tag: nil)
+    end
+
+    # rubocop:disable Rails/OutputSafety
+    def call
+      [label.to_s.strip, helpers.strip_tags(CGI.unescape_html(safe_join(values, "\n")).strip)].compact.join(' ').html_safe
+    end
+    # rubocop:enable Rails/OutputSafety
+  end
+end

app/presenters/blacklight/document_presenter.rb

@@ -11,29 +11,31 @@ class DocumentPresenter
     # @param [SolrDocument] document
     # @param [ActionView::Base] view_context scope for linking and generating urls
     # @param [Blacklight::Configuration] configuration
-    def initialize(document, view_context, configuration = view_context.blacklight_config)
+    def initialize(document, view_context, configuration = view_context.blacklight_config, view_config: nil, field_presenter_options: {})
       @document = document
       @view_context = view_context
       @configuration = configuration
+      @view_config = view_config
+      @field_presenter_options = field_presenter_options
     end
 
     # @return [Hash<String,Configuration::Field>]  all the fields for this index view that should be rendered
-    def fields_to_render
-      return to_enum(:fields_to_render) unless block_given?
+    def fields_to_render(document_fields = fields, **kwargs)
+      return to_enum(:fields_to_render, document_fields, **kwargs) unless block_given?
 
-      fields.each do |name, field_config|
-        field_presenter = field_presenter(field_config)
+      document_fields.each do |name, field_config|
+        field_presenter = field_presenter(field_config, kwargs)
 
         next unless field_presenter.render_field? && field_presenter.any?
 
         yield name, field_config, field_presenter
       end
     end
 
-    def field_presenters
-      return to_enum(:field_presenters) unless block_given?
+    def field_presenters(document_fields = fields, **kwargs)
+      return to_enum(:field_presenters, document_fields, **kwargs) unless block_given?
 
-      fields_to_render.each { |_, _, config| yield config }
+      fields_to_render(document_fields, **kwargs).each { |_, _, config| yield config }
     end
 
     ##
@@ -150,7 +152,7 @@ def field_presenter(field_config, options = {})
     end
 
     def field_presenter_options
-      {}
+      @field_presenter_options || {}
     end
   end
 end

app/views/record_mailer/email_record.text.erb

@@ -1,6 +1,7 @@
+<%= t('blacklight.email.text.message', message: @message) %>
+
 <% @documents.each do |document| %>
-<%= document.to_email_text %>
-<%= t('blacklight.email.text.url', :url =>polymorphic_url(document, @url_gen_params)) %>
+  <%= render Blacklight::DocumentMetadataComponent.new(fields: document_presenter(document).field_presenters(blacklight_config.email_fields), tag: nil, field_layout: Blacklight::MetadataFieldPlainTextLayoutComponent, field_presenter_options: { format: 'text' }) %>
 
+  <%= t('blacklight.email.text.url', url: polymorphic_url(document, @url_gen_params)) %>
 <% end %>
-<%= t('blacklight.email.text.message', :message => @message) %>

app/views/record_mailer/sms_record.text.erb

@@ -1,4 +1,4 @@
-<% @documents.each do |document| %>
-<%= document.to_sms_text(@config) %>
-<%= t('blacklight.sms.text.url', :url => polymorphic_url(document, @url_gen_params) ) %>
-<% end %>
+<% @documents.each do |document| %>
+  <%= render Blacklight::DocumentMetadataComponent.new(fields: document_presenter(document).field_presenters(blacklight_config.sms_fields), tag: nil, field_layout: Blacklight::MetadataFieldPlainTextLayoutComponent, field_presenter_options: { format: 'text' }) %>
+  <%= t('blacklight.sms.text.url', url: polymorphic_url(document, @url_gen_params)) %>
+<% end %>

lib/blacklight/configuration.rb

@@ -200,7 +200,9 @@ def initialized_default_configuration?
         ViewConfig,
         default: { top_level_config: :index },
         show: { top_level_config: :show },
-        citation: { parent_config: :show }
+        citation: { parent_config: :show },
+        email_action: { top_level_config: :email },
+        sms_action: { top_level_config: :sms }
       )
 
       # @!attribute sms

lib/generators/blacklight/templates/solr_document.rb

@@ -6,12 +6,6 @@ class <%= model_name.classify %>
 
   # self.unique_key = 'id'
 
-  # Email uses the semantic field mappings below to generate the body of an email.
-  SolrDocument.use_extension(Blacklight::Document::Email)
-
-  # SMS uses the semantic field mappings below to generate the body of an SMS email.
-  SolrDocument.use_extension(Blacklight::Document::Sms)
-
   # DublinCore uses the semantic field mappings below to assemble an OAI-compliant Dublin Core document
   # Semantic mappings of solr stored fields. Fields may be multi or
   # single valued. See Blacklight::Document::SemanticFields#field_semantics

spec/controllers/catalog_controller_spec.rb

@@ -469,16 +469,12 @@ def export_as_mock
 
   describe "email/sms" do
     before do
-      mock_document.extend(Blacklight::Document::Sms)
-      mock_document.extend(Blacklight::Document::Email)
       allow(mock_document).to receive(:to_semantic_values).and_return({})
       allow(mock_document).to receive(:to_model).and_return(SolrDocument.new(id: 'my_fake_doc'))
 
       allow(controller).to receive(:search_service).and_return(search_service)
       expect(search_service).to receive(:fetch).and_return([mock_document])
       request.env["HTTP_REFERER"] = "/catalog/#{doc_id}"
-      SolrDocument.use_extension(Blacklight::Document::Email)
-      SolrDocument.use_extension(Blacklight::Document::Sms)
     end
 
     describe "email", api: false do

spec/models/record_mailer_spec.rb

@@ -11,8 +11,6 @@
 
   before do
     allow(described_class).to receive(:default).and_return(from: 'no-reply@projectblacklight.org')
-    SolrDocument.use_extension(Blacklight::Document::Email)
-    SolrDocument.use_extension(Blacklight::Document::Sms)
     @documents = [document]
   end