hyrax 3.2.0 → 3.4.1

data/app/models/hyrax/default_administrative_set.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+module Hyrax
+  # This class stores the id of the default `Hyrax::AdministrativeSet`.  This is
+  # used to populate a cache of the default admin set in Hyrax::Configuration.
+  #
+  # @see Hyrax::Configuration.default_admin_set
+  # @see Hyrax::Configuration.default_admin_set_id
+  # @see Hyrax::Configuration.reset_default_admin_set
+  class DefaultAdministrativeSet < ActiveRecord::Base
+    self.table_name = 'hyrax_default_administrative_set'
+
+    class << self
+      # Set the default admin set id in the first record.
+      # @param default_admin_set_id [String | Valkyrie::ID] id of the new default admin set
+      def update(default_admin_set_id:)
+        validate_id(default_admin_set_id)
+        Hyrax.config.reset_default_admin_set
+
+        # saving default_admin_set_id for the first time
+        return new(default_admin_set_id: default_admin_set_id.to_s).save if count.zero?
+
+        # replacing previously saved default_admin_set_id
+        existing = first
+        existing.default_admin_set_id = default_admin_set_id.to_s
+        existing.save
+      end
+
+      def save_supported?
+        ActiveRecord::Base.connection.table_exists? table_name
+      end
+
+      private
+
+      def validate_id(id)
+        # The id is validated prior to updating because a bad default admin set
+        # will cause lots of problems.
+        return true if id.is_a?(String) || id.is_a?(Valkyrie::ID)
+        raise ArgumentError, "default_admin_set_id must be a non-blank String or Valkyrie::ID"
+      end
+    end
+  end
+end

data/app/models/hyrax/file_metadata.rb

@@ -2,6 +2,10 @@
 
 module Hyrax
   class FileMetadata < Valkyrie::Resource
+    # Include mime-types for Hydra Derivatives mime-type checking. We may want
+    # to move this logic someday.
+    include Hydra::Works::MimeTypes
+
     GENERIC_MIME_TYPE = 'application/octet-stream'
 
     ##
@@ -42,7 +46,7 @@ module Hyrax
     attribute :label, ::Valkyrie::Types::Set
     attribute :original_filename, ::Valkyrie::Types::String
     attribute :mime_type, ::Valkyrie::Types::String.default(GENERIC_MIME_TYPE)
-    attribute :type, ::Valkyrie::Types::Set.default([Use::ORIGINAL_FILE].freeze)
+    attribute :type, ::Valkyrie::Types::Set.default([Use::ORIGINAL_FILE])
 
     # attributes set by fits
     attribute :format_label, ::Valkyrie::Types::Set

data/app/models/hyrax/file_set.rb

@@ -4,6 +4,30 @@ module Hyrax
   ##
   # Valkyrie model for `FileSet` domain objects in the Hydra Works model.
   #
+  # ## Relationships
+  #
+  # ### File Set and Work
+  #
+  # * Defined: The relationship is defined by the inverse relationship stored in the
+  #   work's `:member_ids` attribute.
+  # * Tested: The work tests the relationship.
+  # * File Set to Work: (1..1)  A file set must be in one and only one work.
+  #
+  # @example Get work for a file set:
+  #       work = Hyrax.custom_queries.find_parent_work(resource: file_set)
+  #
+  # * Work to File Set: (0..m)  A work can have many file sets.
+  #   * See Hyrax::Work for code to get and set file sets for the work.
+  #
+  # ### File Set and File (TBD)
+  #
+  # @see Hyrax::Work
+  # @see Hyrax::CustomQueries::Navigators::ParentWorkNavigator#find_parent_work
+  #
+  # @todo The description in Hydra::Works Shared Modeling is out of date and uses
+  #   terminology to describe the relationships that is no longer used in code.
+  #   Update the model and link to it.  This can be a simple relationship diagram
+  #   with a link to the original Works Shared Modeling for historical perspective.
   # @see https://wiki.duraspace.org/display/samvera/Hydra%3A%3AWorks+Shared+Modeling
   class FileSet < Hyrax::Resource
     include Hyrax::Schema(:core_metadata)
@@ -15,11 +39,28 @@ module Hyrax
       end
     end
 
+    class_attribute :characterization_proxy
+    self.characterization_proxy = Hyrax.config.characterization_proxy
+
     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 :thumbnail_id, Valkyrie::Types::ID # id for FileMetadata resource
     attribute :extracted_text_id, Valkyrie::Types::ID # id for FileMetadata resource
 
+    ##
+    # @return [Valkyrie::ID]
+    def representative_id
+      id
+    end
+
+    ##
+    # @return [Valkyrie::ID]
+    # If one is set then return it, otherwise use self as the ID to allow for
+    # derivative generators to find the on-disk path for the thumbnail.
+    def thumbnail_id
+      self.[](:thumbnail_id) || id
+    end
+
     ##
     # @return [Boolean] true
     def pcdm_object?

data/app/models/hyrax/pcdm_collection.rb

@@ -5,6 +5,40 @@ require_dependency 'hyrax/collection_name'
 module Hyrax
   ##
   # Valkyrie model for Collection domain objects in the Hydra Works model.
+  #
+  # ## Relationships
+  #
+  # ### Collection and Collection (TBA)
+  #
+  # ### Collection and Work
+  #
+  # * Defined: The relationship is defined by the inverse relationship stored in the
+  #   work's `:member_of_collection_ids` attribute.
+  # * Tested: The work tests the relationship.
+  # * Collection to Work: (0..m)  A collection can have many works.
+  #
+  # @example Get works in a collection:
+  #       works = Hyrax.custom_queries.find_child_works(resource: collection)
+  #
+  # * Work to Collection: (0..m)  A work can be in many collections.
+  #   * See Hyrax::Work for code to get and set collections for the work.
+  #
+  # @note Some collection types limit a work to belong to one and only one collection of that type.
+  #
+  # ### All children
+  #
+  # * There are additional methods for finding all children without respect to
+  #   the child's type.
+  #
+  # @example Get works and child collections in a collection using:
+  #       members = Hyrax.custom_queries.find_members_of(resource: collection)
+  #
+  # @see Hyrax::Work
+  #
+  # @see Hyrax::CustomQueries::Navigators::ChildCollectionsNavigator#find_child_collections
+  # @see Hyrax::CustomQueries::Navigators::ChildWorksNavigator#find_child_works
+  # @see Hyrax::CustomQueries::Navigators::CollectionMembers#find_members_of
+  #
   class PcdmCollection < Hyrax::Resource
     include Hyrax::Schema(:core_metadata)
     include Hyrax::Schema(:basic_metadata)
@@ -32,5 +66,27 @@ module Hyrax
     def pcdm_object?
       true
     end
+
+    def permission_manager
+      @permission_manager ||= Hyrax::PermissionManager.new(resource: self)
+    end
+
+    def visibility=(value)
+      visibility_writer.assign_access_for(visibility: value)
+    end
+
+    def visibility
+      visibility_reader.read
+    end
+
+    protected
+
+    def visibility_writer
+      Hyrax::VisibilityWriter.new(resource: self)
+    end
+
+    def visibility_reader
+      Hyrax::VisibilityReader.new(resource: self)
+    end
   end
 end

data/app/models/hyrax/permission_template.rb

@@ -4,7 +4,7 @@ module Hyrax
   # Holds policy data about the workflow and permissions applied objects when
   # they are deposited through an Administrative Set or a Collection. Each
   # template record has a {#source} (through {#source_id}); the template's
-  # rules inform the behavior of objects deposited through that {#source_model}.
+  # rules inform the behavior of objects deposited through that {#source}.
   #
   # The {PermissionTemplate} specifies:
   #
@@ -81,6 +81,10 @@ module Hyrax
     # A bit of an analogue for a `belongs_to :source_model` as it crosses from Fedora to the DB
     # @return [AdminSet, ::Collection]
     # @raise [Hyrax::ObjectNotFoundError] when neither an AdminSet or Collection is found
+    # @note This method will eventually be replaced by #source which returns a Hyrax::Resource
+    #   object.  Many methods are equally able to process both Hyrax::Resource and
+    #   ActiveFedora::Base.  Only call this method if you need the ActiveFedora::Base object.
+    # @see #source
     def source_model
       ActiveFedora::Base.find(source_id)
     rescue ActiveFedora::ObjectNotFoundError
@@ -88,11 +92,11 @@ module Hyrax
     end
 
     # A bit of an analogue for a `belongs_to :admin_set` as it crosses from Fedora to the DB
-    # @deprecated Use #source_model instead
+    # @deprecated Use #source instead
     # @return [AdminSet]
     # @raise [Hyrax::ObjectNotFoundError] when the we cannot find the AdminSet
     def admin_set
-      Deprecation.warn('Use #source_model instead')
+      Deprecation.warn("#admin_set is deprecated; use #source instead.")
       return AdminSet.find(source_id) if AdminSet.exists?(source_id)
       raise Hyrax::ObjectNotFoundError
     rescue ActiveFedora::ActiveFedoraError # TODO: remove the rescue when active_fedora issue #1276 is fixed
@@ -100,11 +104,11 @@ module Hyrax
     end
 
     # A bit of an analogue for a `belongs_to :collection` as it crosses from Fedora to the DB
-    # @deprecated Use #source_model instead
+    # @deprecated Use #source instead
     # @return [Collection]
     # @raise [Hyrax::ObjectNotFoundError] when the we cannot find the Collection
     def collection
-      Deprecation.warn('Use #source_model instead')
+      Deprecation.warn("#collection is deprecated; use #source instead.")
       return ::Collection.find(source_id) if ::Collection.exists?(source_id)
       raise Hyrax::ObjectNotFoundError
     rescue ActiveFedora::ActiveFedoraError # TODO: remove the rescue when active_fedora issue #1276 is fixed
@@ -216,10 +220,12 @@ module Hyrax
     end
 
     ##
+    # @deprecated Use #reset_access_controls_for instead
     # @param interpret_visibility [Boolean] whether to retain the existing
     #   visibility when applying permission template ACLs
     # @return [Boolean]
     def reset_access_controls(interpret_visibility: false)
+      Deprecation.warn("#reset_access_controls is deprecated; use #reset_access_controls_for instead.")
       reset_access_controls_for(collection: source_model,
                                 interpret_visibility: interpret_visibility)
     end

data/app/models/hyrax/statistic.rb

@@ -34,13 +34,40 @@ module Hyrax
           Rails.logger.error("Google Analytics profile has not been established. Unable to fetch statistics.")
           return []
         end
-        profile.hyrax__pageview(sort: 'date',
-                                start_date: start_date,
-                                end_date: Date.yesterday,
-                                limit: 10_000)
+        profile.hyrax__analytics__google__pageviews(sort: 'date',
+                                                    start_date: start_date,
+                                                    end_date: Date.yesterday,
+                                                    limit: 10_000)
                .for_path(path)
       end
 
+      def query_works(query)
+        models = Hyrax.config.curation_concerns.map { |m| "\"#{m}\"" }
+        ActiveFedora::SolrService.query("has_model_ssim:(#{models.join(' OR ')})", fl: query, rows: 100_000)
+      end
+
+      def work_types
+        results = query_works("human_readable_type_tesim")
+        results.group_by { |result| result['human_readable_type_tesim'].join('') }.transform_values(&:count)
+      end
+
+      def resource_types
+        results = query_works("resource_type_tesim")
+        resource_types = []
+        results.each do |y|
+          if y["resource_type_tesim"].nil? || (y["resource_type_tesim"] == [""])
+            resource_types.push("Unknown")
+          elsif y["resource_type_tesim"].count > 1
+            y["resource_type_tesim"].each do |t|
+              resource_types.push(t)
+            end
+          else
+            resource_types.push(y["resource_type_tesim"].join(""))
+          end
+        end
+        resource_types.group_by { |rt| rt }.transform_values(&:count)
+      end
+
       private
 
       def cached_stats(object, start_date, _method)

data/app/models/hyrax/work.rb

@@ -4,6 +4,97 @@ module Hyrax
   ##
   # Valkyrie model for `Work` domain objects in the Hydra Works model.
   #
+  # ## Relationships
+  #
+  # ### Administrative Set and Work
+  #
+  # * Defined: The relationship is defined by the work's `:admin_set_id` attribute.
+  # * Tested: The relationship is tested in shared spec `'a Hyrax::Work'` by testing
+  #   `#admin_set_id`.  Shared specs are defined in /lib/hyrax/specs/shared_specs/hydra_works.rb.
+  # * Administrative Set to Work: (1..m) An admin set can have many works.
+  #   * See Hyrax::AdministrativeSet for code to get works in an admin set.
+  # * Work to Administrative Set: (1..1)  A work must be in one and only one admin set.
+  #
+  # @example Set admin set for a work:
+  #       work.admin_set_id = admin_set.id
+  # @example Get admin set a work is in:
+  #       admin_set = Hyrax.query_service.find_by(id: work.admin_set_id)
+  #
+  # ### Collection and Work
+  #
+  # * Defined: The relationship is defined by the work's `:member_of_collection_ids` attribute.
+  # * Tested: The relationship is tested in shared spec `'a Hyrax::Work'` by testing
+  #   `it_behaves_like 'belongs to collections'`.  Shared specs are defined in /lib/hyrax/specs/shared_specs/hydra_works.rb.
+  # * Collection to Work: (0..m)  A collection can have many works.
+  #   * See Hyrax::PcdmCollection for code to get works in a collection.
+  # * Work to Collection: (0..m)  A work can be in many collections.
+  #
+  # @example Add a work to a collection using Hyrax::CollectionMemberService (multiple method options)
+  #       Hyrax::CollectionMemberService.add_members(collection_id: col.id, members: works, user: current_user)
+  # @example Get collections a work is in:
+  #       collections = Hyrax.custom_queries.find_collections_for(resource: work)
+  #
+  # @note Some collection types limit a work to belong to one and only one collection of that type.
+  #
+  # ### Work and Work
+  #
+  # * Defined: The relationship is defined in the parent work's `:member_ids` attribute.
+  # * Tested: The relationship is tested in shared spec `'a Hyrax::Work'` by testing
+  #   `it_behaves_like 'has_members'`.  Shared specs are defined in /lib/hyrax/specs/shared_specs/hydra_works.rb.
+  # * Work to child Work: (0..m)  A work can have many child works.
+  #
+  # @example Add a child work to a work:
+  #       Hyrax::Transactions::Container['work_resource.add_to_parent']
+  #         .call(child_work, parent_id: parent_work.id, user: current_user)
+  # @example Get child works:
+  #       works = Hyrax.custom_queries.find_child_works(resource: parent_work)
+  #
+  # * Work to parent Work: (0..1)  A work can be in at most one parent work.
+  #
+  # @example Get parent work:
+  #       parent_work = Hyrax.custom_queries.find_parent_work(resource: child_work)
+  #
+  # @note `:member_ids` holds ids of child works and file sets.
+  #
+  # ### Work and File Set
+  #
+  # * Defined: The relationship is defined in the parent work's `:member_ids` attribute.
+  # * Tested: The relationship is tested in shared spec `'a Hyrax::Work'` by testing
+  #   `it_behaves_like 'has_members'`.  Shared specs are defined in /lib/hyrax/specs/shared_specs/hydra_works.rb.
+  # * Work to File Set: (0..m)  A work can have many file sets.
+  # @example Add a file set to a work (code from Hyrax::WorkUploadsHandler#append_to_work)
+  #       work.member_ids << file_set.id
+  #       work.representative_id = file_set.id if work.respond_to?(:representative_id) && work.representative_id.blank?
+  #       work.thumbnail_id = file_set.id if work.respond_to?(:thumbnail_id) && work.thumbnail_id.blank?
+  #       Hyrax.persister.save(resource: work)
+  #       Hyrax.publisher.publish('object.metadata.updated', object: work, user: files.first.user)
+  # @example Get file sets:
+  #       file_sets = Hyrax.custom_queries.find_child_file_sets(resource: work)
+  #
+  # * File Set to Work: (1..1)  A file set must be in one and only one work.
+  #   * See Hyrax::FileSet for code to get the work a file set is in.
+  #
+  # @see Hyrax::AdministrativeSet
+  # @see Hyrax::PcdmCollection
+  # @see Hyrax::FileSet
+  #
+  # @see Hyrax::CollectionMemberService
+  # @see Hyrax::Transactions::Steps::AddToParent
+  # @see Hyrax::Transactions::Steps::AddFileSets
+  # @see Hyrax::WorksControllerBehavior
+  # @see Hyrax::WorkUploadsHandler#append_to_work
+  #
+  # @see Valkyrie query adapter's #find_by
+  # @see Hyrax::CustomQueries::Navigators::CollectionMembers#find_collections_for
+  # @see Hyrax::CustomQueries::Navigators::ParentWorkNavigator#find_parent_work
+  # @see Hyrax::CustomQueries::Navigators::ChildFileSetsNavigator#find_child_file_sets
+  #
+  # @see /lib/hyrax/specs/shared_specs/hydra_works.rb
+  #
+  # @todo The description in Hydra::Works Shared Modeling is out of date and uses
+  #   terminology to describe the relationships that is no longer used in code.
+  #   Update the model and link to it.  This can be a simple relationship diagram
+  #   with a link to the original Works Shared Modeling for historical perspective.
   # @see https://wiki.lyrasis.org/display/samvera/Hydra::Works+Shared+Modeling
   class Work < Hyrax::Resource
     include Hyrax::Schema(:core_metadata)

data/app/models/proxy_deposit_request.rb

@@ -129,7 +129,7 @@ class ProxyDepositRequest < ActiveRecord::Base
 
   # @param [TrueClass,FalseClass] reset (false)  if true, reset the access controls. This revokes edit access from the depositor
   def transfer!(reset = false)
-    ContentDepositorChangeEventJob.perform_later(work, receiving_user, reset)
+    Hyrax::ChangeDepositorService.call(work, receiving_user, reset)
     fulfill!(status: ACCEPTED)
   end
 

data/app/presenters/hyrax/admin/dashboard_presenter.rb

@@ -3,20 +3,22 @@ module Hyrax
   module Admin
     class DashboardPresenter
       # @return [Fixnum] the number of currently registered users
-      def user_count
-        ::User.where(guest: false).count
+      def user_count(start_date, end_date)
+        ::User.where(guest: false)
+              .where({ created_at: start_date.to_date.beginning_of_day..end_date.to_date.end_of_day })
+              .count
       end
 
       def repository_objects
         @repository_objects ||= Admin::RepositoryObjectPresenter.new
       end
 
-      def repository_growth
-        @repository_growth ||= Admin::RepositoryGrowthPresenter.new
+      def repository_growth(start_date, end_date)
+        @repository_growth ||= Admin::RepositoryGrowthPresenter.new(start_date, end_date)
       end
 
-      def user_activity
-        @user_activity ||= Admin::UserActivityPresenter.new
+      def user_activity(start_date, end_date)
+        @user_activity ||= Admin::UserActivityPresenter.new(start_date, end_date)
       end
     end
   end

data/app/presenters/hyrax/admin/repository_growth_presenter.rb

@@ -2,26 +2,31 @@
 module Hyrax
   module Admin
     class RepositoryGrowthPresenter
-      def initialize
-        @x_min = 90.days.ago.beginning_of_day
+      def initialize(start_date, end_date)
+        @x_min = start_date
+        @x_max = end_date
         @date_format = ->(x) { x.strftime('%F') }
       end
 
       def as_json(*)
         works.to_a.zip(collections.to_a).map do |e|
-          { y: e.first.first, a: e.first.last, b: e.last.last }
+          { y: e.first.first, works: e.first.last, collections: e.last.last }
         end
       end
 
       private
 
       def works
-        Hyrax::Statistics::Works::OverTime.new(x_min: @x_min,
+        Hyrax::Statistics::Works::OverTime.new(delta_x: 1,
+                                               x_min: @x_min,
+                                               x_max: @x_max,
                                                x_output: @date_format).points
       end
 
       def collections
-        Hyrax::Statistics::Collections::OverTime.new(x_min: @x_min,
+        Hyrax::Statistics::Collections::OverTime.new(delta_x: 1,
+                                                     x_min: @x_min,
+                                                     x_max: @x_max,
                                                      x_output: @date_format).points
       end
     end

data/app/presenters/hyrax/admin/user_activity_presenter.rb

@@ -2,28 +2,24 @@
 module Hyrax
   module Admin
     class UserActivityPresenter
-      def initialize
-        @x_min = 90.days.ago.beginning_of_day
-        @date_format = ->(x) { x.strftime('%b %-d') }
+      def initialize(start_date, end_date)
+        @x_min = start_date
+        @x_max = end_date
+        @date_format = ->(x) { x }
       end
 
       def as_json(*)
-        new_users.to_a.zip(returning_users.to_a).map do |e|
-          { y: e.first.first, a: e.first.last, b: e.last.try(:last) }
-        end
+        new_users.to_a
       end
 
       private
 
       def new_users
-        Hyrax::Statistics::Users::OverTime.new(x_min: @x_min,
+        Hyrax::Statistics::Users::OverTime.new(delta_x: 1,
+                                               x_min: @x_min,
+                                               x_max: @x_max,
                                                x_output: @date_format).points
       end
-
-      # TODO: using google analytics
-      def returning_users
-        []
-      end
     end
   end
 end

data/app/presenters/hyrax/admin_set_presenter.rb

@@ -8,11 +8,11 @@ module Hyrax
     end
 
     def total_items
-      Hyrax::SolrService.count("{!field f=isPartOf_ssim}#{id}")
+      Hyrax::SolrService.count("{!field f=#{Hyrax.config.admin_set_predicate.qname.last}_ssim}#{id}")
     end
 
     def total_viewable_items
-      field_pairs = { "isPartOf_ssim" => id.to_s }
+      field_pairs = { "#{Hyrax.config.admin_set_predicate.qname.last}_ssim" => id.to_s }
       SolrQueryService.new
                       .with_field_pairs(field_pairs: field_pairs)
                       .accessible_by(ability: current_ability)

data/app/presenters/hyrax/file_set_presenter.rb

@@ -34,6 +34,8 @@ module Hyrax
              :original_file_id,
              to: :solr_document
 
+    delegate :member_of_collection_ids, to: :parent
+
     def workflow
       nil
     end

data/app/presenters/hyrax/menu_presenter.rb

@@ -43,6 +43,10 @@ module Hyrax
       end
     end
 
+    def analytics_reporting_section?
+      %w[work_reports collection_reports].include?(controller_name)
+    end
+
     # Draw a collaspable menu section. The passed block should contain <li> items.
     def collapsable_section(text, id:, icon_class:, open:, &block)
       CollapsableSectionPresenter.new(view_context: view_context,

data/app/presenters/hyrax/pcdm_member_presenter_factory.rb

@@ -19,7 +19,7 @@ module Hyrax
     ##
     # @param [#member_ids] object
     # @param [::Ability] ability
-    def initialize(object, ability)
+    def initialize(object, ability, _request = nil)
       @object = object
       @ability = ability
     end
@@ -97,7 +97,7 @@ module Hyrax
     # @return
     def presenter_for(document:, ability:)
       case document['has_model_ssim'].first
-      when Hyrax::FileSet.name
+      when Hyrax::FileSet.name, ::FileSet.name # ActiveFedora FileSet within a Valkyrie Resource
         Hyrax::FileSetPresenter.new(document, ability)
       else
         Hyrax::WorkShowPresenter.new(document, ability)
@@ -111,7 +111,7 @@ module Hyrax
       query += "{!term f=generic_type_si}#{generic_type}" if generic_type
 
       Hyrax::SolrService
-        .post(query, rows: 10_000)
+        .post(q: query, rows: 10_000)
         .fetch('response')
         .fetch('docs')
     end

data/app/presenters/hyrax/work_show_presenter.rb

@@ -10,10 +10,11 @@ module Hyrax
     attr_writer :member_presenter_factory
     attr_accessor :solr_document, :current_ability, :request
 
-    class_attribute :collection_presenter_class
+    class_attribute :collection_presenter_class, :presenter_factory_class
 
     # modify this attribute to use an alternate presenter class for the collections
     self.collection_presenter_class = CollectionPresenter
+    self.presenter_factory_class = MemberPresenterFactory
 
     # Methods used by blacklight helpers
     delegate :has?, :first, :fetch, :export_formats, :export_as, to: :solr_document
@@ -304,7 +305,13 @@ module Hyrax
 
     def member_presenter_factory
       @member_presenter_factory ||=
-        MemberPresenterFactory.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/presenters/hyrax/work_usage.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Hyrax
+  # TODO: - Analytics do we still need this?
   # Follows the model established by {FileUsage}.
   #
   # Called by the stats controller, it finds cached work pageview data,

data/app/search_builders/hyrax/README.md

@@ -66,4 +66,4 @@ module Hyrax
 end
 ```
 
-There is no point having the other `filter_models` methods apply `:fq`s that we then try to undo or overwrite.  In general, directly overwriting the whole `default_processor_chain` or solr parameters like `:fq` is less flexible than appending constraints sufficient for your use case.  In particular, you might find that you have overwritten components that implement access controls, thereby making your SearchBuilder less useful and less secure.  When in doubt, examine the actual solr queries produced.
+There is no point having the other `filter_models` methods apply `:fq`s that we then try to undo or overwrite.  In general, directly overwriting the whole `default_processor_chain` or solr parameters like `:fq` is less flexible than appending constraints sufficient for your use case.  In particular, you might find that you have overwritten components that implement access controls, thereby making your SearchBuilder less useful and less secure.  When in doubt, examine the actual solr queries produced.

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_model.safe_constantize].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 ')})"]