hyrax 5.0.0.rc2 → 5.0.0

data/app/search_builders/hyrax/file_set_search_builder.rb

@@ -5,7 +5,7 @@ module Hyrax
 
     # This overrides the models in FilterByType
     def models
-      [::FileSet, ::Hyrax::FileSet]
+      Hyrax::ModelRegistry.file_set_classes
     end
   end
 end

data/app/search_builders/hyrax/filter_by_type.rb

@@ -43,7 +43,7 @@ module Hyrax
     # types from appearing in search results
     # @return [Array<Class>] the list of work types to include in searches
     def work_types
-      Hyrax.config.curation_concerns
+      Hyrax::ModelRegistry.work_classes
     end
 
     def work_classes
@@ -53,7 +53,8 @@ module Hyrax
 
     def collection_classes
       return [] if only_works?
-      [::Collection, Hyrax.config.collection_class].uniq
+
+      Hyrax::ModelRegistry.collection_classes
     end
   end
 end

data/app/search_builders/hyrax/member_with_files_search_builder.rb

@@ -9,7 +9,7 @@ module Hyrax
     # This is like include_collection_ids, but it also joins the files.
     def include_contained_files(solr_parameters)
       solr_parameters[:fq] ||= []
-      solr_parameters[:fq] << "{!join from=file_set_ids_ssim to=id}{!join from=child_object_ids_ssim to=id}id:#{collection_id}"
+      solr_parameters[:fq] << "{!join from=member_ids_ssim to=id}{!join from=child_object_ids_ssim to=id}id:#{collection_id}"
     end
 
     # include filters into the query to only include the collection memebers

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

@@ -18,7 +18,7 @@ class Hyrax::My::CollectionsSearchBuilder < ::Hyrax::CollectionSearchBuilder
   # This overrides the models in FilterByType
   # @return [Array<Class>] a list of classes to include
   def models
-    [::AdminSet, Hyrax::AdministrativeSet, ::Collection, Hyrax.config.collection_class].uniq.compact
+    Hyrax::ModelRegistry.admin_set_classes + Hyrax::ModelRegistry.collection_classes
   end
 
   private
@@ -26,7 +26,7 @@ class Hyrax::My::CollectionsSearchBuilder < ::Hyrax::CollectionSearchBuilder
   def query_for_my_collections
     query_service = Hyrax::SolrQueryService.new
     query_service.with_field_pairs(field_pairs: { depositor_ssim: current_user_key }, type: 'terms')
-    query_service.with_field_pairs(field_pairs: { has_model_ssim: Hyrax.config.admin_set_model,
+    query_service.with_field_pairs(field_pairs: { has_model_ssim: Hyrax::ModelRegistry.admin_set_rdf_representations.join(','),
                                                   creator_ssim: current_user_key }, type: 'terms')
     query_service.build(join_with: 'OR')
   end

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

@@ -20,11 +20,11 @@ class Hyrax::My::FindWorksSearchBuilder < Hyrax::My::SearchBuilder
 
   def show_only_other_works(solr_parameters)
     solr_parameters[:fq] ||= []
-    solr_parameters[:fq] += ["-#{Hyrax::SolrQueryBuilderService.construct_query_for_ids([@id])}"]
+    solr_parameters[:fq] += ["-#{Hyrax::SolrQueryBuilderService.construct_query_for_ids([parsed_id])}"]
   end
 
   def show_only_works_not_child(solr_parameters)
-    ids = Hyrax::SolrService.query("{!field f=id}#{@id}", fl: "member_ids_ssim", rows: 10_000).flat_map { |x| x.fetch("member_ids_ssim", []) }
+    ids = Hyrax::SolrService.query("{!field f=id}#{parsed_id}", fl: "member_ids_ssim", rows: 10_000).flat_map { |x| x.fetch("member_ids_ssim", []) }
     solr_parameters[:fq] ||= []
     solr_parameters[:fq] += ["-#{Hyrax::SolrQueryBuilderService.construct_query_for_ids([ids])}"]
   end
@@ -32,11 +32,16 @@ class Hyrax::My::FindWorksSearchBuilder < Hyrax::My::SearchBuilder
   def show_only_works_not_parent(solr_parameters)
     solr_parameters[:fq] ||= []
     solr_parameters[:fq]  += [
-      "-" + Hyrax::SolrQueryBuilderService.construct_query(member_ids_ssim: @id)
+      "-" + Hyrax::SolrQueryBuilderService.construct_query(member_ids_ssim: parsed_id)
     ]
   end
 
   def only_works?
     true
   end
+
+  # Since Valkyrie objects pass is an Id object, additional parsing is needed.
+  def parsed_id
+    @id.is_a?(String) ? @id : @id.id
+  end
 end

data/app/services/hyrax/access_control_list.rb

@@ -48,14 +48,24 @@ module Hyrax
   #   # => #<Set: {#<Hyrax::Permission access_to=#<Valkyrie::ID:0x000055628b0ae0b8 @id="my_id"> agent="group/public" mode=:read>}>
   class AccessControlList
     ##
-    # @!attribute [rw] resource
+    # @!attribute [r] resource
     #   @return [Valkyrie::Resource]
     # @!attribute [r] persister
     #   @return [#save]
     # @!attribute [r] query_service
     #   @return [#find_inverse_references_by]
     attr_reader :persister, :query_service
-    attr_accessor :resource
+    attr_reader :resource
+
+    ##
+    # @param value [Valkyrie::Resource]
+    # @return [Valkyrie::Resource]
+    def resource=(value)
+      # We need to remove the memoization as the @resource has changed.
+      @change_set = nil
+      @access_control_model = nil
+      @resource = value
+    end
 
     ##
     # @api public
@@ -167,7 +177,14 @@ module Hyrax
       return true unless pending_changes?
 
       change_set.sync
-      persister.save(resource: change_set.resource)
+
+      # change_set.resource is a Hyrax::AccessControl
+      #
+      # We're setting the once fetched access_control_model to what was returned, so as to avoid
+      # a refetch
+      @access_control_model = persister.save(resource: change_set.resource)
+
+      # self.resource is a Hyrax::Resource
       Hyrax.publisher.publish('object.acl.updated', acl: self, result: :success)
       @change_set = nil
 
@@ -251,7 +268,7 @@ module Hyrax
     ##
     # @api private
     def access_control_model
-      AccessControl.for(resource: resource, query_service: query_service)
+      @access_control_model ||= AccessControl.for(resource: resource, query_service: query_service)
     end
 
     ##

data/app/services/hyrax/action/create_valkyrie_work.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Action
+    ##
+    # @since 5.0.0
+    # @api public
+    #
+    # Encapsulating the logic of several interacting objects.  Namely the idea of using a form to
+    # {#validate} given parameters then to {#perform} the action by leveraging the {#transactions}'s
+    # {#transaction_name} configured with appropriate {#step_args} and ultimately providing the
+    # {#form} to then perform that work.
+    class CreateValkyrieWork
+      ##
+      # @!group Class Attributes
+      #
+      # @!attribute transaction_name
+      #   @return [String] the name of the transaction that we call for the CreateValkyrieWorkAction.
+      class_attribute :transaction_name, default: 'change_set.create_work'
+      # @!endgroup Class Attributes
+      ##
+
+      ##
+      # @param form [Object] the form that we'll use for validation and performing the action.
+      # @param transactions [Hyrax::Transactions::Container] the transactions
+      # @param user [User] the person performing the action
+      # @param params [Hash] the contextual parameters for the action; ApplicationController#params
+      #        if you will.
+      # @param work_attribute_key [String] the name of the key within the params that contains
+      #        the work's attributes
+      def initialize(form:, transactions:, user:, params:, work_attributes_key:)
+        @form = form
+        @transactions = transactions
+        @user = user
+        @params = params
+        @work_attributes_key = work_attributes_key
+        @work_attributes = @params.fetch(work_attributes_key, {})
+      end
+
+      attr_reader :form, :transactions, :user, :parent_id, :work_attributes, :uploaded_files, :params, :work_attributes_key
+
+      ##
+      # @api public
+      # @return [TrueClass] when the object is valid.
+      # @return [FalseClass] when the object is valid.
+      def validate
+        form.validate(work_attributes)
+      end
+
+      ##
+      # @api public
+      # @return [#value_or] the resulting created work, when successful.  When not successful, the
+      #         returned value call the given block.
+      def perform
+        transactions[transaction_name].with_step_args(**step_args).call(form)
+      end
+
+      ##
+      # @api public
+      #
+      # @return [Hash<String,Hash>] the step args to use for the given {#transactions}'s
+      #         {.transaction_name}
+      def step_args
+        {
+          'work_resource.add_to_parent' => { parent_id: params[:parent_id], user: user },
+          'work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: work_attributes[:file_set] },
+          'change_set.set_user_as_depositor' => { user: user },
+          'work_resource.change_depositor' => { user: ::User.find_by_user_key(form.on_behalf_of) },
+          'work_resource.save_acl' => { permissions_params: form.input_params["permissions"] }
+        }
+      end
+
+      # rubocop:disable Lint/DuplicateMethods
+      def uploaded_files
+        UploadedFile.find(params.fetch(:uploaded_files, []))
+      end
+      # rubocop:enable Lint/DuplicateMethods
+    end
+  end
+end

data/app/services/hyrax/admin_set_create_service.rb

@@ -84,12 +84,16 @@ module Hyrax
       # Create an instance of `Hyrax::AdministrativeSet` with the suggested_id if supported.
       # @return [Hyrax::AdministrativeSet] the new admin set
       def create_admin_set(suggested_id:, title:)
-        if suggested_id.blank? || Hyrax.config.disable_wings || !Hyrax.metadata_adapter.is_a?(Wings::Valkyrie::MetadataAdapter)
+        # Leverage the configured admin class, if it is a Valkyrie resource, otherwise fallback.
+        # Until we have fully moved to Valkyrie, we will need this logic.  Once past, we can
+        # use `Hyrax.config.admin_set_class`
+        klass = Hyrax.config.admin_set_class < Valkyrie::Resource ? Hyrax.config.admin_set_class : Hyrax::AdministrativeSet
+        if suggested_id.blank? || Hyrax.config.disable_wings
           # allow persister to assign id
-          Hyrax::AdministrativeSet.new(title: Array.wrap(title))
+          klass.new(title: Array.wrap(title))
         else
           # use suggested_id
-          Hyrax::AdministrativeSet.new(id: suggested_id, title: Array.wrap(title))
+          klass.new(id: suggested_id, title: Array.wrap(title))
         end
       end
 

data/app/services/hyrax/admin_set_service.rb

@@ -52,8 +52,8 @@ module Hyrax
     def count_files(admin_sets)
       file_counts = Hash.new(0)
       admin_sets.each do |admin_set|
-        query = "{!join from=file_set_ids_ssim to=id}isPartOf_ssim:#{admin_set.id}"
-        file_results = Hyrax::SolrService.get(fq: [query, "has_model_ssim:FileSet"], rows: 0)
+        query = "{!join from=member_ids_ssim to=id}isPartOf_ssim:#{admin_set.id}"
+        file_results = Hyrax::SolrService.get(fq: [query, "{!terms f=has_model_ssim}FileSet,Hyrax::FileSet"], rows: 0)
         file_counts[admin_set.id] = file_results['response']['numFound']
       end
       file_counts

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

@@ -46,8 +46,10 @@ module Hyrax
       #
       # @return [Blacklight::Solr::Response]
       def available_member_works
+        sort_field = user_params[:sort]
         response, _docs = search_results do |builder|
           builder.search_includes_models = :works
+          builder.merge(sort: sort_field)
           builder
         end
         response

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 module Hyrax
   module Collections
+    # rubocop:disable Metrics/ClassLength
     class PermissionsService
       # @api private
       #
@@ -20,17 +21,34 @@ module Hyrax
       end
       private_class_method :source_ids_for_user
 
+      # rubocop:disable Metrics/MethodLength
       def self.filter_source(source_type:, ids:)
         return [] if ids.empty?
-        model = case source_type
-                when 'admin_set'
-                  Hyrax::AdministrativeSet
-                when 'collection'
-                  Hyrax::PcdmCollection
-                end
+        models = case source_type
+                 when 'admin_set'
+                   Hyrax::ModelRegistry.admin_set_classes
+                 when 'collection'
+                   Hyrax::ModelRegistry.collection_classes
+                 end
 
-        Hyrax.custom_queries.find_ids_by_model(model: model, ids: ids).to_a
+        # Antics to cope with all of the how the custom queries work.
+        if defined?(Wings::ModelRegistry)
+          models = models.map do |model|
+            Wings::ModelRegistry.reverse_lookup(model)
+                   rescue NoMethodError
+                     nil
+          end.compact
+        end
+
+        models.flat_map do |model|
+          if model
+            Hyrax.custom_queries.find_ids_by_model(model: model, ids: ids).to_a
+          else
+            []
+          end
+        end.uniq
       end
+      # rubocop:enable Metrics/MethodLength
       private_class_method :filter_source
 
       # @api private
@@ -203,7 +221,7 @@ module Hyrax
       end
       private_class_method :deposit_access_to_collection?
 
-      # @api private
+      # @api public
       #
       # Determine if the given user has :manage access for the given collection
       #
@@ -215,7 +233,6 @@ module Hyrax
       def self.manage_access_to_collection?(collection_id:, ability:, exclude_groups: [])
         access_to_collection?(collection_id: collection_id, access: 'manage', ability: ability, exclude_groups: exclude_groups)
       end
-      private_class_method :manage_access_to_collection?
 
       # @api private
       #
@@ -250,5 +267,6 @@ module Hyrax
       end
       private_class_method :access_to_collection?
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

data/app/services/hyrax/custom_queries/find_collections_by_type.rb

@@ -30,7 +30,7 @@ module Hyrax
       # @return [Enumerable<PcdmCollection>]
       def find_collections_by_type(global_id:)
         query_service
-          .find_all_of_model(model: PcdmCollection)
+          .find_all_of_model(model: Hyrax.config.collection_model.safe_constantize)
           .select { |collection| collection.collection_type_gid == global_id }
       end
     end

data/app/services/hyrax/custom_queries/find_file_metadata.rb

@@ -64,7 +64,7 @@ module Hyrax
       # @example
       #   Hyrax.query_service.find_file_metadata_by_use(use: ::RDF::URI("http://pcdm.org/ExtractedText"))
       def find_many_file_metadata_by_use(resource:, use:)
-        return [] unless resource.try(:file_ids)
+        return [] if resource.try(:file_ids).blank?
 
         results = find_many_file_metadata_by_ids(ids: resource.file_ids)
         results.select { |fm| fm.pcdm_use.include?(use) }

data/app/services/hyrax/custom_queries/navigators/find_files.rb

@@ -65,7 +65,7 @@ module Hyrax
         def find_thumbnail(file_set:)
           find_exactly_one_file_by_use(
             file_set: file_set,
-            use: Hyrax::FileMetadata::Use::THUMBNAIL
+            use: Hyrax::FileMetadata::Use::THUMBNAIL_IMAGE
           )
         end
 

data/app/services/hyrax/custom_queries/navigators/parent_work_navigator.rb

@@ -33,7 +33,7 @@ module Hyrax
           if results.count > 1
             Hyrax.logger.warn("#{resource.work? ? 'Work' : 'File set'} " \
                               "#{resource.id} is in #{results.count} works when it " \
-                              "should be in no more than one.")
+                              "should be in no more than one. Found in #{results.map(&:id).join(', ')}.")
           end
           results.first
         end

data/app/services/hyrax/edit_permissions_service.rb

@@ -215,7 +215,7 @@ module Hyrax
     # @todo Refactor inner working of code as there's lots of branching logic with potential hidden assumptions.
     def qualifies_as_unauthorized_collection?(resource:)
       case resource
-      when AdminSet, Hyrax::AdministrativeSet
+      when *Hyrax::ModelRegistry.admin_set_classes
         # Prior to this refactor, we looked at AdminSet only; However with the advent of the
         # Hyrax::AdministrativeSet, we need to test both cases.
         true

data/app/services/hyrax/embargo_manager.rb

@@ -176,7 +176,7 @@ module Hyrax
     # Deactivates the embargo
     # @return [Boolean]
     def deactivate!
-      release!(force: true)
+      release(force: true)
       nullify(force: true)
     end
 

data/app/services/hyrax/file_set_file_service.rb

@@ -2,8 +2,17 @@
 
 module Hyrax
   ##
-  # A service for accessing specific Hyrax::FileMetadata objects referenced by a
-  # Hyrax::FileSet.
+  # A service for accessing {Hyrax::FileMetadata} resources by their status
+  # within a {Hyrax::FileSet}. For example, this is the home for the abstraction
+  # of a "Primary" file for the FileSet, used for versioning and as the default
+  # source for the FileSet label, etc...
+  #
+  # If you're looking for {Hyrax::FileMetadata} by PCDM Use, use the custom
+  # queries (e.g. +Hyrax.custom_queries.find_original_file+).
+  #
+  # @note housing the "primary" file abstraction here allows us to begin
+  #   separating from the idea that the `pcdmuse:OriginalFile` is special
+  #   in Hyrax in a hard coded way.
   class FileSetFileService
     ##
     # @!attribute [r] file_set
@@ -23,7 +32,7 @@ module Hyrax
     end
 
     ##
-    # Return the Hyrax::FileMetadata which should be considered “original” for
+    # 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,
@@ -32,7 +41,7 @@ module Hyrax
     # first file in its :file_ids.
     #
     # @return [Hyrax::FileMetadata]
-    def original_file
+    def primary_file
       if file_set.original_file_id
         # Always just use original_file_id if it is defined.
         #
@@ -43,13 +52,15 @@ module Hyrax
         # Cache the fallback to avoid needing to do this query twice.
         #
         # See NOTE above regarding use of :find_file_metadata_by.
-        @original_file ||= begin
-                             query_service.custom_queries.find_original_file(file_set: file_set)
-                           rescue Valkyrie::Persistence::ObjectNotFoundError
-                             fallback_id = file_set.file_ids.first
-                             query_service.custom_queries.find_file_metadata_by(id: fallback_id) if fallback_id
-                           end
+        @primary_file ||= begin
+                            query_service.custom_queries.find_original_file(file_set: file_set)
+                          rescue Valkyrie::Persistence::ObjectNotFoundError
+                            fallback_id = file_set.file_ids.first
+                            query_service.custom_queries.find_file_metadata_by(id: fallback_id) if fallback_id
+                          end
       end
     end
+    alias original_file primary_file
+    deprecation_deprecate :original_file
   end
 end

data/app/services/hyrax/form_factory.rb

@@ -23,7 +23,7 @@ module Hyrax
     #
     # @see https://trailblazer.to/2.0/gems/reform/prepopulator.html
     def build(model, _ability, _controller)
-      Hyrax::Forms::ResourceForm.for(model).prepopulate!
+      Hyrax::Forms::ResourceForm.for(resource: model).prepopulate!
     end
   end
 end

data/app/services/hyrax/lease_manager.rb

@@ -12,12 +12,13 @@ module Hyrax
   #       date is today or later.
   #    - "Applied" means the lease's pre-expiration visibility has been set on
   #      the resource.
-  #    - "Released" means the lease's post-expiration visibility has been set on
-  #      the resource.
   #    - "Enforced" means the object's visibility matches the pre-expiration
   #      visibility of the lease; i.e. the lease has been applied,
   #      but not released.
-  #    - "Deactivate" means that the existing lease will be removed
+  #    - "Released" means the leases's post-release visibility has been set on
+  #      the resource.
+  #    - "Deactivate" means that the existing lease will be removed, even if it
+  #      is active
   #
   class LeaseManager # rubocop:disable Metrics/ClassLength
     ##
@@ -53,11 +54,25 @@ module Hyrax
           .lease
       end
 
+      # @return [Boolean]
+      def deactivate_lease_for(resource:, query_service: Hyrax.query_service)
+        new(resource: resource, query_service: query_service)
+          .deactivate
+      end
+
+      # @return [Boolean]
+      def deactivate_lease_for!(resource:, query_service: Hyrax.query_service)
+        new(resource: resource, query_service: query_service)
+          .deactivate!
+      end
+
+      # @return [Boolean]
       def release_lease_for(resource:, query_service: Hyrax.query_service)
         new(resource: resource, query_service: query_service)
           .release
       end
 
+      # @return [Boolean]
       def release_lease_for!(resource:, query_service: Hyrax.query_service)
         new(resource: resource, query_service: query_service)
           .release!
@@ -93,20 +108,15 @@ module Hyrax
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
     end
 
+    def deactivate
+      release(force: true) &&
+        nullify(force: true)
+    end
+
     # Deactivates the lease and logs a message to the lease_history property
     def deactivate!
-      lease_state = lease.active? ? 'active' : 'expired'
-      lease_record = lease_history_message(
-        lease_state,
-        Time.zone.today,
-        lease.lease_expiration_date,
-        lease.visibility_during_lease,
-        lease.visibility_after_lease
-      )
-
       release(force: true)
       nullify(force: true)
-      lease.lease_history += [lease_record]
     end
 
     ##
@@ -153,14 +163,15 @@ module Hyrax
     ##
     # Drop the lease by setting its release date and visibility settings to `nil`.
     #
-    # @param force [boolean] force the nullify even when the lease period is current
-    # @return [void]
+    # @param force [Boolean] force the nullify even when the lease period is current
+    # @return [Boolean]
     def nullify(force: false)
       return false if !force && under_lease?
 
       lease.lease_expiration_date = nil
       lease.visibility_during_lease = nil
       lease.visibility_after_lease = nil
+      true
     end
 
     ##
@@ -172,6 +183,18 @@ module Hyrax
     # @return [Boolean]
     def release(force: false)
       return false if !force && under_lease?
+
+      lease_state = lease.active? ? 'active' : 'expired'
+      history_record = lease_history_message(
+        lease_state,
+        Hyrax::TimeService.time_in_utc,
+        lease.lease_expiration_date,
+        lease.visibility_during_lease,
+        lease.visibility_after_lease
+      )
+
+      lease.lease_history += [history_record]
+
       return true if lease.visibility_after_lease.nil?
 
       resource.visibility = lease.visibility_after_lease
@@ -202,7 +225,7 @@ module Hyrax
       [:visibility_after_lease, :visibility_during_lease, :lease_expiration_date]
     end
 
-    # Create the log message used when deactivating a lease
+    # Create the log message used when releasing a lease
     def lease_history_message(state, deactivate_date, expiration_date, visibility_during, visibility_after)
       I18n.t 'hydra.lease.history_message',
               state: state,

data/app/services/hyrax/lease_service.rb

@@ -1,20 +1,26 @@
 # frozen_string_literal: true
 module Hyrax
+  ##
+  # Methods for Querying Repository to find Objects with leases
   class LeaseService < RestrictionService
     class << self
       # Returns all assets with lease expiration date set to a date in the past
-      def assets_with_expired_leases
+      def assets_with_expired_enforced_leases
         builder = Hyrax::ExpiredLeaseSearchBuilder.new(self)
         presenters(builder)
       end
+      alias assets_with_expired_leases assets_with_expired_enforced_leases
 
-      # Returns all assets with lease expiration date set
-      #   (assumes that when lease visibility is applied to assets
-      #    whose leases have expired, the lease expiration date will be removed from its metadata)
-      def assets_under_lease
+      ##
+      # Returns all assets with leases that are currently enforced,
+      # regardless of whether the leases are active or expired.
+      #
+      # @see Hyrax::LeaseManager
+      def assets_with_enforced_leases
         builder = Hyrax::LeaseSearchBuilder.new(self)
-        presenters(builder)
+        presenters(builder).select(&:enforced?)
       end
+      alias assets_under_lease assets_with_enforced_leases
 
       # Returns all assets that have had embargoes deactivated in the past.
       def assets_with_deactivated_leases

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

@@ -7,7 +7,7 @@ module Hyrax
     #
     # Hyrax's `Ability` behavior depends on the index being up-to-date as
     # concerns-their read/write users/groups, and visibility.
-    class AclIndexListener
+    class ACLIndexListener
       ##
       # Re-index the resource for the updated ACL.
       #

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

@@ -7,7 +7,7 @@ module Hyrax
     #
     # Hyrax's `Ability` behavior depends on the index being up-to-date as
     # concerns-their read/write users/groups, and visibility.
-    class ActiveFedoraAclIndexListener
+    class ActiveFedoraACLIndexListener
       ##
       # Re-index the resource for the updated ACL.
       #

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

@@ -8,7 +8,21 @@ module Hyrax
       # Called when 'object.deleted' event is published
       # @param [Dry::Events::Event] event
       # @return [void]
-      def on_object_deleted(event); end
+      def on_object_deleted(event)
+        event = event.to_h
+        return unless event[:object]
+
+        object = event[:object]
+        user = event[:user]
+        return unless object.is_a?(Hyrax::Work)
+
+        Hyrax.query_service.find_parents(resource: object).each do |parent|
+          parent.member_ids -= [object.id]
+          Hyrax.persister.save(resource: parent)
+          Hyrax.index_adapter.save(resource: parent)
+          Hyrax.publisher.publish('object.membership.updated', object: parent, user: user)
+        end
+      end
 
       # Called when 'collection.deleted' event is published
       # @param [Dry::Events::Event] event