hyrax 3.3.0 → 3.4.2

data/app/utils/hyrax/test_data_seeders/collection_seeder.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+module Hyrax
+  module TestDataSeeders
+    # This class was created for use in rake tasks and db/seeds.rb.  It generates
+    # collection that can be used in release testing.  This data can also be helpful
+    # for local development testing.
+    #
+    # Adding collections is non-destructive.  But it may create an additional
+    # collection of the same.
+    #
+    # @todo Do we want to assume that if a collection of the same name exists, then
+    #   it is the collection we want for release testing?
+    class CollectionSeeder
+      class << self
+        attr_accessor :logger
+
+        def generate_seeds(logger: Logger.new(STDOUT), allow_seeding_in_production: false) # rubocop:disable Metrics/AbcSize
+          raise("TestDataSeeders are not for use in production!") if Rails.env.production? && !allow_seeding_in_production
+          @logger = logger
+
+          logger.info("Adding collections...")
+
+          create_collection("Grand Parent Collection", collection_types['Nestable only'])
+          create_collection("Parent Collection", collection_types['Nestable only'])
+          create_collection("Child Collection", collection_types['Nestable only'])
+          create_collection("Branded Collection", collection_types['Brandable only'])
+          create_collection("Discoverable Collection", collection_types['Discoverable only'])
+          create_collection("Shared", collection_types['Sharable only'])
+          create_collection("Share Applies to Works", collection_types['Sharable only (and works)'])
+          create_collection("(SM1) Single Membership Collection", collection_types['Single Membership 1'])
+          create_collection("(SM1) Another Single Membership Collection", collection_types['Single Membership 1'])
+          create_collection("(SM2) Single Membership Collection", collection_types['Single Membership 2'])
+          create_collection("(SM2) Another Single Membership Collection", collection_types['Single Membership 2'])
+        end
+
+        ##
+        # @api private
+        class NullUser
+          ##
+          # @return [nil]
+          def user_key
+            nil
+          end
+        end
+
+        private
+
+        def create_collection(title, collection_type_gid)
+          return unless valid_collection_type?(title, collection_type_gid)
+          return if exists?(title, collection_type_gid)
+
+          collection = Hyrax::PcdmCollection.new(title: title, collection_type_gid: collection_type_gid)
+          Hyrax.persister.save(resource: collection)
+          Hyrax.publisher.publish('collection.metadata.updated', collection: collection, user: seed_user)
+          logger.info("   #{collection.title.first} -- CREATED")
+        end
+
+        def seed_user
+          @seed_user ||= NullUser.new
+        end
+
+        def collection_types
+          @collection_types ||=
+            Hyrax::CollectionType.all
+                                 .each_with_object({}) { |ct, hsh| hsh[ct.title] = ct.to_global_id.to_s }
+        end
+
+        def valid_collection_type?(title, collection_type_gid)
+          return true if collection_type_gid.present? && collection_types.value?(collection_type_gid.to_s)
+
+          msg = "   #{title} -- NOT CREATED -- Collection type gid (#{collection_type_gid}) " \
+                  "is invalid or doesn't exist."
+          logger.info(msg)
+          false
+        end
+
+        def existing_collections
+          @existing_collections ||=
+            Hyrax.query_service.find_all_of_model(model: Hyrax::PcdmCollection)
+                 .each_with_object({}) { |col, hsh| hsh[col.title&.first] = col.collection_type_gid.to_s }
+        end
+
+        def exists?(title, collection_type_gid)
+          return false unless existing_collections[title] == collection_type_gid.to_s
+          logger.info("   #{title} -- ALREADY EXISTS")
+          true
+        end
+      end
+    end
+  end
+end

data/app/utils/hyrax/test_data_seeders/collection_type_seeder.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+module Hyrax
+  module TestDataSeeders
+    # This class was created for use in rake tasks and db/seeds.rb.  It generates
+    # collection types that can be used in release testing.  This data can also be
+    # helpful for local development testing.
+    #
+    # Adding collection types is non-destructive.  If a collection type with the
+    # title already exists, it will not be replaced.
+    class CollectionTypeSeeder
+      class << self
+        attr_accessor :logger
+
+        def generate_seeds(logger: Logger.new(STDOUT), allow_seeding_in_production: false) # rubocop:disable Metrics/MethodLength
+          raise("TestDataSeeders are not for use in production!") if Rails.env.production? && !allow_seeding_in_production
+          @logger = logger
+
+          logger.info("Adding collection types...")
+
+          create_collection_type(title: "Nestable only", badge_color: "#282D3C", nestable: true,
+                                 description: "Collections of this type can be nested.")
+          create_collection_type(title: "Brandable only", badge_color: "#ff6600", brandable: true,
+                                 description: "Collections of this type can have branding images.")
+          create_collection_type(title: "Discoverable only", badge_color: "#00A170", discoverable: true,
+                                 description: "Collections of this type can have visibility settings modified.")
+          create_collection_type(title: "Sharable only", badge_color: "#ff0066", sharable: true, share_applies_to_new_works: false,
+                                 description: "Collections of this type are sharable.  Works " \
+                                              "do NOT inherit sharable settings when they are created.")
+          create_collection_type(title: "Sharable only (and works)", badge_color: "#0072B5", sharable: true, share_applies_to_new_works: true,
+                                 description: "Collections of this type are sharable.  Works " \
+                                              "inherit sharable settings when they are created.")
+          create_collection_type(title: "Single Membership 1", badge_color: "#b34700", allow_multiple_membership: false,
+                                 description: "This Single Membership 1 collection type restricts collection membership. " \
+                                              "Collections of this type do not allow works to live in multiple collections of this type.")
+          create_collection_type(title: "Single Membership 2", badge_color: "#926AA6", allow_multiple_membership: false,
+                                 description: "This Single Membership 2 collection type restricts collection membership. " \
+                                              "Collections of this type do not allow works to live in multiple collections of this type.")
+        end
+
+        private
+
+        def collection_type_titles
+          @collection_type_titles ||= Hyrax::CollectionType.all.map(&:title)
+        end
+
+        def create_collection_type(options = {})
+          title = options[:title]
+          return logger.info("   #{title} -- ALREADY EXISTS") if collection_type_titles.include? title
+
+          defaults_for_options(options)
+          Hyrax::CollectionType.new(options).save
+          logger.info("   #{title} -- CREATED")
+        end
+
+        def defaults_for_options(options = {})
+          options[:nestable] ||= false
+          options[:brandable] ||= false
+          options[:discoverable] ||= false
+          options[:sharable] ||= false
+          options[:share_applies_to_new_works] ||= false
+          options[:allow_multiple_membership] ||= true
+
+          # These should always false unless the collection type is Admin Set.
+          # Admin Set collection type is created by required_data_seeders
+          options[:require_membership] = false
+          options[:assigns_workflow] = false
+          options[:assigns_visibility] = false
+        end
+      end
+    end
+  end
+end

data/app/utils/hyrax/test_data_seeders/user_seeder.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+module Hyrax
+  module TestDataSeeders
+    # This class was created for use in rake tasks and db/seeds.rb.  It generates
+    # users that can be used in release testing.  This data can also be helpful
+    # for local development testing.
+    #
+    # Adding users is non-destructive.  If a user with the email already exists,
+    # they will not be replaced.
+    class UserSeeder
+      class << self
+        attr_accessor :logger
+
+        def generate_seeds(logger: Logger.new(STDOUT), allow_seeding_in_production: false)
+          raise("TestDataSeeders are not for use in production!") if Rails.env.production? && !allow_seeding_in_production
+          @logger = logger
+
+          logger.info("Adding users...")
+
+          add_user('admin@example.com', 'admin_password', admin_role)
+          add_user('basic_user@example.com', 'password')
+          add_user('another_user@example.com', 'password')
+        end
+
+        private
+
+        def admin_role
+          unless defined? Role
+            logger.warn("Cannot create `Role` because the `hyrda-role-management` gem, or " \
+                        "other gem providing a definition for a Role class, is not installed.  " \
+                        "For development, you can edit `config/role_map.yml` and add the user's " \
+                        "email under the role you want to assign.")
+            return
+          end
+          @admin_role ||= Role.find_by(name: Hyrax.config.admin_user_group_name)
+        end
+
+        def add_user(email, password, role = nil)
+          created = false
+          user = ::User.find_or_create_by(email: email) do |f|
+            created = true
+            f.password = password
+          end
+          logger.info("   #{email} -- #{created ? 'CREATED' : 'ALREADY EXISTS'}")
+          return unless role && !user.roles.include?(role)
+          user.roles << role
+          user.save
+        end
+      end
+    end
+  end
+end

data/app/validators/hyrax/collection_membership_validator.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+module Hyrax
+  ##
+  # Validates that the record passes the multiple membership requirements for collections.
+  class CollectionMembershipValidator < ActiveModel::Validator
+    ##
+    # @param multiple_membership_checker
+    def initialize(multiple_membership_checker: Hyrax::MultipleMembershipChecker, **options)
+      @multiple_membership_checker = multiple_membership_checker
+      super(options)
+    end
+
+    def validate(record)
+      # collections-in-collections do not have multi-membership restrictions
+      return true if record.is_a? Hyrax::Forms::PcdmCollectionForm
+      checker = @multiple_membership_checker.new(item: nil)
+      ids = collections_ids(record)
+
+      errors = Array(checker.check(collection_ids: ids))
+      record.errors[:member_of_collection_ids].concat(errors)
+    end
+
+    private
+
+    def collections_ids(record)
+      collection_ids = record.member_of_collection_ids.reject(&:blank?)
+
+      if record.member_of_collections_attributes.present?
+        record.member_of_collections_attributes
+              .each do |_k, h|
+                next if h["_destroy"] == "true"
+                collection_ids << Valkyrie::ID.new(h["id"])
+              end
+      end
+
+      collection_ids
+    end
+  end
+end

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

@@ -1,3 +1,10 @@
+<% model = document.hydra_model %>
 <div class="search-results-title-row">
-  <h3 class="search-result-title"><%= link_to document.title_or_label, document %></h3>
+  <% if model == Hyrax::PcdmCollection || model < Hyrax::PcdmCollection %>
+    <h3 class="search-result-title"><%= link_to document.title_or_label, [hyrax, document] %></h3>
+    <%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>
+  <% else %>
+    <h3 class="search-result-title"><%= link_to document.title_or_label, document %></h3>
+  <% end %>
 </div>
+

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

@@ -1,5 +1,10 @@
+<% model = document.hydra_model %>
 <div class="col-md-2">
-  <div class="list-thumbnail">
-    <%= render_thumbnail_tag document %>
-  </div>
+  <% if model == Hyrax::PcdmCollection || model < Hyrax::PcdmCollection %>
+    <%= render_thumbnail_tag document, {}, suppress_link: true %>
+  <% else %>
+    <div class="list-thumbnail">
+      <%= render_thumbnail_tag document %>
+    </div>
+  <% end %>
 </div>

data/app/views/collections/edit_fields/_based_near.html.erb

@@ -1,8 +1,8 @@
 <%= f.input key,
-            as: :multi_value,
-            input_html: {
-              class: 'form-control',
-              data: { 'autocomplete-url' => "/authorities/search/geonames",
-                      'autocomplete' => key }
-            },
-            required: f.object.required?(key) %>
+  as: :multi_value,
+  input_html: {
+    class: 'form-control',
+    data: { 'autocomplete-url' => "/authorities/search/geonames",
+            'autocomplete' => key }
+  },
+  required: f.object.required?(key) %>

data/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb

@@ -1,6 +1,6 @@
                   <h3><%= t(".#{access}.title") %></h3>
                   <p><%= t(".#{access}.help") %></p>
-                  <% if @form.permission_template.access_grants.select(&filter).any? %>
+                  <% if collection_permission_template_form_for(form: @form).access_grants.select(&filter).any? %>
                     <table class="table table-striped share-status">
                       <thead>
                         <tr>
@@ -10,7 +10,7 @@
                         </tr>
                       </thead>
                       <tbody>
-                      <% @form.permission_template.access_grants.select(&filter).each do |g| %>
+                      <% collection_permission_template_form_for(form: @form).access_grants.select(&filter).each do |g| %>
                         <tr>
                           <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
                           <td><%= g.agent_type.titleize %></td>

data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb

@@ -5,7 +5,7 @@
                   <h3><%= t('.add_participants') %></h3>
                   <% access_options = options_for_select([['Manager', 'manage'], ['Depositor', 'deposit'], ['Viewer', 'view']]) %>
                   <div class="sharing-row-form">
-                    <%= simple_form_for @form.permission_template,
+                    <%= simple_form_for collection_permission_template_form_for(form: @form),
                         url: [hyrax, :admin, @form, :permission_template],
                         html: { id: 'group-participants-form', class: 'form-inline' } do |f| %>
 
@@ -33,7 +33,7 @@
                   </div>
 
                   <div class="sharing-row-form">
-                    <%= simple_form_for @form.permission_template,
+                    <%= simple_form_for collection_permission_template_form_for(form: @form),
                         url: [hyrax, :admin, @form, :permission_template],
                         html: { id: 'user-participants-form', class: 'form-inline add-users' } do |f| %>
 

data/app/views/hyrax/admin/admin_sets/_form_visibility.html.erb

@@ -1,6 +1,6 @@
           <div id="visibility" class="tab-pane">
             <div class="panel panel-default labels">
-              <%= simple_form_for @form.permission_template,
+              <%= simple_form_for collection_permission_template_form_for(form: @form),
                                   url: [hyrax, :admin, @form, :permission_template],
                                   html: { class: 'nav-safety' } do |f| %>
                 <div class="panel-body">
@@ -62,4 +62,4 @@
                 </div>
               <% end %>
             </div>
-          </div>
+          </div>

data/app/views/hyrax/admin/admin_sets/_form_workflow.erb

@@ -1,6 +1,6 @@
                 <div id="workflow" class="tab-pane">
                   <div class="panel panel-default labels">
-                    <%= simple_form_for @form.permission_template,
+                    <%= simple_form_for collection_permission_template_form_for(form: @form),
                       url: [hyrax, :admin, @form, :permission_template],
                       html: { id: 'form_workflows', class: 'nav-safety' } do |f| %>
                       <% if f.object.available_workflows.any? %>

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

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

@@ -14,7 +14,7 @@
       <%= render 'form_visibility_error', f: f %>
     </div>
   <% end %>
-  <% if Flipflop.batch_upload? && f.object.new_record? %>
+  <% if Flipflop.batch_upload? && !f.object.persisted? %>
     <% provide :metadata_tab do %>
       <p class="switch-upload-type"><%= t('.batch_upload_hint') %> <%= link_to t('.batch_link'), hyrax.new_batch_upload_path(payload_concern: @form.model.class) %></p>
     <% end %>

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

@@ -18,7 +18,7 @@ HTML Properties:
                         data: {
                           autocomplete: 'work',
                           'autocomplete-url' => Rails.application.routes.url_helpers.qa_path + '/search/find_works',
-                          'exclude-work': f.object.model.id # exclude this item from the result set.
+                          'exclude-work': f.object.model.id.to_s # exclude this item from the result set.
                         } %>
       <a href="#" onclick="return false;" class="btn btn-primary" data-behavior="add-relationship"><%= t('.add') %></a>
   </div>

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

@@ -16,9 +16,9 @@
       <th><%= t("hyrax.dashboard.my.heading.access") %></th>
     <% end %>
     <th><%= t("hyrax.dashboard.my.heading.type") %></th>
-    <th><%= t("hyrax.dashboard.my.heading.collection.visibility") %></th>
-    <th><%= t("hyrax.dashboard.my.heading.items") %></th>
     <th><%= t("hyrax.dashboard.my.heading.last_modified") %></th>
+    <th><%= t("hyrax.dashboard.my.heading.items") %></th>
+    <th><%= t("hyrax.dashboard.my.heading.collection.visibility") %></th>
     <th><%= t("hyrax.dashboard.my.heading.action") %></th>
   </tr>
   </thead>

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

@@ -23,7 +23,7 @@
     <% end %>
   </ul>
 
-  <%= simple_form_for @form, url: [hyrax, :dashboard, @form], html: { class: 'editor nav-safety' } do |f| %>
+  <%= simple_form_for @form, url: [hyrax, :dashboard, @form], html: { class: 'editor nav-safety', data: { behavior: 'collection-form', 'param-key' => @form.model_name.param_key } } do |f| %>
     <div class="tab-content">
       <div id="description" class="tab-pane active">
         <div class="panel panel-default labels">
@@ -35,7 +35,7 @@
               <% end %>
 
               <% # TODO: Remove check for PcdmCollection when Issue #5286 is resolved. %>
-              <% if f.object.persisted? && Hyrax.config.collection_class != Hyrax::PcdmCollection %>
+              <% if f.object.persisted? && !(Hyrax.config.collection_class < Valkyrie::Resource) %>
                 <%# we're loading these values dynamically to speed page load %>
                 <%= f.input :thumbnail_id,
                     input_html: { data: { text: thumbnail_label_for(object: f.object) } } %>
@@ -72,29 +72,35 @@
       </div> <!-- end description -->
 
       <% if @form.persisted? %>
-        <div id="branding" class="tab-pane">
-          <div class="panel panel-default labels">
-            <div class="panel-body">
-              <%= render 'form_branding', f: f %>
+        <% if collection_brandable?(collection: @collection) %>
+          <div id="branding" class="tab-pane">
+            <div class="panel panel-default labels">
+              <div class="panel-body">
+                <%= render 'form_branding', f: f %>
+              </div>
             </div>
           </div>
-        </div>
+        <% end %>
 
-        <div id="discovery" class="tab-pane">
-          <div class="panel panel-default labels">
-            <div class="panel-body">
-              <%= render 'form_discovery', f: f %>
+        <% if collection_discoverable?(collection: @collection) %>
+          <div id="discovery" class="tab-pane">
+            <div class="panel panel-default labels">
+              <div class="panel-body">
+                <%= render 'form_discovery', f: f %>
+              </div>
             </div>
           </div>
-        </div>
+        <% end %>
 
-        <div id="sharing" class="tab-pane">
-          <div class="panel panel-default labels" id="collection_permissions" data-param-key="<%= f.object.model_name.param_key %>">
-            <div class="panel-body">
-              <%= render 'form_share', f: f %>
+        <% if collection_sharable?(collection: @collection) %>
+          <div id="sharing" class="tab-pane">
+            <div class="panel panel-default labels" id="collection_permissions" data-param-key="<%= f.object.model_name.param_key %>">
+              <div class="panel-body">
+                <%= render 'form_share', f: f %>
+              </div>
             </div>
           </div>
-        </div>
+        <% end %>
       <% end %>
 
       <div class="panel-footer">
@@ -110,3 +116,4 @@
   <% end # simple_form_for %>
 
 </div> <!-- end collection-controls -->
+

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

@@ -34,6 +34,7 @@
     <div class="row branding-banner-list">
       <div class="col-xs-12">
         <div class="container">
+        <%# Where the request to display the branding comes from. %>
         <% if f.object.banner_info[:file] %>
           <div id="banner">
             <div class="row branding-banner-row">

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

@@ -5,13 +5,16 @@
 
   <div class="form-group">
     <label class="radio">
-      <input type="radio" id="visibility_open" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>" <% if @collection.open_access? %> checked="true"<% end %> /><strong><%= t('hyrax.visibility.open.text') %></strong> - <%= t('hyrax.visibility.open.note_html') %>
+      <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>
+      <strong><%= t('hyrax.visibility.open.text') %></strong> - <%= t('hyrax.visibility.open.note_html') %>
     </label>
     <label class="radio">
-      <input type="radio" id="visibility_registered" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>" <% if @collection.authenticated_only_access? %> checked="true"<% end %> /><strong><%= t('hyrax.visibility.authenticated.text', institution: institution_name) %></strong> - <%= t('hyrax.visibility.authenticated.note_html', institution: institution_name) %>
+      <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>
+      <strong><%= t('hyrax.visibility.authenticated.text', institution: institution_name) %></strong> - <%= t('hyrax.visibility.authenticated.note_html', institution: institution_name) %>
     </label>
     <label class="radio">
-      <input type="radio" id="visibility_restricted" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE %>" <% if @collection.private_access? %> checked="true"<% end %> /><strong><%= t('hyrax.visibility.restricted.text') %></strong>- <%= t('hyrax.visibility.restricted.note_html') %>
+      <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE %>
+      <strong><%= t('hyrax.visibility.restricted.text') %></strong>- <%= t('hyrax.visibility.restricted.note_html') %>
     </label>
   </div>
 

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

@@ -8,7 +8,7 @@
 
       <!-- Add group form -->
       <div class="form-add-sharing-wrapper" data-id="<%= @form.id %>">
-        <%= simple_form_for @form.permission_template,
+        <%= simple_form_for collection_permission_template_form_for(form: @form),
                             url: [hyrax, :dashboard, @form, :permission_template],
                             html: { id: 'group-participants-form' } do |f| %>
 
@@ -40,7 +40,7 @@
 
       <!-- Add user form -->
       <div class="form-add-sharing-wrapper" data-id="<%= @form.id %>">
-        <%= simple_form_for @form.permission_template,
+        <%= simple_form_for collection_permission_template_form_for(form: @form),
                             url: [hyrax, :dashboard, @form, :permission_template],
                             html: { id: 'user-participants-form' } do |f| %>
 

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

@@ -1,7 +1,7 @@
                   <h3><%= t(".#{access}.title") %></h3>
                   <p><%= t(".#{access}.help") %></p>
-                  <p><%= t(".#{access}.help_with_works", type_title: @collection.collection_type.title) if @collection.share_applies_to_new_works? && access != 'depositors' %></p>
-                  <% if @form.permission_template.access_grants.select(&filter).any? %>
+                  <p><%= t(".#{access}.help_with_works", type_title: @collection_type.title) if @collection_type.share_applies_to_new_works? && access != 'depositors' %></p>
+                  <% if collection_permission_template_form_for(form: @form).access_grants.select(&filter).any? %>
                     <table class="table table-striped share-status">
                       <thead>
                         <tr>
@@ -11,7 +11,7 @@
                         </tr>
                       </thead>
                       <tbody>
-                      <% @form.permission_template.access_grants.select(&filter).each do |g| %>
+                      <% collection_permission_template_form_for(form: @form).access_grants.select(&filter).each do |g| %>
                         <tr>
                           <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
                           <td><%= g.agent_type.titleize %></td>

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

@@ -61,9 +61,9 @@
   <td class="collection_type">
     <%= collection_presenter.collection_type_badge %>
   </td>
-  <td><%= collection_presenter.permission_badge %>  </td>
+  <td class="date"><%= collection_presenter.modified_date %></td>
   <td><%= collection_presenter.total_viewable_items %></td>
-  <td class="date"><%= collection_presenter.modified_date.try(:to_formatted_s, :standard) %> </td>
+  <td><%= collection_presenter.permission_badge %>  </td>
   <td>
     <% if collection_presenter.solr_document.admin_set? %>
       <%= render '/hyrax/my/admin_set_action_menu', admin_set_presenter: collection_presenter %>

data/app/views/hyrax/dashboard/sidebar/_activity.html.erb

@@ -32,7 +32,7 @@
     <% end %>
   <% end %>
 
-  <% if current_ability.can_create_any_work? %>
+  <% if current_ability.can_create_any_work? && Hyrax.config.analytics? %>
     <li>
       <%= menu.collapsable_section t('hyrax.admin.sidebar.analytics'),
                                         icon_class: "fa fa-pie-chart",

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

@@ -5,7 +5,7 @@
     <tr>
       <th class="check-all"><label for="check_all" class="sr-only"><%= t("hyrax.dashboard.my.sr.check_all_label") %></label><%= render_check_all %></th>
       <th><%= t("hyrax.dashboard.my.heading.title") %></th>
-      <th class="date text-center"><%= t("hyrax.dashboard.my.heading.date_uploaded") %></th>
+      <th class="date text-center"><%= t("hyrax.dashboard.my.heading.date_modified") %></th>
       <th class="text-center"><%= t("blacklight.search.fields.facet.suppressed_bsi") %></th>
       <th class="text-center"><%= t("hyrax.dashboard.my.heading.work.visibility") %></th>
       <th class="text-center"><%= t("hyrax.dashboard.my.heading.action") %></th>

data/app/views/hyrax/dashboard/works/_list_works.html.erb

@@ -27,7 +27,7 @@
     </div>
   </td>
 
-  <td class='text-center'><%= document.date_uploaded %></td>
+  <td class="date text-center"><%= document.date_modified %></td>
   <td class='workflow-state text-center'><%= presenter.workflow.state_label %></td>
   <td class='text-center'><%= render_visibility_link document %></td>
 

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

@@ -1,4 +1,4 @@
-<% if (can?(:download, file_set.id) || can?(:destroy, file_set.id) || can?(:edit, file_set.id)) && !workflow_restriction?(file_set.parent) %>
+<% if (can?(:download, file_set.id) || can?(:destroy, file_set.id) || can?(:edit, file_set.id)) && !workflow_restriction?(@parent) %>
   <% if can?(:download, file_set.id) && !(can?(:edit, file_set.id) || can?(:destroy, file_set.id)) %>
   <%= link_to t('.download'),
               hyrax.download_path(file_set),
@@ -51,4 +51,4 @@
     </ul>
   </div>
   <% end %>
-<% end %>
+<% end %>