hyrax 3.3.0 → 3.4.0

data/app/services/hyrax/solr_query_service.rb

@@ -59,10 +59,11 @@ module Hyrax
     end
 
     ##
+    # @param join_with [String] the connector (eg. 'AND', 'OR') used to join each clause (default: 'AND')
     # @return [String] the combined query that can be submitted to solr
-    def build
+    def build(join_with: 'AND')
       return 'id:NEVER_USE_THIS_ID' if @query.blank? # forces this method to always return a valid solr query
-      @query.join(' AND ')
+      @query.join(padded_join_with(join_with))
     end
 
     ##
@@ -106,8 +107,8 @@ module Hyrax
 
     ##
     # @param field_pairs [Hash] a list of pairs of property name and values (e.g. { field1: values, field2: values })
-    # @param join_with [String] the connector used to join the field pairs (default: ' AND ')
-    # @param type [String] type of query to run. Either 'raw' or 'field' (default: 'field')
+    # @param join_with [String] the connector (eg. 'AND', 'OR') used to join the field pairs (default: 'AND')
+    # @param type [String] type of query to run (e.g. 'raw', 'field', 'terms') (default: 'field')
     # @return [SolrQueryService] the existing service with field_pair query appended
     def with_field_pairs(field_pairs: {}, join_with: default_join_with, type: 'field')
       pairs_query = construct_query_for_pairs(field_pairs, join_with, type)
@@ -140,7 +141,7 @@ module Hyrax
 
     # Construct a solr query from a list of pairs (e.g. { field1: values, field2: values })
     # @param [Hash] field_pairs a list of pairs of property name and values
-    # @param [String] join_with the value we're joining the clauses with (default: ' AND ')
+    # @param [String] join_with the value (e.g. 'AND', 'OR') we're joining the clauses with (default: 'AND')
     # @param [String] type of query to run. Either 'raw' or 'field' (default: 'field')
     # @return [String] a solr query
     # @example
@@ -150,7 +151,7 @@ module Hyrax
       clauses = pairs_to_clauses(field_pairs, type)
       return "" if clauses.count.zero?
       return clauses.first if clauses.count == 1
-      "(#{clauses.join(join_with)})"
+      "(#{clauses.join(padded_join_with(join_with))})"
     end
 
     # Construct a solr query from the model (e.g. Collection, Monograph)
@@ -184,7 +185,11 @@ module Hyrax
     end
 
     def default_join_with
-      ' AND '
+      'AND'
+    end
+
+    def padded_join_with(join_with)
+      " #{join_with.strip} "
     end
 
     # @param [Array<Array>] pairs a list of (key, value) pairs. The value itself may

data/app/services/hyrax/thumbnail_path_service.rb

@@ -9,7 +9,7 @@ module Hyrax
 
         thumb = fetch_thumbnail(object)
 
-        return unless thumb
+        return default_image unless thumb
         return call(thumb) unless thumb.file_set?
         if audio?(thumb)
           audio_image

data/app/services/hyrax/work_uploads_handler.rb

@@ -116,9 +116,6 @@ module Hyrax
 
       ValkyrieIngestJob.perform_later(file)
 
-      # this triggers the re-index
-      Hyrax.publisher.publish('object.metadata.updated', object: file_set, user: file.user)
-
       { file_set: file_set, user: file.user }
     end
 
@@ -163,13 +160,6 @@ module Hyrax
       @target_permissions ||= Hyrax::AccessControlList.new(resource: work)
     end
 
-    ##
-    # @api private
-    # @return [JobIoWrapper]
-    def wrap_file(file, file_set)
-      JobIoWrapper.create_with_varied_file_handling!(user: file.user, file: file, relation: :original_file, file_set: file_set)
-    end
-
     ##
     # @api private
     #

data/app/validators/hyrax/collection_membership_validator.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+module Hyrax
+  # Validates that the record passes the multiple membership checker
+  class CollectionMembershipValidator < ActiveModel::Validator
+    def validate(record)
+      update_collections(record)
+      validation = validate_multi_membership(record)
+      return if validation == true
+      record.errors[:member_of_collection_ids] << validation
+    end
+
+    private
+
+    def validate_multi_membership(record)
+      # collections-in-collections do not have multi-membership restrictions
+      return true if record.is_a? Hyrax::Forms::PcdmCollectionForm
+
+      Hyrax::MultipleMembershipChecker.new(item: record).validate
+    end
+
+    def update_collections(record)
+      record.member_of_collection_ids = collections_ids(record)
+      record.member_of_collection_ids.uniq!
+    end
+
+    def collections_ids(record)
+      collection_ids = []
+      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_hyrax_pcdm_collection.html.erb

@@ -0,0 +1,4 @@
+<div class="search-results-title-row">
+  <h3 class="search-result-title"><%= link_to document.title_or_label, [hyrax, document] %></h3>
+  <%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>
+</div>

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

@@ -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">

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/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 %>

data/app/views/hyrax/my/_work_action_menu.html.erb

@@ -12,34 +12,33 @@
 
     <% if can? :edit, document.id %>
       <li role="menuitem" tabindex="-1">
-        <%= link_to [main_app, :edit, document] do %>
-          <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
-          <span> <%= t("hyrax.dashboard.my.action.edit_work") %> </span>
+        <%= link_to [main_app, :edit, document],
+                    id: 'action-edit-work' do %>
+          <%= t("hyrax.dashboard.my.action.edit_work") %>
         <% end %>
       </li>
 
       <li role="menuitem" tabindex="-1">
         <%= link_to [main_app, document],
                     method: :delete,
+                    id: 'action-delete-work',
                     data: {
                       confirm: t("hyrax.dashboard.my.action.work_confirmation", application_name: application_name) } do %>
-          <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
-          <span> <%= t("hyrax.dashboard.my.action.delete_work") %> </span>
+          <%= t("hyrax.dashboard.my.action.delete_work") %>
         <% end %>
       </li>
     <% end %>
 
     <li role="menuitem" tabindex="-1">
       <%= display_trophy_link(current_user, document.id) do |text| %>
-        <i class="glyphicon glyphicon-star" aria-hidden="true"></i> <%= text %>
+        <%= text %>
       <% end %>
     </li>
 
     <% if can? :transfer, document.id %>
       <li role="menuitem" tabindex="-1">
-        <%= link_to(hyrax.new_work_transfer_path(document.id), class: 'itemicon itemtransfer', title: t("hyrax.dashboard.my.action.transfer")) do %>
-          <i class="glyphicon glyphicon-transfer" aria-hidden="true"></i>
-          <span> <%= t("hyrax.dashboard.my.action.transfer") %> </span>
+        <%= link_to(hyrax.new_work_transfer_path(document.id), id: 'action-transfer-work', class: 'itemicon itemtransfer', title: t("hyrax.dashboard.my.action.transfer")) do %>
+          <%= t("hyrax.dashboard.my.action.transfer") %>
         <% end %>
       </li>
     <% end %>

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

@@ -5,9 +5,9 @@
     <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><%= 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/my/collections/_list_collections.html.erb

@@ -60,9 +60,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/my/collections/index.html.erb

@@ -25,6 +25,7 @@
       <% if @collection_type_list_presenter.many? %>
         <% # modal to select type %>
         <button type="button"
+          id="add-new-collection-button"
           class="btn btn-primary"
           data-toggle="modal"
           data-target="#collectiontypes-to-create"
@@ -33,7 +34,7 @@
         </button>
       <% else @collection_type_list_presenter.any? %>
         <% # link directly to create collection form with type %>
-        <%= link_to(t('helpers.action.collection.new'), append_collection_type_url(new_dashboard_collection_path, @collection_type_list_presenter.first_collection_type.id), class: 'btn btn-primary') %>
+        <%= link_to(t('helpers.action.collection.new'), append_collection_type_url(new_dashboard_collection_path, @collection_type_list_presenter.first_collection_type.id), id: 'add-new-collection-button', class: 'btn btn-primary') %>
       <% end %>
     <% end %>
   </section>
@@ -46,7 +47,7 @@
       <% elsif current_page?(hyrax.dashboard_collections_path(locale: nil)) && !current_ability.admin? %>
         <span class="count-display"><%= I18n.t('hyrax.my.count.collections.you_manage', total_count: @response.total_count).html_safe %></span>
       <% else %>
-        <span class="count-display"><%= I18n.t('hyrax.my.count.collections.in_repo', total_count: @response.total_count).html_safe %></span>     
+        <span class="count-display"><%= I18n.t('hyrax.my.count.collections.in_repo', total_count: @response.total_count).html_safe %></span>
       <% end %>
     </div>
     <div class="panel-body">

data/app/views/hyrax/my/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='text-center'><%= t("hyrax.dashboard.my.heading.date_uploaded") %></th>
+    <th class='text-center'><%= t("hyrax.dashboard.my.heading.last_modified") %></th>
     <th class='text-center'><%= t("hyrax.dashboard.my.heading.highlighted") %></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/my/works/_list_works.html.erb

@@ -28,8 +28,7 @@
       </div>
     </div>
   </td>
-
-  <td class="date text-center"><%= document.date_uploaded %></td>
+  <td class="date text-center"><%= document.date_modified %></td>
   <td class='text-center'>
     <span class="fa <%= current_user.trophies.where(work_id: document.id).exists? ? 'fa-star highlighted-work' : 'fa-star-o trophy-off' %>" aria-hidden="true"></span></td>
   <td class='text-center'><%= render_visibility_link document %></td>

data/app/views/hyrax/my/works/index.html.erb

@@ -30,6 +30,7 @@
               t(:'helpers.action.work.new'),
               '#',
               data: { behavior: "select-work", target: "#worktypes-to-create", 'create-type' => 'single' },
+              id: 'add-new-work-button',
               class: 'btn btn-primary'
             ) %>
       <% else # simple link to the first work type %>
@@ -43,6 +44,7 @@
         <%= link_to(
               t(:'helpers.action.work.new'),
               new_polymorphic_path([main_app, @create_work_presenter.first_model]),
+              id: 'add-new-work-button',
               class: 'btn btn-primary'
             ) %>
       <% end %>
@@ -60,9 +62,9 @@
         <% elsif current_page?(hyrax.dashboard_works_path(locale: nil)) && !current_ability.admin? %>
           <span class="count-display"><%= I18n.t('hyrax.my.count.works.you_manage', total_count: @response.total_count).html_safe %></span>
         <% else %>
-          <span class="count-display"><%= I18n.t('hyrax.my.count.works.in_repo', total_count: @response.total_count).html_safe %></span>     
+          <span class="count-display"><%= I18n.t('hyrax.my.count.works.in_repo', total_count: @response.total_count).html_safe %></span>
         <% end %>
-      </div> 
+      </div>
       <div class="panel-body">
         <%= render 'search_header' %>
         <h2 class="sr-only"><%= t('hyrax.my.count.works.works_listing') %></h2>

data/chart/hyrax/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 1.0.2
-appVersion: 3.1.0
+version: 1.1.0
+appVersion: 3.3.0
 dependencies:
   - name: fcrepo
     version: 0.8.0

data/chart/hyrax/README.md

@@ -116,7 +116,7 @@ Then update the helm charts with the following:
 HELM_EXPERIMENTAL_OCI=1 helm dependency update chart/hyrax
 ```
 
-Without the `HELM_EXPERIMENTAL_OCI=1` switch you might see the following error:
+If your `helm` version is before 3.8, without the `HELM_EXPERIMENTAL_OCI=1` switch you might see the following error:
 
 ```sh
 repository oci://ghcr.io/samvera is an OCI registry: this feature has been marked as experimental and is not enabled by default. Please set HELM_EXPERIMENTAL_OCI=1 in your environment to use this feature”
@@ -142,6 +142,27 @@ Some shell commands of house cleaning and destruction:
 *  Remove hanging docker instances: `docker rm $(docker ps -a -q) -f`
 *  Removing dangling docker images: `docker rmi $(docker images -f "dangling=true" -q)`
 
+## Building and Pushing the Chart Package
+
+We currently build and push new chart versions manually. This needs to happen
+any time the chart version in [`Chart.yaml`](./Chart.yaml) is incremented.
+
+To publish the Hyrax chart, you'll need to be in one of the GitHub groups with
+push permissions. These groups are:
+
+  - `@samvera/admins`
+  - `@samvera/hyrax` (and all its subgroups)
+
+To build the package, it's helpful to have a clean checkout of the current
+`main` branch, then:
+
+```sh
+HELM_EXPERIMENTAL_OCI=1 helm dependency update chart/hyrax
+HELM_EXPERIMENTAL_OCI=1 helm package chart/hyrax
+HELM_EXPERIMENTAL_OCI=1 helm push hyrax-[VERSION].tgz oci://ghcr.io/samvera/charts
+```
+
+
 [containers]: ../../CONTAINERS.md#hyrax-image
 [dassie]: ../../.dassie/README.md
 [dassie-image]: https://hub.docker.com/r/samveralabs/dassie

data/config/initializers/listeners.rb

@@ -9,7 +9,6 @@ Hyrax.publisher.subscribe(Hyrax::Listeners::FileSetLifecycleNotificationListener
 Hyrax.publisher.subscribe(Hyrax::Listeners::MemberCleanupListener.new)
 Hyrax.publisher.subscribe(Hyrax::Listeners::MetadataIndexListener.new)
 Hyrax.publisher.subscribe(Hyrax::Listeners::ObjectLifecycleListener.new)
-Hyrax.publisher.subscribe(Hyrax::Listeners::ProxyDepositListener.new)
 Hyrax.publisher.subscribe(Hyrax::Listeners::TrophyCleanupListener.new)
 Hyrax.publisher.subscribe(Hyrax::Listeners::WorkflowListener.new)