hyrax 4.0.0.rc3 → 5.0.0.rc1

data/.koppie/README.md

@@ -1,18 +1,18 @@
 # Koppie
 
-> Isolated granite outcrops in Southern Africa that are a favored habitat for hyraxes. 
+> Isolated granite outcrops in Southern Africa that are a favored habitat for hyraxes.
 
 Koppie is an application used for testing the state of [Hyrax](https://github.com/samvera/hyrax)
-using Postgres as the metadata store for objects.  This is similar to the Dassie test application 
+using Postgres as the metadata store for objects.  This is similar to the Dassie test application
 that lives in `.dassie`, however in this application Fedora is
-not used for storing object metadata or files. The Hyrax gem is sourced from the local hyrax 
+not used for storing object metadata or files. The Hyrax gem is sourced from the local hyrax
 directory one level up from `.koppie` for development purposes.
 
 ## Known Issues
 
 Collection model
 * `/app/models/collection.rb` - is_a `ActiveFedora::Base`
-* if `Collection` is changed to `Valkyrie::Resource`, there is an infinite loop while loading 
+* if `Collection` is changed to `Valkyrie::Resource`, there is an infinite loop while loading
   due to reference to ::Collection in `lib/hyrax/collection_name.rb` in the hyrax engine
 
 Default Admin Set
@@ -21,14 +21,14 @@ Default Admin Set
 
 ## Questions
 
-Please direct questions about this code or the servers where it runs to the `#hyrax-valkyrie` 
+Please direct questions about this code or the servers where it runs to the `#hyrax-valkyrie`
 channel on Samvera slack.
 
 ## Contributing
 
 If you're working on a PR for this project, create a feature branch off of `main`.
 
-This repository follows the [Samvera Community Code of Conduct](https://samvera.atlassian.net/wiki/spaces/samvera/pages/405212316/Code+of+Conduct) 
+This repository follows the [Samvera Community Code of Conduct](https://samvera.atlassian.net/wiki/spaces/samvera/pages/405212316/Code+of+Conduct)
 and [language recommendations](https://github.com/samvera/maintenance/blob/master/templates/CONTRIBUTING.md#language).
 Please ***do not*** create a branch called `master` for this repository or as part of your pull request; the branch will
 either need to be removed or renamed before it can be considered for inclusion in the code base and history of this repository.
@@ -46,10 +46,10 @@ git clone https://github.com/samvera/hyrax.git
 Execute the following commands from the hyrax root to start the app using Docker.
 
 ```
-docker-compose -f docker-compose-koppie.yml build
-docker-compose -f docker-compose-koppie.yml up
+docker compose -f docker-compose-koppie.yml build
+docker compose -f docker-compose-koppie.yml up
 ```
 
-You can find help with additional commands in Hyrax' [FAQ-for-Dassie-Docker-Test-App](https://github.com/samvera/hyrax/wiki/FAQ-for-Dassie-Docker-Test-App).  
-Most commands can be used directly as described in the FAQ.  A few might require 
-a slight adjustment to work with koppie as a Docker app. 
+You can find help with additional commands in Hyrax' [FAQ-for-Dassie-Docker-Test-App](https://github.com/samvera/hyrax/wiki/FAQ-for-Dassie-Docker-Test-App).
+Most commands can be used directly as described in the FAQ.  A few might require
+a slight adjustment to work with koppie as a Docker app.

data/.koppie/app/forms/collection_resource_form.rb

@@ -3,5 +3,6 @@
 # Generated via
 #  `rails generate hyrax:collection_resource CollectionResource`
 class CollectionResourceForm < Hyrax::Forms::PcdmCollectionForm
+  include Hyrax::FormFields(:basic_metadata)
   include Hyrax::FormFields(:collection_resource)
 end

data/.koppie/app/indexers/collection_resource_indexer.rb

@@ -3,5 +3,6 @@
 # Generated via
 #  `rails generate hyrax:collection_resource CollectionResource`
 class CollectionResourceIndexer < Hyrax::PcdmCollectionIndexer
+  include Hyrax::Indexer(:basic_metadata)
   include Hyrax::Indexer(:collection_resource)
 end

data/.koppie/app/models/collection_resource.rb

@@ -27,5 +27,6 @@ class CollectionResource < Hyrax::PcdmCollection
   # * add Valkyrie attributes to this class
   # * update form and indexer to process the attributes
   #
+  include Hyrax::Schema(:basic_metadata)
   include Hyrax::Schema(:collection_resource)
 end

data/.koppie/config/analytics.yml

@@ -3,6 +3,7 @@ analytics:
     analytics_id: <%= ENV['GOOGLE_ANALYTICS_ID'] %>
     app_name: <%= ENV.fetch('GOOGLE_OAUTH_APP_NAME', 'nurax-pg') %>
     app_version: <%= ENV.fetch['GOOGLE_OAUTH_APP_VERSION'] %>
+    privkey_value: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'] %>
     privkey_path: <%= ENV.fetch['GOOGLE_OAUTH_PRIVATE_KEY_PATH'] %>
     privkey_secret: <%= ENV.fetch['GOOGLE_OAUTH_PRIVATE_KEY_SECRET'] %>
     client_email: <%= ENV.fetch['GOOGLE_OAUTH_CLIENT_EMAIL'] %>

data/.koppie/config/environments/test.rb

@@ -1,5 +1,6 @@
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
+  config.assets.debug = true
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that

data/.koppie/config/initializers/hyrax.rb

@@ -7,6 +7,8 @@ Hyrax.config do |config|
 
   config.disable_wings = true # not needed if ENV includes HYRAX_SKIP_WINGS=true
 
+  config.characterization_options = { ch12n_tool: ENV.fetch('CH12N_TOOL', 'fits').to_sym }
+
   # Register roles that are expected by your implementation.
   # @see Hyrax::RoleRegistry for additional details.
   # @note there are magical roles as defined in Hyrax::RoleRegistry::MAGIC_ROLES
@@ -104,7 +106,7 @@ Hyrax.config do |config|
 
   # Location autocomplete uses geonames to search for named regions
   # Username for connecting to geonames
-  # config.geonames_username = ''
+  config.geonames_username = ENV['GEONAMES_USERNAME'] || ''
 
   # Should the acceptance of the licence agreement be active (checkbox), or
   # implied when the save button is pressed? Set to true for active
@@ -320,12 +322,16 @@ custom_queries = [Hyrax::CustomQueries::Navigators::CollectionMembers,
                   Hyrax::CustomQueries::Navigators::ParentCollectionsNavigator,
                   Hyrax::CustomQueries::Navigators::ChildFileSetsNavigator,
                   Hyrax::CustomQueries::Navigators::ChildWorksNavigator,
+                  Hyrax::CustomQueries::Navigators::ParentWorkNavigator,
                   Hyrax::CustomQueries::Navigators::FindFiles,
                   Hyrax::CustomQueries::FindAccessControl,
                   Hyrax::CustomQueries::FindCollectionsByType,
                   Hyrax::CustomQueries::FindFileMetadata,
                   Hyrax::CustomQueries::FindIdsByModel,
-                  Hyrax::CustomQueries::FindManyByAlternateIds]
+                  Hyrax::CustomQueries::FindManyByAlternateIds,
+                  Hyrax::CustomQueries::FindModelsByAccess,
+                  Hyrax::CustomQueries::FindCountBy,
+                  Hyrax::CustomQueries::FindByDateRange]
 custom_queries.each do |handler|
   Hyrax.query_service.custom_queries.register_query_handler(handler)
 end

data/.koppie/config/initializers/redis_config.rb

@@ -2,7 +2,6 @@
 require 'redis'
 require 'connection_pool'
 config = YAML.safe_load(ERB.new(IO.read(Rails.root.join('config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
-config[:thread_safe] = true
 
 size = ENV.fetch("HYRAX_REDIS_POOL_SIZE", 5)
 timeout = ENV.fetch("HYRAX_REDIS_TIMEOUT", 5)

data/.koppie/config/initializers/riiif.rb

@@ -14,12 +14,21 @@ ActiveSupport::Reloader.to_prepare do
     { height: doc['height_is'], width: doc['width_is'], format: doc['mime_type_ssi'], channels: doc['alpha_channels_ssi'] }
   end
 
-  Riiif::Image.file_resolver.id_to_uri = lambda do |id|
-    Hyrax::Base.id_to_uri(CGI.unescape(id)).tap do |url|
-      Rails.logger.info "Riiif resolved #{id} to #{url}"
+  if Hyrax.config.use_valkyrie?
+    # Use Valkyrie adapter to make sure file is available locally. Riiif will just open it then
+    # id comes in with the format "FILE_SET_ID/files/FILE_ID"
+    Riiif::Image.file_resolver.id_to_uri = lambda do |id|
+      file_metadata = Hyrax.query_service.find_by(id: id.split('/').last)
+      file = Hyrax.storage_adapter.find_by(id: file_metadata.file_identifier)
+      file.disk_path.to_s
+    end
+  else
+    Riiif::Image.file_resolver.id_to_uri = lambda do |id|
+      Hyrax::Base.id_to_uri(CGI.unescape(id)).tap do |url|
+        Rails.logger.info "Riiif resolved #{id} to #{url}"
+      end
     end
   end
-
   Riiif::Image.authorization_service = Hyrax::IiifAuthorizationService
 
   Riiif.not_found_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')

data/.koppie/config/metadata/collection_resource.yaml

@@ -19,131 +19,4 @@
 # Generated via
 #  `rails generate hyrax:collection_resource CollectionResource`
 
-attributes:
-  description:
-    type: string
-    multiple: true
-    form:
-      primary: true
-    index_keys:
-      - "description_tesim"
-  creator:
-    type: string
-    multiple: true
-    form:
-      required: false
-      primary: false
-    index_keys:
-      - "creator_tesim"
-  rights_statement:
-    type: string
-    multiple: true
-    form:
-      primary: false
-  abstract:
-    type: string
-    multiple: true
-    form:
-      primary: false
-  access_right:
-    type: string
-    multiple: true
-    form:
-      primary: false
-  alternative_title:
-    type: string
-    multiple: true
-    form:
-      primary: false
-  based_near:
-    type: string
-    multiple: true
-    form:
-      primary: false
-    index_keys:
-      - "based_near_sim"
-      - "based_near_tesim"
-  bibliographic_citation:
-    type: string
-    multiple: true
-  contributor:
-    type: string
-    multiple: true
-    form:
-      primary: false
-  date_created:
-    type: date_time
-    multiple: true
-    form:
-      primary: false
-    index_keys:
-      - "date_created_tesim"
-  identifier:
-    type: string
-    multiple: true
-    form:
-      primary: false
-  import_url:
-    type: string
-  keyword:
-    type: string
-    multiple: true
-    index_keys:
-      - "keyword_sim"
-      - "keyword_tesim"
-    form:
-      primary: false
-  publisher:
-    type: string
-    multiple: true
-    form:
-      primary: false
-  label:
-    type: string
-    form:
-      primary: false
-  language:
-    type: string
-    multiple: true
-    form:
-      primary: false
-  license:
-    type: string
-    multiple: true
-    form:
-      primary: false
-  relative_path:
-    type: string
-  related_url:
-    type: string
-    multiple: true
-    form:
-      primary: false
-    index_keys:
-      - "related_url_tesim"
-  resource_type:
-    type: string
-    multiple: true
-    form:
-      primary: false
-    index_keys:
-      - "resource_type_sim"
-      - "resource_type_tesim"
-  rights_notes:
-    type: string
-    multiple: true
-    form:
-      primary: false
-  source:
-    type: string
-    multiple: true
-    form:
-      primary: false
-  subject:
-    type: string
-    multiple: true
-    index_keys:
-      - "subject_sim"
-      - "subject_tesim"
-    form:
-      primary: false
+attributes: {}

data/.koppie/yarn.lock

@@ -706,7 +706,7 @@ iconv-lite@^0.6.2:
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
-  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
+  integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==
 
 imsc@^1.0.1-rc.1:
   version "1.1.2"
@@ -757,7 +757,7 @@ is-typedarray@~1.0.0:
 isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
 isexe@^2.0.0:
   version "2.0.0"
@@ -818,9 +818,9 @@ json-stringify-safe@~5.0.1:
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
     minimist "^1.2.0"
 
@@ -840,14 +840,14 @@ jsviews@0.9.83:
   integrity sha1-BpsFEigz0jFVzDziwtn7LPeJqYo=
 
 jszip@*, jszip@^3.1.5, jszip@^3.2.2:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9"
-  integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.1.tgz#34aee70eb18ea1faec2f589208a157d1feb091c2"
+  integrity sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==
   dependencies:
     lie "~3.3.0"
     pako "~1.0.2"
     readable-stream "~2.3.6"
-    set-immediate-shim "~1.0.1"
+    setimmediate "^1.0.5"
 
 lie@3.1.1:
   version "3.1.1"
@@ -864,9 +864,9 @@ lie@~3.3.0:
     immediate "~3.0.5"
 
 loader-utils@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
-  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
+  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -953,9 +953,9 @@ minimist@1.2.0:
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
 minimist@^1.2.0:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
+  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
 mute-stream@0.0.7:
   version "0.0.7"
@@ -1100,9 +1100,9 @@ punycode@^2.1.0, punycode@^2.1.1:
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
+  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
 
 readable-stream@^2.0.2, readable-stream@~2.3.6:
   version "2.3.7"
@@ -1209,10 +1209,10 @@ schema-utils@^0.4.0:
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
 
-set-immediate-shim@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
+setimmediate@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
 
 shebang-command@^2.0.0:
   version "2.0.0"
@@ -1419,7 +1419,7 @@ url-toolkit@^2.1.2:
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 uuid@^3.3.2:
   version "3.4.0"

data/.regen

@@ -1,2 +1,2 @@
 # When updating CI regen seed, set to current date.
-2023-05-15T10:04:07
+2023-08-09T14:34:59

data/CONTAINERS.md

@@ -13,7 +13,7 @@ There are two options for development environments to run:
 <!-- NOTE: This title is referenced in the top-level README.md. Keep that in mind if you change it. -->
 ## Hyrax Engine Development
 
-We support a `docker-compose`-based development environment for folks working on
+We support a `docker compose`-based development environment for folks working on
 the Hyrax engine. This environment is substantially more like a Hyrax production
 setup than the older `fedora_wrapper`/`solr_wrapper` approach.
 
@@ -24,8 +24,8 @@ First, make sure you have installed [Docker](https://www.docker.com/).  Then clo
 Within your cloned repository, tell Docker to get started installing your development environment:
 
 ```sh
-docker-compose build
-docker-compose up
+docker compose build
+docker compose up
 ```
 
 This starts containers for:
@@ -40,24 +40,24 @@ This starts containers for:
 
 It also runs database migrations. This will also bring up a development application on `http://localhost:3000`.
 
-To stop the containers for the Hyrax-based application, type <kbd>Ctrl</kbd>+<kbd>c</kbd>. To restart the containers you need only run `docker-compose up`.
+To stop the containers for the Hyrax-based application, type <kbd>Ctrl</kbd>+<kbd>c</kbd>. To restart the containers you need only run `docker compose up`.
 
 _**Note:** Starting and stopping Docker in this way will preserve your data between restarts._
 
 #### Code Changes and Testing
 
-With `docker-compose up` running, any changes you make to your cloned Hyrax code-base should show up in `http://localhost:3000`; There may be cases where you need to restart your test application (e.g. stop the containers and start them up again).
+With `docker compose up` running, any changes you make to your cloned Hyrax code-base should show up in `http://localhost:3000`; There may be cases where you need to restart your test application (e.g. stop the containers and start them up again).
 
 Any changes you make to Hyrax should be tested. You can run the full test suite using the following command:
 
 ```sh
-docker-compose exec -w /app/samvera/hyrax-engine app sh -c "bundle exec rspec"
+docker compose exec -w /app/samvera/hyrax-engine app sh -c "bundle exec rspec"
 ```
 
 Let's break down the above command:
 
 <dl>
-<dt><code>docker-compose exec</code></dt>
+<dt><code>docker compose exec</code></dt>
 <dd>Tell docker to run the following:</dd>
 <dt><code>-w /app/samvera/hyrax-engine</code></dt>
 <dd>In the working directory "/app/samvera/hyrax-engine" (e.g. your cloned Hyrax repository)</dd>
@@ -86,13 +86,13 @@ bind mount to `/app/samvera/hyrax-webapp`, and your local development copy of Hy
 What does this structure mean? Let's look at an example. The following command will list the rake tasks for the Hyrax-based application running in Docker:
 
 ```sh
-docker-compose exec -w /app/samvera/hyrax-webapp app sh -c "bundle exec rake -T"
+docker compose exec -w /app/samvera/hyrax-webapp app sh -c "bundle exec rake -T"
 ```
 
 And this command lists the rake tasks for the Hyrax engine that is in Docker:
 
 ```sh
-docker-compose exec -w /app/samvera/hyrax-engine app sh -c "bundle exec rake -T"
+docker compose exec -w /app/samvera/hyrax-engine app sh -c "bundle exec rake -T"
 ```
 
 In the two examples, note the difference in the `-w` switch. In the first case, it's referencing the Hyrax-based application. In the latter case, it's referencing the Hyrax engine.
@@ -101,7 +101,7 @@ In the two examples, note the difference in the `-w` switch. In the first case,
 
 If you are interested in running Hyrax in debug mode, this requires a somewhat different approach than running Hyrax bare-metal.  You need to use `docker attach` to debug the running docker instance.
 
-1. With `docker-compose up` running open a new Terminal session.
+1. With `docker compose up` running open a new Terminal session.
 2. In that new Terminal session, using `docker container ls` find the "CONTAINER ID" for the `hyrax-engine-dev`.
 3. With the "CONTAINER ID", run `docker attach <CONTAINER ID>`.
 
@@ -111,7 +111,7 @@ This advice comes from [Debugging Rails App With Docker Compose: How to use Byeb
 
 ##### Bad Address SOLR
 
-With `docker-compose up` running, if you see the following, then there may be issues with file permissions:
+With `docker compose up` running, if you see the following, then there may be issues with file permissions:
 
 ```
 db_migrate_1  | waiting for solr:8983
@@ -125,15 +125,15 @@ Executing /opt/docker-solr/scripts/precreate-core hyrax_test /opt/solr/server/co
 cp: cannot create directory '/var/solr/data/hyrax_test': Permission denied
 ```
 
-The solution that appears to work is to `docker-compose down --volumes`; This will tear down the docker instance, and remove the volumes.  You can then run `docker-compose up` to get back to work.  _**Note:** the `--volumes` switch will remove all custom data._
+The solution that appears to work is to `docker compose down --volumes`; This will tear down the docker instance, and remove the volumes.  You can then run `docker compose up` to get back to work.  _**Note:** the `--volumes` switch will remove all custom data._
 
 ##### Errors building the Docker image
 
-If you encounter errors running `docker-compose build`, try running `bundle update` in `./hyrax` as well as within `./hyrax/.dassie`. That can help clear up the problem of a failure to build a particular gem.
+If you encounter errors running `docker compose build`, try running `bundle update` in `./hyrax` as well as within `./hyrax/.dassie`. That can help clear up the problem of a failure to build a particular gem.
 
 ##### Containers do not all start
 
-If any of the services fail to start on `docker-compose up`, try clearing out any `Gemfile.lock` files that might exist in `./hyrax` or `./hyrax/.dassie` and run `docker-compose build` again, then `docker-compose up` again.
+If any of the services fail to start on `docker compose up`, try clearing out any `Gemfile.lock` files that might exist in `./hyrax` or `./hyrax/.dassie` and run `docker compose build` again, then `docker compose up` again.
 
 ### Koppie Internal Test App with Valkyrie Connector to Postgres
 
@@ -191,7 +191,7 @@ We publish several Hyrax images to the [GitHub container registry][ghcr] under
 the [Samvera organization][samvera-packages].  To build them:
 
 ```sh
-export HYRAX_VERSION=v4.0.0.rc3 # or desired version
+export HYRAX_VERSION=v5.0.0.rc1 # or desired version
 git checkout hyrax-$HYRAX_VERSION
 
 docker build --target hyrax-base --tag ghcr.io/samvera/hyrax/hyrax-base:$(git rev-parse HEAD) .

data/Dockerfile

@@ -1,15 +1,10 @@
-ARG RUBY_VERSION=3.2.1
+ARG ALPINE_VERSION=3.18
+ARG RUBY_VERSION=3.2.2
 
-# Replace with official jemalloc package in alpine 3.17
-FROM ruby:$RUBY_VERSION-alpine3.16 as builder
-RUN apk add build-base curl
-RUN curl -sL https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2 | tar -xj && \
-    cd jemalloc-5.3.0 && \
-    ./configure && \
-    make && \
-    make install
+FROM ruby:$RUBY_VERSION-alpine$ALPINE_VERSION as builder
+RUN apk add build-base curl jemalloc
 
-FROM ruby:$RUBY_VERSION-alpine3.16 as hyrax-base
+FROM ruby:$RUBY_VERSION-alpine$ALPINE_VERSION as hyrax-base
 
 ARG DATABASE_APK_PACKAGE="postgresql-dev"
 ARG EXTRA_APK_PACKAGES="git"
@@ -43,7 +38,7 @@ ENV PATH="/app/samvera:$PATH"
 ENV RAILS_ROOT="/app/samvera/hyrax-webapp"
 ENV RAILS_SERVE_STATIC_FILES="1"
 
-COPY --from=builder /usr/local/lib/libjemalloc.so.2 /usr/local/lib/
+COPY --from=builder /usr/lib/libjemalloc.so.2 /usr/local/lib/
 ENV LD_PRELOAD="/usr/local/lib/libjemalloc.so.2"
 
 ENTRYPOINT ["hyrax-entrypoint.sh"]

data/app/actors/hyrax/actors/base_actor.rb

@@ -71,7 +71,8 @@ module Hyrax
       def save(env, use_valkyrie: false)
         return env.curation_concern.save unless use_valkyrie
 
-        resource = valkyrie_save(resource: env.curation_concern.valkyrie_resource)
+        # don't run validations again on the converted object if they've already passed
+        resource = valkyrie_save(resource: env.curation_concern.valkyrie_resource, is_valid: env.curation_concern.save)
 
         # we need to manually set the id and reload, because the actor stack requires
         # `env.curation_concern` to be the exact same instance throughout.
@@ -115,9 +116,9 @@ module Hyrax
         attributes.select { |_, v| v.respond_to?(:select) && !v.respond_to?(:read) }
       end
 
-      def valkyrie_save(resource:)
+      def valkyrie_save(resource:, is_valid:)
         permissions = resource.permission_manager.acl.permissions
-        resource    = Hyrax.persister.save(resource: resource)
+        resource    = Hyrax.persister.save(resource: resource, perform_af_validation: !is_valid)
 
         resource.permission_manager.acl.permissions = permissions
         resource.permission_manager.acl.save

data/app/actors/hyrax/actors/embargo_actor.rb

@@ -15,8 +15,11 @@ module Hyrax
         case work
         when Valkyrie::Resource
           embargo_manager = Hyrax::EmbargoManager.new(resource: work)
-          embargo_manager.release && Hyrax::AccessControlList(work).save
-          embargo_manager.nullify
+          return if embargo_manager.embargo.embargo_release_date.blank?
+
+          embargo_manager.deactivate!
+          work.embargo = Hyrax.persister.save(resource: embargo_manager.embargo)
+          Hyrax::AccessControlList(work).save
         else
           work.embargo_visibility! # If the embargo has lapsed, update the current visibility.
           work.deactivate_embargo!

data/app/actors/hyrax/actors/lease_actor.rb

@@ -15,8 +15,11 @@ module Hyrax
         case work
         when Valkyrie::Resource
           lease_manager = Hyrax::LeaseManager.new(resource: work)
-          lease_manager.release && Hyrax::AccessControlList(work).save
-          lease_manager.nullify
+          return if lease_manager.lease.lease_expiration_date.blank?
+
+          lease_manager.deactivate!
+          work.lease = Hyrax.persister.save(resource: lease_manager.lease)
+          Hyrax::AccessControlList(work).save
         else
           work.lease_visibility! # If the lease has lapsed, update the current visibility.
           work.deactivate_lease!

data/app/assets/javascripts/hyrax/file_manager/sorting.es6

@@ -4,6 +4,7 @@ export default class SortManager {
     this.sorting_info = {}
     this.initialize_sort()
     this.element.data("current-order", this.order)
+    this.sort_property = this.element.data("sort-property")
     this.save_manager = save_manager
     this.initialize_alpha_sort_button()
   }
@@ -38,9 +39,9 @@ export default class SortManager {
   params() {
     let params = {}
     params[this.singular_class_name] = {
-      "version": this.version,
-      "ordered_member_ids": this.order
+      "version": this.version
     }
+    params[this.singular_class_name][this.sort_property] = this.order
     params["_method"] = "PATCH"
     return params
   }

data/app/controllers/concerns/hyrax/embargoes_controller_behavior.rb

@@ -15,7 +15,7 @@ module Hyrax
     # Removes a single embargo
     def destroy
       Hyrax::Actors::EmbargoActor.new(curation_concern).destroy
-      flash[:notice] = embargo_history(curation_concern)
+      flash[:notice] = embargo_history(curation_concern).last
       if curation_concern.work? && work_has_file_set_members?(curation_concern)
         redirect_to confirm_permission_path
       else