diff --git a/Gemfile b/Gemfile
index c4c22fec8..b62095010 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.7.0'
gem 'blacklight_dynamic_sitemap'
gem 'blacklight-hierarchy'
gem 'blacklight-marc', '~>8.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1faf52883..8f942ef3c 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.7.0)
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, < 9)
+ view_component (>= 2.74, < 4)
+ zeitwerk
blacklight-hierarchy (6.4.0)
blacklight (>= 7.18, < 9)
deprecation
@@ -218,7 +217,7 @@ GEM
libddwaf (~> 1.15.0.0.0)
msgpack
datadog-ruby_core_source (3.3.6)
- date (3.4.0)
+ date (3.4.1)
deprecation (1.1.0)
activesupport
descendants_tracker (0.0.4)
@@ -334,8 +333,8 @@ GEM
i18n (1.14.6)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
- io-console (0.7.2)
- irb (1.14.1)
+ io-console (0.8.0)
+ irb (1.14.2)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jaro_winkler (1.6.0)
@@ -414,7 +413,7 @@ GEM
racc (~> 1.7)
net-http (0.5.0)
uri
- net-imap (0.5.1)
+ net-imap (0.5.2)
date
net-protocol
net-ldap (0.19.0)
@@ -466,7 +465,8 @@ GEM
pry-byebug (3.10.1)
byebug (~> 11.0)
pry (>= 0.13, < 0.15)
- psych (5.2.0)
+ psych (5.2.1)
+ date
stringio
public_suffix (6.0.1)
puma (6.4.3)
@@ -526,7 +526,7 @@ GEM
rake (13.2.1)
rbs (2.8.4)
rbtree (0.4.6)
- rdoc (6.8.1)
+ rdoc (6.9.1)
psych (>= 4.0.0)
redis (5.3.0)
redis-client (>= 0.22.0)
@@ -538,7 +538,7 @@ GEM
rainbow (>= 2.0, < 4.0)
rexml (~> 3.1)
regexp_parser (2.9.2)
- reline (0.5.11)
+ reline (0.6.0)
io-console (~> 0.5)
request_store (1.7.0)
rack (>= 1.4)
@@ -684,7 +684,7 @@ GEM
thread_safe (0.3.6)
tilt (2.4.0)
timecop (0.9.10)
- timeout (0.4.2)
+ timeout (0.4.3)
tins (1.37.0)
bigdecimal
sync
@@ -758,7 +758,7 @@ DEPENDENCIES
axe-core-rspec
babel-transpiler
bcrypt_pbkdf
- blacklight (~> 7.38.0)
+ blacklight (~> 8.7.0)
blacklight-hierarchy
blacklight-marc (~> 8.1)
blacklight_dynamic_sitemap
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 7fac5f9ac..bb70be089 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -23,3 +23,11 @@
//
//= require ./custom_range_limit.js
//= require ./orangelight.js
+
+// Wait for the modal to open
+document.addEventListener('show.blacklight.blacklight-modal', function () {
+ // Wait for the form to be submitted successfully
+ $('.modal_form').on('ajax:success', function () {
+ Blacklight.Modal.hide();
+ });
+});
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 %>
-
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/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
index bc66b7804..bf482fc2c 100644
--- a/app/controllers/catalog_controller.rb
+++ b/app/controllers/catalog_controller.rb
@@ -689,6 +689,7 @@ class CatalogController < ApplicationController
config.add_email_field 'pub_created_display', label: 'Published/Created'
config.add_email_field 'format', label: 'Format'
config.add_email_field 'electronic_access_1display', label: 'Online access', presenter: Orangelight::ElectronicAccessPlainTextPresenter
+ config.add_email_field 'electronic_portfolio_s', label: 'Online access', presenter: Orangelight::ElectronicPortfolioPlainTextPresenter
# If there are more than this many search results, no spelling ("did you
# mean") suggestion is offered.
diff --git a/app/presenters/orangelight/electronic_access_plain_text_presenter.rb b/app/presenters/orangelight/electronic_access_plain_text_presenter.rb
index 649588272..bf415fd5e 100644
--- a/app/presenters/orangelight/electronic_access_plain_text_presenter.rb
+++ b/app/presenters/orangelight/electronic_access_plain_text_presenter.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
module Orangelight
- # This class is responsible for presenting electonic access data from solr documents
+ # This class is responsible for presenting electronic access data from solr documents
# in a way suitable for plain text settings, like a plain text email
class ElectronicAccessPlainTextPresenter < Blacklight::FieldPresenter
def values
diff --git a/app/presenters/orangelight/electronic_portfolio_plain_text_presenter.rb b/app/presenters/orangelight/electronic_portfolio_plain_text_presenter.rb
new file mode 100644
index 000000000..6e0afa8b6
--- /dev/null
+++ b/app/presenters/orangelight/electronic_portfolio_plain_text_presenter.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+module Orangelight
+ # This class is responsible for presenting electronic portfolio data from solr documents
+ # in a way suitable for plain text settings, like a plain text email
+ class ElectronicPortfolioPlainTextPresenter < Blacklight::FieldPresenter
+ def values
+ super.map { |access_point| format_access_point(access_point) }
+ end
+
+ private
+
+ # :reek:DuplicateMethodCall
+ # :reek:UtilityFunction
+ def format_access_point(access_point)
+ portfolio = JSON.parse(access_point)
+ "\t#{portfolio['title']}: #{portfolio['url']}\n"
+ end
+ end
+end
diff --git a/app/views/catalog/_ask_a_question_form.html.erb b/app/views/catalog/_ask_a_question_form.html.erb
index 751356010..403b7cd61 100644
--- a/app/views/catalog/_ask_a_question_form.html.erb
+++ b/app/views/catalog/_ask_a_question_form.html.erb
@@ -1,6 +1,7 @@
<%= render :partial=>'shared/flash_msg' %>
<%= simple_form_for(
form,
+ remote: true,
url: contact_question_path,
data: { blacklight_modal: 'trigger' },
html: {class: "modal_form"}
@@ -16,9 +17,9 @@
<%= f.input :context, as: :hidden %>
<%= f.input :title, as: :hidden %>
<%= f.input :feedback_desc, as: :hidden %>
-
-
-<% end %>
+
+ <% end %>
+
diff --git a/app/views/catalog/_report_biased_results_form.html.erb b/app/views/catalog/_report_biased_results_form.html.erb
index 4ff83b6c4..43ef60b68 100644
--- a/app/views/catalog/_report_biased_results_form.html.erb
+++ b/app/views/catalog/_report_biased_results_form.html.erb
@@ -35,7 +35,7 @@
<% end %>
diff --git a/app/views/catalog/_report_harmful_language_form.html.erb b/app/views/catalog/_report_harmful_language_form.html.erb
index beddbb18f..91edad707 100644
--- a/app/views/catalog/_report_harmful_language_form.html.erb
+++ b/app/views/catalog/_report_harmful_language_form.html.erb
@@ -1,6 +1,7 @@
<%= render :partial=>'shared/flash_msg' %>
<%= simple_form_for(
form,
+ remote: true,
url: contact_report_harmful_language_path,
data: { blacklight_modal: 'trigger' },
html: { class: "modal_form" }
@@ -34,7 +35,7 @@
<%= f.input :feedback_desc, as: :hidden %>
<% end %>
diff --git a/app/views/catalog/_suggest_correction_form.html.erb b/app/views/catalog/_suggest_correction_form.html.erb
index 45e1c0e1c..078cd5ca1 100644
--- a/app/views/catalog/_suggest_correction_form.html.erb
+++ b/app/views/catalog/_suggest_correction_form.html.erb
@@ -2,6 +2,7 @@
<%= render :partial=>'shared/flash_msg' %>
<%= simple_form_for(
form,
+ remote: true,
url: contact_suggestion_path,
data: { blacklight_modal: 'trigger' },
html: { class: "modal_form" }
@@ -18,10 +19,9 @@
<%= f.input :context, as: :hidden %>
<%= f.input :title, as: :hidden %>
<%= f.input :feedback_desc, as: :hidden %>
-
-
+ <% 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
diff --git a/spec/features/report_harmful_language_spec.rb b/spec/features/report_harmful_language_spec.rb
index 6d9e11f94..ba6c96e9d 100644
--- a/spec/features/report_harmful_language_spec.rb
+++ b/spec/features/report_harmful_language_spec.rb
@@ -12,6 +12,7 @@
end
it 'gives an error when the email is invalid' do
+ pending 'see https://github.com/pulibrary/orangelight/issues/4655'
expect(page).to have_content 'Email is not a valid email address'
end
end
diff --git a/spec/presenters/orangelight/electronic_portfolio_plain_text_presenter_spec.rb b/spec/presenters/orangelight/electronic_portfolio_plain_text_presenter_spec.rb
new file mode 100644
index 000000000..fba183fd6
--- /dev/null
+++ b/spec/presenters/orangelight/electronic_portfolio_plain_text_presenter_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+require 'rails_helper'
+
+RSpec.describe Orangelight::ElectronicPortfolioPlainTextPresenter do
+ describe '#values' do
+ it 'is formatted nicely' do
+ document = SolrDocument.new({
+ electronic_portfolio_s: [
+ '{"desc":null,"title":"Full Text","url":"https://na05.alma.exlibrisgroup.com/view/uresolver/01PRI_INST/openurl?u.ignore_date_coverage=true&portfolio_pid=53827030770006421&Force_direct=true","start":null,"end":"latest"}',
+ '{"desc":null,"title":"Second Title","url":"https://example.com","start":null,"end":"latest"}'
+ ]
+ })
+ field_config = Blacklight::Configuration::Field.new(label: 'Online access', field: 'electronic_portfolio_s')
+ # rubocop:disable RSpec/VerifiedDoubles
+ view_context = double('View context', should_render_field?: true)
+ # rubocop:enable RSpec/VerifiedDoubles
+ presenter = described_class.new(view_context, document, field_config)
+ expect(presenter.values[0]).to eq("\tFull Text: https://na05.alma.exlibrisgroup.com/view/uresolver/01PRI_INST/openurl?u.ignore_date_coverage=true&portfolio_pid=53827030770006421&Force_direct=true\n")
+ expect(presenter.values[1]).to eq("\tSecond Title: https://example.com\n")
+ end
+ end
+end
diff --git a/spec/system/ask_a_question_form_spec.rb b/spec/system/ask_a_question_form_spec.rb
index 4739642dd..6a0636f72 100644
--- a/spec/system/ask_a_question_form_spec.rb
+++ b/spec/system/ask_a_question_form_spec.rb
@@ -22,4 +22,23 @@
expect(page).to have_text 'Your question has been submitted'
end
end
+ describe 'pressing the send button' do
+ before do
+ stub_libanswers_api
+ stub_holding_locations
+ visit '/catalog/99101035463506421'
+ scroll_to(:bottom) # needed when js: true
+ click_link 'Ask a Question'
+ fill_in 'ask_a_question_form_name', with: 'Agatha'
+ fill_in 'ask_a_question_form_email', with: 'agatha@poi.uk'
+ fill_in 'ask_a_question_form_message', with: 'Murder on the Orient Express'
+ end
+ it 'closes the modal', js: true do
+ expect(page).to have_text('Ask a Question')
+ expect(page).to have_text('Message')
+ click_button 'Send'
+ expect(current_path).to eq '/catalog/99101035463506421'
+ expect(page).not_to have_text('Message')
+ end
+ end
end
diff --git a/spec/system/report_harmful_language_form_spec.rb b/spec/system/report_harmful_language_form_spec.rb
index f627703f1..98cbeb744 100644
--- a/spec/system/report_harmful_language_form_spec.rb
+++ b/spec/system/report_harmful_language_form_spec.rb
@@ -20,4 +20,20 @@
expect(page).to have_text 'Thank you for reporting problematic language in the Princeton University Library catalog'
end
end
+ describe 'pressing the send button' do
+ before do
+ stub_libanswers_api
+ stub_holding_locations
+ visit '/catalog/99105509673506421'
+ scroll_to(:bottom) # needed when js: true
+ click_link 'Report Harmful Language'
+ fill_in 'report_harmful_language_form_message', with: 'Please correct the harmful content of this record'
+ end
+ it 'closes the modal', js: true do
+ expect(page).to have_text('You are reporting the use of harmful language in this catalog record')
+ click_button 'Send'
+ expect(current_path).to eq '/catalog/99105509673506421'
+ expect(page).not_to have_text('You are reporting the use of harmful language in this catalog record')
+ end
+ end
end
diff --git a/spec/system/suggest_correction_form_spec.rb b/spec/system/suggest_correction_form_spec.rb
index cc7abf7ff..ce10acc7c 100644
--- a/spec/system/suggest_correction_form_spec.rb
+++ b/spec/system/suggest_correction_form_spec.rb
@@ -22,4 +22,35 @@
expect(page).to have_text 'Your suggestion has been submitted'
end
end
+ describe 'pressing the cancel button' do
+ before do
+ stub_holding_locations
+ visit '/catalog/99105509673506421'
+ scroll_to(:bottom) # needed when js: true
+ click_link 'Suggest a Correction'
+ end
+ it 'closes the modal', js: true do
+ expect(page).to have_text('Please use this area to report errors or omissions')
+ click_button 'Cancel'
+ expect(page).not_to have_text('Please use this area to report errors or omissions')
+ end
+ end
+ describe 'pressing the send button' do
+ before do
+ stub_libanswers_api
+ stub_holding_locations
+ visit '/catalog/99105509673506421'
+ scroll_to(:bottom) # needed when js: true
+ click_link 'Suggest a Correction'
+ fill_in 'suggest_correction_form_name', with: 'Hercule Poirot'
+ fill_in 'suggest_correction_form_email', with: 'herpo@poi.her'
+ fill_in 'suggest_correction_form_message', with: 'Death on the Nile'
+ end
+ it 'closes the modal', js: true do
+ expect(page).to have_text('Please use this area to report errors or omissions')
+ click_button 'Send'
+ expect(current_path).to eq '/catalog/99105509673506421'
+ expect(page).not_to have_text('Please use this area to report errors or omissions')
+ end
+ end
end
diff --git a/spec/views/orangelight/email_record.text.erb_spec.rb b/spec/views/orangelight/email_record.text.erb_spec.rb
index b4e56e6fb..5977b6d21 100644
--- a/spec/views/orangelight/email_record.text.erb_spec.rb
+++ b/spec/views/orangelight/email_record.text.erb_spec.rb
@@ -134,10 +134,17 @@
]
}
end
+ let(:text) do
+ <<~TEXT
+ \tFull Text: https://na05.alma.exlibrisgroup.com/view/uresolver/01PRI_INST/openurl?u.ignore_date_coverage=true&portfolio_pid=53827030770006421&Force_direct=true
+ \tSecond Title: https://example.com
+ TEXT
+ end
it 'includes the electronic portfolio link' do
expect(rendered).to have_text('Full Text')
expect(rendered).to have_text('Second Title')
+ expect(rendered).to have_text(text)
end
end
end