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

Jump to bottom

Upgrade to Hyrax 3.4.0 #1811

Merged
merged 49 commits into from
Jul 7, 2022
Merged

Upgrade to Hyrax 3.4.0 #1811

merged 49 commits into from
Jul 7, 2022

Conversation

orangewolf
Copy link
Member

@orangewolf orangewolf commented Jun 15, 2022 •
edited
Loading

Upgrade Gemfile to new version of Hyrax, run through various change logs and audit all overrides to match 3.4.0 versions.

Changes

  • Update Hyrax to 3.4.0 and all needed dependencies
  • Upgrade hyrax-doi to branch in order to allow new Hyrax version
  • Renamed solr/config to solr/conf to match Hyrax and Blacklight. This will likely effect CI setups
  • Updated the UV to the yarn based install approach
  • Remove all solr_name and other Solrizer gem code (Solrizer has been removed from Hyrax)
  • Changed and instances of member_of_collection_ids = to member_of_collection_attributes =
  • Updated the image used for selenium in docker-compose to be m1 compatible. New image allows browser based VNC to watch the running session. Nav to chrome.hyku.test and use the password 'secret' to view the running feature specs
  • Reviewed each override file and made all needed app changes for 3.4

TODO

  • Fixed feature specs where small view changes caused failures

@samvera/hyku-code-reviewers

@orangewolf
Use main docker images for zookeeper and solr for development. M1 com…
65a9bed 
…patible images are not available by Bitnami and emulated solr is unstable. This allows development on M1 Macs without preventing development on other platforms.
@orangewolf
Update .env
1e53c27 
fix solr password
@orangewolf
Merge branch 'main' into native_solr_image
8f35296
@orangewolf
update gemfile, temp disable hyrax-doi
b305f8a
@orangewolf
rename migrations so hyrax wont keep trying to create duplicates, add…
bb1d3f4 
… new migrtions
@orangewolf
UV install
5984756
@orangewolf
add tinymce
6c3b356
@orangewolf
remove Solrizer usage and mv solr/config to solr/conf
2fdfc5e
@orangewolf
uv upgrade missing files
6a4797c
@orangewolf
file by file update to 3.4.0 of app directory
07f1f81
@orangewolf
rubocopin
8f644bc
@orangewolf
bring doi gem back
d10dd8b
@orangewolf
env fix
ba91ec7
@orangewolf
env fix
d1c1dac
@orangewolf
Merge branch 'main' into hyku_update_2
829fb5c
@orangewolf
rubocop
ae9609d
@orangewolf
Merge branch 'hyku_update_2' of github.com:samvera/hyku into hyku_upd…
2f7695a 
…ate_2
@orangewolf
work through depreciations
f807902
@orangewolf
use a m1 compatible selenium image and begin fixing feature specs
4bbeb19
@orangewolf
feature sync
e0ac106
@orangewolf
solr config dir
46c0d72
@ShanaLMoore
Copy link
Collaborator

ShanaLMoore commented Jun 16, 2022 •
edited
Loading

@orangewolf For some reason I was not able to build this branch without removing bundle exec rake assets:precompile from the Dockerfile. In particular, the build would fail on this command when attempting to start the check_volume service.

I'm going to have various members from Team V try it.

UPDATE:

the following two solutions resolves this issue. We have decided to commit solution # 2

  1. add a -f flag to the check_volumns command in docker-compose.yml
  2. add the terser gem to support Safe Navigation / Optional Chaining operator (?.). ref: Uglifier Cannot Precompile JS Optional Chaining lautis/uglifier#174 (comment)

ShanaLMoore and others added 20 commits June 17, 2022 09:33
@ShanaLMoore
Update Gemfile
cd60765
@ShanaLMoore
revert changes to config/features as they are already defined by and …
8fcc85a 
…inherits from hyrax
@ShanaLMoore
fix no thumbnail and uv rendering issue
0b6f750
@laritakr
Remove stray references to uglifier
8e5992d 
Uglifier was replaced by terser.
@orangewolf
fix helm deploy for new helm version, bump version tag to 4.1
8bd9a7e
@orangewolf
Merge branch 'hyku_update_2' of github.com:samvera/hyku into hyku_upd…
d995170 
…ate_2
@orangewolf
small typo
98ffb87
@ShanaLMoore
remove guard that prevents the search tenant from creating collection…
d501210 
… types
@selamhabteab
added required fields for User form for email and password. And remov…
c2ee95a 
…ed the unnecessary hint text for password
@orangewolf
bulkrax on by default, can still be disabled from environment variabel
19568e3
@selamhabteab
work in progress: updated proprietor spec and modified required field…
4fa6b54 
…s for global user form
@selamhabteab
removed WIP test for proprietor spec and instead created a test for t…
953ae55 
…he email and password validation in the user model spec
@selamhabteab
rubocop fix: replace should with is_expected.to
6d51a11
@selamhabteab
Merge pull request #1818 from samvera/74-global-user-new-form-500-error
8fd57cd 
global user new form 500 error
@laritakr
Accessibility changes (#1813)
65086a3 
Adds:
* ability to add alternate text for images added via Appearance admin menu.
* use of alternate text for main page logo
* use of alternate text via title attribute for main page banner image
* missing reindex jobs (referenced when adding default images)
* default logo view (pulled up from hyrax) to allow use of alt text
@laritakr
Add alt text for collection banner (#1814)
220f65d 
* Add alt text for collection banner

Resolves ticket https://gitlab.com/notch8/utk-hyku/-/issues/60

* Remove trailing spaces
@kirkkwang
Able to remove Current Account Administrators (#1817)
add6868 
* changed variable to fit convention better, fixed keep_emails array

* Empty-Commit
@laritakr
Fix modal functionality for collection public show (#1819)
c649d34 
`Add to collection` button is now functional.

Also removes duplicated count of items under title.
@kirkkwang
update schema with bulkrax enabled (#1821)
ed6c3c1
@kirkkwang
udpate to fix the way #fetch evaluates env variables (#1820)
a92a8c0
@orangewolf orangewolf merged commit 0a6d047 into main Jul 7, 2022
@orangewolf orangewolf deleted the hyku_update_2 branch July 7, 2022 21:24
@bkiahstroud bkiahstroud added the major-ver for release notes label Feb 1, 2023
jeremyf added a commit to scientist-softserv/adventist_knapsack that referenced this pull request Oct 4, 2023
@jeremyf
🐛 Fix bug regarding assumed default work type
be48081 
This commit includes two things:

1. Favor Bulkrax::EntrySpecHelper provided by Bulkrax (for which the
   removed code was a prototype).
2. Use the existing spec to determine what the default work type should
   be (instead of relying on a random assignment based on the first
   element of the registered curation concerns)

And from this commit, we have a passing test!

Related to:

- https://github.com/scientist-softserv/adventist-dl/issues/538
- samvera/bulkrax#726
- samvera/bulkrax#719
- samvera/bulkrax#742
- samvera/hyku#1811
@jeremyf jeremyf mentioned this pull request Oct 4, 2023
Merged
jeremyf added a commit that referenced this pull request Dec 20, 2023
@jeremyf
✂ Remove lib/importer and corresponding spec/lib/importer
52a7a44 
Per https://github.com/samvera/hyku/releases/tag/v5.0.0, these importers
have been deprecated.

The "Commit History of Directories" shows that
there as been little activity, the recent activity being appeasing
Rubocop and working through upgrades.  Further, these files are
conceptually subsumed by Bulkrax.

<details><summary>Commit History of Directories</summary>

```bash
❯ git slog lib/importer
* 6a48652 — Hyrax 5 upgrade rubocop fixes & get specs running in CI (#2065) LaRita Robinson, (2023-12-16)
* 59626ef — 🧹 Rubocop'd lengths and other low hanging fruit Kirk Wang, (2023-12-13)
* fecb4e9 — 🧹 Ran `bundle exec rubocop -a` Kirk Wang, (2023-12-13)
* 0a6d047 — Upgrade to Hyrax 3.4.0 (#1811) Rob Kaufman, (2022-07-07)
* edafd85 — Rubocop fixes (#1640) Rob Kaufman, (2020-08-04)
* 9326387 — update to hyrax 2.2 (#1543) Rob Kaufman, (2018-10-04)
*   7526936 — Merge pull request #1541 from ubiquitypress/hyku-csv-importer Rob Kaufman, (2018-08-21)
|\
| * 904a369 — Remove :files from attributes Remove method to replace existing file_set Claire, (2018-07-20) (tag: v1.0.0)
| * 1cf7f5c — WIP- set uploaded_files param to use existing Actor Claire, (2018-07-19)
| * 9650e54 — Restore callbacks Claire, (2018-07-12)
| * e6a358a — Coerce UploadedFile to an array and use upstream Job Claire, (2018-07-11)
| * 93cb695 — Import files from CSV Claire, (2018-07-06)
* | bc51174 — Hyrax 2.1 upgrade (#1529) Rob Kaufman, (2018-07-26)
|/
* 116d4b9 — Upgrade Hyrax to 2.0.2 and upgrade gems with security vulnerabilities (#1519) Julie Allinson, (2018-03-22)
* d85952b — Changes necessary to get simple CSV import to run Michael J. Giarlo, (2017-08-22)
* a4024f4 — Make ObjectFactory rubocop-clean Joe Atzberger, (2017-08-22)
* 7618c3a — Refactor csv_importer and improve test accuracy Joe Atzberger, (2017-08-22)
* 21eb1e6 — Add a note about a broken method Justin Coyne, (2017-06-15)
* 86eedaa — Update Hyrax and other dependencies Justin Coyne, (2017-04-13)
* bfecea2 — Refactor importers to use Hyrax's actor stack Justin Coyne, (2017-02-23)
* 554b8a8 — Pass ability to the actor Justin Coyne, (2017-02-17)
* a8b25cd — Point at the Hyrax repo Justin Coyne, (2016-12-03)
* 5d005c9 — [WIP] Hyrax! Justin Coyne, (2016-12-02)
* fe229ca — Rename Lerna to Hyku. Fixes #461 Justin Coyne, (2016-11-07)
* 1f5fe23 — Update dependencies, Sufia to 7.0.0.rc1 Justin Coyne, (2016-07-12)
* d2c8fb1 — Rename hybox to lerna Michael J. Giarlo, (2016-06-08)
* 5de0440 — Add a CSV importer Justin Coyne, (2016-05-23)
* 5dcbb9b — Use User.batch_user instead of the deprecated batchuser Justin Coyne, (2016-05-20)
* d2a6c3c — Update to latest rubocop and rubocop-rspec Chris Beer, (2016-05-20)
* 642df79 — MODS/PURL importer Justin Coyne, (2016-05-19)
```

```bash
❯ git slog spec/lib/importer/
* 1c04b9e — 🧹 Hyrax 5 upgrade additional specs (#2067) LaRita Robinson, (2023-12-18)
* 6a48652 — Hyrax 5 upgrade rubocop fixes & get specs running in CI (#2065) LaRita Robinson, (2023-12-16)
* fecb4e9 — 🧹 Ran `bundle exec rubocop -a` Kirk Wang, (2023-12-13)
* 0a6d047 — Upgrade to Hyrax 3.4.0 (#1811) Rob Kaufman, (2022-07-07)
* edafd85 — Rubocop fixes (#1640) Rob Kaufman, (2020-08-04)
* f9a3a64 — Use paths based on Rails.root instead of pure relative paths Chris Colvard, (2020-07-08)
* 1b3c5ed — rubocop fixes nicholas, (2018-10-12)
* aeb9904 — update FactoryGirl to FactoryBot nicholas, (2018-10-09)
* 93cb695 — Import files from CSV Claire, (2018-07-06)
* 116d4b9 — Upgrade Hyrax to 2.0.2 and upgrade gems with security vulnerabilities (#1519) Julie Allinson, (2018-03-22)
* 7618c3a — Refactor csv_importer and improve test accuracy Joe Atzberger, (2017-08-22)
* 86eedaa — Update Hyrax and other dependencies Justin Coyne, (2017-04-13)
* bfecea2 — Refactor importers to use Hyrax's actor stack Justin Coyne, (2017-02-23)
* 8ecb861 — Require rails_helper in one place instead of 100 Joe Atzberger, (2017-02-14)
* 7498ecb — Update to latest hyrax Justin Coyne, (2016-12-20)
* a8b25cd — Point at the Hyrax repo Justin Coyne, (2016-12-03)
* 5d005c9 — [WIP] Hyrax! Justin Coyne, (2016-12-02)
* 5de0440 — Add a CSV importer Justin Coyne, (2016-05-23)
* d2a6c3c — Update to latest rubocop and rubocop-rspec Chris Beer, (2016-05-20)
* 642df79 — MODS/PURL importer Justin Coyne, (2016-05-19)
```

</details>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
major-ver for release notes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@orangewolf @ShanaLMoore @bkiahstroud @laritakr @selamhabteab @kirkkwang