blacklight 9.0.0.beta2 → 9.0.0.beta4

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:
@@ -106,9 +106,9 @@ nl:
       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: "U zocht op:"
       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:
@@ -155,7 +156,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 +193,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
@@ -107,9 +107,9 @@ pt-BR:
       filters:
         label: "%{label}:"
         remove:
-          label_value: 'Remover %{label}: %{value}'
+          label_value: "Remover %{label}: %{value}"
           value: Remover filtro %{value}
-        title: 'Sua busca por:'
+        title: "Sua busca por:"
       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:
@@ -156,7 +157,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 +194,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:
@@ -106,9 +106,9 @@ sq:
       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: "Ju keni kërkuar për:"
       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:
@@ -155,7 +156,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 +193,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:
@@ -106,7 +106,7 @@ zh:
       filters:
         label: "%{label}:"
         remove:
-          label_value: '删除限定条件 %{label}: %{value}'
+          label_value: "删除限定条件 %{label}: %{value}"
           value: 删除限定条件 %{value}
         title: 你在搜索：
       form:
@@ -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>"
@@ -155,7 +156,7 @@ zh:
       start_over: 重新开始
       view:
         list: 列表
-      view_title: '以如下方式察看搜索结果: '
+      view_title: "以如下方式察看搜索结果: "
       zero_results:
         modify_search: 请更改你的搜索条件
         search_everything: 试一试搜索所有记录
@@ -173,7 +174,7 @@ zh:
       page_title: 搜索历史 - %{application_name}
       recent: 你最近搜索历史
       save: 保存
-      title: ''
+      title: ""
     skip_links:
       first_result: 转到第一个搜索结果
       label: 跳过链接
@@ -192,10 +193,10 @@ zh:
         carrier_prompt: 请选择运营商
         submit: 发送
         title: 通过短信发送
-        to: '电话号码:'
+        to: "电话号码:"
       success: 已发送短信
       text:
-        url: '链接: %{url}'
+        url: "链接: %{url}"
     tools:
       citation: 引用
       clear: 清除

data/lib/blacklight/configuration/facet_field.rb

@@ -95,6 +95,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.rb

@@ -96,6 +96,10 @@ module Blacklight
       ##
       # == Response models
 
+      # @!attribute repository_class
+      # @return [Class] Class for sending and receiving requests from a search index
+      #                 defaults to the class configured in blacklight.yml
+      property :repository_class, default: Blacklight.repository_class
       # @!attribute search_builder_class
       # @return [Class] class for converting Blacklight parameters to request parameters for the repository_class
       property :search_builder_class, default: ::SearchBuilder
@@ -162,6 +166,8 @@ module Blacklight
         respond_to: OpenStructWithHashAccess.new,
         # component class used to render the facet grouping
         facet_group_component: Blacklight::Response::FacetGroupComponent,
+        # component class used to render the facet search and start at
+        facet_filters_component: Blacklight::Facets::FiltersComponent,
         # component class used to render the facet pagination
         facet_pagination_component: Blacklight::FacetFieldPaginationComponent,
         # component class used to render search constraints
@@ -379,7 +385,7 @@ module Blacklight
 
     # @return [Blacklight::Repository]
     def repository
-      Blacklight.repository_class.new(self)
+      repository_class.new(self)
     end
 
     # @return [String] The destination for the link around the logo in the header

data/lib/blacklight/solr/repository.rb

@@ -52,12 +52,15 @@ module Blacklight::Solr
 
     ##
     # @return [boolean] true if the repository is reachable
-    def ping
+    def ping?
       response = connection.send_and_receive 'admin/ping', {}
       Blacklight.logger&.info("Ping [#{connection.uri}] returned: '#{response['status']}'")
       response['status'] == "OK"
     end
 
+    alias ping ping?
+    Blacklight.deprecation.deprecate_methods(Repository, ping: 'use Repository#ping? instead')
+
     ##
     # Execute a solr query at the given path with the parameters
     # TODO: Make this private after we have a way to abstract admin/luke and ping

data/lib/blacklight.rb

@@ -29,14 +29,16 @@ module Blacklight
   # the class Blacklight::(name of the adapter)::Repository, e.g.
   #   elastic_search => Blacklight::ElasticSearch::Repository
   def self.repository_class
-    case connection_config[:adapter]
+    if connection_config && !connection_config.key?(:adapter)
+      raise "The value for :adapter was not found in the blacklight.yml config"
+    end
+
+    case connection_config&.fetch(:adapter) || 'solr' # rubocop:disable Lint/LiteralAsCondition
     when 'solr'
       Blacklight::Solr::Repository
     when /::/
       connection_config[:adapter].constantize
     else
-      raise "The value for :adapter was not found in the blacklight.yml config" unless connection_config.key? :adapter
-
       Blacklight.const_get("#{connection_config.fetch(:adapter)}/Repository".classify)
     end
   end

data/lib/generators/blacklight/templates/catalog_controller.rb

@@ -65,8 +65,8 @@ class <%= controller_name.classify %>Controller < ApplicationController
     config.add_results_collection_tool(:view_type_group)
 
     config.add_show_tools_partial(:bookmark, component: Blacklight::Document::BookmarkComponent, if: :render_bookmarks_control?)
-    config.add_show_tools_partial(:email, callback: :email_action, validator: :validate_email_params)
-    config.add_show_tools_partial(:sms, if: :render_sms_action?, callback: :sms_action, validator: :validate_sms_params)
+    config.add_show_tools_partial(:email, callback: :email_action, validator: :email_params_valid?)
+    config.add_show_tools_partial(:sms, if: :render_sms_action?, callback: :sms_action, validator: :sms_params_valid?)
     config.add_show_tools_partial(:citation)
 
     config.add_nav_action(:bookmark, partial: 'blacklight/nav/bookmark', if: :render_bookmarks_control?)

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "9.0.0-beta2",
+  "version": "9.0.0-beta4",
   "description": "The frontend code and styles for Blacklight",
   "exports": {
     "./blacklight.esm.js": "./app/assets/javascripts/blacklight/blacklight.esm.js",

data/spec/components/blacklight/facets/list_component_spec.rb

@@ -42,6 +42,11 @@ RSpec.describe Blacklight::Facets::ListComponent, type: :component do
     expect(page).to have_css 'li', count: 2
   end
 
+  it 'does not add a role attribute by default' do
+    expect(page).to have_css 'ul.facet-values'
+    expect(page).to have_no_css 'ul.facet-values[role]'
+  end
+
   context 'with an active facet' do
     let(:facet_field) do
       instance_double(

data/spec/components/blacklight/facets/pivot_list_component_spec.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Blacklight::Facets::PivotListComponent, type: :component do
+  before do
+    render_inline(described_class.new(facet_field: facet_field))
+  end
+
+  let(:facet_field) do
+    instance_double(
+      Blacklight::FacetFieldPresenter,
+      paginator: paginator,
+      facet_field: facet_config,
+      key: 'pivot_field',
+      label: 'Pivot Field',
+      active?: false,
+      collapsed?: false,
+      modal_path: nil,
+      values: []
+    )
+  end
+
+  let(:facet_config) do
+    Blacklight::Configuration::NullField.new(
+      key: 'pivot_field',
+      item_component: Blacklight::FacetItemPivotComponent,
+      item_presenter: Blacklight::FacetItemPivotPresenter,
+      pivot: %w[field_a field_b]
+    )
+  end
+
+  let(:paginator) do
+    instance_double(Blacklight::FacetPaginator, items: [
+                      double(value: 'x', hits: 10),
+                      double(value: 'y', hits: 33)
+                    ])
+  end
+
+  it 'renders the facet items with role="tree"' do
+    expect(page).to have_css 'ul.facet-values[role="tree"]'
+  end
+end

data/spec/features/modal_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe 'Modal' do
     expect(page).to have_no_selector 'dialog#blacklight-modal'
     click_on 'Email'
     expect(page).to have_css 'dialog#blacklight-modal'
-    click_on '×'
+    find('button[aria-label=Close]').click
     expect(page).to have_no_selector 'dialog#blacklight-modal'
   end
 end

data/spec/models/blacklight/configuration_spec.rb

@@ -5,6 +5,26 @@ RSpec.describe Blacklight::Configuration, :api do
     described_class.new
   end
 
+  describe "#repository" do
+    context 'when the class is configured in blacklight.yml' do
+      it "uses the default repository class" do
+        expect(config.repository).to be_a(Blacklight::Solr::Repository)
+      end
+    end
+
+    context 'when the class is set in the configuration' do
+      let(:custom_repository_class) { Class.new(Blacklight::Solr::Repository) }
+
+      before do
+        config.repository_class = custom_repository_class
+      end
+
+      it "uses the custom repository class" do
+        expect(config.repository).to be_a(custom_repository_class)
+      end
+    end
+  end
+
   it "supports arbitrary configuration values" do
     config.a = 1
 

data/spec/presenters/blacklight/json_presenter_spec.rb

@@ -56,5 +56,22 @@ RSpec.describe Blacklight::JsonPresenter, :api do
         expect(search_facets.map(&:name)).to eq ['format_si']
       end
     end
+
+    context 'when facets are in multiple groups' do
+      before do
+        config.add_facet_field 'author_tsim', label: 'author', group: 'other-group'
+      end
+
+      let(:aggregations) do
+        {
+          'format_si' => Blacklight::Solr::Response::Facets::FacetField.new("format_si", [{ label: "Book", value: 'Book', hits: 20 }]),
+          'author_tsim' => Blacklight::Solr::Response::Facets::FacetField.new("author_tsim", [{ label: "Julie", value: 'Julie', hits: 1 }])
+        }
+      end
+
+      it 'filters out the facets that are not defined' do
+        expect(search_facets.map(&:name)).to eq %w[format_si author_tsim]
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 9.0.0.beta2
+  version: 9.0.0.beta4
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -16,7 +16,7 @@ authors:
 - Justin Coyne
 bindir: exe
 cert_chain: []
-date: 2025-06-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -448,7 +448,6 @@ files:
 - app/assets/stylesheets/blacklight/_facets.scss
 - app/assets/stylesheets/blacklight/_group.scss
 - app/assets/stylesheets/blacklight/_header.scss
-- app/assets/stylesheets/blacklight/_icons.scss
 - app/assets/stylesheets/blacklight/_layout.scss
 - app/assets/stylesheets/blacklight/_modal.scss
 - app/assets/stylesheets/blacklight/_pagination.scss
@@ -519,6 +518,7 @@ files:
 - app/components/blacklight/facets/list_component.html.erb
 - app/components/blacklight/facets/list_component.rb
 - app/components/blacklight/facets/no_layout_component.rb
+- app/components/blacklight/facets/pivot_list_component.rb
 - app/components/blacklight/facets/selected_value_component.rb
 - app/components/blacklight/facets/suggest_component.html.erb
 - app/components/blacklight/facets/suggest_component.rb
@@ -674,7 +674,6 @@ files:
 - app/views/catalog/_document.rss.builder
 - app/views/catalog/_document_list.html.erb
 - app/views/catalog/_email_form.html.erb
-- app/views/catalog/_facet_pivot.html.erb
 - app/views/catalog/_field.json.jbuilder
 - app/views/catalog/_group.html.erb
 - app/views/catalog/_home.html.erb
@@ -860,6 +859,7 @@ files:
 - spec/components/blacklight/facets/index_navigation_component_spec.rb
 - spec/components/blacklight/facets/item_component_spec.rb
 - spec/components/blacklight/facets/list_component_spec.rb
+- spec/components/blacklight/facets/pivot_list_component_spec.rb
 - spec/components/blacklight/facets/suggest_component_spec.rb
 - spec/components/blacklight/header_component_spec.rb
 - spec/components/blacklight/hidden_search_state_component_spec.rb
@@ -1023,7 +1023,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
   index.
@@ -1043,6 +1043,7 @@ test_files:
 - spec/components/blacklight/facets/index_navigation_component_spec.rb
 - spec/components/blacklight/facets/item_component_spec.rb
 - spec/components/blacklight/facets/list_component_spec.rb
+- spec/components/blacklight/facets/pivot_list_component_spec.rb
 - spec/components/blacklight/facets/suggest_component_spec.rb
 - spec/components/blacklight/header_component_spec.rb
 - spec/components/blacklight/hidden_search_state_component_spec.rb

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

@@ -1,4 +0,0 @@
-.remove .bi {
-  height: 1em;
-  width: 1em;
-}

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

@@ -1,3 +0,0 @@
-<%= render(Blacklight::Facets::ListComponent.new(
-      facet_field: facet_field_presenter(facet_field.merge(item_component: Blacklight::FacetItemPivotComponent), display_facet),
-      layout: false)) %>