hyrax 5.0.1 → 5.0.3

data/app/services/hyrax/embargo_manager.rb

@@ -140,8 +140,9 @@ module Hyrax
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def create_or_update_embargo_on_members(members, work)
         # TODO: account for all members and levels, not just file sets. ref: #6131
-
         members.each do |member|
+          # reload member to make sure nothing in the transaction has changed it already
+          member = Hyrax.query_service.find_by(id: member.id)
           member_embargo_needs_updating = work.embargo.updated_at > member.embargo&.updated_at if member.embargo
 
           if member.embargo && member_embargo_needs_updating

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

@@ -29,8 +29,8 @@ module Hyrax
       # @param [Dry::Events::Event] event
       # @return [void]
       def on_file_uploaded(event)
-        # Run characterization for original file only
-        return unless event[:metadata]&.original_file?
+        # Run characterization for original file only and allow optional skip paramater
+        return if event.payload[:skip_derivatives] || !event[:metadata]&.original_file?
 
         ValkyrieCharacterizationJob.perform_later(event[:metadata].id.to_s)
       end

data/app/services/hyrax/lock_manager.rb

@@ -16,11 +16,11 @@ module Hyrax
 
     ##
     # Blocks until lock is acquired or timeout.
-    def lock(key)
+    def lock(key, ttl: @ttl, retry_count: @retry_count, retry_delay: @retry_delay)
       returned_from_block = nil
 
       pool.then do |conn|
-        client(conn).lock(key, @ttl) do |locked|
+        client(conn, retry_count: retry_count, retry_delay: retry_delay).lock(key, ttl) do |locked|
           raise UnableToAcquireLockError unless locked
           returned_from_block = yield
         end
@@ -31,16 +31,16 @@ module Hyrax
       Hyrax.logger.error(err.message)
       raise(ConnectionPool::TimeoutError,
             "Failed to acquire a lock from Redlock due to a Redis connection " \
-            "timeout: #{err}. If you are using Redis via `ConnectionPool` " \
-            "you may wish to increase the pool size.")
+              "timeout: #{err}. If you are using Redis via `ConnectionPool` " \
+              "you may wish to increase the pool size.")
     end
 
     private
 
     ##
     # @api_private
-    def client(conn)
-      Redlock::Client.new([conn], retry_count: @retry_count, retry_delay: @retry_delay)
+    def client(conn, retry_count:, retry_delay:)
+      Redlock::Client.new([conn], retry_count: retry_count, retry_delay: retry_delay)
     end
 
     ##

data/app/services/hyrax/lockable.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+require 'forwardable'
+
 module Hyrax
   module Lockable
+    extend Forwardable
     extend ActiveSupport::Concern
 
-    def acquire_lock_for(lock_key, &block)
-      lock_manager.lock(lock_key, &block)
-    end
+    def_delegator :lock_manager, :lock, :acquire_lock_for
 
     def lock_manager
       @lock_manager ||= LockManager.new(

data/app/services/hyrax/simple_schema_loader.rb

@@ -158,7 +158,7 @@ module Hyrax
     end
 
     def config_search_paths
-      [Rails.root, Hyrax::Engine.root]
+      Hyrax.config.simple_schema_loader_config_search_paths
     end
 
     def metadata_files

data/app/services/hyrax/solr_service.rb

@@ -54,7 +54,7 @@ module Hyrax
       end
 
       delegate :add, :commit, :count, :delete, :get, :instance, :ping, :post,
-               :query, :query_result, :delete_by_query, :search_by_id, :wipe!, to: :new
+               :query, :query_result, :query_in_batches, :delete_by_query, :search_by_id, :wipe!, to: :new
     end
 
     # Wraps rsolr get
@@ -111,6 +111,20 @@ module Hyrax
       end
     end
 
+    def query_in_batches(query, **args)
+      args[:rows] ||= 500
+      args[:start] ||= 0
+      loop do
+        result = query_result(query, **args)
+        break if result['response']['docs'].blank? || result['response']['numFound'] <= args[:start]
+        result['response']['docs'].select do |doc|
+          yield ::SolrHit.new(doc)
+          nil
+        end
+        args[:start] += args[:rows]
+      end
+    end
+
     # Wraps rsolr :delete_by_query
     def delete_by_query(query, **args)
       connection.delete_by_query(query, params: args)
@@ -149,6 +163,13 @@ module Hyrax
       result.first
     end
 
+    ##
+    # @api private
+    def connection
+      return self.class.instance.conn unless use_valkyrie
+      valkyrie_index.connection
+    end
+
     private
 
     ##
@@ -163,13 +184,6 @@ module Hyrax
       Hyrax.index_adapter
     end
 
-    ##
-    # @api private
-    def connection
-      return self.class.instance.conn unless use_valkyrie
-      valkyrie_index.connection
-    end
-
     def rows_warning
       "Calling Hyrax::SolrService.get without passing an explicit value for ':rows' is not recommended. You will end up with Solr's default (usually set to 10)\nCalled by #{caller[0]}"
     end

data/app/services/hyrax/statistics/query_service.rb

@@ -45,7 +45,7 @@ module Hyrax
       delegate :count, to: :relation
 
       def relation
-        Hyrax::WorkRelation.new
+        Hyrax.config.disable_wings ? Hyrax::ValkyrieWorkRelation.new : Hyrax::WorkRelation.new
       end
 
       private

data/app/services/hyrax/statistics/works/over_time.rb

@@ -16,7 +16,7 @@ module Hyrax
         private
 
         def relation
-          Hyrax::WorkRelation.new
+          Hyrax.config.disable_wings ? Hyrax::ValkyrieWorkRelation.new : Hyrax::WorkRelation.new
         end
       end
     end

data/app/services/hyrax/thumbnail_path_service.rb

@@ -31,6 +31,8 @@ module Hyrax
         return object if object.thumbnail_id == object.id ||
                          object.try(:file_ids)&.detect { |fid| fid == object.thumbnail_id }
         begin
+          # In some implmentations (e.g. Wings), `find_by(id:)` aliases
+          # `find_by_alternate_identifier`  but that is not guaranteed.
           return Hyrax.query_service.find_by(id: object.thumbnail_id)
         rescue
           nil

data/app/services/hyrax/user_stat_importer.rb

@@ -61,7 +61,7 @@ module Hyrax
 
     def process_works(stats, user, start_date)
       work_ids_for_user(user).each do |work_id|
-        work = Hyrax::WorkRelation.new.find(work_id)
+        work = Hyrax.query_service.find_by(id: work_id)
         work_stats = extract_stats_for(object: work, from: WorkViewStat, start_date: start_date, user: user)
         stats = tally_results(work_stats, :work_views, stats) if work_stats.present?
         delay
@@ -94,7 +94,7 @@ module Hyrax
       if last_cached_stat
         last_cached_stat.date + 1.day
       else
-        Hyrax.config.analytic_start_date
+        Hyrax.config.analytic_start_date || 1.week.ago
       end
     end
 
@@ -108,8 +108,8 @@ module Hyrax
 
     def work_ids_for_user(user)
       ids = []
-      Hyrax::WorkRelation.new.search_in_batches("#{depositor_field}:\"#{user.user_key}\"", fl: "id") do |group|
-        ids.concat group.map { |doc| doc["id"] }
+      Hyrax::SolrService.query_in_batches("#{depositor_field}:\"#{user.user_key}\"", fl: "id") do |hit|
+        ids << hit.id
       end
       ids
     end
@@ -124,7 +124,7 @@ module Hyrax
 
         date_key = stats.date.to_s
         old_count = total_stats[date_key] ? total_stats[date_key].fetch(stat_name) { 0 } : 0
-        new_count = old_count + stats.method(stat_name).call
+        new_count = old_count + stats.method(stat_name).call.to_i
 
         old_values = total_stats[date_key] || {}
         total_stats.store(date_key, old_values)

data/app/services/hyrax/valkyrie_upload.rb

@@ -18,10 +18,12 @@ class Hyrax::ValkyrieUpload
     io:,
     storage_adapter: Hyrax.storage_adapter,
     use: Hyrax::FileMetadata::Use::ORIGINAL_FILE,
-    user: nil
+    user: nil,
+    mime_type: nil,
+    skip_derivatives: false
   )
     new(storage_adapter: storage_adapter)
-      .upload(filename: filename, file_set: file_set, io: io, use: use, user: user)
+      .upload(filename: filename, file_set: file_set, io: io, use: use, user: user, mime_type: mime_type, skip_derivatives: skip_derivatives)
   end
 
   ##
@@ -36,13 +38,13 @@ class Hyrax::ValkyrieUpload
     @file_set_file_service = file_set_file_service
   end
 
-  def upload(filename:, file_set:, io:, use: Hyrax::FileMetadata::Use::ORIGINAL_FILE, user: nil, mime_type: nil) # rubocop:disable Metrics/AbcSize
+  def upload(filename:, file_set:, io:, use: Hyrax::FileMetadata::Use::ORIGINAL_FILE, user: nil, mime_type: nil, skip_derivatives: false) # 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.pcdm_use = Array(use)
+    file_metadata.recorded_size = Array(io.size)
     file_metadata.mime_type = mime_type if mime_type
     file_metadata.original_filename = File.basename(filename).to_s || File.basename(io)
 
@@ -62,8 +64,8 @@ class Hyrax::ValkyrieUpload
                          file_metadata: saved_metadata,
                          user: user)
 
-    Hyrax.publisher.publish("file.uploaded", metadata: saved_metadata)
-    Hyrax.publisher.publish('file.metadata.updated', metadata: saved_metadata, user: user)
+    Hyrax.publisher.publish("file.uploaded", metadata: saved_metadata, skip_derivatives: skip_derivatives)
+    Hyrax.publisher.publish('file.metadata.updated', metadata: saved_metadata, user: user, skip_derivatices: skip_derivatives)
 
     saved_metadata
   end

data/app/services/hyrax/versioning_service.rb

@@ -20,8 +20,16 @@ module Hyrax
 
     ##
     # @param resource [ActiveFedora::File | Hyrax::FileMetadata | NilClass]
-    def initialize(resource:, storage_adapter: Hyrax.storage_adapter)
-      @storage_adapter = storage_adapter
+    def initialize(resource:, storage_adapter: nil)
+      @storage_adapter = if storage_adapter.nil?
+                           if resource.respond_to?(:file_identifier)
+                             Valkyrie::StorageAdapter.adapter_for(id: resource.file_identifier)
+                           else
+                             Hyrax.storage_adapter
+                           end
+                         else
+                           storage_adapter
+                         end
       self.resource = resource
     end
 

data/app/services/hyrax/work_query_service.rb

@@ -3,7 +3,7 @@ module Hyrax
   # Responsible for retrieving information based on the given work.
   #
   # @see ProxyDepositRequest
-  # @see Hyrax::WorkRelation
+  # @see Hyrax::VaklyrieWorkRelation
   # @see SolrDocument
   # @see Hyrax::SolrService
   # @see ActiveFedora::SolrQueryBuilder
@@ -20,7 +20,7 @@ module Hyrax
     private
 
     def default_work_relation
-      Hyrax::WorkRelation.new
+      Hyrax.config.disable_wings ? Hyrax::ValkyrieWorkRelation.new : Hyrax::WorkRelation.new
     end
 
     public

data/app/services/migrate_resource_service.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+# migrates models from AF to valkyrie
+class MigrateResourceService
+  attr_accessor :resource
+  def initialize(resource:)
+    @resource = resource
+  end
+
+  def model
+    @model || Wings::ModelRegistry.lookup(resource.class).to_s
+  end
+
+  def call
+    prep_resource
+    Hyrax::Transactions::Container[model_events(model)]
+      .with_step_args(**model_steps(model)).call(resource_form)
+  end
+
+  def prep_resource
+    case model
+    when 'FileSet'
+      resource.creator << ::User.batch_user.email if resource.creator.blank?
+    end
+  end
+
+  def resource_form
+    @resource_form ||= Hyrax::Forms::ResourceForm.for(resource: resource)
+  end
+
+  def model_events(model)
+    {
+      'AdminSet' => 'admin_set_resource.update',
+      'Collection' => 'change_set.update_collection',
+      'FileSet' => 'change_set.update_file_set'
+    }[model] || 'change_set.update_work'
+  end
+
+  def model_steps(model)
+    {
+      'AdminSet' => {},
+      'Collection' => {
+        'collection_resource.save_collection_banner' => { banner_unchanged_indicator: true },
+        'collection_resource.save_collection_logo' => { logo_unchanged_indicator: true }
+      },
+      'FileSet' => {
+        'file_set.save_acl' => {}
+      }
+    }[model] || {
+      'work_resource.add_file_sets' => { uploaded_files: [], file_set_params: [] },
+      'work_resource.update_work_members' => { work_members_attributes: [] },
+      'work_resource.save_acl' => { permissions_params: [] }
+    }
+  end
+end

data/app/views/_controls.html.erb

@@ -1,12 +1,12 @@
-<nav class="navbar navbar-light bg-light navbar-expand-sm justify-content-between align-items-center px-2 py-3 border-bottom" role="navigation" aria-label="Root Menu">
+<nav class="navbar bg-light navbar-expand-sm justify-content-between align-items-center px-2 py-3 border-bottom" role="navigation" aria-label="Root Menu">
     <ul class="nav navbar-nav col-sm-5">
-      <li class="nav-item <%= 'active' if current_page?(hyrax.root_path) %>">
+      <li class="nav-item <%= 'active font-weight-bold' if current_page?(hyrax.root_path) %>">
         <%= link_to t(:'hyrax.controls.home'), hyrax.root_path, class: "nav-link", aria: current_page?(hyrax.root_path) ? {current: 'page'} : nil %></li>
-      <li class="nav-item <%= 'active' if current_page?(hyrax.about_path) %>">
+      <li class="nav-item <%= 'active font-weight-bold' if current_page?(hyrax.about_path) %>">
         <%= link_to t(:'hyrax.controls.about'), hyrax.about_path, class: "nav-link", aria: current_page?(hyrax.about_path) ? {current: 'page'} : nil %></li>
-      <li class="nav-item <%= 'active' if current_page?(hyrax.help_path) %>">
+      <li class="nav-item <%= 'active font-weight-bold' if current_page?(hyrax.help_path) %>">
         <%= link_to t(:'hyrax.controls.help'), hyrax.help_path, class: "nav-link", aria: current_page?(hyrax.help_path) ? {current: 'page'} : nil %></li>
-      <li class="nav-item <%= 'active' if current_page?(hyrax.contact_path) %>">
+      <li class="nav-item <%= 'active font-weight-bold' if current_page?(hyrax.contact_path) %>">
         <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path, class: "nav-link", aria: current_page?(hyrax.contact_path) ? {current: 'page'} : nil %></li>
     </ul><!-- /.nav -->
     <div class="col-sm-7">

data/app/views/_masthead.html.erb

@@ -1,6 +1,6 @@
 <header aria-label="header" class="top-header">
   <nav id="masthead" class="navbar navbar-expand-lg navbar-dark bg-dark justify-content-between <%= placement_class %>" role="navigation" aria-label="masthead">
-    <h1 class="sr-only"><%= application_name %></h1>
+    <h1 class="sr-only navbar-text"><%= application_name %></h1>
     <%= render '/logo' %>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#top-navbar-collapse" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>

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

@@ -20,24 +20,17 @@
             <span class="sr-only" data-search-element="label"><%= t("hyrax.search.form.option.all.label_long", application_name: application_name) %></span>
             <span aria-hidden="true"><%= t("hyrax.search.form.option.all.label_short") %></span>
           </button>
-
-          <ul class="dropdown-menu dropdown-menu-right">
-            <li class="dropdown-item">
-              <%= link_to t("hyrax.search.form.option.all.label_long", application_name: application_name), "#",
-                  data: { "search-option" => main_app.search_catalog_path, "search-label" => t("hyrax.search.form.option.all.label_short") } %>
-            </li>
-            <li class="dropdown-item">
-              <%= link_to t("hyrax.search.form.option.my_works.label_long"), "#",
-                  data: { "search-option" => hyrax.my_works_path, "search-label" => t("hyrax.search.form.option.my_works.label_short") } %>
-            </li>
-            <li class="dropdown-item">
-              <%= link_to t("hyrax.search.form.option.my_collections.label_long"), "#",
-                  data: { "search-option" => hyrax.my_collections_path, "search-label" => t("hyrax.search.form.option.my_collections.label_short") } %>
-            </li>
-          </ul>
+          <div class="dropdown-menu dropdown-menu-right">
+            <%= link_to t("hyrax.search.form.option.all.label_long", application_name: application_name), "#", class: "dropdown-item",
+                data: { "search-option" => main_app.search_catalog_path, "search-label" => t("hyrax.search.form.option.all.label_short") } %>
+            <%= link_to t("hyrax.search.form.option.my_works.label_long"), "#", class: "dropdown-item",
+                data: { "search-option" => hyrax.my_works_path, "search-label" => t("hyrax.search.form.option.my_works.label_short") } %>
+            <%= link_to t("hyrax.search.form.option.my_collections.label_long"), "#", class: "dropdown-item",
+                data: { "search-option" => hyrax.my_collections_path, "search-label" => t("hyrax.search.form.option.my_collections.label_short") } %>
+          </div>
         <% end %>
       </div><!-- /.input-group-btn -->
     </div><!-- /.input-group -->
-    
+
   </div><!-- /.form-group -->
 <% end %>

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

@@ -1,4 +1,4 @@
 <div class="col-md-3">
-  <%= document_presenter(document)&.thumbnail&.thumbnail_tag({}, { suppress_link: true }) %>
+  <%= document_presenter(document)&.thumbnail&.thumbnail_tag({ alt: document.title_or_label }, { suppress_link: true }) %>
 </div> 
 

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

@@ -1,10 +1,10 @@
 <% model = document.hydra_model %>
 <div class="col-md-3">
   <% if model == Hyrax::PcdmCollection || model < Hyrax::PcdmCollection %>
-    <%= document_presenter(document)&.thumbnail&.thumbnail_tag({}, suppress_link: true) %>
+    <%= document_presenter(document)&.thumbnail&.thumbnail_tag({ alt: document.title_or_label }, { suppress_link: true }) %>
   <% else %>
     <div class="list-thumbnail">
-      <%= document_presenter(document)&.thumbnail&.thumbnail_tag %>
+      <%= document_presenter(document)&.thumbnail&.thumbnail_tag(alt: document.title_or_label) %>
     </div>
   <% end %>
 </div>

data/app/views/hyrax/admin/analytics/collection_reports/index.html.erb

@@ -8,11 +8,11 @@
   <div class="col-sm-12">
     <div class="collection-reports">
 
-<% if Hyrax.config.analytics? %>
+<% if Hyrax.config.analytics_reporting? %>
       <div class="card">
         <div class="card-header"><%= t('.repo_summary') %> <b><%= pluralize(Collection.count, "collection") %></b>, <%= t('.repo_summary_2') %> <b><%= @pageviews.all %> <%= t('.views') %></b> <%= t('.and') %> <b><%= @downloads.all %> <%= t('.downloads') %></b>.</div>
         <div class="card-body">
-      
+
                <div class="row text-center">
                 <div class="nav nav-pills btn-group" role="group">
                     <% if params[:start_date] %>
@@ -54,7 +54,7 @@
                   <%= render "hyrax/admin/analytics/date_range_form", redirect_path: hyrax.admin_analytics_collection_reports_path %>
                   <%= render "custom_range" %></div>
               </div>
-            
+
             </div>
           </div>
           <p class="text-center"><%= t('.report_generated_on') %> <b><%= Time.current %></b>.</p>
@@ -67,4 +67,4 @@
   <% end %>
     </div>
   </div>
-</div>
+</div>

data/app/views/hyrax/admin/analytics/work_reports/index.html.erb

@@ -9,7 +9,7 @@
     <div class="work-reports">
 
     <div class="card">
-    <% if Hyrax.config.analytics? %>
+    <% if Hyrax.config.analytics_reporting? %>
       <% if current_user.ability.admin? %>
         <div class="card-header"><b><%= @works_count %> <%= t('.works') %></b> <%= t('.repo_summary') %> <b><%= @pageviews.all if @pageviews %> <%= t('.views') %></b> <%= t('.and') %> <b><%= @downloads.all if @downloads %> <%= t('.downloads') %></b>.</div>
       <% else %>

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

@@ -1,17 +1,17 @@
 <%= render "shared/nav_safety_modal" %>
 <div class="card tabs" id="collection-types-controls">
   <ul class="nav nav-tabs" role="tablist">
-    <li class="nav-item">
+    <li class="nav-item" role="presentation">
       <a href="#metadata" role="tab" data-toggle="tab" class="nav-link active nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.metadata') %></a>
     </li>
     <% if @form.persisted? %>
-      <li class="nav-item">
+      <li class="nav-item" role="presentation">
         <a href="#settings" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.settings') %></a>
       </li>
-      <li class="nav-item">
+      <li class="nav-item" role="presentation">
         <a href="#participants" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.participants') %></a>
       </li>
-      <li class="nav-item">
+      <li class="nav-item" role="presentation">
         <a href="#appearance" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.appearance') %></a>
       </li>
     <% end %>

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

@@ -41,7 +41,7 @@
                   <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 }) %>"
-                          data-has-collections="<%= collection_type.collections.any? %>">
+                          data-has-collections="<%= collection_type.collections? %>">
                     <%= t('helpers.action.delete') %>
                   </button>
                   <% end %>

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

@@ -9,7 +9,7 @@
           <table class="table table-striped">
             <thead>
               <tr>
-                <th></th>
+                <th>Status</th>
                 <th class="name"><%= t('.feature') %></th>
                 <th class="description"><%= t('.description') %></th>
                 <th class="action"><%= t('.action') %></th>

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

@@ -1,6 +1,6 @@
   <div class="actions card">
     <div class="d-flex">
-      <%= button_tag t('.save'), class: "btn btn-primary disabled mr-2", data: { action: "save-actions" } %>
+      <%= button_tag t('.save'), class: "btn btn-primary disabled mr-2", data: { action: "save-actions" }, 'aria-disabled': true %>
       <%= button_tag t('.sort_alphabetically'), class: "btn btn-primary ", data: { action: "alpha-sort-action" } %>
     </div>
   </div>

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

@@ -3,7 +3,8 @@
       <%= simple_form_for [main_app, node], remote: true, html: {'data-type': 'json'} do |f| %>
         <div class="card-header">
           <div class="order-title">
-            <%= f.input :title, as: :string, input_html: { name: "#{f.object.model_name.singular}[title][]", class: "title" }, value: node.to_s, label: false, hint: false %>
+            <label class="sr-only" id='<%= "edit_#{f.object.model_name.singular}_title" %>'>Edit title</label>
+            <%= f.input :title, as: :string, input_html: { name: "#{f.object.model_name.singular}[title][]", class: "title", 'aria-labelledby': "edit_#{f.object.model_name.singular}_title" }, value: node.to_s, label: false, hint: false %>
           </div>
           <div class="file-set-link float-right">
             <%= link_to contextual_path(node, @presenter), title: "Edit file" do %>
@@ -11,9 +12,11 @@
             <% end %>
           </div>
           <% if node.respond_to?(:label) %>
-            <div class="order-filename">
-              <em title="<%= node.page_title %>">(<%= truncate(node.label, length: 29) %>)</em>
-            </div>
+            <% unless node.label.nil? %>
+              <div class="order-filename" >
+                <em title="<%= node.page_title %>">(<%= truncate(node.label, length: 29) %>)</em>
+              </div>
+            <% end %>
           <% end %>
         </div>
         <div class="card-body">

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

@@ -1 +1 @@
-<%= document_presenter(node)&.thumbnail&.thumbnail_tag({ class: 'thumbnail-inner mw-100' }, {}) %>
+<%= document_presenter(node)&.thumbnail&.thumbnail_tag({ class: 'thumbnail-inner mw-100', 'alt': "Thumbnail image for #{node.title[0]}" }, {}) %>

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

@@ -1,4 +1,4 @@
-<%= render "base_form_files_prepend", locals: { f: f } %>
+<%= render partial: "base_form_files_prepend", locals: { f: f } %>
 <div id="fileupload">
   <!-- Redirect browsers with JavaScript disabled to the origin page -->
   <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>" /></noscript>

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

@@ -33,6 +33,10 @@ HTML Properties:
     </tr>
     </thead>
     <tbody>
+      <tr class="sr-only">
+        <td>This table will only display data if works are assigned to collections</td>
+        <td><span></span></td>
+      </tr>
     </tbody>
   </table>
 </div>

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

@@ -17,7 +17,7 @@
             class: presenter.display_unfeature_link? ? 'btn btn-secondary' : 'btn btn-secondary collapse' %>
       <% end %>
     <% end %>
-    <% if Hyrax.config.analytics? %>
+    <% if Hyrax.config.analytics_reporting? %>
       <% # turbolinks needs to be turned off or the page will use the cache and the %>
       <% # analytics graph will not show unless the page is refreshed. %>
       <%= link_to t('.analytics'), presenter.stats_path, id: 'stats', class: 'btn btn-secondary', data: { turbolinks: false } %>
@@ -34,13 +34,12 @@
         <div class="btn-group">
           <button type="button" class="btn btn-secondary dropdown-toggle" type="button" id="dropdown-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <%= t('.attach_child') %>
-            <ul class="dropdown-menu">
-              <% presenter.valid_child_concerns.each do |concern| %>
-                <li class="dropdown-item">
-                  <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular.to_sym], parent_id: presenter.id) %>
-                </li>
-              <% end %>
-            </ul>
+          </button>
+          <div class="dropdown-menu">
+            <% presenter.valid_child_concerns.each do |concern| %>
+              <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular.to_sym], parent_id: presenter.id), class: "dropdown-item" %>
+            <% end %>
+          </div>
         </div>
       <% end %>
       <%= link_to t('.delete'), [main_app, presenter], class: 'btn btn-danger', data: { confirm: t('.confirm_delete', work_type: presenter.human_readable_type) }, method: :delete %>

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

@@ -38,7 +38,7 @@
           data: { behavior: 'unfeature' },
           class: presenter.display_feature_link? ? 'btn btn-secondary collapse' : 'btn btn-secondary' %>
     <% end %>
-    <% if Hyrax.config.analytics? %>
+    <% if Hyrax.config.analytics_reporting? %>
       <%= link_to t(".analytics"), presenter.stats_path, id: 'stats', class: 'btn btn-secondary' %>
     <% end %>
   </div>

data/app/views/hyrax/batch_select/_add_button.html.erb

@@ -1,3 +1,3 @@
 <div data-behavior="batch-add-button">
-  <%= check_box_tag "batch_document_ids[]", document.id, false, class:"batch_document_selector", id: "batch_document_#{document.id}", checks: "active" %>
+  <%= check_box_tag "batch_document_ids[]", document.id, false, class:"batch_document_selector", id: "batch_document_#{document.id}", checks: "active", 'aria-labelledby': "batch_document_#{document.id}" %>
 </div>