hyrax 3.1.0 → 3.2.0

data/app/controllers/hyrax/dashboard/nest_collections_controller.rb

@@ -1,100 +1,136 @@
 # frozen_string_literal: true
 module Hyrax
   module Dashboard
+    ##
+    # @api public
     class NestCollectionsController < ApplicationController
       include Blacklight::Base
+
       class_attribute :form_class, :new_collection_form_class
       self.form_class = Hyrax::Forms::Dashboard::NestCollectionForm
       self.new_collection_form_class = Hyrax::Forms::CollectionForm
 
       # Add this collection as a subcollection within another existing collection
       def create_relationship_within
-        @form = build_within_form
-        if @form.save
-          notice = I18n.t('create_within', scope: 'hyrax.dashboard.nest_collections_form', child_title: @form.child.title.first, parent_title: @form.parent.title.first)
-          redirect_to redirect_path(item: @form.child), notice: notice
+        authorize! :read, form_params[:child_id]
+
+        if form.save
+          notice = I18n.t('create_within', scope: 'hyrax.dashboard.nest_collections_form', child_title: form.child.title.first, parent_title: form.parent.title.first)
+          redirect_to redirect_path(item: form.child), notice: notice
         else
-          redirect_to redirect_path(item: @form.child), flash: { error: @form.errors.full_messages }
+          redirect_to redirect_path(item: form.child), flash: { error: form.errors.full_messages }
         end
       end
 
       # create and link a NEW subcollection under this collection, with this collection as parent
       def create_collection_under
-        @form = build_create_collection_form
-        if @form.validate_add
-          redirect_to new_dashboard_collection_path(collection_type_id: @form.parent.collection_type.id, parent_id: @form.parent)
+        authorize! :deposit, form_params[:parent_id]
+
+        if form.validate_add
+          redirect_to new_dashboard_collection_path(collection_type_id: parent_type_id_for(form), parent_id: form.parent)
         else
-          redirect_to redirect_path(item: @form.parent), flash: { error: @form.errors.full_messages }
+          redirect_to redirect_path(item: form.parent), flash: { error: form.errors.full_messages }
         end
       end
 
       # link this collection as parent by adding existing collection as subcollection under this one
       def create_relationship_under
-        @form = build_under_form
-        if @form.save
-          notice = I18n.t('create_under', scope: 'hyrax.dashboard.nest_collections_form', child_title: @form.child.title.first, parent_title: @form.parent.title.first)
-          redirect_to redirect_path(item: @form.parent), notice: notice
+        authorize! :read, form_params[:parent_id]
+
+        if form.save
+          notice = I18n.t('create_under', scope: 'hyrax.dashboard.nest_collections_form', child_title: form.child.title.first, parent_title: form.parent.title.first)
+          redirect_to redirect_path(item: form.parent), notice: notice
         else
-          redirect_to redirect_path(item: @form.parent), flash: { error: @form.errors.full_messages }
+          redirect_to redirect_path(item: form.parent), flash: { error: form.errors.full_messages }
         end
       end
 
       # remove a parent collection relationship from this collection
       def remove_relationship_above
-        @form = build_remove_form
-        if @form.remove
-          notice = I18n.t('removed_relationship', scope: 'hyrax.dashboard.nest_collections_form', child_title: @form.child.title.first, parent_title: @form.parent.title.first)
-          redirect_to redirect_path(item: @form.child), notice: notice
+        authorize! :edit, form_params[:parent_id]
+        if form.remove
+          notice = I18n.t('removed_relationship', scope: 'hyrax.dashboard.nest_collections_form', child_title: form.child.title.first, parent_title: form.parent.title.first)
+          redirect_to redirect_path(item: form.child), notice: notice
         else
-          redirect_to redirect_path(item: @form.child), flash: { error: @form.errors.full_messages }
+          redirect_to redirect_path(item: form.child), flash: { error: form.errors.full_messages }
         end
       end
 
       # remove a subcollection relationship from this collection
       def remove_relationship_under
-        @form = build_remove_form
-        if @form.remove
-          notice = I18n.t('removed_relationship', scope: 'hyrax.dashboard.nest_collections_form', child_title: @form.child.title.first, parent_title: @form.parent.title.first)
-          redirect_to redirect_path(item: @form.parent), notice: notice
+        authorize! :edit, form_params[:parent_id]
+
+        if form.remove
+          notice = I18n.t('removed_relationship', scope: 'hyrax.dashboard.nest_collections_form', child_title: form.child.title.first, parent_title: form.parent.title.first)
+          redirect_to redirect_path(item: form.parent), notice: notice
         else
-          redirect_to redirect_path(item: @form.parent), flash: { error: @form.errors.full_messages }
+          redirect_to redirect_path(item: form.parent), flash: { error: form.errors.full_messages }
         end
       end
 
       private
 
+      ##
+      # @deprecated
       def build_within_form
-        child = ::Collection.find(params.fetch(:child_id))
-        authorize! :read, child
-        parent = params.key?(:parent_id) ? ::Collection.find(params[:parent_id]) : nil
-        form_class.new(child: child, parent: parent, context: self)
+        authorize! :read, form_params[:child_id]
+        form_class.new(context: self, **form_params.to_h.symbolize_keys)
       end
+      deprecation_deprecate :build_within_form
 
+      ##
+      # @deprecated
       def build_under_form
-        parent = ::Collection.find(params.fetch(:parent_id))
-        authorize! :deposit, parent
-        child = params.key?(:child_id) ? ::Collection.find(params[:child_id]) : nil
-        form_class.new(child: child, parent: parent, context: self)
+        authorize! :read, form_params[:parent_id]
+        form_class.new(context: self, **form_params.to_h.symbolize_keys)
       end
+      deprecation_deprecate :build_under_form
 
+      ##
+      # @deprecated
       def build_create_collection_form
-        parent = ::Collection.find(params.fetch(:parent_id))
-        authorize! :deposit, parent
-        form_class.new(child: nil, parent: parent, context: self)
+        authorize! :deposit, form_params[:parent_id]
+        form_class.new(context: self, **form_params.to_h.symbolize_keys)
       end
+      deprecation_deprecate :build_create_collection_form
 
+      ##
+      # @deprecated
       def build_remove_form
-        child = ::Collection.find(params.fetch(:child_id))
-        parent = ::Collection.find(params.fetch(:parent_id))
-        authorize! :edit, parent
-        form_class.new(child: child, parent: parent, context: self)
+        authorize! :edit, form_params[:parent_id]
+        form_class.new(context: self, **form_params.to_h.symbolize_keys)
       end
+      deprecation_deprecate :build_create_collection_form
 
+      ##
+      # @api public
+      # @since 3.2.0
+      def form
+        @form ||=
+          form_class.new(context: self, **form_params.to_h.symbolize_keys)
+      end
+
+      ##
+      # @api public
+      # @since 3.2.0
+      def form_params
+        params.slice(:child_id, :parent_id).permit!
+      end
+
+      ##
+      # @api public
+      #
       # determine appropriate redirect location depending on specified source
       def redirect_path(item:)
         return my_collections_path if params[:source] == 'my'
         dashboard_collection_path(item)
       end
+
+      ##
+      # @api private
+      def parent_type_id_for(form)
+        URI::GID.parse(form.parent.collection_type_gid).model_id
+      end
     end
   end
 end

data/app/controllers/hyrax/my_controller.rb

@@ -27,7 +27,9 @@ module Hyrax
     configure_facets
 
     before_action :authenticate_user!
-    load_and_authorize_resource only: :show, instance_name: :collection
+    load_and_authorize_resource only: :show,
+                                instance_name: :collection,
+                                class: Hyrax.config.collection_model
 
     # include the render_check_all view helper method
     helper Hyrax::BatchEditsHelper
@@ -36,9 +38,7 @@ module Hyrax
 
     def index
       @user = current_user
-      Deprecation.silence(Hyrax::MyController) do
-        (@response, @document_list) = query_solr
-      end
+      (@response, @document_list) = search_service.search_results
       prepare_instance_variables_for_batch_control_display
 
       respond_to do |format|

data/app/controllers/hyrax/workflow_actions_controller.rb

@@ -3,6 +3,13 @@ module Hyrax
   class WorkflowActionsController < ApplicationController
     DEFAULT_FORM_CLASS = Hyrax::Forms::WorkflowActionForm
 
+    ##
+    # @!attribute [r] curation_concern
+    #   @api private
+    #   @return [Hyrax::Resource]
+    attr_reader :curation_concern
+
+    load_resource class: Hyrax::Resource, instance_name: :curation_concern
     before_action :authenticate_user!
 
     def update
@@ -11,17 +18,13 @@ module Hyrax
       else
         respond_to do |wants|
           wants.html { render 'hyrax/base/unauthorized', status: :unauthorized }
-          wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: curation_concern.errors }) }
+          wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: workflow_action_form.errors }) }
         end
       end
     end
 
     private
 
-    def curation_concern
-      @curation_concern ||= Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: params[:id], use_valkyrie: false)
-    end
-
     def workflow_action_form
       @workflow_action_form ||= DEFAULT_FORM_CLASS.new(
         current_ability: current_ability,

data/app/forms/hyrax/forms/administrative_set_form.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Forms
+    ##
+    # @api public
+    # @see https://github.com/samvera/valkyrie/wiki/ChangeSets-and-Dirty-Tracking
+    class AdministrativeSetForm < Valkyrie::ChangeSet
+      property :title, required: true, primary: true
+      property :description, primary: true
+
+      property :human_readable_type, writable: false
+      property :date_modified, readable: false
+      property :date_uploaded, readable: false
+
+      property :depositor
+
+      class << self
+        def model_class
+          Hyrax::AdministrativeSet
+        end
+
+        ##
+        # @return [Array<Symbol>] list of required field names as symbols
+        def required_fields
+          definitions
+            .select { |_, definition| definition[:required] }
+            .keys.map(&:to_sym)
+        end
+      end
+
+      ##
+      # @return [Array<Symbol>] terms for display 'above-the-fold', or in the most
+      #   prominent form real estate
+      def primary_terms
+        _form_field_definitions
+          .select { |_, definition| definition[:primary] }
+          .keys.map(&:to_sym)
+      end
+
+      ##
+      # @return [Array<Symbol>] terms for display 'below-the-fold'
+      def secondary_terms
+        _form_field_definitions
+          .select { |_, definition| definition[:display] && !definition[:primary] }
+          .keys.map(&:to_sym)
+      end
+
+      ##
+      # @return [Boolean] whether there are terms to display 'below-the-fold'
+      def display_additional_fields?
+        secondary_terms.any?
+      end
+
+      private
+
+      def _form_field_definitions
+        self.class.definitions
+      end
+    end
+  end
+end

data/app/forms/hyrax/forms/collection_form.rb

@@ -16,7 +16,7 @@ module Hyrax
       # Required for search builder (FIXME)
       alias collection model
 
-      self.model_class = ::Collection
+      self.model_class = Hyrax.config.collection_class
 
       self.membership_service_class = Collections::CollectionMemberSearchService
 
@@ -131,7 +131,7 @@ module Hyrax
       def available_parent_collections(scope:)
         return @available_parents if @available_parents.present?
 
-        collection = ::Collection.find(id)
+        collection = model_class.find(id)
         colls = Hyrax::Collections::NestedCollectionQueryService.available_parent_collections(child: collection, scope: scope, limit_to_id: nil)
         @available_parents = colls.map do |col|
           { "id" => col.id, "title_first" => col.title.first }

data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb

@@ -10,18 +10,28 @@ module Hyrax
         self.default_query_service = Hyrax::Collections::NestedCollectionQueryService
         self.default_persistence_service = Hyrax::Collections::NestedCollectionPersistenceService
 
+        ##
         # @param parent [::Collection, NilClass]
         # @param child [::Collection, NilClass]
+        # @param parent_id [String, nil]
+        # @param child_id [String, nil]
         # @param context [#can?,#repository,#blacklight_config]
         # @param query_service [Hyrax::Collections::NestedCollectionQueryService]
         # @param persistence_service [Hyrax::Collections::NestedCollectionPersistenceService] responsible for persisting the parent/child relationship
-        def initialize(parent: nil, child: nil, context:, query_service: default_query_service, persistence_service: default_persistence_service)
-          self.parent = parent
-          self.child = child
+        # rubocop:disable Metrics/ParameterLists
+        def initialize(parent: nil,
+                       child: nil,
+                       parent_id: nil,
+                       child_id: nil,
+                       context:,
+                       query_service: default_query_service,
+                       persistence_service: default_persistence_service)
+          self.parent = parent || (parent_id.present? && Hyrax.config.collection_class.find(parent_id))
+          self.child = child || (child_id.present? && Hyrax.config.collection_class.find(child_id))
           self.context = context
           self.query_service = query_service
           self.persistence_service = persistence_service
-        end
+        end # rubocop:enable Metrics/ParameterLists
 
         attr_accessor :parent, :child
 

data/app/forms/hyrax/forms/pcdm_collection_form.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Forms
+    ##
+    # @api public
+    # @see https://github.com/samvera/valkyrie/wiki/ChangeSets-and-Dirty-Tracking
+    class PcdmCollectionForm < Valkyrie::ChangeSet # rubocop:disable Metrics/ClassLength
+      property :title, required: true, primary: true
+
+      property :human_readable_type, writable: false
+      property :date_modified, readable: false
+      property :date_uploaded, readable: false
+
+      property :depositor, required: true
+      property :collection_type_gid, required: true
+
+      property :member_of_collection_ids, default: [], type: Valkyrie::Types::Array
+
+      class << self
+        def model_class
+          Hyrax::PcdmCollection
+        end
+
+        ##
+        # @return [Array<Symbol>] list of required field names as symbols
+        def required_fields
+          definitions
+            .select { |_, definition| definition[:required] }
+            .keys.map(&:to_sym)
+        end
+      end
+
+      ##
+      # @return [Array<Symbol>] terms for display 'above-the-fold', or in the most
+      #   prominent form real estate
+      def primary_terms
+        _form_field_definitions
+          .select { |_, definition| definition[:primary] }
+          .keys.map(&:to_sym)
+      end
+
+      ##
+      # @return [Array<Symbol>] terms for display 'below-the-fold'
+      def secondary_terms
+        _form_field_definitions
+          .select { |_, definition| definition[:display] && !definition[:primary] }
+          .keys.map(&:to_sym)
+      end
+
+      ##
+      # @return [Boolean] whether there are terms to display 'below-the-fold'
+      def display_additional_fields?
+        secondary_terms.any?
+      end
+
+      private
+
+      def _form_field_definitions
+        self.class.definitions
+      end
+    end
+  end
+end

data/app/forms/hyrax/forms/resource_form.rb

@@ -30,7 +30,7 @@ module Hyrax
     # @api public
     #
     # This form wraps `Hyrax::ChangeSet` in the `HydraEditor::Form` interface.
-    class ResourceForm < Hyrax::ChangeSet
+    class ResourceForm < Hyrax::ChangeSet # rubocop:disable Metrics/ClassLength
       ##
       # @api private
       InWorksPopulator = lambda do |_options|
@@ -53,16 +53,15 @@ module Hyrax
       #   we want to move away from application side lock validation and rely
       #   on the adapter/database features instead.
       LockKeyPopulator = lambda do |_options|
-        self.version =
-          case Hyrax.metadata_adapter
-          when Wings::Valkyrie::MetadataAdapter
+        if Hyrax.config.disable_wings || !Hyrax.metadata_adapter.is_a?(Wings::Valkyrie::MetadataAdapter)
+          Hyrax.logger.info "trying to prepopulate a lock token for " \
+                            "#{self.class.inspect}, but optimistic locking isn't " \
+                            "supported for the configured adapter: #{Hyrax.metadata_adapter.class}"
+          self.version = ''
+        else
+          self.version =
             model.persisted? ? Wings::ActiveFedoraConverter.convert(resource: model).etag : ''
-          else
-            Hyrax.logger.info 'trying to prepopulate a lock token for ' \
-                              "#{self.class.inspect}, but optimistic locking isn't " \
-                              "supported for the configured adapter: #{Hyrax.metadata_adapter.class}"
-            ''
-          end
+        end
       end
 
       class_attribute :model_class
@@ -101,6 +100,10 @@ module Hyrax
       property :member_ids, default: [], type: Valkyrie::Types::Array
       property :member_of_collection_ids, default: [], type: Valkyrie::Types::Array
 
+      property :representative_id, type: Valkyrie::Types::String
+      property :thumbnail_id, type: Valkyrie::Types::String
+      property :rendering_ids, default: [], type: Valkyrie::Types::Array
+
       # provide a lock token for optimistic locking; we name this `version` for
       # backwards compatibility
       #
@@ -130,6 +133,8 @@ module Hyrax
           case resource
           when Hyrax::FileSet
             Hyrax::Forms::FileSetForm.new(resource)
+          when Hyrax::PcdmCollection
+            Hyrax::Forms::PcdmCollectionForm.new(resource)
           else
             Hyrax::Forms::ResourceForm(resource.class).new(resource)
           end

data/app/forms/hyrax/forms/workflow_action_form.rb

@@ -17,6 +17,10 @@ module Hyrax
       include ActiveModel::Validations
       extend ActiveModel::Translation
 
+      ##
+      # @param current_ability [::Ability]
+      # @param work [ActiveFedora::Base, Valkyrie::Resource]
+      # @param attributes [Hash{Symbol => String}]
       def initialize(current_ability:, work:, attributes: {})
         @current_ability = current_ability
         @work = work

data/app/helpers/hyrax/hyrax_helper_behavior.rb

@@ -296,6 +296,15 @@ module Hyrax
       solr_field.first
     end
 
+    ##
+    # @param [Object] an object that might have a thumbnail
+    #
+    # @return [String] a label for the object's thumbnail
+    def thumbnail_label_for(object:)
+      object.try(:thumbnail_title).presence ||
+        ""
+    end
+
     private
 
     def user_agent

data/app/indexers/hyrax/administrative_set_indexer.rb

@@ -4,14 +4,14 @@ module Hyrax
   ##
   # Indexes Hyrax::AdministrativeSet objects
   class AdministrativeSetIndexer < Hyrax::ValkyrieIndexer
+    include Hyrax::Indexer(:core_metadata)
+
     def to_solr # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
       super.tap do |solr_doc|
-        solr_doc['generic_type_si'] = 'Admin Set'
-        solr_doc['alternative_title_tesim'] = resource.alternative_title
-        solr_doc['creator_ssim']            = resource.creator
-        solr_doc['description_tesim']       = resource.description
-        solr_doc['title_tesim']             = resource.title
-        solr_doc['title_sim']               = resource.title
+        solr_doc[:generic_type_si]         = 'Admin Set'
+        solr_doc[:alternative_title_tesim] = resource.alternative_title
+        solr_doc[:creator_ssim]            = resource.creator
+        solr_doc[:description_tesim]       = resource.description
       end
     end
   end

data/app/indexers/hyrax/pcdm_collection_indexer.rb

@@ -15,6 +15,8 @@ module Hyrax
         index_document[Hyrax.config.collection_type_index_field.to_sym] = Array(resource.try(:collection_type_gid)&.to_s)
         index_document[:generic_type_sim] = ['Collection']
         index_document[:thumbnail_path_ss] = Hyrax::CollectionThumbnailPathService.call(resource)
+        index_document[:depositor_ssim] = [resource.depositor]
+        index_document[:depositor_tesim] = [resource.depositor]
       end
     end
   end

data/app/models/admin_set.rb

@@ -21,9 +21,10 @@ class AdminSet < ActiveFedora::Base
   include Hyrax::Noid
   include Hyrax::HumanReadableType
   include Hyrax::HasRepresentative
+  include Hyrax::Permissions
 
-  DEFAULT_ID = 'admin_set/default'
-  DEFAULT_TITLE = ['Default Admin Set'].freeze
+  DEFAULT_ID = Hyrax::AdminSetCreateService::DEFAULT_ID
+  DEFAULT_TITLE = Hyrax::AdminSetCreateService::DEFAULT_TITLE
   DEFAULT_WORKFLOW_NAME = Hyrax.config.default_active_workflow_name
 
   validates_with Hyrax::HasOneTitleValidator
@@ -42,17 +43,27 @@ class AdminSet < ActiveFedora::Base
   after_destroy :destroy_permission_template
 
   def self.default_set?(id)
-    id == DEFAULT_ID
+    Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
+                     "Instead, use 'Hyrax::AdminSetCreateService.default_admin_set?(id:)'.")
+    Hyrax::AdminSetCreateService.default_admin_set?(id: id)
   end
 
   def default_set?
+    Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
+                     "Instead, use 'Hyrax::AdminSetCreateService.default_admin_set?(id:)'.")
     self.class.default_set?(id)
   end
 
   # Creates the default AdminSet and an associated PermissionTemplate with workflow
   def self.find_or_create_default_admin_set_id
-    Hyrax::AdminSetCreateService.create_default_admin_set(admin_set_id: DEFAULT_ID, title: DEFAULT_TITLE) unless exists?(DEFAULT_ID)
-    DEFAULT_ID
+    Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
+                     "Instead, use 'Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id'.")
+    Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s
+  end
+
+  def collection_type_gid
+    # allow AdminSet to behave more like a regular Collection
+    Hyrax::CollectionType.find_or_create_admin_set_type.to_global_id
   end
 
   def to_s

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

@@ -2,28 +2,52 @@
 module Hyrax
   module Ability
     module AdminSetAbility
-      def admin_set_abilities # rubocop:disable Metrics/MethodLength
+      def admin_set_abilities # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         if admin?
-          can :manage, AdminSet
+          can :manage, [AdminSet, Hyrax::AdministrativeSet]
           can :manage_any, AdminSet
+          can :manage_any, Hyrax::AdministrativeSet
           can :create_any, AdminSet
+          can :create_any, Hyrax::AdministrativeSet
           can :view_admin_show_any, AdminSet
+          can :view_admin_show_any, Hyrax::AdministrativeSet
         else
-          can :manage_any, AdminSet if Hyrax::Collections::PermissionsService.can_manage_any_admin_set?(ability: self)
-          can [:create_any, :create], AdminSet if Hyrax::CollectionTypes::PermissionsService.can_create_admin_set_collection_type?(ability: self)
-          can :view_admin_show_any, AdminSet if Hyrax::Collections::PermissionsService.can_view_admin_show_for_any_admin_set?(ability: self)
-
-          can [:edit, :update, :destroy], AdminSet do |admin_set| # for test by solr_doc, see solr_document_ability.rb
+          if Hyrax::Collections::PermissionsService.can_manage_any_admin_set?(ability: self)
+            can :manage_any, AdminSet
+            can :manage_any, Hyrax::AdministrativeSet
+          end
+          if Hyrax::CollectionTypes::PermissionsService.can_create_admin_set_collection_type?(ability: self)
+            can :create, [AdminSet, Hyrax::AdministrativeSet]
+            can :create_any, AdminSet
+            can :create_any, Hyrax::AdministrativeSet
+          end
+          if Hyrax::Collections::PermissionsService.can_view_admin_show_for_any_admin_set?(ability: self)
+            can :view_admin_show_any, AdminSet
+            can :view_admin_show_any, Hyrax::AdministrativeSet
+          end
+          # [:edit, :update, :destroy] for AdminSet is controlled by Hydra::Ability #edit_permissions
+          can [:edit, :update, :destroy], Hyrax::AdministrativeSet do |admin_set| # for test by solr_doc, see solr_document_ability.rb
             test_edit(admin_set.id)
           end
 
           can :deposit, AdminSet do |admin_set| # for test by solr_doc, see collection_ability.rb
             Hyrax::Collections::PermissionsService.can_deposit_in_collection?(ability: self, collection_id: admin_set.id)
           end
+          can :deposit, Hyrax::AdministrativeSet do |admin_set| # for test by solr_doc, see collection_ability.rb
+            Hyrax::Collections::PermissionsService.can_deposit_in_collection?(ability: self, collection_id: admin_set.id)
+          end
 
           can :view_admin_show, AdminSet do |admin_set| # admin show page # for test by solr_doc, see collection_ability.rb
             Hyrax::Collections::PermissionsService.can_view_admin_show_for_collection?(ability: self, collection_id: admin_set.id)
           end
+          can :view_admin_show, Hyrax::AdministrativeSet do |admin_set| # admin show page # for test by solr_doc, see collection_ability.rb
+            Hyrax::Collections::PermissionsService.can_view_admin_show_for_collection?(ability: self, collection_id: admin_set.id)
+          end
+
+          # [:read] for AdminSet is controlled by Hydra::Ability #read_permissions
+          can :read, Hyrax::AdministrativeSet do |admin_set| # admin show page # for test by solr_doc, see collection_ability.rb
+            test_read(admin_set.id)
+          end
         end
 
         # TODO: I'm not sure why this is checked with AdminSet abilities.  It was before the refactor and since I'm not sure what the connection is, I left it here.