blacklight 8.8.2 → 8.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dd86bf03c86da1ff25d4c652ce4a7121f6d4418cb4bc40d7b435a17dd214f26
-  data.tar.gz: c1735cda91ea0095dcb73e1d3a9aae3fb17de0280dd3c77aebcf3d0b67cd78fc
+  metadata.gz: d197e1d545d7d874d39770d590fa4981a841c9143e2b14bfaeec95bbc449b914
+  data.tar.gz: 7a37f82fa0be835b5d9d01dbcd66f620e26a8a3143cf327a626725c8f3865a7e
 SHA512:
-  metadata.gz: 2f7d8b428cfe7b9a73f4f2b1985064bfe292f66ae7c878c15eaf83225492d63433687fef4539eb9a975d0bd29020e1341fa507775c5daf2825b1ca484efc6c6d
-  data.tar.gz: b07daac34342d08bdd8a3927fca57449cfacfdd4f866bf74c18d4f4040e7d967a04797448fded5beec7e3532e1a00e8903fd6294b8162e7a5fbaf84a094f471a
+  metadata.gz: 80bcd51b40f30b48e1774975ee5701a1ab6a825455a4a4796b27023a12faf7aa0be12f86da6448d914e100b85573b3a9cfca06bec4c250922148754674fddc78
+  data.tar.gz: 7662c623c9654f640a116b4fb6f7233ce5216ebf9c8ed964c0bbc31f165f43133167faeaba61ca935614ebe800ac0fbff0426b6f89d88294e53cf93aecf704e5

data/VERSION

@@ -1 +1 @@
-8.8.2
+8.8.4

data/app/components/blacklight/document/action_component.rb

@@ -61,9 +61,7 @@ module Blacklight
         end
       end
 
-      def key
-        @action.key
-      end
+      delegate :key, to: :@action
     end
   end
 end

data/app/components/blacklight/facet_field_component.html.erb

@@ -8,7 +8,7 @@
       data-target="#<%= html_id %>"
       data-bs-target="#<%= html_id %>"
       aria-expanded="<%= @facet_field.collapsed? ? 'false' : 'true' %>"
-      arial-controls="<%= html_id %>"
+      aria-controls="<%= html_id %>"
     >
       <%= label %>
     </button>

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

@@ -1,7 +1,7 @@
 <%= content_tag :div, id: @id, class: @classes.join(' ') do %>
   <%= button %>
 
-  <div class="dropdown-menu" role="menu">
+  <div class="dropdown-menu">
     <% options.each do |option| %>
       <%= option %>
     <% end %>

data/app/components/blacklight/system/dropdown_component.rb

@@ -6,7 +6,7 @@ module Blacklight
       renders_one :button, DropdownButtonComponent
 
       renders_many :options, (lambda do |text:, url:, selected: false|
-        link_to(text, url, class: "dropdown-item #{'active' if selected}", role: 'menuitem', aria: { current: ('page' if selected) })
+        link_to(text, url, class: "dropdown-item #{'active' if selected}", aria: { current: ('page' if selected) })
       end)
 
       # rubocop:disable Metrics/ParameterLists

data/app/presenters/blacklight/json_presenter.rb

@@ -13,9 +13,7 @@ module Blacklight
 
     delegate :facet_field_names, :facet_configuration_for_field, to: :blacklight_config
 
-    def documents
-      @response.documents
-    end
+    delegate :documents, to: :@response
 
     # @return [Array<Blacklight::Solr::Response::Facets::FacetField>]
     def search_facets

data/lib/blacklight/search_state/filter_field.rb

@@ -145,8 +145,8 @@ module Blacklight
       def permitted_params
         if config.pivot
           {
-            filters_key => config.pivot.each_with_object({}) { |key, filter| filter.merge(key => [], "-#{key}" => []) },
-            inclusive_filters_key => config.pivot.each_with_object({}) { |key, filter| filter.merge(key => []) }
+            filters_key => config.pivot.each_with_object({}) { |key, filter| filter.merge!(key => [], "-#{key}" => []) },
+            inclusive_filters_key => config.pivot.each_with_object({}) { |key, filter| filter.merge!(key => []) }
           }
         else
           {

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "8.8.2",
+  "version": "8.8.4",
   "description": "The frontend code and styles for Blacklight",
   "main": "app/assets/javascripts/blacklight",
   "type": "module",

data/spec/components/blacklight/system/dropdown_component_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Blacklight::System::DropdownComponent, type: :component do
+  it 'includes a link for each choice' do
+    search_state = double(Blacklight::SearchState)
+    allow(search_state).to receive(:params_for_search).and_return('http://example.com')
+    rendered = render_inline(described_class.new(
+                               param: :per_page,
+                               choices: [
+                                 ['10 per page', 10],
+                                 ['20 per page', 20]
+                               ],
+                               search_state: search_state,
+                               selected: 20,
+                               interpolation: :count
+                             ))
+
+    expect(rendered.css('a').length).to eq 2
+    expect(rendered.css('a')[0].text).to eq '10 per page'
+    expect(rendered.css('a')[0].attributes).not_to have_key 'aria-current'
+    expect(rendered.css('a')[1].text).to eq '20 per page'
+    expect(rendered.css('a')[1].attributes).to have_key 'aria-current'
+  end
+end

data/spec/controllers/catalog_controller_spec.rb

@@ -803,7 +803,7 @@ RSpec.describe CatalogController, :api do
     end
 
     it "is empty for empty result sets", :integration do
-      get :page_links, params: { f: { "format" => 'empty-result-set' }, counter: 1 }
+      get :page_links, params: { f: { "format" => ['empty-result-set'] }, counter: 1 }
       expect(assigns(:page_link_data)).to be_empty
     end
   end

data/spec/features/facets_spec.rb

@@ -138,4 +138,11 @@ RSpec.describe "Facets" do
       end
     end
   end
+
+  describe 'facebook-style facet parameters' do
+    it 'can perform a search' do
+      visit '/?f[subject_ssim][0]=Iran.+Viza%CC%84rat-i+Kishvar'
+      expect(page).to have_text 'Naqdī barā-yi tamām-i fuṣūl'
+    end
+  end
 end

data/spec/lib/blacklight/parameters_spec.rb

@@ -52,7 +52,7 @@ RSpec.describe Blacklight::Parameters do
     let(:search_state) { Blacklight::SearchState.new(query_params, blacklight_config) }
     let(:blacklight_config) { Blacklight::Configuration.new }
 
-    context 'with facebooks badly mangled query parameters' do
+    context 'with facebook\'s badly mangled query parameters' do
       let(:query_params) do
         ActionController::Parameters.new(
           f: { field: { '0': 'first', '1': 'second' } },
@@ -67,6 +67,17 @@ RSpec.describe Blacklight::Parameters do
       it 'normalizes the facets to the expected format' do
         expect(params.permit_search_params.to_h.with_indifferent_access).to include f: { field: %w[first second] }, f_inclusive: { field: %w[first second] }
       end
+
+      context 'when several fields are configured' do
+        before do
+          blacklight_config.add_facet_field 'other_field'
+          blacklight_config.add_facet_field 'some_other_pivot_field', pivot: %w[abc def]
+        end
+
+        it 'normalizes the facets to the expected format' do
+          expect(params.permit_search_params.to_h.with_indifferent_access).to include f: { field: %w[first second] }, f_inclusive: { field: %w[first second] }
+        end
+      end
     end
 
     context 'with filter_search_state_fields set to false' do

data/spec/lib/blacklight/search_state/filter_field_spec.rb

@@ -198,4 +198,22 @@ RSpec.describe Blacklight::SearchState::FilterField do
       expect(search_state.filter('some_field').include?(OpenStruct.new(value: '1'))).to be true
     end
   end
+
+  describe '#permitted_params' do
+    context 'with a pivot facet' do
+      let(:blacklight_config) do
+        Blacklight::Configuration.new.configure do |config|
+          config.add_facet_field 'my_pivot', pivot: %w[format language_ssim]
+        end
+      end
+
+      it 'marks all the pivot fields as permitted' do
+        field = described_class.new blacklight_config.facet_fields['my_pivot'], search_state
+        expect(field.permitted_params).to eq({
+                                               f: { "-format" => [], "-language_ssim" => [], "format" => [], "language_ssim" => [] },
+                                               f_inclusive: { "format" => [], "language_ssim" => [] }
+                                             })
+      end
+    end
+  end
 end

data/spec/services/blacklight/search_service_spec.rb

@@ -59,7 +59,7 @@ RSpec.describe Blacklight::SearchService, :api do
         allow(blacklight_config).to receive(:default_solr_params).and_return(qt: 'custom_request_handler')
         allow(blacklight_solr).to receive(:send_and_receive) do |path, params|
           expect(path).to eq 'select'
-          expect(params[:params]['facet.field']).to eq ["format", "{!ex=pub_date_ssim_single}pub_date_ssim", "subject_ssim", "language_ssim", "lc_1letter_ssim", "subject_geo_ssim", "subject_era_ssim"]
+          expect(params[:params]['facet.field']).to contain_exactly "format", "{!ex=pub_date_ssim_single}pub_date_ssim", "subject_ssim", "language_ssim", "lc_1letter_ssim", "subject_geo_ssim", "subject_era_ssim"
           expect(params[:params]["facet.query"]).to eq ["pub_date_ssim:[#{5.years.ago.year} TO *]", "pub_date_ssim:[#{10.years.ago.year} TO *]", "pub_date_ssim:[#{25.years.ago.year} TO *]"]
           expect(params[:params]).to include('rows' => 10, 'qt' => "custom_request_handler", 'q' => "", "f.subject_ssim.facet.limit" => 21, 'sort' => "score desc, pub_date_si desc, title_si asc")
         end.and_return('response' => { 'docs' => [] })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 8.8.2
+  version: 8.8.4
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -16,7 +16,7 @@ authors:
 - Justin Coyne
 bindir: exe
 cert_chain: []
-date: 2025-02-06 00:00:00.000000000 Z
+date: 2025-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -869,6 +869,7 @@ files:
 - spec/components/blacklight/search_context/server_item_pagination_component_spec.rb
 - spec/components/blacklight/skip_link_component_spec.rb
 - spec/components/blacklight/start_over_button_component_spec.rb
+- spec/components/blacklight/system/dropdown_component_spec.rb
 - spec/components/blacklight/system/flash_message_component_spec.rb
 - spec/controllers/alternate_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
@@ -1051,6 +1052,7 @@ test_files:
 - spec/components/blacklight/search_context/server_item_pagination_component_spec.rb
 - spec/components/blacklight/skip_link_component_spec.rb
 - spec/components/blacklight/start_over_button_component_spec.rb
+- spec/components/blacklight/system/dropdown_component_spec.rb
 - spec/components/blacklight/system/flash_message_component_spec.rb
 - spec/controllers/alternate_controller_spec.rb
 - spec/controllers/application_controller_spec.rb