From 557b870bbc49034e1271466ad0c377069e40f466 Mon Sep 17 00:00:00 2001 From: Christina Chortaria Date: Mon, 18 Nov 2024 09:59:03 -0500 Subject: [PATCH] Blacklight upgrade to 8.6.1 Co-authored-by: Jane Sandberg Co-authored-by: Max Kadel --- Gemfile | 2 +- Gemfile.lock | 11 +++++------ .../server_item_pagination_component.html.erb | 11 ----------- .../server_item_pagination_component.rb | 18 ------------------ .../index_document_component_spec.rb | 4 ++-- .../index_metadata_component_spec.rb | 4 ++-- spec/components/index_title_component_spec.rb | 2 +- 7 files changed, 11 insertions(+), 41 deletions(-) delete mode 100644 app/components/blacklight/search_context/server_item_pagination_component.html.erb delete mode 100644 app/components/blacklight/search_context/server_item_pagination_component.rb diff --git a/Gemfile b/Gemfile index d5e3816bd..644a6be34 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'alma' gem 'babel-transpiler' gem 'bcrypt_pbkdf' # Blacklight -gem 'blacklight', '~> 7.38.0' +gem 'blacklight', '~> 8.6.1' gem 'blacklight_dynamic_sitemap' gem 'blacklight-hierarchy' gem 'blacklight-marc', '~>8.1' diff --git a/Gemfile.lock b/Gemfile.lock index 1d98fa3bf..2c175d80b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -127,16 +127,15 @@ GEM parser (>= 2.4) smart_properties bigdecimal (3.1.8) - blacklight (7.38.0) - deprecation + blacklight (8.6.1) globalid - hashdiff i18n (>= 1.7.0) jbuilder (~> 2.7) kaminari (>= 0.15) ostruct (>= 0.3.2) - rails (>= 5.1, < 7.3) - view_component (>= 2.66, < 4) + rails (>= 6.1, < 8) + view_component (>= 2.74, < 4) + zeitwerk blacklight-hierarchy (6.4.0) blacklight (>= 7.18, < 9) deprecation @@ -758,7 +757,7 @@ DEPENDENCIES axe-core-rspec babel-transpiler bcrypt_pbkdf - blacklight (~> 7.38.0) + blacklight (~> 8.6.1) blacklight-hierarchy blacklight-marc (~> 8.1) blacklight_dynamic_sitemap diff --git a/app/components/blacklight/search_context/server_item_pagination_component.html.erb b/app/components/blacklight/search_context/server_item_pagination_component.html.erb deleted file mode 100644 index 767e09af7..000000000 --- a/app/components/blacklight/search_context/server_item_pagination_component.html.erb +++ /dev/null @@ -1,11 +0,0 @@ -<%# This can be removed after migrating to Blacklight 8 %> -
- -
- <%= link_to_previous_document %> | - - <%= item_page_entry_info %> | - - <%= link_to_next_document %> -
-
diff --git a/app/components/blacklight/search_context/server_item_pagination_component.rb b/app/components/blacklight/search_context/server_item_pagination_component.rb deleted file mode 100644 index ddb2cec54..000000000 --- a/app/components/blacklight/search_context/server_item_pagination_component.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -# This can be removed after migrating to Blacklight 8 -module Blacklight - module SearchContext - # This class makes the ServerItemPaginationComponent that is present in Blacklight 8 - # available while we are still on Blacklight 7 - class ServerItemPaginationComponent < Blacklight::SearchContextComponent - with_collection_parameter :search_context - - def initialize(search_context:, search_session:, current_document:) - @search_context = search_context - @search_session = search_session - @current_document_id = current_document.id - end - end - end -end diff --git a/spec/components/index_document_component_spec.rb b/spec/components/index_document_component_spec.rb index 58af59717..f0456c161 100644 --- a/spec/components/index_document_component_spec.rb +++ b/spec/components/index_document_component_spec.rb @@ -5,7 +5,7 @@ RSpec.describe IndexDocumentComponent, type: :component do let(:blacklight_config) do Blacklight::Configuration.new do |config| - config.track_search_session = false + config.track_search_session.storage = false end end before do @@ -16,7 +16,7 @@ end subject do document = SolrDocument.new(id: 'SCSB-1234') - presenter = Blacklight::DocumentPresenter.new(document, instance_double(ActionView::Base), blacklight_config) + presenter = Blacklight::DocumentPresenter.new(document, instance_double(ActionView::Base, action_name: 'show'), blacklight_config) allow(presenter).to receive(:fields).and_return([]) allow(document).to receive(:export_as_openurl_ctx_kev).and_return 'ctx_ver=Z39.88-2004&rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajournal&rft.issn=1045-4438' render_inline(described_class.new(document:, presenter:)) diff --git a/spec/components/index_metadata_component_spec.rb b/spec/components/index_metadata_component_spec.rb index c8fffd867..4ba135a80 100644 --- a/spec/components/index_metadata_component_spec.rb +++ b/spec/components/index_metadata_component_spec.rb @@ -33,8 +33,8 @@ def call expect(render_inline(component).css('li').first.text.strip).to eq('Hello') end it 'renders multi-valued fields' do - expect(render_inline(component).search('./li/ul/li').length).to eq(2) - expect(render_inline(component).search('./li/ul/li').map(&:text).map(&:strip)).to eq(['Goodbye', 'Auf Wiedersehen']) + expect(render_inline(component).search('./li/ul/li/ul/li').length).to eq(2) + expect(render_inline(component).search('./li/ul/li/ul/li').map(&:text).map(&:strip)).to eq(['Goodbye', 'Auf Wiedersehen']) end context 'when the index field is configured to use a component' do let(:blacklight_config) do diff --git a/spec/components/index_title_component_spec.rb b/spec/components/index_title_component_spec.rb index 46bcdc356..873cd09ae 100644 --- a/spec/components/index_title_component_spec.rb +++ b/spec/components/index_title_component_spec.rb @@ -15,7 +15,7 @@ end let(:blacklight_config) do Blacklight::Configuration.new do |config| - config.track_search_session = false + config.track_search_session.storage = false config.index.document_actions[:bookmark].partial = '/catalog/bookmark_control' end end