blacklight 7.20.1 → 7.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee4c46b8533bb359a6619ef6dddd96b4de1449b4bfc96db65a357469bebc7cc1
-  data.tar.gz: 9eecbab00d1484a3e417bd60245479fc58d6bd9c41a7b16be91d3cef056846a2
+  metadata.gz: 100a7b0ab6394c96ba5ad5606bffe36132721d9f09c5946911845f117d8bddee
+  data.tar.gz: a57654c6cdb05add30658903b407d86661a8b975b0af389f84c56736bff2d56c
 SHA512:
-  metadata.gz: 97d968403618ee1d25fac527cea64467e3be78040e0d58e8d672463b94c22f272ff7b30fec66af576084bf2a9e8d169a7d3bec9b58b0d1187bb8ffc5bdab2f21
-  data.tar.gz: 31855c12d2d58eb7863aa90a4b60c106d208b302460bd0f263fdd32baf8d6025f94025cdf953c82a42220a403c2d0eeae367e7729c7f714f8bc19d23bb561974
+  metadata.gz: dec089984409283e902abf6d3a79c549a1785742396dd6d1e6dbd8ec5b49b1ec5ae4be46cad25eb5bdff663880fce761e023c313f71a020f989f17932492adb4
+  data.tar.gz: d1bb132cc0ef21f5f9c3a715bf407c47eba801f274d7d78f5e872b6f495298d5bad2720ee89e84944c733babcda22ec62f6d8eed119df9e7ded38b70fd5de1b7

data/.babelrc

@@ -0,0 +1,11 @@
+{
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "useBuiltIns": "entry",
+        "corejs": "2.0"
+      }
+    ]
+  ]
+}

data/.docker/app/Dockerfile

@@ -9,8 +9,10 @@ RUN apk add --update --no-cache \
   libxml2-dev \
   libxslt-dev \
   nodejs \
+  shared-mime-info \
   sqlite-dev \
-  tzdata
+  tzdata \
+  yarn
 
 RUN mkdir /app
 WORKDIR /app

data/.dockerignore

@@ -0,0 +1,3 @@
+Gemfile.lock
+.internal_test_app
+.solr_wrapper.yml

data/.env

@@ -1,5 +1,5 @@
-ALPINE_RUBY_VERSION=2.6.5
-RAILS_VERSION=5.2.5
+ALPINE_RUBY_VERSION=2.7.5
+RAILS_VERSION=5.2.6
 SOLR_PORT=8983
 SOLR_URL=http://solr:8983/solr/blacklight-core
 SOLR_VERSION=latest

data/.github/workflows/ruby.yml

@@ -9,9 +9,10 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - main
+      - 'release-*'
   pull_request:
-    branches: [ master ]
 
 jobs:
   lint:

data/Gemfile

@@ -27,7 +27,7 @@ else
   if ENV['RAILS_VERSION']
     if ENV['RAILS_VERSION'] == 'edge'
       gem 'rails', github: 'rails/rails'
-      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
+      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge'
     else
       gem 'rails', ENV['RAILS_VERSION']
     end

data/README.md

@@ -39,7 +39,7 @@ rails generate blacklight:install
 
 ## Contributing Code
 
-Code contributions are always welcome, instructions for contributing can be found at [CONTRIBUTING.md](https://github.com/projectblacklight/blacklight/blob/master/CONTRIBUTING.md).
+Code contributions are always welcome, instructions for contributing can be found at [CONTRIBUTING.md](https://github.com/projectblacklight/blacklight/blob/main/CONTRIBUTING.md).
 
 ## Configuring Apache Solr
 You'll also want some information about how Blacklight expects [Apache Solr](http://lucene.apache.org/solr ) to run, which you can find in [README_SOLR](https://github.com/projectblacklight/blacklight/wiki/README_SOLR)

data/VERSION

@@ -1 +1 @@
-7.20.1
+7.22.0

data/app/assets/javascripts/blacklight/blacklight.js

@@ -1,18 +1,22 @@
-Blacklight = function () {
+"use strict";
+
+var Blacklight = function () {
   var buffer = new Array();
   return {
-    onLoad: function (func) {
+    onLoad: function onLoad(func) {
       buffer.push(func);
     },
-    activate: function () {
+    activate: function activate() {
       for (var i = 0; i < buffer.length; i++) {
         buffer[i].call();
       }
     },
-    listeners: function () {
+    listeners: function listeners() {
       var listeners = [];
 
-      if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
+      if (typeof Turbo !== 'undefined') {
+        listeners.push('turbo:load');
+      } else if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
         // Turbolinks 5
         if (Turbolinks.BrowserAdapter) {
           listeners.push('turbolinks:load');
@@ -37,11 +41,14 @@ Blacklight.listeners().forEach(function (listener) {
   });
 });
 Blacklight.onLoad(function () {
-  const elem = document.querySelector('.no-js');
+  var elem = document.querySelector('.no-js'); // The "no-js" class may already have been removed because this function is
+  // run on every turbo:load event, in that case, it won't find an element.
+
   if (!elem) return;
   elem.classList.remove('no-js');
   elem.classList.add('js');
 });
+window.Blacklight = Blacklight;
 /*global Bloodhound */
 
 Blacklight.onLoad(function () {
@@ -87,7 +94,7 @@ Blacklight.onLoad(function () {
     $(Blacklight.doBookmarkToggleBehavior.selector).blCheckboxSubmit({
       // cssClass is added to elements added, plus used for id base
       cssClass: 'toggle-bookmark',
-      success: function (checked, response) {
+      success: function success(checked, response) {
         if (response.bookmarks) {
           $('[data-role=bookmark-counter]').text(response.bookmarks.count);
         }
@@ -105,8 +112,8 @@ Blacklight.onLoad(function () {
   // 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
-  document.querySelectorAll('button.collapse-toggle').forEach(button => {
-    button.addEventListener('click', () => {
+  document.querySelectorAll('button.collapse-toggle').forEach(function (button) {
+    button.addEventListener('click', function () {
       event.target.focus();
     });
   });
@@ -193,12 +200,12 @@ Blacklight.onLoad(function () {
           dataType: 'json',
           type: form.attr('method').toUpperCase(),
           data: form.serialize(),
-          error: function () {
+          error: function error() {
             label.removeAttr('disabled');
             checkbox.removeAttr('disabled');
             options.error.call();
           },
-          success: function (data, status, xhr) {
+          success: function success(data, status, xhr) {
             //if app isn't running at all, xhr annoyingly
             //reports success with status 0.
             if (xhr.status != 0) {
@@ -224,10 +231,10 @@ Blacklight.onLoad(function () {
   $.fn.blCheckboxSubmit.defaults = {
     //cssClass is added to elements added, plus used for id base
     cssClass: 'blCheckboxSubmit',
-    error: function () {
+    error: function error() {
       alert("Error");
     },
-    success: function () {} //callback
+    success: function success() {} //callback
 
   };
 })(jQuery);
@@ -243,12 +250,12 @@ Blacklight.doResizeFacetLabelsAndCounts = function () {
   }
 
   document.querySelectorAll('.facet-values, .pivot-facet').forEach(function (elem) {
-    const nodes = elem.querySelectorAll('.facet-count'); // TODO: when we drop ie11 support, this can become the spread operator:
+    var nodes = elem.querySelectorAll('.facet-count'); // TODO: when we drop ie11 support, this can become the spread operator:
 
-    const longest = Array.from(nodes).sort(longer)[0];
+    var longest = Array.from(nodes).sort(longer)[0];
 
     if (longest && longest.textContent) {
-      const width = longest.textContent.length + 1 + 'ch';
+      var width = longest.textContent.length + 1 + 'ch';
       elem.querySelector('.facet-count').style.width = width;
     }
   });
@@ -359,13 +366,13 @@ Blacklight.modal.onFailure = function (jqXHR, textStatus, errorThrown) {
   console.error('Server error:', this.url, jqXHR.status, errorThrown);
   var 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-dismiss="modal" aria-label="Close">' + '  <span aria-hidden="true">&times;</span>' + '</button></div>' + ' <div class="modal-body"><p>Expected a successful response from the server, but got an error</p>' + '<pre>' + this.type + ' ' + this.url + "\n" + jqXHR.status + ': ' + errorThrown + '</pre></div>';
   $(Blacklight.modal.modalSelector).find('.modal-content').html(contents);
-  $(Blacklight.modal.modalSelector).modal('show');
+  Blacklight.modal.show();
 };
 
 Blacklight.modal.receiveAjax = function (contents) {
   // does it have a data- selector for container?
   // important we don't execute script tags, we shouldn't.
-  // code modelled off of JQuery ajax.load. https://github.com/jquery/jquery/blob/master/src/ajax/load.js?source=c#L62
+  // code modelled off of JQuery ajax.load. https://github.com/jquery/jquery/blob/main/src/ajax/load.js?source=c#L62
   var container = $('<div>').append(jQuery.parseHTML(contents)).find(Blacklight.modal.containerSelector).first();
 
   if (container.length !== 0) {
@@ -378,7 +385,7 @@ Blacklight.modal.receiveAjax = function (contents) {
   $(Blacklight.modal.modalSelector).trigger(e); // if they did preventDefault, don't show the dialog
 
   if (e.isDefaultPrevented()) return;
-  $(Blacklight.modal.modalSelector).modal('show');
+  Blacklight.modal.show();
 };
 
 Blacklight.modal.modalAjaxLinkClick = function (e) {
@@ -425,7 +432,7 @@ Blacklight.modal.setupModal = function () {
 Blacklight.modal.checkCloseModal = function (event) {
   if ($(event.target).find(Blacklight.modal.modalCloseSelector).length) {
     var modalFlashes = $(this).find('.flash_messages');
-    $(event.target).modal('hide');
+    Blacklight.modal.hide(event.target);
     event.preventDefault();
     var mainFlashes = $('#main-flashes');
     mainFlashes.append(modalFlashes);
@@ -433,6 +440,22 @@ Blacklight.modal.checkCloseModal = function (event) {
   }
 };
 
+Blacklight.modal.hide = function (el) {
+  if (bootstrap.Modal.VERSION >= "5") {
+    bootstrap.Modal.getOrCreateInstance(el).hide();
+  } else {
+    $(el || Blacklight.modal.modalSelector).modal('hide');
+  }
+};
+
+Blacklight.modal.show = function (el) {
+  if (bootstrap.Modal.VERSION >= "5") {
+    bootstrap.Modal.getOrCreateInstance(el).show();
+  } else {
+    $(el || Blacklight.modal.modalSelector).modal('show');
+  }
+};
+
 Blacklight.onLoad(function () {
   Blacklight.modal.setupModal();
 });
@@ -443,9 +466,9 @@ Blacklight.doSearchContextBehavior = function () {
     return Blacklight.do_search_context_behavior();
   }
 
-  const elements = document.querySelectorAll('a[data-context-href]'); // Equivalent to Array.from(), but supports ie11
+  var elements = document.querySelectorAll('a[data-context-href]'); // Equivalent to Array.from(), but supports ie11
 
-  const nodes = Array.prototype.slice.call(elements);
+  var nodes = Array.prototype.slice.call(elements);
   nodes.forEach(function (element) {
     element.addEventListener('click', function (e) {
       Blacklight.handleSearchContextMethod.call(e.currentTarget, e);
@@ -453,9 +476,17 @@ Blacklight.doSearchContextBehavior = function () {
   });
 };
 
-Blacklight.csrfToken = () => document.querySelector('meta[name=csrf-token]')?.content;
+Blacklight.csrfToken = function () {
+  var _document$querySelect;
+
+  return (_document$querySelect = document.querySelector('meta[name=csrf-token]')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.content;
+};
+
+Blacklight.csrfParam = function () {
+  var _document$querySelect2;
 
-Blacklight.csrfParam = () => document.querySelector('meta[name=csrf-param]')?.content; // this is the Rails.handleMethod with a couple adjustments, described inline:
+  return (_document$querySelect2 = document.querySelector('meta[name=csrf-param]')) === null || _document$querySelect2 === void 0 ? void 0 : _document$querySelect2.content;
+}; // this is the Rails.handleMethod with a couple adjustments, described inline:
 // first, we're attaching this directly to the event handler, so we can check for meta-keys
 
 
@@ -467,22 +498,21 @@ Blacklight.handleSearchContextMethod = function (event) {
 
   var link = this; // instead of using the normal href, we need to use the context href instead
 
-  let href = link.getAttribute('data-context-href');
-  let target = link.getAttribute('target');
-  let csrfToken = Blacklight.csrfToken();
-  let csrfParam = Blacklight.csrfParam();
-  let form = document.createElement('form');
+  var href = link.getAttribute('data-context-href');
+  var target = link.getAttribute('target');
+  var csrfToken = Blacklight.csrfToken();
+  var csrfParam = Blacklight.csrfParam();
+  var form = document.createElement('form');
   form.method = 'post';
   form.action = href;
-  let formContent = `<input name="_method" value="post" type="hidden" />
-    <input name="redirect" value="${link.getAttribute('href')}" type="hidden" />`; // check for meta keys.. if set, we should open in a new tab
+  var formContent = "<input name=\"_method\" value=\"post\" type=\"hidden\" />\n    <input name=\"redirect\" value=\"".concat(link.getAttribute('href'), "\" type=\"hidden\" />"); // check for meta keys.. if set, we should open in a new tab
 
   if (event.metaKey || event.ctrlKey) {
     target = '_blank';
   }
 
   if (csrfParam !== undefined && csrfToken !== undefined) {
-    formContent += `<input name="${csrfParam}" value="${csrfToken}" type="hidden" />`;
+    formContent += "<input name=\"".concat(csrfParam, "\" value=\"").concat(csrfToken, "\" type=\"hidden\" />");
   } // Must trigger submit by click on a button, else "submit" event handler won't work!
   // https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormElement/submit
 

data/app/assets/stylesheets/blacklight/_constraints.scss

@@ -1,6 +1,8 @@
 .constraints-container {
   @extend .mb-2;
-  @extend .d-flex;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.5rem 0.25rem;
 }
 
 .applied-filter {

data/app/assets/stylesheets/blacklight/_controls.scss

@@ -1,5 +1,6 @@
 .search-widgets {
-  @extend .d-flex;
+  display: flex;
+
   > * {
     @extend .mx-1;
   }

data/app/components/blacklight/constraints_component.rb

@@ -63,14 +63,10 @@ module Blacklight
 
       Deprecation.silence(Blacklight::SearchState) do
         @search_state.filters.map do |facet|
-          missing_facet = @search_state.params.dig("f", "-#{facet.key}:").present?
           facet.values.map do |val|
-            next if val.blank? && !missing_facet
+            next if val.blank?
 
-            if missing_facet && val.blank?
-              missing = I18n.t("blacklight.search.facets.missing")
-              yield facet_item_presenter(facet.config, missing, facet.key)
-            elsif val.is_a?(Array)
+            if val.is_a?(Array)
               yield inclusive_facet_item_presenter(facet.config, val, facet.key) if val.any?(&:present?)
             else
               yield facet_item_presenter(facet.config, val, facet.key)
@@ -90,7 +86,7 @@ module Blacklight
     end
 
     def facet_item_presenter(facet_config, facet_item, facet_field)
-      Blacklight::FacetItemPresenter.new(facet_item, facet_config, @view_context, facet_field)
+      (facet_config.item_presenter || Blacklight::FacetItemPresenter).new(facet_item, facet_config, @view_context, facet_field)
     end
 
     def inclusive_facet_item_presenter(facet_config, facet_item, facet_field)

data/app/components/blacklight/facet_field_checkboxes_component.rb

@@ -17,7 +17,7 @@ module Blacklight
       return to_enum(:presenters) unless block_given?
 
       @facet_field.paginator.items.each do |item|
-        yield Blacklight::FacetItemPresenter.new(item, @facet_field.facet_field, @view_context, @facet_field.key, @facet_field.search_state)
+        yield (@facet_field.facet_field.item_presenter || Blacklight::FacetItemPresenter).new(item, @facet_field.facet_field, @view_context, @facet_field.key, @facet_field.search_state)
       end
     end
   end

data/app/components/blacklight/facet_item_pivot_component.rb

@@ -78,7 +78,7 @@ module Blacklight
     end
 
     def facet_item_presenter(facet_item)
-      Blacklight::FacetItemPresenter.new(facet_item, @facet_item.facet_config, @view_context, @facet_item.facet_field, @facet_item.search_state)
+      (@facet_item.facet_config.item_presenter || Blacklight::FacetItemPresenter).new(facet_item, @facet_item.facet_config, @view_context, @facet_item.facet_field, @facet_item.search_state)
     end
   end
 end

data/app/components/blacklight/system/modal_component.html.erb

@@ -6,8 +6,8 @@
       <h1 class="modal-title"><%= title %></h1>
     <% end) %>
 
-    <button type="button" class="blacklight-modal-close btn-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
-      <span aria-hidden="true">&times;</span>
+    <button type="button" class="blacklight-modal-close btn-close close" data-bs-dismiss="modal" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+      <span aria-hidden="true" class="visually-hidden">&times;</span>
     </button>
   </div>
 

data/app/controllers/concerns/blacklight/catalog.rb

@@ -260,7 +260,7 @@ module Blacklight::Catalog
 
   # Email Action (this will render the appropriate view on GET requests and process the form and send the email on POST requests)
   def email_action documents
-    mail = RecordMailer.email_record(documents, { to: params[:to], message: params[:message] }, url_options)
+    mail = RecordMailer.email_record(documents, { to: params[:to], message: params[:message], config: blacklight_config }, url_options)
     if mail.respond_to? :deliver_now
       mail.deliver_now
     else
@@ -271,7 +271,7 @@ module Blacklight::Catalog
   # SMS action (this will render the appropriate view on GET requests and process the form and send the email on POST requests)
   def sms_action documents
     to = "#{params[:to].gsub(/[^\d]/, '')}@#{params[:carrier]}"
-    mail = RecordMailer.sms_record(documents, { to: to }, url_options)
+    mail = RecordMailer.sms_record(documents, { to: to, config: blacklight_config }, url_options)
     if mail.respond_to? :deliver_now
       mail.deliver_now
     else

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -319,7 +319,7 @@ module Blacklight::FacetsHelperBehavior
   end
 
   def facet_item_presenter(facet_config, facet_item, facet_field)
-    Blacklight::FacetItemPresenter.new(facet_item, facet_config, self, 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)

data/app/helpers/blacklight/render_partials_helper_behavior.rb

@@ -9,7 +9,10 @@ module Blacklight::RenderPartialsHelperBehavior
   # @param [Hash] locals to pass to the render call
   # @return [String]
   def render_document_index documents = nil, locals = {}
-    documents ||= @response.documents
+    unless documents
+      Deprecation.warn(self, "Calling render_document_index without documents is deprecated and will be removed in version 8")
+      documents = @response.documents
+    end
     render_document_index_with_view(document_index_view_type, documents, locals)
   end
 

data/app/javascript/blacklight/core.js

@@ -1,4 +1,4 @@
-Blacklight = function() {
+const Blacklight = function() {
   var buffer = new Array;
   return {
     onLoad: function(func) {
@@ -13,7 +13,9 @@ Blacklight = function() {
 
     listeners: function () {
       var listeners = [];
-      if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
+      if (typeof Turbo !== 'undefined') {
+        listeners.push('turbo:load');
+      } else if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
         // Turbolinks 5
         if (Turbolinks.BrowserAdapter) {
           listeners.push('turbolinks:load');
@@ -41,8 +43,12 @@ Blacklight.listeners().forEach(function(listener) {
 Blacklight.onLoad(function () {
   const elem = document.querySelector('.no-js');
 
+  // The "no-js" class may already have been removed because this function is
+  // run on every turbo:load event, in that case, it won't find an element.
   if (!elem) return;
 
   elem.classList.remove('no-js')
   elem.classList.add('js')
 })
+
+window.Blacklight = Blacklight

data/app/javascript/blacklight/modal.js

@@ -114,13 +114,13 @@ Blacklight.modal.onFailure = function(jqXHR, textStatus, errorThrown) {
             this.type + ' ' + this.url + "\n" + jqXHR.status + ': ' + errorThrown +
             '</pre></div>';
   $(Blacklight.modal.modalSelector).find('.modal-content').html(contents);
-  $(Blacklight.modal.modalSelector).modal('show');
+  Blacklight.modal.show();
 }
 
 Blacklight.modal.receiveAjax = function (contents) {
     // does it have a data- selector for container?
     // important we don't execute script tags, we shouldn't.
-    // code modelled off of JQuery ajax.load. https://github.com/jquery/jquery/blob/master/src/ajax/load.js?source=c#L62
+    // code modelled off of JQuery ajax.load. https://github.com/jquery/jquery/blob/main/src/ajax/load.js?source=c#L62
     var container =  $('<div>').
       append( jQuery.parseHTML(contents) ).find( Blacklight.modal.containerSelector ).first();
     if (container.length !== 0) {
@@ -135,7 +135,7 @@ Blacklight.modal.receiveAjax = function (contents) {
     // if they did preventDefault, don't show the dialog
     if (e.isDefaultPrevented()) return;
 
-    $(Blacklight.modal.modalSelector).modal('show');
+    Blacklight.modal.show();
 };
 
 
@@ -196,7 +196,7 @@ Blacklight.modal.checkCloseModal = function(event) {
   if ($(event.target).find(Blacklight.modal.modalCloseSelector).length) {
     var modalFlashes = $(this).find('.flash_messages');
 
-    $(event.target).modal('hide');
+    Blacklight.modal.hide(event.target);
     event.preventDefault();
 
     var mainFlashes = $('#main-flashes');
@@ -205,6 +205,22 @@ Blacklight.modal.checkCloseModal = function(event) {
   }
 }
 
+Blacklight.modal.hide = function(el) {
+  if (bootstrap.Modal.VERSION >= "5") {
+    bootstrap.Modal.getOrCreateInstance(el).hide();
+  } else {
+    $(el || Blacklight.modal.modalSelector).modal('hide');
+  }
+}
+
+Blacklight.modal.show = function(el) {
+  if (bootstrap.Modal.VERSION >= "5") {
+    bootstrap.Modal.getOrCreateInstance(el).show();
+  } else {
+    $(el || Blacklight.modal.modalSelector).modal('show');
+  }
+}
+
 Blacklight.onLoad(function() {
   Blacklight.modal.setupModal();
 });

data/app/models/concerns/blacklight/document/email.rb

@@ -2,13 +2,25 @@
 # This module provides the body of an email export based on the document's semantic values
 module Blacklight::Document::Email
   # Return a text string that will be the body of the email
-  def to_email_text
-    semantics = to_semantic_values
+  def to_email_text(config = nil)
     body = []
-    body << I18n.t('blacklight.email.text.title', value: semantics[:title].join(" ")) if semantics[:title].present?
-    body << I18n.t('blacklight.email.text.author', value: semantics[:author].join(" ")) if semantics[:author].present?
-    body << I18n.t('blacklight.email.text.format', value: semantics[:format].join(" ")) if semantics[:format].present?
-    body << I18n.t('blacklight.email.text.language', value: semantics[:language].join(" ")) if semantics[:language].present?
+
+    if config
+      body = config.email_fields.map do |name, field|
+        values = [self[name]].flatten
+        "#{field.label} #{values.join(' ')}" if self[name].present?
+      end
+    end
+
+    # Use to_semantic_values for backwards compatibility
+    if body.empty?
+      semantics = to_semantic_values
+      body << I18n.t('blacklight.email.text.title', value: semantics[:title].join(" ")) if semantics[:title].present?
+      body << I18n.t('blacklight.email.text.author', value: semantics[:author].join(" ")) if semantics[:author].present?
+      body << I18n.t('blacklight.email.text.format', value: semantics[:format].join(" ")) if semantics[:format].present?
+      body << I18n.t('blacklight.email.text.language', value: semantics[:language].join(" ")) if semantics[:language].present?
+    end
+
     return body.join("\n") unless body.empty?
   end
 end

data/app/models/concerns/blacklight/document/sms.rb

@@ -2,11 +2,23 @@
 # This module provides the body of an email export based on the document's semantic values
 module Blacklight::Document::Sms
   # Return a text string that will be the body of the email
-  def to_sms_text
-    semantics = to_semantic_values
+  def to_sms_text(config = nil)
     body = []
-    body << I18n.t('blacklight.sms.text.title', value: semantics[:title].first) if semantics[:title].present?
-    body << I18n.t('blacklight.sms.text.author', value: semantics[:author].first) if semantics[:author].present?
+
+    if config
+      body = config.sms_fields.map do |name, field|
+        values = [self[name]].flatten
+        "#{field.label} #{values.first}" if self[name].present?
+      end
+    end
+
+    # Use to_semantic_values for backwards compatibility
+    if body.empty?
+      semantics = to_semantic_values
+      body << I18n.t('blacklight.sms.text.title', value: semantics[:title].first) if semantics[:title].present?
+      body << I18n.t('blacklight.sms.text.author', value: semantics[:author].first) if semantics[:author].present?
+    end
+
     return body.join unless body.empty?
   end
 end

data/app/models/record_mailer.rb

@@ -3,7 +3,12 @@
 class RecordMailer < ActionMailer::Base
   def email_record(documents, details, url_gen_params)
     title = begin
-              documents.first.to_semantic_values[:title]
+              title_field = details[:config].email.title_field
+              if title_field
+                [documents.first[title_field]].flatten.first
+              else
+                documents.first.to_semantic_values[:title]
+              end
             rescue
               I18n.t('blacklight.email.text.default_title')
             end
@@ -14,6 +19,7 @@ class RecordMailer < ActionMailer::Base
 
     @documents      = documents
     @message        = details[:message]
+    @config         = details[:config]
     @url_gen_params = url_gen_params
 
     mail(to: details[:to],  subject: subject)
@@ -21,7 +27,9 @@ class RecordMailer < ActionMailer::Base
 
   def sms_record(documents, details, url_gen_params)
     @documents      = documents
+    @config         = details[:config]
     @url_gen_params = url_gen_params
+
     mail(to: details[:to], subject: "")
   end
 end

data/app/presenters/blacklight/facet_item_presenter.rb

@@ -56,6 +56,8 @@ module Blacklight
         view_context.public_send(facet_config.helper_method, label_value)
       elsif facet_config.query && facet_config.query[label_value]
         facet_config.query[label_value][:label]
+      elsif value == Blacklight::SearchState::FilterField::MISSING
+        I18n.t("blacklight.search.facets.missing")
       elsif facet_config.date
         localization_options = facet_config.date == true ? {} : facet_config.date
         I18n.l(Time.zone.parse(label_value), **localization_options)

data/app/views/bookmarks/index.html.erb

@@ -14,7 +14,7 @@
     <%= render 'sort_and_per_page' %>
     <%= render partial: 'tools', locals: { document_list: @response.documents } %>
     <h2 class='section-heading sr-only visually-hidden'><%= t('blacklight.bookmarks.list_title') %></h2>
-    <%= render_document_index %>
+    <%= render_document_index @response.documents %>
     <%= render 'results_pagination' %>
   <% end %>
 </div>

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

@@ -26,7 +26,7 @@
 <%- elsif render_grouped_response? %>
   <%= Deprecation.silence(Blacklight::RenderPartialsHelperBehavior) { render_grouped_document_index } %>
 <%- else %>
-  <%= render_document_index %>
+  <%= render_document_index @response.documents %>
 <%- end %>
 
 <%= render 'results_pagination' %>