hyrax 2.1.0 → 2.2.0

data/app/search_builders/hyrax/my/works_search_builder.rb

@@ -7,7 +7,8 @@ module Hyrax
     # We remove the access controls filter, because some of the works a user has
     # deposited may have gone through a workflow which has removed their ability
     # to edit the work.
-    self.default_processor_chain -= [:add_access_controls_to_solr_params]
+    # We remove the active works filter, so a depositor can see submitted works in any state.
+    self.default_processor_chain -= [:only_active_works, :add_access_controls_to_solr_params]
 
     def only_works?
       true

data/app/services/hyrax/collection_size_service.rb

@@ -1,5 +1,10 @@
 # returns a list of solr documents for collections the item is a part of
 module Hyrax
+  ##
+  # @deprecated This class is broken for base Hyrax applications. Current users
+  #   should call with extreme caution and consider a local implementation as
+  #   an alternative.
+  # @see https://github.com/samvera/hyrax/issues/2801
   class CollectionSizeService
     include Blacklight::Configurable
     include Blacklight::SearchHelper
@@ -13,6 +18,13 @@ module Hyrax
     end
 
     def initialize(collection)
+      Deprecation
+        .warn(self, 'CollectionSizeService has been deprecated for removal in ' \
+                    'Hyrax 3.0. This class is broken for base Hyrax ' \
+                    'applications. Current users should call with extreme ' \
+                    'caution and consider a local implementation as an ' \
+                    'alternative.')
+
       @collection = collection
     end
 

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

@@ -166,8 +166,8 @@ module Hyrax
         child_depth = NestingAttributes.new(id: child.id, scope: scope).depth
         nesting_depth = descendant_depth - child_depth + 1
 
-        return nesting_depth if nesting_depth > 0 # this should always be > 0, but just being safe
-        1
+        # this should always be positive, but just being safe
+        nesting_depth.positive? ? nesting_depth : 1
       end
       private_class_method :child_nesting_depth
 

data/app/services/hyrax/graph_exporter.rb

@@ -51,6 +51,8 @@ module Hyrax
       end
 
       def subresource_replacer(resource_id, parent_klass)
+        return subject_replacer(parent_klass, resource_id) unless resource_id.include?('/')
+
         parent_id, local = resource_id.split('/', 2)
 
         if @visited_subresources.add?(resource_id)
@@ -73,7 +75,10 @@ module Hyrax
                     end
         routes = Rails.application.routes.url_helpers
         builder = ActionDispatch::Routing::PolymorphicRoutes::HelperMethodBuilder
-        builder.polymorphic_method routes, route_key, nil, :url, id: resource_id, host: hostname, anchor: anchor
+        resource_id = RDF::URI(resource_id)
+        new_uri = RDF::URI(builder.polymorphic_method(routes, route_key, nil, :url, id: resource_id.path, host: hostname, anchor: anchor))
+        new_uri.fragment = resource_id.fragment
+        new_uri
       end
 
       def object_replacer(id, _graph)

data/app/services/hyrax/license_service.rb

@@ -1,16 +1,8 @@
 module Hyrax
   # Provide select options for the license (dcterms:rights) field
   class LicenseService < QaSelectService
-    def initialize
+    def initialize(_authority_name = nil)
       super('licenses')
     end
-
-    def include_current_value(value, _index, render_options, html_options)
-      unless value.blank? || active?(value)
-        html_options[:class] << ' force-select'
-        render_options += [[label(value), value]]
-      end
-      [render_options, html_options]
-    end
   end
 end

data/app/services/hyrax/qa_select_service.rb

@@ -8,16 +8,23 @@ module Hyrax
       @authority = Qa::Authorities::Local.subauthority_for(authority_name)
     end
 
+    ##
+    # @return [Array<String, #to_s>]
     def select_all_options
       authority.all.map do |element|
         [element[:label], element[:id]]
       end
     end
 
+    # @return [Array<String, #to_s>]
     def select_active_options
       active_elements.map { |e| [e[:label], e[:id]] }
     end
 
+    ##
+    # @return [Boolean] whether the key is active
+    #
+    # @raise [KeyError] when the key has no `active:` status
     def active?(id)
       authority.find(id).fetch('active')
     end
@@ -35,8 +42,29 @@ module Hyrax
       authority.find(id).fetch('term', &block)
     end
 
+    ##
+    # @return [Enumerable<Hash>]
+    #
+    # @raise [KeyError] when no 'term' value is present for the id
     def active_elements
       authority.all.select { |e| e.fetch('active') }
     end
+
+    ##
+    # A helper for adding the current value to a form dropdown when
+    # @note this was extracted from LicenseService for more general use.
+    #
+    # @todo find a better home for this! This was initially inlined to the
+    #   service from a helper module in
+    #   https://github.com/samvera/curation_concerns/pull/986. It seems odd
+    #   that this service knows about HTML rendering details. Maybe a factory
+    #   is an appropriate next step?
+    def include_current_value(value, _index, render_options, html_options)
+      unless value.blank? || active?(value)
+        html_options[:class] << ' force-select'
+        render_options += [[label(value) { value }, value]]
+      end
+      [render_options, html_options]
+    end
   end
 end

data/app/services/hyrax/rights_statement_service.rb

@@ -1,7 +1,7 @@
 module Hyrax
   # Provide select options for the copyright status (edm:rights) field
   class RightsStatementService < QaSelectService
-    def initialize
+    def initialize(_authority_name = nil)
       super('rights_statements')
     end
   end

data/app/services/hyrax/tolerant_select_service.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+module Hyrax
+  ##
+  # A more tolerant `QaSelectService`. This service treats terms with no
+  # `active:` property as active terms, instead of erroring with `eKeyError`.
+  class TolerantSelectService < QaSelectService
+    ##
+    # @return [Boolean] indicates whether the term is active;
+    #   false if the term is inactive or does not exist; defaults to true when
+    #   no key is given
+    def active?(id)
+      authority.find(id)&.fetch('active', true)
+    end
+
+    ##
+    # @return [Enumerable<Hash>]
+    #
+    # @raise [KeyError] when no 'term' value is present for the id
+    def active_elements
+      authority.all.select { |e| e.fetch('active', true) }
+    end
+  end
+end

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

@@ -149,7 +149,7 @@ module Hyrax
       def authorized_for_processing?(user:, entity:, action:)
         action_name = PowerConverter.convert_to_sipity_action_name(action)
         scope_permitted_workflow_actions_available_for_current_state(user: user, entity: entity)
-          .where(Sipity::WorkflowAction.arel_table[:name].eq(action_name)).count > 0
+          .find_by(Sipity::WorkflowAction.arel_table[:name].eq(action_name)).present?
       end
 
       # @api public

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

@@ -66,7 +66,7 @@ module Hyrax
           workflow.workflow_states.each do |state|
             next if new_state_names.include?(state.name)
             states_to_remove << state
-            states_that_cannot_be_destroyed << state if state.entities.count > 0 # Choosing count so we pre-warm the query
+            states_that_cannot_be_destroyed << state if state.entities.count.positive? # Choosing count so we pre-warm the query
           end
           if states_that_cannot_be_destroyed.any?
             exception_message = "Cannot delete one or more states because they have one or more entities associated with them."

data/app/strategies/hyrax/strategies/yaml_strategy.rb

@@ -28,7 +28,7 @@ module Hyrax::Strategies
     private
 
       def key_exists?(feature)
-        yaml_file[feature.to_s] && yaml_file[feature.to_s].key?("enabled")
+        yaml_file[feature.to_s]&.key?("enabled")
       end
 
       def yaml_file

data/app/views/_logo.html.erb

@@ -1,4 +1,4 @@
 <a id="logo" class="navbar-brand" href="<%= hyrax.root_path %>" data-no-turbolink="true">
-  <span class="glyphicon glyphicon-globe"></span>
+  <span class="glyphicon glyphicon-globe" role="img" aria-label="<%= application_name %>"></span>
   <span class="institution_name"><%= application_name %></span>
 </a>

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

@@ -11,7 +11,7 @@
         <%= t('hyrax.search.button.html') %>
       </button>
       <% if current_user %>
-        <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
+        <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
           <span data-search-element="label"><%= t("hyrax.search.form.option.all.label_long", application_name: application_name) %></span>
           <span class="caret"></span>
         </button>

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

@@ -34,7 +34,7 @@
              <tr>
                <td><%= collection_type.title %></td>
                <td>
-                 <%= link_to hyrax.edit_admin_collection_type_path(collection_type), class: 'btn btn-primary btn-sm', data: { turbolinks: false } do %>
+                 <%= link_to hyrax.edit_admin_collection_type_path(collection_type), class: 'btn btn-primary btn-sm' do %>
                   <%= t('helpers.action.edit') %>
                  <% end %>
                  <% unless collection_type.admin_set? || collection_type.user_collection? %>

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

@@ -26,15 +26,17 @@
         <h2 class="panel-title h2"><%= t('.current_roles') %></h3>
       </div>
       <div class="panel-body">
-        <table class="table table-striped">
+        <table class="table table-striped datatable">
           <thead>
+            <th><%= t('.header.name') %></th>
             <th><%= t('.header.user') %></th>
             <th><%= t('.header.roles') %></th>
           </thead>
           <tbody>
           <% @presenter.users.each do |user| %>
             <tr>
-              <td><%= user.user_key %></td>
+              <td data-sort="<%= user.name %>"><%= user.name %></td>
+              <td data-sort="<%= user.user_key %>"><%= user.user_key %></td>
               <% agent_presenter = @presenter.presenter_for(user) %>
               <% if agent_presenter && agent_presenter.responsibilities_present? %>
                 <td>

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

@@ -34,7 +34,7 @@
                           <%= link_to document, [main_app, document] %>
                         </td>
                         <td>
-                          <%= document.depositor %>
+                          <%= safe_join(document.creator, tag(:br)) %>
                         </td>
                         <td>
                           <%= document.date_modified %>

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

@@ -13,17 +13,17 @@
           <div class="row">
             <div class="col-xs-12">
                 <!-- The fileinput-button span is used to style the file input field as button -->
-                <span id="addfiles" class="btn btn-success fileinput-button">
+                <button id="addfiles" class="btn btn-success fileinput-button">
                     <span class="glyphicon glyphicon-plus"></span>
                     <span>Add files...</span>
-                    <input type="file" name="files[]" multiple />
-                </span>
+                    <input type="file" name="files[]" tabindex="-1" aria-hidden="true" multiple />
+                </button>
                 <!-- The fileinput-button span is used to style the file input field as button -->
-                <span id="addfolder" class="btn btn-success fileinput-button">
+                <button id="addfolder" class="btn btn-success fileinput-button">
                     <span class="glyphicon glyphicon-plus"></span>
                     <span>Add folder...</span>
-                    <input type="file" name="files[]" multiple directory webkitdirectory />
-                </span>
+                    <input type="file" name="files[]" tabindex="-1" aria-hidden="true" multiple directory webkitdirectory />
+                </button>
                 <% if Hyrax.config.browse_everything? %>
                   <%= button_tag(type: 'button', class: 'btn btn-success', id: "browse-btn",
                     'data-toggle' => 'browse-everything', 'data-route' => browse_everything_engine.root_path,
@@ -32,7 +32,7 @@
                     <%= t('hyrax.upload.browse_everything.browse_files_button') %>
                   <% end %>
                 <% end %>
-                <button type="reset" class="btn btn-warning cancel hidden">
+                <button type="reset" id="file-upload-cancel-btn" class="btn btn-warning cancel hidden">
                     <span class="glyphicon glyphicon-ban-circle"></span>
                     <span>Cancel upload</span>
                 </button>

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

@@ -11,7 +11,7 @@
           <% if Hyrax.config.work_requires_files? %>
             <li class="incomplete" id="required-files"><%= t('.required_files') %></li>
           <% end %>
-          <% if Flipflop.active_deposit_agreement_acceptance? %>
+          <% if Flipflop.show_deposit_agreement? && Flipflop.active_deposit_agreement_acceptance? %>
             <li class="incomplete" id="required-agreement"><%= t('.required_agreement') %></li>
           <% end %>
         </ul>
@@ -45,13 +45,18 @@
       <% end %>
     <% end %>
     <br />
-    <% cancel_path = f.object.persisted? ? polymorphic_path([main_app, f.object]) : hyrax.my_works_path %>
-    <%= link_to t(:'helpers.action.cancel'),
-                cancel_path,
-                class: 'btn btn-default' %>
     <%# TODO: If we start using ActionCable, we could listen for object updates and
               alert the user that the object has changed by someone else %>
     <%= f.input Hyrax::Actors::OptimisticLockValidator.version_field, as: :hidden if f.object.persisted? %>
     <%= f.submit class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "with_files_submit", name: "save_with_files" %>
   </div>
+
+  <%# Provide immediate feedback after the form is submitted while the subsequent page is loading %>
+  <div class="panel-footer hidden">
+    <div class="progress">
+      <div class="progress-bar progress-bar-striped progress-bar-complete active">
+        <span id="form-feedback" aria-live="assertive">Saving your work. This may take a few moments</span>
+      </div>
+    </div>
+  </div>
 </aside>

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

@@ -1,14 +1,6 @@
-<p>You may grant &quot;View/Download&quot; or &quot;Edit&quot; access for specific users and/or groups to files.
-  Enter a valid <%= t('hyrax.account_name') %>, one at a time, select the access level for that user and click
-  <button class='btn btn-xs btn-inverse' onclick='return false;'><i class='glyphicon glyphicon-plus'></i>Add</button>.
-</p>
-
+<p><%= t('.share_with_html', account_name: t('hyrax.account_name')) %></p>
 <%= render 'hyrax/file_sets/groups_description' %>
-
-<h5><b>Permission Definitions</b></h5>
+<h5><b><%= t('.definition_heading') %></b></h5>
 <p>
-  <strong>View/Download:</strong> this file (both contents and metadata) is accessible from within
-  <%= application_name %>.<br />
-  <strong>Edit:</strong> this file (both contents and metadata) can be edited. You may only grant
-  this permission to <%= institution_name %> users and/or groups.
+  <%= t('.definitions_html', application_name: application_name, institution_name: institution_name) %>
 </p>

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

@@ -1,6 +1,6 @@
 <div class="show-actions">
   <% if Hyrax.config.analytics? %>
-    <%= link_to "Analytics", presenter.stats_path, id: 'stats', class: 'btn btn-default', data: { turbolinks: false } %>
+    <%= link_to "Analytics", presenter.stats_path, id: 'stats', class: 'btn btn-default' %>
   <% end %>
   <% if presenter.editor? %>
       <%= link_to "Edit", edit_polymorphic_path([main_app, presenter]), class: 'btn btn-default' %>
@@ -44,5 +44,3 @@
   <span class="Z3988" title="<%= export_as_openurl_ctx_kev(presenter) %>"></span>
 <!-- Render Modals -->
   <%= render 'hyrax/dashboard/collections/form_for_select_collection', user_collections: @user_collections %>
-
-

data/app/views/hyrax/batch_edits/_check_all.html.erb

@@ -1,9 +1,17 @@
 <div class="dropdown batch_document_selector_all">
-  <%= check_box_tag 'check_all', 'yes', @all_checked, disabled: @disable_select_all %>
-  <% if !@disable_select_all %>
-    <a class="dropdown-toggle" data-toggle="dropdown" href="#"><span class="sr-only">Select to access selection options</span><span class="caret"></span></a>
-    <ul class="dropdown-menu">
-      <%= render "batch_edits_actions" %>
-    </ul>
-  <% end %>
+  <label class="centerizer">
+    <%= check_box_tag 'check_all', 'yes', @all_checked, disabled: @disable_select_all %>
+    <span class="works-list-batch-checkbox-label-text">
+      <%= t("hyrax.dashboard.my.action.select") %>
+    </span>
+    <% if !@disable_select_all %>
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        <span class="sr-only">Select to access selection options</span>
+        <span class="caret"></span>
+      </a>
+      <ul class="dropdown-menu">
+        <%= render "batch_edits_actions" %>
+      </ul>
+    <% end %>
+  </label>
 </div>

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

@@ -37,7 +37,7 @@
   <td colspan="6">
     <dl class="expanded-details row">
       <dt class="col-xs-3 col-lg-2"><%= t("hyrax.dashboard.my.collection_list.description") %></dt>
-      <dd class="col-xs-9 col-lg-10"><%= collection_presenter.description.first %></dd>
+      <dd class="col-xs-9 col-lg-10"><%= collection_presenter.description&.first %></dd>
       <dt class="col-xs-3 col-lg-2"><%= t("hyrax.dashboard.my.collection_list.edit_access") %></dt>
       <dd class="col-xs-9 col-lg-10">
       <% if collection_presenter.edit_groups.present? %>

data/app/views/hyrax/dashboard/_index_partials/_transfers.html.erb

@@ -3,7 +3,7 @@
     <h4><%= t("hyrax.dashboard.transfers_sent") %></h4>
   </div>
   <div class="col-xs-12 col-sm-3 transfer_link">
-    <%= link_to hyrax.my_works_path, data: { turbolinks: false } do %>
+    <%= link_to hyrax.my_works_path do %>
         <%= t("hyrax.dashboard.transfer_works_link") %>
     <% end %>
   </div>

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

@@ -3,8 +3,13 @@
   <thead>
   <tr>
     <th class="check-all">
-      <label for="check_all" class="sr-only"><%= t("hyrax.dashboard.my.sr.check_all_label") %></label>
-      <input type="checkbox" name="check_all" id="check_all" value="yes" />
+      <label for="check_all" class="sr-only"
+        ><%= t("hyrax.dashboard.my.sr.check_all_label") %>
+      </label>
+      <label class="centerizer">
+        <input type="checkbox" class="check-all-checkbox" name="check_all" id="check_all" value="yes" />
+        <%= t("hyrax.dashboard.my.action.select") %>
+      </label>
     </th>
     <th><%= t("hyrax.dashboard.my.heading.title") %></th>
     <% if !current_ability.admin? %>

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

@@ -3,6 +3,5 @@
   <%= link_to t('hyrax.collection.actions.add_existing_works.label'),
               hyrax.my_works_path(add_works_to_collection: @form.id),
               title: t('hyrax.collection.actions.add_existing_works.desc'),
-              class: 'btn btn-default',
-              data: { turbolinks: false } %>
+              class: 'btn btn-default' %>
 </div>

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

@@ -97,7 +97,7 @@
 
       <div class="panel-footer">
         <% if @collection.persisted? %>
-          <%= f.submit t(:'hyrax.collection.select_form.update'), class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "update_submit", name: "update_collection", data: { turbolinks: false } %>
+          <%= f.submit t(:'hyrax.collection.select_form.update'), class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "update_submit", name: "update_collection" %>
           <%= link_to t(:'helpers.action.cancel'), hyrax.dashboard_collection_path(@collection), class: 'btn btn-link' %>
         <% else %>
           <%= f.submit t(:'hyrax.collection.select_form.create'), class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "create_submit", name: "create_collection" %>

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

@@ -13,11 +13,11 @@
     <div class="row fileupload-buttonbar">
       <div class="col-xs-4">
         <!-- The fileinput-button span is used to style the file input field as button -->
-        <span class="btn btn-success fileinput-button">
+        <button class="btn btn-success fileinput-button">
           <span class="glyphicon glyphicon-plus"></span>
           <span>Choose File</span>
-          <input type="file" name="files[]" single />
-        </span>
+          <input type="file" name="files[]" tabindex="-1" aria-hidden="true" single />
+        </button>
       </div> <!-- end col-xs-4 -->
 
       <!-- The global progress state -->
@@ -90,11 +90,11 @@
     <div class="row fileupload-buttonbar">
       <div class="col-xs-4">
         <!-- The fileinput-button span is used to style the file input field as button -->
-        <span class="btn btn-success fileinput-button">
+        <button class="btn btn-success fileinput-button">
           <span class="glyphicon glyphicon-plus"></span>
           <span>Choose File</span>
-          <input type="file" name="files[]" single />
-        </span>
+          <input type="file" name="files[]" tabindex="-1" aria-hidden="true" single />
+        </button>
       </div> <!-- end col-xs-4 -->
 
       <!-- The global progress state -->