☄️ Valkyrize Hyku EPIC

.env

@@ -35,10 +35,12 @@ SOLR_PORT=8983
 SOLR_URL=http://solr:SolrRocks@solr:8983/solr/
 TB_RSPEC_FORMATTER=progress
 TB_RSPEC_OPTIONS="--format RspecJunitFormatter --out rspec.xml"
+VALKYRIE_ID_TYPE=string
 
 # Comment out these 5 for single tenancy / Uncomment for multi
 HYKU_ADMIN_HOST=hyku.test
 HYKU_ADMIN_ONLY_TENANT_CREATION=false
+HYKU_BLOCK_VALKYRIE_REDIRECT=false
 HYKU_DEFAULT_HOST=%{tenant}.hyku.test
 HYKU_ROOT_HOST=hyku.test
 HYKU_MULTITENANT=true
@@ -67,3 +69,5 @@ HYKU_RESTRICT_CREATE_AND_DESTROY_PERMISSIONS=true
 # AND comment this out
 HYRAX_ANALYTICS=false
 ##END## Enable Google Analytics
+
+HYRAX_VALKYRIE=true

.gitignore

@@ -17,6 +17,7 @@ rerun.txt
 pickle-email-*.html
 solr_db_initialized
 fits.log
+/storage/files
 
 ## Environment normalization:
 /.bundle

.rubocop.yml

@@ -41,6 +41,7 @@ Metrics/BlockLength:
     - 'lib/tasks/*.rake'
     - 'spec/**/*.rb'
     - 'tasks/benchmark.rake'
+    - 'config/application.rb'
 
 Style/AsciiComments:
   Enabled: false

Gemfile

@@ -29,7 +29,7 @@ gem 'blacklight_range_limit'
 gem 'bolognese', '>= 1.9.10'
 gem 'bootstrap', '~> 4.6'
 gem 'bootstrap-datepicker-rails'
-gem 'bulkrax', '~> 5.4'
+gem 'bulkrax', github: 'samvera/bulkrax', branch: 'main'
 gem 'byebug', group: %i[development test]
 gem 'capybara', group: %i[test]
 gem 'capybara-screenshot', '~> 1.0', group: %i[test]
@@ -54,7 +54,7 @@ gem 'hyrax-doi', github: 'samvera-labs/hyrax-doi', branch: 'rails_hyrax_upgrade'
 gem 'hyrax-iiif_av', github: 'samvera-labs/hyrax-iiif_av', branch: 'rails_hyrax_upgrade'
 gem 'i18n-debug', require: false, group: %i[development test]
 gem 'i18n-tasks', group: %i[development test]
-gem 'iiif_print', github: 'scientist-softserv/iiif_print', branch: 'rails_hyrax_upgrade'
+gem 'iiif_print', github: 'scientist-softserv/iiif_print', branch: 'main'
 gem 'jbuilder', '~> 2.5'
 gem 'jquery-rails' # Use jquery as the JavaScript library
 # The maintainers yanked 0.3.2 version (see https://github.com/dryruby/json-canonicalization/issues/2)
@@ -109,9 +109,12 @@ gem 'terser' # to support the Safe Navigation / Optional Chaining operator (?.)
 gem 'tether-rails'
 gem 'turbolinks', '~> 5'
 gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
+gem 'valkyrie', '~> 3.0', '>= 3.1.4' # There's a patch in 3.1.4 that we want
 gem 'web-console', '>= 3.3.0', group: %i[development] # <%= console %> in views
 gem 'webdrivers', '~> 4.7.0', group: %i[test]
 gem 'webmock', group: %i[test]
+# Enabling the following gem breaks sidekiq. To Enable: assets.debug must be set to true in config/development.rb
+# gem "xray-rails", git: "https://github.com/brentd/xray-rails.git", branch: "bugs/ruby-3.0.0", group: %i[development]
 
 # This gem does nothing by default, but is instead a tool to ease developer flow
 # and place overrides, themes and deployment code.
@@ -131,7 +134,8 @@ gem 'webmock', group: %i[test]
 #
 # Thus the hopefully descriptive `required_for_knapsack_instances`.
 #
-# tl;dr - Have a local `required_for_knapsack_instances` branch on your knapsack repository
+# tl;dr - Have a local `required_for_knapsack_instances` branch on your knapsack repository and 99%
+#         of the time use the `samvera-labs/hyku_knapsack` remote branch.
 gem 'hyku_knapsack', github: 'samvera-labs/hyku_knapsack', branch: 'required_for_knapsack_instances'
 
 # rubocop:enable Layout/LineLength

Gemfile.lock

@@ -100,6 +100,9 @@ GIT
   specs:
     hyku_knapsack (0.0.1)
       rails (>= 5.2.0)
+      sentry-rails
+      sentry-ruby
+      sentry-sidekiq
 
 GIT
   remote: https://github.com/samvera-labs/hyrax-doi.git
@@ -123,12 +126,34 @@ GIT
       iiif_manifest (> 0.5)
       rails (>= 5.1, < 8.0)
 
+GIT
+  remote: https://github.com/samvera/bulkrax.git
+  revision: 1048453a4d99a6fba4b10531c2dc3a67a51c4c50
+  branch: main
+  specs:
+    bulkrax (8.0.0)
+      bagit (~> 0.4.6)
+      coderay
+      denormalize_fields
+      iso8601 (~> 0.9.0)
+      kaminari
+      language_list (~> 1.2, >= 1.2.1)
+      libxml-ruby (~> 3.2.4)
+      loofah (>= 2.2.3)
+      marcel
+      oai (>= 0.4, < 2.x)
+      rack (>= 2.0.6)
+      rails (>= 5.1.6)
+      rdf (>= 2.0.2, < 4.0)
+      rubyzip
+      simple_form
+
 GIT
   remote: https://github.com/samvera/hyrax.git
-  revision: cc86fa88456b2d5021e52f8d8842128f960215d0
+  revision: a5a0ae9e56df857a92fc53ae86216cbb007db47a
   branch: double_combo
   specs:
-    hyrax (5.0.0.rc3)
+    hyrax (5.0.0)
       active-fedora (~> 14.0)
       almond-rails (~> 0.1)
       awesome_nested_set (~> 3.1)
@@ -197,8 +222,8 @@ GIT
 
 GIT
   remote: https://github.com/scientist-softserv/iiif_print.git
-  revision: cad2cf33fc07ec2abb5b6834a858b5ed74903c12
-  branch: rails_hyrax_upgrade
+  revision: eed88649c00e7b78f33425151fafe793db75ac82
+  branch: main
   specs:
     iiif_print (1.0.0)
       blacklight_iiif_search (>= 1.0, < 3.0)
@@ -383,20 +408,6 @@ GEM
       signet (~> 0.8)
       typhoeus
     builder (3.2.4)
-    bulkrax (5.5.0)
-      bagit (~> 0.4)
-      coderay
-      iso8601 (~> 0.9.0)
-      kaminari
-      language_list (~> 1.2, >= 1.2.1)
-      libxml-ruby (~> 3.2.4)
-      loofah (>= 2.2.3)
-      oai (>= 0.4, < 2.x)
-      rack (>= 2.0.6)
-      rails (>= 5.1.6)
-      rdf (>= 2.0.2, < 4.0)
-      rubyzip
-      simple_form
     byebug (11.1.3)
     cancancan (3.5.0)
     capybara (3.39.2)
@@ -454,6 +465,8 @@ GEM
     database_cleaner-core (2.0.1)
     date (3.3.4)
     declarative (0.0.20)
+    denormalize_fields (1.3.0)
+      activerecord (>= 4.1.14, < 8.0.0)
     deprecation (1.1.0)
       activesupport
     derivative-rodeo (0.5.3)
@@ -559,7 +572,7 @@ GEM
       ffi (>= 1.15.0)
     excon (0.71.1)
     execjs (2.9.1)
-    factory_bot (6.4.2)
+    factory_bot (6.4.6)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.2)
       factory_bot (~> 6.4)
@@ -1146,7 +1159,7 @@ GEM
     rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.1.0)
+    rspec-rails (6.1.1)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -1214,6 +1227,15 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
+    sentry-rails (5.17.1)
+      railties (>= 5.0)
+      sentry-ruby (~> 5.17.1)
+    sentry-ruby (5.17.1)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+    sentry-sidekiq (5.17.1)
+      sentry-ruby (~> 5.17.1)
+      sidekiq (>= 3.0)
     shacl (0.3.0)
       json-ld (~> 3.2)
       rdf (~> 3.2, >= 3.2.8)
@@ -1346,7 +1368,7 @@ GEM
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    valkyrie (3.1.1)
+    valkyrie (3.1.4)
       activemodel
       activesupport
       dry-struct
@@ -1402,6 +1424,8 @@ GEM
 
 PLATFORMS
   aarch64-linux-musl
+  arm64-darwin-23
+  ruby
   x86_64-linux-musl
 
 DEPENDENCIES
@@ -1419,7 +1443,7 @@ DEPENDENCIES
   bolognese (>= 1.9.10)
   bootstrap (~> 4.6)
   bootstrap-datepicker-rails
-  bulkrax (~> 5.4)
+  bulkrax!
   byebug
   capybara
   capybara-screenshot (~> 1.0)
@@ -1500,6 +1524,7 @@ DEPENDENCIES
   tether-rails
   turbolinks (~> 5)
   twitter-typeahead-rails (= 0.11.1.pre.corejavascript)
+  valkyrie (~> 3.0, >= 3.1.4)
   web-console (>= 3.3.0)
   webdrivers (~> 4.7.0)
   webmock

app/assets/stylesheets/hyku.scss

@@ -16,6 +16,10 @@
   }
 }
 
+.dashboard .form-tab-content label {
+  font-weight: 700;
+}
+
 @media (min-width: 768px) {
   .logo-set {
     display: flex;
@@ -467,6 +471,24 @@ body.public-facing {
   padding: 0;
 }
 
+.dd3-handle {
+  position: absolute; margin: 0; left: 0; top: 0; cursor: pointer; width: 30px;
+  text-indent: 100px;
+  white-space: nowrap; overflow: hidden;
+  border: 1px solid #aaa;
+  background: #ddd;
+  background: -webkit-linear-gradient(top, #ddd 0%, #bbb 100%);
+  background:    -moz-linear-gradient(top, #ddd 0%, #bbb 100%);
+  background:         linear-gradient(top, #ddd 0%, #bbb 100%);
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  z-index: 1;
+}
+
+.dd3-content .card-body {
+  background: transparent;
+}
+
 .d-flex {
   display: flex;
 }
@@ -532,6 +554,7 @@ span.constraint-value p, .facet-values p {
 // style the analytics button to match citations button
 #stats {
   margin-top: 10px;
+
   @media (min-width: 576px) {
     max-width: 300px;
   }
@@ -549,25 +572,28 @@ span.constraint-value p, .facet-values p {
 // collection show page styles
 
 .space-between {
-  justify-content: space-between;
   align-items: center;
+  justify-content: space-between;
 }
 
 .hyc-banner {
   padding: 15px;
-  .hyc-bugs .hyc-created-by, .hyc-bugs .hyc-last-updated, .hyc-title {
+  .hyc-bugs .hyc-created-by,
+  .hyc-bugs .hyc-last-updated,
+  .hyc-title {
     padding: 0;
   }
 
   .hyc-item-count {
-    margin: 0;
     background: rgba(255, 255, 255, 0.75);
-    padding: 10px;
     border-radius: 0.5em;
     color: #333;
+    margin: 0;
+    padding: 10px;
   }
 
-  .hyc-bugs div, div {
+  .hyc-bugs div,
+  div {
     position: relative;
   }
 }
@@ -588,7 +614,7 @@ span.constraint-value p, .facet-values p {
 }
 
 .mb-2 {
-  margin-bottom: .5em;
+  margin-bottom: 0.5em;
 }
 
 .mb-5 {
@@ -605,13 +631,13 @@ span.constraint-value p, .facet-values p {
 }
 
 .py-0 {
-  padding-top: 0;
   padding-bottom: 0;
+  padding-top: 0;
 }
 
 .py-4 {
-  padding-top: 2em;
   padding-bottom: 2em;
+  padding-top: 2em;
 }
 
 .d-block {

app/assets/stylesheets/hyrax.scss

@@ -22,6 +22,6 @@
 
 // for catalog search result snippets
 .highlight {
-  background: yellow;
+    background: #ffff00;
   font-weight: 700;
-}
+}

app/assets/stylesheets/viewer.scss

@@ -22,4 +22,4 @@
 .video-embed-viewer {
   aspect-ratio: 16 / 9;
   width: 100%;
-}
+}

app/controllers/application_controller.rb

@@ -41,7 +41,7 @@ def api_or_pdf?
   end
 
   def staging?
-    ['staging'].include?(Rails.env)
+    Rails.env.staging? # rubocop:disable Rails/UnknownEnv
   end
 
   def authenticate_if_needed