hyrax 3.1.0 → 3.2.0

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

@@ -2,38 +2,53 @@
 module Hyrax
   module Ability
     module CollectionAbility
-      def collection_abilities # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      def collection_abilities # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        models = [Hyrax::PcdmCollection, Hyrax.config.collection_class].uniq
         if admin?
-          can :manage, ::Collection
-          can :manage_any, ::Collection
-          can :create_any, ::Collection
-          can :view_admin_show_any, ::Collection
+          models.each do |collection_model|
+            can :manage, collection_model
+            can :manage_any, collection_model
+            can :create_any, collection_model
+            can :view_admin_show_any, collection_model
+          end
         else
-          can :manage_any, ::Collection if Hyrax::Collections::PermissionsService.can_manage_any_collection?(ability: self)
-          can :create_any, ::Collection if Hyrax::CollectionTypes::PermissionsService.can_create_any_collection_type?(ability: self)
-          can :view_admin_show_any, ::Collection if Hyrax::Collections::PermissionsService.can_view_admin_show_for_any_collection?(ability: self)
+          models.each { |collection_model| can :manage_any, collection_model } if
+            Hyrax::Collections::PermissionsService.can_manage_any_collection?(ability: self)
 
-          can [:edit, :update, :destroy], ::Collection do |collection| # for test by solr_doc, see solr_document_ability.rb
-            test_edit(collection.id)
-          end
+          models.each { |collection_model| can :create_any, collection_model } if
+            Hyrax::CollectionTypes::PermissionsService.can_create_any_collection_type?(ability: self)
+
+          models.each { |collection_model| can :view_admin_show_any, collection_model } if
+          Hyrax::Collections::PermissionsService.can_view_admin_show_for_any_collection?(ability: self)
+
+          models.each do |collection_model|
+            can [:edit, :update, :destroy], collection_model do |collection|
+              test_edit(collection.id)
+            end
+
+            can :deposit, collection_model do |collection|
+              Hyrax::Collections::PermissionsService.can_deposit_in_collection?(ability: self, collection_id: collection.id)
+            end
+
+            can :view_admin_show, collection_model do |collection| # admin show page
+              Hyrax::Collections::PermissionsService.can_view_admin_show_for_collection?(ability: self, collection_id: collection.id)
+            end
 
-          can :deposit, ::Collection do |collection|
-            Hyrax::Collections::PermissionsService.can_deposit_in_collection?(ability: self, collection_id: collection.id)
+            can :read, collection_model do |collection| # public show page
+              test_read(collection.id)
+            end
           end
+
           can :deposit, ::SolrDocument do |solr_doc|
             Hyrax::Collections::PermissionsService.can_deposit_in_collection?(ability: self, collection_id: solr_doc.id) # checks collections and admin_sets
           end
-
-          can :view_admin_show, ::Collection do |collection| # admin show page
-            Hyrax::Collections::PermissionsService.can_view_admin_show_for_collection?(ability: self, collection_id: collection.id)
+          can :deposit, String do |collection_id|
+            Hyrax::Collections::PermissionsService.can_deposit_in_collection?(ability: self, collection_id: collection_id)
           end
+
           can :view_admin_show, ::SolrDocument do |solr_doc| # admin show page
             Hyrax::Collections::PermissionsService.can_view_admin_show_for_collection?(ability: self, collection_id: solr_doc.id) # checks collections and admin_sets
           end
-
-          can :read, ::Collection do |collection| # public show page  # for test by solr_doc, see solr_document_ability.rb
-            test_read(collection.id)
-          end
         end
       end
     end

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

@@ -8,7 +8,7 @@ module Hyrax
           can :create_collection_type, CollectionType
         else
           can :create_collection_of_type, CollectionType do |collection_type|
-            Hyrax::CollectionTypes::PermissionsService.can_create_collection_of_type?(user: current_user, collection_type: collection_type)
+            Hyrax::CollectionTypes::PermissionsService.can_create_collection_of_type?(ability: self, collection_type: collection_type)
           end
         end
       end

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

@@ -103,7 +103,7 @@ module Hyrax
         test_download(id)
       end
 
-      can :download, SolrDocument do |obj|
+      can :download, ::SolrDocument do |obj|
         cache.put(obj.id, obj)
         test_download(obj.id)
       end
@@ -397,7 +397,7 @@ module Hyrax
     end
 
     def curation_concerns_models
-      [::FileSet, ::Collection] + Hyrax.config.curation_concerns
+      [::FileSet, Hyrax.config.collection_class] + Hyrax.config.curation_concerns
     end
 
     def can_review_submissions?

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

@@ -53,7 +53,7 @@ module Hyrax
     ##
     # @return [Boolean]
     def collection?
-      hydra_model == ::Collection
+      hydra_model == Hyrax.config.collection_class
     end
 
     ##
@@ -76,7 +76,7 @@ module Hyrax
 
     # Method to return the model
     def hydra_model(classifier: ActiveFedora.model_mapper)
-      "::#{first('has_model_ssim')}".safe_constantize ||
+      first('has_model_ssim')&.safe_constantize ||
         classifier.classifier(self).best_model
     end
 

data/app/models/hyrax/administrative_set.rb

@@ -4,9 +4,15 @@ module Hyrax
   ##
   # Valkyrie model for Admin Set domain objects.
   class AdministrativeSet < Hyrax::Resource
+    include Hyrax::Schema(:core_metadata)
+
     attribute :alternative_title, Valkyrie::Types::Set.of(Valkyrie::Types::String)
     attribute :creator,           Valkyrie::Types::Set.of(Valkyrie::Types::String)
     attribute :description,       Valkyrie::Types::Set.of(Valkyrie::Types::String)
-    attribute :title,             Valkyrie::Types::Set.of(Valkyrie::Types::String)
+
+    def collection_type_gid
+      # allow AdministrativeSet to behave more like a regular PcdmCollection
+      Hyrax::CollectionType.find_or_create_admin_set_type.to_global_id
+    end
   end
 end

data/app/models/hyrax/permission.rb

@@ -14,6 +14,6 @@ module Hyrax
 
     attribute :access_to, Valkyrie::Types::ID
     attribute :agent,     Valkyrie::Types::String
-    attribute :mode,      Valkyrie::Types::String
+    attribute :mode,      Valkyrie::Types::Coercible::Symbol
   end
 end

data/app/models/hyrax/permission_template.rb

@@ -216,6 +216,8 @@ module Hyrax
     end
 
     ##
+    # @param interpret_visibility [Boolean] whether to retain the existing
+    #   visibility when applying permission template ACLs
     # @return [Boolean]
     def reset_access_controls(interpret_visibility: false)
       reset_access_controls_for(collection: source_model,
@@ -223,8 +225,11 @@ module Hyrax
     end
 
     ##
+    # @param collection [::Collection, Hyrax::Resource]
+    # @param interpret_visibility [Boolean] whether to retain the existing
+    #   visibility when applying permission template ACLs
     # @return [Boolean]
-    def reset_access_controls_for(collection:, interpret_visibility: false)
+    def reset_access_controls_for(collection:, interpret_visibility: false) # rubocop:disable Metrics/MethodLength
       interpreted_read_groups = read_groups
 
       if interpret_visibility
@@ -233,10 +238,19 @@ module Hyrax
         interpreted_read_groups += visibilities.additions_for(visibility: collection.visibility)
       end
 
-      collection.update!(edit_users: edit_users,
-                         edit_groups: edit_groups,
-                         read_users: read_users,
-                         read_groups: interpreted_read_groups.uniq)
+      case collection
+      when Valkyrie::Resource
+        collection.permission_manager.edit_groups = edit_groups
+        collection.permission_manager.edit_users  = edit_users
+        collection.permission_manager.read_groups = interpreted_read_groups
+        collection.permission_manager.read_users  = read_users
+        collection.permission_manager.acl.save
+      else
+        collection.update!(edit_users: edit_users,
+                           edit_groups: edit_groups,
+                           read_users: read_users,
+                           read_groups: interpreted_read_groups.uniq)
+      end
     end
 
     private

data/app/models/hyrax/work.rb

@@ -14,6 +14,7 @@ module Hyrax
     attribute :on_behalf_of,             Valkyrie::Types::String
     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
 

data/app/models/hyrax/workflow_action_info.rb

@@ -1,7 +1,23 @@
 # frozen_string_literal: true
 module Hyrax
+  ##
   # A simple data object for holding a user, work and their workflow proxies
+  #
+  # this is a glorified Struct that resolves +Sipity::Enitity(work)+
+  # and +Sipity::Agent(user)+ for the input given, then provides readers
+  # for its instance variables.
+  #
+  # @example
+  #   info = WorkflowActionInfo.new(my_work, current_user)
+  #
+  #   info.agent # =>  #<Sipity::Agent...>
+  #   info.entity # =>  #<Sipity::Entity...>
+  #   info.work == my_work # => true
+  #   info.user == current_user # => true
   class WorkflowActionInfo
+    ##
+    # @param work [Object]
+    # @param user [::User]
     def initialize(work, user)
       @work = work
       @user = user

data/app/models/sipity/comment.rb

@@ -11,4 +11,21 @@ module Sipity
       agent.proxy_for.to_s
     end
   end
+
+  ##
+  # A comment without a database record; always returns an empty string
+  class NullComment
+    attr_reader :agent, :entity
+
+    def initialize(agent:, entity:)
+      @agent = agent
+      @entity = entity
+    end
+
+    ##
+    # @return [String]
+    def comment
+      ''
+    end
+  end
 end

data/app/models/sipity.rb

@@ -56,28 +56,37 @@ module Sipity
   #
   # @return [Sipity::Entity]
   # rubocop:disable Naming/MethodName, Metrics/CyclomaticComplexity, Metrics/MethodLength
-  def Entity(input, &block)
+  def Entity(input, &block) # rubocop:disable Metrics/AbcSize
+    Rails.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")
                Entity.find_by(proxy_for_global_id: input.to_s)
              when SolrDocument
+               Rails.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}")
                Entity(input.model)
              when Sipity::Comment
+               Rails.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)}")
                Entity(Hyrax::GlobalID(input))
              else
+               Rails.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}")
     handle_conversion(input, result, :to_sipity_entity, &block)
   rescue URI::GID::MissingModelIdError
     Entity(nil)
-  end
+  end # rubocop:enable Metrics/AbcSize
   module_function :Entity
   # rubocop:enable Naming/MethodName, Metrics/CyclomaticComplexity, Metrics/MethodLength
 

data/app/presenters/hyrax/admin_set_presenter.rb

@@ -21,13 +21,12 @@ module Hyrax
 
     # AdminSet cannot be deleted if default set or non-empty
     def disable_delete?
-      AdminSet.default_set?(id) || any_items?
+      default_set? || any_items?
     end
 
     # Message to display if deletion is disabled
     def disabled_message
-      return I18n.t('hyrax.admin.admin_sets.delete.error_default_set') if AdminSet.default_set?(id)
-
+      return I18n.t('hyrax.admin.admin_sets.delete.error_default_set') if default_set?
       I18n.t('hyrax.admin.admin_sets.delete.error_not_empty') if any_items?
     end
 
@@ -63,5 +62,11 @@ module Hyrax
       return false unless current_ability.can?(:edit, solr_document)
       !disable_delete?
     end
+
+    private
+
+    def default_set?
+      Hyrax::AdminSetCreateService.default_admin_set?(id: id)
+    end
   end
 end

data/app/presenters/hyrax/collection_presenter.rb

@@ -116,13 +116,13 @@ module Hyrax
 
     # The total number of parents that this collection belongs to, visible or not.
     def total_parent_collections
-      parent_collections.nil? ? 0 : parent_collections.response['numFound']
+      parent_collections.blank? ? 0 : parent_collections.response['numFound']
     end
 
     # The number of parent collections shown on the current page. This will differ from total_parent_collections
     # due to pagination.
     def parent_collection_count
-      parent_collections.nil? ? 0 : parent_collections.documents.size
+      parent_collections.blank? ? 0 : parent_collections.documents.size
     end
 
     def user_can_nest_collection?
@@ -182,7 +182,7 @@ module Hyrax
                        "deprecated. Use available_parent_collections_data " \
                        "helper instead.")
       return @available_parents if @available_parents.present?
-      collection = ::Collection.find(id)
+      collection = Hyrax.config.collection_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/presenters/hyrax/work_show_presenter.rb

@@ -248,7 +248,8 @@ module Hyrax
     # @return [Boolean] a flag indicating whether to display collection deposit
     #   options.
     def show_deposit_for?(collections:)
-      collections.present? || current_ability.can?(:create_any, ::Collection)
+      collections.present? ||
+        current_ability.can?(:create_any, Hyrax.config.collection_class)
     end
 
     ##

data/app/search_builders/hyrax/abstract_type_relation.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 module Hyrax
   class AbstractTypeRelation < ActiveFedora::Relation
-    def initialize(opts = {})
+    def initialize(allowable_types: nil, **opts)
+      @allowable_types = allowable_types
       super(DummyModel, opts)
     end
 
     def allowable_types
-      raise NotImplementedException, "Implement allowable_types in a subclass"
+      @allowable_types ||
+        raise(NotImplementedException, "Implement allowable_types in a subclass")
     end
 
     def equivalent_class?(klass)

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]
+        [::AdminSet, ::Collection, Hyrax.config.collection_model.safe_constantize].uniq.compact
       end
 
       # adds a filter to exclude collections and admin sets created by the

data/app/search_builders/hyrax/exposed_models_relation.rb

@@ -3,7 +3,7 @@ module Hyrax
   # A relation that scopes to all user visible models (e.g. works + collections + file sets)
   class ExposedModelsRelation < AbstractTypeRelation
     def allowable_types
-      Hyrax.config.curation_concerns + [::Collection, ::FileSet]
+      (Hyrax.config.curation_concerns + [Hyrax.config.collection_class, ::Collection, ::FileSet]).uniq
     end
   end
 end

data/app/search_builders/hyrax/filter_by_type.rb

@@ -53,8 +53,7 @@ module Hyrax
 
     def collection_classes
       return [] if only_works?
-      # to_class_uri is deprecated in AF 11
-      [::Collection]
+      [::Collection, Hyrax.config.collection_class].uniq
     end
   end
 end

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

@@ -21,6 +21,6 @@ class Hyrax::My::CollectionsSearchBuilder < ::Hyrax::CollectionSearchBuilder
   # This overrides the models in FilterByType
   # @return [Array<Class>] a list of classes to include
   def models
-    [::AdminSet, ::Collection, Hyrax::AdministrativeSet]
+    [::AdminSet, Hyrax::AdministrativeSet, Hyrax.config.collection_model.safe_constantize].compact
   end
 end

data/app/services/hyrax/admin_set_create_service.rb

@@ -1,46 +1,99 @@
 # frozen_string_literal: true
 module Hyrax
-  # Responsible for creating an AdminSet and its corresponding data:
+  # Responsible for creating a Hyrax::AdministrativeSet and its corresponding data.
   #
   # * An associated permission template
   # * Available workflows
   # * An active workflow
   #
-  # @see AdminSet
+  # @see Hyrax::AdministrativeSet
   # @see Hyrax::PermissionTemplate
   # @see Sipity::Workflow
-  class AdminSetCreateService
-    # @api public
-    # Creates the default AdminSet and corresponding data
-    # @param admin_set_id [String] The default admin set ID
-    # @param title [Array<String>] The title of the default admin set
-    # @return [TrueClass]
-    # @see AdminSet
-    def self.create_default_admin_set(admin_set_id:, title:)
-      admin_set = AdminSet.new(id: admin_set_id, title: Array.wrap(title))
-      begin
-        new(admin_set: admin_set, creating_user: nil).create
-      rescue ActiveFedora::IllegalOperation
-        # It is possible that another thread created the AdminSet just before this method
-        # was called, so ActiveFedora will raise IllegalOperation. In this case we can safely
-        # ignore the error.
-        Rails.logger.error("AdminSet ID=#{AdminSet::DEFAULT_ID} may or may not have been created due to threading issues.")
+  class AdminSetCreateService # rubocop:disable Metrics/ClassLength
+    DEFAULT_ID = 'admin_set/default'
+    DEFAULT_TITLE = ['Default Admin Set'].freeze
+
+    class_attribute :permissions_create_service
+    self.permissions_create_service = Hyrax::Collections::PermissionsCreateService
+
+    class << self
+      # @api public
+      # Creates the default Hyrax::AdministrativeSet and corresponding data
+      # @param admin_set_id [String] The default admin set ID
+      # @param title [Array<String>] The title of the default admin set
+      # @return [TrueClass]
+      # @see Hyrax::AdministrativeSet
+      # @deprecated
+      # TODO: When this deprecated method is removed, update private method
+      #       .create_default_admin_set! to remove the parameters.
+      def create_default_admin_set(admin_set_id: DEFAULT_ID, title: DEFAULT_TITLE)
+        Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
+                         "Instead, use 'Hyrax::AdminSetCreateService.find_or_create_default_admin_set'.")
+        create_default_admin_set!(admin_set_id: admin_set_id, title: title).present?
+      rescue RuntimeError => _err
+        false
       end
-    end
 
-    # @api public
-    # Creates a non-default AdminSet and corresponding data
-    # @param admin_set [AdminSet] the admin set to operate on
-    # @param creating_user [User] the user who created the admin set
-    # @return [TrueClass, FalseClass] true if it was successful
-    # @see AdminSet
-    # @raise [RuntimeError] if you attempt to create a default admin set via this mechanism
-    def self.call(admin_set:, creating_user:, **kwargs)
-      raise "Use .create_default_admin_set to create a default admin set" if admin_set.default_set?
-      new(admin_set: admin_set, creating_user: creating_user, **kwargs).create
+      # @api public
+      # Finds the default AdministrativeSet if it exists; otherwise, creates it and corresponding data
+      # @return [Hyrax::AdministrativeSet] The default admin set.
+      # @see Hyrax::AdministrativeSet
+      # @raise [RuntimeError] if admin set cannot be persisted
+      def find_or_create_default_admin_set
+        Hyrax.query_service.find_by(id: DEFAULT_ID)
+      rescue Valkyrie::Persistence::ObjectNotFoundError
+        create_default_admin_set!
+      end
+
+      # @api public
+      # Is the admin_set the default Hyrax::AdministrativeSet
+      # @param id [#to_s] the id of the admin set to check
+      def default_admin_set?(id:)
+        id.to_s == DEFAULT_ID
+      end
+
+      # @api public
+      # Creates a non-default Hyrax::AdministrativeSet and corresponding data
+      # @param admin_set [Hyrax::AdministrativeSet | AdminSet] the admin set to operate on
+      # @param creating_user [User] the user who created the admin set
+      # @return [TrueClass, FalseClass] true if it was successful
+      # @see Hyrax::AdministrativeSet
+      # @raise [RuntimeError] if you attempt to create a default admin set via this mechanism
+      # @deprecated
+      def call(admin_set:, creating_user:, **kwargs)
+        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?
+      rescue RuntimeError => err
+        raise err if default_admin_set?(id: admin_set.id)
+        false
+      end
+
+      # @api public
+      # Creates a non-default Hyrax::AdministrativeSet and corresponding data
+      # @param admin_set [Hyrax::AdministrativeSet] the admin set to operate on
+      # @param creating_user [User] the user who created the admin set
+      # @return [Hyrax::AdministrativeSet] The fully created admin set.
+      # @see Hyrax::AdministrativeSet
+      # @raise [RuntimeError] if you attempt to create a default admin set via this mechanism
+      # @raise [RuntimeError] if admin set cannot be persisted
+      def call!(admin_set:, creating_user:, **kwargs)
+        raise "Use .find_or_create_default_admin_set to create a default admin set" if default_admin_set?(id: admin_set.id)
+        new(admin_set: admin_set, creating_user: creating_user, **kwargs).create!
+      end
+
+      private
+
+      # TODO: Parameters admin_set_id and title are defined to support .create_default_admin_set
+      #       which is deprecated.  When it is removed, the parameters will no longer be required.
+      def create_default_admin_set!(admin_set_id: DEFAULT_ID, title: DEFAULT_TITLE)
+        admin_set = Hyrax::AdministrativeSet.new(id: admin_set_id, title: Array.wrap(title))
+        new(admin_set: admin_set, creating_user: nil).create!
+      end
     end
 
-    # @param admin_set [AdminSet] the admin set to operate on
+    # @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)
@@ -53,40 +106,69 @@ module Hyrax
 
     # Creates an admin set, setting the creator and the default access controls.
     # @return [TrueClass, FalseClass] true if it was successful
+    # @deprecated
     def 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 = create_permission_template
-            workflow = create_workflows_for(permission_template: permission_template)
-            create_default_access_for(permission_template: permission_template, workflow: workflow) if admin_set.default_set?
-          end
-        end
-      end
+      Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
+                         "Warning: This method may hide runtime errors.  " \
+                         "Instead, use 'Hyrax::AdminSetCreateService.create!'.  ")
+      create!.persisted?
+    rescue RuntimeError => _err
+      false
+    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 create!
+      admin_set.respond_to?(:valkyrie_resource) ? active_fedora_create! : valkyrie_create!
     end
 
     private
 
-    def access_grants_attributes
-      [
-        { agent_type: 'group', agent_id: admin_group_name, access: Hyrax::PermissionTemplateAccess::MANAGE }
-      ].tap do |attribute_list|
-        # Grant manage access to the creating_user if it exists. Should exist for all but default Admin Set
-        attribute_list << { agent_type: 'user', agent_id: creating_user.user_key, access: Hyrax::PermissionTemplateAccess::MANAGE } if creating_user
-      end
+    def default_admin_set?(id:)
+      self.class.default_admin_set?(id: id)
     end
 
     def admin_group_name
       ::Ability.admin_group_name
     end
 
-    ##
-    # @return [PermissionTemplate]
-    def create_permission_template
-      permission_template = PermissionTemplate.create!(source_id: admin_set.id, access_grants_attributes: access_grants_attributes)
-      permission_template.reset_access_controls_for(collection: admin_set)
-      permission_template
+    # 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,
+                                                                            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?(id: admin_set.id)
+          end
+        end
+      end
+      Hyrax.publisher.publish('collection.metadata.updated', collection: updated_admin_set, user: creating_user)
+      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?(id: admin_set.id)
+          end
+        end
+      end
+      raise 'Admin set failed to persist.' unless admin_set.persisted?
+      admin_set.valkyrie_resource
     end
 
     def create_workflows_for(permission_template:)
@@ -121,7 +203,7 @@ module Hyrax
       end
     end
 
-    # Gives deposit access to registered users to default AdminSet
+    # Give registered users deposit access to default admin set
     def create_default_access_for(permission_template:, workflow:)
       permission_template.access_grants.create(agent_type: 'group', agent_id: ::Ability.registered_group_name, access: Hyrax::PermissionTemplateAccess::DEPOSIT)
       deposit = Sipity::Role[Hyrax::RoleRegistry::DEPOSITING]