hyrax 3.3.0 → 3.4.2

data/app/presenters/hyrax/work_show_presenter.rb

@@ -154,9 +154,9 @@ module Hyrax
     def grouped_presenters(filtered_by: nil, except: nil)
       # TODO: we probably need to retain collection_presenters (as parent_presenters)
       #       and join this with member_of_collection_presenters
-      grouped = member_of_collection_presenters.group_by(&:model_name).transform_keys { |key| key.to_s.underscore }
-      grouped.select! { |obj| obj.downcase == filtered_by } unless filtered_by.nil?
-      grouped.except!(*except) unless except.nil?
+      grouped = member_of_collection_presenters.group_by(&:model_name).transform_keys(&:human)
+      grouped.select! { |obj| obj.casecmp(filtered_by).zero? } unless filtered_by.nil?
+      grouped.reject! { |obj| except.map(&:downcase).include? obj.downcase } unless except.nil?
       grouped
     end
 
@@ -305,9 +305,13 @@ module Hyrax
 
     def member_presenter_factory
       @member_presenter_factory ||=
-        self.class
-            .presenter_factory_class
-            .new(solr_document, current_ability, request)
+        if solr_document.hydra_model < Valkyrie::Resource
+          PcdmMemberPresenterFactory.new(solr_document, current_ability)
+        else
+          self.class
+              .presenter_factory_class
+              .new(solr_document, current_ability, request)
+        end
     end
 
     def graph

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

@@ -9,7 +9,7 @@ module Hyrax
 
       # This overrides the models in FilterByType
       def models
-        [::AdminSet, ::Collection, Hyrax.config.collection_class].uniq.compact
+        [::AdminSet, Hyrax::AdministrativeSet, ::Collection, Hyrax.config.collection_class].uniq.compact
       end
 
       # adds a filter to exclude collections and admin sets created by the
@@ -19,7 +19,7 @@ module Hyrax
         return if current_ability.admin?
         clauses = [
           '-' + ActiveFedora::SolrQueryBuilder.construct_query_for_rel(depositor: current_user_key),
-          '-' + ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::AdminSet.to_s, creator: current_user_key)
+          '-' + ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: Hyrax.config.admin_set_model, creator: current_user_key)
         ]
         solr_parameters[:fq] ||= []
         solr_parameters[:fq] += ["(#{clauses.join(' OR ')})"]

data/app/search_builders/hyrax/dashboard/managed_search_filters.rb

@@ -11,15 +11,55 @@ module Hyrax
 
       # Override to exclude 'public' and 'registered' groups from read access.
       def apply_group_permissions(permission_types, ability = current_ability)
+        search_terms = add_managing_role_search_filter(ability: ability)
         groups = ability.user_groups
-        return [] if groups.empty?
-        permission_types.map do |type|
+        return search_terms if groups.empty?
+        permission_types.each do |type|
           field = solr_field_for(type, 'group')
-          user_groups = type == 'read' ? groups - [::Ability.public_group_name, ::Ability.registered_group_name] : groups
+          delete_groups = [::Ability.public_group_name, ::Ability.registered_group_name]
+          user_groups = type == 'read' ? groups - delete_groups : groups
           next if user_groups.empty?
-          "({!terms f=#{field}}#{user_groups.join(',')})" # parens required to properly OR the clauses together.
+          # parens required to properly OR the clauses together:
+          search_terms << "({!terms f=#{field}}#{user_groups.join(',')})"
         end
+        search_terms
       end
+
+      # Look for a user's managing role and add filters for all admin sets that have permission
+      # templates that include managing roles.
+      #
+      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/CyclomaticComplexity
+      def add_managing_role_search_filter(ability:, search_terms: [])
+        search_terms ||= []
+        # Look for managing role assignement
+        managing_role = Sipity::Role.find_by(name: Hyrax::RoleRegistry::MANAGING)
+        return search_terms if managing_role.blank?
+        agent = ability.current_user.to_sipity_agent
+        return search_terms if agent.workflow_responsibilities.blank?
+        managing_workflow_roles = []
+        agent.workflow_responsibilities.each do |workflow_responsibility|
+          wfr = Sipity::WorkflowRole.find_by(id: workflow_responsibility.workflow_role_id)
+          managing_workflow_roles << wfr if wfr.role_id == managing_role.id
+        end
+        return search_terms if managing_workflow_roles.empty?
+        # if the user has managing responsibilties, then look up the associated admin set ids
+        admin_set_ids = managing_workflow_roles.map do |wfr|
+          wf = Sipity::Workflow.find_by(id: wfr.workflow_id)
+          pt = Hyrax::PermissionTemplate.find_by(id: wf.permission_template_id)
+          pt.source_id
+        end
+        admin_set_ids.uniq!
+        # create search terms for works that are in managed admin sets
+        admin_set_ids.each do |id|
+          search_terms << "isPartOf_ssim:#{id}"
+        end
+        search_terms
+      end
+      # rubocop:enable Metrics/MethodLength
+      # rubocop:enable Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity
     end
   end
 end

data/app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb

@@ -37,7 +37,7 @@ module Hyrax
 
       def limit_ids
         # exclude current collection from returned list
-        limit_ids = [@collection.id]
+        limit_ids = [@collection.id.to_s]
         # cannot add a parent that is already a parent
         limit_ids += @nesting_attributes.parents if @nesting_attributes.parents && @nest_direction == :as_parent
         limit_ids
@@ -91,7 +91,7 @@ module Hyrax
 
       def exclude_if_already_parent
         # 2) Exclude any of Collection F's direct children
-        "-" + ActiveFedora::SolrQueryBuilder.construct_query(Samvera::NestingIndexer.configuration.solr_field_name_for_storing_parent_ids => @collection.id)
+        "-" + ActiveFedora::SolrQueryBuilder.construct_query(Samvera::NestingIndexer.configuration.solr_field_name_for_storing_parent_ids => @collection.id.to_s)
       end
     end
   end

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

@@ -10,10 +10,7 @@ class Hyrax::My::CollectionsSearchBuilder < ::Hyrax::CollectionSearchBuilder
   # the current user has deposited
   # @param [Hash] solr_parameters
   def show_only_collections_deposited_by_current_user(solr_parameters)
-    clauses = [
-      ActiveFedora::SolrQueryBuilder.construct_query_for_rel(depositor: current_user_key),
-      ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::AdminSet.to_s, creator: current_user_key)
-    ]
+    clauses = [query_for_my_collections]
     solr_parameters[:fq] ||= []
     solr_parameters[:fq] += ["(#{clauses.join(' OR ')})"]
   end
@@ -23,4 +20,14 @@ class Hyrax::My::CollectionsSearchBuilder < ::Hyrax::CollectionSearchBuilder
   def models
     [::AdminSet, Hyrax::AdministrativeSet, ::Collection, Hyrax.config.collection_class].uniq.compact
   end
+
+  private
+
+  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,
+                                                  creator_ssim: current_user_key }, type: 'terms')
+    query_service.build(join_with: 'OR')
+  end
 end

data/app/services/hyrax/access_control_list.rb

@@ -174,6 +174,19 @@ module Hyrax
       true
     end
 
+    ##
+    # @api public
+    #
+    # Deletes the ACL for the resource
+    #
+    # @return [Boolean]
+    def destroy
+      persister.delete(resource: change_set.resource) if change_set.resource.persisted?
+      @change_set = nil
+
+      true
+    end
+
     private
 
     ##
@@ -187,13 +200,14 @@ module Hyrax
 
       private
 
+      ##
+      # Returns the identifier used by ACLs to identify agents.
+      #
+      # This defaults to the `:agent_key`, but if that method doesn’t exist,
+      # `:user_key` will be used as a fallback.
       def id_for(agent:)
-        case agent
-        when Hyrax::Group
-          "#{Hyrax::Group.name_prefix}#{agent.name}"
-        else
-          agent.user_key.to_s
-        end
+        key = agent.try(:agent_key) || agent.user_key
+        key.to_s
       end
     end
 

data/app/services/hyrax/adapters/nesting_index_adapter.rb

@@ -60,7 +60,7 @@ module Hyrax
           object = ActiveFedora::Base.find(id)
           parent_ids = object.try(:member_of_collection_ids) || []
 
-          # note: we do not yield when the object has parents. Calling the nested indexer for the
+          # NOTE: we do not yield when the object has parents. Calling the nested indexer for the
           # top id will reindex all descendants as well.
           if object.try(:use_nested_reindexing?)
             yield(id, parent_ids) if parent_ids.empty?
@@ -119,11 +119,11 @@ module Hyrax
       # @yield Samvera::NestingIndexer::Documents::IndexDocument
       #
       # @return [void]
-      def self.each_child_document_of(document:, extent:, &block)
+      def self.each_child_document_of(document:, extent:, &block) # rubocop:disable Lint/UnusedMethodArgument
         raw_child_solr_documents_of(parent_document: document).each do |solr_document|
           child_document = coerce_solr_document_to_index_document(original_solr_document: solr_document, id: solr_document.fetch('id'))
           # during light reindexing, we want to reindex the child only if fields aren't already there
-          block.call(child_document) if full_reindex?(extent: extent) || child_document.pathnames.empty?
+          yield(child_document) if full_reindex?(extent: extent) || child_document.pathnames.empty?
         end
       end
 

data/app/services/hyrax/admin_set_create_service.rb

@@ -64,7 +64,7 @@ module Hyrax
         Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
                          "Warning: This method may hide runtime errors.  " \
                          "Instead, use 'Hyrax::AdminSetCreateService.call!'.  ")
-        call!(admin_set: admin_set, creating_user: creating_user, **kwargs).present?
+        call!(admin_set: admin_set_resource(admin_set), creating_user: creating_user, **kwargs).present?
       rescue RuntimeError => err
         raise err if default_admin_set?(id: admin_set.id)
         false
@@ -152,13 +152,22 @@ module Hyrax
         id = find_unsaved_default_admin_set&.id&.to_s if id.blank?
         id
       end
+
+      def admin_set_resource(admin_set)
+        case admin_set
+        when Valkyrie::Resource
+          admin_set
+        else
+          admin_set.valkyrie_resource
+        end
+      end
     end
 
     # @param admin_set [Hyrax::AdministrativeSet | AdminSet] the admin set to operate on
     # @param creating_user [User] the user who created the admin set (if any).
     # @param workflow_importer [#call] imports the workflow
     def initialize(admin_set:, creating_user:, workflow_importer: default_workflow_importer, default_admin_set: false)
-      @admin_set = admin_set
+      @admin_set = Hyrax::AdminSetCreateService.send(:admin_set_resource, admin_set)
       @creating_user = creating_user
       @workflow_importer = workflow_importer
       @default_admin_set = default_admin_set
@@ -182,28 +191,12 @@ module Hyrax
     # @return [Hyrax::AdministrativeSet] The fully created admin set.
     # @raise [RuntimeError] if admin set cannot be persisted
     def create!
-      admin_set.respond_to?(:valkyrie_resource) ? active_fedora_create! : valkyrie_create!
-    end
-
-    private
-
-    def default_admin_set?
-      @default_admin_set
-    end
-
-    def admin_group_name
-      ::Ability.admin_group_name
-    end
-
-    # Creates an admin set, setting the creator and the default access controls.
-    # @return [Hyrax::AdministrativeSet] The fully created admin set.
-    # @raise [RuntimeError] if admin set cannot be persisted
-    def valkyrie_create!
       admin_set.creator = [creating_user.user_key] if creating_user
       updated_admin_set = Hyrax.persister.save(resource: admin_set).tap do |result|
         if result
           ActiveRecord::Base.transaction do
-            permission_template = permissions_create_service.create_default(collection: result,
+            permission_template = PermissionTemplate.find_by(source_id: result.id.to_s) ||
+                                  permissions_create_service.create_default(collection: result,
                                                                             creating_user: creating_user)
             workflow = create_workflows_for(permission_template: permission_template)
             create_default_access_for(permission_template: permission_template, workflow: workflow) if default_admin_set?
@@ -214,23 +207,14 @@ module Hyrax
       updated_admin_set
     end
 
-    # Creates an admin set, setting the creator and the default access controls.
-    # @return [Hyrax::AdministrativeSet] The fully created admin set.
-    # @raise [RuntimeError] if admin set cannot be persisted
-    def active_fedora_create!
-      admin_set.creator = [creating_user.user_key] if creating_user
-      admin_set.save.tap do |result|
-        if result
-          ActiveRecord::Base.transaction do
-            permission_template = permissions_create_service.create_default(collection: admin_set,
-                                                                            creating_user: creating_user)
-            workflow = create_workflows_for(permission_template: permission_template)
-            create_default_access_for(permission_template: permission_template, workflow: workflow) if default_admin_set?
-          end
-        end
-      end
-      raise 'Admin set failed to persist.' unless admin_set.persisted?
-      admin_set.valkyrie_resource
+    private
+
+    def default_admin_set?
+      @default_admin_set
+    end
+
+    def admin_group_name
+      ::Ability.admin_group_name
     end
 
     def create_workflows_for(permission_template:)

data/app/services/hyrax/change_content_depositor_service.rb

@@ -13,6 +13,7 @@ module Hyrax
     #              sets; regardless of true/false make the given user
     #              the depositor of the given work
     def self.call(work, user, reset)
+      Deprecation.warn("This class will be removed in the next major release. Use Hyrax::ChangeDepositorService.call instead.")
       case work
       when ActiveFedora::Base
         call_af(work, user, reset)
@@ -49,7 +50,6 @@ module Hyrax
       apply_valkyrie_changes_to_file_sets(work: work, user: user, reset: reset)
 
       Hyrax.persister.save(resource: work)
-      work
     end
     private_class_method :call_valkyrie
 
@@ -61,7 +61,7 @@ module Hyrax
     private_class_method :apply_depositor_metadata
 
     def self.apply_valkyrie_changes_to_file_sets(work:, user:, reset:)
-      Hyrax.custom_queries.find_child_filesets(resource: work).each do |f|
+      Hyrax.custom_queries.find_child_file_sets(resource: work).each do |f|
         if reset
           f.permission_manager.acl.permissions = []
           f.permission_manager.acl.save

data/app/services/hyrax/change_depositor_service.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+module Hyrax
+  class ChangeDepositorService
+    # Set the given `user` as the depositor of the given `work`; If
+    # `reset` is true, first remove all previous permissions.
+    #
+    # Used to transfer a an existing work, and to set
+    # depositor / proxy_depositor on a work newly deposited
+    # on_behalf_of another user
+    #
+    # @param work [ActiveFedora::Base, Valkyrie::Resource] the work
+    #             that is receiving a change of depositor
+    # @param user [User] the user that will "become" the depositor of
+    #             the given work
+    # @param reset [TrueClass, FalseClass] when true, first clear
+    #              permissions for the given work and contained file
+    #              sets; regardless of true/false make the given user
+    #              the depositor of the given work
+    # @return work, updated if necessary
+    def self.call(work, user, reset)
+      # user_key is nil when there was no `on_behalf_of` in the form
+      return work unless user&.user_key
+      # Don't transfer to self
+      return work if user.user_key == work.depositor
+
+      work = case work
+             when ActiveFedora::Base
+               call_af(work, user, reset)
+             when Valkyrie::Resource
+               call_valkyrie(work, user, reset)
+             end
+      ChangeDepositorEventJob.perform_later(work)
+      work
+    end
+
+    def self.call_af(work, user, reset)
+      work.proxy_depositor = work.depositor
+      work.permissions = [] if reset
+      work.apply_depositor_metadata(user)
+      work.save!
+      Hyrax::PropagateChangeDepositorJob.perform_later(work.id.to_s, user, reset)
+      work
+    end
+    private_class_method :call_af
+
+    # @todo Should this include some dependency injection regarding
+    # the Hyrax.persister and Hyrax.custom_queries?
+    def self.call_valkyrie(work, user, reset)
+      if reset
+        work.permission_manager.acl.permissions = []
+        work.permission_manager.acl.save
+      end
+
+      work.proxy_depositor = work.depositor
+      apply_depositor_metadata(work, user)
+
+      work = Hyrax.persister.save(resource: work)
+      Hyrax::PropagateChangeDepositorJob.perform_later(work.id.to_s, user, reset)
+      work
+    end
+    private_class_method :call_valkyrie
+
+    def self.apply_depositor_metadata(resource, depositor)
+      depositor_id = depositor.respond_to?(:user_key) ? depositor.user_key : depositor
+      resource.depositor = depositor_id if resource.respond_to? :depositor=
+      Hyrax::AccessControlList.new(resource: resource).grant(:edit).to(::User.find_by_user_key(depositor_id)).save
+    end
+    private_class_method :apply_depositor_metadata
+  end
+end

data/app/services/hyrax/characterization/valkyrie_characterization_service.rb

@@ -14,7 +14,7 @@ class Hyrax::Characterization::ValkyrieCharacterizationService
   def self.run(metadata:, file:, user: ::User.system_user, **options)
     new(metadata: metadata, file: file, **options).characterize
     saved = Hyrax.persister.save(resource: metadata)
-    Hyrax.publisher.publish('object.metadata.updated', object: saved, user: user)
+    Hyrax.publisher.publish('file.metadata.updated', metadata: saved, user: user)
   end
 
   ##
@@ -91,11 +91,9 @@ class Hyrax::Characterization::ValkyrieCharacterizationService
     h = {}
 
     doc.class.terminology.terms.each_pair do |key, _target|
-      begin
-        h[key] = doc.public_send(key)
-      rescue NoMethodError
-        next
-      end
+      h[key] = doc.public_send(key)
+    rescue NoMethodError
+      next
     end
 
     h.compact

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

@@ -83,11 +83,9 @@ module Hyrax
         def add_members(collection_id:, new_members:, user:)
           messages = []
           new_members.map do |new_member|
-            begin
-              add_member(collection_id: collection_id, new_member: new_member, user: user)
-            rescue Hyrax::SingleMembershipError => err
-              messages += [err.message]
-            end
+            add_member(collection_id: collection_id, new_member: new_member, user: user)
+          rescue Hyrax::SingleMembershipError => err
+            messages += [err.message]
           end
           raise Hyrax::SingleMembershipError, messages if messages.present?
         end

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

@@ -12,11 +12,11 @@ module Hyrax
         attr_accessor :parents, :pathnames, :ancestors, :depth, :id
 
         def initialize(id:, scope:)
-          query_builder = Hyrax::CollectionSearchBuilder.new(scope).where(id: id)
+          query_builder = Hyrax::CollectionSearchBuilder.new(scope).where(id: id.to_s)
           query = Hyrax::Collections::NestedCollectionQueryService.clean_lucene_error(builder: query_builder)
           response = scope.repository.search(query)
           collection_doc = response.documents.first
-          @id = id
+          @id = id.to_s
           @parents = collection_doc[Samvera::NestingIndexer.configuration.solr_field_name_for_storing_parent_ids]
           @pathnames = collection_doc[Samvera::NestingIndexer.configuration.solr_field_name_for_storing_pathnames]
           @ancestors = collection_doc[Samvera::NestingIndexer.configuration.solr_field_name_for_storing_ancestors]
@@ -34,7 +34,7 @@ module Hyrax
       # @param limit_to_id [nil, String] Limit the query to just check if the given id is in the response. Useful for validation.
       # @return [Array<SolrDocument>]
       def self.available_child_collections(parent:, scope:, limit_to_id: nil)
-        return [] unless parent.try(:nestable?)
+        return [] unless nestable?(collection: parent)
         return [] unless scope.can?(:deposit, parent)
         query_solr(collection: parent, access: :read, scope: scope, limit_to_id: limit_to_id, nest_direction: :as_child).documents
       end
@@ -52,7 +52,7 @@ module Hyrax
       #
       # @return [Array<SolrDocument>]
       def self.available_parent_collections(child:, scope:, limit_to_id: nil)
-        return [] unless child.try(:nestable?)
+        return [] unless nestable?(collection: child)
         return [] unless scope.can?(:read, child)
         query_solr(collection: child, access: :deposit, scope: scope, limit_to_id: limit_to_id, nest_direction: :as_parent).documents
       end
@@ -69,7 +69,7 @@ module Hyrax
       #
       # @return [Blacklight::Solr::Response]
       def self.parent_collections(child:, scope:, page: 1)
-        return [] unless child.try(:nestable?)
+        return [] unless nestable?(collection: child)
         query_builder = Hyrax::NestedCollectionsParentSearchBuilder.new(scope: scope, child: child, page: page)
         query = clean_lucene_error(builder: query_builder)
         scope.repository.search(query)
@@ -86,7 +86,7 @@ module Hyrax
       #   id is in the response. Useful for validation.
       # @param nest_direction [Symbol] :as_child or :as_parent
       def self.query_solr(collection:, access:, scope:, limit_to_id:, nest_direction:)
-        nesting_attributes = NestingAttributes.new(id: collection.id, scope: scope)
+        nesting_attributes = NestingAttributes.new(id: collection.id.to_s, scope: scope)
         query_builder = Hyrax::Dashboard::NestedCollectionsSearchBuilder.new(
           access: access,
           collection: collection,
@@ -95,7 +95,7 @@ module Hyrax
           nest_direction: nest_direction
         )
 
-        query_builder.where(id: limit_to_id) if limit_to_id
+        query_builder.where(id: limit_to_id.to_s) if limit_to_id
         query = clean_lucene_error(builder: query_builder)
         scope.repository.search(query)
       end
@@ -139,8 +139,8 @@ module Hyrax
       def self.parent_and_child_can_nest?(parent:, child:, scope:)
         return false if parent == child # Short-circuit
         return false unless parent.collection_type_gid == child.collection_type_gid
-        return false if available_parent_collections(child: child, scope: scope, limit_to_id: parent.id).none?
-        return false if available_child_collections(parent: parent, scope: scope, limit_to_id: child.id).none?
+        return false if available_parent_collections(child: child, scope: scope, limit_to_id: parent.id.to_s).none?
+        return false if available_child_collections(parent: parent, scope: scope, limit_to_id: child.id.to_s).none?
         true
       end
 
@@ -171,7 +171,7 @@ module Hyrax
       # @return [Fixnum] the largest number of collections in a path nested
       #   under this collection (including this collection)
       def self.child_nesting_depth(child:, scope:)
-        return 1 if child.nil?
+        return 1 unless child
         # The nesting depth of a child collection is found by finding the largest nesting depth
         # among all collections and works which have the child collection in the paths, and
         # subtracting the nesting depth of the child collection itself.
@@ -190,7 +190,7 @@ module Hyrax
         descendant_depth = response[Samvera::NestingIndexer.configuration.solr_field_name_for_deepest_nested_depth]
 
         # => 2) Then we get the stored depth of the child collection itself to eliminate the collections above this one from our count, and add 1 to add back in this collection itself
-        child_depth = NestingAttributes.new(id: child.id, scope: scope).depth
+        child_depth = NestingAttributes.new(id: child.id.to_s, scope: scope).depth
         nesting_depth = descendant_depth - child_depth + 1
 
         # this should always be positive, but just being safe
@@ -207,9 +207,21 @@ module Hyrax
       #   this collection (includes this collection)
       def self.parent_nesting_depth(parent:, scope:)
         return 1 if parent.nil?
-        NestingAttributes.new(id: parent.id, scope: scope).depth
+        NestingAttributes.new(id: parent.id.to_s, scope: scope).depth
       end
       private_class_method :parent_nesting_depth
+
+      # @api private
+      #
+      # @param collection [Hyrax::PcdmCollection,::Collection]
+      # @return [Boolean] true if the collection is nestable; otherwise, false
+      def self.nestable?(collection:)
+        return false if collection.blank?
+        return collection.nestable? if collection.respond_to? :nestable?
+        collection_type = Hyrax::CollectionType.find_by_gid!(collection.collection_type_gid)
+        collection_type.nestable?
+      end
+      private_class_method :nestable?
     end
   end
 end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module CustomQueries
+    module Navigators
+      ##
+      # Navigate from a resource to the child filesets in the resource.
+      #
+      # @see https://github.com/samvera/valkyrie/wiki/Queries#custom-queries
+      # @since 3.4.0
+      class ChildFileSetsNavigator
+        # Define the queries that can be fulfilled by this navigator.
+        def self.queries
+          [:find_child_file_sets, :find_child_file_set_ids]
+        end
+
+        attr_reader :query_service
+
+        def initialize(query_service:)
+          @query_service = query_service
+        end
+
+        ##
+        # Find child filesets of a given resource, and map to Valkyrie Resources
+        #
+        # @param [Valkyrie::Resource] resource
+        #
+        # @return [Array<Valkyrie::Resource>]
+        def find_child_file_sets(resource:)
+          query_service.find_members(resource: resource).select(&:file_set?)
+        end
+
+        ##
+        # Find the ids of child filesets of a given resource, and map to Valkyrie Resources IDs
+        #
+        # @param [Valkyrie::Resource] resource
+        #
+        # @return [Array<Valkyrie::ID>]
+        def find_child_file_set_ids(resource:)
+          find_child_file_sets(resource: resource).map(&:id)
+        end
+      end
+    end
+  end
+end

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

@@ -6,6 +6,7 @@ module Hyrax
       ##
       # Navigate from a resource to the child filesets in the resource.
       #
+      # @deprecated use Hyrax::CustomQueries::Navigators::ChildFileSetsNavigator instead
       # @see https://github.com/samvera/valkyrie/wiki/Queries#custom-queries
       # @since 3.0.0
       class ChildFilesetsNavigator
@@ -26,8 +27,10 @@ module Hyrax
         # @param [Valkyrie::Resource] resource
         #
         # @return [Array<Valkyrie::Resource>]
+        # @deprecated
         def find_child_filesets(resource:)
-          query_service.find_members(resource: resource).select(&:file_set?)
+          Deprecation.warn("Custom query find_child_filesets is deprecated; use find_child_file_sets instead.")
+          Hyrax.custom_queries.find_child_file_sets(resource: resource)
         end
 
         ##
@@ -36,8 +39,10 @@ module Hyrax
         # @param [Valkyrie::Resource] resource
         #
         # @return [Array<Valkyrie::ID>]
+        # @deprecated
         def find_child_fileset_ids(resource:)
-          find_child_filesets(resource: resource).map(&:id)
+          Deprecation.warn("Custom query find_child_fileset_ids is deprecated; use find_child_file_set_ids instead.")
+          Hyrax.custom_queries.find_child_file_set_ids(resource: resource)
         end
       end
     end