blacklight 9.0.0.beta2 → 9.0.0.beta4

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

@@ -239,7 +239,7 @@ module Blacklight::Catalog
     mail.deliver_now
   end
 
-  def validate_sms_params
+  def sms_params_valid?
     if params[:to].blank?
       flash[:error] = I18n.t('blacklight.sms.errors.to.blank')
     elsif params[:carrier].blank?
@@ -252,12 +252,14 @@ module Blacklight::Catalog
 
     flash[:error].blank?
   end
+  alias validate_sms_params sms_params_valid?
+  Blacklight.deprecation.deprecate_methods(Blacklight::Catalog, validate_sms_params: 'use Catalog#sms_params_valid? instead')
 
   def sms_mappings
     Blacklight::Engine.config.blacklight.sms_mappings
   end
 
-  def validate_email_params
+  def email_params_valid?
     if params[:to].blank?
       flash[:error] = I18n.t('blacklight.email.errors.to.blank')
     elsif !params[:to].match(Blacklight::Engine.config.blacklight.email_regexp)
@@ -266,6 +268,8 @@ module Blacklight::Catalog
 
     flash[:error].blank?
   end
+  alias validate_email_params email_params_valid?
+  Blacklight.deprecation.deprecate_methods(Blacklight::Catalog, validate_email_params: 'use Catalog#email_params_valid? instead')
 
   def start_new_search_session?
     action_name == "index"

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -169,7 +169,7 @@ module Blacklight::CatalogHelperBehavior
       constraints += search_state.filters.collect { |filter| render_search_to_page_title_filter(filter.key, filter.values) }
     end
 
-    constraints.join(' / ')
+    constraints.join(t('blacklight.search.page_title.joiner'))
   end
 
   ##

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

@@ -1,12 +1,17 @@
 import CheckboxSubmit from 'blacklight-frontend/checkbox_submit'
 
 const BookmarkToggle = (e) => {
-  if (e.target.matches('[data-checkboxsubmit-target="checkbox"]')) {
-    const form = e.target.closest('form')
+  const elementType = e.target.getAttribute('data-checkboxsubmit-target');
+  if (elementType == 'checkbox' || elementType == 'label') {
+    const form = e.target.closest('form');
     if (form) new CheckboxSubmit(form).clicked(e);
+    if (e.code == 'Space') e.preventDefault();
   }
 };
 
 document.addEventListener('click', BookmarkToggle);
+document.addEventListener('keydown', function (e) {
+  if (e.key === 'Enter' || e.code == 'Space') { BookmarkToggle(e); } }
+);
 
 export default BookmarkToggle

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

@@ -43,6 +43,9 @@ export default class CheckboxSubmit {
       this.bookmarksCounter().forEach(counter => {
         counter.innerHTML = json.bookmarks.count;
       });
+
+      var e = new CustomEvent('bookmark.blacklight', { detail: { checked: this.checked } });
+      window.dispatchEvent(e)
     }).catch((error) => {
       this.handleError(error)
     })
@@ -77,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/modal.js

@@ -81,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">
@@ -135,7 +134,7 @@ const Modal = (() => {
   modal.modalAjaxLinkClick = function(e) {
     e.preventDefault();
     const href = e.target.closest('a').getAttribute('href')
-    fetch(href)
+    fetch(href, { headers: { 'X-Requested-With': 'XMLHttpRequest' }})
       .then(response => {
          if (!response.ok) {
            throw new TypeError("Request failed");

data/app/presenters/blacklight/json_presenter.rb

@@ -11,7 +11,7 @@ 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
 
     delegate :documents, to: :@response
 
@@ -23,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/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/facet.html.erb

@@ -2,7 +2,7 @@
   <% component.with_title { facet_field_label(@facet.key) } %>
   <% view_config = blacklight_config.view_config(document_index_view_type) %>
 
-  <%= render Blacklight::Facets::FiltersComponent.new(presenter: @presenter) %>
+  <%= render view_config.facet_filters_component.new(presenter: @presenter) %>
 
   <div class="facet-pagination top d-flex flex-wrap w-100 justify-content-between border-bottom pb-3 mb-3">
     <%= render view_config.facet_pagination_component.new(facet_field: @presenter) %>

data/config/locales/blacklight.ar.yml

@@ -36,29 +36,29 @@ ar:
       apa: الجمعية الأمريكية لعلم النفس APA
       chicago: شيكاغو
       mla: جمعية اللغة الحديثة MLA
-    did_you_mean: 'هل كنت تقصد كتابة: %{options}؟'
+    did_you_mean: "هل كنت تقصد كتابة: %{options}؟"
     email:
       errors:
         to:
           blank: يجب إدخال مُستلم من أجل إرسال هذه الرسالة
           invalid: يجب إدخال عنوان بريد إلكتروني صحيح
       form:
-        message: 'الرسالة:'
+        message: "الرسالة:"
         submit: إرسال
         title: إرسله عبرالبريد الإلكتروني
-        to: 'بريد إلكتروني:'
+        to: "بريد إلكتروني:"
       success: تم إرسال البريد الإلكتروني
       text:
         default_title: لا يوجد
-        message: 'الرسالة: %{message}'
+        message: "الرسالة: %{message}"
         subject:
           few: سجلات المادة
           many: سجلات المادة
-          one: 'سجل المادة: %{title}'
+          one: "سجل المادة: %{title}"
           other: سجلات المادة
           two: سجلان للمادة
           zero: لا يوجد سجل للمادة
-        url: 'الرابط: %{url}'
+        url: "الرابط: %{url}"
     entry_name:
       default: إدخال
       grouped:
@@ -118,9 +118,9 @@ ar:
       filters:
         label: "%{label}:"
         remove:
-          label_value: 'إزالة القيد %{label}: %{value}'
+          label_value: "إزالة القيد %{label}: %{value}"
           value: إزالة القيد %{value}
-        title: 'لقد بحثت عن:'
+        title: "لقد بحثت عن:"
       form:
         search:
           label: ابحث عن
@@ -139,6 +139,7 @@ ar:
         constraint: "%{label}: %{value}"
         many_constraint_values: تم تحديد %{values}
         title: "%{constraints} - %{application_name} نتائج البحث"
+        joiner: " / "
       pagination:
         title: تصفح النتائج
       pagination_info:
@@ -171,7 +172,7 @@ ar:
       start_over: البدء من جديد
       view:
         list: قائمة
-      view_title: 'عرض النتائج ك: '
+      view_title: "عرض النتائج ك: "
       zero_results:
         modify_search: حاول تعديل معايير البحث
         search_everything: حاول البحث عن كل شيء
@@ -208,10 +209,10 @@ ar:
         carrier_prompt: يرجى تحديد شركة الاتصالات
         submit: إرسال
         title: إرسله كرسالة نصية قصيرة
-        to: 'رقم الهاتف:'
+        to: "رقم الهاتف:"
       success: تم الإرسال كرسالة نصية قصيرة
       text:
-        url: 'الرابط: %{url}'
+        url: "الرابط: %{url}"
     tools:
       citation: استشهاد مرجعي
       clear: مسح

data/config/locales/blacklight.ca.yml

@@ -134,6 +134,7 @@ ca:
         title: "%{constraints} - %{application_name} Resultats de la cerca"
         constraint: "%{label}: %{value}"
         many_constraint_values: "%{values} seleccionat"
+        joiner: " / "
       header: "Cerca"
       search_constraints_header: "Filtres de la cerca"
       search_results: "Resultats de la cerca"

data/config/locales/blacklight.de.yml

@@ -32,25 +32,25 @@ de:
       apa: APA
       chicago: Chicago
       mla: MLA
-    did_you_mean: 'Meinten Sie: %{options}?'
+    did_you_mean: "Meinten Sie: %{options}?"
     email:
       errors:
         to:
           blank: Sie müssen einen Empfänger eingeben, um diese Mitteilung zu schicken
           invalid: Sie müssen eine gültige E-Mail-Addresse eingeben
       form:
-        message: 'Nachricht:'
+        message: "Nachricht:"
         submit: Senden
         title: E-Mail
-        to: 'E-Mail-Adresse:'
+        to: "E-Mail-Adresse:"
       success: E-Mail verschickt
       text:
         default_title: N/A
-        message: 'Mitteilung: %{message}'
+        message: "Mitteilung: %{message}"
         subject:
-          one: 'Artikeldatensatz: %{title}'
+          one: "Artikeldatensatz: %{title}"
           other: Artikeldatensätze
-        url: 'URL: %{url}'
+        url: "URL: %{url}"
     entry_name:
       default:
         one: Eintrag
@@ -92,7 +92,7 @@ de:
           close: Facetten ausblenden
           open: Facetten zeigen
         missing:
-        - fehlt
+          - fehlt
         more_html: mehr <span class="visually-hidden">%{field_name}</span> »
         pivot:
           hide: Schließen
@@ -109,9 +109,9 @@ de:
       filters:
         label: "%{label}:"
         remove:
-          label_value: 'Filter %{label}: %{value} entfernen'
+          label_value: "Filter %{label}: %{value} entfernen"
           value: Filter %{value} entfernen
-        title: 'Sie suchten nach:'
+        title: "Sie suchten nach:"
       form:
         search:
           label: suchen nach
@@ -130,6 +130,7 @@ de:
         constraint: "%{label}: %{value}"
         many_constraint_values: "%{values} ausgewählt"
         title: "%{constraints} - %{application_name} Suchergebnisse"
+        joiner: " / "
       pagination:
         title: Ergebnisse Navigation
       pagination_info:
@@ -158,7 +159,7 @@ de:
       start_over: Neu anfangen
       view:
         list: Liste
-      view_title: 'Ergebnisse ansehen als: '
+      view_title: "Ergebnisse ansehen als: "
       zero_results:
         modify_search: Ändern Sie Ihre Suche
         search_everything: Suchen Sie nach allem
@@ -195,10 +196,10 @@ de:
         carrier_prompt: Bitte wählen Sie Ihren Netzbetreiber aus
         submit: Schicken
         title: SMS
-        to: 'Telefonnummer:'
+        to: "Telefonnummer:"
       success: SMS verschickt
       text:
-        url: 'Link: %{url}'
+        url: "Link: %{url}"
     tools:
       citation: Zitieren
       clear: Löschen

data/config/locales/blacklight.en.yml

@@ -148,6 +148,7 @@ en:
         constraint: "%{label}: %{value}"
         many_constraint_values: "%{values} selected"
         title: "%{constraints} - %{application_name} Search Results"
+        joiner: " / "
       pagination:
         title: Results navigation
       pagination_info:

data/config/locales/blacklight.es.yml

@@ -39,18 +39,18 @@ es:
           blank: Debe introducir un destinatario para enviar este mensaje
           invalid: Debe entrar un email válido
       form:
-        message: 'Mensaje:'
+        message: "Mensaje:"
         submit: Enviar
         title: Enviar
-        to: 'Email:'
+        to: "Email:"
       success: Email enviado
       text:
         default_title: N/A
-        message: 'Mensaje: %{message}'
+        message: "Mensaje: %{message}"
         subject:
-          one: 'Ficha artículo: %{title}'
+          one: "Ficha artículo: %{title}"
           other: Ficha artículos
-        url: 'URL: %{url}'
+        url: "URL: %{url}"
     entry_name:
       default:
         one: entrada
@@ -108,9 +108,9 @@ es:
       filters:
         label: "%{label}:"
         remove:
-          label_value: 'Eliminar la restricción%{label}: %{value}'
+          label_value: "Eliminar la restricción%{label}: %{value}"
           value: Eliminar la restricción %{value}
-        title: 'Usted ha buscado:'
+        title: "Usted ha buscado:"
       form:
         search:
           label: buscar
@@ -129,6 +129,7 @@ es:
         constraint: "%{label}: %{value}"
         many_constraint_values: "%{values} seleccionado"
         title: "%{constraints} - %{application_name} Resultados de la búsqueda"
+        joiner: " / "
       pagination:
         title: Resultados de navegación
       pagination_info:
@@ -157,7 +158,7 @@ es:
       start_over: Volver a empezar
       view:
         list: Lista
-      view_title: 'Ver Resultados por: '
+      view_title: "Ver Resultados por: "
       zero_results:
         modify_search: Intente modificar su búsqueda
         search_everything: Pruebe a buscar de todo
@@ -194,10 +195,10 @@ es:
         carrier_prompt: Por favor, seleccione su compañía telefónica
         submit: Enviar
         title: Enviar SMS
-        to: 'Número de teléfono:'
+        to: "Número de teléfono:"
       success: SMS enviado
       text:
-        url: 'Link: %{url}'
+        url: "Link: %{url}"
     tools:
       citation: Cité
       clear: Borrar

data/config/locales/blacklight.fr.yml

@@ -32,25 +32,25 @@ fr:
       apa: APA
       chicago: Chicago
       mla: MLA
-    did_you_mean: 'Essayez peut-être avec : %{options}'
+    did_you_mean: "Essayez peut-être avec : %{options}"
     email:
       errors:
         to:
           blank: Vous devez saisir l'adresse de votre destinataire.
           invalid: Vous devez saisir une adresse correcte.
       form:
-        message: 'Message :'
+        message: "Message :"
         submit: Envoyer
         title: Envoyer par courriel
-        to: 'Courriel :'
+        to: "Courriel :"
       success: Message envoyé
       text:
         default_title: N/A
-        message: 'Message : %{message}'
+        message: "Message : %{message}"
         subject:
-          one: 'Une référence : %{title}'
+          one: "Une référence : %{title}"
           other: Des références bibliographiques
-        url: 'URL : %{url}'
+        url: "URL : %{url}"
     entry_name:
       default:
         one: résultat
@@ -108,9 +108,9 @@ fr:
       filters:
         label: "%{label}:"
         remove:
-          label_value: 'Supprimer la restriction %{label}: %{value}'
+          label_value: "Supprimer la restriction %{label}: %{value}"
           value: Supprimer la restriction %{value}
-        title: 'Vous avez demandé :'
+        title: "Vous avez demandé :"
       form:
         search:
           label: Rechercher
@@ -129,6 +129,7 @@ fr:
         constraint: "%{label}: %{value}"
         many_constraint_values: "%{values} sélectionné"
         title: "%{constraints} - %{application_name} Résultats de recherche"
+        joiner: " / "
       pagination:
         title: Navigation dans les résultats
       pagination_info:
@@ -157,7 +158,7 @@ fr:
       start_over: Accueil
       view:
         list: Liste
-      view_title: 'Affichage: '
+      view_title: "Affichage: "
       zero_results:
         modify_search: Essayez de modifier votre requête de recherche
         search_everything: essayez de rechercher tout
@@ -194,10 +195,10 @@ fr:
         carrier_prompt: Veuillez choisir votre opérateur
         submit: Envoyer
         title: Envoyer par SMS
-        to: 'Numéro de téléphone :'
+        to: "Numéro de téléphone :"
       success: SMS envoyé
       text:
-        url: 'Lien : %{url}'
+        url: "Lien : %{url}"
     tools:
       citation: Citer
       clear: Effacer

data/config/locales/blacklight.hu.yml

@@ -32,25 +32,25 @@ hu:
       apa: APA
       chicago: Chicago
       mla: MLA
-    did_you_mean: 'Arra gondolt, hogy: %{options}?'
+    did_you_mean: "Arra gondolt, hogy: %{options}?"
     email:
       errors:
         to:
           blank: Kérjük az üzenet elküldéséhez adja meg a címzettet
           invalid: Kérjük érvényes email címet adjon meg
       form:
-        message: 'Üzenet:'
+        message: "Üzenet:"
         submit: Küldés
         title: Email küldése
-        to: 'Email:'
+        to: "Email:"
       success: Email elküldve
       text:
         default_title: N/A
-        message: 'Üzenet: %{message}'
+        message: "Üzenet: %{message}"
         subject:
-          one: 'Adatrekord: %{title}'
+          one: "Adatrekord: %{title}"
           other: Adatrekordok
-        url: 'URL: %{url}'
+        url: "URL: %{url}"
     entry_name:
       default: bejegyzés
       grouped:
@@ -106,9 +106,9 @@ hu:
       filters:
         label: "%{label}:"
         remove:
-          label_value: 'Feltétel eltávolítása %{label}: %{value}'
+          label_value: "Feltétel eltávolítása %{label}: %{value}"
           value: Feltételek eltávolítása %{value}
-        title: 'Ön ezt kereste:'
+        title: "Ön ezt kereste:"
       form:
         search:
           label: keresés
@@ -127,6 +127,7 @@ hu:
         constraint: "%{label}: %{value}"
         many_constraint_values: "%{values} kiválasztva"
         title: "%{constraints} - %{application_name} Keresés eredményei"
+        joiner: " / "
       pagination:
         title: Eredmény navigáció
       pagination_info:
@@ -155,11 +156,11 @@ hu:
       start_over: Újrakezdés
       view:
         list: Lista
-      view_title: 'Eredmények megtekintése mint: '
+      view_title: "Eredmények megtekintése mint: "
       zero_results:
         modify_search: Próbálja módosítani keresését
         search_everything: Próbálja meg a keresést az összes mezőben
-        search_fields: 'Ön a következő mező alapján keresett: %{search_fields}'
+        search_fields: "Ön a következő mező alapján keresett: %{search_fields}"
         title: Az Ön keresése nem hozott eredményt
         use_fewer_keywords: Kezdetben használjon kevesebb kulcsszavat, majd finomítsa keresését a bal oldali szűrőlinkekkel.
     search_history:
@@ -192,10 +193,10 @@ hu:
         carrier_prompt: Kérjük válassza ki a szolgáltatót
         submit: Küldés
         title: Küldés SMS-ben
-        to: 'Telefonszám:'
+        to: "Telefonszám:"
       success: SMS elküldve
       text:
-        url: 'Link: %{url}'
+        url: "Link: %{url}"
     tools:
       citation: Hivatkozás
       clear: Eltávolítás

data/config/locales/blacklight.it.yml

@@ -32,25 +32,25 @@ it:
       apa: APA
       chicago: Chicago
       mla: MLA
-    did_you_mean: 'Intendevi digitare: %{options}?'
+    did_you_mean: "Intendevi digitare: %{options}?"
     email:
       errors:
         to:
           blank: Inserisci un destinatario per inviare il messaggio
           invalid: L'indirizzo e-mail inserito non è valido
       form:
-        message: 'Messaggio:'
+        message: "Messaggio:"
         submit: Invia
         title: Invia per e-mail
-        to: 'E-mail:'
+        to: "E-mail:"
       success: Messaggio inviato
       text:
         default_title: N/A
-        message: 'Messaggio: %{message}'
+        message: "Messaggio: %{message}"
         subject:
-          one: 'Numero di scheda: %{title}'
+          one: "Numero di scheda: %{title}"
           other: Numeri di scheda
-        url: 'URL: %{url}'
+        url: "URL: %{url}"
     entry_name:
       default:
         one: termine di ricerca
@@ -92,7 +92,7 @@ it:
           close: Nascondi sfaccettature
           open: Mostra sfaccettature
         missing:
-        - Mancante
+          - Mancante
         more_html: altri <span class="sr-only visually-hidden">%{field_name}</span> »
         pivot:
           hide: Chiudi
@@ -109,9 +109,9 @@ it:
       filters:
         label: "%{label}:"
         remove:
-          label_value: 'Cancella il filtro %{label}: %{value}'
+          label_value: "Cancella il filtro %{label}: %{value}"
           value: Cancella il filtro %{value}
-        title: 'Hai cercato per:'
+        title: "Hai cercato per:"
       form:
         search:
           label: cerca per
@@ -130,6 +130,7 @@ it:
         constraint: "%{label}: %{value}"
         many_constraint_values: "%{values} selezionato"
         title: "%{constraints} - %{application_name} Risultati della ricerca"
+        joiner: " / "
       pagination:
         title: Navigazione nei risultati
       pagination_info:
@@ -158,7 +159,7 @@ it:
       start_over: Nuova ricerca
       view:
         list: Lista
-      view_title: 'Visualizza i risultati come: '
+      view_title: "Visualizza i risultati come: "
       zero_results:
         modify_search: Modifica la ricerca
         search_everything: prova a cercare in tutti i campi
@@ -195,10 +196,10 @@ it:
         carrier_prompt: Indicare l'operatore
         submit: Inviare
         title: Invia per SMS
-        to: 'Numero di telefono:'
+        to: "Numero di telefono:"
       success: SMS inviato
       text:
-        url: 'Link: %{url}'
+        url: "Link: %{url}"
     tools:
       citation: Cita
       clear: Cancella