hyrax 4.0.0 → 5.0.0.rc1

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-24T10:43:07
+2023-08-09T14:34:59

data/CONTAINERS.md

@@ -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 # 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

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

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+module Hyrax
+  module ValkyrieDownloadsControllerBehavior
+    def show_valkyrie
+      file_set_id = params.require(:id)
+      file_set = Hyrax.query_service.find_by(id: file_set_id)
+      send_file_contents_valkyrie(file_set)
+    end
+
+    private
+
+    def send_file_contents_valkyrie(file_set)
+      response.headers["Accept-Ranges"] = "bytes"
+      self.status = 200
+      use = params.fetch(:file, :original_file).to_sym
+      file_metadata = find_file_metadata(file_set: file_set, use: use)
+      return unless stale?(last_modified: file_metadata.updated_at, template: false)
+
+      file = Hyrax.storage_adapter.find_by(id: file_metadata.file_identifier)
+      prepare_file_headers_valkyrie(metadata: file_metadata, file: file)
+
+      # Warning - using the range header will load the range selection in to memory
+      # this can cause memory bloat
+      if request.headers['Range']
+        file.rewind
+        send_data send_range_valkyrie(file: file), data_options(file_metadata)
+      else
+        send_file file.disk_path
+      end
+    end
+
+    def data_options(file_metadata)
+      {
+        type: file_metadata.mime_type,
+        filename: file_metadata.original_filename,
+        disposition: "inline",
+        status: status
+      }
+    end
+
+    def send_range_valkyrie(file:)
+      _, range = request.headers['Range'].split('bytes=')
+      from, to = range.split('-').map(&:to_i)
+      to = file.size - 1 unless to
+      length = to - from + 1
+      response.headers['Content-Range'] = "bytes #{from}-#{to}/#{file.size}"
+      response.headers['Content-Length'] = length.to_s
+      self.status = 206
+      file.read from # Seek to start of requested range
+      file.read length
+    end
+
+    def prepare_file_headers_valkyrie(metadata:, file:, inline: false)
+      inline_display = ActiveRecord::Type::Boolean.new.cast(params.fetch(:inline, inline))
+      response.headers["Content-Disposition"] = "#{inline_display ? 'inline' : 'attachment'}; filename=#{metadata.original_filename}"
+      response.headers["Content-Type"] = metadata.mime_type
+      response.headers["Content-Length"] ||= (file.try(:size) || metadata.size.first).to_s
+      # Prevent Rack::ETag from calculating a digest over body
+      response.headers["Last-Modified"] = metadata.updated_at.utc.strftime("%a, %d %b %Y %T GMT")
+      self.content_type = metadata.mime_type
+    end
+
+    def find_file_metadata(file_set:, use: :original_file)
+      use = :thumbnail_file if use == :thumbnail
+      begin
+        use = Hyrax::FileMetadata::Use.uri_for(use: use)
+      rescue ArgumentError
+        raise Hyrax::ObjectNotFoundError
+      end
+      results = Hyrax.custom_queries.find_many_file_metadata_by_use(resource: file_set, use: use)
+      results.first || raise(Hyrax::ObjectNotFoundError)
+    end
+  end
+end

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

@@ -125,7 +125,7 @@ module Hyrax
     end
 
     def file_manager
-      @form = Forms::FileManagerForm.new(curation_concern, current_ability)
+      @form = presenter
     end
 
     def inspect_work
@@ -180,15 +180,18 @@ module Hyrax
 
     ##
     # @return [#errors]
+    # rubocop:disable Metrics/MethodLength
     def create_valkyrie_work
       form = build_form
-      return after_create_error(form_err_msg(form)) unless form.validate(params[hash_key_for_curation_concern])
+      # fallback to an empty hash to avoid: # NoMethodError: undefined method `has_key?` for nil:NilClass
+      original_input_params_for_form = params[hash_key_for_curation_concern] ? params[hash_key_for_curation_concern] : {}
+      return after_create_error(form_err_msg(form), original_input_params_for_form) unless form.validate(original_input_params_for_form)
 
       result =
         transactions['change_set.create_work']
         .with_step_args(
           'work_resource.add_to_parent' => { parent_id: params[:parent_id], user: current_user },
-          'work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: params[hash_key_for_curation_concern][:file_set] },
+          'work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: original_input_params_for_form[:file_set] },
           'change_set.set_user_as_depositor' => { user: current_user },
           'work_resource.change_depositor' => { user: ::User.find_by_user_key(form.on_behalf_of) },
           'work_resource.save_acl' => { permissions_params: form.input_params["permissions"] }
@@ -197,6 +200,7 @@ module Hyrax
       @curation_concern = result.value_or { return after_create_error(transaction_err_msg(result)) }
       after_create_response
     end
+    # rubocop:enable Metrics/MethodLength
 
     def update_valkyrie_work
       form = build_form
@@ -370,10 +374,15 @@ module Hyrax
       end
     end
 
+    def format_error_messages(errors)
+      # the error may already be a string
+      errors.respond_to?(:messages) ? errors.messages.values.flatten.join("\n") : errors
+    end
+
     def after_create_error(errors, original_input_params_for_form = nil)
       respond_to do |wants|
         wants.html do
-          flash[:error] = errors.to_s
+          flash[:error] = format_error_messages(errors)
           rebuild_form(original_input_params_for_form) if original_input_params_for_form.present?
           render 'new', status: :unprocessable_entity
         end
@@ -402,7 +411,7 @@ module Hyrax
     def after_update_error(errors)
       respond_to do |wants|
         wants.html do
-          flash[:error] = errors.to_s
+          flash[:error] = format_error_messages(errors)
           build_form unless @form.is_a? Hyrax::ChangeSet
           render 'edit', status: :unprocessable_entity
         end

data/app/controllers/hyrax/admin/workflows_controller.rb

@@ -15,9 +15,8 @@ module Hyrax
       add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
       add_breadcrumb t(:'hyrax.admin.sidebar.tasks'), '#'
       add_breadcrumb t(:'hyrax.admin.sidebar.workflow_review'), request.path
-
-      @status_list = actionable_objects.reject(&:published?)
-      @published_list = actionable_objects.select(&:published?)
+      assign_action_objects_params
+      @response = WorkflowResponse.new(actionable_objects.to_a, actionable_objects.total_count, current_page, per_page, under_review?)
     end
 
     private
@@ -30,5 +29,51 @@ module Hyrax
       @actionable_objects ||=
         Hyrax::Workflow::ActionableObjects.new(user: current_user)
     end
+
+    def current_page
+      @page ||= params.fetch('page', 1).to_i
+    end
+
+    def per_page
+      @per_page ||= params.fetch('per_page', 10).to_i
+    end
+
+    def assign_action_objects_params
+      actionable_objects.page = current_page
+      actionable_objects.per_page = per_page
+      actionable_objects.workflow_state_filter = (under_review? ? '!' : '') + deposited_workflow_state_name
+    end
+
+    def under_review?
+      @under_review = params['state'] != 'published'
+    end
+
+    class WorkflowResponse
+      attr_reader :total_count
+      attr_reader :current_page
+      attr_reader :per_page
+      attr_reader :docs
+      attr_reader :under_review
+
+      def initialize(docs, total_count, page, per_page, under_review)
+        @docs = docs
+        @total_count = total_count
+        @per_page = per_page.to_i
+        @current_page = page.to_i
+        @under_review = under_review
+      end
+
+      def total_pages
+        (total_count.to_f / per_page).ceil
+      end
+
+      def limit_value
+        docs.length
+      end
+
+      def viewing_under_review?
+        under_review
+      end
+    end
   end
 end

data/app/controllers/hyrax/batch_edits_controller.rb

@@ -52,7 +52,7 @@ module Hyrax
     def update_document(obj)
       interpret_visiblity_params(obj)
       obj.attributes = work_params(admin_set_id: obj.admin_set_id).except(*visibility_params)
-      obj.date_modified = Time.current.ctime
+      obj.date_modified = TimeService.time_in_utc
 
       InheritPermissionsJob.perform_now(obj)
       VisibilityCopyJob.perform_now(obj)
@@ -60,11 +60,30 @@ module Hyrax
       obj.save
     end
 
+    def valkyrie_update_document(obj)
+      form = form_class.new(obj, current_ability, nil)
+      return unless form.validate(params[form_class.model_class.model_name.param_key])
+
+      cleanup_form_fields form
+
+      result = transactions['change_set.update_work']
+               .with_step_args('work_resource.save_acl' => { permissions_params: form.input_params["permissions"] })
+               .call(form)
+      obj = result.value!
+
+      InheritPermissionsJob.perform_now(obj)
+      VisibilityCopyJob.perform_now(obj)
+    end
+
     def update
       case params["update_type"]
       when "update"
         batch.each do |doc_id|
-          update_document(Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: doc_id, use_valkyrie: false))
+          if Hyrax.config.use_valkyrie?
+            valkyrie_update_document(Hyrax.query_service.find_by(id: doc_id))
+          else
+            update_document(Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: doc_id, use_valkyrie: false))
+          end
         end
         flash[:notice] = "Batch update complete"
         after_update
@@ -97,7 +116,7 @@ module Hyrax
     end
 
     def form_class
-      Forms::BatchEditForm
+      Hyrax.config.use_valkyrie? ? Forms::ResourceBatchEditForm : Forms::BatchEditForm
     end
 
     def terms
@@ -105,7 +124,7 @@ module Hyrax
     end
 
     def work_params(extra_params = {})
-      work_params = params[form_class.model_name.param_key] || ActionController::Parameters.new
+      work_params = params[form_class.model_class.model_name.param_key] || ActionController::Parameters.new
       form_class.model_attributes(work_params.merge(extra_params))
     end
 
@@ -135,5 +154,15 @@ module Hyrax
         redirect_to hyrax.dashboard_path
       end
     end
+
+    # Clean up form fields
+    # @param form Hyrax::Froms::ResourceBatchEditForm
+    def cleanup_form_fields(form)
+      form.lease = nil if form.lease && form.lease.fields['lease_expiration_date'].nil?
+      form.embargo = nil if form.embargo && form.embargo.fields['embargo_release_date'].nil?
+      form.fields.keys.each do |k|
+        form.fields[k] = nil if form.fields[k].is_a?(Array) && form.fields[k].blank?
+      end
+    end
   end
 end

data/app/controllers/hyrax/downloads_controller.rb

@@ -3,6 +3,7 @@ module Hyrax
   class DownloadsController < ApplicationController
     include Hydra::Controller::DownloadBehavior
     include Hyrax::LocalFileDownloadsControllerBehavior
+    include Hyrax::ValkyrieDownloadsControllerBehavior
     include Hyrax::WorkflowsHelper # Provides #workflow_restriction?
 
     def self.default_content_path
@@ -12,6 +13,8 @@ module Hyrax
     # Render the 404 page if the file doesn't exist.
     # Otherwise renders the file.
     def show
+      return show_valkyrie if Hyrax.config.use_valkyrie?
+
       case file
       when ActiveFedora::File
         # For original files that are stored in fedora
@@ -39,7 +42,11 @@ module Hyrax
     end
 
     def file_set_parent(file_set_id)
-      file_set = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: file_set_id, use_valkyrie: Hyrax.config.use_valkyrie?)
+      file_set = if defined?(Wings) && Hyrax.metadata_adapter.is_a?(Wings::Valkyrie::MetadataAdapter)
+                   Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: file_set_id, use_valkyrie: Hyrax.config.use_valkyrie?)
+                 else
+                   Hyrax.query_service.find_by(id: file_set_id)
+                 end
       @parent ||=
         case file_set
         when Hyrax::Resource