hyrax 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 238652072010e0112f31139f4a0fd08b8cfffa834d059fe6f1a09a785dbbb95b
-  data.tar.gz: a5a9237eb4c0444181113ae4666131b592d29f210550ed967854995cea3b5ca0
+  metadata.gz: 791fb1a29523524e62036fd25aed45e6297d4d010e4b20bbcd9abe468bb30278
+  data.tar.gz: fbfdf5b3523294fe5dff601c92412967da57fdd02ac6c28d2384f18e8033cb4e
 SHA512:
-  metadata.gz: 112a9cfd288216b3ac82b7393190a2a3d5d77fe174497854d19d91a3503391fc179d1b28c00d94e91dabd3aa86c6a2d62b8e12f91f7b852e0e36edcb629ec9de
-  data.tar.gz: 67fabd5262783627bf3aaf6587240922db90aeede162e2c2bcc20b8312bbee4f1e84113b09fecb9636d411b7c2e09ee48bafe000d3fc73af7eb9eeec8e7e6623
+  metadata.gz: 98fbab4485f2bb977cfb0fe755a05a98f39a2ba6f575420bae41a70d5e361aae482d81da902203afc49aa9171decafa3d4b87d6d58c0ee05e14a9ff8221f545b
+  data.tar.gz: 8846f839b4040ce79e52738da5fe3585fa176041cc6805c8c124724c8db006d6fee2ff30e5d286bfc0ca76de1e10a331bf608c9f88109208b6bdffc2d90d3023

data/app/assets/javascripts/hyrax/autocomplete/linked_data.es6

@@ -18,6 +18,9 @@ export default class LinkedData {
     let result = this.element.select2("data")
     this.element.select2("destroy")
     this.element.val(result.label).attr("readonly", "readonly")
+    // Adding d-block class to the remove button to show it after a selection is made.
+    let removeButton = this.element.closest('.field-wrapper').find('.input-group-btn.field-controls .remove')
+    removeButton.addClass('d-block')
     this.setIdentifier(result.id)
   }
 

data/app/assets/javascripts/hyrax/editor/controlled_vocabulary.es6

@@ -31,6 +31,8 @@ export default class ControlledVocabulary extends FieldManager {
       this.paramKey = paramKey
       this.fieldName = this.element.data('fieldName')
       this.searchUrl = this.element.data('autocompleteUrl')
+      // Used to prevent index collisions for existing words when removing and adding back in values.
+      this.postRemovalAdjustment = 0
   }
 
   // Overrides FieldManager, because field manager uses the wrong selector
@@ -49,6 +51,15 @@ export default class ControlledVocabulary extends FieldManager {
   //         this._manageFocus()
   // }
 
+  // Overrides FieldManager in order to display Remove button for values that exist at initial load time
+  _createRemoveControl() {
+    if (this.element.find('input.multi-text-field').val()) {
+      this.remover.addClass('d-block')
+      this.remover.addClass('has-existing-value')
+    }
+    $(this.fieldWrapperClass + ' .field-controls', this.element).append(this.remover)
+  }
+
   // Overrides FieldManager in order to avoid doing a clone of the existing field
   createNewField($activeField) {
       let $newField = this._newFieldTemplate()
@@ -68,20 +79,24 @@ export default class ControlledVocabulary extends FieldManager {
   }
 
   _newFieldTemplate() {
-      let index = this._maxIndex()
+      let index = this._maxIndex() + this.postRemovalAdjustment
       let rowTemplate = this._template()
       let controls = this.controls.clone()//.append(this.remover)
       let row =  $(rowTemplate({ "paramKey": this.paramKey,
                                  "name": this.fieldName,
                                  "index": index,
-                                 "class": "controlled_vocabulary" }))
+                                 "class": "controlled_vocabulary",
+                                 "placeholder": "Search for a location..." }))
                   .append(controls)
+      let removeButton = row.find('.remove');
+      removeButton.removeClass('d-block')
+      removeButton.removeClass('has-existing-value')
       return row
   }
 
   get _source() {
       return "<li class=\"field-wrapper input-group input-append\">" +
-        "<input class=\"string {{class}} optional form-control {{paramKey}}_{{name}} form-control multi-text-field\" name=\"{{paramKey}}[{{name}}_attributes][{{index}}][hidden_label]\" value=\"\" id=\"{{paramKey}}_{{name}}_attributes_{{index}}_hidden_label\" data-attribute=\"{{name}}\" type=\"text\">" +
+        "<input class=\"string {{class}} optional form-control {{paramKey}}_{{name}} form-control multi-text-field\" name=\"{{paramKey}}[{{name}}_attributes][{{index}}][hidden_label]\" value=\"\" id=\"{{paramKey}}_{{name}}_attributes_{{index}}_hidden_label\" data-attribute=\"{{name}}\" type=\"text\" placeholder=\"{{placeholder}}\">" +
         "<input name=\"{{paramKey}}[{{name}}_attributes][{{index}}][id]\" value=\"\" id=\"{{paramKey}}_{{name}}_attributes_{{index}}_id\" type=\"hidden\" data-id=\"remote\">" +
         "<input name=\"{{paramKey}}[{{name}}_attributes][{{index}}][_destroy]\" id=\"{{paramKey}}_{{name}}_attributes_{{index}}__destroy\" value=\"\" data-destroy=\"true\" type=\"hidden\"></li>"
   }
@@ -114,9 +129,27 @@ export default class ControlledVocabulary extends FieldManager {
   // '_destroy' hidden parameter
   removeFromList( event ) {
       event.preventDefault()
+      // Changing behavior of the remove button to add a new field if the last field is removed
+      // Using querySelector to find elements with data-attribute="based_near"
+      const inputElements = this.element.find('input' + this.inputTypeClass)
+      const parentsArray = Array.from(inputElements).map(element => element.parentElement)
+      const nonHiddenElements = parentsArray.filter(element => element.style.display !== 'none')
+      const nonHiddenCount = nonHiddenElements.length
+      if (nonHiddenCount < 2){
+        let $listing = $(event.target).closest(this.inputTypeClass).find(this.listClass)
+        let $activeField = $listing.children('li').last()
+        $listing.append(this.createNewField($activeField))
+        this.postRemovalAdjustment += 1
+      }
       let field = $(event.target).parents(this.fieldWrapperClass)
-      field.find('[data-destroy]').val('true')
-      field.hide()
+      // Removes field if a value hasn't been selected, otherwise marks it for destruction. 
+      // Prevents bug caused by marking empty fields for destruction.
+      if (field.find('.has-existing-value').length > 0) {
+        field.find('[data-destroy]').val('true')
+        field.hide()
+      } else {
+        field.remove()
+      }
       this.element.trigger("managed_field:remove", field)
   }
 }

data/app/assets/stylesheets/hyrax/_file_upload.scss

@@ -34,3 +34,9 @@
     padding-bottom: 10px;
   }
 }
+
+// fix blueimp jQuery-File-Upload display problems under Bootstrap 4+
+// found here: https://stackoverflow.com/a/48162651
+.fade.in {
+  opacity: 1
+}

data/app/assets/stylesheets/hyrax/controlled_vocabulary.scss

@@ -1,7 +1,7 @@
 .controlled_vocabulary {
   @extend .multi_value;
 
-  .listing li:only-of-type .remove {
-    display: block;
+  .listing li .remove {
+    display: none;
   }
 }

data/app/controllers/hyrax/file_sets_controller.rb

@@ -292,7 +292,7 @@ module Hyrax
     end
 
     def file_metadata
-      @file_metadata ||= Hyrax.query_service.custom_queries.find_file_metadata_by(id: curation_concern.original_file_id)
+      @file_metadata ||= Hyrax.config.file_set_file_service.primary_file_for(file_set: file_set)
     end
 
     # Override this method to add additional response formats to your local app

data/app/controllers/hyrax/single_use_links_viewer_controller.rb

@@ -84,7 +84,13 @@ module Hyrax
     end
 
     def current_ability
-      @current_ability ||= SingleUseLinksViewerController::Ability.new current_user, single_use_link
+      link_instance = nil
+      begin
+        link_instance = single_use_link
+      rescue ActiveRecord::RecordNotFound
+        Rails.logger.debug("Single user link was not found while getting current ability")
+      end
+      @current_ability ||= SingleUseLinksViewerController::Ability.new current_user, link_instance
     end
 
     def render_single_use_error(exception)
@@ -102,9 +108,10 @@ module Hyrax
       include CanCan::Ability
 
       attr_reader :single_use_link
+      attr_reader :current_user
 
       def initialize(user, single_use_link)
-        @user = user || ::User.new
+        @current_user = user || ::User.new
         return unless single_use_link
 
         @single_use_link = single_use_link

data/app/models/collection.rb

@@ -2,4 +2,16 @@
 
 # Provide plain collection model if not defined by the application.
 # Needed until Hyrax internals do not assume its existence.
-class ::Collection < Hyrax.config.collection_class; end unless '::Collection'.safe_constantize
+class ::Collection < Hyrax.config.collection_class; end unless ActiveSupport::Dependencies.then do |deps|
+  # In autoloading environments, when referencing +::Collection+ from the
+  # initializer, make sure that +safe_constantize+ wouldn’t just try loading
+  # this file again (which would produce a runtime error). Do this by manually
+  # searching for the file which should define +::Collection+ and checking if it
+  # is the one being currently loaded.
+  break true if Object.const_defined?(:Collection)
+  file_path = deps.search_for_file("collection")
+  expanded = File.expand_path(file_path)
+  expanded.delete_suffix!(".rb")
+  break false if deps.loading.include?(expanded)
+  '::Collection'.safe_constantize
+end

data/app/models/hyrax/model_registry.rb

@@ -99,7 +99,7 @@ module Hyrax
     end
 
     def self.classes_from(strings)
-      strings.map(&:safe_constantize).flatten.uniq
+      strings.map(&:safe_constantize).compact.uniq
     end
     private_class_method :classes_from
 

data/app/presenters/hyrax/pcdm_member_presenter_factory.rb

@@ -98,9 +98,9 @@ module Hyrax
     def presenter_for(document:, ability:)
       case document['has_model_ssim'].first
       when *Hyrax::ModelRegistry.file_set_rdf_representations
-        Hyrax::FileSetPresenter.new(document, ability)
+        file_presenter_class.new(document, ability)
       else
-        Hyrax::WorkShowPresenter.new(document, ability)
+        work_presenter_class.new(document, ability)
       end
     end
 

data/app/presenters/hyrax/work_show_presenter.rb

@@ -63,10 +63,10 @@ module Hyrax
 
     # @return [Boolean] render a IIIF viewer
     def iiif_viewer?
-      representative_id.present? &&
+      Hyrax.config.iiif_image_server? &&
+        representative_id.present? &&
         representative_presenter.present? &&
         representative_presenter.image? &&
-        Hyrax.config.iiif_image_server? &&
         members_include_viewable_image?
     end
 

data/app/services/hyrax/file_set_file_service.rb

@@ -32,7 +32,16 @@ module Hyrax
     end
 
     ##
-    # Return the Hyrax::FileMetadata which should be considered “primary” for
+    # Return the {Hyrax::FileMetadata} which should be considered “primary” for
+    # indexing and version‐tracking.
+    #
+    # @return [Hyrax::FileMetadata]
+    def self.primary_file_for(file_set:, query_service: Hyrax.query_service)
+      new(file_set: file_set, query_service: query_service).primary_file
+    end
+
+    ##
+    # Return the {Hyrax::FileMetadata} which should be considered “primary” for
     # indexing and version‐tracking.
     #
     # If +file_set.original_file_id+ is defined, it will be used; otherwise,

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Listeners
+    ##
+    # Listens for events related to Files ({Valkyrie::StorageAdapter::File})
+    class FileListener
+      ##
+      # Called when 'file.characterized' event is published;
+      # allows post-characterization handling, like derivatives generation.
+      #
+      # @param [Dry::Events::Event] event
+      # @return [void]
+      def on_file_characterized(event)
+        file_set = event[:file_set]
+
+        case file_set
+        when ActiveFedora::Base # ActiveFedora
+          CreateDerivativesJob
+            .perform_later(file_set, event[:file_id], event[:path_hint])
+        else
+          ValkyrieCreateDerivativesJob
+            .perform_later(file_set.id.to_s, event[:file_id])
+        end
+      end
+
+      ##
+      # Called when 'file.uploaded' event is published
+      # @param [Dry::Events::Event] event
+      # @return [void]
+      def on_file_uploaded(event)
+        # Run characterization for original file only
+        return unless event[:metadata]&.original_file?
+
+        ValkyrieCharacterizationJob.perform_later(event[:metadata].id.to_s)
+      end
+    end
+  end
+end

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

@@ -5,25 +5,6 @@ module Hyrax
     ##
     # Listens for events related to {Hyrax::FileMetadata}
     class FileMetadataListener
-      ##
-      # Called when 'file.characterized' event is published;
-      # allows post-characterization handling, like derivatives generation.
-      #
-      # @param [Dry::Events::Event] event
-      # @return [void]
-      def on_file_characterized(event)
-        file_set = event[:file_set]
-
-        case file_set
-        when ActiveFedora::Base # ActiveFedora
-          CreateDerivativesJob
-            .perform_later(file_set, event[:file_id], event[:path_hint])
-        else
-          ValkyrieCreateDerivativesJob
-            .perform_later(file_set.id.to_s, event[:file_id])
-        end
-      end
-
       ##
       # Called when 'file.metadata.updated' event is published; reindexes a
       # {Hyrax::FileSet} when a file claiming to be its `pcdm_use:OriginalFile`
@@ -41,17 +22,6 @@ module Hyrax
                           "encountered an error #{err.message}. should this " \
                           "object be in a FileSet #{event[:metadata]}"
       end
-
-      ##
-      # Called when 'file.uploaded' event is published
-      # @param [Dry::Events::Event] event
-      # @return [void]
-      def on_file_uploaded(event)
-        # Run characterization for original file only
-        return unless event[:metadata]&.original_file?
-
-        ValkyrieCharacterizationJob.perform_later(event[:metadata].id.to_s)
-      end
     end
   end
 end

data/app/services/hyrax/lock_manager.rb

@@ -30,8 +30,8 @@ module Hyrax
     rescue ConnectionPool::TimeoutError => err
       Hyrax.logger.error(err.message)
       raise(ConnectionPool::TimeoutError,
-            "Failed to aquire a lock from Redlock due to a Redis connection " /
-            "timeout: #{err}. If you are using Redis via `ConnectionPool` " /
+            "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.")
     end
 

data/app/services/hyrax/valkyrie_upload.rb

@@ -30,8 +30,10 @@ class Hyrax::ValkyrieUpload
   attr_reader :storage_adapter
   ##
   # @param [Valkyrie::StorageAdapter] storage_adapter
-  def initialize(storage_adapter: Hyrax.storage_adapter)
+  # @param [Class] file_set_file_service implementer of {Hyrax::FileSetFileService}
+  def initialize(storage_adapter: Hyrax.storage_adapter, file_set_file_service: Hyrax.config.file_set_file_service)
     @storage_adapter = storage_adapter
+    @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
@@ -67,7 +69,8 @@ class Hyrax::ValkyrieUpload
   end
 
   def version_upload(file_set:, io:, user:)
-    file_metadata = Hyrax.query_service.custom_queries.find_file_metadata_by(id: file_set.original_file_id)
+    file_metadata = @file_set_file_service.primary_file_for(file_set: file_set)
+
     Hyrax::VersioningService.create(file_metadata, user, io)
     Hyrax.publisher.publish("file.uploaded", metadata: file_metadata)
     ContentNewVersionEventJob.perform_later(file_set, user)

data/app/views/hyrax/uploads/_js_templates.html.erb

@@ -1,20 +1,20 @@
 <!-- The template to display files available for upload -->
-<% fade_class_if_not_test = Rails.env.test? ? 'show' : 'fade show' %>
+<% fade_class_if_not_test = Rails.env.test? ? '' : 'fade' %>
 <script id="template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
     <tr class="template-upload <%= fade_class_if_not_test %>">
-        <span>
+        <td>
             <span class="preview"></span>
-        </span>
-        <span>
+        </td>
+        <td>
             <p class="name">{%=file.name%}</p>
             <strong class="error text-danger"></strong>
-        </span>
-        <span>
+        </td>
+        <td>
             <p class="size">Processing...</p>
             <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div></div>
-        </span>
-        <span class="text-right">
+        </td>
+        <td class="text-right">
             {% if (!i && !o.options.autoUpload) { %}
                 <button class="btn btn-primary start" disabled>
                     <span class="fa fa-upload"></span>
@@ -27,7 +27,7 @@
                     <span><%= t('helpers.action.cancel') %></span>
                 </button>
             {% } %}
-        </span>
+        </td>
     </tr>
 {% } %}
 </script>

data/app/views/hyrax/uploads/_js_templates_branding.html.erb

@@ -1,7 +1,7 @@
 <!-- The template to display files available for upload -->
 <script id="template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-upload fade show">
+    <tr class="template-upload fade">
       <td>
         <span class="preview"></span>
       </td>
@@ -37,7 +37,7 @@
 <!-- The template to display the banner once upload is complete -->
 <script id="template-download" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-        <span class="template-download fade show">
+        <span class="template-download fade">
           <div id="banner">
             <div class="row branding-banner-row">
               <div class="col-sm-3">
@@ -69,7 +69,7 @@
 <!-- The template to display logo in the table once upload is complete -->
 <script id="logo-template-download" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-            <span class="template-download fade show">
+            <span class="template-download fade">
             <div class="row branding-logo-row">
               <div class="col-sm-3">
                 <span class="preview">

data/app/views/hyrax/uploads/_js_templates_versioning.html.erb

@@ -1,5 +1,5 @@
 <!-- The template to display files available for upload -->
-<% fade_class_if_not_test = Rails.env.test? ? 'show' : 'fade show' %>
+<% fade_class_if_not_test = Rails.env.test? ? '' : 'fade' %>
 <script id="versioning-template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
     <tr class="template-upload <%= fade_class_if_not_test %>">

data/chart/hyrax/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 3.6.0
+version: 3.7.0
 appVersion: 5.0.0
 dependencies:
   - name: fcrepo

data/chart/hyrax/templates/deployment.yaml

@@ -112,6 +112,18 @@ spec:
             - name: http
               containerPort: 3000
               protocol: TCP
+          {{- if .Values.startupProbe.enabled }}
+          startupProbe:
+            initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds | default 5 }}
+            timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds | default 5 }}
+            failureThreshold: {{ .Values.startupProbe.failureThreshold | default 3 }}
+            periodSeconds: {{ .Values.startupProbe.periodSeconds | default 10}}
+            successThreshold: {{ .Values.startupProbe.successThreshold | default 1 }}
+            httpGet:
+              scheme: "HTTP"
+              path: {{ .Values.startupProbe.path | default "/" }}
+              port: 3000
+          {{- end }}
           {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 5 }}

data/chart/hyrax/values.yaml

@@ -188,6 +188,16 @@ readinessProbe:
   # failureThreshold: 6
   # successThreshold: 1
 
+# consider enabling if you are experiencing slow startup times
+startupProbe:
+  enabled: false
+  # path: "/healthz"
+  # initialDelaySeconds: 30
+  # periodSeconds: 30
+  # timeoutSeconds: 5
+  # failureThreshold: 3
+  # successThreshold: 1
+
 resources: {}
 
 worker:

data/documentation/developing-your-hyrax-based-app.md

@@ -32,7 +32,7 @@ You can also try [Running Hyrax-based application in local VM](https://github.co
 During development, running only the dependent services in a container environment may be beneficial. This avoids potential headaches concerning file permissions and eases the use of debugging tools. The application generation instructions below use [Lando](https://lando.dev) to achieve this setup.
 
 This document contains instructions specific to setting up an app with __Hyrax
-v5.0.0__. If you are looking for instructions on installing a different
+v5.0.1__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -130,7 +130,7 @@ Rails requires that you have a JavaScript runtime installed (e.g. nodejs or ruby
 Create a new Hyrax-based application by following these steps in order.
 
 **NOTE:** Starting with Hyrax v5, the generated application will use [Valkyrie](https://github.com/samvera/valkyrie) for repository persistence.
-Use of [ActiveFedora](https://github.com/samvera/active_fedora) (instead of Valkyrie) is deprecated, but it should still be possible to reconfigure the generated application to use it. 
+Use of [ActiveFedora](https://github.com/samvera/active_fedora) (instead of Valkyrie) is deprecated, but it should still be possible to reconfigure the generated application to use it.
 
 ### Development Prerequisites
 
@@ -145,10 +145,10 @@ These instructions assume the use of [Lando](https://lando.dev) and [Docker](htt
 
 Generate a new Rails application using the template.
 
-**NOTE:** `HYRAX_SKIP_WINGS` is needed here to avoid loading the Wings compatibility layer during the application generation process. 
+**NOTE:** `HYRAX_SKIP_WINGS` is needed here to avoid loading the Wings compatibility layer during the application generation process.
 
 ```shell
-HYRAX_SKIP_WINGS=true rails _6.1.7.7_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.0.0/template.rb
+HYRAX_SKIP_WINGS=true rails _6.1.7.7_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.0.1/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/hyrax.gemspec

@@ -18,13 +18,7 @@ SUMMARY
   spec.homepage      = "http://github.com/samvera/hyrax"
 
   spec.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR).reject do |f|
-    f == 'bin/rails' ||
-      # We want for downstream implementations to be able to leverage the various Hyrax factories.
-      # As such we need them to be available in the .gem file.  See `./lib/hyrax/spec/factories.rb`
-      # for more details.
-      (File.dirname(f) =~ %r{\A"?spec\/?} &&
-        File.dirname(f) !~ %r{\A"?spec\/(factories|assets|support)\/?}
-      )
+    f == 'bin/rails' || File.dirname(f) =~ %r{\A"?spec\/?}
   end
   spec.executables   = spec.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   spec.name          = "hyrax"
@@ -91,7 +85,7 @@ SUMMARY
   spec.add_dependency 'tinymce-rails', '~> 5.10'
   spec.add_dependency 'valkyrie', '~> 3.1.1'
   spec.add_dependency 'view_component', '~> 2.74.1' # Pin until blacklight is updated with workaround for https://github.com/ViewComponent/view_component/issues/1565
-  spec.add_dependency 'sprockets', '~> 3.7'
+  spec.add_dependency 'sprockets', '3.7.2' # 3.7.3 fails feature specs
   spec.add_dependency 'sass-rails', '~> 6.0'
   spec.add_dependency 'select2-rails', '~> 3.5'
 

data/lib/hyrax/publisher.rb

@@ -124,6 +124,16 @@ module Hyrax
 
     # @since 3.5.0
     # @macro a_registered_event
+    #   @note this event SHOULD be published file is characteried by the
+    #     characterization service. Normally, this should happen close to
+    #     when the `file.metadata.updated` event (since characterization
+    #     typically involves updating the metadata). Listeners that intend
+    #     to track updates to file metadata should listen on that event
+    #     topic.
+    #     The event payload MUST include a `:file_set` ({Hyrax::FileSet}),
+    #     a `:file_id` (the id of the {Valkyrie::StorageAdapter::File}),
+    #     and MAY have a `path_hint` for a local path / cache for the
+    #     file.
     register_event('file.characterized')
 
     # @since 3.3.0
@@ -208,6 +218,7 @@ module Hyrax
       @default_listeners ||=
         [Hyrax::Listeners::ACLIndexListener.new,
          Hyrax::Listeners::BatchNotificationListener.new,
+         Hyrax::Listeners::FileListener.new,
          Hyrax::Listeners::FileMetadataListener.new,
          Hyrax::Listeners::FileSetLifecycleListener.new,
          Hyrax::Listeners::FileSetLifecycleNotificationListener.new,

data/{spec → lib/hyrax/specs/shared_specs}/factories/hyrax_work.rb

@@ -66,6 +66,11 @@ FactoryBot.define do
           .assign_access_for(visibility: evaluator.visibility_setting)
       end
 
+      if evaluator.respond_to?(:admin_set) && evaluator.admin_set.present?
+        template = Hyrax::PermissionTemplate.find_by(source_id: evaluator.admin_set.id)
+        Hyrax::PermissionTemplateApplicator.apply(template).to(model: work) if template
+      end
+
       work.permission_manager.edit_groups = work.permission_manager.edit_groups.to_a + evaluator.edit_groups
       work.permission_manager.edit_users  = work.permission_manager.edit_users.to_a + evaluator.edit_users
       work.permission_manager.read_users  = work.permission_manager.read_users.to_a + evaluator.read_users
@@ -80,6 +85,12 @@ FactoryBot.define do
           .new(resource: work)
           .assign_access_for(visibility: evaluator.visibility_setting)
       end
+
+      if evaluator.respond_to?(:admin_set) && evaluator.admin_set.present?
+        template = Hyrax::PermissionTemplate.find_by(source_id: evaluator.admin_set.id)
+        Hyrax::PermissionTemplateApplicator.apply(template).to(model: work) if template
+      end
+
       work.permission_manager.edit_groups = work.permission_manager.edit_groups.to_a + evaluator.edit_groups
       work.permission_manager.edit_users  = work.permission_manager.edit_users.to_a + evaluator.edit_users
       work.permission_manager.read_users  = work.permission_manager.read_users.to_a + evaluator.read_users

data/lib/hyrax/transactions/steps/delete_all_file_metadata.rb

@@ -14,8 +14,7 @@ module Hyrax
 
         ##
         # @params [#save] persister
-        def initialize(property: :file_ids, query_service: Hyrax.query_service, persister: Hyrax.persister, publisher: Hyrax.publisher)
-          @property = property
+        def initialize(query_service: Hyrax.query_service, persister: Hyrax.persister, publisher: Hyrax.publisher)
           @persister = persister
           @query_service = query_service
           @publisher = publisher
@@ -29,10 +28,10 @@ module Hyrax
         def call(resource)
           return Failure(:resource_not_persisted) unless resource.persisted?
 
-          resource[@property].each do |file_id|
-            return Failure[:failed_to_delete_file_metadata, file_id] unless
+          @query_service.custom_queries.find_files(file_set: resource).each do |file_metadata|
+            return Failure[:failed_to_delete_file_metadata, file_metadata.id] unless
               Hyrax::Transactions::Container['file_metadata.destroy']
-              .call(@query_service.custom_queries.find_file_metadata_by(id: file_id))
+              .call(file_metadata)
               .success?
           rescue ::Ldp::Gone
             nil

data/lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '5.0.0'
+  VERSION = '5.0.1'
 end

data/template.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
-gem 'hyrax', '5.0.0'
+gem 'hyrax', '5.0.1'
 run 'bundle install'
 generate 'hyrax:install', '-f'