hyrax 5.0.0.rc2 → 5.0.0

data/CONTAINERS.md

@@ -5,10 +5,11 @@ Our goal is to provide a practical, reusable reference environment for applicati
 
 The [Hyrax Engine Development](#hyrax-engine-development) is further along than the [Docker Image for Hyrax-based Applications](#docker-image-for-hyrax-based-applications) which is further along than [Deploying to Production](#deploying-to-production).
 
-There are two options for development environments to run:
+There are three options for development environments to run:
 
 - [Dassie](#dassie-internal-test-app-with-activefedora) is the default internal test app that will run an ActiveFedora-based Hyrax web application using Fedora 4 as the backend storage. See [Troubleshooting Dassie](#troubleshooting-dassie) if you encounter any issues.
 - [Koppie](#koppie-internal-test-app-with-valkyrie-connector-to-postgres) is a newer internal test app that is a Valkyrie-based Hyrax web application that runs with PostGres as backend storage. It does not run ActiveFedora or use Fedora 4. See [Troubleshooting Koppie](#troubleshooting-koppie) if you encounter any issues.
+- [Sirenia](#sirenia-internal-test-app-with-valkyrie-connector-to-fedora) is Koppie but with Valkyrie configured to use Fedora 6 metadata and storage adapters.
 
 <!-- NOTE: This title is referenced in the top-level README.md. Keep that in mind if you change it. -->
 ## Hyrax Engine Development
@@ -37,6 +38,7 @@ This starts containers for:
   - Redis
   - Memcached
   - SideKiq (for background jobs)
+  - Chrome (for feature tests)
 
 It also runs database migrations. This will also bring up a development application on `http://localhost:3000`.
 
@@ -147,6 +149,7 @@ This starts containers for:
   - Redis
   - Memcached
   - SideKiq (for background jobs)
+  - Chrome (for feature tests)
 
 It also runs database migrations. This will also bring up a development application on `http://localhost:3001`.
 
@@ -183,13 +186,47 @@ echo "FROM samveralabs/hyrax" > Dockerfile
 
 _This is for applications that mount Hyrax and is separate from the docker containers for Hyrax engine development._
 
+### Sirenia Internal Test App with Valkyrie Connector to Fedora
+
+Sirenia uses the same image as koppie. If you have not already done so, follow the build instructions for koppie above.
+
+Start Sirenia: `docker compose -f docker-compose-sirenia.yml up`
+
+This starts containers for:
+
+  - a `hyrax` test application (`.sirenia`);
+  - Fedora
+  - Solr
+  - Postgresql
+  - Redis
+  - Memcached
+  - SideKiq (for background jobs)
+  - Chrome (for feature tests)
+
+It also runs database migrations. This will also bring up a development application on `http://localhost:3002`.
+
+To stop the containers for the Hyrax-based application, type <kbd>Ctrl</kbd>+<kbd>c</kbd>. To restart the containers run `docker compose -f docker-compose-sirenia.yml up`.
+
+_**Note:** Starting and stopping Docker in this way will preserve your data between restarts._
+
+Sirenia runs as a different project than Dassie and Koppie, so it should be possible to run both concurrently (assuming your workstation has enough RAM).
+
+#### Run rails console on Sirenia
+
+Currently Sirenia should not be used for running specs. See [Code Changes and Testing](#code-changes-and-testing) under Dassie instead until the specs can be updated for a valkyrie only environment.
+
+```sh
+docker compose -f docker-compose-sirenia.yml up
+docker compose -f docker-compose-sirenia.yml exec app bundle exec rails c
+```
+
 ### Maintaining
 
 We publish several Hyrax images to the [GitHub container registry][ghcr] under
 the [Samvera organization][samvera-packages].  To build them:
 
 ```sh
-export HYRAX_VERSION=v5.0.0.rc2 # or desired version
+export HYRAX_VERSION=v5.0.0 # 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,8 +1,5 @@
-ARG ALPINE_VERSION=3.18
-ARG RUBY_VERSION=3.2.2
-
-FROM ruby:$RUBY_VERSION-alpine$ALPINE_VERSION as builder
-RUN apk add build-base curl jemalloc
+ARG ALPINE_VERSION=3.19
+ARG RUBY_VERSION=3.2.3
 
 FROM ruby:$RUBY_VERSION-alpine$ALPINE_VERSION as hyrax-base
 
@@ -16,6 +13,14 @@ RUN apk --no-cache upgrade && \
   curl \
   gcompat \
   imagemagick \
+  imagemagick-heic \
+  imagemagick-jpeg \
+  imagemagick-jxl \
+  imagemagick-pdf \
+  imagemagick-svg \
+  imagemagick-tiff \
+  imagemagick-webp \
+  jemalloc \
   tzdata \
   nodejs \
   yarn \
@@ -34,12 +39,10 @@ RUN mkdir -p /app/samvera/hyrax-webapp
 WORKDIR /app/samvera/hyrax-webapp
 
 COPY --chown=1001:101 ./bin/*.sh /app/samvera/
-ENV PATH="/app/samvera:$PATH"
-ENV RAILS_ROOT="/app/samvera/hyrax-webapp"
-ENV RAILS_SERVE_STATIC_FILES="1"
-
-COPY --from=builder /usr/lib/libjemalloc.so.2 /usr/local/lib/
-ENV LD_PRELOAD="/usr/local/lib/libjemalloc.so.2"
+ENV PATH="/app/samvera:$PATH" \
+    RAILS_ROOT="/app/samvera/hyrax-webapp" \
+    RAILS_SERVE_STATIC_FILES="1" \
+    LD_PRELOAD="/usr/local/lib/libjemalloc.so.2"
 
 ENTRYPOINT ["hyrax-entrypoint.sh"]
 CMD ["bundle", "exec", "puma", "-v", "-b", "tcp://0.0.0.0:3000"]

data/Gemfile

@@ -1,7 +1,14 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
+
 # Please see hyrax.gemspec for dependency information.
-gemspec
+# Install gems from test app
+if ENV['RAILS_ROOT']
+  test_app_gemfile_path = File.expand_path('Gemfile', ENV['RAILS_ROOT'])
+  eval_gemfile test_app_gemfile_path
+else
+  gemspec
+end
 
 group :development, :test do
   gem 'benchmark-ips'
@@ -13,9 +20,3 @@ group :development, :test do
   gem 'ruby-prof', require: false
   gem "simplecov", require: false
 end
-
-# Install gems from test app
-if ENV['RAILS_ROOT']
-  test_app_gemfile_path = File.expand_path('Gemfile', ENV['RAILS_ROOT'])
-  eval_gemfile test_app_gemfile_path
-end

data/README.md

@@ -76,6 +76,8 @@ This software has been developed by and is brought to you by the Samvera communi
 
 ![Samvera Logo](./samvera-fall-TM3.svg)
 
+This project is tested with Browserstack.
+
 ## License
 
 Hyrax is available under [the Apache 2.0 license](LICENSE).

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

@@ -69,10 +69,13 @@ module Hyrax
       end
 
       def save(env, use_valkyrie: false)
-        return env.curation_concern.save unless use_valkyrie
+        # NOTE: You must call env.curation_concern.save before you attempt to coerce the curation
+        # concern into a valkyrie resource.
+        is_valid = env.curation_concern.save
+        return is_valid unless use_valkyrie
 
         # 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)
+        resource = valkyrie_save(resource: env.curation_concern.valkyrie_resource, is_valid: is_valid)
 
         # we need to manually set the id and reload, because the actor stack requires
         # `env.curation_concern` to be the exact same instance throughout.
@@ -83,7 +86,7 @@ module Hyrax
         # for now, just hit the validation error again
         # later we should capture the _err.obj and pass it back
         # through the environment
-        env.curation_concern.save
+        is_valid
       end
 
       def apply_save_data_to_curation_concern(env)

data/app/actors/hyrax/actors/file_actor.rb

@@ -80,7 +80,7 @@ module Hyrax
           :original_file
         when Hyrax::FileMetadata::Use::EXTRACTED_TEXT
           :extracted_file
-        when Hyrax::FileMetadata::Use::THUMBNAIL
+        when Hyrax::FileMetadata::Use::THUMBNAIL_IMAGE
           :thumbnail_file
         else
           :original_file

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

@@ -14,12 +14,9 @@ module Hyrax
       def destroy
         case work
         when Valkyrie::Resource
-          lease_manager = Hyrax::LeaseManager.new(resource: work)
-          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
+          Hyrax::LeaseManager.deactivate_lease_for(resource: work) &&
+            Hyrax.persister.save(resource: work.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/save_work/uploaded_files.es6

@@ -3,7 +3,15 @@ export class UploadedFiles {
   constructor(form, callback) {
     this.form = form
     this.element = $('#fileupload')
-    this.element.on('fileuploadcompleted', callback)
+    this.uploadsInProgress = 0
+    this.element.on('fileuploadadded', (e, data) => {
+      this.uploadsInProgress += 1
+      callback(e, data)
+    })
+    this.element.on('fileuploadcompleted', (e, data) => {
+      this.uploadsInProgress -= 1
+      callback(e, data)
+    })
     this.element.on('fileuploaddestroyed', callback)
   }
 
@@ -13,7 +21,7 @@ export class UploadedFiles {
   }
 
   get inProgress() {
-    return this.element.fileupload('active') > 0
+    return this.uploadsInProgress > 0;
   }
 
   get hasFiles() {

data/app/assets/stylesheets/hyrax/sidebar.scss

@@ -137,9 +137,14 @@ $gutter-width: $grid-gutter-width/2;
     li {
       white-space: nowrap;
 
-      > a:hover, > a:focus {
+      > a:focus {
+        color: $admin-sidebar-link-color;
+      }
+
+      > a:hover {
         text-decoration: none;
         background-color: $admin-sidebar-link-background-color;
+        color: $admin-sidebar-link-hover-color;
       }
     }
     

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

@@ -39,7 +39,7 @@ module Hyrax
 
       respond_to do |format|
         format.html
-        format.json { render json: @curation_concern }
+        format.json { render 'hyrax/base/show' }
       end
     end
 

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

@@ -6,9 +6,7 @@ module Hyrax
     # Handle the HTTP show request
     def send_local_content
       response.headers['Accept-Ranges'] = 'bytes'
-      if request.head?
-        local_content_head
-      elsif request.headers['Range']
+      if request.headers['Range']
         send_range_for_local_file
       else
         send_local_file_contents
@@ -26,7 +24,11 @@ module Hyrax
       self.status = 206
       prepare_local_file_headers
       # For derivatives stored on the local file system
-      send_data IO.binread(file, length, from), local_derivative_download_options.merge(status: status)
+      if request.head?
+        head status
+      else
+        send_data IO.binread(file, length, from), local_derivative_download_options.merge(status: status)
+      end
     end
 
     def send_local_file_contents
@@ -34,7 +36,11 @@ module Hyrax
       self.status = 200
       prepare_local_file_headers
       # For derivatives stored on the local file system
-      send_file file, local_derivative_download_options
+      if request.head?
+        head status
+      else
+        send_file file, local_derivative_download_options
+      end
     end
 
     def local_file_size
@@ -54,16 +60,9 @@ module Hyrax
       File.mtime(file) if file.is_a? String
     end
 
-    # Override
-    # render an HTTP HEAD response
-    def local_content_head
-      response.headers['Content-Length'] = local_file_size.to_s
-      head :ok, content_type: local_file_mime_type
-    end
-
     # Override
     def prepare_local_file_headers
-      send_file_headers! local_content_options
+      send_file_headers! local_derivative_download_options
       response.headers['Content-Type'] = local_file_mime_type
       response.headers['Content-Length'] ||= local_file_size.to_s
       # Prevent Rack::ETag from calculating a digest over body
@@ -73,12 +72,6 @@ module Hyrax
 
     private
 
-    # Override the Hydra::Controller::DownloadBehavior#content_options so that
-    # we have an attachement rather than 'inline'
-    def local_content_options
-      { type: local_file_mime_type, filename: local_file_name, disposition: 'attachment' }
-    end
-
     # Override this method if you want to change the options sent when downloading
     # a derivative file
     def local_derivative_download_options

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+module Hyrax
+  # Overrides Hydra::Controller:DownloadBehavior handing of HEAD requests to
+  # respond with same headers as a GET request would receive.
+  module StreamFileDownloadsControllerBehavior
+    protected
+
+    # Handle the HTTP show request
+    def send_content
+      response.headers['Accept-Ranges'] = 'bytes'
+      if request.headers['HTTP_RANGE']
+        send_range
+      else
+        send_file_contents
+      end
+    end
+
+    # rubocop:disable Metrics/AbcSize
+    def send_range
+      _, range = request.headers['HTTP_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
+      prepare_file_headers
+
+      if request.head?
+        head status
+      else
+        stream_body file.stream(request.headers['HTTP_RANGE'])
+      end
+    end
+    # rubocop:enable Metrics/AbcSize
+
+    def send_file_contents
+      return unless stale?(last_modified: file_last_modified, template: false)
+
+      self.status = 200
+      prepare_file_headers
+
+      if request.head?
+        head status
+      else
+        stream_body file.stream
+      end
+    end
+
+    def file_last_modified
+      file.modified_date
+    end
+  end
+end

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

@@ -9,10 +9,10 @@ module Hyrax
 
     private
 
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def send_file_contents_valkyrie(file_set)
       response.headers["Accept-Ranges"] = "bytes"
       self.status = 200
-      use = params.fetch(:file, :original_file).to_sym
       mime_type = params[:mime_type]
       file_metadata = find_file_metadata(file_set: file_set, use: use, mime_type: mime_type)
       return unless stale?(last_modified: file_metadata.updated_at, template: false)
@@ -23,23 +23,49 @@ module Hyrax
       # 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)
+        if request.head?
+          prepare_range_headers_valkyrie(file: file)
+          head status
+        else
+          send_data send_range_valkyrie(file: file), data_options(file_metadata)
+        end
+      elsif request.head?
+        head status
       else
         send_file file.disk_path, data_options(file_metadata).except(:status)
       end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     def data_options(file_metadata)
       {
         type: file_metadata.mime_type,
         filename: file_metadata.original_filename,
-        disposition: "inline",
+        disposition: disposition,
         status: status
       }
     end
 
+    def use
+      params.fetch(:file, :original_file).to_sym
+    end
+
+    def disposition
+      if ActiveRecord::Type::Boolean.new.cast(params.fetch(:inline, use != :original_file))
+        'inline'
+      else
+        'attachment'
+      end
+    end
+
     def send_range_valkyrie(file:)
+      from, length = prepare_range_headers_valkyrie(file: file)
+      file.rewind
+      file.read from # Seek to start of requested range
+      file.read length
+    end
+
+    def prepare_range_headers_valkyrie(file:)
       _, range = request.headers['Range'].split('bytes=')
       from, to = range.split('-').map(&:to_i)
       to = file.size - 1 unless to
@@ -47,19 +73,22 @@ module Hyrax
       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
+      [from, 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}"
+    # rubocop:disable Metrics/AbcSize
+    def prepare_file_headers_valkyrie(metadata:, file:)
+      response.headers["Content-Disposition"] =
+        ActionDispatch::Http::ContentDisposition.format(disposition: disposition, filename: metadata.original_filename)
       response.headers["Content-Type"] = metadata.mime_type
       response.headers["Content-Length"] ||= (file.try(:size) || metadata.size.first).to_s
+      headers["Content-Transfer-Encoding"] = "binary"
       # 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
+      response.cache_control[:public] ||= false
     end
+    # rubocop:enable Metrics/AbcSize
 
     def find_file_metadata(file_set:, use: :original_file, mime_type: nil)
       if mime_type.nil?

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

@@ -18,9 +18,12 @@ module Hyrax
 
       class_attribute :_curation_concern_type, :show_presenter, :work_form_service, :search_builder_class
       class_attribute :iiif_manifest_builder, instance_accessor: false
+      class_attribute :create_valkyrie_work_action
+
       self.show_presenter = Hyrax::WorkShowPresenter
       self.work_form_service = Hyrax::WorkFormService
       self.search_builder_class = WorkSearchBuilder
+      self.create_valkyrie_work_action = Hyrax::Action::CreateValkyrieWork
       self.iiif_manifest_builder = nil
       attr_accessor :curation_concern
       helper_method :curation_concern, :contextual_path
@@ -187,20 +190,16 @@ module Hyrax
     # rubocop:disable Metrics/MethodLength
     def create_valkyrie_work
       form = build_form
-      # 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)
+      action = create_valkyrie_work_action.new(form: form,
+                                               transactions: transactions,
+                                               user: current_user,
+                                               params: params,
+                                               work_attributes_key: hash_key_for_curation_concern)
+
+      return after_create_error(form_err_msg(action.form), action.work_attributes) unless action.validate
+
+      result = action.perform
 
-      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: 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"] }
-        )
-        .call(form)
       @curation_concern = result.value_or { return after_create_error(transaction_err_msg(result)) }
       after_create_response
     end
@@ -228,7 +227,13 @@ module Hyrax
     end
 
     def transaction_err_msg(result)
-      result.failure.first
+      msg = if result.failure[1].respond_to?(:full_messages)
+              "#{result.failure[1].full_messages.to_sentence} [#{result.failure[0]}]"
+            else
+              result.failure[0].to_s
+            end
+      Rails.logger.info("Transaction failed: #{msg}\n  #{result.trace}")
+      msg
     end
 
     def presenter

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

@@ -99,7 +99,7 @@ module Hyrax
       case @admin_set
       when Valkyrie::Resource
         transactions['admin_set_resource.destroy'].call(@admin_set).value_or do |failure|
-          redirect_to hyrax.admin_admin_set_path(admin_set_id), alert: failure.first
+          return redirect_to hyrax.admin_admin_set_path(admin_set_id), alert: failure.first
         end
         after_delete_success
       else
@@ -182,7 +182,7 @@ module Hyrax
       @form ||=
         case @admin_set
         when Valkyrie::Resource
-          Hyrax::Forms::ResourceForm.for(@admin_set)
+          Hyrax::Forms::ResourceForm.for(resource: @admin_set)
         else
           form_class.new(@admin_set, current_ability, repository)
         end

data/app/controllers/hyrax/admin/analytics/work_reports_controller.rb

@@ -29,7 +29,7 @@ module Hyrax
           @pageviews = Hyrax::Analytics.daily_events_for_id(@document.id, 'work-view')
           @uniques = Hyrax::Analytics.unique_visitors_for_id(@document.id)
           @downloads = Hyrax::Analytics.daily_events_for_id(@document.id, 'file_set_in_work_download')
-          @files = paginate(@document._source["file_set_ids_ssim"], rows: 5)
+          @files = paginate(@document._source["member_ids_ssim"], rows: 5)
           respond_to do |format|
             format.html
             format.csv { export_data }
@@ -41,11 +41,11 @@ module Hyrax
         def accessible_works
           models = Hyrax.config.curation_concerns.map { |m| "\"#{m}\"" }
           if current_user.ability.admin?
-            ActiveFedora::SolrService.query("has_model_ssim:(#{models.join(' OR ')})",
+            Hyrax::SolrService.query("has_model_ssim:(#{models.join(' OR ')})",
               fl: 'title_tesim, id, member_of_collections',
               rows: 50_000)
           else
-            ActiveFedora::SolrService.query(
+            Hyrax::SolrService.query(
               "edit_access_person_ssim:#{current_user} AND has_model_ssim:(#{models.join(' OR ')})",
               fl: 'title_tesim, id, member_of_collections',
               rows: 50_000
@@ -55,13 +55,13 @@ module Hyrax
 
         def accessible_file_sets
           if current_user.ability.admin?
-            ActiveFedora::SolrService.query(
+            Hyrax::SolrService.query(
               "has_model_ssim:FileSet",
               fl: 'title_tesim, id',
               rows: 50_000
             )
           else
-            ActiveFedora::SolrService.query(
+            Hyrax::SolrService.query(
               "edit_access_person_ssim:#{current_user} AND has_model_ssim:FileSet",
               fl: 'title_tesim, id',
               rows: 50_000

data/app/controllers/hyrax/dashboard/collections_controller.rb

@@ -26,9 +26,6 @@ module Hyrax
       # Catch permission errors
       rescue_from Hydra::AccessDenied, CanCan::AccessDenied, with: :deny_collection_access
 
-      # actions: index, create, new, edit, show, update, destroy, permissions, citation
-      before_action :authenticate_user!, except: [:index]
-
       class_attribute :presenter_class,
                       :form_class,
                       :single_item_search_builder_class,
@@ -80,7 +77,6 @@ module Hyrax
 
       def edit
         form
-        collection_type
       end
 
       def after_create
@@ -274,6 +270,7 @@ module Hyrax
       def collection_type
         @collection_type ||= CollectionType.find_by_gid!(collection.collection_type_gid)
       end
+      helper_method :collection_type
 
       def link_parent_collection(parent_id)
         child = collection.respond_to?(:valkyrie_resource) ? collection.valkyrie_resource : collection
@@ -512,7 +509,7 @@ module Hyrax
         @form ||=
           case @collection
           when Valkyrie::Resource
-            form = Hyrax::Forms::ResourceForm.for(@collection)
+            form = Hyrax::Forms::ResourceForm.for(resource: @collection)
             form.prepopulate!
             form
           else

data/app/controllers/hyrax/downloads_controller.rb

@@ -2,6 +2,7 @@
 module Hyrax
   class DownloadsController < ApplicationController
     include Hydra::Controller::DownloadBehavior
+    include Hyrax::StreamFileDownloadsControllerBehavior
     include Hyrax::LocalFileDownloadsControllerBehavior
     include Hyrax::ValkyrieDownloadsControllerBehavior
     include Hyrax::WorkflowsHelper # Provides #workflow_restriction?

data/app/controllers/hyrax/file_sets_controller.rb

@@ -121,7 +121,7 @@ module Hyrax
     end
 
     def valkyrie_update_metadata
-      change_set = Hyrax::Forms::ResourceForm.for(file_set)
+      change_set = Hyrax::Forms::ResourceForm.for(resource: file_set)
 
       result =
         change_set.validate(attributes) &&
@@ -137,6 +137,7 @@ module Hyrax
       @parent ||=
         case file_set
         when Hyrax::FileSet
+          # TODO: Add Hyrax::FileSet#parent method
           Hyrax.query_service.find_parents(resource: file_set).first
         else
           file_set.parent
@@ -233,7 +234,7 @@ module Hyrax
 
       case file_set
       when Hyrax::Resource
-        @form = Hyrax::Forms::ResourceForm.for(file_set)
+        @form = Hyrax::Forms::ResourceForm.for(resource: file_set)
         @form.prepopulate!
       else
         @form = form_class.new(file_set)