blacklight 8.8.1 → 8.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a451b7f410e4471509825f5d26bdcd26e641dc6bd812a471e16e1486e7a391e5
-  data.tar.gz: 410b81b50ada2b286b299175e504aa85f5ec87708ae64fb42d9b036c68535c98
+  metadata.gz: a1e08ce0753e7c685ea8c89ddb71a79df93264b09316f4fd42d10e9df6b0445a
+  data.tar.gz: f2fd78857733c1d5729806da77d823b459aa66414d753b27e03ae3b9bc2adac9
 SHA512:
-  metadata.gz: '08a2cff69bac1f9bd00889b428fef0f63e3aead84dd615126e9b1620b122f058d926172f919f915ce184bb04165eea50783af699309d61d31aaf8544349bc2c5'
-  data.tar.gz: eebf1d8271275ee525c374245be122f41b259bb95888e9d24ee15179ca457e4faa7863440f88f6d88a5b0b2547e5fa3c489e84d688c59a2723dc4ea0695c5149
+  metadata.gz: 7b8109311a031925baef9b67a4a89a5c0acd49d7ed7822e5d129b7c22b9920e742684035685bd780f293de3a6f78b4725dc22fbd77d77f8513d54cfe467d9c06
+  data.tar.gz: b245a145acf722e3e505820fafa9d1731fbbd30d43e2bca4465ffa9e430bfffe542fe81761b1c6d92cdcca84d561d2026a75d293c19ecd57ea479f3aba3ede56

data/VERSION

@@ -1 +1 @@
-8.8.1
+8.8.3

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/models/blacklight/facet_paginator.rb

@@ -16,7 +16,7 @@ module Blacklight
     # and need to make them accessible in a list so we can easily
     # strip em out before redirecting to catalog/index.
     mattr_accessor :request_keys do
-      { sort: :'facet.sort', page: :'facet.page', prefix: :'facet.prefix' }
+      { sort: :'facet.sort', page: :'facet.page', prefix: :'facet.prefix', fragment: :query_fragment, only: :only_values }
     end
 
     attr_reader :offset, :limit, :sort, :prefix

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.1",
+  "version": "8.8.3",
   "description": "The frontend code and styles for Blacklight",
   "main": "app/assets/javascripts/blacklight",
   "type": "module",

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

@@ -125,6 +125,24 @@ RSpec.describe "Facets" do
         expect(page).to have_link 'Tibetan language'
         expect(page).to have_css 'a.facet-select', count: 1
       end
+
+      it 'allows the user to filter more than once', :js do
+        visit '/catalog/facet/subject_ssim'
+        expect(page).to have_no_link 'Old age' # This is on the second page of facet values
+        expect(page).to have_css 'a.facet-select', count: 20
+
+        fill_in 'facet_suggest_subject_ssim', with: "ag"
+
+        expect(page).to have_link 'Old age'
+        expect(page).to have_link('Old age', href: '/?f%5Bsubject_ssim%5D%5B%5D=Old+age')
+      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.1
+  version: 8.8.3
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -16,7 +16,7 @@ authors:
 - Justin Coyne
 bindir: exe
 cert_chain: []
-date: 2025-02-04 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails