hyrax 3.3.0 → 3.4.2

data/app/helpers/hyrax/collections_helper.rb

@@ -191,6 +191,20 @@ module Hyrax
       CollectionType.find_or_create_default_collection_type.title
     end
 
+    ##
+    # @param collection [Object]
+    #
+    # @return [PermissionTemplateForm]
+    def collection_permission_template_form_for(form:)
+      case form
+      when Valkyrie::ChangeSet
+        template_model = Hyrax::PermissionTemplate.find_or_create_by(source_id: form.id.to_s)
+        Hyrax::Forms::PermissionTemplateForm.new(template_model)
+      else
+        form.permission_template
+      end
+    end
+
     private
 
     # add hidden fields to a form for performing an action on a single document on a collection

data/app/helpers/hyrax/membership_helper.rb

@@ -41,7 +41,7 @@ module Hyrax
       Hyrax.custom_queries.find_child_works(resource: resource).map do |member|
         { id: member.id.to_s,
           label: member.title.first,
-          path: url_for(member) }
+          path: main_app.url_for([member, { only_path: true }]) }
       end.to_json
     end
   end

data/app/helpers/hyrax/trophy_helper.rb

@@ -15,7 +15,7 @@ module Hyrax
       args[:data]['remove-text'] = args[:remove_text]
 
       args[:data][:url] = hyrax.trophy_work_path(id)
-      link_to '#', class: args[:class], data: args[:data] do
+      link_to '#', id: 'action-highlight-work', class: args[:class], data: args[:data] do
         yield(text)
       end
     end

data/app/helpers/hyrax/url_helper.rb

@@ -3,7 +3,7 @@ module Hyrax
   module UrlHelper
     # generated models get registered as curation concerns and need a
     # track_model_path to render Blacklight-related views
-    (['FileSet', 'Collection'] + Hyrax.config.registered_curation_concern_types).each do |concern|
+    (['FileSet', 'Collection', 'Hyrax::AdministrativeSet'] + Hyrax.config.registered_curation_concern_types).each do |concern|
       model = concern.safe_constantize
       model_name = model.respond_to?(:model_name) && model.model_name
       next unless model_name

data/app/indexers/hyrax/administrative_set_indexer.rb

@@ -4,14 +4,20 @@ module Hyrax
   ##
   # Indexes Hyrax::AdministrativeSet objects
   class AdministrativeSetIndexer < Hyrax::ValkyrieIndexer
+    include Hyrax::ResourceIndexer
+    include Hyrax::PermissionIndexer
+    include Hyrax::VisibilityIndexer
     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[Hyrax.config.collection_type_index_field.to_sym] = Array(resource.try(:collection_type_gid)&.to_s)
         solr_doc[:alternative_title_tesim] = resource.alternative_title
-        solr_doc[:creator_ssim]            = resource.creator
+        solr_doc[:creator_ssim]            = [resource.creator]
+        solr_doc[:creator_tesim]           = [resource.creator]
         solr_doc[:description_tesim]       = resource.description
+        solr_doc[:generic_type_sim]        = ['Admin Set']
+        solr_doc[:thumbnail_path_ss]       = Hyrax::CollectionThumbnailPathService.call(resource)
       end
     end
   end

data/app/indexers/hyrax/deep_indexing_service.rb

@@ -41,7 +41,7 @@ module Hyrax
 
     def fetch_with_persistence(resource)
       old_label = resource.rdf_label.first
-      return unless old_label == resource.rdf_subject.to_s || old_label.nil?
+      return unless old_label == resource.rdf_subject.to_s
       fetch_value(resource)
       return if old_label == resource.rdf_label.first || resource.rdf_label.first == resource.rdf_subject.to_s
       resource.persist! # Stores the fetched values into our marmotta triplestore

data/app/indexers/hyrax/file_set_indexer.rb

@@ -30,6 +30,7 @@ module Hyrax
         solr_doc['original_checksum_tesim'] = object.original_checksum
         solr_doc['alpha_channels_ssi']      = object.alpha_channels
         solr_doc['original_file_id_ssi']    = original_file_id
+        solr_doc['generic_type_si'] = 'FileSet'
       end
     end
 

data/app/indexers/hyrax/pcdm_collection_indexer.rb

@@ -7,14 +7,15 @@ module Hyrax
     include Hyrax::ResourceIndexer
     include Hyrax::PermissionIndexer
     include Hyrax::VisibilityIndexer
+    include Hyrax::ThumbnailIndexer
     include Hyrax::Indexer(:core_metadata)
-    include Hyrax::Indexer(:basic_metadata)
+
+    self.thumbnail_path_service = CollectionThumbnailPathService
 
     def to_solr
       super.tap do |index_document|
         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

data/app/indexers/hyrax/thumbnail_indexer.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+module Hyrax
+  module ThumbnailIndexer
+    extend ActiveSupport::Concern
+
+    included do
+      class_attribute :thumbnail_path_service
+      self.thumbnail_path_service = ThumbnailPathService
+      class_attribute :thumbnail_field
+      self.thumbnail_field = :thumbnail_path_ss
+    end
+
+    # Adds thumbnail indexing to the solr document of a valkyrie resource
+    def to_solr
+      super.tap do |solr_doc|
+        index_thumbnails(solr_doc)
+      end
+    end
+
+    # Write the thumbnail paths into the solr_document
+    # @param [Hash] solr_document the solr document to add the field to
+    def index_thumbnails(solr_document)
+      solr_document[thumbnail_field] = thumbnail_path.to_s
+    end
+
+    # Returns the value for the thumbnail path to put into the solr document
+    def thumbnail_path
+      self.class.thumbnail_path_service.call(resource)
+    end
+  end
+end

data/app/indexers/hyrax/valkyrie_file_set_indexer.rb

@@ -7,20 +7,20 @@ module Hyrax
     include Hyrax::ResourceIndexer
     include Hyrax::PermissionIndexer
     include Hyrax::VisibilityIndexer
+    include Hyrax::ThumbnailIndexer
     include Hyrax::Indexer(:core_metadata)
     include Hyrax::Indexer(:basic_metadata)
 
-    # include Hyrax::IndexesThumbnails # TODO: Is there a Valkyrie version of a thumbnail indexer?
-
     def to_solr # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
       super.tap do |solr_doc| # rubocop:disable Metrics/BlockLength
         solr_doc['generic_type_si'] = 'FileSet'
 
         # Metadata from the FileSet
-        solr_doc['file_ids_ssim']         = resource.file_ids&.map(&:to_s)
-        solr_doc['original_file_id_ssi']  = resource.original_file_id.to_s
-        solr_doc['thumbnail_id_ssi']      = resource.thumbnail_id.to_s
-        solr_doc['extracted_text_id_ssi'] = resource.extracted_text_id.to_s
+        solr_doc['file_ids_ssim']                = resource.file_ids&.map(&:to_s)
+        solr_doc['original_file_id_ssi']         = resource.original_file_id.to_s
+        solr_doc['extracted_text_id_ssi']        = resource.extracted_text_id.to_s
+        solr_doc['hasRelatedMediaFragment_ssim'] = resource.representative_id.to_s
+        solr_doc['hasRelatedImage_ssim']         = resource.thumbnail_id.to_s
 
         # Add in metadata from the original file.
         file_metadata = original_file

data/app/indexers/hyrax/valkyrie_indexer.rb

@@ -64,14 +64,16 @@ module Hyrax
 
     ##
     # @api public
-    # @return [Hash<Symbol, Object>]
+    # @return [HashWithIndifferentAccess<Symbol, Object>]
     def to_solr
       {
         "id": resource.id.to_s,
         "date_uploaded_dtsi": resource.created_at,
         "date_modified_dtsi": resource.updated_at,
+        "system_create_dtsi": resource.created_at,
+        "system_modified_dtsi": resource.updated_at,
         "has_model_ssim": resource.internal_resource
-      }
+      }.with_indifferent_access
     end
 
     ##

data/app/indexers/hyrax/valkyrie_work_indexer.rb

@@ -7,6 +7,7 @@ module Hyrax
     include Hyrax::ResourceIndexer
     include Hyrax::PermissionIndexer
     include Hyrax::VisibilityIndexer
+    include Hyrax::ThumbnailIndexer
     include Hyrax::Indexer(:core_metadata)
 
     def to_solr # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
@@ -14,10 +15,16 @@ module Hyrax
         solr_doc['generic_type_si'] = 'Work'
         solr_doc['suppressed_bsi'] = suppressed?(resource)
         solr_doc['admin_set_id_ssim'] = [resource.admin_set_id.to_s]
+        admin_set_label = admin_set_label(resource)
+        solr_doc['admin_set_sim']   = admin_set_label
+        solr_doc['admin_set_tesim'] = admin_set_label
+        solr_doc["#{Hyrax.config.admin_set_predicate.qname.last}_ssim"] = [resource.admin_set_id.to_s]
         solr_doc['member_of_collection_ids_ssim'] = resource.member_of_collection_ids.map(&:to_s)
         solr_doc['member_ids_ssim'] = resource.member_ids.map(&:to_s)
         solr_doc['depositor_ssim'] = [resource.depositor]
         solr_doc['depositor_tesim'] = [resource.depositor]
+        solr_doc['hasRelatedMediaFragment_ssim'] = [resource.representative_id.to_s]
+        solr_doc['hasRelatedImage_ssim'] = [resource.thumbnail_id.to_s]
       end
     end
 
@@ -26,5 +33,11 @@ module Hyrax
     def suppressed?(resource)
       Hyrax::ResourceStatus.new(resource: resource).inactive?
     end
+
+    def admin_set_label(resource)
+      return if resource.admin_set_id.blank?
+      admin_set = Hyrax.query_service.find_by(id: resource.admin_set_id)
+      admin_set.title
+    end
   end
 end

data/app/inputs/controlled_vocabulary_input.rb

@@ -62,10 +62,12 @@ class ControlledVocabularyInput < MultiValueInput
 
   def build_options_for_new_row(_attribute_name, _index, options)
     options[:value] = ''
+    options[:data][:label] = ''
   end
 
   def build_options_for_existing_row(_attribute_name, _index, value, options)
     options[:value] = value.rdf_label.first || "Unable to fetch label for #{value.rdf_subject}"
+    options[:data][:label] = value.full_label || value.rdf_label
     options[:readonly] = true
   end
 

data/app/jobs/change_depositor_event_job.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+# Log work depositor change to activity streams
+#
+# This class simply logs the transfer, pulling data from the object that was
+# just transferred. It does not perform the transfer.
+class ChangeDepositorEventJob < ContentEventJob
+  include Rails.application.routes.url_helpers
+  include ActionDispatch::Routing::PolymorphicRoutes
+
+  # @param [ActiveFedora::Base, Hyrax::Work] work the work that's been transfered
+  def perform(work)
+    # these get set to repo_object and depositor
+    super(work, new_owner(work))
+  end
+
+  def action
+    "User #{link_to_profile repo_object.proxy_depositor} has transferred #{link_to_work repo_object.title.first} to user #{link_to_profile depositor}"
+  end
+
+  def link_to_work(text)
+    link_to text, polymorphic_path(repo_object)
+  end
+
+  # Log the event to the work's stream
+  def log_work_event(work)
+    work.log_event(event)
+  end
+  alias log_file_set_event log_work_event
+
+  # overriding default to log the event to the depositor instead of their profile
+  # and to log the event for both users
+  def log_user_event(depositor)
+    previous_owner.log_profile_event(event)
+    depositor.log_event(event)
+  end
+
+  private
+
+  def previous_owner
+    ::User.find_by_user_key(repo_object.proxy_depositor)
+  end
+
+  # used for @depositor
+  def new_owner(work)
+    ::User.find_by_user_key(work.depositor)
+  end
+end

data/app/jobs/characterize_job.rb

@@ -31,17 +31,57 @@ class CharacterizeJob < Hyrax::ApplicationJob
     raise "#{file_set.class.characterization_proxy} was not found for FileSet #{file_set.id}" unless file_set.characterization_proxy?
     filepath = Hyrax::WorkingDirectory.find_or_retrieve(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
 
-  def characterize(file_set, _file_id, filepath)
+  def characterize(file_set, _file_id, filepath) # rubocop:disable Metrics/AbcSize
+    # store this so we can tell if the original_file is actually changing
+    previous_checksum = file_set.characterization_proxy.original_checksum.first
+
+    clear_metadata(file_set)
+
+    # If the current FileSet title is the same as the label, it must be a filename as opposed to a user-entered...
+    # value. So later we'll ensure it's set to the new file's filename.
+    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})"
     file_set.characterization_proxy.alpha_channels = channels(filepath) if file_set.image? && Hyrax.config.iiif_image_server?
     file_set.characterization_proxy.save!
-    file_set.update_index
+
+    # Ensure that if the actual file content has changed, the mod timestamp on the FileSet object changes.
+    # Otherwise this does not happen when rolling back to a previous version. Perhaps this should be set as part of...
+    # `FileActor.revert_to` (or its replacement Transaction?!), where the FileSet is saved. Not sure if the...
+    # before/after checksum is readily available there though. I like this checksum verification because it allows...
+    # all changes to the current FileSet version to be detected, which in our case triggers re-creation of a...
+    # "cold storage" archive of the parent Work. It's worth noting that adding a *new* version always touches this...
+    # mod time. This is done in the versioning code.
+    file_set.date_modified = Hyrax::TimeService.time_in_utc if file_set.characterization_proxy.original_checksum.first != previous_checksum
+
+    # set title to label if that's how it was before this characterization
+    file_set.title = [file_set.characterization_proxy.original_name] if reset_title
+    # always set the label to the original_name
+    file_set.label = file_set.characterization_proxy.original_name
+
+    file_set.save!
+  end
+
+  def clear_metadata(file_set)
+    # The characterization of additional file versions adds new height/width/size/checksum values to un-orderable...
+    # `ActiveTriples::Relation` fields on `original_file`. Values from those are then randomly pulled into Solr...
+    # fields which may have scalar or vector cardinality. So for height/width you get two scalar values pulled from...
+    # "randomized parallel arrays". Upshot is to reset all of these before (re)characterization to stop the mayhem.
+    file_set.characterization_proxy.height = []
+    file_set.characterization_proxy.width  = []
+    file_set.characterization_proxy.original_checksum = []
+    file_set.characterization_proxy.file_size = []
+    file_set.characterization_proxy.format_label = []
   end
 
   def channels(filepath)

data/app/jobs/concerns/hyrax/members_permission_job_behavior.rb

@@ -17,7 +17,7 @@ module Hyrax
       when ActiveFedora::Base
         ::FileSet.search_with_conditions(id: work.member_ids).map(&:id)
       when Valkyrie::Resource
-        Hyrax.custom_queries.find_child_fileset_ids(resource: work)
+        Hyrax.custom_queries.find_child_file_set_ids(resource: work)
       end
     end
 

data/app/jobs/content_depositor_change_event_job.rb

@@ -8,10 +8,11 @@ class ContentDepositorChangeEventJob < ContentEventJob
 
   attr_accessor :reset
 
-  # @param [ActiveFedora::Base] work the work to be transfered
+  # @param [ActiveFedora::Base, Hyrax::Work] work the work to be transferred
   # @param [User] user the user the work is being transfered to.
   # @param [TrueClass,FalseClass] reset (false) if true, reset the access controls. This revokes edit access from the depositor
   def perform(work, user, reset = false)
+    Deprecation.warn("This class will be removed in the next major release. Use Hyrax::ChangeDepositorService.call instead.")
     @reset = reset
     super(work, user)
   end

data/app/jobs/hyrax/propagate_change_depositor_job.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+module Hyrax
+  # updates depositor on file sets and resets permissions if flagged. Used by
+  # ChangeDepositorService to background changes to lots of file sets
+  class PropagateChangeDepositorJob < ApplicationJob
+    # @param work_id [Valkyrie::Id, String] the id of the work
+    #             that is receiving a change of depositor
+    # @param user [User] the user that will "become" the depositor of
+    #             the given work
+    # @param reset [TrueClass, FalseClass] when true, first clear
+    #              permissions for the given work and contained file
+    #              sets; regardless of true/false make the given user
+    #              the depositor of the given work
+    def perform(work_id, user, reset)
+      work = Hyrax.query_service.find_by(id: work_id)
+      Hyrax.custom_queries.find_child_file_sets(resource: work).each do |f|
+        if reset
+          f.permission_manager.acl.permissions = []
+          f.permission_manager.acl.save
+        end
+        apply_depositor_metadata(f, user)
+        Hyrax.persister.save(resource: f)
+      end
+    end
+
+    def apply_depositor_metadata(resource, depositor)
+      depositor_id = depositor.respond_to?(:user_key) ? depositor.user_key : depositor
+      resource.depositor = depositor_id if resource.respond_to? :depositor=
+      Hyrax::AccessControlList.new(resource: resource).grant(:edit).to(::User.find_by_user_key(depositor_id)).save
+    end
+  end
+end

data/app/jobs/import_url_job.rb

@@ -80,12 +80,10 @@ class ImportUrlJob < Hyrax::ApplicationJob
     Rails.logger.debug("ImportUrlJob: Copying <#{uri}> to #{dir}")
 
     File.open(File.join(dir, filename), 'wb') do |f|
-      begin
-        write_file(f)
-        yield f
-      rescue StandardError => e
-        send_error(e.message)
-      end
+      write_file(f)
+      yield f
+    rescue StandardError => e
+      send_error(e.message)
     end
     Rails.logger.debug("ImportUrlJob: Closing #{File.join(dir, filename)}")
   end

data/app/jobs/inherit_permissions_job.rb

@@ -24,7 +24,7 @@ class InheritPermissionsJob < Hyrax::ApplicationJob
   # @param work [Resource]
   # @return [Array<Hyrax::File_Set>]
   def file_sets_for(work)
-    Hyrax.custom_queries.find_child_filesets(resource: work)
+    Hyrax.custom_queries.find_child_file_sets(resource: work)
   end
 
   # Perform the copy from the work to the contained filesets

data/app/jobs/valkyrie_create_derivatives_job.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+class ValkyrieCreateDerivativesJob < Hyrax::ApplicationJob
+  queue_as Hyrax.config.ingest_queue_name
+  def perform(_file_set_id, file_id, _filepath = nil)
+    file_metadata = Hyrax.custom_queries.find_file_metadata_by(id: file_id)
+    return if file_metadata.video? && !Hyrax.config.enable_ffmpeg
+    # Get file into a local path.
+    file = Hyrax.storage_adapter.find_by(id: file_metadata.file_identifier)
+    # Call derivatives with the file_set.
+    derivative_service = Hyrax::DerivativeService.for(file_metadata)
+    derivative_service.create_derivatives(file.disk_path)
+    # Trigger a reindex to get the thumbnail path.
+    Hyrax.publisher.publish('file.metadata.updated', metadata: file_metadata, user: nil)
+  end
+
+  private
+
+  def query_service
+    Hyrax.query_service
+  end
+
+  def storage_adapter
+    Hyrax.storage_adapter
+  end
+end

data/app/jobs/valkyrie_ingest_job.rb

@@ -1,56 +1,62 @@
 # frozen_string_literal: true
+
+##
+# Ingests a {Hyrax::UploadedFile} as file member of a {Hyrax::FileSet}.
+#
+# The {Hyrax::UploadedFile} is passed into {#perform}, and should have a
+# {Hyrax::UploadedFile#file_set_uri} identifying an existing {Hyrax::FileSet}.
 class ValkyrieIngestJob < Hyrax::ApplicationJob
   queue_as Hyrax.config.ingest_queue_name
 
   ##
-  # @param [Valkyrie::StorageAdapter::StreamFile] file
-  def perform(file)
-    ingest(file: file)
+  # @param [Hyrax::UploadedFile] file
+  # @param [RDF::URI] pcdm_use is the use/type to apply to the created FileMetadata
+  # @see Hyrax::FileMetadata::Use
+  def perform(file, pcdm_use: Hyrax::FileMetadata::Use::ORIGINAL_FILE)
+    ingest(file: file, pcdm_use: pcdm_use)
   end
 
   ##
-  # @param [Valkyrie::StorageAdapter::StreamFile] file
+  # @api private
   #
+  # @param [Hyrax::UploadedFile] file
+  # @param [RDF::URI] pcdm_use
   # @return [void]
-  def ingest(file:)
-    file_set = Hyrax.query_service.find_by(id: file.file_set_uri)
-    updated_metadata = upload_file(file: file, file_set: file_set)
-
-    add_file_to_file_set(file_set: file_set, file_metadata: updated_metadata)
+  def ingest(file:, pcdm_use:)
+    file_set_uri = Valkyrie::ID.new(file.file_set_uri)
+    file_set = Hyrax.query_service.find_by(id: file_set_uri)
+
+    updated_metadata = upload_file(
+      file: file,
+      file_set: file_set,
+      pcdm_use: pcdm_use,
+      user: file.user
+    )
+
+    ValkyrieCreateDerivativesJob.perform_later(file_set.id.to_s, updated_metadata.id.to_s)
   end
 
   ##
-  # @todo this should publish something to allow the fileset
-  #   to reindex its membership
-  # @param [Hyrax::FileSet] file_set the file set to add to
-  # @param [Hyrax::FileMetadata] file_metadata the metadata object representing
-  #   the file to add
+  # @api private
   #
-  # @return [Hyrax::FileSet] updated file set
-  def add_file_to_file_set(file_set:, file_metadata:)
-    file_set.file_ids << file_metadata.id
-    Hyrax.persister.save(resource: file_set)
-  end
-
-  ##
   # @param [Hyrax::UploadedFile] file
   # @param [Hyrax::FileSet] file_set
+  # @param [RDF::URI] pcdm_use  the use/type to apply to the created FileMetadata
+  # @param [User] user
   #
   # @return [Hyrax::FileMetadata] the metadata representing the uploaded file
-  def upload_file(file:, file_set:)
+  def upload_file(file:, file_set:, pcdm_use:, user: nil)
     carrier_wave_sanitized_file = file.uploader.file
-    uploaded = Hyrax.storage_adapter
-                    .upload(resource: file_set,
-                            file: carrier_wave_sanitized_file,
-                            original_filename: carrier_wave_sanitized_file.original_filename)
-
-    file_metadata = Hyrax.custom_queries.find_file_metadata_by(id: uploaded.id)
-    file_metadata.file_set_id = file.file_set_uri
-    file_metadata.file_identifier = uploaded.id
-    file_metadata.size = uploaded.size
-
-    Hyrax.publisher.publish("object.file.uploaded", metadata: file_metadata)
-
-    file_metadata
+    # Pull file, since carrierwave files don't respond to a proper IO #read. See
+    # https://github.com/carrierwaveuploader/carrierwave/issues/1959
+    file_io = carrier_wave_sanitized_file.to_file
+
+    ::Hyrax::ValkyrieUpload.file(
+      io: file_io,
+      filename: carrier_wave_sanitized_file.original_filename,
+      file_set: file_set,
+      use: pcdm_use,
+      user: user
+    )
   end
 end

data/app/models/admin_set.rb

@@ -87,16 +87,24 @@ class AdminSet < ActiveFedora::Base
   end
 
   ##
-  # @deprecated use PermissionTemplate#reset_access_controls instead
+  # @deprecated use PermissionTemplate#reset_access_controls_for instead
   #
   # Calculate and update who should have edit access based on who
   # has "manage" access in the PermissionTemplateAccess
   def reset_access_controls!
-    Deprecation.warn("reset_access_controls! is deprecated; use PermissionTemplate#reset_access_controls instead.")
+    Deprecation.warn("reset_access_controls! is deprecated; use PermissionTemplate#reset_access_controls_for instead.")
 
     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/collection_branding_info.rb

@@ -14,16 +14,19 @@ class CollectionBrandingInfo < ApplicationRecord
     self.local_path = File.join(role, filename)
   end
 
-  def save(file_location, copy_file = true)
+  def save(file_location, upload_file = true)
     filename = File.split(local_path).last
     role_and_filename = File.join(role, filename)
 
-    storage.upload(resource: Hyrax::PcdmCollection.new(id: collection_id),
-                   file: File.open(file_location),
-                   original_filename: role_and_filename)
+    if upload_file
+      storage.upload(resource: Hyrax::PcdmCollection.new(id: collection_id),
+                     file: File.open(file_location),
+                     original_filename: role_and_filename)
+    end
+
     self.local_path = find_local_filename(collection_id, role, filename)
 
-    FileUtils.remove_file(file_location) if File.exist?(file_location) && copy_file
+    FileUtils.remove_file(file_location) if File.exist?(file_location) && upload_file
     super()
   end
 
@@ -35,7 +38,6 @@ class CollectionBrandingInfo < ApplicationRecord
          else
            local_path
          end
-
     storage.delete(id: id)
   end
 

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

@@ -87,7 +87,7 @@ module Hyrax
 
     module ClassMethods
       # This governs which partial to draw when you render this type of object
-      def _to_partial_path #:nodoc:
+      def _to_partial_path # :nodoc:
         @_to_partial_path ||= begin
           element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(name))
           collection = ActiveSupport::Inflector.tableize(name)
@@ -121,12 +121,12 @@ module Hyrax
     end
 
     ##
-    # @deprecated use PermissionTemplate#reset_access_controls instead
+    # @deprecated use PermissionTemplate#reset_access_controls_for instead
     #
     # Calculate and update who should have read/edit access to the collections based on who
     # has access in PermissionTemplateAccess
     def reset_access_controls!
-      Deprecation.warn("reset_access_controls! is deprecated; use PermissionTemplate#reset_access_controls instead.")
+      Deprecation.warn("reset_access_controls! is deprecated; use PermissionTemplate#reset_access_controls_for instead.")
 
       permission_template
         .reset_access_controls_for(collection: self, interpret_visibility: true)