hyrax 5.0.0.rc1 → 5.0.0.rc2

data/app/services/hyrax/listeners/member_cleanup_listener.rb

@@ -8,38 +8,12 @@ module Hyrax
       # Called when 'object.deleted' event is published
       # @param [Dry::Events::Event] event
       # @return [void]
-      def on_object_deleted(event)
-        return unless event.payload.key?(:object) # legacy callback
-        return if event[:object].is_a?(ActiveFedora::Base) # handled by legacy code
-
-        Hyrax.custom_queries.find_child_file_sets(resource: event[:object]).each do |file_set|
-          Hyrax.persister.delete(resource: file_set)
-          Hyrax.publisher
-               .publish('object.deleted', object: file_set, id: file_set.id, user: event[:user])
-        rescue StandardError # we don't uncaught errors looping filesets
-          Hyrax.logger.warn "Failed to delete #{file_set.class}:#{file_set.id} " \
-                            "during cleanup for resource: #{event[:object]}. " \
-                            'This member may now be orphaned.'
-        end
-      end
+      def on_object_deleted(event); end
 
       # Called when 'collection.deleted' event is published
       # @param [Dry::Events::Event] event
       # @return [void]
-      def on_collection_deleted(event)
-        return unless event.payload.key?(:collection) # legacy callback
-        return if event[:collection].is_a?(ActiveFedora::Base) # handled by legacy code
-
-        Hyrax.custom_queries.find_members_of(collection: event[:collection]).each do |resource|
-          resource.member_of_collection_ids -= [event[:collection].id]
-          Hyrax.persister.save(resource: resource)
-          Hyrax.publisher
-               .publish('collection.membership.updated', collection: event[:collection], user: event[:user])
-        rescue StandardError
-          Hyrax.logger.warn "Failed to remove collection reference from #{work.class}:#{work.id} " \
-                            "during cleanup for collection: #{event[:collection]}. "
-        end
-      end
+      def on_collection_deleted(event); end
     end
   end
 end

data/app/services/hyrax/listeners/metadata_index_listener.rb

@@ -83,6 +83,17 @@ module Hyrax
         Hyrax.index_adapter.delete(resource: event[:collection])
       end
 
+      ##
+      # Remove the resource from the index.
+      #
+      # Called when 'file.metadata.deleted' event is published
+      # @param [Dry::Events::Event] event
+      # @return [void]
+      def on_file_metadata_deleted(event)
+        return unless resource? event.payload[:metadata]
+        Hyrax.index_adapter.delete(resource: event[:metadata])
+      end
+
       private
 
       def resource?(resource)

data/app/services/hyrax/lock_manager.rb

@@ -47,11 +47,10 @@ module Hyrax
     # @api private
     #
     # @note support both a ConnectionPool and a raw Redis client for now.
-    #   we should drop support for `Redis.current` in 5.0.0.
     #   `#then` supports both options. for a ConnectionPool it will block
     #   until a connection is available.
     def pool
-      Hyrax.config.redis_connection || Redis.current
+      Hyrax.config.redis_connection || Redis.new
     end
   end
 end

data/app/services/hyrax/riiif_file_resolver.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+module Hyrax
+  # Riiif file resolver for valkyrie resources
+  class RiiifFileResolver
+    include ActiveSupport::Benchmarkable
+
+    # @param [String] id from iiif manifest
+    # @return [Riiif::File]
+    def find(id)
+      path = nil
+      file_locks[id].with_write_lock do
+        path = build_path(id)
+        path = build_path(id, force: true) unless File.exist?(path) # Ensures the file is locally available
+      end
+      RiiifFile.new(path, id: id)
+    end
+
+    # tracks individual file locks
+    # @see RiiifFile
+    # @return [Concurrent::Map<Concurrent::ReadWriteLock>]
+    def file_locks
+      @file_locks ||= Concurrent::Map.new do |k, v|
+        k.compute_if_absent(v) { Concurrent::ReadWriteLock.new }
+      end
+    end
+
+    private
+
+    def build_path(id, force: false)
+      Riiif::Image.cache.fetch("riiif:" + Digest::MD5.hexdigest("path:#{id}"),
+                               expires_in: Riiif::Image.expires_in,
+                               force: force) do
+        load_file(id)
+      end
+    end
+
+    def load_file(id)
+      benchmark "RiiifFileResolver loaded #{id}", level: :debug do
+        fs_id = id.sub(/\A([^\/]*)\/.*/, '\1')
+        file_set = Hyrax.query_service.find_by(id: fs_id)
+        file_metadata = Hyrax.custom_queries.find_original_file(file_set: file_set)
+        file_metadata.file.disk_path.to_s # Stores a local copy in tmpdir
+      end
+    end
+
+    def logger
+      Hyrax.logger
+    end
+  end
+end

data/app/services/hyrax/simple_schema_loader.rb

@@ -43,6 +43,12 @@ module Hyrax
       end
     end
 
+    def permissive_schema_for_valkrie_adapter
+      metadata_files.each_with_object({}) do |schema_name, ret_hsh|
+        predicate_pairs(ret_hsh, schema_name)
+      end
+    end
+
     ##
     # @api private
     class AttributeDefinition
@@ -154,5 +160,30 @@ module Hyrax
     def config_search_paths
       [Rails.root, Hyrax::Engine.root]
     end
+
+    def metadata_files
+      file_name_arr = []
+      config_search_paths.each { |root_path| file_name_arr += Dir.entries(root_path.to_s + "/config/metadata/") }
+      file_name_arr.reject { |fn| !fn.include?('.yaml') }.uniq.map { |y| y.gsub('.yaml', '') }
+    end
+
+    def predicate_pairs(ret_hsh, schema_name)
+      schema_config(schema_name)['attributes'].each do |name, config|
+        predicate = RDF::URI(config['predicate'])
+        if ret_hsh[name].blank?
+          ret_hsh[name.to_sym] = predicate
+        elsif ret_hsh[name] != predicate
+          multiple_predicate_message(name, ret_hsh[name], predicate)
+        end
+      end
+    end
+
+    def multiple_predicate_message(name, existing, incoming)
+      message =  "The attribute of #{name} has been assigned a predicate multiple times " \
+                 "within the metadata YAMLs. Please be aware that once the attribute's " \
+                 "predicate value is first assigned, any other value will be ignored. " \
+                 "The existing value is #{existing} preventing the use of #{incoming}"
+      Hyrax.logger.warn(message)
+    end
   end
 end

data/app/services/hyrax/valkyrie_persist_derivatives.rb

@@ -32,7 +32,7 @@ module Hyrax
 
       filename = filename(directives)
       Hyrax.logger.debug "Uploading derivative for FileSet #{file_set.id} as #{filename}"
-      uploader.upload(io: tmpfile, filename: filename, file_set: file_set, use: file_metadata(directives))
+      uploader.upload(io: tmpfile, filename: filename, file_set: file_set, use: file_metadata(directives), mime_type: directives[:mime_type])
     end
 
     # The filepath will look something like

data/app/services/hyrax/valkyrie_upload.rb

@@ -34,12 +34,15 @@ class Hyrax::ValkyrieUpload
     @storage_adapter = storage_adapter
   end
 
-  def upload(filename:, file_set:, io:, use: Hyrax::FileMetadata::Use::ORIGINAL_FILE, user: nil)
+  def upload(filename:, file_set:, io:, use: Hyrax::FileMetadata::Use::ORIGINAL_FILE, user: nil, mime_type: nil) # rubocop:disable Metrics/AbcSize
+    return version_upload(file_set: file_set, io: io, user: user) if use == Hyrax::FileMetadata::Use::ORIGINAL_FILE && file_set.original_file_id && storage_adapter.supports?(:versions)
     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.pcdm_use = [use]
     file_metadata.recorded_size = [io.size]
+    file_metadata.mime_type = mime_type if mime_type
+    file_metadata.original_filename = File.basename(filename).to_s || File.basename(io)
 
     if use == Hyrax::FileMetadata::Use::ORIGINAL_FILE
       # Set file set label.
@@ -63,6 +66,13 @@ class Hyrax::ValkyrieUpload
     saved_metadata
   end
 
+  def version_upload(file_set:, io:, user:)
+    file_metadata = Hyrax.query_service.custom_queries.find_file_metadata_by(id: file_set.original_file_id)
+    Hyrax::VersioningService.create(file_metadata, user, io)
+    Hyrax.publisher.publish("file.uploaded", metadata: file_metadata)
+    ContentNewVersionEventJob.perform_later(file_set, user)
+  end
+
   # @param [Hyrax::FileSet] file_set the file set to add to
   # @param [Hyrax::FileMetadata] file_metadata the metadata object representing
   #   the file to add
@@ -70,32 +80,8 @@ class Hyrax::ValkyrieUpload
   #
   # @return [Hyrax::FileSet] updated file set
   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)
-
+    file_set.file_ids += [file_metadata.id]
     Hyrax.persister.save(resource: file_set)
     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 set_file_use_ids(file_set, file_metadata)
-    file_metadata.pcdm_use.each do |type|
-      case type
-      when Hyrax::FileMetadata::Use::ORIGINAL_FILE
-        file_set.original_file_id = file_metadata.id
-      when Hyrax::FileMetadata::Use::THUMBNAIL
-        file_set.thumbnail_id = file_metadata.id
-      when Hyrax::FileMetadata::Use::EXTRACTED_TEXT
-        file_set.extracted_text_id = file_metadata.id
-      else
-        Hyrax.logger.warn "Unknown file use #{file_metadata.type} specified for #{file_metadata.file_identifier}"
-      end
-    end
-  end
 end

data/app/services/hyrax/versioning_service.rb

@@ -32,14 +32,12 @@ module Hyrax
     # If the resource is nil, or if it is a Hyrax::FileMetadata and versioning
     # is not supported in the storage adapter, an empty array will be returned.
     def versions
-      if resource.nil?
+      if !supports_multiple_versions?
         []
       elsif resource.is_a?(Hyrax::FileMetadata)
-        if storage_adapter.try(:"supports?", :versions)
-          storage_adapter.find_versions(id: resource.file_identifier).to_a
-        else
-          []
-        end
+        # Reverse - Valkyrie puts these most recent first, we assume most recent
+        # last.
+        storage_adapter.find_versions(id: resource.file_identifier).to_a.reverse
       else
         return resource.versions if resource.versions.is_a?(Array)
         resource.versions.all.to_a
@@ -53,6 +51,16 @@ module Hyrax
       versions.last
     end
 
+    ##
+    # Returns whether support for multiple versions exists on this
+    # +Hyrax::VersioningService+.
+    #
+    # Versioning is unsupported on nil resources or on Valkyrie resources when
+    # the configured storage adapter does not advertise versioning support.
+    def supports_multiple_versions?
+      !(resource.nil? || resource.is_a?(Hyrax::FileMetadata) && !storage_adapter.try(:"supports?", :versions))
+    end
+
     ##
     # Returns the file ID of the latest version of the file associated with this
     # Hyrax::VersioningService, or the ID of the file resource itself if no
@@ -61,7 +69,7 @@ module Hyrax
     # If the resource is nil, this method returns an empty string.
     def versioned_file_id
       latest = latest_version
-      if latest
+      if latest && !resource.is_a?(Hyrax::FileMetadata)
         if latest.respond_to?(:id)
           latest.id
         else
@@ -70,7 +78,7 @@ module Hyrax
       elsif resource.nil?
         ""
       elsif resource.is_a?(Hyrax::FileMetadata)
-        resource.file_identifier
+        latest_version&.version_id || resource.file_identifier
       else
         resource.id
       end
@@ -80,9 +88,9 @@ module Hyrax
       # Make a version and record the version committer
       # @param [ActiveFedora::File | Hyrax::FileMetadata] content
       # @param [User, String] user
-      def create(content, user = nil)
+      def create(content, user = nil, file = nil)
         use_valkyrie = content.is_a? Hyrax::FileMetadata
-        perform_create(content, user, use_valkyrie)
+        perform_create(content, user, file, use_valkyrie)
       end
 
       # @param [ActiveFedora::File | Hyrax::FileMetadata] file
@@ -102,14 +110,14 @@ module Hyrax
         user_key = user_key.user_key if user_key.respond_to?(:user_key)
         version = latest_version_of(content)
         return if version.nil?
-        version_id = content.is_a?(Hyrax::FileMetadata) ? version.id.to_s : version.uri
+        version_id = content.is_a?(Hyrax::FileMetadata) ? version.version_id.to_s : version.uri
         Hyrax::VersionCommitter.create(version_id: version_id, committer_login: user_key)
       end
 
       private
 
-      def perform_create(content, user, use_valkyrie)
-        use_valkyrie ? perform_create_through_valkyrie(content, user) : perform_create_through_active_fedora(content, user)
+      def perform_create(content, user, file, use_valkyrie)
+        use_valkyrie ? perform_create_through_valkyrie(content, file, user) : perform_create_through_active_fedora(content, user)
       rescue NotImplementedError
         Hyrax.logger.warn "Declining to create a Version for #{content}; #{self} doesn't support versioning with use_valkyrie: #{use_valkyrie}"
       end
@@ -119,8 +127,14 @@ module Hyrax
         record_committer(content, user) if user
       end
 
-      def perform_create_through_valkyrie(content, user) # no-op
-        raise NotImplementedError
+      def perform_create_through_valkyrie(content, file, user)
+        raise NotImplementedError unless Hyrax.storage_adapter.supports?(:versions)
+        Hyrax.storage_adapter.upload_version(id: content.file_identifier, file: file)
+        record_committer(content, user) if user
+      end
+
+      def storage_adapter
+        Hyrax.storage_adapter
       end
     end
   end

data/app/services/hyrax/work_uploads_handler.rb

@@ -124,7 +124,7 @@ module Hyrax
     #
     # @todo figure out how to know less about Work's ideas about FileSet use here. Maybe post-Wings, work.
     def append_to_work(file_set)
-      work.member_ids << file_set.id
+      work.member_ids += [file_set.id]
       work.representative_id = file_set.id if work.respond_to?(:representative_id) && work.representative_id.blank?
       work.thumbnail_id = file_set.id if work.respond_to?(:thumbnail_id) && work.thumbnail_id.blank?
     end

data/app/validators/hyrax/collection_membership_validator.rb

@@ -29,7 +29,7 @@ module Hyrax
         record.member_of_collections_attributes
               .each do |_k, h|
                 next if h["_destroy"] == "true"
-                collection_ids << Valkyrie::ID.new(h["id"])
+                collection_ids += [Valkyrie::ID.new(h["id"])]
               end
       end
 

data/app/views/catalog/_search_form.html.erb

@@ -8,7 +8,7 @@
     </label>
 
     <div class="input-group col-sm-9">
-      <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
+      <%= text_field_tag :q, current_search_parameters , 'aria-label': 'Search', class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
 
       <div class="input-group-append">
         <button type="submit" class="btn btn-primary" id="search-submit-header">

data/app/views/hyrax/admin/collection_types/index.html.erb

@@ -40,7 +40,7 @@
                  <% unless collection_type.admin_set? || collection_type.user_collection? %>
                   <button class="btn btn-danger btn-sm delete-collection-type"
                           data-collection-type="<%= collection_type.to_json %>"
-                          data-collection-type-index="<%= hyrax.dashboard_collections_path({ 'f[collection_type_gid_ssim][]' => collection_type.to_global_id.to_s, 'f[has_model_ssim][]' => 'Collection' }) %>"
+                          data-collection-type-index="<%= hyrax.dashboard_collections_path({ 'f[collection_type_gid_ssim][]' => collection_type.to_global_id.to_s }) %>"
                           data-has-collections="<%= collection_type.collections.any? %>">
                     <%= t('helpers.action.delete') %>
                   </button>

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

@@ -1,5 +1,5 @@
 <div class="resource-form-container">
-  <%= simple_form_for [main_app, @form], remote: true, html: { id: 'resource-form', 'data-type': 'json' } do |f| %>
+  <%= simple_form_for [main_app, @form], remote: true, authenticity_token: true, html: { id: 'resource-form', 'data-type': 'json' } do |f| %>
     <%= f.input :thumbnail_id, as: :hidden, input_html: { data: {member_link: 'thumbnail_id'}} %>
     <%= f.input :representative_id, as: :hidden, input_html: { data: {member_link: 'representative_id'}} %>
   <% end %>

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

@@ -31,7 +31,7 @@
         </li>
         <li class="form-check">
           <label class="form-check-label">
-            <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO, class: 'form-check-input', data: { 'target': '#collapseEmbargo' } %>
+            <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO, 'aria-label': 'Embargo', class: 'form-check-input', data: { 'target': '#collapseEmbargo' } %>
             <%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO) %>
             <br />
             <%= t('hyrax.visibility.embargo.note_html') %>
@@ -39,7 +39,7 @@
               <div class="form-inline">
                 <%= f.input :visibility_during_embargo, wrapper: :inline, collection: visibility_options(:restrict), include_blank: false %>
                 <%= t('hyrax.works.form.visibility_until') %>
-                <%= f.date_field :embargo_release_date, wrapper: :inline, value: f.object.embargo_release_date&.to_date || Date.tomorrow, class: 'datepicker form-control' %>
+                <%= f.date_field :embargo_release_date, wrapper: :inline, 'aria-label': 'Embargo Release Date', value: f.object.embargo_release_date&.to_date || Date.tomorrow, class: 'datepicker form-control' %>
                 <%= f.input :visibility_after_embargo, wrapper: :inline, collection: visibility_options(:loosen), include_blank: false %>
               </div>
             </div>
@@ -47,7 +47,7 @@
         </li>
         <li class="form-check">
           <label class="form-check-label">
-            <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE, class: 'form-check-input', data: { 'target': '#collapseLease' } %>
+            <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE, 'aria-label': 'Lease', class: 'form-check-input', data: { 'target': '#collapseLease' } %>
             <%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE) %>
             <br />
             <%= t('hyrax.visibility.lease.note_html') %>
@@ -55,7 +55,7 @@
               <div class="form-inline">
                 <%= f.input :visibility_during_lease, wrapper: :inline, collection: visibility_options(:loosen), include_blank: false %>
                 <%= t('hyrax.works.form.visibility_until') %>
-                <%= f.date_field :lease_expiration_date, wrapper: :inline, value: f.object.lease_expiration_date&.to_date || Date.tomorrow, class: 'datepicker form-control' %>
+                <%= f.date_field :lease_expiration_date, wrapper: :inline, 'aria-label': 'Lease Expiration Date', value: f.object.lease_expiration_date&.to_date || Date.tomorrow, class: 'datepicker form-control' %>
                 <%= f.input :visibility_after_lease, wrapper: :inline, collection: visibility_options(:restrict), include_blank: false %>
               </div>
             </div>

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

@@ -2,7 +2,7 @@
   <div class="col-sm-6">
     <% if !workflow_restriction?(presenter) %>
       <% if presenter.show_deposit_for?(collections: @user_collections) %>
-        <input type="checkbox"  style="display:none" name="batch_document_ids[]" id="batch_document_<%= presenter.id %>" value="<%= presenter.id %>" class="batch_document_selector" checked="checked" />
+        <input type="checkbox" aria-label="Batch Documents" style="display:none" name="batch_document_ids[]" id="batch_document_<%= presenter.id %>" value="<%= presenter.id %>" class="batch_document_selector" checked="checked" />
         <%= button_tag t('hyrax.dashboard.my.action.add_to_collection'),
                       class: 'btn btn-secondary submits-batches submits-batches-add',
                       data: { toggle: "modal", target: "#collection-list-container" } %>

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

@@ -6,33 +6,35 @@
   </button>
   <%= form_tag main_app.hyrax_workflow_action_path(presenter), method: :put do %>
     <div id="workflow_controls_collapse" class="card-body collapse">
-      <div class="col-sm-3 workflow-actions">
-        <h3><%= t('.actions') %></h3>
+      <div class="row">
+        <div class="col-sm-3 workflow-actions">
+          <h3><%= t('.actions') %></h3>
 
-        <% presenter.workflow.actions.each do |key, label| %>
-          <div class="form-check">
-            <label class="form-check-label">
-              <%= radio_button_tag 'workflow_action[name]', key, key == 'comment_only', class: 'form-check-input' %>
-              <%= label %>
-            </label>
-          </div>
-        <% end %>
-      </div>
-      <div class="col-sm-9 workflow-comments">
-        <div class="form-group">
-          <label for="workflow_action_comment"><%= t('.review_comment') %>:</label>
-          <textarea class="form-control" name="workflow_action[comment]" id="workflow_action_comment"></textarea>
+          <% presenter.workflow.actions.each do |key, label| %>
+            <div class="form-check">
+              <label class="form-check-label">
+                <%= radio_button_tag 'workflow_action[name]', key, key == 'comment_only', class: 'form-check-input' %>
+                <%= label %>
+              </label>
+            </div>
+          <% end %>
         </div>
+        <div class="col-sm-9 workflow-comments">
+          <div class="form-group">
+            <label for="workflow_action_comment"><%= t('.review_comment') %>:</label>
+            <textarea class="form-control" name="workflow_action[comment]" id="workflow_action_comment"></textarea>
+          </div>
 
-        <input class="btn btn-primary" type="submit" value="Submit" />
+          <input class="btn btn-primary" type="submit" value="Submit" />
 
-        <h4><%= t('.previous_comments') %></h4>
-        <dl>
-          <% presenter.workflow.comments.each do |comment| %>
-            <dt><%= comment.name_of_commentor %></dt>
-            <dd><%= comment.comment %></dd>
-          <% end %>
-        </dl>
+          <h4><%= t('.previous_comments') %></h4>
+          <dl>
+            <% presenter.workflow.comments.each do |comment| %>
+              <dt><%= comment.name_of_commentor %></dt>
+              <dd><%= comment.comment %></dd>
+            <% end %>
+          </dl>
+        </div>
       </div>
     </div>
   <% end %>

data/app/views/hyrax/base/show.json.jbuilder

@@ -2,5 +2,6 @@
 @curation_concern = ::Wings::ActiveFedoraConverter.convert(resource: @curation_concern) if
   @curation_concern.is_a?(Hyrax::Resource) && Object.const_defined?("Wings")
 
-json.extract! @curation_concern, *[:id] + @curation_concern.class.fields.reject { |f| [:has_model].include? f }
+json.extract! @curation_concern, *@curation_concern.class.fields.reject { |f| [:has_model].include? f }
+json.id @curation_concern.id.to_s
 json.version @curation_concern.try(:etag)

data/app/views/hyrax/collections/_show_document_list_row.html.erb

@@ -7,7 +7,7 @@
   </td>
   <td>
     <div class="media">
-      <%= link_to [main_app, document], "class" => "media-left", "aria-hidden" => "true" do %>
+      <%= link_to [main_app, document], "class" => "media-left mr-3", "aria-hidden" => "true" do %>
         <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
           { class: "d-none d-md-block file_listing_thumbnail", alt: "#{document.title_or_label} #{t('hyrax.homepage.admin_sets.thumbnail')}" },
           { suppress_link: true }

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

@@ -12,7 +12,7 @@
     <input type="checkbox" name="batch_document_ids[]" id="batch_document_<%= id %>" value="<%= id %>" class="batch_document_selector"
       data-hasaccess="<%= (can?(:edit, collection_presenter.solr_document)) %>" />
     <% else %>
-    <input type="checkbox" class="disabled" disabled=true />
+    <input type="checkbox" class="disabled batch_document_selector" disabled=true />
     <% end %>
   </td>
   <td>

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

@@ -7,7 +7,7 @@
   </td>
   <td>
     <div class="media">
-      <%= link_to [main_app, document], "class" => "media-left", "aria-hidden" => "true" do %>
+      <%= link_to [main_app, document], "class" => "media-left mr-3", "aria-hidden" => "true" do %>
         <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
           { class: "d-none d-md-block file_listing_thumbnail", alt: document.title_or_label }, { suppress_link: true }
         ) %>

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

@@ -11,8 +11,8 @@
   <% if show_sort_and_per_page? && collection_member_sort_fields.many? %>
     <div class="sort-toggle">
       <%= form_tag dashboard_collection_path(collection), method: :get, class: 'per_page' do %>
-         <div class="form-group row form-control-lg">
-           <fieldset class="col-sm-9">
+         <div class="form-group row">
+           <fieldset class="col-sm-7 col-lg-8">
              <legend class="sr-only"><%= t('hyrax.sort_label') %></legend>
              <%= label_tag(:sort, t(".sort_by")) %>
              <%= select_tag(:sort, options_from_collection_for_select(collection_member_sort_fields, 'first', lambda {|field| field.last.label}, h(params[:sort]))) %>
@@ -22,7 +22,7 @@
              <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:per_page, :sort)) %>
              <button class="btn btn-info"><span class="fa fa-refresh"></span> <%= t('helpers.action.refresh') %></button>
            </fieldset>
-           <div class="col-sm-3">
+           <div class="col-sm-5 col-lg-4">
              <%= render 'hyrax/collections/view_type_group' %>
            </div>
          </div>

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

@@ -1,6 +1,6 @@
 <div id="versioning_display" class="tab-pane">
   <h2><%= t('.header') %></h2>
-  <%= simple_form_for [main_app, curation_concern], html: { multipart: true, class: 'nav-safety' } do |f| %>
+  <% if @version_list.supports_multiple_versions? %><%= simple_form_for [main_app, curation_concern], html: { multipart: true, class: 'nav-safety' } do |f| %>
     <div id="fileuploadVersioning">
       <!-- Redirect browsers with JavaScript disabled to the origin page -->
       <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>"/></noscript>
@@ -45,10 +45,10 @@
         <%= t('.upload') %>
       <% end %>
 
-    </div> <!-- fileuploadVersioning -->
-  <% end %>
+    </div> <!-- /fileuploadVersioning -->
+  <% end %><% end %>
 
-  <%= form_for [main_app, curation_concern],
+  <% if !@version_list.empty? %><%= form_for [main_app, curation_concern],
                html: { class: 'edit_file_set_previous_version nav-safety' } do |f| %>
     <h3><%= t('.restore') %></h3>
     <% @version_list.each do |version| %>
@@ -68,7 +68,7 @@
                  type: 'submit' do %>
       <%= t('.save') %>
     <% end %>
-  <% end %>
+  <% end %><% end %>
 
   <%= render 'hyrax/uploads/js_templates_versioning' %>
 

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

@@ -2,8 +2,8 @@
   <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <audio controls="controls" class="audiojs" style="width:100%" controlsList="nodownload" preload="auto">
-        <source src="<%= hyrax.download_path(file_set, file: 'ogg') %>" type="audio/ogg" />
-        <source src="<%= hyrax.download_path(file_set, file: 'mp3') %>" type="audio/mpeg" />
+        <source src="<%= hyrax.download_path(file_set, file: 'ogg', mime_type: 'audio/ogg') %>" type="audio/ogg" />
+        <source src="<%= hyrax.download_path(file_set, file: 'mp3', mime_type: 'audio/mpeg') %>" type="audio/mpeg" />
         <%= t('hyrax.file_set.show.downloadable_content.audio_tag_not_supported') %>
       </audio>
       <%= link_to t('hyrax.file_set.show.downloadable_content.audio_link'),
@@ -15,8 +15,8 @@
 <% else %>
     <div>
       <audio controls="controls" class="audiojs" style="width:100%" controlsList="nodownload" preload="auto">
-        <source src="<%= hyrax.download_path(file_set, file: 'ogg') %>" type="audio/ogg" />
-        <source src="<%= hyrax.download_path(file_set, file: 'mp3') %>" type="audio/mpeg" />
+        <source src="<%= hyrax.download_path(file_set, file: 'ogg', mime_type: 'audio/ogg') %>" type="audio/ogg" />
+        <source src="<%= hyrax.download_path(file_set, file: 'mp3', mime_type: 'audio/mpeg') %>" type="audio/mpeg" />
         <%= t('hyrax.file_set.show.downloadable_content.audio_tag_not_supported') %>
       </audio>
     </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, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
+      data: { label: file_set.id.to_s, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
       target: "_new" %>
   <% end %>
 </div>

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

@@ -2,8 +2,8 @@
   <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <video controls="controls" class="video-js vjs-default-skin" style="width:100%" data-setup="{}" controlsList="nodownload" preload="auto">
-        <source src="<%= hyrax.download_path(file_set, file: 'webm') %>" type="video/webm" />
-        <source src="<%= hyrax.download_path(file_set, file: 'mp4') %>" type="video/mp4" />
+        <source src="<%= hyrax.download_path(file_set, file: 'webm', mime_type: 'video/webm') %>" type="video/webm" />
+        <source src="<%= hyrax.download_path(file_set, file: 'mp4', mime_type: 'video/mp4') %>" type="video/mp4" />
         <%= t('hyrax.file_set.show.downloadable_content.video_tag_not_supported') %>
       </video>
       <%= link_to t('hyrax.file_set.show.downloadable_content.video_link'),