Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Blacklight 8 Upgrade #351

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
Draft

Blacklight 8 Upgrade #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a478f1b
Upgrade to Blacklight 7.33
eliotjordan Jan 30, 2023
62b79bf
Update masonry configuration in catalog controller
hackartisan Jan 30, 2023
3ffd26c
Use new SearchBarComponent
hackartisan Jan 30, 2023
912ab1c
remove search_form partial
hackartisan Jan 30, 2023
c110c28
Added id and locale to search_state_fields
eliotjordan Jan 30, 2023
407ff9c
Use SearchContextComponent instead of _previous_next_doc partial
eliotjordan Jan 30, 2023
07805ba
Use document_presenter.html_title
hackartisan Jan 30, 2023
c1555ee
Use document presenter title for page heading
hackartisan Jan 30, 2023
3f7515d
Use response.documents instead of document_list
hackartisan Jan 30, 2023
ea4551d
pass argument to render_document_index
hackartisan Jan 30, 2023
03e7a0a
Upgrade blacklight-gallery, limit scope of header styling
hackartisan Jan 30, 2023
2ae9943
Override masonry DocumentComponent
hackartisan Feb 1, 2023
dbd7793
Upgrade to Blacklight 8 and fix tests
eliotjordan Feb 1, 2023
7d58f34
Remove blacklight include from application James
tpendragon Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,6 @@ RSpec/DescribeClass:

Layout/IndentationConsistency:
EnforcedStyle: indented_internal_methods

Style/HashSyntax:
Enabled: false
8 changes: 4 additions & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ 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-gallery'
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'
Expand All @@ -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'
Expand Down
201 changes: 109 additions & 92 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -8,60 +26,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)
Expand Down Expand Up @@ -89,25 +107,17 @@ GEM
rubocop-performance
rubocop-rails
rubocop-rspec
blacklight (7.24.0)
deprecation
blacklight (8.0.0.beta4)
globalid
i18n (>= 1.7.0)
jbuilder (~> 2.7)
kaminari (>= 0.15)
ostruct (>= 0.3.2)
rails (>= 5.1, < 7.1)
view_component (~> 2.43)
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)
bootstrap (4.6.1)
rails (>= 6.1, < 8)
view_component (>= 2.66, < 3.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)
Expand Down Expand Up @@ -148,10 +158,11 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.10)
concurrent-ruby (1.2.0)
crack (0.4.5)
rexml
crass (1.0.6)
date (3.3.3)
debug_inspector (1.1.0)
deprecation (1.1.0)
activesupport
Expand All @@ -174,7 +185,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)
Expand All @@ -183,7 +194,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)
Expand Down Expand Up @@ -232,11 +243,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)
Expand All @@ -247,23 +261,24 @@ 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)
net-smtp (0.3.3)
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)
Expand All @@ -274,7 +289,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)
Expand All @@ -283,24 +298,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)
Expand All @@ -309,14 +324,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)
Expand Down Expand Up @@ -440,9 +455,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)
Expand All @@ -457,18 +472,19 @@ GEM
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.2.1)
tilt (2.0.10)
timeout (0.3.0)
tilt (2.0.11)
timeout (0.3.1)
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)
Expand All @@ -489,17 +505,17 @@ GEM
nokogiri (~> 1.8)
yard (0.9.27)
webrick (~> 1.7.0)
zeitwerk (2.6.0)
zeitwerk (2.6.6)

PLATFORMS
ruby

DEPENDENCIES
bitters (~> 1.2.0)
bixby (~> 5.0)
blacklight (~> 7.24.0)
blacklight-gallery
blacklight_range_limit
blacklight (= 8.0.0.beta4)
blacklight-gallery!
blacklight_range_limit!
bootstrap (~> 4.0)
bourbon (~> 7.0)
breakpoint
Expand Down Expand Up @@ -531,6 +547,7 @@ DEPENDENCIES
net-pop
net-smtp
nokogiri (~> 1.13.9)
openseadragon
pg
progressbar
pry-byebug
Expand Down
Loading