blacklight 9.0.0.beta3 → 9.0.0.beta5

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

@@ -5,16 +5,16 @@
              method: :post do %>
 <div class="modal-body">
   <%= render '/shared/flash_msg' %>
-    <div class="form-group row">
-      <label class="control-label col-sm-2" for="to">
+    <div class="row">
+      <label class="col-form-label col-sm-2" for="to">
         <%= t('blacklight.sms.form.to') %>
       </label>
       <div class="col-sm-10">
         <%= telephone_field_tag :to, params[:to], class: 'form-control', required: true %>
       </div>
     </div>
-    <div class="form-group row">
-      <label class="control-label col-sm-2" for="carrier">
+    <div class="row">
+      <label class="col-form-label col-sm-2" for="carrier">
         <%= t('blacklight.sms.form.carrier') %>
       </label>
       <div class="col-sm-10">

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

@@ -1,7 +1,7 @@
 <% @page_title = t('blacklight.advanced_search.page_title', application_name: application_name) %>
 
 <div class="advanced-search-form col-sm-12">
-  <h1 class="advanced page-header">
+  <h1>
       <%= t('blacklight.advanced_search.form.title') %>
   </h1>
 

data/app/views/layouts/blacklight/base.html.erb

@@ -32,7 +32,7 @@
     <main id="main-container" class="<%= container_classes %>" aria-label="<%= t('blacklight.main.aria.main_container') %>">
       <%= content_for(:container_header) %>
 
-      <%= render partial: 'shared/flash_msg', layout: 'shared/flash_messages' %>
+      <%= render 'shared/flash_msg', layout: 'shared/flash_messages' if flash.any? %>
 
       <div class="row">
         <%= content_for?(:content) ? yield(:content) : yield %>

data/config/locales/blacklight.it.yml

@@ -93,7 +93,7 @@ it:
           open: Mostra sfaccettature
         missing:
           - Mancante
-        more_html: altri <span class="sr-only visually-hidden">%{field_name}</span> »
+        more_html: altri <span class="visually-hidden">%{field_name}</span> »
         pivot:
           hide: Chiudi
           show: Apri

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/search_state.rb

@@ -82,6 +82,8 @@ module Blacklight
       blacklight_config.facet_fields.each_value.map { |value| filter(value) }
     end
 
+    # Return the list of filters (i.e. facets) that have been applied in the current search
+    # @return [Array<FilterField>]
     def filters
       @filters ||= filter_fields.select(&:any?)
     end

data/lib/blacklight.rb

@@ -33,7 +33,7 @@ module Blacklight
       raise "The value for :adapter was not found in the blacklight.yml config"
     end
 
-    case connection_config&.fetch(:adapter) || 'solr' # rubocop:disable Lint/LiteralAsCondition
+    case connection_config&.fetch(:adapter) || 'solr'
     when 'solr'
       Blacklight::Solr::Repository
     when /::/

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

@@ -119,7 +119,9 @@ class <%= controller_name.classify %>Controller < ApplicationController
     config.add_facet_field 'subject_geo_ssim', label: 'Region'
     config.add_facet_field 'subject_era_ssim', label: 'Era'
 
-    config.add_facet_field 'example_pivot_field', label: 'Pivot Field', pivot: ['format', 'language_ssim'], collapsing: true
+    config.add_facet_field 'example_pivot_field',
+                           label: 'Pivot Field',
+                           pivot: ['language_ssim', 'subject_geo_ssim', 'subject_ssim'], collapsing: true
 
     config.add_facet_field 'example_query_facet_field', label: 'Publish Date', :query => {
        :years_5 => { label: 'within 5 Years', fq: "pub_date_ssim:[#{Time.zone.now.year - 5 } TO *]" },

data/package.json

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

data/spec/components/blacklight/facet_item_pivot_component_spec.rb

@@ -40,7 +40,7 @@ RSpec.describe Blacklight::FacetItemPivotComponent, type: :component do
   end
 
   it 'has the facet hierarchy' do
-    expect(page).to have_css 'li ul.pivot-facet'
+    expect(page).to have_css 'li.treeitem ul li.treeitem'
     expect(page).to have_link 'x:1', href: nokogiri_mediated_href(facet_item.facet_item_presenters.first.href)
   end
 

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,47 @@
+# 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 top ul with "pivot-facet" class' do
+    expect(page).to have_css 'ul.pivot-facet'
+  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/advanced_search_spec.rb

@@ -69,7 +69,9 @@ RSpec.describe "Blacklight Advanced Search Form" do
     it 'can limit to facets' do
       fill_in 'Subject', with: 'Women'
       click_on 'Language'
-      check 'Urdu 3'
+      within '#facet-language_ssim' do
+        check 'Urdu 3'
+      end
       click_on 'advanced-search-submit'
       expect(page).to have_content 'Pākistānī ʻaurat dorāhe par'
       expect(page).to have_no_content 'Ajikto kŭrŏk chŏrŏk sasimnikka : and 아직도　그럭　저럭　사십니까'

data/spec/features/facets_spec.rb

@@ -69,14 +69,14 @@ RSpec.describe "Facets" do
     click_on 'Pivot Field'
 
     within '#facet-example_pivot_field' do
-      expect(page).to have_css('.facet-leaf-node', text: "Book 30", normalize_ws: true)
-      expect(page).to have_no_css('.facet-select', text: 'Tibetan')
-      page.find('.facet-toggle-handle').click
-      click_on 'Tibetan'
+      expect(page).to have_css('.facet-leaf-node', text: "Tibetan 6", normalize_ws: true)
+      expect(page).to have_no_css('.facet-select', text: 'India')
+      first('.facet-toggle-handle').click
+      click_on 'India'
     end
 
-    expect(page).to have_css('.constraint-value', text: 'Format Book')
     expect(page).to have_css('.constraint-value', text: 'Language Tibetan')
+    expect(page).to have_css('.constraint-value', text: 'Region India')
   end
 
   describe 'heading button focus with Firefox' do

data/spec/features/search_filters_spec.rb

@@ -18,7 +18,9 @@ RSpec.describe "Facets" do
       expect(page).to have_css("span.facet-count.selected", text: "6")
     end
 
-    click_on "India"
+    within "#facet-subject_geo_ssim" do
+      click_on "India"
+    end
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 - 2 of 2"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 9.0.0.beta3
+  version: 9.0.0.beta5
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -16,7 +16,7 @@ authors:
 - Justin Coyne
 bindir: exe
 cert_chain: []
-date: 2025-06-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -518,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
@@ -673,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
@@ -859,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
@@ -1022,7 +1023,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
   index.
@@ -1042,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/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)) %>