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.

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

Update to Hyrax v4.0 #1037

Merged
merged 71 commits into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
0b928c9
Update gems to hyrax 4
bbpennel Aug 23, 2023
b293326
Replace bootstrap-sass with bootstrap
bbpennel Aug 24, 2023
a0fb05e
Make changes described in https://github.com/samvera/hyrax/wiki/Upgra…
bbpennel Aug 24, 2023
3c2cd5d
Require log_service in rails helper so it will load in time for usage…
bbpennel Aug 24, 2023
d72c6a0
Trigger build for PRs to hyrax-4
bbpennel Aug 24, 2023
c049b8d
Comment out override of deleted file so application can build, will n…
bbpennel Aug 24, 2023
9fff55e
Move include to environment files so that it'll be present anytime th…
bbpennel Aug 24, 2023
23c91c0
Update to rails 5 version of puma config file
bbpennel Aug 24, 2023
22b9c11
Comment automatically updated by rails
bbpennel Aug 24, 2023
4dfa5c4
Add in twitter gem, which is a new dependency in hyrax 4
bbpennel Aug 24, 2023
df76546
ajax_modal was replaced by modal
bbpennel Aug 24, 2023
d7a17e4
Disabling sidekiq for the time being, since it can't be started with …
bbpennel Aug 24, 2023
42b9ecd
HYC-1595 - Sidekiq 6 in docker (#993)
bbpennel Aug 28, 2023
658d059
Update create_derivatives_job.rb, and ignore tmp dirs
bbpennel Aug 28, 2023
2253f5c
Update pointer to upstream file
bbpennel Aug 28, 2023
873efd8
Update pointer to upstream file
bbpennel Aug 28, 2023
016eb66
Remove works_controller.rb since fix for issue has been merged upstream
bbpennel Aug 28, 2023
b57cc8c
Update pointer to upstream file
bbpennel Aug 28, 2023
655ac48
Move override from ContentDepositorChangeEventJob to new ChangeDeposi…
bbpennel Aug 28, 2023
053ba1b
Update work_show_presenter_override.rb, add override comment
bbpennel Aug 28, 2023
1878755
Update solr_query_service.rb
bbpennel Aug 31, 2023
a63062d
Removing file_download_stat_override.rb since one of the overrides ha…
bbpennel Aug 31, 2023
f0232e1
Remove ga_statistic override, since one of the overrides has been mer…
bbpennel Aug 31, 2023
fde33f5
Update workflow_presenter.rb
bbpennel Aug 31, 2023
5cf0442
Replace workflow_presenter with override, add test for ovevrridden ac…
bbpennel Aug 31, 2023
64a77cb
Add new test from upstream, and adjust override to only cleanup uploa…
bbpennel Aug 31, 2023
d8d9104
Fix paths where collection_form are stored to match hyrax paths for them
bbpennel Aug 31, 2023
7b7a281
Rubocop
bbpennel Aug 31, 2023
d855b68
Update hyrax/controller.rb
bbpennel Aug 28, 2023
7c711e4
Update file_actor_override.rb. Add test to verify that longleaf is ca…
bbpennel Aug 28, 2023
30f809e
Mock virus scan
bbpennel Sep 1, 2023
efe382f
Switch to hyrax branch with a few upstream PRs merged in for GA4 and …
bbpennel Sep 1, 2023
c088be3
Merge pull request #995 from UNC-Libraries/hyc-1737-class2
sharonluong Sep 7, 2023
2a62158
HYC-1739 - Blacklight class overrides (#996)
bbpennel Sep 12, 2023
5d053a9
HYC-1736 - Update view overrides based on hyrax 4 (#998)
bbpennel Sep 19, 2023
38f9317
Remove mapping of affiliation to contributor (#1000)
lfarrell Sep 19, 2023
08258cc
HYC-1740 - Hyrax 4 updates to overrides from other hydra gems (mostly…
bbpennel Sep 22, 2023
cac47cd
HYC-1739 - Blacklight overrides round 2 (#1003)
bbpennel Sep 25, 2023
03ea2c0
Add missing paren, remove extra closing tag (#1004)
bbpennel Sep 25, 2023
222b941
Move fcrepo-data up a directory to avoid losss of all the other fedor…
bbpennel Sep 26, 2023
c6674a2
HYC-1752 - Hyrax 4 CSS updates (#1005)
lfarrell Sep 26, 2023
e166eda
Display file option buttons the same (#1008)
lfarrell Sep 27, 2023
35e16be
HYC-1761 - Fix tests in hyrax-4 (#1009)
bbpennel Sep 29, 2023
bf397db
HYC-1765 - Duplicate people entries, bootstrap, file upload form (hyr…
bbpennel Oct 2, 2023
507f1e9
HYC-1728 - Update ingest from ftp, glyphicons (#1014)
bbpennel Oct 3, 2023
b008d0a
Various style updates for Bootstrap 4 (#1012)
lfarrell Oct 3, 2023
6505205
Ensure test base created in hyrax 4 docker (#1013)
bbpennel Oct 3, 2023
8776459
HYC-1777 - Fix bulkrax importer buttons (#1016)
bbpennel Oct 4, 2023
a334a6c
Add custom activity partial for menu to add back in sidekiq link (#1015)
bbpennel Oct 4, 2023
092020b
Fix spacing of buttons on admin set worktype page and clean up sideba…
lfarrell Oct 4, 2023
d88a8aa
Remove merged overrides (hyrax-4) (#1019)
bbpennel Oct 4, 2023
5d82005
Fixes for the mobile menu (#1020)
lfarrell Oct 4, 2023
f0f5431
Hide mobile facet toggler and add margin to the bottom of the facet l…
lfarrell Oct 4, 2023
e50a1d9
HYC-1774 - Bulkrax importer fixes (hyrax-4) (#1010)
bbpennel Oct 5, 2023
0da501c
Style updates for agreement spacing and facet color contrast (#1017)
lfarrell Oct 9, 2023
dd5f539
Bulkrax related schema changes from gem update (#1022)
bbpennel Oct 10, 2023
5bb14d9
HYC-1766 - Date range advanced search (#1023)
bbpennel Oct 11, 2023
9632fd7
Fix styling in the worktype assignment pages. Refactor header a littl…
bbpennel Oct 11, 2023
a8083a1
HYC- 1789/1791 - Masters paper and new user styles (hyrax-4) (#1025)
bbpennel Oct 11, 2023
297eed3
HYC-1787 - Display issues on collection pages (hyrax-4) (#1026)
bbpennel Oct 11, 2023
81dd436
Use branch of blacklight 7.34.0 which has a fix for the advanced sear…
bbpennel Oct 12, 2023
7872633
Update to newer ref
bbpennel Oct 12, 2023
9848d6c
Merge pull request #1027 from UNC-Libraries/hyc-1790-start-over
sharonluong Oct 16, 2023
3876254
HYC-1793 - Another round of style fixes (hyrax-4) (#1031)
bbpennel Oct 19, 2023
e392b8e
Update to a bulkrax reference with fix for tab event problem (#1033)
bbpennel Oct 20, 2023
d14bbe6
Hyc-1788/1794 - Sidebar select color, and user links dropdown fixes (…
bbpennel Oct 25, 2023
0e6d236
HYC-1797/1798 - Fix visibility option issues (hyrax-4) (#1034)
bbpennel Oct 30, 2023
3af56e7
Merge branch 'main' into hyrax-4
bbpennel Oct 30, 2023
9f9bf9d
Refactor export_as_oai_dc_xml into helper methods to reduce cognitive…
bbpennel Oct 30, 2023
5292048
Add cleaning to test
bbpennel Oct 30, 2023
c84f846
HYC-1758 - Silence deprecation warnings in prod
bbpennel Oct 31, 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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ main ]
pull_request:
branches: [ main, hyrax-3 ]
branches: [ main, hyrax-4 ]

jobs:
build:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
tmp/
!/log/.keep
!/tmp/.keep
tmp

# Ignore Byebug command history file.
.byebug_history
Expand Down
2 changes: 1 addition & 1 deletion .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ GitHub/InsecureHashAlgorithm:
- 'app/models/concerns/bulkrax/file_factory.rb'

# Offense count: 1
GitHub/RailsApplicationRecord:
Rails/ApplicationRecord:
Exclude:
- 'app/models/proxy_deposit_request.rb'

Expand Down
35 changes: 19 additions & 16 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,25 @@ git_source(:github) do |repo_name|
"https://github.com/#{repo_name}.git"
end

gem 'active-fedora', '~> 13.1'
gem 'blacklight_advanced_search', '~> 6.4.1'
gem 'blacklight_oai_provider', '6.1.1'
gem 'blacklight_range_limit', '6.5.0'
gem 'bootstrap-sass', '~> 3.4.1'
gem 'bulkrax', '~> 5.0.0'
gem 'active-fedora', '~> 14.0'
gem 'blacklight', git: 'https://github.com/UNC-Libraries/blacklight.git', branch: 'advanced_start_over'
gem 'blacklight_advanced_search', '~> 8.0.0.alpha2'
gem 'blacklight_oai_provider', '7.0.2'
gem 'blacklight_range_limit', '~> 8.3.0'
gem 'bootstrap', '~> 4.0'
gem 'bulkrax', git: 'https://github.com/UNC-Libraries/bulkrax.git', branch: 'unc-bulkrax-5-development'
gem 'clamav-client', require: 'clamav/client'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.2.2'
gem 'coffee-rails', '~> 5.0.0'
gem 'devise', '~> 4.8.0'
gem 'devise-guests', '~> 0.8.1'
gem 'edtf-humanize', '2.0.1'
# See https://github.com/rails/execjs#readme for more supported runtimes
gem 'execjs', '2.8.1'
gem 'httparty', '~>0.21.0'
gem 'hydra-editor', '~> 5.0'
gem 'hydra-editor', '~> 6.0'
gem 'hydra-role-management', '~> 1.0'
gem 'hyrax', git: 'https://github.com/UNC-Libraries/hyrax.git', tag: 'hyrax-v3.6.0'
gem 'hyrax', git: 'https://github.com/UNC-Libraries/hyrax.git', branch: 'unc-hyrax-4-development'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.11.2'
# Use jquery as the JavaScript library
Expand All @@ -35,7 +36,7 @@ gem 'libv8', '~> 7.3'
gem 'sparql', '3.2.5'
gem 'linkeddata'
gem 'loofah', '~>2.19.1'
gem 'mini_magick', '~>4.11.0'
gem 'mini_magick', '~>4.12.0'
gem 'mini_racer', '~> 0.2.15', platforms: :ruby
gem 'nokogiri', '~>1.14.2'
gem 'omniauth', '~> 2.0'
Expand All @@ -45,24 +46,26 @@ gem 'passenger', '6.0.14', require: 'phusion_passenger/rack_handler'
# Use postgresql as the database for Active Record
gem 'pg', '~> 1.3.5'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.8.1'
gem 'rails', '~> 6.0'
# Use Redis adapter to run Action Cable in production
gem 'redis', '~> 4.5.0'
gem 'riiif', '~> 2.4.0'
gem 'roo', '~>2.9.0'
gem 'rsolr', '~> 2.5.0'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.1.0'
gem 'sidekiq', '~> 5.2.10'
gem 'sidekiq-status', '~> 2.1.3'
gem 'sass-rails', '~> 6.0.0'
gem 'sidekiq', '~> 6.0'
gem 'sidekiq-status', '~> 3.0.0'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5.2.1'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '~> 4.2.0'
gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
# Use terser as compressor for JavaScript assets
gem 'terser', '~> 1.1'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', '~> 11.1.3', platform: :mri
gem 'database_cleaner'
gem 'fcrepo_wrapper', '~> 0.9.0'
gem 'rspec-rails', '~> 5.1.2'
# Rubocop for style and error checking (linter)
Expand Down
Loading