hyrax 5.2.0 → 5.3.0

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

@@ -4,8 +4,12 @@ require 'iiif_manifest'
 module Hyrax
   module WorksControllerBehavior
     extend ActiveSupport::Concern
-    include Blacklight::Base
+    include Blacklight::Configurable
+    include Blacklight::SearchContext
     include Blacklight::AccessControls::Catalog
+    include Hyrax::FlexibleSchemaBehavior if Hyrax.config.flexible?
+    include Hyrax::EnsureMigratedBehavior
+    include Hyrax::RedirectToDisplayUrl
 
     included do
       with_themed_layout :decide_layout
@@ -34,6 +38,7 @@ module Hyrax
     class_methods do
       def curation_concern_type=(curation_concern_type)
         load_and_authorize_resource class: curation_concern_type, instance_name: :curation_concern, except: [:show, :file_manager, :inspect_work, :manifest]
+        before_action :ensure_migrated_object, only: :edit
 
         # Load the fedora resource to get the etag.
         # No need to authorize for the file manager, because it does authorization via the presenter.
@@ -59,6 +64,7 @@ module Hyrax
       # TODO: move these lines to the work form builder in Hyrax
       curation_concern.depositor = current_user.user_key
       curation_concern.admin_set_id = params[:admin_set_id] || admin_set_id_for_new
+      curation_concern.contexts = Hyrax.query_service.find_by(id: curation_concern.admin_set_id)&.contexts if curation_concern.flexible?
       build_form
     end
 
@@ -134,17 +140,27 @@ module Hyrax
     end
 
     def manifest
-      headers['Access-Control-Allow-Origin'] = '*'
+      locale = params[:locale] || current_user&.preferred_locale || I18n.default_locale
+      I18n.with_locale(locale) do
+        headers['Access-Control-Allow-Origin'] = '*'
 
-      json = iiif_manifest_builder.manifest_for(presenter: iiif_manifest_presenter)
+        json = iiif_manifest_builder.manifest_for(presenter: iiif_manifest_presenter)
 
-      respond_to do |wants|
-        wants.any { render json: json }
+        respond_to do |wants|
+          wants.any { render json: json }
+        end
       end
     end
 
     private
 
+    def ensure_migrated_object
+      @curation_concern = ensure_migrated(
+        resource: curation_concern,
+        transaction_key: 'change_set.update_work'
+      )
+    end
+
     def load_curation_concern
       if Hyrax.config.disable_wings
         Hyrax.query_service.find_by(id: params[:id])
@@ -155,7 +171,7 @@ module Hyrax
 
     def iiif_manifest_builder
       self.class.iiif_manifest_builder ||
-        (Flipflop.cache_work_iiif_manifest? ? Hyrax::CachingIiifManifestBuilder.new : Hyrax::ManifestBuilderService.new)
+        (Flipflop.cache_work_iiif_manifest? ? Hyrax::CachingIiifManifestBuilder.new : Hyrax::ManifestBuilderService.new(iiif_manifest_factory: manifest_factory_for_work))
     end
 
     def iiif_manifest_presenter
@@ -166,7 +182,7 @@ module Hyrax
     end
 
     def user_collections
-      collections_service.search_results(:deposit)
+      collections_service.all_search_results(:deposit)
     end
 
     def collections_service
@@ -177,7 +193,8 @@ module Hyrax
       Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s
     end
 
-    def build_form
+    def build_form(contexts: [])
+      curation_concern.contexts = contexts if contexts.present?
       @form = work_form_service.build(curation_concern, current_ability, self)
     end
 
@@ -189,7 +206,7 @@ module Hyrax
     # @return [#errors]
     # rubocop:disable Metrics/MethodLength
     def create_valkyrie_work
-      form = build_form
+      form = build_form(contexts: params[hash_key_for_curation_concern]['contexts'])
       action = create_valkyrie_work_action.new(form: form,
                                                transactions: transactions,
                                                user: current_user,
@@ -208,9 +225,10 @@ module Hyrax
     def update_valkyrie_work
       form = build_form
       return after_update_error(form_err_msg(form)) unless form.validate(params[hash_key_for_curation_concern])
+
       result =
         transactions['change_set.update_work']
-        .with_step_args('work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: params[hash_key_for_curation_concern][:file_set] },
+        .with_step_args('work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: file_set_attributes },
                         'work_resource.update_work_members' => { work_members_attributes: work_members_attributes },
                         'work_resource.save_acl' => { permissions_params: form.input_params["permissions"] })
         .call(form)
@@ -222,6 +240,10 @@ module Hyrax
       params[hash_key_for_curation_concern][:work_members_attributes]&.permit!&.to_h
     end
 
+    def file_set_attributes
+      params[hash_key_for_curation_concern][:file_set]&.map { |fs| fs.permit!&.to_h }
+    end
+
     def form_err_msg(form)
       form.errors.messages.values.flatten.to_sentence
     end
@@ -541,5 +563,25 @@ module Hyrax
 
       AdminSetSelectionPresenter.new(admin_sets: admin_sets)
     end
+
+    def manifest_factory_for_work
+      return ::IIIFManifest::V3::ManifestFactory if av_content? || pdf_content?
+
+      Hyrax.config.iiif_manifest_factory
+    end
+
+    def av_content?
+      return false unless Flipflop.iiif_av?
+
+      iiif_manifest_presenter.file_set_presenters.any? do |file_set|
+        file_set.video? || file_set.audio?
+      end
+    end
+
+    def pdf_content?
+      return false unless Flipflop.iiif_pdf?
+
+      iiif_manifest_presenter.file_set_presenters.any?(&:pdf?)
+    end
   end
 end

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

@@ -126,7 +126,7 @@ module Hyrax
     def valkyrie_update
       @admin_set = form.validate(admin_set_params) && transactions['admin_set_resource.update'].call(form).value_or do |_failure|
         setup_form # probably should do some real error handling here
-        render :edit
+        return render :edit
       end
       redirect_to update_referer, notice: I18n.t('updated_admin_set', scope: 'hyrax.admin.admin_sets.form.permission_update_notices', name: @admin_set.title.first)
     end
@@ -145,22 +145,30 @@ module Hyrax
     end
 
     def valkyrie_create
-      form.validate(admin_set_params) &&
-        @admin_set = transactions['change_set.create_admin_set']
-                     .with_step_args(
-                       'change_set.set_user_as_creator' => { user: current_user },
-                       'admin_set_resource.apply_collection_type_permissions' => { user: current_user }
-                     )
-                     .call(form).value_or do |_failure|
-                       setup_form # probably should do some real error handling here
-                       render :edit
-                     end
-      @admin_set = admin_set_create_service.call!(admin_set: @admin_set, creating_user: current_user)
-      after_create
+      form.creator = [current_user.user_key] if form.respond_to?(:creator=) && Array(form.try(:creator)).empty?
+      if form.validate(admin_set_params)
+        valkyrie_create_detail
+      else
+        after_create_error(err_msg: form.errors.full_messages.to_sentence)
+      end
     rescue RuntimeError => err
       after_create_error(err_msg: err.message)
     end
 
+    def valkyrie_create_detail
+      @admin_set = transactions['change_set.create_admin_set']
+                   .with_step_args(
+                     'change_set.set_user_as_creator' => { user: current_user },
+                     'admin_set_resource.apply_collection_type_permissions' => { user: current_user }
+                   )
+                   .call(form).value_or do |_failure|
+                     setup_form # probably should do some real error handling here
+                     return render :edit
+                   end
+      @admin_set = admin_set_create_service.call!(admin_set: @admin_set, creating_user: current_user)
+      after_create
+    end
+
     def active_fedora_create
       updated_admin_set = admin_set_create_service.call!(admin_set: admin_set_resource, creating_user: current_user)
       @admin_set = Wings::ActiveFedoraConverter.convert(resource: updated_admin_set)

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

@@ -4,6 +4,8 @@ module Hyrax
     module Analytics
       class CollectionReportsController < AnalyticsController
         include Hyrax::BreadcrumbsForCollectionAnalytics
+        include Hyrax::AnalyticsErrorHandling
+
         def index
           return unless Hyrax.config.analytics_reporting?
 

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

@@ -4,6 +4,7 @@ module Hyrax
     module Analytics
       class WorkReportsController < AnalyticsController
         include Hyrax::BreadcrumbsForWorksAnalytics
+        include Hyrax::AnalyticsErrorHandling
         before_action :authenticate_user!
 
         def index

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

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Admin
+    class MetadataProfilesController < ApplicationController
+      include Hyrax::ThemedLayoutController
+      require 'yaml'
+
+      with_themed_layout 'dashboard'
+
+      # GET /allinson_flex_profiles
+      def index
+        add_breadcrumbs
+        @metadata_profiles = Hyrax::FlexibleSchema.page(params[:profile_entries_page])
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def import
+        uploaded_io = params[:file]
+        if uploaded_io.blank?
+          redirect_to admin_metadata_profiles_path, alert: 'Please select a file to upload'
+          return
+        end
+
+        begin
+          @flexible_schema = Hyrax::FlexibleSchema.create(profile: YAML.safe_load_file(uploaded_io.path))
+
+          if @flexible_schema.persisted?
+            warning_messages = @flexible_schema.warnings.full_messages.join(', ')
+            flash_options = { notice: 'Flexible Metadata Profile was successfully created.' }
+            flash_options[:alert] = warning_messages if @flexible_schema.warnings.any?
+            redirect_to admin_metadata_profiles_path, flash: flash_options
+          else
+            error_message = @flexible_schema.errors.messages.values.flatten.join(', ')
+            redirect_to admin_metadata_profiles_path, flash: { error: error_message }
+          end
+        rescue => e
+          redirect_to admin_metadata_profiles_path, flash: { error: e.message }
+          nil
+        end
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      def export
+        @schema = Hyrax::FlexibleSchema.find(params[:metadata_profile_id])
+        filename = "metadata-profile-v.#{@schema.version}.yml"
+
+        profile_hash = @schema.profile.deep_dup
+
+        profile_hash['profile']['version'] = @schema.version
+        profile_hash['profile']['date_modified'] = Time.current.strftime('%Y-%m-%d')
+
+        yaml_data = profile_hash.to_yaml(indentation: 2)
+        send_data yaml_data, filename: filename, type: "application/yaml"
+      end
+
+      private
+
+      def add_breadcrumbs
+        add_breadcrumb t(:'hyrax.controls.home'), main_app.root_path
+        add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
+        add_breadcrumb t(:'hyrax.dashboard.metadata_profiles'), hyrax.admin_metadata_profiles_path
+      end
+    end
+  end
+end

data/app/controllers/hyrax/batch_uploads_controller.rb

@@ -80,6 +80,8 @@ module Hyrax
     def create_update_job(klass)
       operation = BatchCreateOperation.create!(user: current_user,
                                                operation_type: "Batch Create")
+      # Make sure we have the correct model name for the resource
+      klass = Valkyrie.config.resource_class_resolver.call(klass).to_s
       # ActionController::Parameters are not serializable, so cast to a hash
       BatchCreateJob.perform_later(current_user,
                                    params[:title].permit!.to_h,

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

@@ -4,7 +4,10 @@ module Hyrax
     ## Shows a list of all collections to the admins
     class CollectionsController < Hyrax::My::CollectionsController
       include Blacklight::AccessControls::Catalog
-      include Blacklight::Base
+      include Blacklight::Configurable
+      include Blacklight::SearchContext
+      include Hyrax::FlexibleSchemaBehavior if Hyrax.config.collection_flexible?
+      include Hyrax::EnsureMigratedBehavior
 
       configure_blacklight do |config|
         config.search_builder_class = Hyrax::Dashboard::CollectionsSearchBuilder
@@ -43,6 +46,7 @@ module Hyrax
       load_and_authorize_resource except: [:index, :create],
                                   instance_name: :collection,
                                   class: Hyrax.config.collection_model
+      before_action :ensure_migrated_collection, only: :edit
 
       def deny_collection_access(exception)
         if exception.action == :edit
@@ -70,6 +74,7 @@ module Hyrax
       def show
         # @todo: remove this unused assignment in 4.0.0
         @banner_file = presenter.banner_file if collection_type.brandable?
+        @admin_sets_for_select = helpers.available_admin_sets_for_creating_works(ability: current_ability)
 
         presenter
         query_collection_members
@@ -80,12 +85,12 @@ module Hyrax
       end
 
       def after_create
-        Deprecation.warn("Method `#after_create` will be removed in Hyrax 4.0.")
+        Hyrax.deprecator(4).warn("Method `#after_create` should have been removed in Hyrax 4.0 but still exists. It will be removed in Hyrax 6.0.")
         after_create_response # call private method for processing
       end
 
       def after_create_error
-        Deprecation.warn("Method `#after_create_error` will be removed in Hyrax 4.0.")
+        Hyrax.deprecator(4).warn("Method `#after_create_error` should have been removed in Hyrax 4.0 but still exists. It will be removed in Hyrax 6.0.")
         after_create_errors("") # call private method for processing
       end
 
@@ -105,12 +110,12 @@ module Hyrax
       end
 
       def after_update
-        Deprecation.warn("Method `#after_update` will be removed in Hyrax 4.0.")
+        Hyrax.deprecator(4).warn("Method `#after_update` should have been removed in Hyrax 4.0 but still exists. It will be removed in Hyrax 6.0.")
         after_update_response # call private method for processing
       end
 
       def after_update_error
-        Deprecation.warn("Method `#after_update_error` will be removed in Hyrax 4.0.")
+        Hyrax.deprecator(4).warn("Method `#after_update_error` should have been removed in Hyrax 4.0 but still exists. It will be removed in Hyrax 6.0.")
         after_update_errors(@collection.errors) # call private method for processing
       end
 
@@ -180,6 +185,19 @@ module Hyrax
 
       private
 
+      def ensure_migrated_collection
+        # We need to know if a migration is going to happen, because if it is,
+        # we need to reset the memoized form.
+        needs_migration = wings_backed?(@collection)
+        @collection = ensure_migrated(
+          resource: @collection,
+          transaction_key: 'change_set.update_collection'
+        )
+
+        # If a migration happened, the memoized @form is now stale.
+        @form = nil if needs_migration
+      end
+
       def create_active_fedora_collection
         # Coming from the UI, a collection type gid should always be present.  Coming from the API, if a collection type gid is not specified,
         # use the default collection type (provides backward compatibility with versions < Hyrax 2.1.0)
@@ -428,7 +446,7 @@ module Hyrax
         # TODO: REMOVE in 3.0 - part of deprecation of permission attributes
         permissions = attributes.delete("permissions_attributes")
         return [] unless permissions
-        Deprecation.warn(self, "Passing in permissions_attributes parameter with a new collection is deprecated and support will be removed from Hyrax 3.0. " \
+        Deprecation.warn("Passing in permissions_attributes parameter with a new collection is deprecated and support will be removed from Hyrax 3.0. " \
                                "Use Hyrax::PermissionTemplate instead to grant Manage, Deposit, or View access.")
         participants = []
         permissions.each do |p|
@@ -604,7 +622,10 @@ module Hyrax
       end
 
       def after_create_errors(errors) # for valkyrie
+        collection_type_id = params[:collection_type_id].presence || default_collection_type.id
+        @collection.collection_type_gid = CollectionType.find(collection_type_id).to_global_id
         return after_create_errors_for_active_fedora(errors) if @collection.is_a? ActiveFedora::Base
+
         respond_to do |wants|
           wants.html do
             flash[:error] = errors.to_s

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

@@ -4,7 +4,8 @@ module Hyrax
     ##
     # @api public
     class NestCollectionsController < ApplicationController
-      include Blacklight::Base
+      include Blacklight::Configurable
+      include Blacklight::SearchContext
 
       class_attribute :form_class, :new_collection_form_class
       self.form_class = Hyrax::Forms::Dashboard::NestCollectionForm

data/app/controllers/hyrax/dashboard_controller.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 module Hyrax
   class DashboardController < ApplicationController
-    include Blacklight::Base
+    include Blacklight::Configurable
+    include Blacklight::SearchContext
     include Hyrax::Breadcrumbs
     with_themed_layout 'dashboard'
     before_action :authenticate_user!

data/app/controllers/hyrax/file_sets_controller.rb

@@ -3,9 +3,12 @@ module Hyrax
   class FileSetsController < ApplicationController
     rescue_from WorkflowAuthorizationException, with: :render_unavailable
 
-    include Blacklight::Base
+    include Blacklight::Configurable
+    include Blacklight::SearchContext
     include Blacklight::AccessControls::Catalog
     include Hyrax::Breadcrumbs
+    include Hyrax::FlexibleSchemaBehavior if Hyrax.config.file_set_flexible?
+    include Hyrax::EnsureMigratedBehavior
 
     before_action :authenticate_user!, except: [:show, :citation, :stats]
     load_and_authorize_resource class: Hyrax.config.file_set_class
@@ -14,6 +17,7 @@ module Hyrax
     # prevent method errors and nil objects later
     before_action :cast_file_set
     before_action :build_breadcrumbs, only: [:show, :edit, :stats]
+    before_action :ensure_migrated_file_set, only: :edit
     before_action do
       blacklight_config.track_search_session = false
     end
@@ -94,6 +98,20 @@ module Hyrax
 
     private
 
+    def ensure_migrated_file_set
+      # We need to know if a migration is going to happen, because if it is,
+      # we need to reset the memoized form.
+      needs_migration = wings_backed?(@file_set)
+
+      @file_set = ensure_migrated(
+        resource: @file_set,
+        transaction_key: 'change_set.update_file_set'
+      )
+
+      # If a migration happened, the memoized @form is now stale.
+      @form = nil if needs_migration
+    end
+
     ##
     # @api public
     def delete(file_set:)

data/app/controllers/hyrax/homepage_controller.rb

@@ -18,6 +18,13 @@ class Hyrax::HomepageController < ApplicationController
     recent
   end
 
+  def robots
+    expires_in 1.day, public: true
+    respond_to do |format|
+      format.text
+    end
+  end
+
   private
 
   # Return 5 collections

data/app/controllers/hyrax/my/works_controller.rb

@@ -17,14 +17,14 @@ module Hyrax
 
       def index
         # The user's collections for the "add to collection" form
-        @user_collections = collections_service.search_results(:deposit)
+        @user_collections = collections_service.all_search_results(:deposit)
 
         add_breadcrumb t(:'hyrax.controls.home'), root_path
         add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
         add_breadcrumb t(:'hyrax.admin.sidebar.works'), hyrax.my_works_path
         managed_works_count
         @create_work_presenter = create_work_presenter_class.new(current_user)
-        @admin_sets_for_select = admin_sets_for_select
+        @admin_sets_for_select = helpers.available_admin_sets_for_creating_works(ability: current_ability)
         super
       end
 
@@ -48,25 +48,6 @@ module Hyrax
       def managed_works_count
         @managed_works_count = Hyrax::Works::ManagedWorksService.managed_works_count(scope: self)
       end
-
-      def admin_sets_for_select
-        source_ids = Hyrax::Collections::PermissionsService.source_ids_for_deposit(ability: current_ability, source_type: 'admin_set')
-
-        admin_sets_list = Hyrax.query_service.find_many_by_ids(ids: source_ids).map do |source|
-          [source.title.first, source.id]
-        end
-
-        # Sorts the default admin set to be first, then the rest by title.
-        admin_sets_list.sort do |a, b|
-          if Hyrax::AdminSetCreateService.default_admin_set?(id: a[1])
-            -1
-          elsif Hyrax::AdminSetCreateService.default_admin_set?(id: b[1])
-            1
-          else
-            a[0] <=> b[0]
-          end
-        end
-      end
     end
   end
 end

data/app/controllers/hyrax/permissions_controller.rb

@@ -27,8 +27,10 @@ module Hyrax
       # copy visibility
       VisibilityCopyJob.perform_later(curation_concern)
 
-      # copy permissions
-      InheritPermissionsJob.perform_later(curation_concern)
+      # Copy permissions for AF work
+      # Due to performance issues for a Hyrax::Resource in Fedora 6, permissions are copied
+      # during visibility copy instead of reloading and iterating again.
+      InheritPermissionsJob.perform_later(curation_concern) unless curation_concern.is_a?(Hyrax::Resource)
       redirect_to [main_app, curation_concern], notice: I18n.t("hyrax.upload.change_access_flash_message")
     end
   end

data/app/controllers/hyrax/redirects_controller.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Hyrax
+  # See documentation/redirects.md for the redirects feature.
+  #
+  # Wired up as a catch-all route in the host application's `config/routes.rb`
+  # (see the install generator). Serves any path not claimed by an earlier
+  # route when the feature is active.
+  class RedirectsController < ApplicationController
+    def show
+      row = Hyrax::RedirectsLookup.find_row(params[:alias_path])
+      raise ActionController::RoutingError, 'Not Found' if row.blank?
+
+      if row.is_display_url?
+        dispatch_in_place(row)
+      else
+        redirect_to with_locale(row.to_path), status: :moved_permanently
+      end
+    end
+
+    private
+
+    # The visited path IS the display URL — render the resource's show
+    # page in place at the visited path. Use `recognize_path` to find
+    # the underlying curation-concern controller for the permalink, then
+    # dispatch the same request to it. Setting
+    # `request.env['hyrax.redirects.dispatched']` signals
+    # `Hyrax::RedirectToDisplayUrl` to skip its own redirect check on
+    # the inner controller's show action — otherwise the inner show
+    # would see the visited path, find the same row, and try to redirect
+    # back to itself.
+    def dispatch_in_place(row)
+      info = Rails.application.routes.recognize_path(row.permalink_path)
+      info[:locale] = params[:locale] if params[:locale].present?
+      controller_class = "#{info[:controller].camelize}Controller".constantize
+      request.path_parameters = info
+      request.env['hyrax.redirects.dispatched'] = true
+      controller_class.dispatch(info[:action], request, response)
+      # The inner controller wrote into the shared `response`; mark the outer
+      # action as performed so Rails skips its own implicit_render lookup.
+      self.response_body = response.body
+    end
+
+    # Carry the visitor's requested locale (set by Hyrax::Controller#set_locale
+    # from `params[:locale]`) across the 301 so the destination page renders in
+    # the same language. Appended as `?locale=<value>` so this works whether the
+    # host app uses path-prefix or query-string locales. The locale value is
+    # URL-encoded via Rack::Utils.build_query so attacker-controlled chars in
+    # params[:locale] can't inject extra query params into the Location header.
+    def with_locale(path)
+      return path if params[:locale].blank?
+      separator = path.include?('?') ? '&' : '?'
+      "#{path}#{separator}#{Rack::Utils.build_query(locale: params[:locale])}"
+    end
+  end
+end

data/app/controllers/hyrax/single_use_links_viewer_controller.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 module Hyrax
   class SingleUseLinksViewerController < DownloadsController
-    include Blacklight::Base
+    include Blacklight::Configurable
+    include Blacklight::SearchContext
     include Blacklight::AccessControls::Catalog
     include ActionDispatch::Routing::PolymorphicRoutes
 

data/app/controllers/hyrax/transcripts_controller.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Hyrax
+  class TranscriptsController < DownloadsController
+    def show
+      # Using the extracted text from the index is blocked
+      # by https://github.com/samvera/hyrax/issues/7410, so we
+      # need to get the original file instead.
+      file_metadata = find_file_metadata(file_set: Hyrax.query_service.find_by(id: params.require(:id)))
+      file = Hyrax.storage_adapter.find_by(id: file_metadata.file_identifier)
+
+      prepare_file_headers_valkyrie(metadata: file_metadata, file: file)
+      response.headers['Access-Control-Allow-Origin'] = '*'
+      send_file file.disk_path, data_options(file_metadata)
+    end
+
+    private
+
+    def disposition
+      'inline'
+    end
+
+    def data_options(file_metadata)
+      {
+        type: "#{file_metadata.mime_type}; charset=utf-8",
+        filename: file_metadata.original_filename,
+        disposition: disposition
+      }
+    end
+  end
+end

data/app/controllers/hyrax/uploads_controller.rb

@@ -23,20 +23,29 @@ module Hyrax
     def upload_with_chunking
       @upload = Hyrax::UploadedFile.find(params[:id])
       unpersisted_upload = Hyrax::UploadedFile.new(file: params[:files].first, user: current_user)
-
-      # Check if CONTENT-RANGE header is present
       content_range = request.headers['CONTENT-RANGE']
-      return @upload.file = unpersisted_upload.file if content_range.nil?
 
-      # deal with chunks
-      current_size = @upload.file.size
-      begin_of_chunk = content_range[/\ (.*?)-/, 1].to_i # "bytes 100-999999/1973660678" will return '100'
+      if content_range
+        handle_chunk(content_range, unpersisted_upload.file)
+      else
+        @upload.file = unpersisted_upload.file
+      end
+    end
+
+    def handle_chunk(content_range, chunk)
+      file_path = @upload.file.path
+      current_size = 0
+      File.open(file_path, "r") { |f| current_size = f.size } if file_path && File.exist?(file_path)
+
+      begin_of_chunk = content_range[/\ (.*?)-/, 1].to_i
 
-      # Add the following chunk to the incomplete upload
       if @upload.file.present? && begin_of_chunk == current_size
-        File.open(@upload.file.path, "ab") { |f| f.write(params[:files].first.read) }
+        File.open(file_path, "ab") do |f|
+          f.write(chunk.read)
+          f.fsync
+        end
       else
-        @upload.file = unpersisted_upload.file
+        @upload.file = chunk
       end
     end
   end