hyrax 4.0.0.beta1 → 4.0.0.beta2

data/app/indexers/hyrax/valkyrie_file_set_indexer.rb

@@ -23,7 +23,7 @@ module Hyrax
         solr_doc['hasRelatedImage_ssim']         = resource.thumbnail_id.to_s
 
         # Add in metadata from the original file.
-        file_metadata = original_file
+        file_metadata = Hyrax::FileSetFileService.new(file_set: resource).original_file
         return solr_doc unless file_metadata
 
         # Label is the actual file name. It's not editable by the user.
@@ -99,12 +99,6 @@ module Hyrax
 
     private
 
-    def original_file
-      Hyrax.custom_queries.find_original_file(file_set: resource)
-    rescue Valkyrie::Persistence::ObjectNotFoundError
-      Hyrax.custom_queries.find_files(file_set: resource).first
-    end
-
     def file_format(file)
       if file.mime_type.present? && file.format_label.present?
         "#{file.mime_type.split('/').last} (#{file.format_label.join(', ')})"

data/app/indexers/hyrax/valkyrie_work_indexer.rb

@@ -25,6 +25,8 @@ module Hyrax
         solr_doc['depositor_tesim'] = [resource.depositor]
         solr_doc['hasRelatedMediaFragment_ssim'] = [resource.representative_id.to_s]
         solr_doc['hasRelatedImage_ssim'] = [resource.thumbnail_id.to_s]
+        index_embargo(solr_doc)
+        index_lease(solr_doc)
       end
     end
 
@@ -39,5 +41,24 @@ module Hyrax
       admin_set = Hyrax.query_service.find_by(id: resource.admin_set_id)
       admin_set.title
     end
+
+    def index_embargo(doc)
+      if Hyrax::EmbargoManager.new(resource: resource).under_embargo?
+        doc['embargo_release_date_dtsi'] = resource.embargo.embargo_release_date&.to_datetime
+        doc['visibility_after_embargo_ssim'] = resource.embargo.visibility_after_embargo
+        doc['visibility_during_embargo_ssim'] = resource.embargo.visibility_during_embargo
+      end
+      doc
+    end
+
+    def index_lease(doc)
+      if Hyrax::LeaseManager.new(resource: resource).under_lease?
+        doc['lease_expiration_date_dtsi'] = resource.lease.lease_expiration_date&.to_datetime
+        doc['visibility_after_lease_ssim'] = resource.lease.visibility_after_lease
+        doc['visibility_during_lease_ssim'] = resource.lease.visibility_during_lease
+      end
+
+      doc
+    end
   end
 end

data/app/jobs/characterize_job.rb

@@ -32,7 +32,11 @@ class CharacterizeJob < Hyrax::ApplicationJob
     # Ensure a fresh copy of the repo file's latest version is being worked on, if no filepath is directly provided
     filepath = Hyrax::WorkingDirectory.copy_repository_resource_to_working_directory(Hydra::PCDM::File.find(file_id), file_set.id) unless filepath && File.exist?(filepath)
     characterize(file_set, file_id, filepath)
-    CreateDerivativesJob.perform_later(file_set, file_id, filepath)
+
+    Hyrax.publisher.publish('file.characterized',
+                            file_set: file_set,
+                            file_id: file_id,
+                            path_hint: filepath)
   end
 
   private
@@ -48,7 +52,7 @@ class CharacterizeJob < Hyrax::ApplicationJob
     reset_title = file_set.title.first == file_set.label
 
     characterization_service.run(file_set.characterization_proxy, filepath)
-    Rails.logger.debug "Ran characterization on #{file_set.characterization_proxy.id} (#{file_set.characterization_proxy.mime_type})"
+    Hyrax.logger.debug "Ran characterization on #{file_set.characterization_proxy.id} (#{file_set.characterization_proxy.mime_type})"
     file_set.characterization_proxy.alpha_channels = channels(filepath) if file_set.image? && Hyrax.config.iiif_image_server?
     file_set.characterization_proxy.save!
 

data/app/jobs/import_url_job.rb

@@ -77,7 +77,7 @@ class ImportUrlJob < Hyrax::ApplicationJob
   def copy_remote_file(name)
     filename = File.basename(name)
     dir = Dir.mktmpdir
-    Rails.logger.debug("ImportUrlJob: Copying <#{uri}> to #{dir}")
+    Hyrax.logger.debug("ImportUrlJob: Copying <#{uri}> to #{dir}")
 
     File.open(File.join(dir, filename), 'wb') do |f|
       write_file(f)
@@ -85,7 +85,7 @@ class ImportUrlJob < Hyrax::ApplicationJob
     rescue StandardError => e
       send_error(e.message)
     end
-    Rails.logger.debug("ImportUrlJob: Closing #{File.join(dir, filename)}")
+    Hyrax.logger.debug("ImportUrlJob: Closing #{File.join(dir, filename)}")
   end
 
   ##

data/app/models/admin_set.rb

@@ -97,6 +97,14 @@ class AdminSet < ActiveFedora::Base
     permission_template.reset_access_controls_for(collection: self)
   end
 
+  # @api public
+  #
+  # return an id for the AdminSet.
+  # defaults to calling Hyrax::Noid, but needs a fall back if noid is off
+  def assign_id
+    super || SecureRandom.uuid
+  end
+
   private
 
   def destroy_permission_template

data/app/models/concerns/hyrax/ability.rb

@@ -86,7 +86,7 @@ module Hyrax
       doc = permissions_doc(id)
       return [] if doc.nil?
       groups = Array(doc[self.class.read_group_field]) + Array(doc[self.class.edit_group_field])
-      Rails.logger.debug("[CANCAN] download_groups: #{groups.inspect}")
+      Hyrax.logger.debug("[CANCAN] download_groups: #{groups.inspect}")
       groups
     end
 
@@ -95,7 +95,7 @@ module Hyrax
       doc = permissions_doc(id)
       return [] if doc.nil?
       users = Array(doc[self.class.read_user_field]) + Array(doc[self.class.edit_user_field])
-      Rails.logger.debug("[CANCAN] download_users: #{users.inspect}")
+      Hyrax.logger.debug("[CANCAN] download_users: #{users.inspect}")
       users
     end
 

data/app/models/concerns/hyrax/collection_behavior.rb

@@ -10,7 +10,6 @@ module Hyrax
     include Hyrax::HumanReadableType
     include Hyrax::HasRepresentative
     include Hyrax::Permissions
-    include Hyrax::CollectionNesting
 
     included do
       validates_with HasOneTitleValidator
@@ -40,9 +39,12 @@ module Hyrax
     end
 
     delegate(*Hyrax::CollectionType.settings_attributes, to: :collection_type)
+    ActiveSupport::Deprecation.deprecate_methods(self, *Hyrax::CollectionType.settings_attributes)
 
     # Get the collection_type when accessed
     def collection_type
+      Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
+                         "Instead, use Hyrax::CollectionType.for(collection: collection).")
       @collection_type ||= Hyrax::CollectionType.find_by_gid!(collection_type_gid)
     end
 

data/app/models/concerns/hyrax/file_set_behavior.rb

@@ -35,6 +35,7 @@ module Hyrax
 
     # Cast to a SolrDocument by querying from Solr
     def to_presenter
+      Deprecation.warn "Method #to_presenter will be removed in Hyrax 5.0. Use Hyrax::FileSetsController#presenter.solr_document or `@presenter.solr_document` from a view instead."
       Blacklight::SearchService.new(config: CatalogController.blacklight_config).fetch(id).last
     end
   end

data/app/models/concerns/hyrax/naming.rb

@@ -10,7 +10,7 @@ module Hyrax
       # Override of ActiveModel::Model name that allows us to use our custom name class
       def model_name(name_class: _hyrax_default_name_class)
         @_model_name ||= begin
-          namespace = parents.detect do |n|
+          namespace = module_parents.detect do |n|
             n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
           end
           name_class.new(self, namespace)

data/app/models/concerns/hyrax/work_behavior.rb

@@ -20,7 +20,6 @@ module Hyrax
     include ProxyDeposit
     include Works::Metadata
     include WithEvents
-    include Hyrax::CollectionNesting
 
     included do
       property :owner, predicate: RDF::URI.new('http://opaquenamespace.org/ns/hydra/owner'), multiple: false

data/app/models/file_download_stat.rb

@@ -9,7 +9,7 @@ class FileDownloadStat < Hyrax::Statistic
     def ga_statistics(start_date, file)
       profile = Hyrax::Analytics.profile
       unless profile
-        Rails.logger.error("Google Analytics profile has not been established. Unable to fetch statistics.")
+        Hyrax.logger.error("Google Analytics profile has not been established. Unable to fetch statistics.")
         return []
       end
       profile.hyrax__analytics__google__download(sort: 'date',

data/app/models/hyrax/collection_type.rb

@@ -52,6 +52,14 @@ module Hyrax
     alias_attribute :visibility, :assigns_visibility
     alias_attribute :branding, :brandable
 
+    # Find the collection type associated with the collection
+    # @param [::Collection, Hyrax::PcdmCollection] collection
+    # @return [Hyrax::PcdmCollection | ::Collection] an instance of Hyrax::CollectionType with id = the model_id portion of the gid (e.g. 3)
+    # @raise [ActiveRecord::RecordNotFound] if record matching gid is not found
+    def self.for(collection:)
+      find_by_gid!(collection.collection_type_gid)
+    end
+
     # Find the collection type associated with the Global Identifier (gid)
     # @param [String] gid - Global Identifier for this collection_type (e.g. gid://internal/hyrax-collectiontype/3)
     # @return [Hyrax::CollectionType] if record matching gid is found, an instance of Hyrax::CollectionType with id = the model_id portion of the gid (e.g. 3)
@@ -78,7 +86,7 @@ module Hyrax
       raise(URI::InvalidURIError) if gid.nil?
       GlobalID::Locator.locate(gid)
     rescue NameError
-      Rails.logger.warn "#{self.class}##{__method__} called with #{gid}, which is " \
+      Hyrax.logger.warn "#{self.class}##{__method__} called with #{gid}, which is " \
                         "a legacy collection type global id format. If this " \
                         "collection type gid is attached to a collection in " \
                         "your repository you'll want to run " \

data/app/models/hyrax/embargo.rb

@@ -15,7 +15,7 @@ module Hyrax
     attribute :embargo_history,           Valkyrie::Types::Array
 
     def active?
-      (embargo_release_date.present? && Time.zone.today < embargo_release_date)
+      (embargo_release_date.present? && Hyrax::TimeService.time_in_utc < embargo_release_date)
     end
   end
 end

data/app/models/hyrax/file_set.rb

@@ -42,8 +42,8 @@ module Hyrax
 
     attribute :file_ids, Valkyrie::Types::Array.of(Valkyrie::Types::ID) # id for FileMetadata resources
     attribute :thumbnail_id, Valkyrie::Types::ID.optional # id for FileMetadata resource
-    attribute :original_file_id, Valkyrie::Types::ID # id for FileMetadata resource
-    attribute :extracted_text_id, Valkyrie::Types::ID # id for FileMetadata resource
+    attribute :original_file_id, Valkyrie::Types::ID.optional # id for FileMetadata resource
+    attribute :extracted_text_id, Valkyrie::Types::ID.optional # id for FileMetadata resource
 
     ##
     # @return [Valkyrie::ID]

data/app/models/hyrax/lease.rb

@@ -15,7 +15,7 @@ module Hyrax
     attribute :lease_history,           Valkyrie::Types::Array
 
     def active?
-      (lease_expiration_date.present? && Time.zone.today < lease_expiration_date)
+      (lease_expiration_date.present? && Hyrax::TimeService.time_in_utc < lease_expiration_date)
     end
   end
 end

data/app/models/hyrax/statistic.rb

@@ -31,7 +31,7 @@ module Hyrax
         path = polymorphic_path(object)
         profile = Hyrax::Analytics.profile
         unless profile
-          Rails.logger.error("Google Analytics profile has not been established. Unable to fetch statistics.")
+          Hyrax.logger.error("Google Analytics profile has not been established. Unable to fetch statistics.")
           return []
         end
         profile.hyrax__analytics__google__pageviews(sort: 'date',

data/app/models/hyrax/work.rb

@@ -106,8 +106,8 @@ module Hyrax
     attribute :proxy_depositor,          Valkyrie::Types::String
     attribute :state,                    Valkyrie::Types::URI.default(Hyrax::ResourceStatus::ACTIVE)
     attribute :rendering_ids,            Valkyrie::Types::Array.of(Valkyrie::Types::ID).meta(ordered: true)
-    attribute :representative_id,        Valkyrie::Types::ID
-    attribute :thumbnail_id,             Valkyrie::Types::ID
+    attribute :representative_id,        Valkyrie::Types::ID.optional
+    attribute :thumbnail_id,             Valkyrie::Types::ID.optional
 
     ##
     # @return [Boolean] true

data/app/models/proxy_deposit_request.rb

@@ -7,7 +7,7 @@ class ProxyDepositRequest < ActiveRecord::Base
   include ActionView::Helpers::UrlHelper
 
   class_attribute :work_query_service_class
-  self.work_query_service_class = Hyrax::WorkQueryService
+  self.work_query_service_class = Hyrax.config.use_valkyrie? ? Hyrax::WorkResourceQueryService : Hyrax::WorkQueryService
 
   delegate :deleted_work?, :work, :to_s, to: :work_query_service
 

data/app/models/sipity.rb

@@ -57,32 +57,32 @@ module Sipity
   # @return [Sipity::Entity]
   # rubocop:disable Naming/MethodName, Metrics/CyclomaticComplexity, Metrics/MethodLength
   def Entity(input, &block) # rubocop:disable Metrics/AbcSize
-    Rails.logger.debug("Trying to make an Entity for #{input.inspect}")
+    Hyrax.logger.debug("Trying to make an Entity for #{input.inspect}")
 
     result = case input
              when Sipity::Entity
                input
              when URI::GID, GlobalID
-               Rails.logger.debug("Entity() got a GID, searching by proxy")
+               Hyrax.logger.debug("Entity() got a GID, searching by proxy")
                Entity.find_by(proxy_for_global_id: input.to_s)
              when SolrDocument
-               Rails.logger.debug("Entity() got a SolrDocument, retrying on #{input.to_model}")
+               Hyrax.logger.debug("Entity() got a SolrDocument, retrying on #{input.to_model}")
                Entity(input.to_model)
              when Draper::Decorator
-               Rails.logger.debug("Entity() got a Decorator, retrying on #{input.model}")
+               Hyrax.logger.debug("Entity() got a Decorator, retrying on #{input.model}")
                Entity(input.model)
              when Sipity::Comment
-               Rails.logger.debug("Entity() got a Comment, retrying on #{input.entity}")
+               Hyrax.logger.debug("Entity() got a Comment, retrying on #{input.entity}")
                Entity(input.entity)
              when Valkyrie::Resource
-               Rails.logger.debug("Entity() got a Resource, retrying on #{Hyrax::GlobalID(input)}")
+               Hyrax.logger.debug("Entity() got a Resource, retrying on #{Hyrax::GlobalID(input)}")
                Entity(Hyrax::GlobalID(input))
              else
-               Rails.logger.debug("Entity() got something else, testing #to_global_id")
+               Hyrax.logger.debug("Entity() got something else, testing #to_global_id")
                Entity(input.to_global_id) if input.respond_to?(:to_global_id)
              end
 
-    Rails.logger.debug("Entity(): attempting conversion on #{result}")
+    Hyrax.logger.debug("Entity(): attempting conversion on #{result}")
     handle_conversion(input, result, :to_sipity_entity, &block)
   rescue URI::GID::MissingModelIdError
     Entity(nil)

data/app/presenters/hyrax/admin_set_presenter.rb

@@ -34,6 +34,11 @@ module Hyrax
       @collection_type ||= Hyrax::CollectionType.find_or_create_admin_set_type
     end
 
+    # Overrides delegate because admin sets do not index collection type gid
+    def collection_type_gid
+      collection_type.to_global_id
+    end
+
     def show_path
       Hyrax::Engine.routes.url_helpers.admin_admin_set_path(id, locale: I18n.locale)
     end

data/app/presenters/hyrax/displays_image.rb

@@ -69,7 +69,7 @@ module Hyrax
           result = original_file_id
 
           if result.blank?
-            Rails.logger.warn "original_file_id for #{id} not found, falling back to Fedora."
+            Hyrax.logger.warn "original_file_id for #{id} not found, falling back to Fedora."
             result = Hyrax::VersioningService.versioned_file_id ::FileSet.find(id).original_file
           end
 

data/app/presenters/hyrax/pcdm_member_presenter_factory.rb

@@ -61,7 +61,7 @@ module Hyrax
       ids.each do |id|
         id = id.to_s
         indx = results.index { |doc| id == doc['id'] }
-        raise(ArgumentError, "Could not find an indexed document for id: #{id}") if
+        raise(Hyrax::ObjectNotFoundError, "Could not find an indexed document for id: #{id}") if
           indx.nil?
         hash = results.delete_at(indx)
         yield presenter_for(document: ::SolrDocument.new(hash), ability: ability)

data/app/presenters/hyrax/permission_badge.rb

@@ -24,14 +24,15 @@ module Hyrax
     private
 
     def dom_label_class
-      VISIBILITY_LABEL_CLASS.fetch(@visibility.to_sym, 'badge-info')
+      VISIBILITY_LABEL_CLASS.fetch(@visibility&.to_sym, 'badge-info')
     end
 
     def text
       if registered?
         Institution.name
       else
-        I18n.t("hyrax.visibility.#{@visibility}.text")
+        visibility_key = @visibility || 'unknown'
+        I18n.t("hyrax.visibility.#{visibility_key}.text")
       end
     end
 

data/app/presenters/hyrax/presenter_renderer.rb

@@ -39,7 +39,7 @@ module Hyrax
     def find_field_partial(field_name)
       ["#{collection_path}/show_fields/_#{field_name}", "records/show_fields/_#{field_name}",
        "#{collection_path}/show_fields/_default", "records/show_fields/_default"].find do |partial|
-        Rails.logger.debug "Looking for show field partial #{partial}"
+        Hyrax.logger.debug "Looking for show field partial #{partial}"
         return partial.sub(/\/_/, '/') if partial_exists?(partial)
       end
     end

data/app/presenters/hyrax/presents_attributes.rb

@@ -15,7 +15,7 @@ module Hyrax
     # @option options [String] :work_type name of work type class (e.g., "GenericWork")
     def attribute_to_html(field, options = {})
       unless respond_to?(field)
-        Rails.logger.warn("#{self.class} attempted to render #{field}, but no method exists with that name.")
+        Hyrax.logger.warn("#{self.class} attempted to render #{field}, but no method exists with that name.")
         return
       end
 

data/app/presenters/hyrax/version_list_presenter.rb

@@ -19,7 +19,12 @@ module Hyrax
     #
     # @raise [ArgumentError] if we can't build an enu
     def self.for(file_set:)
-      new(file_set.original_file&.versions&.all.to_a)
+      original_file = if file_set.respond_to?(:original_file)
+                        file_set.original_file
+                      else
+                        Hyrax::FileSetFileService.new(file_set: file_set).original_file
+                      end
+      new(Hyrax::VersioningService.new(resource: original_file).versions)
     rescue NoMethodError
       raise ArgumentError
     end

data/app/presenters/hyrax/work_show_presenter.rb

@@ -98,6 +98,9 @@ module Hyrax
           result = member_presenters([representative_id]).first
           return nil if result.try(:id) == id
           result.try(:representative_presenter) || result
+        rescue Hyrax::ObjectNotFoundError
+          Hyrax.logger.warn "Unable to find representative_id #{representative_id} for work #{id}"
+          return nil
         end
     end
 

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

@@ -6,13 +6,11 @@ module Hyrax
       # @param access [Symbol] :edit, :read, :discover - With the given :access what all can
       # @param collection [::Collection]
       # @param scope [Object] Typically a controller that responds to #current_ability, #blackligh_config
-      # @param nesting_attributes [NestingAttributes] an object encapsulating nesting attributes of the collection
       # @param nest_direction [Symbol] (:as_parent or :as_child) the direction we are adding nesting to this collection
-      def initialize(access:, collection:, scope:, nesting_attributes:, nest_direction:)
+      def initialize(access:, collection:, scope:, nest_direction:)
         super(scope)
         @collection = collection
         @discovery_permissions = extract_discovery_permissions(access)
-        @nesting_attributes = nesting_attributes
         @nest_direction = nest_direction
       end
 
@@ -24,74 +22,16 @@ module Hyrax
         solr_parameters[:rows] = 1000
       end
 
+      # Solr can do graph traversal without the need of special indexing with the Graph query parser so
+      # use this to compute both the parents and children of the current collection then exclude them
+      # See https://solr.apache.org/guide/solr/latest/query-guide/other-parsers.html#graph-query-parser
       def show_only_other_collections_of_the_same_collection_type(solr_parameters)
         solr_parameters[:fq] ||= []
         solr_parameters[:fq] += [
-          "-" + Hyrax::SolrQueryBuilderService.construct_query_for_ids([limit_ids]),
-          Hyrax::SolrQueryBuilderService.construct_query(Hyrax.config.collection_type_index_field => @collection.collection_type_gid)
+          Hyrax::SolrQueryBuilderService.construct_query(Hyrax.config.collection_type_index_field => @collection.collection_type_gid),
+          "-{!graph from=id to=member_of_collection_ids_ssim#{' maxDepth=1' if @nest_direction == :as_parent}}id:#{@collection.id}",
+          "-{!graph to=id from=member_of_collection_ids_ssim#{' maxDepth=1' if @nest_direction == :as_child}}id:#{@collection.id}"
         ]
-        solr_parameters[:fq] += limit_clause if limit_clause # add limits to prevent illegal nesting arrangements
-      end
-
-      private
-
-      def limit_ids
-        # exclude current collection from returned list
-        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
-      end
-
-      # remove collections from list in order to to prevent illegal nesting arrangements
-      def limit_clause
-        case @nest_direction
-        when :as_parent
-          eligible_to_be_a_parent
-        when :as_child
-          eligible_to_be_a_child
-        end
-      end
-
-      # To be eligible to be a parent collection of child "Collection G":
-      # 1) cannot have any pathnames containing Collection G's ID
-      # 2) cannot already be Collection G's direct parent
-      # => this is handled through limit_ids method
-      def eligible_to_be_a_parent
-        # Using a !lucene query allows us to get items using a wildcard query, a feature not supported via AF query builder.
-        ["-_query_:\"{!lucene df=#{Samvera::NestingIndexer.configuration.solr_field_name_for_storing_pathnames}}*#{@collection.id}*\""]
-      end
-
-      # To be eligible to be a child collection of parent "Collection F":
-      # 1) Cannot have any pathnames containing any of Collection F's pathname or ancestors
-      # 2) cannot already be Collection F's direct child
-      def eligible_to_be_a_child
-        exclude_path = []
-        exclude_path << exclude_if_paths_contain_collection
-        exclude_path << exclude_if_already_parent
-      end
-
-      def exclude_if_paths_contain_collection
-        # 1) Exclude any pathnames containing any of Collection F's pathname or ancestors
-        array_to_exclude = [] + @nesting_attributes.pathnames unless @nesting_attributes.pathnames.nil?
-        array_to_exclude += @nesting_attributes.ancestors unless @nesting_attributes.ancestors.nil?
-        # build a unique string containing all of Collection F's pathnames and ancestors
-        exclude_list = ""
-        array_to_exclude&.uniq&.each do |element|
-          exclude_list += ' ' unless exclude_list.empty?
-          exclude_list += element.to_s
-        end
-        # Using a !lucene query allows us to get items which match any individual element
-        # from the list. Building the query via the AF builder created a !field query which
-        # only searches the field for an exact string and doesn't allow an "OR" connection
-        # between the elements.
-        return "-_query_:\"{!lucene q.op=OR df=#{Samvera::NestingIndexer.configuration.solr_field_name_for_storing_pathnames}}#{exclude_list}\"" unless exclude_list.empty?
-        ""
-      end
-
-      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.to_s)
       end
     end
   end

data/app/services/hyrax/admin_set_create_service.rb

@@ -242,10 +242,10 @@ module Hyrax
 
     def workflow_agents
       [
-        Hyrax::Group.new(admin_group_name)
+        Sipity::Agent(Hyrax::Group.new(admin_group_name))
       ].tap do |agent_list|
         # The default admin set does not have a creating user
-        agent_list << creating_user if creating_user
+        agent_list << Sipity::Agent(creating_user) if creating_user
       end
     end
 

data/app/services/hyrax/analytics/google.rb

@@ -27,7 +27,7 @@ module Hyrax
             filename = Rails.root.join('config', 'analytics.yml')
             yaml = YAML.safe_load(ERB.new(File.read(filename)).result)
             unless yaml
-              Rails.logger.error("Unable to fetch any keys from #{filename}.")
+              Hyrax.logger.error("Unable to fetch any keys from #{filename}.")
               return new({})
             end
             config = yaml.fetch('analytics')&.fetch('google', nil)

data/app/services/hyrax/analytics/matomo.rb

@@ -24,7 +24,7 @@ module Hyrax
             filename = Rails.root.join('config', 'analytics.yml')
             yaml = YAML.safe_load(ERB.new(File.read(filename)).result)
             unless yaml
-              Rails.logger.error("Unable to fetch any keys from #{filename}.")
+              Hyrax.logger.error("Unable to fetch any keys from #{filename}.")
               return new({})
             end
             new yaml.fetch('analytics')&.fetch('matomo')

data/app/services/hyrax/collection_member_service.rb

@@ -31,5 +31,7 @@ module Hyrax
     def collection_search_builder
       @collection_search_builder ||= ParentCollectionSearchBuilder.new([:include_item_ids, :add_paging_to_solr, :add_access_controls_to_solr_params], self)
     end
+
+    def search_state_class; end
   end
 end

data/app/services/hyrax/collection_types/create_service.rb

@@ -147,7 +147,7 @@ module Hyrax
           Hyrax::CollectionTypeParticipant.create!(hyrax_collection_type_id: collection_type_id, agent_type: p.fetch(:agent_type), agent_id: p.fetch(:agent_id), access: p.fetch(:access))
         end
       rescue InvalidParticipantError => error
-        Rails.logger.error "Participants not created for collection type " \
+        Hyrax.logger.error "Participants not created for collection type " \
                            " #{collection_type_id}: #{error.message}"
         raise error
       end

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

@@ -13,17 +13,17 @@ module Hyrax
       def self.migrate_all_collections
         Deprecation.warn('This migration tool will be removed in Hyrax 4.0.0.')
 
-        Rails.logger.info "*** Migrating #{::Collection.count} collections"
+        Hyrax.logger.info "*** Migrating #{::Collection.count} collections"
         ::Collection.all.each do |col|
           migrate_collection(col)
-          Rails.logger.info "  migrating collection - id: #{col.id}, title: #{col.title}"
+          Hyrax.logger.info "  migrating collection - id: #{col.id}, title: #{col.title}"
         end
 
         AdminSet.all.each do |adminset|
           migrate_adminset(adminset)
-          Rails.logger.info "  migrating adminset - id: #{adminset.id}, title: #{adminset.title}"
+          Hyrax.logger.info "  migrating adminset - id: #{adminset.id}, title: #{adminset.title}"
         end
-        Rails.logger.info "--- Migration Complete"
+        Hyrax.logger.info "--- Migration Complete"
       end
 
       # @api private
@@ -64,16 +64,16 @@ module Hyrax
       def self.repair_migrated_collections
         Deprecation.warn('This migration tool will be removed in Hyrax 4.0.0.')
 
-        Rails.logger.info "*** Repairing migrated collections"
+        Hyrax.logger.info "*** Repairing migrated collections"
         ::Collection.all.each do |col|
           repair_migrated_collection(col)
-          Rails.logger.info "  repairing collection - id: #{col.id}, title: #{col.title}"
+          Hyrax.logger.info "  repairing collection - id: #{col.id}, title: #{col.title}"
         end
         AdminSet.all.each do |adminset|
           migrate_adminset(adminset)
-          Rails.logger.info "  repairing adminset - id: #{adminset.id}, title: #{adminset.title}"
+          Hyrax.logger.info "  repairing adminset - id: #{adminset.id}, title: #{adminset.title}"
         end
-        Rails.logger.info "--- Repairing Complete"
+        Hyrax.logger.info "--- Repairing Complete"
       end
 
       # @api private