hyrax 4.0.0.beta2 → 4.0.0.rc2

data/app/search_builders/hyrax/filter_suppressed_with_roles.rb

@@ -32,7 +32,7 @@ module Hyrax
 
     def user_has_active_workflow_role?(current_work:)
       Hyrax::Workflow::PermissionQuery.scope_permitted_workflow_actions_available_for_current_state(user: current_ability.current_user, entity: current_work).any?
-    rescue PowerConverter::ConversionError
+    rescue Sipity::ConversionError
       # The current_work doesn't have a sipity workflow entity
       false
     end

data/app/services/hyrax/admin_set_service.rb

@@ -15,7 +15,7 @@ module Hyrax
 
     # @param [Symbol] access :deposit, :read or :edit
     def search_results(access)
-      response = context.repository.search(builder(access))
+      response = context.blacklight_config.repository.search(builder(access))
       response.documents
     end
 

data/app/services/hyrax/collections/nested_collection_query_service.rb

@@ -51,7 +51,7 @@ module Hyrax
       def self.parent_collections(child:, scope:, page: 1)
         return [] unless nestable?(collection: child)
         query_builder = Hyrax::NestedCollectionsParentSearchBuilder.new(scope: scope, child: child, page: page)
-        scope.repository.search(query_builder.query)
+        scope.blacklight_config.repository.search(query_builder.query)
       end
 
       ##
@@ -73,7 +73,7 @@ module Hyrax
         )
 
         query_builder.where(id: limit_to_id.to_s) if limit_to_id
-        scope.repository.search(query_builder.query)
+        scope.blacklight_config.repository.search(query_builder.query)
       end
       private_class_method :query_solr
 

data/app/services/hyrax/database_migrator.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'rails/generators/actions'
+require 'rails/generators'
 require 'rails/generators/active_record'
 
 module Hyrax

data/app/services/hyrax/edit_permissions_service.rb

@@ -20,17 +20,35 @@ module Hyrax
     # @note
     #   +form object.class = SimpleForm::FormBuilder+
     #    For works (i.e. GenericWork):
-    #    * form object.object = Hyrax::GenericWorkForm
-    #    * form object.object.model = GenericWork
+    #    * form_object.object = Hyrax::GenericWorkForm
+    #    * form_object.object.model = GenericWork
     #    * use the work itself
     #    For file_sets:
-    #    * form object.object.class = FileSet
+    #    * form_object.object.class = FileSet
+    #    * use work the file_set is in
+    #    For file set forms:
+    #    * form_object.object.class = Hyrax::Forms::FileSetForm OR
+    #      Hyrax::Forms::FileSetEditForm
+    #    * form_object.object.model = FileSet
     #    * use work the file_set is in
     #    No other object types are supported by this view.
     def self.build_service_object_from(form:, ability:)
       if form.object.respond_to?(:model) && form.object.model.work?
+        # The provided form object is a work form.
         new(object: form.object, ability: ability)
+      elsif form.object.respond_to?(:model) && form.object.model.file_set?
+        # The provided form object is a FileSet form. For Valkyrie forms
+        # (+Hyrax::Forms::FileSetForm+), +:in_works_ids+ is prepopulated onto
+        # the form object itself. For +Hyrax::Forms::FileSetEditForm+, the
+        # +:in_works+ method is present on the wrapped +:model+.
+        if form.object.is_a?(Hyrax::Forms::FileSetForm)
+          object_id = form.object.in_works_ids.first
+          new(object: Hyrax.query_service.find_by(id: object_id), ability: ability)
+        else
+          new(object: form.object.model.in_works.first, ability: ability)
+        end
       elsif form.object.file_set?
+        # The provided form object is a FileSet.
         new(object: form.object.in_works.first, ability: ability)
       end
     end

data/app/services/hyrax/restriction_service.rb

@@ -18,7 +18,7 @@ module Hyrax
       end
 
       def repository
-        config.repository
+        config.blacklight_config.repository
       end
 
       def config

data/app/services/hyrax/solr_query_service.rb

@@ -26,21 +26,29 @@ module Hyrax
     end
 
     ##
+    # execute the query using a GET request
     # @return [Hash] the results returned from solr for the current query
     def get
       solr_service.get(build)
     end
 
+    ##
+    # execute the solr query and return results
+    # @return [Hash] the results returned from solr for the current query
+    def query_result
+      solr_service.query_result(build)
+    end
+
     ##
     # @return [Enumerable<SolrDocument>]
     def solr_documents
-      get['response']['docs'].map { |doc| self.class.document_model.new(doc) }
+      query_result['response']['docs'].map { |doc| self.class.document_model.new(doc) }
     end
 
     ##
     # @return [Array<String>] ids of documents matching the current query
     def get_ids # rubocop:disable Naming/AccessorMethodName
-      results = get
+      results = query_result
       results['response']['docs'].map { |doc| doc['id'] }
     end
 

data/app/services/hyrax/solr_service.rb

@@ -38,7 +38,7 @@ module Hyrax
       end
 
       delegate :add, :commit, :count, :delete, :get, :instance, :ping, :post,
-               :query, :delete_by_query, :search_by_id, :wipe!, to: :new
+               :query, :query_result, :delete_by_query, :search_by_id, :wipe!, to: :new
     end
 
     # Wraps rsolr get
@@ -72,21 +72,27 @@ module Hyrax
       connection.post(solr_path, data: args)
     end
 
-    # Wraps get by default
+    # Query solr using the provided or default http method, returning the result as a hash.
+    # @return [Hash] raw query result from solr
+    def query_result(query, **args)
+      Hyrax.logger.warn rows_warning unless args.key?(:rows)
+      # Use the provided solr query method, or fall back to the configured default
+      method = args.delete(:method) || Hyrax.config.solr_default_method
+
+      case method
+      when :get
+        get(query, **args)
+      when :post
+        post(query, **args)
+      else
+        raise "Unsupported HTTP method for querying SolrService (#{method.inspect})"
+      end
+    end
+
+    # Execute the provided query. Uses the configured http method by default.
     # @return [Array<SolrHit>] the response docs wrapped in SolrHit objects
     def query(query, **args)
-      Hyrax.logger.warn rows_warning unless args.key?(:rows)
-      method = args.delete(:method) || :get
-
-      result = case method
-               when :get
-                 get(query, **args)
-               when :post
-                 post(query, **args)
-               else
-                 raise "Unsupported HTTP method for querying SolrService (#{method.inspect})"
-               end
-      result['response']['docs'].map do |doc|
+      query_result(query, **args)['response']['docs'].map do |doc|
         ::SolrHit.new(doc)
       end
     end
@@ -114,16 +120,16 @@ module Hyrax
     end
 
     # Wraps rsolr count
-    # @return [Hash] the hash straight form rsolr
+    # @return [Hash] the hash straight from rsolr
     def count(query)
       args = { rows: 0 }
-      get(query, **args)['response']['numFound'].to_i
+      query_result(query, **args)['response']['numFound'].to_i
     end
 
     # Wraps ActiveFedora::Base#search_by_id(id, opts)
     # @return [Array<SolrHit>] the response docs wrapped in SolrHit objects
-    def search_by_id(id, opts = {})
-      result = Hyrax::SolrService.query("id:#{id}", opts.merge(rows: 1))
+    def search_by_id(id, **opts)
+      result = Hyrax::SolrService.query("id:#{id}", **opts.merge(rows: 1))
 
       raise Hyrax::ObjectNotFoundError, "Object '#{id}' not found in solr" if result.empty?
       result.first

data/app/services/hyrax/thumbnail_path_service.rb

@@ -28,7 +28,8 @@ module Hyrax
       end
 
       def fetch_thumbnail(object)
-        return object if object.thumbnail_id == object.id
+        return object if object.thumbnail_id == object.id ||
+                         object.try(:file_ids)&.detect { |fid| fid == object.thumbnail_id }
         Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: object.thumbnail_id)
       rescue Valkyrie::Persistence::ObjectNotFoundError, Hyrax::ObjectNotFoundError
         Hyrax.logger.error("Couldn't find thumbnail #{object.thumbnail_id} for #{object.id}")
@@ -53,13 +54,20 @@ module Hyrax
       # @return true if there a file on disk for this object, otherwise false
       # @param [FileSet] thumb - the object that is the thumbnail
       def thumbnail?(thumb)
-        File.exist?(thumbnail_filepath(thumb))
+        File.exist?(thumbnail_filepath(thumb)) ||
+          (thumb.is_a?(Hyrax::Resource) && file_in_storage?(thumb))
       end
 
       # @param [FileSet] thumb - the object that is the thumbnail
       def thumbnail_filepath(thumb)
         Hyrax::DerivativePath.derivative_path_for_reference(thumb, 'thumbnail')
       end
+
+      def file_in_storage?(thumb)
+        Hyrax.custom_queries.find_thumbnail(file_set: thumb)
+      rescue Valkyrie::StorageAdapter::FileNotFound, Valkyrie::Persistence::ObjectNotFoundError
+        false
+      end
     end
   end
 end

data/app/services/hyrax/valkyrie_persist_derivatives.rb

@@ -16,22 +16,25 @@ module Hyrax
     # @param [#read] stream the derivative filestream
     # @param [Hash] directives
     # @option directives [String] :url a url to the file destination
-    def self.call(stream, directives)
-      filepath = URI(directives.fetch(:url)).path
-      fileset_id = fileset_id_from_path(filepath)
-      fileset = Hyrax.metadata_adapter.query_service.find_by(id: fileset_id)
+    def self.call(stream,
+                  directives,
+                  uploader: Hyrax::ValkyrieUpload.new(storage_adapter: Hyrax.config.derivatives_storage_adapter))
+      file_set = fileset_for_directives(directives)
 
       # Valkyrie storage adapters will typically expect an IO-like object that
       # responds to #path -- here we only have a StringIO, so some
       # transformation is in order
-      tmpfile = Tempfile.new(fileset_id, encoding: 'ascii-8bit')
+      tmpfile = Tempfile.new(file_set.id, encoding: 'ascii-8bit')
       tmpfile.write stream.read
 
-      Hyrax.logger.debug "Uploading thumbnail for FileSet #{fileset_id} as #{filepath}"
-      Hyrax.config.derivatives_storage_adapter.upload(
-        file: tmpfile,
-        original_filename: filepath,
-        resource: fileset
+      filename = filename(directives)
+      Hyrax.logger.debug "Uploading thumbnail for FileSet #{file_set.id} as #{filename}"
+
+      uploader.upload(
+        io: tmpfile,
+        filename: filename,
+        file_set: file_set,
+        use: Hyrax::FileMetadata::Use::THUMBNAIL
       )
     end
 
@@ -40,11 +43,19 @@ module Hyrax
     # we want to extract the FileSet id, which in this case would be 9593tv123
     #
     # @param [String] path
-    # @return [String]
-    def self.fileset_id_from_path(path)
-      path.sub(Hyrax.config.derivatives_path.to_s, "")
-          .sub(/-[^\/]+\..*$/, "")
-          .delete("/")
+    # @return [Hyrax::FileSet]
+    def self.fileset_for_directives(directives)
+      path = URI(directives.fetch(:url)).path
+      id = path.sub(Hyrax.config.derivatives_path.to_s, "")
+               .delete('/')
+               .match(/^(.*)-\w*(\.\w+)*$/) { |m| m[1] }
+      raise "Could not extract fileset id from path #{path}" unless id
+
+      Hyrax.metadata_adapter.query_service.find_by(id: id)
+    end
+
+    def self.filename(directives)
+      URI(directives.fetch(:url)).path.split('/').last
     end
   end
 end

data/app/services/hyrax/valkyrie_upload.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-module Hyrax::ValkyrieUpload
+class Hyrax::ValkyrieUpload
   # @param [IO] io
   # @param [String] filename
   # @param [Hyrax::FileSet] file_set
+  # @param [Valkyrie::StorageAdapter] storage_adapter
   # @param [RDF::URI] use
   # @param [User] user
   #
@@ -19,31 +20,33 @@ module Hyrax::ValkyrieUpload
     use: Hyrax::FileMetadata::Use::ORIGINAL_FILE,
     user: nil
   )
+    new(storage_adapter: storage_adapter)
+      .upload(filename: filename, file_set: file_set, io: io, use: use, user: user)
+  end
 
-    streamfile = storage_adapter.upload(
-      file: io,
-      original_filename: filename,
-      resource: file_set,
-      use: use
-    )
-    io.close
+  ##
+  # @!attribute [r] storage_adapter
+  #   @return [Valkyrie::StorageAdapter] storage_adapter
+  attr_reader :storage_adapter
+  ##
+  # @param [Valkyrie::StorageAdapter] storage_adapter
+  def initialize(storage_adapter: Hyrax.storage_adapter)
+    @storage_adapter = storage_adapter
+  end
 
-    file_metadata = find_or_create_metadata(id: streamfile.id, file: streamfile)
+  def upload(filename:, file_set:, io:, use: Hyrax::FileMetadata::Use::ORIGINAL_FILE, user: nil)
+    streamfile = storage_adapter.upload(file: io, original_filename: filename, resource: file_set)
+    file_metadata = Hyrax::FileMetadata(streamfile)
     file_metadata.file_set_id = file_set.id
+    file_metadata.type += [use]
 
-    case use
-    when Hyrax::FileMetadata::Use::ORIGINAL_FILE
+    if use == Hyrax::FileMetadata::Use::ORIGINAL_FILE
       # Set file set label.
       reset_title = file_set.title.first == file_set.label
       # set title to label if that's how it was before this characterization
       file_set.title = file_metadata.original_filename if reset_title
       # always set the label to the original_name
       file_set.label = file_metadata.original_filename
-    when Hyrax::FileMetadata::Use::THUMBNAIL
-      # TODO: the parent work's thumbnail_id remains incorrect (it's set to the
-      # FileSet ID, rather than the ID of this thumbnail FileMetadata; but
-      # trying to update the parent attributes here doesn't seem to stick
-      file_set.thumbnail_id = file_metadata.id
     end
 
     saved_metadata = Hyrax.persister.save(resource: file_metadata)
@@ -64,7 +67,7 @@ module Hyrax::ValkyrieUpload
   # @param [::User] user  the user performing the add
   #
   # @return [Hyrax::FileSet] updated file set
-  def self.add_file_to_file_set(file_set:, file_metadata:, user:)
+  def add_file_to_file_set(file_set:, file_metadata:, user:)
     file_set.file_ids << file_metadata.id
     set_file_use_ids(file_set, file_metadata)
 
@@ -72,12 +75,14 @@ module Hyrax::ValkyrieUpload
     Hyrax.publisher.publish('object.membership.updated', object: file_set, user: user)
   end
 
+  private
+
   # @api private
   # @param [Hyrax::FileSet] file_set the file set to add to
   # @param [Hyrax::FileMetadata] file_metadata the metadata object representing
   #   the file to add
   # @return [void]
-  def self.set_file_use_ids(file_set, file_metadata)
+  def set_file_use_ids(file_set, file_metadata)
     file_metadata.type.each do |type|
       case type
       when Hyrax::FileMetadata::Use::ORIGINAL_FILE
@@ -91,16 +96,4 @@ module Hyrax::ValkyrieUpload
       end
     end
   end
-
-  # @api private
-  # @param [#to_s] id
-  # @param [Valkyrie::StorageAdapter::StreamFile] file
-  def self.find_or_create_metadata(id:, file:)
-    Hyrax.custom_queries.find_file_metadata_by(id: id)
-  rescue Valkyrie::Persistence::ObjectNotFoundError => e
-    Hyrax.logger.warn "Failed to find existing metadata for #{id}:"
-    Hyrax.logger.warn e.message
-    Hyrax.logger.warn "Creating Hyrax::FileMetadata now"
-    Hyrax::FileMetadata.for(file: file)
-  end
 end

data/app/services/hyrax/visibility_propagator.rb

@@ -15,13 +15,13 @@ module Hyrax
       when Hyrax::Resource # Valkyrie
         ResourceVisibilityPropagator.new(source: source)
       else
-        NullVisibilityPropogator.new(source: source)
+        NullVisibilityPropagator.new(source: source)
       end
     end
 
     ##
-    # Provides a null/logging implementation of the visibility propogator.
-    class NullVisibilityPropogator
+    # Provides a null/logging implementation of the visibility propagator.
+    class NullVisibilityPropagator
       ##
       # @!attribute [rw] source
       #   @return [#visibility]
@@ -36,8 +36,8 @@ module Hyrax
       ##
       # @return [void]
       # @raise [RuntimeError] if we're in development mode
-      def propogate
-        message =  "Tried to propogate visibility to members of #{source} " \
+      def propagate
+        message =  "Tried to propagate visibility to members of #{source} " \
                    "but didn't know what kind of object it is. Model " \
                    "name #{source.try(:model_name)}. Called from #{caller[0]}."
 

data/app/services/hyrax/visibility_reader.rb

@@ -41,7 +41,7 @@ module Hyrax
     end
 
     def visibility_map
-      Hyrax::VisibilityMap.instance
+      Hyrax.config.visibility_map
     end
   end
 end

data/app/services/hyrax/visibility_writer.rb

@@ -44,7 +44,7 @@ module Hyrax
     end
 
     def visibility_map
-      Hyrax::VisibilityMap.instance
+      Hyrax.config.visibility_map
     end
   end
 end

data/app/services/hyrax/workflow/permission_query.rb

@@ -55,7 +55,7 @@ module Hyrax
           workflow_actions_scope.arel_table[:id].in(
             workflow_state_actions_scope.arel_table.project(
               workflow_state_actions_scope.arel_table[:workflow_action_id]
-            ).where(workflow_state_actions_scope.arel.constraints.reduce)
+            ).where(workflow_state_actions_scope.arel.constraints.reduce(:+))
           )
         )
       end
@@ -307,7 +307,7 @@ module Hyrax
 
         entity_specific_scope = scope_processing_workflow_roles_for_user_and_entity_specific(user: user, entity: entity)
         Sipity::WorkflowRole.where(
-          workflow_scope.arel.constraints.reduce.or(entity_specific_scope.arel.constraints.reduce)
+          workflow_scope.arel.constraints.reduce(:+).or(entity_specific_scope.arel.constraints.reduce(:+))
         )
       end
 
@@ -358,7 +358,7 @@ module Hyrax
                 agent_scope.arel_table.project(
                   agent_scope.arel_table[:id]
                 ).where(
-                  agent_scope.arel.constraints.reduce.and(entity_responsibilities[:entity_id].eq(entity.id))
+                  agent_scope.arel.constraints.reduce(:+).and(entity_responsibilities[:entity_id].eq(entity.id))
                 )
               )
             )
@@ -399,7 +399,7 @@ module Hyrax
               ).where(
                 permissions.arel_table[:workflow_role_id].in(
                   role_scope.arel_table.project(role_scope.arel_table[:id]).where(
-                    role_scope.arel.constraints.reduce
+                    role_scope.arel.constraints.reduce(:+)
                   )
                 )
               )
@@ -441,7 +441,7 @@ module Hyrax
       # @return [ActiveRecord::Relation<Sipity::WorkflowAction>]
       def scope_workflow_actions_available_for_current_state(entity:)
         workflow_actions_for_current_state = scope_workflow_actions_for_current_state(entity: entity)
-        Sipity::WorkflowAction.where(workflow_actions_for_current_state.arel.constraints.reduce)
+        Sipity::WorkflowAction.where(workflow_actions_for_current_state.arel.constraints.reduce(:+))
       end
     end
   end

data/app/services/hyrax/workflow/status_list_service.rb

@@ -69,7 +69,7 @@ module Hyrax
         actionable_roles = roles_for_user
         Hyrax.logger.debug("Actionable roles for #{@user.user_key} are #{actionable_roles}")
         return [] if actionable_roles.empty?
-        WorkRelation.new.search_with_conditions(query(actionable_roles), method: :post)
+        WorkRelation.new.search_with_conditions(query(actionable_roles), method: Hyrax.config.solr_default_method)
       end
 
       def query(actionable_roles)

data/app/validators/hyrax/collection_membership_validator.rb

@@ -5,8 +5,8 @@ module Hyrax
   class CollectionMembershipValidator < ActiveModel::Validator
     ##
     # @param multiple_membership_checker
-    def initialize(multiple_membership_checker: Hyrax::MultipleMembershipChecker, **options)
-      @multiple_membership_checker = multiple_membership_checker
+    def initialize(options = {})
+      @multiple_membership_checker = options[:multiple_membership_checker] || Hyrax::MultipleMembershipChecker
       super(options)
     end
 

data/app/views/hyrax/base/_attribute_rows.html.erb

@@ -1,9 +1,11 @@
+<%= presenter.attribute_to_html(:alternative_title, html_dl: true) %>
 <%= presenter.attribute_to_html(:abstract, html_dl: true) %>
 <%= presenter.attribute_to_html(:date_modified, label: t('hyrax.base.show.last_modified'), html_dl: true) %>
 <%= presenter.attribute_to_html(:creator, render_as: :faceted, html_dl: true) %>
 <%= presenter.attribute_to_html(:contributor, render_as: :faceted, html_dl: true) %>
 <%= presenter.attribute_to_html(:subject, render_as: :faceted, html_dl: true) %>
 <%= presenter.attribute_to_html(:publisher, render_as: :faceted, html_dl: true) %>
+<%= presenter.attribute_to_html(:bibliographic_citation, html_dl: true) %>
 <%= presenter.attribute_to_html(:language, render_as: :faceted, html_dl: true) %>
 <%= presenter.attribute_to_html(:identifier, render_as: :linked, search_field: 'identifier_tesim', html_dl: true) %>
 <%= presenter.attribute_to_html(:keyword, render_as: :faceted, html_dl: true) %>

data/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb

@@ -14,7 +14,7 @@
                 <p><%= t("hyrax.collection.select_form.select_heading") %></p>
               
                 <% if @add_works_to_collection.present? %>
-                  <%= text_field_tag 'member_of_collection_label', @add_works_to_collection_label, size: '90', disabled: true %>
+                  <%= text_field_tag 'member_of_collection_label', @add_works_to_collection_label, disabled: true %>
                   <%= hidden_field_tag 'member_of_collection_ids', @add_works_to_collection %>
                 <% else %>
                   <%= text_field_tag 'member_of_collection_ids', nil,

data/app/views/hyrax/file_sets/_permission.html.erb

@@ -1,5 +1,5 @@
   <div id="permissions_display" class="tab-pane">
-    <%= simple_form_for [main_app, file_set],
+    <%= simple_form_for [main_app, form_object],
                         html: { multipart: true,
                                 id: 'permission',
                                 data: { param_key: file_set.model_name.param_key },

data/app/views/hyrax/file_sets/edit.html.erb

@@ -33,7 +33,7 @@
             <h2><%= t('.descriptions') %></h2>
             <%= render "form" %>
           </div>
-          <%= render "permission", file_set: curation_concern %>
+          <%= render "permission", file_set: curation_concern, form_object: @form %>
           <%= render "versioning", file_set: curation_concern %>
         </div>
       </div>

data/app/views/hyrax/file_sets/media_display/_audio.html.erb

@@ -8,7 +8,7 @@
       </audio>
       <%= link_to t('hyrax.file_set.show.downloadable_content.audio_link'),
                   hyrax.download_path(file_set),
-                  data: { label: file_set.id },
+                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
                   target: :_blank,
                   id: "file_download" %>
     </div>

data/app/views/hyrax/file_sets/media_display/_default.html.erb

@@ -4,7 +4,7 @@
     <p /><%= link_to t('hyrax.file_set.show.download'),
       hyrax.download_path(file_set),
       id: "file_download",
-      data: { label: file_set.id },
+      data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
       target: "_new" %>
   <% end %>
 </div>

data/app/views/hyrax/file_sets/media_display/_image.html.erb

@@ -7,7 +7,7 @@
                     role: "presentation") %>
       <%= link_to t('hyrax.file_set.show.downloadable_content.image_link'),
                   hyrax.download_path(file_set),
-                  data: { label: file_set.id },
+                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
                   target: :_blank,
                   id: "file_download" %>
     </div>

data/app/views/hyrax/file_sets/media_display/_office_document.html.erb

@@ -9,7 +9,7 @@
                   hyrax.download_path(file_set),
                   target: :_blank,
                   id: "file_download",
-                  data: { label: file_set.id } %>
+                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids } %>
     </div>
 <% else %>
     <div>

data/app/views/hyrax/file_sets/media_display/_pdf.html.erb

@@ -9,7 +9,7 @@
                   hyrax.download_path(file_set),
                   target: :_blank,
                   id: "file_download",
-                  data: { label: file_set.id } %>
+                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids } %>
     </div>
 <% else %>
     <div>

data/app/views/hyrax/file_sets/media_display/_video.html.erb

@@ -8,7 +8,7 @@
       </video>
       <%= link_to t('hyrax.file_set.show.downloadable_content.video_link'),
                   hyrax.download_path(file_set),
-                  data: { label: file_set.id },
+                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
                   target: :_blank,
                   id: "file_download" %>
     </div>

data/app/views/hyrax/uploads/_js_templates.html.erb

@@ -3,18 +3,18 @@
 <script id="template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
     <tr class="template-upload <%= fade_class_if_not_test %>">
-        <td>
+        <span>
             <span class="preview"></span>
-        </td>
-        <td>
+        </span>
+        <span>
             <p class="name">{%=file.name%}</p>
             <strong class="error text-danger"></strong>
-        </td>
-        <td>
+        </span>
+        <span>
             <p class="size">Processing...</p>
             <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div></div>
-        </td>
-        <td class="text-right">
+        </span>
+        <span class="text-right">
             {% if (!i && !o.options.autoUpload) { %}
                 <button class="btn btn-primary start" disabled>
                     <span class="fa fa-upload"></span>
@@ -27,7 +27,7 @@
                     <span><%= t('helpers.action.cancel') %></span>
                 </button>
             {% } %}
-        </td>
+        </span>
     </tr>
 {% } %}
 </script>