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

🎁 Hyrax 5 upgrade #2047

Merged
merged 255 commits into from
Jan 5, 2024
Merged
Show file tree
Hide file tree
Changes from 243 commits
Commits
Show all changes
255 commits
Select commit Hold shift + click to select a range
a233497
Merge branch 'iiif_print_extensions' into adventist_dev
orangewolf Sep 21, 2023
8e3b70f
Merge branch 'going_up' into adventist_dev
orangewolf Sep 21, 2023
e45bb38
Merge branch 'iiif_manifest_title' into adventist_dev
orangewolf Sep 21, 2023
6538238
Merge branch 'blank_tif_bug' into adventist_dev
orangewolf Sep 21, 2023
395d4d9
Merge branch 'mark_during_bulk' into adventist_dev
orangewolf Sep 21, 2023
a6f856d
Merge branch 'index_job_tidying' into adventist_dev
orangewolf Sep 21, 2023
1a548cf
Merge branch 'schemas_and_timeouts' into adventist_dev
orangewolf Sep 21, 2023
ad05a98
Merge branch 'content_block_updates' into adventist_dev
orangewolf Sep 21, 2023
3f22a33
remove dogbiscuit crossover, fix routes
orangewolf Sep 21, 2023
3a7fde2
Merge branch 'blacklight_advanced_and_range' into adventist_dev
orangewolf Sep 21, 2023
36590bc
add spec for search history
orangewolf Sep 21, 2023
5b72d50
Merge branch 'blacklight_advanced_and_range' into adventist_dev
orangewolf Sep 21, 2023
326576e
add missing methods to avoid content block errors
ShanaLMoore Sep 21, 2023
1899175
Update Hyku Gemfile.lock
laritakr Sep 22, 2023
7039606
Merge branch 'blacklight_advanced_and_range' into adventist_dev
laritakr Sep 22, 2023
4dc0dcd
add option to support good job for background jobs instead of sidekiq
orangewolf Sep 22, 2023
225e8de
Merge branch 'mr_good_job_its_got_to_be_good' into adventist_dev
orangewolf Sep 22, 2023
c32a948
update gemfile lock
orangewolf Sep 22, 2023
f2fbd2a
Merge branch 'adventist_dev' of https://github.com/samvera/hyku into …
orangewolf Sep 22, 2023
8cf14c4
Update good_job.rb
orangewolf Sep 22, 2023
61a9504
merge
orangewolf Sep 22, 2023
363f9ee
fix routes file, add missing js file
orangewolf Sep 22, 2023
6dae41d
Merge branch 'mr_good_job_its_got_to_be_good' of https://github.com/s…
orangewolf Sep 22, 2023
6905712
Merge branch 'mr_good_job_its_got_to_be_good' into adventist_dev
orangewolf Sep 22, 2023
3acad8e
Merge branch 'adventist_dev' into fix-block-content-error
ShanaLMoore Sep 25, 2023
03dd69e
:lipstick: styling fix
ShanaLMoore Sep 25, 2023
ed161f8
:lipstick: rubocop fixes
ShanaLMoore Sep 25, 2023
880b3d2
Merge pull request #1995 from samvera/fix-block-content-error
ShanaLMoore Sep 25, 2023
00a4b4a
remove iiif_print/iiif_print require
ShanaLMoore Sep 25, 2023
b452363
Merge branch 'main' into mr_good_job_its_got_to_be_good
ShanaLMoore Sep 25, 2023
2ac4625
:gift: :broom: add missing file and format with semicolons
ShanaLMoore Sep 25, 2023
15d3136
:lipstick: correct missing semicolons
ShanaLMoore Sep 25, 2023
ebe15ca
Merge branch 'main' into blacklight_advanced_and_range
kirkkwang Sep 25, 2023
21133ea
:broom: remove call to iiif_print/iiif_print
ShanaLMoore Sep 25, 2023
05304fd
:lipstick: Rubocop fixes
ShanaLMoore Sep 25, 2023
8d81514
✅ Fix test setup for catalog_controller_spec
kirkkwang Sep 25, 2023
aa7f8c6
Add knapsack helper
kirkkwang Sep 26, 2023
7740cfd
remove Adventist from application.rb
kirkkwang Sep 26, 2023
5108af1
🎁 Add conditional to run correct command for worker
ShanaLMoore Sep 28, 2023
b8af51e
Make appearance constants overrideable
laritakr Sep 29, 2023
6126bf6
add reporting fix to hyku ci
orangewolf Oct 1, 2023
057e77d
Merge branch 'main' into blacklight_advanced_and_range
orangewolf Oct 1, 2023
4bbb426
Merge branch 'main' into blacklight_advanced_and_range
orangewolf Oct 1, 2023
2a80187
spec loading fixes
orangewolf Oct 1, 2023
205e86c
Merge branch 'blacklight_advanced_and_range' of https://github.com/sa…
orangewolf Oct 1, 2023
49ce124
Merge branch 'blacklight_advanced_and_range' into adventist_dev
orangewolf Oct 1, 2023
691dda7
rubocop
orangewolf Oct 1, 2023
1e1d5f4
Merge branch 'blacklight_advanced_and_range' into adventist_dev
orangewolf Oct 1, 2023
deec7e2
🧹Make appearance defaults overrideable
laritakr Oct 2, 2023
cb2e3bf
bump bulkrax to 5.4.0
ShanaLMoore Oct 2, 2023
c700d41
🧹 Include knapsack css
laritakr Oct 3, 2023
45196bf
Merge branch 'allow_appearance_constant_overrides' into hyku_applicat…
laritakr Oct 3, 2023
f54672e
Merge branch 'main' into mr_good_job_its_got_to_be_good
orangewolf Oct 3, 2023
3552664
fix job loading when selecting good job
orangewolf Oct 3, 2023
22a3b4f
Merge branch 'mr_good_job_its_got_to_be_good' of https://github.com/s…
orangewolf Oct 3, 2023
d8117ad
Merge pull request #2006 from samvera/add-bundle-to-initialize-app
jeremyf Oct 3, 2023
64d9281
adjust docker compose to use the startup script
orangewolf Oct 3, 2023
5155798
Merge branch 'mr_good_job_its_got_to_be_good' into adventist_dev
orangewolf Oct 3, 2023
5feb7f4
:gift: install tesseract eng_best
ShanaLMoore Oct 3, 2023
e568fbd
♻️ revert tesseract best changes to dockerfile
ShanaLMoore Oct 3, 2023
0f91695
♻️ revert tesseract best changes to dockerfile
ShanaLMoore Oct 3, 2023
825b40e
Merge branch 'adventist_dev' of https://github.com/samvera/hyku into …
ShanaLMoore Oct 3, 2023
26ae013
🐛 Bring fix for entry show page not showing link
kirkkwang Oct 4, 2023
07fde57
🧹 Revert previous commit and update Bulkrax
kirkkwang Oct 4, 2023
8ae51d8
:bug: subject can't be blank for the contact form
ShanaLMoore Oct 4, 2023
fd32f03
mend
ShanaLMoore Oct 4, 2023
5e0cc2c
♻️ Add handling for Knapsack theme overrides
jeremyf Oct 4, 2023
de00833
Merge pull request #2010 from samvera/adding-knapsack-handling-for-files
jeremyf Oct 5, 2023
ff3fbcc
♻️ Favor Hyku::Application.path_for over Rails.root
jeremyf Oct 5, 2023
bd4ca7b
Merge pull request #2012 from samvera/favor-hyku-application-path-for
jeremyf Oct 5, 2023
95a7482
Merge remote-tracking branch 'origin/double-rendered-fonts' into adve…
ShanaLMoore Oct 5, 2023
80e02d3
🎁 Add highlight key to UV
kirkkwang Oct 6, 2023
ae093f1
🐛 Mixin `HykuKnapsack::ApplicationHelper`
kirkkwang Oct 7, 2023
9827c14
Revert "🐛 Mixin `HykuKnapsack::ApplicationHelper`"
kirkkwang Oct 7, 2023
6ccd618
♻️ Favor class_attribute over constant
jeremyf Oct 10, 2023
c114626
Merge pull request #2017 from samvera/favor-class-variable-over-constant
jeremyf Oct 10, 2023
2ff5f6c
♻️ Favor configurable html head title value
jeremyf Oct 10, 2023
f8eee24
Merge pull request #2018 from samvera/favor-configurable-application-…
jeremyf Oct 10, 2023
1c2a9d4
🐛 Add custom rendering for license
jeremyf Oct 10, 2023
6a2d624
Merge pull request #2019 from samvera/add-license-rendering
jeremyf Oct 10, 2023
363bc07
♻️ Add option to override devise configuration
jeremyf Oct 10, 2023
014f7b7
Merge pull request #2020 from samvera/add-config-for-devise-options
jeremyf Oct 10, 2023
961b712
run asset build later in process to allow knapsack to run it only one…
orangewolf Oct 12, 2023
6930f7f
🐛 Fix Add to Collection for page 2+ of works
jeremyf Oct 13, 2023
ae6de21
Merge pull request #2023 from samvera/add-to-collection-for-second-pa…
jeremyf Oct 13, 2023
ad8444e
test that invited users are added to the registered group
bkiahstroud Oct 13, 2023
db098e1
Add invited users to the registered group
bkiahstroud Oct 13, 2023
d2c02e3
Merge pull request #2026 from samvera/backport-2025
jeremyf Oct 16, 2023
3919082
🐛 Change Hyky to Hyku (#2029)
laritakr Oct 18, 2023
b0f2c44
🎁 Modify labels in UV for V3 manifests
kirkkwang Nov 1, 2023
7add38e
🐛 Fix bad method name
jeremyf Nov 27, 2023
0405abd
Merge pull request #2039 from samvera/fixing-method-name
jeremyf Nov 27, 2023
dbe996e
🐛 Move some methods to be public
kirkkwang Nov 29, 2023
da162d4
First attempt for upgrade to Hyrax 5.0.0.rc2
kirkkwang Dec 11, 2023
0840f98
🧹 Get assets to precompile
kirkkwang Dec 12, 2023
68f8909
🧹 Switch to Hyrax `double_combo` branch
kirkkwang Dec 12, 2023
2f2f4dc
Merge branch 'main' into adventist_dev
orangewolf Dec 12, 2023
0f67c4c
🧹 use class attribute instead of constant to correct failing specs
ShanaLMoore Dec 13, 2023
6930a86
Fix specs
kirkkwang Dec 13, 2023
939bd17
🧹 Get the page to load
kirkkwang Dec 12, 2023
31de0fe
♻️ Introduce Hyku::Application.theme_view_path_roots
jeremyf Oct 4, 2023
95a2228
Merge pull request #2007 from samvera/handle-theming-for-knapsacks
jeremyf Dec 13, 2023
032e08e
Merge branch 'adventist_dev' into hyrax-5-upgrade
kirkkwang Dec 13, 2023
2d7f8b7
🧹 Prepping for rubocop
kirkkwang Dec 13, 2023
fecb4e9
🧹 Ran `bundle exec rubocop -a`
kirkkwang Dec 13, 2023
6859d73
🧹 Autocorrect frozen string literals
kirkkwang Dec 13, 2023
59626ef
🧹 Rubocop'd lengths and other low hanging fruit
kirkkwang Dec 14, 2023
fe54004
Merge branch 'adventist_dev' into hyrax-5-upgrade
kirkkwang Dec 14, 2023
306b893
🧹 Remove deprecated Blacklight code
ShanaLMoore Dec 14, 2023
8b64bf8
🧹 Avoid `#present?` in non-Rails situations
jeremyf Dec 14, 2023
5177c95
Merge pull request #2056 from samvera/i35-remove-deprecated-blackligh…
ShanaLMoore Dec 14, 2023
553dec5
Merge pull request #2055 from samvera/avoid-present-call-in-non-rails…
jeremyf Dec 15, 2023
4d291bb
🧹 Get Homepage Controller specs passing (#2058)
laritakr Dec 15, 2023
2d00694
♻️ Replace Homepage Presenter with decorator (#2059)
laritakr Dec 15, 2023
1bfe119
🧹Get CatalogController specs working (#2060)
laritakr Dec 15, 2023
76010a4
🧹 Hyrax 5 get additional specs passing (#2062)
laritakr Dec 15, 2023
2cad6b2
🧹Database migration & schema update (#2063)
laritakr Dec 15, 2023
cd3b059
🧹 Fix Hyrax 5 remaining controller spec failures (#2064)
laritakr Dec 16, 2023
67f3163
🧹 Upgrade views from Bootstrap 3 to 4
kirkkwang Dec 16, 2023
6a48652
Hyrax 5 upgrade rubocop fixes & get specs running in CI (#2065)
laritakr Dec 16, 2023
8ac6d41
🧹 Fix CollapsableSectionPresenter override
kirkkwang Dec 16, 2023
7254e9f
🧹 Remove required translations from locales
kirkkwang Dec 16, 2023
0d76532
🐛 Fix some javascript errors
kirkkwang Dec 18, 2023
a16d786
Hyrax 5 upgrade rubocop fixes & get specs running in CI (#2065)
laritakr Dec 16, 2023
64a630a
Merge branch 'hyrax-5-upgrade' into bootstrap-5-views
kirkkwang Dec 18, 2023
c94feea
🧹 Post review adjustments
kirkkwang Dec 18, 2023
5f83a9a
Merge pull request #2066 from samvera/bootstrap-5-views
kirkkwang Dec 18, 2023
4275a22
🧹 Clean up a couple blacklight views
kirkkwang Dec 18, 2023
6563c87
🧹 Bring back `BlacklightHelperBehavior`
kirkkwang Dec 18, 2023
1c04b9e
🧹 Hyrax 5 upgrade additional specs (#2067)
laritakr Dec 19, 2023
f7d9038
Merge pull request #2069 from samvera/odds-and-ends-blacklight-views
kirkkwang Dec 19, 2023
2845fd5
Update Hyrax to pull in most recent changes
laritakr Dec 19, 2023
5655df8
Merge pull request #2070 from samvera/update-hyrax-double_combo
jeremyf Dec 19, 2023
ae6b9cd
More spec fixes
laritakr Dec 19, 2023
f086c09
Fix missing translation logic
laritakr Dec 19, 2023
716b7ef
Fix missing_translation override
laritakr Dec 19, 2023
75d519f
🧹 Remove copied code
jeremyf Dec 19, 2023
2c64fa3
Merge pull request #2072 from samvera/rework-permission-query
jeremyf Dec 19, 2023
e905068
Merge branch 'hyrax-5-upgrade' in
laritakr Dec 19, 2023
ac83919
🧹 Fix missing method name
jeremyf Dec 19, 2023
e33ffab
🐛 Ensure :maxFileSize is integer
jeremyf Dec 19, 2023
5159b57
Merge pull request #2071 from samvera/i55-get-specs-passing
jeremyf Dec 19, 2023
9e098a8
Merge pull request #2074 from samvera/fix-size
jeremyf Dec 19, 2023
0daf9f0
Skip taking a picture on failure
jeremyf Dec 19, 2023
d122f12
Merge pull request #2075 from samvera/skip-taking-page-snapshot-in-ci
jeremyf Dec 19, 2023
6bac28b
🧹 Fix issue regarding Valkyrie::Identifier
jeremyf Dec 19, 2023
c786fb8
Merge pull request #2076 from samvera/fixing-valkyrie-identifier-not-…
jeremyf Dec 19, 2023
d758340
🧹 Favor Sipity::Entity function over to_sipity_entity
jeremyf Dec 19, 2023
a9dc46e
Update Hyrax IIIF AV gem
jeremyf Dec 19, 2023
b01e6c5
Merge pull request #2077 from samvera/fix-conversion-to-sipity
jeremyf Dec 19, 2023
095edca
🧹 Review controller overrides
kirkkwang Dec 20, 2023
a32c814
clean up from pr review
orangewolf Dec 20, 2023
f4065ea
Appease rubocop
jeremyf Dec 20, 2023
8272321
Update IIIF Print gem
jeremyf Dec 20, 2023
5b3089a
🤖 Specify Cache Root
jeremyf Dec 20, 2023
ecbf83e
🧹 Update spec to reflect AdminSet default behavior
jeremyf Dec 20, 2023
4f4ccb4
Merge pull request #2079 from samvera/hyrax-5-upgrade-check-controllers
kirkkwang Dec 20, 2023
71a303f
Merge pull request #2081 from samvera/hyrax-5-upgrade-specify-hyku-ca…
jeremyf Dec 20, 2023
57bf77c
Merge pull request #2082 from samvera/hyrax-5-upgrade-replace-admin-s…
jeremyf Dec 20, 2023
f50b3f5
Remove obsolete site roles and routes (#2080)
laritakr Dec 20, 2023
c78d7ad
Remove stanford importer
laritakr Dec 20, 2023
aa9a6d7
🤖 Fix spec/features/collection_type_spec.rb
jeremyf Dec 20, 2023
73359b6
🤖 Fix stub methods to pass tests
jeremyf Dec 20, 2023
a6eaf7a
Merge pull request #2085 from samvera/hyrax-5-upgrade-fix-collection-…
jeremyf Dec 20, 2023
9183bc4
Merge pull request #2084 from samvera/remove-stanford-importer
jeremyf Dec 20, 2023
bee1f4f
Lock chromedriver version (#2086)
laritakr Dec 20, 2023
05d2838
🧹 Clean up model overrides
kirkkwang Dec 20, 2023
754013a
Merge pull request #2088 from samvera/hyrax-5-upgrade-check-model-ove…
kirkkwang Dec 20, 2023
87ce1dc
Merge pull request #2087 from samvera/hyrax-5-upgrade-redis-end-point…
jeremyf Dec 20, 2023
408d518
🤖 Favor general spec over specific
jeremyf Dec 20, 2023
4319562
🤖 Bring over Hyrax spec changes
jeremyf Dec 20, 2023
13775d6
🤖 Extract constant to ease testing
jeremyf Dec 20, 2023
0dbddad
🤖 Re-arrange CleanupAccountJob specs
jeremyf Dec 20, 2023
deb76d7
🧹 Restore btn-sign-up on splash page
jeremyf Dec 20, 2023
338aa71
🧹 Fix `./spec/requests/admin_dashboard_spec.rb` spec
jeremyf Dec 20, 2023
97403ce
Merge pull request #2091 from samvera/hyrax-5-upgrade-restore-btn-sig…
jeremyf Dec 20, 2023
047c8bc
🎁 Upgrade Redis initializer to Hyrax 5's gen version
jeremyf Dec 20, 2023
d35b250
🧹 Clean up actors
kirkkwang Dec 20, 2023
b4c0f5e
Merge pull request #2092 from samvera/hyrax-5-upgrade-workflow-respon…
jeremyf Dec 20, 2023
8bfed2e
Merge pull request #2090 from samvera/hyrax-5-clean-up-actors
kirkkwang Dec 20, 2023
7cd50e0
Merge pull request #2093 from samvera/hyrax-5-redis-connection
jeremyf Dec 20, 2023
55fa158
🐛 Handle missing labels
laritakr Dec 20, 2023
01c8643
Appease the cops
jeremyf Dec 20, 2023
70099cb
🧹 Assigning collection_type
jeremyf Dec 20, 2023
875df7a
Merge pull request #2089 from samvera/hyrax-5-upgrade-spec-fixing
jeremyf Dec 20, 2023
00e3ce8
Merge pull request #2095 from samvera/hyrax-5-upgrade-fix-identity-pr…
jeremyf Dec 20, 2023
c0bca4a
Merge pull request #2094 from samvera/hyrax-5-upgrade-fixing-dashboar…
jeremyf Dec 20, 2023
8748cda
Appease rubocop
jeremyf Dec 20, 2023
8ca1257
Fixing nav link selectors to new structure
jeremyf Dec 20, 2023
3c1f35b
Merge pull request #2096 from samvera/hyrax-5-upgrade-fixing-nav-link…
jeremyf Dec 20, 2023
fe5fc7c
Fixing nav link selectors to new structure
jeremyf Dec 20, 2023
e92726a
🧹 Clean up forms
kirkkwang Dec 20, 2023
546dcc5
Merge pull request #2097 from samvera/hyrax-5-upgrade-fixing-nav-link…
jeremyf Dec 21, 2023
0444cf5
Merge pull request #2098 from samvera/hyrax-5-forms-cleanup
jeremyf Dec 21, 2023
7218001
🧹 Fix spec based on HTML class changes
jeremyf Dec 21, 2023
f44ed0f
Merge pull request #2099 from samvera/hyrax-5-upgrade-fixing-nav-link…
jeremyf Dec 21, 2023
cffe41b
🧹 Narrow specificity of CSS selector
jeremyf Dec 21, 2023
9c3c46a
🧹 Remove specificity of CSS selectors in test
jeremyf Dec 21, 2023
47648f1
Merge pull request #2100 from samvera/hyrax-5-upgrade-fix-a-few-specs
jeremyf Dec 21, 2023
621c9aa
🐛 Adding document_component to blacklight's config
jeremyf Dec 21, 2023
046c6ea
Merge pull request #2104 from samvera/hyrax-5-upgrade-add-document-co…
jeremyf Dec 21, 2023
75fc391
🧹 Allow :clean or :clean_repo to work for the cleaners
jeremyf Dec 21, 2023
97e320b
🧹 Remove skip CI
jeremyf Dec 21, 2023
7184607
🧹 Fix button class for Bootstrap 3 to 4
jeremyf Dec 21, 2023
9eed101
Merge pull request #2105 from samvera/hyrax-5-upgrade-allow-clean_repo
jeremyf Dec 21, 2023
956249c
Merge pull request #2103 from samvera/hyrax-5-upgrade-remove-ci-skip-…
jeremyf Dec 21, 2023
b7bc2f2
Merge pull request #2102 from samvera/hyrax-5-upgrade-restore-ci-spec
jeremyf Dec 21, 2023
681401a
🧹 Favor Layout/LineLength over Metrics/LineLength
jeremyf Dec 21, 2023
4fb2fa8
🧹 The selector is not working
jeremyf Dec 21, 2023
a1e501a
Merge pull request #2107 from samvera/hyrax-5-upgrade-remove-rubocop-…
jeremyf Dec 21, 2023
c681a5d
Cleaning a spec that should start clean
jeremyf Dec 21, 2023
28825f9
Merge pull request #2106 from samvera/hyrax-5-upgrade-to-tame-a-faili…
jeremyf Dec 21, 2023
0616ff2
🧹 Ensure feature specs run clean
jeremyf Dec 21, 2023
134c8ff
Merge pull request #2108 from samvera/hyrax-5-upgrade-ensure-feature-…
jeremyf Dec 21, 2023
342605d
Stab at trying to find a problem
jeremyf Dec 21, 2023
e718e51
🧹 Clean up services
kirkkwang Dec 21, 2023
fb3459c
Moving rescue and documenting the why
jeremyf Dec 21, 2023
dd0d99b
Merge branch 'adventist_dev' into hyrax-5-upgrade-with-adventist-dev
jeremyf Dec 21, 2023
1929072
🧹 Rearrange order of filter chain
jeremyf Dec 21, 2023
488208b
Merge pull request #2110 from samvera/hyrax-5-upgrade-with-adventist-dev
jeremyf Dec 21, 2023
4942fe4
🧹 Address PR comments
kirkkwang Dec 22, 2023
1476b2b
🧹 Attempting to find and squash bug
jeremyf Dec 22, 2023
0ca7ad2
Merge pull request #2111 from samvera/hyrax-5-upgrade-build-bug-squas…
jeremyf Dec 22, 2023
357da53
Merge pull request #2109 from samvera/hyrax-5-clean-up-services
kirkkwang Dec 22, 2023
87df9b0
♻️ Account for observed customizations
jeremyf Dec 22, 2023
5e58fd9
Merge pull request #2115 from samvera/prime-hyrax-5-upgrade-refactor-…
jeremyf Dec 22, 2023
3af409b
🧹 Clean up other overrides
kirkkwang Dec 22, 2023
4162498
🧹 Change locale file load order so that our local files are prioritized
ShanaLMoore Jan 2, 2024
5907888
Merge pull request #2118 from samvera/local-file-load-order
ShanaLMoore Jan 2, 2024
f311a8e
Merge pull request #2117 from samvera/hyrax-5-clean-up-other-overrides
kirkkwang Jan 2, 2024
e13371f
🧹 Update IIIF Print and AV gems
kirkkwang Jan 2, 2024
84fbabf
Merge pull request #2119 from samvera/hyrax-5-upgrade-fix-images-in-uv
kirkkwang Jan 2, 2024
577c479
🐛 Fix video thumbnail generation
kirkkwang Jan 2, 2024
a8d190b
Merge pull request #2120 from samvera/hyrax-5-fix-video-thumbnail
kirkkwang Jan 2, 2024
f802001
🧹 Add space between thumbnail and title
kirkkwang Jan 2, 2024
6f97be3
🧹 Update Hyku version
ShanaLMoore Jan 3, 2024
e573197
Merge branch 'hyrax-5-upgrade' into bump-hyku-version
ShanaLMoore Jan 3, 2024
0fd6877
:lipstick: ruboco fix
ShanaLMoore Jan 3, 2024
0133b09
Merge pull request #2121 from samvera/bump-hyku-version
ShanaLMoore Jan 3, 2024
e15b2dd
🧹 Fixing a few styles
kirkkwang Jan 3, 2024
9ec6d40
sort properties
kirkkwang Jan 3, 2024
8e4c93f
adjust screen size
kirkkwang Jan 3, 2024
3c71cb3
Merge pull request #2122 from samvera/hyrax-5-fix-css
kirkkwang Jan 3, 2024
f33a57b
🧹 Update `rails` to `6-1-stable` for GoodJob
kirkkwang Jan 3, 2024
0405409
Merge pull request #2125 from samvera/hyrax-5-get-good-job-working
kirkkwang Jan 3, 2024
826ed40
🎁 only add Good Job classes if it's enabled
ShanaLMoore Jan 4, 2024
762ab77
♻️ Removing file in favor of comments found in docker-compose.yml
ShanaLMoore Jan 4, 2024
1797a6a
Merge pull request #2127 from samvera/hyrax-5-upgrade-pr-feedback
ShanaLMoore Jan 4, 2024
ef392b4
🧹 Remove disabling of Rubocop Naming/PredicateName (#2126)
laritakr Jan 4, 2024
5c1deab
🎁 Add Hyrax version in the footer
kirkkwang Jan 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 9 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1
orbs:
samvera: samvera/circleci-orb@1
browser-tools: circleci/browser-tools@1.3
browser-tools: circleci/browser-tools@1.4.6
ruby: circleci/ruby@2
node: circleci/node@5

Expand All @@ -10,13 +10,13 @@ jobs:
parameters:
ruby_version:
type: string
default: 2.7.8
default: 3.2.2
bundler_version:
type: string
default: 2.4.8
rails_version:
type: string
default: '5.1.6'
default: '6.1.7.6'
solr_config_path:
type: string
fcrepo_version:
Expand Down Expand Up @@ -61,6 +61,7 @@ jobs:
BUNDLE_PATH: vendor/bundle
BUNDLE_JOBS: 4
BUNDLE_RETRY: 3
HYKU_CACHE_ROOT: /tmp/hyku-cache
HYKU_RESTRICT_CREATE_AND_DESTROY_PERMISSIONS: 'true'
SOLR_ADMIN_USER: admin
SOLR_ADMIN_PASSWORD: admin
Expand All @@ -79,7 +80,9 @@ jobs:
ruby_version: << parameters.ruby_version >>
bundler_version: << parameters.bundler_version >>
- samvera/rubocop
- browser-tools/install-chrome
- browser-tools/install-chrome:
chrome-version: 114.0.5735.90 # see https://github.com/CircleCI-Public/browser-tools-orb/pull/96
replace-existing: true
- browser-tools/install-chromedriver
- run:
name: Check Chrome install
Expand All @@ -95,6 +98,6 @@ workflows:
ci:
jobs:
- bundle:
ruby_version: "2.7.8"
name: "ruby2-7-8"
ruby_version: "3.2.2"
name: "ruby3-2-2"
solr_config_path: 'solr/conf'
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
./coverage
./docker
./fcrepo
./importer
./log
./pg
./public/assets
Expand Down
11 changes: 7 additions & 4 deletions .env
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
CHROME_HOSTNAME=chrome
COMPOSE_DOCKER_CLI_BUILD=1
DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true
DB_ADAPTER=postgresql
DB_HOST=db
DB_HOST=db
Expand All @@ -13,25 +14,27 @@ FCREPO_BASE_PATH=/hykudemo
FCREPO_HOST=fcrepo
FCREPO_PORT=8080
FCREPO_REST_PATH=rest
HYRAX_ACTIVE_JOB_QUEUE=sidekiq
HYRAX_FITS_PATH=/app/fits/fits.sh
[email protected]
INITIAL_ADMIN_PASSWORD=testing123
JAVA_OPTS=-Xmx4g -Xms1g
IN_DOCKER=true
JAVA_OPTS=-Xmx4g -Xms1g
LD_LIBRARY_PATH=/opt/fits/tools/mediainfo/linux
NEGATIVE_CAPTCHA_SECRET=default-value-change-me
PASSENGER_APP_ENV=development
RAILS_LOG_TO_STDOUT=true
REDIS_HOST=redis
SECRET_KEY_BASE=asdf
HYRAX_ACTIVE_JOB_QUEUE=sidekiq
HYRAX_FITS_PATH=/app/fits/fits.sh
NEGATIVE_CAPTCHA_SECRET=default-value-change-me
SOLR_ADMIN_PASSWORD=SolrRocks
SOLR_ADMIN_USER=solr
SOLR_COLLECTION_NAME=hydra-development
SOLR_CONFIGSET_NAME=hyku
SOLR_HOST=solr
SOLR_PORT=8983
SOLR_URL=http://solr:SolrRocks@solr:8983/solr/
TB_RSPEC_FORMATTER=progress
TB_RSPEC_OPTIONS="--format RspecJunitFormatter --out rspec.xml"

# Comment out these 5 for single tenancy / Uncomment for multi
HYKU_ADMIN_HOST=hyku.test
Expand Down
180 changes: 99 additions & 81 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,129 +1,147 @@
# Turn on RSpec cops
require: rubocop-rspec
inherit_from: .rubocop_todo.yml
inherit_from:
- .rubocop_fixme.yml

# With the rubocop 0.47.0 and rubocop-rspec 1.8.0 the following stderr message was sent:
# An error occurred while RSpec/DescribedClass cop was inspecting path/to/file
RSpec/DescribedClass:
Enabled: false
inherit_gem:
bixby: bixby_default.yml

AllCops:
NewCops: disable
TargetRubyVersion: 3.2.2
DisplayCopNames: true
TargetRubyVersion: 2.3
Exclude:
- 'bin/**/*'
- 'db/**/*'
- 'config/**/*'
- 'vendor/**/*'
- '.internal_test_app/**/*'
- 'spec/fixtures/**/*'
- 'spec/internal/**/*'
- 'script/**/*'
- 'spec/test_app_templates/**/*'
- 'Rakefile'
- 'lib/tasks/rubocop.rake'
# disabling collections controller as most of the rubocop errors are in hyrax
- 'app/controllers/hyrax/dashboard/collections_controller.rb'

Rails:
Enabled: true
- 'vendor/**/*'
- 'lib/hyrax/specs/**/*'
- 'bin/graph'
- 'bin/import_from_purl'

Rails/DynamicFindBy:
Whitelist:
- find_by_user_key
Lint/ImplicitStringConcatenation:
Exclude:
- 'lib/importer/factory/object_factory.rb'
- 'lib/generators/hyrax/**/*'

Rails/UnknownEnv:
Environments:
- development
- production
- staging
- test
Rails/Output:
Exclude:
- 'lib/generators/**/*'

Metrics/LineLength:
Max: 120
Metrics/BlockLength:
IgnoredMethods: ['included']
Exclude:
- 'app/controllers/catalog_controller.rb'
- 'spec/controllers/curation_concerns/generic_works_controller_spec.rb'
- 'spec/services/iiif_collection_thumbnail_path_service_spec.rb'
- 'spec/services/iiif_work_thumbnail_path_service_spec.rb'
- 'spec/routing/proprietor/accounts_routing_spec.rb'
- 'hyrax.gemspec'
- 'app/models/concerns/hyrax/content_block_behavior.rb'
- 'app/services/hyrax/workflow/workflow_schema.rb'
- 'config/initializers/simple_form.rb'
- 'config/features.rb'
- 'config/routes.rb'
- 'lib/generators/hyrax/templates/catalog_controller.rb'
- 'lib/generators/hyrax/templates/config/initializers/simple_form_bootstrap.rb'
- 'lib/hyrax/rails/routes.rb'
- 'lib/tasks/*.rake'
- 'spec/**/*.rb'
- 'tasks/benchmark.rake'

Layout/IndentationConsistency:
EnforcedStyle: rails
Style/AsciiComments:
Enabled: false

Layout/DotPosition:
EnforcedStyle: leading
# rubocop suggests !thing.nil? instead, but that is NOT equivalent
Style/DoubleNegation:
Enabled: false

Style/Documentation:
Style/CollectionMethods:
PreferredMethods:
collect: 'map'
collect!: 'map!'
inject: 'reduce'
detect: 'find'
find_all: 'select'

Style/SymbolArray:
Enabled: false

Style/StringLiterals:
Style/ClassAndModuleChildren:
Enabled: false

Style/WordArray:
Style/SingleLineBlockParams:
Enabled: false

Metrics/ClassLength:
Exclude:
- 'app/controllers/catalog_controller.rb'
Rails/ApplicationJob:
Enabled: false

Rails/ApplicationMailer:
Enabled: false

Metrics/ModuleLength:
Max: 200
Rails/ApplicationRecord:
Enabled: false

Rails/HasAndBelongsToMany:
Exclude:
- 'app/models/role.rb'

RSpec/AnyInstance:
Rails/HasManyOrHasOneDependent:
Exclude:
- 'app/models/endpoint.rb'

Rails/RakeEnvironment:
Enabled: false

RSpec/InstanceVariable:
# We define custom methods like `find_by_user_key`,
# `find_by_created_date`, etc
Rails/DynamicFindBy:
Enabled: false

Rails/FilePath:
Exclude:
- 'spec/controllers/hyku/registrations_controller_spec.rb'
- 'spec/abilities/**/*'

RSpec/NamedSubject:
Enabled: false
Rails/OutputSafety:
Exclude:
- 'app/builders/hyrax/form_builder.rb'
- 'app/helpers/hyrax/citations_behaviors/formatters/apa_formatter.rb'
- 'app/helpers/hyrax/citations_behaviors/formatters/chicago_formatter.rb'
- 'app/helpers/hyrax/citations_behaviors/formatters/mla_formatter.rb'
- 'app/helpers/hyrax/collections_helper.rb'
- 'app/helpers/hyrax/content_block_helper_behavior.rb'
- 'app/helpers/hyrax/hyrax_helper_behavior.rb'
- 'app/presenters/hyrax/fixity_status_presenter.rb'
- 'app/presenters/hyrax/presents_attributes.rb'
- 'app/renderers/hyrax/renderers/attribute_renderer.rb'
- 'spec/views/hyrax/my/works/_list_works.html.erb_spec.rb'

Rails/UniqueValidationWithoutIndex:
Exclude:
- 'app/models/account.rb'
- 'app/models/domain_name.rb'
- 'app/models/hyrax/group.rb'

RSpec/DescribeClass:
Exclude:
- 'spec/requests/**/*'
- 'spec/abilities/**/*'
- 'spec/config/hyrax_events_spec.rb'
- 'spec/conversions/**/*'
- 'spec/features/**/*'
- 'spec/inputs/**/*'
- 'spec/javascripts/jasmine_spec.rb'
- 'spec/tasks/rake_spec.rb'
- 'spec/views/**/*'
- 'spec/routing/**/*'
- 'spec/tasks/**/*'

Rails/FilePath:
Exclude:
- 'spec/routing/**/*'
# # By default RSpec/MessageSpies has the following:
# # Prefer have_received for setting message expectations. Setup form as a spy using allow or instance_spy.
# # The default assumes EnforcedStyle is 'have_received'. Most of our specs are 'receive'
RSpec/MessageSpies:
Enabled: false

RSpec/ExpectActual:
Exclude:
- 'spec/routing/**/*'
Enabled: false

RSpec/VerifiedDoubles:
RSpec/LetSetup:
Enabled: false

RSpec/MessageExpectation:
Enabled: false

# By default RSpec/MessageSpies has the following:
# Prefer have_received for setting message expectations. Setup form as a spy using allow or instance_spy.
RSpec/MessageSpies:
Enabled: true
EnforcedStyle: receive

RSpec/ExampleLength:
Max: 20

RSpec/NestedGroups:
Max: 4

RSpec/MultipleExpectations:
Enabled: false

Metrics/BlockLength:
Exclude:
- 'spec/**/*.rb'
- 'lib/tasks/*.rake'
- 'app/controllers/catalog_controller.rb'
RSpec/LeadingSubject:
Enabled: false
Loading
Loading