blacklight 9.0.0.beta1 → 9.0.0

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,8 +92,8 @@ it:
           close: Nascondi sfaccettature
           open: Mostra sfaccettature
         missing:
-        - Mancante
-        more_html: altri <span class="sr-only visually-hidden">%{field_name}</span> »
+          - Mancante
+        more_html: altri <span class="visually-hidden">%{field_name}</span> »
         pivot:
           hide: Chiudi
           show: Apri
@@ -103,15 +103,15 @@ it:
           count: Ordina per numero
           index: Ordina A-Z
         suggest:
-          label: Filter %{field_label}
-          placeholder: Filter...
+          label: Filtro %{field_label}
+          placeholder: Filtro...
         title: Affina la ricerca
       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: "Le tue selezioni:"
       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:
@@ -146,7 +147,6 @@ it:
         submit: Aggiorna
         title: Risultati per pagina
       rss_feed: RSS per i risultati
-      search_constraints_header: Ricerca
       search_results: Risultati della ricerca
       show:
         label: "%{label}:"
@@ -158,7 +158,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 +195,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

data/config/locales/blacklight.nl.yml

@@ -32,25 +32,25 @@ nl:
       apa: APA
       chicago: Chicago
       mla: MLA
-    did_you_mean: 'Bedoelde u: %{options}?'
+    did_you_mean: "Bedoelde u: %{options}?"
     email:
       errors:
         to:
           blank: U dient een ontvanger voor dit bericht op te geven.
           invalid: U dient een geldig e-mailadres op te geven.
       form:
-        message: 'Boodschap:'
+        message: "Boodschap:"
         submit: Verzenden
         title: Email dit
-        to: 'Email:'
+        to: "Email:"
       success: Email Verzonden
       text:
         default_title: N/A
-        message: 'Boodschap: %{message}'
+        message: "Boodschap: %{message}"
         subject:
-          one: 'Item Record: %{title}'
+          one: "Item Record: %{title}"
           other: Item records
-        url: 'URL: %{url}'
+        url: "URL: %{url}"
     entry_name:
       default: ingang
       grouped:
@@ -100,15 +100,15 @@ nl:
           count: Numeriek sorteren
           index: A-Z Sorteren
         suggest:
-          label: Filter %{field_label}
+          label: Filteren %{field_label}
           placeholder: Filter...
         title: Verfijn uw zoekopdracht
       filters:
         label: "%{label}:"
         remove:
-          label_value: 'Verwijder zoekfilter %{label}: %{value}'
+          label_value: "Verwijder zoekfilter %{label}: %{value}"
           value: Verwijder zoekfilter %{value}
-        title: 'U zocht op:'
+        title: "Uw selecties:"
       form:
         search:
           label: zoeken op
@@ -127,6 +127,7 @@ nl:
         constraint: "%{label}: %{value}"
         many_constraint_values: "%{values} geselecteerd"
         title: "%{constraints} - %{application_name} Zoek resultaten"
+        joiner: " / "
       pagination:
         title: Zoeken navigatie
       pagination_info:
@@ -143,7 +144,6 @@ nl:
         submit: Update
         title: Toon aantal zoekresultaten per pagina
       rss_feed: RSS voor zoekresultaten
-      search_constraints_header: Zoek filters
       search_results: Zoek resultaten
       show:
         label: "%{label}:"
@@ -155,7 +155,7 @@ nl:
       start_over: Start Opnieuw
       view:
         list: Lijst
-      view_title: 'Bekijk resultaten als: '
+      view_title: "Bekijk resultaten als: "
       zero_results:
         modify_search: Probeer uw zoekopdracht aan te passen
         search_everything: probeer door alles te zoeken
@@ -192,10 +192,10 @@ nl:
         carrier_prompt: Gelieve uw carrier op te geven.
         submit: Verzenden
         title: SMS dit
-        to: 'Telefoonnummer:'
+        to: "Telefoonnummer:"
       success: SMS Verzonden
       text:
-        url: 'Link: %{url}'
+        url: "Link: %{url}"
     tools:
       citation: Citeer
       clear: Leeg maken

data/config/locales/blacklight.pt-BR.yml

@@ -32,25 +32,25 @@ pt-BR:
       apa: APA
       chicago: Chicago
       mla: MLA
-    did_you_mean: 'Você quis dizer: %{options}?'
+    did_you_mean: "Você quis dizer: %{options}?"
     email:
       errors:
         to:
           blank: Você precisa especificar um destinaário para enviar esta mensagem
           invalid: Verifique seu endereço de email
       form:
-        message: 'Mensagem:'
+        message: "Mensagem:"
         submit: Enviar
         title: Enviar por Email
-        to: 'Email:'
+        to: "Email:"
       success: Email Enviado
       text:
         default_title: N/A
-        message: 'Mensagem: %{message}'
+        message: "Mensagem: %{message}"
         subject:
-          one: 'Item: %{title}'
+          one: "Item: %{title}"
           other: Itens
-        url: 'URL: %{url}'
+        url: "URL: %{url}"
     entry_name:
       default: registro
       grouped:
@@ -90,7 +90,7 @@ pt-BR:
           close: Ocultar facetas
           open: Mostrar facetas
         missing:
-        - Ausência
+          - Ausência
         more_html: mais <span class="visually-hidden">%{field_name}</span> »
         pivot:
           hide: Fechar
@@ -101,15 +101,15 @@ pt-BR:
           count: Ordenar por Número
           index: Ordem Alfabética A-Z
         suggest:
-          label: Filter %{field_label}
-          placeholder: Filter...
+          label: Filtro %{field_label}
+          placeholder: Filtro...
         title: Filtre sua busca
       filters:
         label: "%{label}:"
         remove:
-          label_value: 'Remover %{label}: %{value}'
+          label_value: "Remover %{label}: %{value}"
           value: Remover filtro %{value}
-        title: 'Sua busca por:'
+        title: "Suas seleções:"
       form:
         search:
           label: busca
@@ -128,6 +128,7 @@ pt-BR:
         constraint: "%{label}: %{value}"
         many_constraint_values: "%{values} selecionado"
         title: "%{constraints} - %{application_name} Resultado da Busca"
+        joiner: " / "
       pagination:
         title: Navegação nos Resultados
       pagination_info:
@@ -144,7 +145,6 @@ pt-BR:
         submit: Atualizar
         title: Número de resultados para mostrar por página
       rss_feed: RSS para resultadoss
-      search_constraints_header: Busca
       search_results: Resultados da Busca
       show:
         label: "%{label}:"
@@ -156,7 +156,7 @@ pt-BR:
       start_over: refazer busca
       view:
         list: Lista
-      view_title: 'Ver resultados como: '
+      view_title: "Ver resultados como: "
       zero_results:
         modify_search: Tente modificar sua busca
         search_everything: tente buscar em tudo
@@ -193,10 +193,10 @@ pt-BR:
         carrier_prompt: Selecione a Operadora
         submit: Enviar
         title: Enviar por SMS
-        to: 'Celular:'
+        to: "Celular:"
       success: SMS Enviado
       text:
-        url: 'Link: %{url}'
+        url: "Link: %{url}"
     tools:
       citation: Citar
       clear: Limpar

data/config/locales/blacklight.sq.yml

@@ -32,25 +32,25 @@ sq:
       apa: APA
       chicago: Chicago
       mla: MLA
-    did_you_mean: 'A keni menduar: %{options}?'
+    did_you_mean: "A keni menduar: %{options}?"
     email:
       errors:
         to:
           blank: Duhet të shkruash një pranues për të dëguar mesazh
           invalid: Duhet të shkruash një email adresë valide
       form:
-        message: 'Mesazhi:'
+        message: "Mesazhi:"
         submit: Dërgo
         title: Dërgo Email
-        to: 'Email:'
+        to: "Email:"
       success: Emaili u dëgua
       text:
         default_title: N/A
-        message: 'Mesazhi: %{message}'
+        message: "Mesazhi: %{message}"
         subject:
-          one: 'Item Record: %{title}'
+          one: "Item Record: %{title}"
           other: Item records
-        url: 'URL: %{url}'
+        url: "URL: %{url}"
     entry_name:
       default: entry
       grouped:
@@ -100,15 +100,15 @@ sq:
           count: Renditja numerike
           index: A-Z Renditja
         suggest:
-          label: Filter %{field_label}
-          placeholder: Filter...
+          label: Filtri %{field_label}
+          placeholder: Filtro...
         title: Kufizo këkimin
       filters:
         label: "%{label}:"
         remove:
-          label_value: 'Fshij kufizimin %{label}: %{value}'
+          label_value: "Fshij kufizimin %{label}: %{value}"
           value: Fshij kufizimin %{value}
-        title: 'Ju keni kërkuar për:'
+        title: "Zgjedhjet tuaja:"
       form:
         search:
           label: kërko për
@@ -127,6 +127,7 @@ sq:
         constraint: "%{label}: %{value}"
         many_constraint_values: "%{values} zgjedhura"
         title: "%{constraints} - %{application_name} Rezultatet e kërkimit"
+        joiner: " / "
       pagination:
         title: Navigimi i rezultateteve
       pagination_info:
@@ -143,7 +144,6 @@ sq:
         submit: Përditëso
         title: Numri i rezultateve që do të shfaqen për faqe
       rss_feed: RSS për rezultatet
-      search_constraints_header: Kufizimet e kërkimit
       search_results: Rezultatet e kërkimit
       show:
         label: "%{label}:"
@@ -155,7 +155,7 @@ sq:
       start_over: Fillo nga e para
       view:
         list: List
-      view_title: 'Shiko rezultatin si: '
+      view_title: "Shiko rezultatin si: "
       zero_results:
         modify_search: Provo të ndryshosh kërkimin
         search_everything: provo të kërkosh çdo gjë
@@ -192,10 +192,10 @@ sq:
         carrier_prompt: Ju lutemi zgjedheni operatorin
         submit: Dërgo
         title: SMS
-        to: 'Numri i telefonit:'
+        to: "Numri i telefonit:"
       success: SMS-i u dëgua
       text:
-        url: 'Link: %{url}'
+        url: "Link: %{url}"
     tools:
       citation: Citati
       clear: Fshij

data/config/locales/blacklight.zh.yml

@@ -48,9 +48,9 @@ zh:
         default_title: 无
         message: 正文： %{message}
         subject:
-          one: '记录: %{title}'
+          one: "记录: %{title}"
           other: 记录
-        url: '网址: %{url}'
+        url: "网址: %{url}"
     entry_name:
       default: 条目
       grouped:
@@ -100,15 +100,15 @@ zh:
           count: 按数量排序
           index: 按字母排序
         suggest:
-          label: Filter %{field_label}
-          placeholder: Filter...
+          label: 过滤器 %{field_label}
+          placeholder: 筛选...
         title: 限定搜索
       filters:
         label: "%{label}:"
         remove:
-          label_value: '删除限定条件 %{label}: %{value}'
+          label_value: "删除限定条件 %{label}: %{value}"
           value: 删除限定条件 %{value}
-        title: 你在搜索：
+        title: 您的选择：
       form:
         search:
           label: 搜索
@@ -127,10 +127,11 @@ zh:
         constraint: "%{label}: %{value}"
         many_constraint_values: "%{values} 已选"
         title: "%{constraints} - %{application_name} 搜索结果"
+        joiner: " / "
       pagination:
         title: 搜索结果导航
       pagination_info:
-        no_items_found: '没有找到 %{entry_name} '
+        no_items_found: "没有找到 %{entry_name} "
         pages:
           one: "<strong>%{start_num}</strong> - <strong>%{end_num}</strong> 共 <strong>%{total_num}</strong>"
           other: "<strong>%{start_num}</strong> - <strong>%{end_num}</strong> 共 <strong>%{total_num}</strong>"
@@ -143,7 +144,6 @@ zh:
         submit: 更新
         title: 每页显示结果数
       rss_feed: 搜索结果RSS
-      search_constraints_header: 搜索条件
       search_results: 搜索结果
       show:
         label: "%{label}:"
@@ -155,7 +155,7 @@ zh:
       start_over: 重新开始
       view:
         list: 列表
-      view_title: '以如下方式察看搜索结果: '
+      view_title: "以如下方式察看搜索结果: "
       zero_results:
         modify_search: 请更改你的搜索条件
         search_everything: 试一试搜索所有记录
@@ -173,7 +173,7 @@ zh:
       page_title: 搜索历史 - %{application_name}
       recent: 你最近搜索历史
       save: 保存
-      title: ''
+      title: ""
     skip_links:
       first_result: 转到第一个搜索结果
       label: 跳过链接
@@ -192,10 +192,10 @@ zh:
         carrier_prompt: 请选择运营商
         submit: 发送
         title: 通过短信发送
-        to: '电话号码:'
+        to: "电话号码:"
       success: 已发送短信
       text:
-        url: '链接: %{url}'
+        url: "链接: %{url}"
     tools:
       citation: 引用
       clear: 清除

data/lib/blacklight/abstract_repository.rb

@@ -37,8 +37,8 @@ module Blacklight
 
     # Find multiple documents by their ids
     # @param [Hash] _params query parameters
-    def find_many(params, **kwargs)
-      search(params, **kwargs)
+    def find_many(params, **)
+      search(params, **)
     end
 
     ##

data/lib/blacklight/component.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'view_component/version'
+
 module Blacklight
   class Component < ViewComponent::Base
     class << self
@@ -9,9 +11,13 @@ module Blacklight
         @__vc_compiler = nil
       end
 
+      # This allows the host application to provide erb templates that override the templates
+      # provided by Blacklight.
       def sidecar_files(*args, **kwargs)
         upstream_sidecar_files(*args, **kwargs).map do |path|
-          app_path = Rails.root.join(path.slice(path.index(view_component_path)..-1).to_s).to_s
+          components_path = ViewComponent::VERSION::MAJOR == 3 ? view_component_path : config.generate.path
+
+          app_path = Rails.root.join(path.slice(path.index(components_path)..-1).to_s).to_s
 
           if File.exist?(app_path)
             app_path

data/lib/blacklight/configuration/context.rb

@@ -24,16 +24,16 @@ module Blacklight
       #
       # @param [#if,#unless] config an object that responds to if/unless
       # @return [Boolean]
-      def evaluate_if_unless_configuration(config, *args)
+      def evaluate_if_unless_configuration(config, *)
         return config if config == true || config == false
 
         if_value = !config.respond_to?(:if) ||
                    config.if.nil? ||
-                   evaluate_configuration_conditional(config.if, config, *args)
+                   evaluate_configuration_conditional(config.if, config, *)
 
         unless_value = !config.respond_to?(:unless) ||
                        config.unless.nil? ||
-                       !evaluate_configuration_conditional(config.unless, config, *args)
+                       !evaluate_configuration_conditional(config.unless, config, *)
 
         if_value && unless_value
       end

data/lib/blacklight/configuration/facet_field.rb

@@ -16,6 +16,8 @@ module Blacklight
     #   @return [Boolean] whether to show the facet to the user or not (very similar to the more generic if/unless)
     # @!attribute index_range
     #   @return [Enumerable] a list of facet prefixes (default: A-Z) to allow users to 'jump' to particular values
+    # @!attribute suggest
+    #   @return [Boolean] whether to display a suggest/autocomplete on the detailed facet view that allows users to filter facet values
     # @!attribute date
     #   @return [Symbol|Hash] the i18n localization option for a date or time value; used as the second parameter for the I18n.l method
     # @!attribute link_to_facet
@@ -59,15 +61,15 @@ module Blacklight
     # @!attribute item_presenter
     #   @return [Blacklight::FacetItemPresenter]
     # @!attribute component
-    #   @return [Blacklight::FacetFieldListComponent]
+    #   @return [Blacklight::Facets::ListComponent]
     # @!attribute item_component
-    #   @return [Blacklight::FacetItemComponent]
+    #   @return [Blacklight::Facets::ItemComponent]
     # @!attribute partial
     #   @return [String] Rails view partial used to render the facet field
 
     # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def normalize! blacklight_config = nil
-      query.stringify_keys! if query
+      query&.stringify_keys!
 
       normalize_pivot_config! if pivot
       self.collapse = true if collapse.nil?
@@ -76,9 +78,11 @@ module Blacklight
       self.index_range = 'A'..'Z' if index_range == true
       self.presenter ||= Blacklight::FacetFieldPresenter
       self.item_presenter ||= Blacklight::FacetItemPresenter
-      self.component = Blacklight::FacetFieldListComponent if component.nil? || component == true
-      self.advanced_search_component ||= Blacklight::FacetFieldCheckboxesComponent
-      self.item_component ||= Blacklight::FacetItemComponent
+      self.constraint_presenter ||= Blacklight::ConstraintPresenter
+
+      self.component = Blacklight::Facets::ListComponent if component.nil? || component == true
+      self.advanced_search_component ||= Blacklight::Facets::CheckboxesComponent
+      self.item_component ||= Blacklight::Facets::ItemComponent
       super
 
       if single && tag.blank? && ex.blank?
@@ -95,6 +99,7 @@ module Blacklight
     def normalize_pivot_config!
       self.item_presenter ||= Blacklight::FacetItemPivotPresenter
       self.item_component ||= Blacklight::FacetItemPivotComponent
+      self.component ||= Blacklight::Facets::PivotListComponent
       self.filter_class ||= Blacklight::SearchState::PivotFilterField
       self.filter_query_builder ||= Blacklight::SearchState::PivotFilterField::QueryBuilder
     end

data/lib/blacklight/configuration/field.rb

@@ -33,13 +33,13 @@ module Blacklight
       raise ArgumentError, "Must supply a field name" if self.field.nil?
     end
 
-    def display_label(context = nil, **options)
+    def display_label(context = nil, **)
       field_label(
         (:"blacklight.search.fields.#{context}.#{key}" if context),
         :"blacklight.search.fields.#{key}",
         label,
         default_label,
-        **options
+        **
       )
     end
 
@@ -65,10 +65,10 @@ module Blacklight
     #     before falling  back to the label
     #   @param [Symbol] any number of additional keys
     #   @param [Symbol] ...
-    def field_label *i18n_keys, **options
+    def field_label(*i18n_keys, **)
       first, *rest = i18n_keys.compact
 
-      I18n.t(first, default: rest, **options)
+      I18n.t(first, default: rest, **)
     end
   end
 end

data/lib/blacklight/configuration/fields.rb

@@ -145,7 +145,6 @@ module Blacklight
         end
 
         @table[:reflected_fields] ||= Rails.cache.fetch("blacklight_configuration/admin/reflected_fields", expires_in: 1.hour) do
-          repository = repository_class.new(self)
           repository.reflect_fields
         rescue => e
           Blacklight.logger&.warn "Error retrieving field metadata: #{e}"

data/lib/blacklight/configuration/search_field.rb

@@ -14,7 +14,7 @@ module Blacklight
       self.if = include_in_simple_select if self.if.nil?
 
       super
-      self.qt ||= blacklight_config.default_solr_params[:qt] if blacklight_config && blacklight_config.default_solr_params
+      self.qt ||= blacklight_config.default_solr_params[:qt] if blacklight_config&.default_solr_params
 
       self
     end