hyrax 5.0.0.rc1 → 5.0.0.rc3

data/app/indexers/hyrax/valkyrie_file_set_indexer.rb

@@ -2,147 +2,11 @@
 
 module Hyrax
   ##
-  # Indexes Hyrax::FileSet objects
-  class ValkyrieFileSetIndexer < Hyrax::ValkyrieIndexer # rubocop:disable Metrics/ClassLength
-    include Hyrax::ResourceIndexer
-    include Hyrax::PermissionIndexer
-    include Hyrax::VisibilityIndexer
-    include Hyrax::ThumbnailIndexer
-    include Hyrax::Indexer(:core_metadata)
-    include Hyrax::Indexer(:file_set_metadata)
-
-    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']         = original_file_id
-        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
-
-        index_lease(solr_doc)
-        index_embargo(solr_doc)
-
-        # Add in metadata from the original file.
-        file_metadata = Hyrax::FileSetFileService.new(file_set: resource).original_file
-        return solr_doc unless file_metadata
-
-        # Label is the actual file name. It's not editable by the user.
-        solr_doc['original_file_alternate_ids_tesim'] = file_metadata.alternate_ids&.map(&:to_s) if file_metadata.alternate_ids.present?
-
-        solr_doc['original_filename_tesi']  = file_metadata.original_filename if file_metadata.original_filename.present?
-        solr_doc['original_filename_ssi']   = file_metadata.original_filename if file_metadata.original_filename.present?
-        solr_doc['mime_type_tesi']          = file_metadata.mime_type if file_metadata.mime_type.present?
-        solr_doc['mime_type_ssi']           = file_metadata.mime_type if file_metadata.mime_type.present?
-
-        solr_doc['file_format_tesim']       = file_format(file_metadata)
-        solr_doc['file_format_sim']         = file_format(file_metadata)
-        solr_doc['file_size_lts']           = file_metadata.recorded_size[0]
-        solr_doc['type_tesim']              = file_metadata.pcdm_use.map(&:to_s) if file_metadata.pcdm_use.present?
-        solr_doc['pcdm_use_tesim'] = file_metadata.pcdm_use.map(&:to_s) if file_metadata.pcdm_use.present?
-
-        # attributes set by fits
-        solr_doc['format_label_tesim']      = file_metadata.format_label if file_metadata.format_label.present?
-        solr_doc['size_tesim']              = file_metadata.recorded_size if file_metadata.recorded_size.present?
-        solr_doc['well_formed_tesim']       = file_metadata.well_formed if file_metadata.well_formed.present?
-        solr_doc['valid_tesim']             = file_metadata.valid if file_metadata.valid.present?
-        solr_doc['fits_version_tesim']      = file_metadata.fits_version if file_metadata.fits_version.present?
-        solr_doc['exif_version_tesim']      = file_metadata.exif_version if file_metadata.exif_version.present?
-        solr_doc['checksum_tesim']          = file_metadata.checksum if file_metadata.checksum.present?
-
-        # shared attributes across multiple file types
-        solr_doc['frame_rate_tesim']        = file_metadata.frame_rate if file_metadata.frame_rate.present? # audio, video
-        solr_doc['bit_rate_tesim']          = file_metadata.bit_rate if file_metadata.bit_rate.present? # audio, video
-        solr_doc['duration_tesim']          = file_metadata.duration if file_metadata.duration.present? # audio, video
-        solr_doc['sample_rate_tesim']       = file_metadata.sample_rate if file_metadata.sample_rate.present? # audio, video
-
-        solr_doc['height_tesim']            = file_metadata.height if file_metadata.height.present? # image, video
-        solr_doc['width_tesim']             = file_metadata.width if file_metadata.width.present? # image, video
-        solr_doc['height_is']               = Integer(file_metadata.height.first) if file_metadata.height.present?
-        solr_doc['width_is']                = Integer(file_metadata.width.first) if file_metadata.width.present?
-
-        # attributes set by fits for audio files
-        solr_doc['bit_depth_tesim']         = file_metadata.bit_depth if file_metadata.bit_depth.present?
-        solr_doc['channels_tesim']          = file_metadata.channels if file_metadata.channels.present?
-        solr_doc['alpha_channels_ssi']      = file_metadata.channels.first if file_metadata.channels.present?
-        solr_doc['data_format_tesim']       = file_metadata.data_format if file_metadata.data_format.present?
-        solr_doc['offset_tesim']            = file_metadata.offset if file_metadata.offset.present?
-
-        # attributes set by fits for documents
-        solr_doc['file_title_tesim']        = file_metadata.file_title if file_metadata.file_title.present?
-        solr_doc['page_count_tesim']        = file_metadata.page_count if file_metadata.page_count.present?
-        solr_doc['language_tesim']          = file_metadata.language if file_metadata.language.present?
-        solr_doc['word_count_tesim']        = file_metadata.word_count if file_metadata.word_count.present?
-        solr_doc['character_count_tesim']   = file_metadata.character_count if file_metadata.character_count.present?
-        solr_doc['line_count_tesim']        = file_metadata.line_count if file_metadata.line_count.present?
-        solr_doc['character_set_tesim']     = file_metadata.character_set if file_metadata.character_set.present?
-        solr_doc['markup_basis_tesim']      = file_metadata.markup_basis if file_metadata.markup_basis.present?
-        solr_doc['paragraph_count_tesim']   = file_metadata.paragraph_count if file_metadata.paragraph_count.present?
-        solr_doc['markup_language_tesim']   = file_metadata.markup_language if file_metadata.markup_language.present?
-        solr_doc['table_count_tesim']       = file_metadata.table_count if file_metadata.table_count.present?
-        solr_doc['graphics_count_tesim']    = file_metadata.graphics_count if file_metadata.graphics_count.present?
-
-        # attributes set by fits for images
-        solr_doc['byte_order_tesim']        = file_metadata.byte_order if file_metadata.byte_order.present?
-        solr_doc['compression_tesim']       = file_metadata.compression if file_metadata.compression.present?
-        solr_doc['color_space_tesim']       = file_metadata.color_space if file_metadata.color_space.present?
-        solr_doc['profile_name_tesim']      = file_metadata.profile_name if file_metadata.profile_name.present?
-        solr_doc['profile_version_tesim']   = file_metadata.profile_version if file_metadata.profile_version.present?
-        solr_doc['orientation_tesim']       = file_metadata.orientation if file_metadata.orientation.present?
-        solr_doc['color_map_tesim']         = file_metadata.color_map if file_metadata.color_map.present?
-        solr_doc['image_producer_tesim']    = file_metadata.image_producer if file_metadata.image_producer.present?
-        solr_doc['capture_device_tesim']    = file_metadata.capture_device if file_metadata.capture_device.present?
-        solr_doc['scanning_software_tesim'] = file_metadata.scanning_software if file_metadata.scanning_software.present?
-        solr_doc['gps_timestamp_tesim']     = file_metadata.gps_timestamp if file_metadata.gps_timestamp.present?
-        solr_doc['latitude_tesim']          = file_metadata.latitude if file_metadata.latitude.present?
-        solr_doc['longitude_tesim']         = file_metadata.longitude if file_metadata.longitude.present?
-
-        # attributes set by fits for video
-        solr_doc['aspect_ratio_tesim']      = file_metadata.aspect_ratio if file_metadata.aspect_ratio.present?
-      end
-    end
-
-    private
-
-    # Convert Valkyrie Original File Pointer to versioned url syntax expected by the iiif_presenter
-    def original_file_id
-      "#{resource.id}/files/#{resource.original_file_id}"
-    end
-
-    def file_format(file)
-      if file.mime_type.present? && file.format_label.present?
-        "#{file.mime_type.split('/').last} (#{file.format_label.join(', ')})"
-      elsif file.mime_type.present?
-        file.mime_type.split('/').last
-      elsif file.format_label.present?
-        file.format_label
-      end
-    end
-
-    def index_lease(doc)
-      if resource.lease&.active?
-        doc['lease_expiration_date_dtsi'] = resource.lease.lease_expiration_date&.to_datetime
-        doc['visibility_after_lease_ssim'] = resource.lease.visibility_after_lease
-        doc['visibility_during_lease_ssim'] = resource.lease.visibility_during_lease
-      else
-        doc['lease_history_ssim'] = resource&.lease&.lease_history
-      end
-
-      doc
-    end
-
-    def index_embargo(doc)
-      if resource.embargo&.active?
-        doc['embargo_release_date_dtsi'] = resource.embargo.embargo_release_date&.to_datetime
-        doc['visibility_after_embargo_ssim'] = resource.embargo.visibility_after_embargo
-        doc['visibility_during_embargo_ssim'] = resource.embargo.visibility_during_embargo
-      else
-        doc['embargo_history_ssim'] = resource&.embargo&.embargo_history
-      end
-
-      doc
+  # @deprecated use +Hyrax::Indexers::FileSetIndexer+ instead
+  class ValkyrieFileSetIndexer < Hyrax::Indexers::FileSetIndexer
+    def initialize(*args, **kwargs)
+      Deprecation.warn "`Hyrax::ValkyrieFileSetIndexer` is deprecated. Use `Hyrax::Indexers::FileSetIndexer` instead."
+      super
     end
   end
 end

data/app/indexers/hyrax/valkyrie_indexer.rb

@@ -2,121 +2,17 @@
 
 module Hyrax
   ##
-  # @api public
-  #
-  # Transforms +Valkyrie::Resource+ models to solr-ready key-value hashes. Use
-  # {#to_solr} to retrieve the indexable hash.
-  #
-  # The default {Hyrax::ValkyrieIndexer} implementation provides minimal
-  # indexing for the Valkyrie id and the reserved +#created_at+ and
-  # +#updated_at+ attributes.
-  #
-  # Custom indexers inheriting from others are responsible for providing a full
-  # index hash. A common pattern for doing this is to employ method composition
-  # to retrieve the parent's data, then modify it:
-  # +def to_solr; super.tap { |index_document| transform(index_document) }; end+.
-  # This technique creates infinitely composible index building behavior, with
-  # indexers that can always see the state of the resource and the full current
-  # index document.
-  #
-  # It's recommended to *never* modify the state of +resource+ in an indexer.
-  #
-  # @example defining a custom indexer with composition
-  #   class MyIndexer < ValkyrieIndexer
-  #     def to_solr
-  #       super.tap do |index_document|
-  #         index_document[:my_field_tesim]   = resource.my_field.map(&:to_s)
-  #         index_document[:other_field_ssim] = resource.other_field
-  #       end
-  #     end
-  #   end
-  #
-  # @example pairing an indexer with a model class
-  #   class Book < Hyrax::Resource
-  #     attribute :author
-  #   end
-  #
-  #   # match by name "#{model_class}Indexer"
-  #   class BookIndexer < ValkyrieIndexer
-  #     def to_solr
-  #       super.tap do |index_document|
-  #         index_document[:author_si] = resource.author
-  #       end
-  #     end
-  #   end
-  #
-  #   ValkyrieIndexer.for(resource: Book.new) # => #<BookIndexer:0x0000563715a9f1f8 ...>
-  #
-  # @see Valkyrie::Indexing::Solr::IndexingAdapter
-  class ValkyrieIndexer
-    ##
-    # @!attribute [r] resource
-    #   @api public
-    #   @return [Valkyrie::Resource]
-    attr_reader :resource
-
-    ##
-    # @api private
-    # @param [Valkyrie::Resource] resource
-    def initialize(resource:)
-      @resource = resource
-    end
-
-    ##
-    # @api public
-    # @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
-
-    ##
-    # @api private
-    # @note provided for ActiveFedora compatibility.
-    def generate_solr_document
-      to_solr.stringify_keys
+  # @deprecated use +Hyrax::Indexers::ResourceIndexer+ instead
+  class ValkyrieIndexer < Hyrax::Indexers::ResourceIndexer
+    def initialize(*args, **kwargs)
+      Deprecation.warn "`Hyrax::ValkyrieIndexer` is deprecated. Use `Hyrax::Indexers::ResourceIndexer` instead."
+      super
     end
 
     class << self
-      ##
-      # @api public
-      # @param resource [Valkyrie::Resource] an instance of a +Valkyrie::Resource+
-      #   or an inherited class
-      # @note This factory will attempt to return an indexer following a naming convention
-      #   where the indexer for a resource class is expected to be the class name
-      #   appended with 'Indexer'.  It will return default {ValkyrieIndexer} if
-      #   an indexer class following the naming convention is not found.
-      #
-      # @return [Valkyrie::Indexer] an instance of ValkyrieIndexer or an inherited class based on naming convention
-      #
-      # @example
-      #     ValkyrieIndexer.for(resource: Book.new) # => #<BookIndexer ...>
-      def for(resource:)
-        case resource
-        when Hyrax::FileSet
-          Hyrax::ValkyrieFileSetIndexer.new(resource: resource)
-        else
-          indexer_class_for(resource).new(resource: resource)
-        end
-      end
-
-      private
-
-      ##
-      # @param [Object]
-      # @return [Class]
-      def indexer_class_for(resource)
-        indexer_class = "#{resource.class.name}Indexer".safe_constantize
-
-        return indexer_class if indexer_class.is_a?(Class) &&
-                                indexer_class.instance_methods.include?(:to_solr)
-        resource.try(:work?) ? Hyrax::ValkyrieWorkIndexer : ValkyrieIndexer
+      def for(*args, **kwargs)
+        Deprecation.warn "`Hyrax::ValkyrieIndexer.for` is deprecated. Use `Hyrax::Indexers::ResourceIndexer.for` instead."
+        Hyrax::Indexers::ResourceIndexer.for(*args, **kwargs)
       end
     end
   end

data/app/indexers/hyrax/valkyrie_work_indexer.rb

@@ -2,69 +2,11 @@
 
 module Hyrax
   ##
-  # Indexes Hyrax::Work objects
-  class ValkyrieWorkIndexer < Hyrax::ValkyrieIndexer
-    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
-      super.tap do |solr_doc|
-        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]
-        solr_doc['hasFormat_ssim'] = resource.rendering_ids.map(&:to_s) if resource.rendering_ids.present?
-        index_embargo(solr_doc)
-        index_lease(solr_doc)
-      end
-    end
-
-    private
-
-    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
-
-    def index_embargo(doc)
-      if resource.embargo&.active?
-        doc['embargo_release_date_dtsi'] = resource.embargo.embargo_release_date&.to_datetime
-        doc['visibility_after_embargo_ssim'] = resource.embargo.visibility_after_embargo
-        doc['visibility_during_embargo_ssim'] = resource.embargo.visibility_during_embargo
-      else
-        doc['embargo_history_ssim'] = resource&.embargo&.embargo_history
-      end
-
-      doc
-    end
-
-    def index_lease(doc)
-      if resource.lease&.active?
-        doc['lease_expiration_date_dtsi'] = resource.lease.lease_expiration_date&.to_datetime
-        doc['visibility_after_lease_ssim'] = resource.lease.visibility_after_lease
-        doc['visibility_during_lease_ssim'] = resource.lease.visibility_during_lease
-      else
-        doc['lease_history_ssim'] = resource&.lease&.lease_history
-      end
-
-      doc
+  # @deprecated use +Hyrax::Indexers::PcdmObjectIndexer+ instead
+  class ValkyrieWorkIndexer < Hyrax::Indexers::PcdmObjectIndexer
+    def initialize(*args, **kwargs)
+      Deprecation.warn "`Hyrax::ValkyrieWorkIndexer` is deprecated. Use `Hyrax::Indexers::PcdmObjectIndexer` instead."
+      super
     end
   end
 end

data/app/indexers/hyrax/work_indexer.rb

@@ -15,6 +15,7 @@ module Hyrax
         # This enables us to return a Work when we have a FileSet that matches
         # the search query.  While at the same time allowing us not to return Collections
         # when a work in the collection matches the query.
+        # NOTE: file_set_ids_ssim is not indexed for valkyrie resources
         solr_doc['file_set_ids_ssim'] = solr_doc['member_ids_ssim']
         solr_doc['visibility_ssi'] = object.visibility
 

data/app/inputs/controlled_vocabulary_input.rb

@@ -44,7 +44,7 @@ class ControlledVocabularyInput < MultiValueInput
   def hidden_id_field(value, index)
     name = name_for(attribute_name, index, 'id')
     id = id_for(attribute_name, index, 'id')
-    hidden_value = value.node? ? '' : value.rdf_subject
+    hidden_value = value.try(:node?) ? '' : value.rdf_subject
     @builder.hidden_field(attribute_name, name: name, id: id, value: hidden_value, data: { id: 'remote' })
   end
 

data/app/jobs/characterize_job.rb

@@ -51,7 +51,7 @@ class CharacterizeJob < Hyrax::ApplicationJob
     # 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)
+    characterization_service.run(file_set.characterization_proxy, filepath, **Hyrax.config.characterization_options)
     Hyrax.logger.debug "Ran characterization on #{file_set.characterization_proxy.id} (#{file_set.characterization_proxy.mime_type})"
     file_set.characterization_proxy.alpha_channels = channels(filepath) if file_set.image? && Hyrax.config.iiif_image_server?
     file_set.characterization_proxy.save!

data/app/jobs/create_work_job.rb

@@ -17,15 +17,48 @@ class CreateWorkJob < Hyrax::ApplicationJob
   def perform(user, model, attributes, operation)
     operation.performing!
     work = model.constantize.new
-    current_ability = Ability.new(user)
-    env = Hyrax::Actors::Environment.new(work, current_ability, attributes)
-    status = work_actor.create(env)
+    if model.constantize < ActiveFedora::Base
+      status = batch_create_af_work(work, attributes, user)
+      errors = work.errors
+    else
+      result = batch_create_valkyrie_work(work, attributes, user)
+      status = result.success?
+      errors = result.failure&.last
+    end
+
     return operation.success! if status
-    operation.fail!(work.errors.full_messages.join(' '))
+    operation.fail!(errors.full_messages.join(' '))
   end
 
   private
 
+  def batch_create_af_work(work, attributes, user)
+    current_ability = Ability.new(user)
+    env = Hyrax::Actors::Environment.new(work, current_ability, attributes)
+    work_actor.create(env)
+  end
+
+  def batch_create_valkyrie_work(work, attributes, user)
+    uploaded_file_ids = attributes.delete(:uploaded_files)
+    files = Hyrax::UploadedFile.find(uploaded_file_ids)
+    permissions_params = attributes.delete(:permissions_attributes)
+    form = Hyrax::FormFactory.new.build(work, nil, nil)
+    form.validate(attributes)
+
+    transactions['change_set.create_work']
+      .with_step_args(
+        'work_resource.add_file_sets' => { uploaded_files: files },
+        'change_set.set_user_as_depositor' => { user: user },
+        'work_resource.change_depositor' => { user: ::User.find_by_user_key(form.on_behalf_of) },
+        'work_resource.save_acl' => { permissions_params: permissions_params }
+      )
+      .call(form)
+  end
+
+  def transactions
+    Hyrax::Transactions::Container
+  end
+
   def work_actor
     Hyrax::CurationConcern.actor
   end

data/app/jobs/valkyrie_characterization_job.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+class ValkyrieCharacterizationJob < Hyrax::ApplicationJob
+  queue_as Hyrax.config.ingest_queue_name
+  def perform(file_metadata_id)
+    file_metadata = Hyrax.custom_queries.find_file_metadata_by(id: file_metadata_id)
+    Hyrax.config.characterization_service
+         .run(metadata: file_metadata, file: file_metadata.file, **Hyrax.config.characterization_options)
+  end
+end

data/app/jobs/valkyrie_ingest_job.rb

@@ -25,14 +25,12 @@ class ValkyrieIngestJob < Hyrax::ApplicationJob
   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(
+    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
 
   ##

data/app/models/admin_set.rb

@@ -28,7 +28,26 @@ class AdminSet < ActiveFedora::Base
   DEFAULT_WORKFLOW_NAME = Hyrax.config.default_active_workflow_name
 
   validates_with Hyrax::HasOneTitleValidator
+
+  ##
+  # @!group Class Attributes
+  #
+  # @!attribute internal_resource
+  #   @return [String]
+  class_attribute :internal_resource, default: "AdminSet"
+
   class_attribute :human_readable_short_description
+  # @!endgroup Class Attributes
+  ##
+
+  def self.to_rdf_representation
+    internal_resource
+  end
+
+  def to_rdf_representation
+    internal_resource
+  end
+
   self.indexer = Hyrax::AdminSetIndexer
 
   property :title,             predicate: ::RDF::Vocab::DC.title
@@ -39,7 +58,7 @@ class AdminSet < ActiveFedora::Base
            predicate: Hyrax.config.admin_set_predicate,
            class_name: 'ActiveFedora::Base'
 
-  before_destroy :check_if_not_default_set, :check_if_empty
+  before_destroy :check_if_not_default_set, :check_if_empty, prepend: true
   after_destroy :destroy_permission_template
 
   def collection_type_gid

data/app/models/collection.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# Provide plain collection model if not defined by the application.
+# Needed until Hyrax internals do not assume its existence.
+class ::Collection < Hyrax.config.collection_class; end unless '::Collection'.safe_constantize

data/app/models/collection_branding_info.rb

@@ -19,15 +19,8 @@ class CollectionBrandingInfo < ApplicationRecord
     super()
   end
 
-  def delete(location_path = nil)
-    id = if location_path
-           Deprecation.warn('Passing an explict location path is ' \
-                            'deprecated. Call without arguments instead.')
-           location_path
-         else
-           local_path
-         end
-    storage.delete(id: id)
+  def delete(_location_path = nil)
+    storage.delete(id: local_path)
   end
 
   def find_local_filename(collection_id, role, filename)

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

@@ -3,49 +3,34 @@ module Hyrax
   module Ability
     module AdminSetAbility
       def admin_set_abilities # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+        models = Hyrax::ModelRegistry.admin_set_classes
         if admin?
-          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
+          can :manage, models
+          can :manage_any, models
+          can :create_any, models
+          can :view_admin_show_any, models
         else
-          if Hyrax::Collections::PermissionsService.can_manage_any_admin_set?(ability: self)
-            can :manage_any, AdminSet
-            can :manage_any, Hyrax::AdministrativeSet
-          end
+          can :manage_any, models if Hyrax::Collections::PermissionsService.can_manage_any_admin_set?(ability: self)
           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
+            can :create, models
+            can :create_any, models
           end
+          can :view_admin_show_any, models if Hyrax::Collections::PermissionsService.can_view_admin_show_for_any_admin_set?(ability: self)
           # [: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
+          can [:edit, :update, :destroy], models 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
+          can :deposit, models 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
+          can :view_admin_show, models 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
+          can :read, models do |admin_set| # admin show page # for test by solr_doc, see collection_ability.rb
             test_read(admin_set.id)
           end
         end