From a478f1b2347e5c3ed290562b79b1035a5747d14d Mon Sep 17 00:00:00 2001 From: Eliot Jordan Date: Mon, 30 Jan 2023 10:32:38 -0600 Subject: [PATCH 01/14] Upgrade to Blacklight 7.33 Co-authored-by: Anna Headley --- Gemfile | 2 +- Gemfile.lock | 173 ++++++++++--------- app/controllers/search_history_controller.rb | 1 - 3 files changed, 95 insertions(+), 81 deletions(-) diff --git a/Gemfile b/Gemfile index 5b41e7f5..899d0cd4 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' gem 'bitters', '~> 1.2.0' gem 'bixby', '~> 5.0' # Locked to Blacklight 7.24 as 7.25.1 currently breaks range limit -gem 'blacklight', '~> 7.24.0' +gem 'blacklight', '~> 7.33.0' gem 'blacklight-gallery' gem 'blacklight_range_limit' gem 'bootstrap', '~> 4.0' diff --git a/Gemfile.lock b/Gemfile.lock index b5f8ec64..e8cf90ef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,60 +8,60 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.1.6.1) - actionpack (= 6.1.6.1) - activesupport (= 6.1.6.1) + actioncable (6.1.7.2) + actionpack (= 6.1.7.2) + activesupport (= 6.1.7.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.6.1) - actionpack (= 6.1.6.1) - activejob (= 6.1.6.1) - activerecord (= 6.1.6.1) - activestorage (= 6.1.6.1) - activesupport (= 6.1.6.1) + actionmailbox (6.1.7.2) + actionpack (= 6.1.7.2) + activejob (= 6.1.7.2) + activerecord (= 6.1.7.2) + activestorage (= 6.1.7.2) + activesupport (= 6.1.7.2) mail (>= 2.7.1) - actionmailer (6.1.6.1) - actionpack (= 6.1.6.1) - actionview (= 6.1.6.1) - activejob (= 6.1.6.1) - activesupport (= 6.1.6.1) + actionmailer (6.1.7.2) + actionpack (= 6.1.7.2) + actionview (= 6.1.7.2) + activejob (= 6.1.7.2) + activesupport (= 6.1.7.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.6.1) - actionview (= 6.1.6.1) - activesupport (= 6.1.6.1) + actionpack (6.1.7.2) + actionview (= 6.1.7.2) + activesupport (= 6.1.7.2) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.6.1) - actionpack (= 6.1.6.1) - activerecord (= 6.1.6.1) - activestorage (= 6.1.6.1) - activesupport (= 6.1.6.1) + actiontext (6.1.7.2) + actionpack (= 6.1.7.2) + activerecord (= 6.1.7.2) + activestorage (= 6.1.7.2) + activesupport (= 6.1.7.2) nokogiri (>= 1.8.5) - actionview (6.1.6.1) - activesupport (= 6.1.6.1) + actionview (6.1.7.2) + activesupport (= 6.1.7.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.6.1) - activesupport (= 6.1.6.1) + activejob (6.1.7.2) + activesupport (= 6.1.7.2) globalid (>= 0.3.6) - activemodel (6.1.6.1) - activesupport (= 6.1.6.1) - activerecord (6.1.6.1) - activemodel (= 6.1.6.1) - activesupport (= 6.1.6.1) - activestorage (6.1.6.1) - actionpack (= 6.1.6.1) - activejob (= 6.1.6.1) - activerecord (= 6.1.6.1) - activesupport (= 6.1.6.1) + activemodel (6.1.7.2) + activesupport (= 6.1.7.2) + activerecord (6.1.7.2) + activemodel (= 6.1.7.2) + activesupport (= 6.1.7.2) + activestorage (6.1.7.2) + actionpack (= 6.1.7.2) + activejob (= 6.1.7.2) + activerecord (= 6.1.7.2) + activesupport (= 6.1.7.2) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.6.1) + activesupport (6.1.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -89,22 +89,23 @@ GEM rubocop-performance rubocop-rails rubocop-rspec - blacklight (7.24.0) + blacklight (7.33.0) deprecation globalid + hashdiff i18n (>= 1.7.0) jbuilder (~> 2.7) kaminari (>= 0.15) ostruct (>= 0.3.2) rails (>= 5.1, < 7.1) - view_component (~> 2.43) + view_component (~> 2.66) blacklight-gallery (2.1.0) blacklight (~> 7.7) bootstrap (~> 4.0) openseadragon (>= 0.2.0) rails (>= 5.1, < 7) - blacklight_range_limit (8.1.0) - blacklight (~> 7.0) + blacklight_range_limit (8.2.3) + blacklight (>= 7.25.2, < 9) bootstrap (4.6.1) autoprefixer-rails (>= 9.1.0) popper_js (>= 1.14.3, < 2) @@ -148,10 +149,17 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) + coveralls (0.8.23) + json (>= 1.8, < 3) + simplecov (~> 0.16.1) + term-ansicolor (~> 1.3) + thor (>= 0.19.4, < 2.0) + tins (~> 1.6) crack (0.4.5) rexml crass (1.0.6) + date (3.3.3) debug_inspector (1.1.0) deprecation (1.1.0) activesupport @@ -174,7 +182,7 @@ GEM scanf (~> 1.0) sxp (~> 1.2) unicode-types (~> 1.7) - erubi (1.10.0) + erubi (1.12.0) execjs (2.8.1) faraday (2.2.0) faraday-net_http (~> 2.0) @@ -183,7 +191,7 @@ GEM ffi (1.15.5) font-awesome-sass (4.7.0) sass (>= 3.2) - globalid (1.0.0) + globalid (1.1.0) activesupport (>= 5.0) haml (5.2.2) temple (>= 0.8.0) @@ -232,11 +240,14 @@ GEM kaminari-core (= 1.2.2) kaminari-core (1.2.2) link_header (0.0.8) - loofah (2.18.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.1) + mail (2.8.0.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp mail_form (1.9.0) actionmailer (>= 5.2) activemodel (>= 5.2) @@ -247,15 +258,16 @@ GEM nokogiri (~> 1) rake mini_mime (1.1.2) - mini_portile2 (2.8.0) - minitest (5.16.2) + mini_portile2 (2.8.1) + minitest (5.17.0) modernizr-rails (2.7.1) multi_json (1.15.0) - net-imap (0.3.1) + net-imap (0.3.4) + date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.1.3) + net-protocol (0.2.1) timeout net-scp (4.0.0) net-ssh (>= 2.6.5, < 8.0.0) @@ -263,7 +275,7 @@ GEM net-protocol net-ssh (7.0.1) nio4r (2.5.8) - nokogiri (1.13.9) + nokogiri (1.13.10) mini_portile2 (~> 2.8.0) racc (~> 1.4) openseadragon (0.6.0) @@ -283,24 +295,24 @@ GEM byebug (~> 11.0) pry (~> 0.13.0) public_suffix (4.0.6) - racc (1.6.0) - rack (2.2.4) + racc (1.6.2) + rack (2.2.6.2) rack-test (2.0.2) rack (>= 1.3) - rails (6.1.6.1) - actioncable (= 6.1.6.1) - actionmailbox (= 6.1.6.1) - actionmailer (= 6.1.6.1) - actionpack (= 6.1.6.1) - actiontext (= 6.1.6.1) - actionview (= 6.1.6.1) - activejob (= 6.1.6.1) - activemodel (= 6.1.6.1) - activerecord (= 6.1.6.1) - activestorage (= 6.1.6.1) - activesupport (= 6.1.6.1) + rails (6.1.7.2) + actioncable (= 6.1.7.2) + actionmailbox (= 6.1.7.2) + actionmailer (= 6.1.7.2) + actionpack (= 6.1.7.2) + actiontext (= 6.1.7.2) + actionview (= 6.1.7.2) + activejob (= 6.1.7.2) + activemodel (= 6.1.7.2) + activerecord (= 6.1.7.2) + activestorage (= 6.1.7.2) + activesupport (= 6.1.7.2) bundler (>= 1.15.0) - railties (= 6.1.6.1) + railties (= 6.1.7.2) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -309,14 +321,14 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) rails-i18n (7.0.3) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (6.1.6.1) - actionpack (= 6.1.6.1) - activesupport (= 6.1.6.1) + railties (6.1.7.2) + actionpack (= 6.1.7.2) + activesupport (= 6.1.7.2) method_source rake (>= 12.2) thor (~> 1.0) @@ -440,9 +452,9 @@ GEM rbtree set (~> 1.0) spring (4.0.0) - sprockets (4.1.1) + sprockets (4.2.0) concurrent-ruby (~> 1.0) - rack (> 1, < 3) + rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) @@ -458,17 +470,20 @@ GEM unicode-display_width (>= 1.1.1, < 3) thor (1.2.1) tilt (2.0.10) - timeout (0.3.0) + timeout (0.3.1) + tins (1.31.0) + sync turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (2.0.4) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (1.4.1) unicode-types (1.8.0) vcr (6.1.0) - view_component (2.53.0) - activesupport (>= 5.0.0, < 8.0) + view_component (2.82.0) + activesupport (>= 5.2.0, < 8.0) + concurrent-ruby (~> 1.0) method_source (~> 1.0) warden (1.2.9) rack (>= 2.0.9) @@ -489,7 +504,7 @@ GEM nokogiri (~> 1.8) yard (0.9.27) webrick (~> 1.7.0) - zeitwerk (2.6.0) + zeitwerk (2.6.6) PLATFORMS ruby @@ -497,7 +512,7 @@ PLATFORMS DEPENDENCIES bitters (~> 1.2.0) bixby (~> 5.0) - blacklight (~> 7.24.0) + blacklight (~> 7.33.0) blacklight-gallery blacklight_range_limit bootstrap (~> 4.0) diff --git a/app/controllers/search_history_controller.rb b/app/controllers/search_history_controller.rb index 83a21bb7..89c2a2dc 100644 --- a/app/controllers/search_history_controller.rb +++ b/app/controllers/search_history_controller.rb @@ -2,6 +2,5 @@ class SearchHistoryController < ApplicationController include Blacklight::SearchHistory - helper BlacklightRangeLimit::ViewHelperOverride helper RangeLimitHelper end From 62b79bfafee780220459be50a5534f1e06ac3de8 Mon Sep 17 00:00:00 2001 From: Anna Headley Date: Mon, 30 Jan 2023 12:08:43 -0500 Subject: [PATCH 02/14] Update masonry configuration in catalog controller resolves deprecation warning, but doesn't look right yet. Co-authored-by: Eliot Jordan --- app/controllers/catalog_controller.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index cb1e5589..4f82ced0 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -7,9 +7,7 @@ class CatalogController < ApplicationController helper Openseadragon::OpenseadragonHelper configure_blacklight do |config| - # config.view.gallery.partials = [:index_header, :index] - config.view.masonry.partials = [:index] - # config.view.slideshow.partials = [:index] + config.view.masonry! config.index.thumbnail_method = :thumbnail_from_manifest # config.show.tile_source_field = :content_metadata_image_iiif_info_ssm # config.show.partials.insert(0, :openseadragon) From 3ffd26cda2e68394896ba4cdd0a2ad8f4747bf4d Mon Sep 17 00:00:00 2001 From: Anna Headley Date: Mon, 30 Jan 2023 12:17:26 -0500 Subject: [PATCH 03/14] Use new SearchBarComponent eliminates a deprecation warning: render_search_bar is deprecated and will be removed from a future release (Call `render Blacklight::SearchBarComponent.new' instead). (called from _app_views_shared__header_navbar_html_erb___903966786867993672_57000 at lae-blacklight/app/views/shared/_header_navbar.html.erb:27) Co-authored-by: Eliot Jordan --- app/views/shared/_header_navbar.html.erb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/views/shared/_header_navbar.html.erb b/app/views/shared/_header_navbar.html.erb index c41a8a38..929cbaed 100644 --- a/app/views/shared/_header_navbar.html.erb +++ b/app/views/shared/_header_navbar.html.erb @@ -22,9 +22,13 @@
<%= render partial: '/user_util_links' %>
- +
- <%= render_search_bar %> + <%= render Blacklight::SearchBarComponent.new( + url: search_action_url, + params: search_state.params_for_search.except(:qt) + ) + %>
From 912ab1c12e4ec193ee70863fac3087d2a2aacba4 Mon Sep 17 00:00:00 2001 From: Anna Headley Date: Mon, 30 Jan 2023 14:55:06 -0500 Subject: [PATCH 04/14] remove search_form partial This appears to have only ever been overridden for style purposes, but the current upstream search form looks nearly identical to ours at this point, actually probably better. The partial itself is no longer used due to new view component. --- app/views/catalog/_search_form.html.erb | 30 ------------------------- 1 file changed, 30 deletions(-) delete mode 100644 app/views/catalog/_search_form.html.erb diff --git a/app/views/catalog/_search_form.html.erb b/app/views/catalog/_search_form.html.erb deleted file mode 100644 index ffe2d074..00000000 --- a/app/views/catalog/_search_form.html.erb +++ /dev/null @@ -1,30 +0,0 @@ - <%= form_tag search_action_url, :method => :get, :class => 'search', :role => 'search' do %> - <%= render_hash_as_hidden_fields(search_state.params_for_search().except(:q, :search_field, :qt, :page, :utf8)) %> - -
- <% unless search_fields.empty? %> - -
- - <%= select_tag(:search_field, options_for_select(search_fields, h(params[:search_field])), :title => t('blacklight.search.form.search_field.title'), :class=>"search_field btn dropdown-toggle") %> - <%= t('blacklight.search.form.search_field.post_label') %> -
- <% end %> - - <%= text_field_tag :q, params[:q], :placeholder => t('blacklight.search.form.search.placeholder'), :class => "search_q q form-control", :id => "q", :autofocus => should_autofocus_on_search_box? %> - - - - -
- - <% end %> From c110c2857af6352d8cd360300090751e9073a075 Mon Sep 17 00:00:00 2001 From: Eliot Jordan Date: Mon, 30 Jan 2023 14:45:37 -0600 Subject: [PATCH 05/14] Added id and locale to search_state_fields Co-authored-by: Anna Headley --- app/controllers/catalog_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index 4f82ced0..aa59fdd6 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -9,6 +9,7 @@ class CatalogController < ApplicationController configure_blacklight do |config| config.view.masonry! config.index.thumbnail_method = :thumbnail_from_manifest + config.search_state_fields = config.search_state_fields + [:id, :locale] # config.show.tile_source_field = :content_metadata_image_iiif_info_ssm # config.show.partials.insert(0, :openseadragon) config.index.display_type_field = 'genre_pul_label_facet' From 407ff9cc71af27087dbbb3f106dc35b041e1781a Mon Sep 17 00:00:00 2001 From: Eliot Jordan Date: Mon, 30 Jan 2023 14:52:28 -0600 Subject: [PATCH 06/14] Use SearchContextComponent instead of _previous_next_doc partial Co-authored-by: Anna Headley --- app/views/catalog/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/catalog/show.html.erb b/app/views/catalog/show.html.erb index 7bde3210..ad59d6f3 100644 --- a/app/views/catalog/show.html.erb +++ b/app/views/catalog/show.html.erb @@ -1,6 +1,6 @@
- <%= render 'previous_next_doc' %> + <%= render(Blacklight::SearchContextComponent.new(search_context: @search_context, search_session: search_session)) %> <% @page_title = t('blacklight.search.show.title', :document_title => document_show_html_title, :application_name => application_name).html_safe -%> <% content_for(:head) { render_link_rel_alternates } -%> From 07805baf3d7178cfbdca1b4e31c813d6534bddb5 Mon Sep 17 00:00:00 2001 From: Anna Headley Date: Mon, 30 Jan 2023 16:04:39 -0500 Subject: [PATCH 07/14] Use document_presenter.html_title Co-authored-by: Eliot Jordan --- app/views/catalog/show.html.erb | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/app/views/catalog/show.html.erb b/app/views/catalog/show.html.erb index ad59d6f3..c2c8fdfb 100644 --- a/app/views/catalog/show.html.erb +++ b/app/views/catalog/show.html.erb @@ -1,28 +1,25 @@
<%= render(Blacklight::SearchContextComponent.new(search_context: @search_context, search_session: search_session)) %> - - <% @page_title = t('blacklight.search.show.title', :document_title => document_show_html_title, :application_name => application_name).html_safe -%> + + <% @page_title = t('blacklight.search.show.title', document_title: document_presenter(@document).html_title, application_name: application_name).html_safe -%> <% content_for(:head) { render_link_rel_alternates } -%> <%# this should be in a partial -%> <% @manifest = IIIF::Service.parse(@document['manifest']) %> -
-
- + <%= render_document_partials @document, blacklight_config.view_config(:show).partials %>
- <% if @document.respond_to?(:export_as_openurl_ctx_kev) %> - <% end %> From c1555ee8ca00ba1964f27c04336e2985469eec02 Mon Sep 17 00:00:00 2001 From: Anna Headley Date: Mon, 30 Jan 2023 16:12:48 -0500 Subject: [PATCH 08/14] Use document presenter title for page heading Instead of deprecated helper Co-authored-by: Eliot Jordan --- app/views/catalog/_show_header_default.html.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/catalog/_show_header_default.html.erb b/app/views/catalog/_show_header_default.html.erb index 5bf7057c..d423521c 100644 --- a/app/views/catalog/_show_header_default.html.erb +++ b/app/views/catalog/_show_header_default.html.erb @@ -1,2 +1 @@ -<% # bookmark/folder functions -%> -<%= render_document_heading(@document, :tag => :h1) %> \ No newline at end of file +<%= tag.h1 document_presenter(@document).html_title %> From 3f7515dd2124d4e29be02708086da3b8c5e507de Mon Sep 17 00:00:00 2001 From: Anna Headley Date: Mon, 30 Jan 2023 16:16:37 -0500 Subject: [PATCH 09/14] Use response.documents instead of document_list silence deprecation Co-authored-by: Eliot Jordan --- app/views/bookmarks/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/bookmarks/index.html.erb b/app/views/bookmarks/index.html.erb index 2e8eff50..de3cb72c 100644 --- a/app/views/bookmarks/index.html.erb +++ b/app/views/bookmarks/index.html.erb @@ -5,7 +5,7 @@

<%= t('blacklight.bookmarks.need_login') %>

-<%- elsif @document_list.blank? -%> +<%- elsif @response.documents.blank? -%>

<%= t('blacklight.bookmarks.no_bookmarks') %>

<% else %> From ea4551da31da2e59ec2dad4a6d700f40a0e54d43 Mon Sep 17 00:00:00 2001 From: Anna Headley Date: Mon, 30 Jan 2023 16:18:28 -0500 Subject: [PATCH 10/14] pass argument to render_document_index silence deprecation Co-authored-by: Eliot Jordan --- app/views/bookmarks/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/bookmarks/index.html.erb b/app/views/bookmarks/index.html.erb index de3cb72c..e575b874 100644 --- a/app/views/bookmarks/index.html.erb +++ b/app/views/bookmarks/index.html.erb @@ -12,7 +12,7 @@ <%= render 'sort_and_per_page' %> <%= render 'tools' %> - <%= render_document_index %> + <%= render_document_index @response.documents %> <%= render 'results_pagination' %> <% end %>
From 03e7a0a2c99d6e1196659cfc0dbf9954fca9811d Mon Sep 17 00:00:00 2001 From: Anna Headley Date: Mon, 30 Jan 2023 16:44:20 -0500 Subject: [PATCH 11/14] Upgrade blacklight-gallery, limit scope of header styling and change tabs to spaces in a couple files Co-authored-by: Eliot Jordan --- Gemfile | 4 +- Gemfile.lock | 27 +-- app/assets/javascripts/blacklight_gallery.js | 3 +- app/assets/stylesheets/lae--header.scss | 190 +++++++++---------- app/controllers/catalog_controller.rb | 4 +- app/views/pages/index.html.erb | 36 ++-- 6 files changed, 129 insertions(+), 135 deletions(-) diff --git a/Gemfile b/Gemfile index 899d0cd4..a334b83d 100644 --- a/Gemfile +++ b/Gemfile @@ -3,9 +3,8 @@ source 'https://rubygems.org' gem 'bitters', '~> 1.2.0' gem 'bixby', '~> 5.0' -# Locked to Blacklight 7.24 as 7.25.1 currently breaks range limit gem 'blacklight', '~> 7.33.0' -gem 'blacklight-gallery' +gem 'blacklight-gallery', '~>4.0' gem 'blacklight_range_limit' gem 'bootstrap', '~> 4.0' gem 'bourbon', '~> 7.0' @@ -32,6 +31,7 @@ gem "mail_form" gem "mimemagic", "~> 0.3" gem 'modernizr-rails' gem 'nokogiri', '~> 1.13.9' +gem 'openseadragon' gem "pg" gem "progressbar" gem 'pul_uv_rails', github: 'pulibrary/pul_uv_rails', branch: 'main' diff --git a/Gemfile.lock b/Gemfile.lock index e8cf90ef..6cc58f4e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,16 +99,14 @@ GEM ostruct (>= 0.3.2) rails (>= 5.1, < 7.1) view_component (~> 2.66) - blacklight-gallery (2.1.0) - blacklight (~> 7.7) - bootstrap (~> 4.0) - openseadragon (>= 0.2.0) - rails (>= 5.1, < 7) + blacklight-gallery (4.0.2) + blacklight (~> 7.17) + rails (>= 5.1, < 8) blacklight_range_limit (8.2.3) blacklight (>= 7.25.2, < 9) - bootstrap (4.6.1) + bootstrap (4.6.2) autoprefixer-rails (>= 9.1.0) - popper_js (>= 1.14.3, < 2) + popper_js (>= 1.16.1, < 2) sassc-rails (>= 2.0.0) bourbon (7.2.0) thor (~> 1.0) @@ -150,12 +148,6 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.2.0) - coveralls (0.8.23) - json (>= 1.8, < 3) - simplecov (~> 0.16.1) - term-ansicolor (~> 1.3) - thor (>= 0.19.4, < 2.0) - tins (~> 1.6) crack (0.4.5) rexml crass (1.0.6) @@ -286,7 +278,7 @@ GEM parser (3.1.2.0) ast (~> 2.4.1) pg (1.3.4) - popper_js (1.16.0) + popper_js (1.16.1) progressbar (1.11.0) pry (0.13.1) coderay (~> 1.1) @@ -469,10 +461,8 @@ GEM terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.2.1) - tilt (2.0.10) + tilt (2.0.11) timeout (0.3.1) - tins (1.31.0) - sync turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) @@ -513,7 +503,7 @@ DEPENDENCIES bitters (~> 1.2.0) bixby (~> 5.0) blacklight (~> 7.33.0) - blacklight-gallery + blacklight-gallery (~> 4.0) blacklight_range_limit bootstrap (~> 4.0) bourbon (~> 7.0) @@ -546,6 +536,7 @@ DEPENDENCIES net-pop net-smtp nokogiri (~> 1.13.9) + openseadragon pg progressbar pry-byebug diff --git a/app/assets/javascripts/blacklight_gallery.js b/app/assets/javascripts/blacklight_gallery.js index 992a7d4d..ed461ee7 100644 --- a/app/assets/javascripts/blacklight_gallery.js +++ b/app/assets/javascripts/blacklight_gallery.js @@ -1 +1,2 @@ -//= require blacklight_gallery/default \ No newline at end of file +//= require blacklight_gallery/default +//= require blacklight_gallery/osd_viewer diff --git a/app/assets/stylesheets/lae--header.scss b/app/assets/stylesheets/lae--header.scss index e2229879..9dcab7de 100644 --- a/app/assets/stylesheets/lae--header.scss +++ b/app/assets/stylesheets/lae--header.scss @@ -6,131 +6,131 @@ @import "variables/base"; @import "variables/colors"; -header { - font-size: 13px; - background: image-url("symphony.png"); - position: relative; - -webkit-box-shadow: 0 5px 6px -6px #ccc; - -moz-box-shadow: 0 5px 6px -6px #ccc; - box-shadow: 0 5px 6px -6px #ccc; +header.wrapper--branding { + font-size: 13px; + background: image-url("symphony.png"); + position: relative; + -webkit-box-shadow: 0 5px 6px -6px #ccc; + -moz-box-shadow: 0 5px 6px -6px #ccc; + box-shadow: 0 5px 6px -6px #ccc; - .l-branding__site { - background-color: rgba($gray-lighter, 0.4); - position: relative; - top: 0; - left: 0; - width: 100%; - height: 100%; - } - // border-bottom: 1px solid #eee; + .l-branding__site { + background-color: rgba($gray-lighter, 0.4); + position: relative; + top: 0; + left: 0; + width: 100%; + height: 100%; + } + // border-bottom: 1px solid #eee; h2 { - margin: 16px 0 0 105px; + margin: 16px 0 0 105px; display: inline-block; // font-family: 'Sail', cursive; font-family: 'Bitter', 'Source Sans Pro', sans-serif; font-size: 2.15em; position: relative; @include breakpoint(550px){ - font-size: 2.1em; - margin-bottom: 10px; + font-size: 2.1em; + margin-bottom: 10px; } @include breakpoint(768px){ - margin-bottom: 10px; + margin-bottom: 10px; + } + @include breakpoint($tab-desk){ + margin: 16px 0 16px 105px; + } + @include breakpoint(864px){ + font-size: 1.3em; + margin-left: 90px; + } + @include breakpoint(896px){ + font-size: 1.5em; + } + @include breakpoint(1060px){ + font-size: 1.9em; + margin-left: 115px; } - @include breakpoint($tab-desk){ - margin: 16px 0 16px 105px; - } - @include breakpoint(864px){ - font-size: 1.3em; - margin-left: 90px; - } - @include breakpoint(896px){ - font-size: 1.5em; - } - @include breakpoint(1060px){ - font-size: 1.9em; - margin-left: 115px; - } a { - color: black; - text-decoration: none; - &:visited { - text-decoration: none; - } - &:hover, &:active { - text-decoration: none; - } + color: black; + text-decoration: none; + &:visited { + text-decoration: none; + } + &:hover, &:active { + text-decoration: none; + } } } } .site-links { - display: inline-block; - margin-left: 1.5em; - @include breakpoint(768px){ - margin-left: 0.5em; - } - @include breakpoint(864px){ - float: right; - } - @include breakpoint(896px){ - margin-left: 1em; - position: relative; - top: 2px; - margin-bottom: 1em; - } - @include breakpoint(1060px){ - top: -4px; - margin-left: 0; - } + display: inline-block; + margin-left: 1.5em; + @include breakpoint(768px){ + margin-left: 0.5em; + } + @include breakpoint(864px){ + float: right; + } + @include breakpoint(896px){ + margin-left: 1em; + position: relative; + top: 2px; + margin-bottom: 1em; + } + @include breakpoint(1060px){ + top: -4px; + margin-left: 0; + } - a { - background: white; - border-radius: 4px; - } - .nav > li { - display: inline-block; - } + a { + background: white; + border-radius: 4px; + } + .nav > li { + display: inline-block; + } } .search-bar { - display: inline-block; - margin: 0 1em; - @include breakpoint($tab-desk){ - width: 60%; - margin-right: 0; - } - @include breakpoint(864px){ - margin-left: 90px; - } - @include breakpoint(1060px){ - margin-bottom: 1em; - margin-left: 115px; - } + display: inline-block; + margin: 0 1em; + @include breakpoint($tab-desk){ + width: 60%; + margin-right: 0; + } + @include breakpoint(864px){ + margin-left: 90px; + } + @include breakpoint(1060px){ + margin-bottom: 1em; + margin-left: 115px; + } } .search-links { - display: inline-block; - margin-left: 1em; + display: inline-block; + margin-left: 1em; float: right; - @include breakpoint(768px){ - margin-left: 0; - } - @include breakpoint($tab-desk){ - margin-left: 0; - } - .navbar-nav > li > a { - margin: 0 0.5em; - } - .navbar-nav > li { - display: inline-block; + @include breakpoint(768px){ + margin-left: 0; + } + @include breakpoint($tab-desk){ + margin-left: 0; + } + .navbar-nav > li > a { + margin: 0 0.5em; + } + .navbar-nav > li { + display: inline-block; .nav-link { display: inline-block; } - } + } } article header { - background: $white; + background: $white; } diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index aa59fdd6..f331063e 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -7,7 +7,9 @@ class CatalogController < ApplicationController helper Openseadragon::OpenseadragonHelper configure_blacklight do |config| - config.view.masonry! + config.view.masonry(document_component: Blacklight::Gallery::DocumentComponent) + # config.show.tile_source_field = :content_metadata_image_iiif_info_ssm + config.show.partials.insert(1, :openseadragon) config.index.thumbnail_method = :thumbnail_from_manifest config.search_state_fields = config.search_state_fields + [:id, :locale] # config.show.tile_source_field = :content_metadata_image_iiif_info_ssm diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb index d9c556b3..b5a34f0d 100644 --- a/app/views/pages/index.html.erb +++ b/app/views/pages/index.html.erb @@ -1,25 +1,25 @@ <%= render 'shared/header_navbar' %> <%= content_for :page_title, 'Home' %>
-
-
- <%= render 'featured_document' %> -
-

- <%= t('blacklight.application_name') %> -

-
-

<%= t('index.description_html', href: link_to(t('index.description_href'), "http://libguides.princeton.edu/laec"), application_name: t('blacklight.application_name')) %>

- <%= link_to "".html_safe, page_path('catalog', sort: 'date_modified desc', search_field:'all_fields') %> - <%= link_to "".html_safe, page_path('about') %> -
-
-
-
+
+
+ <%= render 'featured_document' %> +
+

+ <%= t('blacklight.application_name') %> +

+
+

<%= t('index.description_html', href: link_to(t('index.description_href'), "http://libguides.princeton.edu/laec"), application_name: t('blacklight.application_name')) %>

+ <%= link_to "".html_safe, page_path('catalog', sort: 'date_modified desc', search_field:'all_fields') %> + <%= link_to "".html_safe, page_path('about') %> +
+
+
+
-
+

<%= t('index.recent_additions') %>

- <%= render 'recent_documents' %> -
+ <%= render 'recent_documents' %> +
From 2ae9943d994d49d3f26b4dc3e64b1f5da6adc1d6 Mon Sep 17 00:00:00 2001 From: Anna Headley Date: Wed, 1 Feb 2023 11:31:44 -0500 Subject: [PATCH 12/14] Override masonry DocumentComponent it's closer to how LAE should look but not styled correctly yet. Co-authored-by: Eliot Jordan Co-authored-by: Trey Pendragon --- .rubocop.yml | 3 +++ app/components/masonry_document_component.html.erb | 13 +++++++++++++ app/components/masonry_document_component.rb | 12 ++++++++++++ app/controllers/catalog_controller.rb | 2 +- spec/rails_helper.rb | 1 + 5 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 app/components/masonry_document_component.html.erb create mode 100644 app/components/masonry_document_component.rb diff --git a/.rubocop.yml b/.rubocop.yml index bb747492..6b21b516 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -92,3 +92,6 @@ RSpec/DescribeClass: Layout/IndentationConsistency: EnforcedStyle: indented_internal_methods + +Style/HashSyntax: + Enabled: false diff --git a/app/components/masonry_document_component.html.erb b/app/components/masonry_document_component.html.erb new file mode 100644 index 00000000..d3ab669d --- /dev/null +++ b/app/components/masonry_document_component.html.erb @@ -0,0 +1,13 @@ +<%= render(Blacklight::DocumentComponent.new(classes: 'col', component: :div, document: @document, counter: @counter, presenter: @presenter)) do |component| %> + <% component.body do %> +
+ <%= thumbnail %> + +
+
+ <%= helpers.link_to_document presenter.document, @title.presence || content.presence, counter: @counter, itemprop: 'name' %> +
+
+
+ <% end %> +<% end %> diff --git a/app/components/masonry_document_component.rb b/app/components/masonry_document_component.rb new file mode 100644 index 00000000..96313633 --- /dev/null +++ b/app/components/masonry_document_component.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +class MasonryDocumentComponent < Blacklight::DocumentComponent + def before_render + thumbnail(image_options: { class: 'img-thumbnail' }) if thumbnail.blank? + super + end + + def render_document_class(*args) + @view_context.render_document_class(*args) + end +end diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index f331063e..7c76c8f0 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -7,7 +7,7 @@ class CatalogController < ApplicationController helper Openseadragon::OpenseadragonHelper configure_blacklight do |config| - config.view.masonry(document_component: Blacklight::Gallery::DocumentComponent) + config.view.masonry(document_component: MasonryDocumentComponent) # config.show.tile_source_field = :content_metadata_image_iiif_info_ssm config.show.partials.insert(1, :openseadragon) config.index.thumbnail_method = :thumbnail_from_manifest diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 56704bf8..2d4fe15b 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -50,6 +50,7 @@ # # The different available types are documented in the features, such as in # https://relishapp.com/rspec/rspec-rails/docs + config.infer_spec_type_from_file_location! end WebMock.disable_net_connect!(allow_localhost: true) From dbd7793ec6ce147099db7e057365d699b64c27c5 Mon Sep 17 00:00:00 2001 From: Eliot Jordan Date: Wed, 1 Feb 2023 11:14:43 -0600 Subject: [PATCH 13/14] Upgrade to Blacklight 8 and fix tests Co-authored-by: Anna Headley Co-authored-by: Trey Pendragon --- Gemfile | 6 ++--- Gemfile.lock | 37 +++++++++++++++++---------- app/controllers/catalog_controller.rb | 7 ++--- app/views/bookmarks/_tools.html.erb | 7 ----- app/views/bookmarks/index.html.erb | 19 -------------- spec/features/search_history_spec.rb | 2 +- 6 files changed, 32 insertions(+), 46 deletions(-) delete mode 100644 app/views/bookmarks/_tools.html.erb delete mode 100644 app/views/bookmarks/index.html.erb diff --git a/Gemfile b/Gemfile index a334b83d..8718b367 100644 --- a/Gemfile +++ b/Gemfile @@ -3,9 +3,9 @@ source 'https://rubygems.org' gem 'bitters', '~> 1.2.0' gem 'bixby', '~> 5.0' -gem 'blacklight', '~> 7.33.0' -gem 'blacklight-gallery', '~>4.0' -gem 'blacklight_range_limit' +gem 'blacklight', '8.0.0.beta4' +gem 'blacklight-gallery', github: 'projectblacklight/blacklight-gallery', branch: 'main' +gem 'blacklight_range_limit', github: 'projectblacklight/blacklight_range_limit', branch: 'main' gem 'bootstrap', '~> 4.0' gem 'bourbon', '~> 7.0' gem 'breakpoint' diff --git a/Gemfile.lock b/Gemfile.lock index 6cc58f4e..7b5b46f8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,21 @@ +GIT + remote: https://github.com/projectblacklight/blacklight-gallery.git + revision: 3bf20e28e3a959ec7399880c10c9308fa005b8c7 + branch: main + specs: + blacklight-gallery (4.0.2) + blacklight (>= 7.17, < 9) + rails (>= 6.1, < 8) + +GIT + remote: https://github.com/projectblacklight/blacklight_range_limit.git + revision: 5828f02c6c5c7c0fdd5fd61b71f63fccace9221d + branch: main + specs: + blacklight_range_limit (8.2.4) + blacklight (>= 7.25.2, < 9) + deprecation + GIT remote: https://github.com/pulibrary/pul_uv_rails.git revision: 91412fb7fa04ebd66bbf4df621892c9b6dbc97f6 @@ -89,21 +107,14 @@ GEM rubocop-performance rubocop-rails rubocop-rspec - blacklight (7.33.0) - deprecation + blacklight (8.0.0.beta4) globalid - hashdiff i18n (>= 1.7.0) jbuilder (~> 2.7) kaminari (>= 0.15) ostruct (>= 0.3.2) - rails (>= 5.1, < 7.1) - view_component (~> 2.66) - blacklight-gallery (4.0.2) - blacklight (~> 7.17) - rails (>= 5.1, < 8) - blacklight_range_limit (8.2.3) - blacklight (>= 7.25.2, < 9) + rails (>= 6.1, < 8) + view_component (>= 2.66, < 3.1) bootstrap (4.6.2) autoprefixer-rails (>= 9.1.0) popper_js (>= 1.16.1, < 2) @@ -502,9 +513,9 @@ PLATFORMS DEPENDENCIES bitters (~> 1.2.0) bixby (~> 5.0) - blacklight (~> 7.33.0) - blacklight-gallery (~> 4.0) - blacklight_range_limit + blacklight (= 8.0.0.beta4) + blacklight-gallery! + blacklight_range_limit! bootstrap (~> 4.0) bourbon (~> 7.0) breakpoint diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index 7c76c8f0..9852deca 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -194,9 +194,10 @@ class CatalogController < ApplicationController def invalid_document_id_error(exception) search_service = search_service_class.new(config: blacklight_config, user_params: { search_field: 'local_identifier', q: params[:id] }) - @response, @document = search_service.search_results - if @document.first && @document.length == 1 - redirect_to solr_document_path(@document.first.id) + @response = search_service.search_results + document = @response.documents.first + if document && @response.documents.length == 1 + redirect_to solr_document_path(document.id) return end super diff --git a/app/views/bookmarks/_tools.html.erb b/app/views/bookmarks/_tools.html.erb deleted file mode 100644 index 79278677..00000000 --- a/app/views/bookmarks/_tools.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -
    - <%= render_show_doc_actions @document_list, document: nil, document_list: @document_list, url_opts: Blacklight::Parameters.sanitize(params.to_unsafe_h) do |config, inner| %> -
  • - <%= inner %> -
    • - <% end %> -
diff --git a/app/views/bookmarks/index.html.erb b/app/views/bookmarks/index.html.erb deleted file mode 100644 index e575b874..00000000 --- a/app/views/bookmarks/index.html.erb +++ /dev/null @@ -1,19 +0,0 @@ -
-

<%= t('blacklight.bookmarks.title') %>

- -<%- if current_or_guest_user.blank? -%> - -

<%= t('blacklight.bookmarks.need_login') %>

- -<%- elsif @response.documents.blank? -%> - -

<%= t('blacklight.bookmarks.no_bookmarks') %>

-<% else %> - <%= render 'sort_and_per_page' %> - <%= render 'tools' %> - - <%= render_document_index @response.documents %> - <%= render 'results_pagination' %> -<% end %> -
- diff --git a/spec/features/search_history_spec.rb b/spec/features/search_history_spec.rb index 69f6d3ac..99f60c7e 100644 --- a/spec/features/search_history_spec.rb +++ b/spec/features/search_history_spec.rb @@ -5,6 +5,6 @@ scenario 'my recent searches should be displayed in the search history' do visit '/catalog?q=test&search_field=all_fields' visit '/search_history' - expect(page).to have_selector 'span.filter-value', text: 'test' + expect(page).to have_selector 'span.filter-values', text: 'test' end end From 7d58f34dd6454e34aedf07bbbb71ce0666b9b859 Mon Sep 17 00:00:00 2001 From: Trey Pendragon Date: Wed, 1 Feb 2023 09:56:10 -0800 Subject: [PATCH 14/14] Remove blacklight include from application James It's included in the upstream template layouts/blacklight/base now if you're using Sprockets. Co-authored-by: Anna Headley Co-authored-by: Eliot Jordan --- app/assets/javascripts/application.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 422d0441..5c06dfe1 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -19,8 +19,6 @@ //= require eventEmitter/EventEmitter //= require imagesloaded/imagesloaded // -// Required by Blacklight -//= require blacklight/blacklight //= require_tree .