Blacklight 8 and Bootstrap 5 Upgrade

Gemfile

@@ -5,10 +5,10 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby '3.4.1'
 
-gem 'blacklight', '~> 7.38'
-gem 'blacklight_oai_provider'
+gem 'blacklight', '~> 8.12.3'
+gem 'blacklight_oai_provider', github: 'projectblacklight/blacklight_oai_provider', ref: '69795b0'
 gem 'bootsnap', require: false
-gem 'bootstrap', '~> 4.0'
+gem 'bootstrap', '~> 5.1.3'
 gem 'bot_challenge_page', '~> 0.3.0'
 gem 'cancancan'
 gem 'devise'

Gemfile.lock

@@ -1,3 +1,13 @@
+GIT
+  remote: https://github.com/projectblacklight/blacklight_oai_provider.git
+  revision: 69795b06cc37150386b6d9732be027d200412598
+  ref: 69795b0
+  specs:
+    blacklight_oai_provider (7.0.2)
+      blacklight (>= 7.0, < 9)
+      oai (~> 1.2)
+      rexml
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -91,26 +101,21 @@ GEM
       smart_properties
     bigdecimal (3.3.1)
     bindex (0.8.1)
-    blacklight (7.40.0)
-      deprecation
+    blacklight (8.12.3)
       globalid
-      hashdiff
       i18n (>= 1.7.0)
       jbuilder (~> 2.7)
       kaminari (>= 0.15)
       ostruct (>= 0.3.2)
-      rails (>= 6.1, < 7.3)
-      view_component (>= 2.74, < 4)
+      rails (>= 6.1, < 9)
+      view_component (>= 2.74, < 5)
       zeitwerk
-    blacklight_oai_provider (7.0.2)
-      blacklight (~> 7.0)
-      oai (~> 1.2)
-      rexml
     bootsnap (1.18.4)
       msgpack (~> 1.2)
-    bootstrap (4.6.2.1)
+    bootstrap (5.1.3)
       autoprefixer-rails (>= 9.1.0)
-      popper_js (>= 1.16.1, < 2)
+      popper_js (>= 2.9.3, < 3)
+      sassc-rails (>= 2.0.0)
     bot_challenge_page (0.3.0)
       http (~> 5.2)
       rack-attack (~> 6.7)
@@ -137,8 +142,6 @@ GEM
       rexml
     crass (1.0.6)
     date (3.5.1)
-    deprecation (1.1.0)
-      activesupport
     devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -275,18 +278,19 @@ GEM
       racc (~> 1.4)
     nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
-    oai (1.2.1)
+    oai (1.3.0)
       builder (>= 3.1.0)
       faraday (< 3)
       faraday-follow_redirects (>= 0.3.0, < 2)
+      rexml
     okcomputer (1.19.0)
     orm_adapter (0.5.0)
     ostruct (0.6.1)
     parallel (1.27.0)
     parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
-    popper_js (1.16.1)
+    popper_js (2.11.8)
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
@@ -527,10 +531,10 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  blacklight (~> 7.38)
-  blacklight_oai_provider
+  blacklight (~> 8.12.3)
+  blacklight_oai_provider!
   bootsnap
-  bootstrap (~> 4.0)
+  bootstrap (~> 5.1.3)
   bot_challenge_page (~> 0.3.0)
   byebug
   cancancan

app/assets/config/manifest.js

@@ -3,4 +3,14 @@
 //= link_tree ../../javascript .js
 //= link_tree ../../../vendor/javascript .js
 
-//= link application.js
+//= link application.js
+//= link blacklight/bookmark_toggle.js
+//= link blacklight/button_focus.js
+//= link blacklight/checkbox_submit.js
+//= link blacklight/core.js
+//= link blacklight/debounce.js
+//= link blacklight/facet_suggest.js
+//= link blacklight/index.js
+//= link blacklight/modal.js
+//= link blacklight/modalForm.js
+//= link blacklight/search_context.js

app/assets/stylesheets/custom.scss

@@ -18,6 +18,7 @@ $theme-colors: (
     margin-left: 30px;
     padding-left: 1rem;
     padding-right: 0;
+    text-decoration: none;
 
     &:hover {
       text-decoration: none;
@@ -45,3 +46,25 @@ $theme-colors: (
     text-decoration: none;
   }
 }
+
+.container {
+  max-width: 1140px;
+}
+
+a {
+  text-decoration: none;
+
+  &:hover,
+  &:focus {
+    text-decoration: underline;
+  }
+}
+
+.btn {
+  &:hover,
+  &:focus {
+    text-decoration: none;
+  }
+}
+
+

app/views/errors/_error_contact_links.html.erb

@@ -1,4 +1,4 @@
 <span id="contact_link">
   <%= link_to 'reporting this errors', I18n.t('libraries_help_link'), target: '_blank' %>
-  <span class="sr-only">this link will open in a new tab</span>
+  <span class="visually-hidden">this link will open in a new tab</span>
 </span>

app/views/shared/_footer.html.erb

@@ -1,9 +1,9 @@
 <footer class="bg-dark text-center text-white">
   <div class="container p-4">
-    <%= link_to 'The University Libraries', 'https://libraries.psu.edu/', class: 'text-white pr-3', target: '_blank' %> <span class="sr-only">link opens in a new tab</span>
-    <%= link_to "#{current_partner.name}", EtdaUtilities::Hosts.workflow_url, class: 'text-white pr-3', target: '_blank' %> <span class="sr-only">link opens in a new tab</span>
-    <%= link_to "© #{Time.now.year} The Pennsylvania State University", 'http://www.psu.edu/copyright-information/', class: 'text-white pr-3', target: '_blank' %> <span class="sr-only">link opens in a new tab</span>
-    <%= link_to 'Accessibility', 'https://libraries.psu.edu/about/accessibility/request-accommodation-accessibility-help', class: 'text-white pr-3', target: '_blank' %> <span class="sr-only">link opens in a new tab</span>
-    <%= link_to 'Support', 'https://libraries.psu.edu/website-feedback', class: 'text-white pr-3', target: '_blank' %> <span class="sr-only">link opens in a new tab</span>
+    <%= link_to 'The University Libraries', 'https://libraries.psu.edu/', class: 'text-white pe-3', target: '_blank' %> <span class="visually-hidden">link opens in a new tab</span>
+    <%= link_to "#{current_partner.name}", EtdaUtilities::Hosts.workflow_url, class: 'text-white pe-3', target: '_blank' %> <span class="visually-hidden">link opens in a new tab</span>
+    <%= link_to "© #{Time.now.year} The Pennsylvania State University", 'http://www.psu.edu/copyright-information/', class: 'text-white pe-3', target: '_blank' %> <span class="visually-hidden">link opens in a new tab</span>
+    <%= link_to 'Accessibility', 'https://libraries.psu.edu/about/accessibility/request-accommodation-accessibility-help', class: 'text-white pe-3', target: '_blank' %> <span class="visually-hidden">link opens in a new tab</span>
+    <%= link_to 'Support', 'https://libraries.psu.edu/website-feedback', class: 'text-white pe-3', target: '_blank' %> <span class="visually-hidden">link opens in a new tab</span>
   </div>
 </footer>

app/views/shared/_header_navbar.html.erb

@@ -1,12 +1,12 @@
 <nav class="navbar navbar-expand-md navbar-dark bg-dark topbar" role="navigation">
   <div class="<%= container_classes %>">
-    <div class="col-md-1 mr-5">
+    <div class="col-md-1 me-5">
       <a id="psulib-shield" href="https://libraries.psu.edu/">
         <%= image_tag 'PS_UL_REV_RGB_2C.png', alt: 'PSU Libraries logo', width: '150' %>
       </a>
     </div>
 
-    <h4 class="col-md-8 logo-title pr-0 mt-1"><%= link_to "#{current_partner.header_title}", '/' %></h4>
+    <h4 class="col-md-8 logo-title pe-0 mt-1"><%= link_to "#{current_partner.header_title}", '/' %></h4>
 
     <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-bs-toggle="collapse" data-target="#user-util-collapse" data-bs-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
@@ -27,8 +27,8 @@
         params: search_state.params_for_search.except(:qt),
         autocomplete_path: search_action_path(action: :suggest))) %>
 
-    <div class="justify-content-md-end row">
-      <%= link_to 'About', '/about', class: 'btn btn-outline-dark btn-sm mr-2' %>
+    <div class="justify-content-md-end d-flex align-items-center">
+      <%= link_to 'About', '/about', class: 'btn btn-outline-dark btn-sm me-2' %>
       <%= link_to 'Add My Work', EtdaUtilities::Hosts.workflow_url, class: 'btn btn-outline-dark btn-sm' %>
     </div>
   </div>

spec/integration/search_spec.rb

@@ -14,7 +14,7 @@
     visit '/'
     select('All Fields', from: 'search_field')
     fill_in 'q', with: title
-    click_link_or_button 'Search'
+    click_link_or_button 'Explore'
     expect(all('.document-title-heading').count).to be > 0
     expect(page).to have_content @doc.doc[:last_name_ssi]
   end
@@ -24,7 +24,7 @@
     visit '/'
     select('Author Name', from: 'search_field')
     fill_in 'q', with: last_name
-    click_link_or_button 'Search'
+    click_link_or_button 'Explore'
     expect(all('.document-title-heading').count).to be > 0
     expect(page).to have_content @doc.doc[:title_ssi]
   end
@@ -34,7 +34,7 @@
     visit '/'
     select('Title', from: 'search_field')
     fill_in 'q', with: title
-    click_link_or_button 'Search'
+    click_link_or_button 'Explore'
     expect(all('.document-title-heading').count).to be > 0
     expect(page).to have_content @doc.doc[:last_name_ssi]
   end
@@ -44,7 +44,7 @@
     visit '/'
     select('Graduate Program', from: 'search_field')
     fill_in 'q', with: program
-    click_link_or_button 'Search'
+    click_link_or_button 'Explore'
     expect(all('.document-title-heading').count).to be > 0
     expect(page).to have_css '.blacklight-program_name_ssi', text: @doc.doc[:program_name_ssi]
   end
@@ -54,7 +54,7 @@
     visit '/'
     select('Keyword', from: 'search_field')
     fill_in 'q', with: keyword
-    click_link_or_button 'Search'
+    click_link_or_button 'Explore'
     expect(all('.document-title-heading').count).to be > 0
     expect(page).to have_css '.blacklight-keyword_ssim', text: /#{@doc.doc[:keyword_ssi]}/
   end
@@ -64,7 +64,7 @@
     visit '/'
     select('Committee Member', from: 'search_field')
     fill_in 'q', with: committee_member
-    click_link_or_button 'Search'
+    click_link_or_button 'Explore'
     expect(all('.document-title-heading').count).to be > 0
     expect(page).to have_content @doc.doc[:title_ssi]
   end
@@ -74,7 +74,7 @@
     visit '/'
     select('Abstract', from: 'search_field')
     fill_in 'q', with: abstract
-    click_link_or_button 'Search'
+    click_link_or_button 'Explore'
     expect(all('.document-title-heading').count).to be > 0
     expect(page).to have_content @doc.doc[:title_ssi]
   end