hyrax 3.0.0 → 3.2.0

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

@@ -2,92 +2,96 @@
 module Hyrax
   module Collections
     class PermissionsCreateService
-      # @api public
-      #
-      # Set the default permissions for a (newly created) collection
-      #
-      # @param collection [::Collection] the collection the new permissions will act on
-      # @param creating_user [User] the user that created the collection
-      # @param grants [Array<Hash>] additional grants to apply to the new collection
-      # @return [Hyrax::PermissionTemplate]
-      def self.create_default(collection:, creating_user:, grants: [])
-        collection_type = Hyrax::CollectionType.find_by_gid!(collection.collection_type_gid)
-        access_grants = access_grants_attributes(collection_type: collection_type, creating_user: creating_user, grants: grants)
-        PermissionTemplate.create!(source_id: collection.id,
-                                   access_grants_attributes: access_grants.uniq)
-        collection.reset_access_controls!
-      end
+      class << self
+        # @api public
+        #
+        # Set the default permissions for a (newly created) collection
+        #
+        # @param collection [#collection_type_gid || Hyrax::AdministrativeSet] the collection or admin set the new permissions will act on
+        # @param creating_user [User] the user that created the collection
+        # @param grants [Array<Hash>] additional grants to apply to the new collection
+        # @return [Hyrax::PermissionTemplate]
+        def create_default(collection:, creating_user:, grants: [])
+          collection_type = Hyrax::CollectionType.find_by_gid!(collection.collection_type_gid)
+          access_grants = access_grants_attributes(collection_type: collection_type, creating_user: creating_user, grants: grants)
+          template = Hyrax::PermissionTemplate.create!(source_id: collection.id.to_s,
+                                                       access_grants_attributes: access_grants.uniq)
 
-      # @api public
-      #
-      # Add access grants to a collection
-      #
-      # @param collection_id [String] id of a collection
-      # @param grants [Array<Hash>] array of grants to add to the collection
-      # @example grants
-      #   [ { agent_type: Hyrax::PermissionTemplateAccess::GROUP,
-      #       agent_id: 'my_group_name',
-      #       access: Hyrax::PermissionTemplateAccess::DEPOSIT } ]
-      # @see Hyrax::PermissionTemplateAccess for valid values for agent_type and access
-      def self.add_access(collection_id:, grants:)
-        collection = ::Collection.find(collection_id)
-        template = Hyrax::PermissionTemplate.find_by!(source_id: collection_id)
-        grants.each do |grant|
-          Hyrax::PermissionTemplateAccess.find_or_create_by(permission_template_id: template.id,
-                                                            agent_type: grant[:agent_type],
-                                                            agent_id: grant[:agent_id],
-                                                            access: grant[:access])
+          template.reset_access_controls_for(collection: collection, interpret_visibility: true)
+          template
         end
-        collection.reset_access_controls!
-      end
 
-      # @api private
-      #
-      # Gather the default permissions needed for a new collection
-      #
-      # @param collection_type [CollectionType] the collection type of the new collection
-      # @param creating_user [User] the user that created the collection
-      # @param grants [Array<Hash>] additional grants to apply to the new collection
-      # @return [Hash] a hash containing permission attributes
-      def self.access_grants_attributes(collection_type:, creating_user:, grants:)
-        [
-          { agent_type: 'group', agent_id: admin_group_name, access: Hyrax::PermissionTemplateAccess::MANAGE }
-        ].tap do |attribute_list|
-          # Grant manage access to the creating_user if it exists
-          attribute_list << { agent_type: 'user', agent_id: creating_user.user_key, access: Hyrax::PermissionTemplateAccess::MANAGE } if creating_user
-        end + managers_of_collection_type(collection_type: collection_type) + grants
-      end
-      private_class_method :access_grants_attributes
+        # @api public
+        #
+        # Add access grants to a collection
+        #
+        # @param collection_id [String] id of a collection
+        # @param grants [Array<Hash>] array of grants to add to the collection
+        # @example grants
+        #   [ { agent_type: Hyrax::PermissionTemplateAccess::GROUP,
+        #       agent_id: 'my_group_name',
+        #       access: Hyrax::PermissionTemplateAccess::DEPOSIT } ]
+        # @see Hyrax::PermissionTemplateAccess for valid values for agent_type and access
+        def add_access(collection_id:, grants:)
+          collection = Hyrax.query_service.find_by(id: collection_id)
+          template = Hyrax::PermissionTemplate.find_by!(source_id: collection_id.to_s)
+          grants.each do |grant|
+            Hyrax::PermissionTemplateAccess.find_or_create_by(permission_template_id: template.id.to_s,
+                                                              agent_type: grant[:agent_type],
+                                                              agent_id: grant[:agent_id],
+                                                              access: grant[:access])
+          end
 
-      # @api private
-      #
-      # Retrieve the users or groups with manage permissions for a collection type
-      #
-      # @param collection_type [CollectionType] the collection type of the new collection
-      # @return [Hash] a hash containing permission attributes
-      def self.managers_of_collection_type(collection_type:)
-        attribute_list = []
-        user_managers = Hyrax::CollectionTypes::PermissionsService.user_edit_grants_for_collection_of_type(collection_type: collection_type)
-        user_managers.each do |user|
-          attribute_list << { agent_type: 'user', agent_id: user, access: Hyrax::PermissionTemplateAccess::MANAGE }
+          template.reset_access_controls_for(collection: collection, interpret_visibility: true)
         end
-        group_managers = Hyrax::CollectionTypes::PermissionsService.group_edit_grants_for_collection_of_type(collection_type: collection_type)
-        group_managers.each do |group|
-          attribute_list << { agent_type: 'group', agent_id: group, access: Hyrax::PermissionTemplateAccess::MANAGE }
+
+        private
+
+        # @api private
+        #
+        # Gather the default permissions needed for a new collection
+        #
+        # @param collection_type [CollectionType] the collection type of the new collection
+        # @param creating_user [User] the user that created the collection
+        # @param grants [Array<Hash>] additional grants to apply to the new collection
+        # @return [Array<Hash>] a hash containing permission attributes
+        def access_grants_attributes(collection_type:, creating_user:, grants:)
+          [
+            { agent_type: 'group', agent_id: admin_group_name, access: Hyrax::PermissionTemplateAccess::MANAGE }
+          ].tap do |attribute_list|
+            # Grant manage access to the creating_user if it exists
+            attribute_list << { agent_type: 'user', agent_id: creating_user.user_key, access: Hyrax::PermissionTemplateAccess::MANAGE } if creating_user
+          end + managers_of_collection_type(collection_type: collection_type) + grants
+        end
+
+        # @api private
+        #
+        # Retrieve the users or groups with manage permissions for a collection type
+        #
+        # @param collection_type [CollectionType] the collection type of the new collection
+        # @return [Array<Hash>] a hash containing permission attributes
+        def managers_of_collection_type(collection_type:)
+          attribute_list = []
+          user_managers = Hyrax::CollectionTypes::PermissionsService.user_edit_grants_for_collection_of_type(collection_type: collection_type)
+          user_managers.each do |user|
+            attribute_list << { agent_type: 'user', agent_id: user, access: Hyrax::PermissionTemplateAccess::MANAGE }
+          end
+          group_managers = Hyrax::CollectionTypes::PermissionsService.group_edit_grants_for_collection_of_type(collection_type: collection_type)
+          group_managers.each do |group|
+            attribute_list << { agent_type: 'group', agent_id: group, access: Hyrax::PermissionTemplateAccess::MANAGE }
+          end
+          attribute_list
         end
-        attribute_list
-      end
-      private_class_method :managers_of_collection_type
 
-      # @api private
-      #
-      # The value of the admin group name
-      #
-      # @return [String] a string representation of the admin group name
-      def self.admin_group_name
-        ::Ability.admin_group_name
+        # @api private
+        #
+        # The value of the admin group name
+        #
+        # @return [String] a string representation of the admin group name
+        def admin_group_name
+          ::Ability.admin_group_name
+        end
       end
-      private_class_method :admin_group_name
     end
   end
 end

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

@@ -243,7 +243,7 @@ module Hyrax
       # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
       def self.access_to_collection?(collection_id:, access:, ability:, exclude_groups: [])
         return false unless collection_id
-        template = Hyrax::PermissionTemplate.find_by!(source_id: collection_id)
+        template = Hyrax::PermissionTemplate.find_by!(source_id: collection_id.to_s)
         return true if ([ability.current_user.user_key] & template.agent_ids_for(agent_type: 'user', access: access)).present?
         return true if (ability.user_groups & (template.agent_ids_for(agent_type: 'group', access: access) - exclude_groups)).present?
         false

data/app/services/hyrax/contextual_path.rb

@@ -1,17 +1,40 @@
 # frozen_string_literal: true
 module Hyrax
+  ##
+  # @api public
+  #
+  # Provides a polymorphic path for a target object (presenter) nested under the
+  # path of the parent, if given.
+  #
+  # @see WorkShowPresenter#contextual_path
+  #
+  # @example
+  #   Hyrax::ContextualPath.new(my_file_set, parent_object).show
+  #   # => "/concerns/parent/id4parent/file_sets/id4file_set"
+  #
+  # @example with a nil parent
+  #   Hyrax::ContextualPath.new(my_file_set, nil).show
+  #   # => "/concerns/file_sets/id4file_set"
+  #
   class ContextualPath
     include Rails.application.routes.url_helpers
     include ActionDispatch::Routing::PolymorphicRoutes
     attr_reader :presenter, :parent_presenter
+
+    ##
+    # @param presenter [#model_name] an ActiveModel-like target object
+    # @param parent_presenter [#id, nil] an ActiveModel-like presenter for the
+    #   target's parent
     def initialize(presenter, parent_presenter)
       @presenter = presenter
       @parent_presenter = parent_presenter
     end
 
+    ##
+    # @return [String]
     def show
       if parent_presenter
-        polymorphic_path([:hyrax, :parent, presenter.model_name.singular],
+        polymorphic_path([:hyrax, :parent, presenter.model_name.singular.to_sym],
                          parent_id: parent_presenter.id,
                          id: presenter.id)
       else

data/app/services/hyrax/curation_concern.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 module Hyrax
   class CurationConcern
+    ##
     # The actor middleware stack can be customized like so:
     #   # Adding a new middleware
     #   Hyrax::CurationConcern.actor_factory.use MyCustomActor
@@ -16,14 +17,35 @@ module Hyrax
     #
     # You can customize the actor stack, so long as you do so before the actor
     # is used.  Once it is used, it becomes immutable.
+    #
     # @return [ActionDispatch::MiddlewareStack]
+    # @see Hyrax::DefaultMiddlewareStack
     def self.actor_factory
       @actor_factory ||= Hyrax::DefaultMiddlewareStack.build_stack
     end
 
-    # A consumer of this method can inject a different factory
-    # into this class in order to change the behavior of this method.
+    ##
+    # Provides the Hyrax "Actor Stack" used during creation of Works when
+    # +ActiveFedora+ models are used by the application
+    #
+    # The "Actor Stack" consists of a series of objects ("Actors"), which
+    # implement +#create+, +#update+ and +#destroy+. Each actor's methods
+    # promise to call the same methods on the next actor in the series, and may
+    # do some work before (on the way down the stack) and/or after (on the
+    # way up) calling to the next actor.
+    #
+    # The normal convention is to call an actor inheriting
+    # {Hyrax::Actors::BaseActor} at or near the bottom of the stack, to handle
+    # the create, update , or destroy action.
+    #
+    # @note this stack, and the Actor classes it calls, is not used when
+    #   +Valkyrie+ models are defined by the application. in that context,
+    #   this behavior is replaced by `Hyrax::Transactions::Container`.
+    #
     # @return [#create, #update] an actor that can create and update the work
+    #
+    # @see Hyrax::DefaultMiddlewareStack
+    # @see https://samvera.github.io/actor_stack.html
     def self.actor
       @work_middleware_stack ||= actor_factory.build(Actors::Terminator.new)
     end

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

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
-# Provide custom queries for finding Hyrax::FileMetadata
-# @example
-#   Hyrax.custom_queries.find_file_metadata_by(id: valkyrie_id)
-#   Hyrax.custom_queries.find_file_metadata_by_alternate_identifier(alternate_identifier: alt_id)
-#   Hyrax.custom_queries.find_many_file_metadata_by_ids(ids: [valkyrie_id, valkyrie_id])
 module Hyrax
   module CustomQueries
+    ##
+    # Provide custom queries for finding Hyrax::FileMetadata
+    #
+    # @example
+    #   Hyrax.custom_queries.find_file_metadata_by(id: valkyrie_id)
+    #   Hyrax.custom_queries.find_file_metadata_by_alternate_identifier(alternate_identifier: alt_id)
+    #   Hyrax.custom_queries.find_many_file_metadata_by_ids(ids: [valkyrie_id, valkyrie_id])
     class FindFileMetadata
       def self.queries
         [:find_file_metadata_by,

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module CustomQueries
+    module Navigators
+      ##
+      # Navigate from a resource to the parent collections of the resource.
+      #
+      # @see https://github.com/samvera/valkyrie/wiki/Queries#custom-queries
+      # @since 3.0.0
+      class ParentCollectionsNavigator
+        # Define the queries that can be fulfilled by this navigator.
+        def self.queries
+          [:find_parent_collections, :find_parent_collection_ids]
+        end
+
+        attr_reader :query_service
+
+        def initialize(query_service:)
+          @query_service = query_service
+        end
+
+        ##
+        # Find parent collections of a given resource, and map to Valkyrie Resources
+        #
+        # @param [Valkyrie::Resource] resource
+        #
+        # @return [Array<Valkyrie::Resource>]
+        def find_parent_collections(resource:)
+          query_service
+            .find_many_by_ids(ids: find_parent_collection_ids(resource: resource))
+        end
+
+        ##
+        # Find the ids of parent collections of a given resource, and map to Valkyrie Resources IDs
+        #
+        # @param [Valkyrie::Resource] resource
+        #
+        # @return [Array<Valkyrie::ID>]
+        def find_parent_collection_ids(resource:)
+          resource.member_of_collection_ids
+        end
+      end
+    end
+  end
+end

data/app/services/hyrax/default_middleware_stack.rb

@@ -1,5 +1,16 @@
 # frozen_string_literal: true
 module Hyrax
+  ##
+  # Defines the Hyrax "Actor Stack", used in creation of works when using
+  # +ActiveFedora+.
+  #
+  # @note this stack, and the Actor classes it calls, is not used when
+  #   +Valkyrie+ models are defined by the application. in that context,
+  #   this behavior is replaced by `Hyrax::Transactions::Container`.
+  #
+  # @see Hyrax::CurationConcern.actor
+  # @see Hyrax::WorksControllerBehavior#create
+  # @see Hyrax::WorksControllerBehavior#update
   class DefaultMiddlewareStack
     # rubocop:disable Metrics/MethodLength
     def self.build_stack

data/app/services/hyrax/edit_permissions_service.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 module Hyrax
+  ##
+  # @api public
+  #
   # Encapsulates the logic to determine which object permissions may be edited by a given user
-  #  - user is permitted to update any work permissions coming ONLY from collections they manage
-  #  - user is not permitted to update a work permission if it comes from a collection they do not manage, even if also from a managed collection
-  #  - user is permitted to update only non-manager permissions from any Collections
-  #  - user is permitted to update any non-collection permissions
+  # * user is permitted to update any work permissions coming ONLY from collections they manage
+  # * user is not permitted to update a work permission if it comes from a collection they do not manage, even if also from a managed collection
+  # * user is permitted to update only non-manager permissions from any Collections
+  # * user is permitted to update any non-collection permissions
   class EditPermissionsService
+    ##
     # @api public
     # @since v3.0.0
     #
@@ -14,15 +18,15 @@ module Hyrax
     # @return [Hyrax::EditPermissionService]
     #
     # @note
-    #   form object.class = SimpleForm::FormBuilder
-    #     For works (i.e. GenericWork):
-    #     - form object.object = Hyrax::GenericWorkForm
-    #     - form object.object.model = GenericWork
-    #     - use the work itself
-    #     For file_sets:
-    #     - form object.object.class = FileSet
-    #     - use work the file_set is in
-    #     No other object types are supported by this view. %>
+    #   +form object.class = SimpleForm::FormBuilder+
+    #    For works (i.e. GenericWork):
+    #    * form object.object = Hyrax::GenericWorkForm
+    #    * form object.object.model = GenericWork
+    #    * use the work itself
+    #    For file_sets:
+    #    * form object.object.class = FileSet
+    #    * use work the file_set is in
+    #    No other object types are supported by this view.
     def self.build_service_object_from(form:, ability:)
       if form.object.respond_to?(:model) && form.object.model.work?
         new(object: form.object, ability: ability)
@@ -33,7 +37,9 @@ module Hyrax
 
     attr_reader :depositor, :unauthorized_collection_managers
 
-    # @param object [#depositor, #admin_set_id, #member_of_collection_ids] GenericWorkForm (if called for object) or GenericWork (if called for file set)
+    ##
+    # @param object [#depositor, #admin_set_id, #member_of_collection_ids]
+    #   +GenericWorkForm+ (if called for object) or +GenericWork+ (if called for file set)
     # @param ability [Ability] user's current_ability
     def initialize(object:, ability:)
       @object = object
@@ -47,7 +53,7 @@ module Hyrax
     # @api private
     # @todo refactor this code to use "can_edit?"; Thinking in negations can be challenging.
     #
-    # @param permission_hash [Hash] one set of permission fields for object {:name, :access}
+    # @param permission_hash [Hash] one set of permission fields for object +:name+, :access}
     # @return [Boolean] true if user cannot edit the given permissions
     def cannot_edit_permissions?(permission_hash)
       permission_hash.fetch(:access) == "edit" && @unauthorized_managers.include?(permission_hash.fetch(:name))
@@ -55,7 +61,7 @@ module Hyrax
 
     # @api private
     #
-    # @param permission_hash [Hash] one set of permission fields for object {:name, :access}
+    # @param permission_hash [Hash] one set of permission fields for object +:name+, +:access+
     # @return [Boolean] true if given permissions are one of fixed exclusions
     def excluded_permission?(permission_hash)
       exclude_from_display.include? permission_hash.fetch(:name).downcase
@@ -68,9 +74,10 @@ module Hyrax
     # * returns false if the given permission_hash is part of the fixed exclusions.
     # * yields a PermissionPresenter to provide additional logic and text for rendering
     #
-    # @param permission_hash [Hash<:name, :access>]
-    # @return false if the given permission_hash is a fixed exclusion
-    # @yield PermissionPresenter
+    # @param permission_hash [Hash{Symbol => Object}]
+    #
+    # @return [Boolean] +false+ if the given +permission_hash+ is a fixed exclusion
+    # @yield [PermissionPresenter]
     #
     # @see #excluded_permission?
     def with_applicable_permission(permission_hash:)
@@ -81,7 +88,7 @@ module Hyrax
     # @api private
     #
     # A helper class to contain specific presentation logic related to
-    # the EditPermissionsService
+    # the {EditPermissionsService}
     class PermissionPresenter
       # @param service [Hyrax::EditPermissionsService]
       # @param permission_hash [Hash]
@@ -158,38 +165,64 @@ module Hyrax
     # find all of the work's collections a user can manage
     # @return [Array] of collection ids
     def object_managed_collection_ids
-      @object_managed_collection_ids ||= object_member_of & managed_collection_ids
+      @object_managed_collection_ids ||= object_member_of_ids & managed_collection_ids
     end
 
-    # find all of the work's collections a user cannot manage
-    # note: if the collection type doesn't include "sharing_applies_to_new_works", we don't limit access
+    # find all of the work's collections a user cannot manage note: if
+    # the collection type doesn't include
+    # "sharing_applies_to_new_works", we don't limit access
+    #
     # @return [Array] of collection ids with limited access
     def object_unauthorized_collection_ids
       @object_unauthorized_collection_ids ||= begin
-                                                limited_access = []
-                                                unauthorized_collection_ids = object_member_of - object_managed_collection_ids
-                                                if unauthorized_collection_ids.any?
-                                                  unauthorized_collection_ids.each do |id|
-                                                    # TODO: Can we instead use a SOLR query?  This seems to be somewhat expensive.  However, as this is
-                                                    # used in administration instead of user front-end displays, I'm not as concerned.
-                                                    collection = ActiveFedora::Base.find(id)
-                                                    limited_access << id if (collection.instance_of? AdminSet) || collection.share_applies_to_new_works?
-                                                  end
+                                                unauthorized_collection_ids = object_member_of_ids - object_managed_collection_ids
+                                                qualified_resources = Hyrax.query_service.find_many_by_ids(ids: unauthorized_collection_ids).select do |resource|
+                                                  qualifies_as_unauthorized_collection?(resource: resource)
                                                 end
-                                                limited_access
+                                                qualified_resources.map { |resource| resource.id.to_s }
                                               end
     end
 
+    # Does the given resource qualify as a collection the current user cannot manage.
+    #
+    # @see {#object_unauthorized_collection_ids}
+    #
+    # @param resource [Valkyrie::Resource, AdminSet, Collection, #collection_type_gid, #share_applies_to_new_works?]
+    #     the given resource, hopefully a collection-like thing
+    #     (e.g. AdminSet, Hyrax::AdminSet, Hyrax::PcdmCollection,
+    #     Collection)
+    #
+    # @return [Boolean]
+    #
+    # @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
+        # Prior to this refactor, we looked at AdminSet only; However with the advent of the
+        # Hyrax::AdministrativeSet, we need to test both cases.
+        true
+      else
+        if resource.respond_to?(:share_applies_to_new_works?)
+          # The Collection model has traditionally delegated #share_applies_to_new_works? to
+          # the underlying collection_type
+          # (see https://github.com/samvera/hyrax/blob/696da5db/spec/models/collection_spec.rb#L189)
+          resource.share_applies_to_new_works?
+        elsif resource.respond_to?(:collection_type_gid)
+          # This is likely a Hyrax::PcdmCollection object, which means we don't have the delegation
+          # behavior.  Instead we'll query the collection type directly.
+          collection_type = CollectionType.find_by_gid(resource.collection_type_gid)
+          collection_type&.share_applies_to_new_works?
+        else
+          # How might we get here?
+          false
+        end
+      end
+    end
+
     # find all of the collection ids an object is a member of
     # @return [Array] array of collection ids
-    def object_member_of
-      @object_member_of ||= begin
-                              belongs_to = []
-                              # get all of work's collection ids from the form
-                              belongs_to += @object.member_of_collection_ids
-                              belongs_to << @object.admin_set_id if @object.admin_set_id.present?
-                              belongs_to
-                            end
+    def object_member_of_ids
+      @object_member_of_ids ||= (@object.member_of_collection_ids + [@object.admin_set_id]).select(&:present?)
     end
 
     # The list of all collections this user has manage rights on

data/app/services/hyrax/ensure_well_formed_admin_set_service.rb

@@ -14,12 +14,12 @@ module Hyrax
     #
     # @param admin_set_id [String, nil]
     #
-    # @return [String] an admin_set_id; if you provide a "present"
+    # @return [#to_s] an admin_set_id; if you provide a "present"
     #   admin_set_id, this service will return that.
     #
-    # @see AdminSet.find_or_create_default_admin_set_id
+    # @see Hyrax::AdminSetCreateService.find_or_create_default_admin_set
     def self.call(admin_set_id: nil)
-      admin_set_id = admin_set_id.presence || AdminSet.find_or_create_default_admin_set_id
+      admin_set_id = admin_set_id.presence&.to_s || Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s
       Hyrax::PermissionTemplate.find_or_create_by!(source_id: admin_set_id)
       admin_set_id
     end

data/app/services/hyrax/find_objects_via_solr_service.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+module Hyrax
+  # @deprecated This class is being replaced by Hyrax::SolrQueryService #get_objects method.
+  #
+  # Methods in this class search solr to get the ids and then use the query service to find the objects.
+  class FindObjectsViaSolrService
+    class_attribute :solr_query_builder, :solr_service, :query_service
+    self.solr_query_builder = Hyrax::SolrQueryService
+    self.solr_service = Hyrax::SolrService
+    self.query_service = Hyrax.query_service
+
+    class << self
+      # Find objects matching search criteria.
+      # @param model [Class] if not using Valkyrie, this is expected to be an ActiveFedora::Base object that supports #where
+      # @param field_pairs [Hash] a list of pairs of property name and values
+      # @param join_with [String] the value we're joining the clauses with (default: ' OR ' for backward compatibility with ActiveFedora where)
+      # @param type [String] The type of query to run. Either 'raw' or 'field' (default: 'field')
+      # @param use_valkyrie [Boolean] if true, return Valkyrie resource(s); otherwise, return ActiveFedora object(s)
+      # @return [Array<ActiveFedora::Base|Valkyrie::Resource>] objects matching the query
+      def find_for_model_by_field_pairs(model:, field_pairs:, join_with: ' OR ', type: 'field', use_valkyrie: Hyrax.config.use_valkyrie?)
+        Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
+                         "Instead, use 'Hyrax::SolrQueryService.new.with_model(...).with_field_pairs(...).get_objects'.")
+
+        solr_query_builder.new
+                          .with_model(model: model)
+                          .with_field_pairs(field_pairs: field_pairs, join_with: join_with, type: type)
+                          .get_objects(use_valkyrie: use_valkyrie).to_a
+      end
+    end
+  end
+end

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

@@ -13,6 +13,7 @@ module Hyrax
       #
       # @param event [Dry::Event]
       def on_object_acl_updated(event)
+        return if Hyrax.config.disable_wings
         return unless event[:result] == :success # do nothing on failure
 
         if Hyrax.metadata_adapter.is_a?(Wings::Valkyrie::MetadataAdapter)

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Listeners
+    ##
+    # Listens for object deleted events and cleans up associated members
+    class MemberCleanupListener
+      def on_object_deleted(event)
+        return unless event.payload.key?(:object) # legacy callback
+        return if event[:object].is_a?(ActiveFedora::Base) # handled by legacy code
+
+        Hyrax.custom_queries.find_child_filesets(resource: event[:object]).each do |file_set|
+          begin
+            Hyrax.persister.delete(resource: file_set)
+            Hyrax.publisher
+                 .publish('object.deleted', object: file_set, id: file_set.id, user: user)
+          rescue StandardError # we don't uncaught errors looping filesets
+            Hyrax.logger.warn "Failed to delete #{file_set.class}:#{file_set.id} " \
+                              "during cleanup for resource: #{event[:object]}. " \
+                              'This member may now be orphaned.'
+          end
+        end
+      end
+    end
+  end
+end