hyrax 4.0.0 → 5.0.0.rc1

data/app/controllers/hyrax/file_sets_controller.rb

@@ -171,6 +171,7 @@ module Hyrax
       respond_to do |wants|
         wants.html do
           initialize_edit_form
+          # TODO: return a valuable error message
           flash[:error] = "There was a problem processing your request."
           render 'edit', status: :unprocessable_entity
         end

data/app/forms/hyrax/forms/file_set_edit_form.rb

@@ -6,7 +6,7 @@ module Hyrax::Forms
 
     delegate :depositor, :permissions, :human_readable_type, to: :model
 
-    self.required_fields = [:title, :creator, :license]
+    self.required_fields = [:title, :creator]
 
     self.model_class = ::FileSet
 

data/app/forms/hyrax/forms/permission_template_form.rb

@@ -266,6 +266,8 @@ module Hyrax
       # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/PerceivedComplexity
       def permission_template_update_params
+        return attributes unless attributes.key?(:release_varies) || attributes.key?(:release_embargo)
+
         filtered_attributes = attributes.except(:release_varies, :release_embargo)
         # If 'varies' before date option selected, then set release_period='before' and save release_date as-is
         if attributes[:release_varies] == Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE

data/app/forms/hyrax/forms/resource_batch_edit_form.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+module Hyrax
+  module Forms
+    class ResourceBatchEditForm < Hyrax::Forms::ResourceForm
+      include Hyrax::FormFields(:basic_metadata)
+
+      self.required_fields = []
+      self.model_class = Hyrax.primary_work_type
+
+      # Contains a list of titles of all the works in the batch
+      attr_accessor :names
+
+      # @param [Hyrax::Work] model the model backing the form
+      # @param [Ability] current_ability the user authorization model
+      # @param [Array<String>] batch_document_ids a list of document ids in the batch
+      def initialize(model, _current_ability, batch_document_ids)
+        @names = []
+        @batch_document_ids = batch_document_ids
+        if @batch_document_ids.present?
+          super(model.class.new(initialize_combined_fields))
+        else
+          super(model)
+        end
+      end
+
+      def terms
+        [:creator, :contributor, :description,
+         :keyword, :resource_type, :license, :publisher, :date_created,
+         :subject, :language, :identifier, :based_near,
+         :related_url]
+      end
+
+      attr_reader :batch_document_ids
+
+      # Returns a list of parameters we accept from the form
+      # rubocop:disable Metrics/MethodLength
+      def self.build_permitted_params
+        [{ creator: [] },
+         { contributor: [] },
+         { description: [] },
+         { keyword: [] },
+         { resource_type: [] },
+         { license: [] },
+         { publisher: [] },
+         { date_created: [] },
+         { subject: [] },
+         { language: [] },
+         { identifier: [] },
+         { based_near: [] },
+         { related_url: [] },
+         { permissions_attributes: [:type, :name, :access, :id, :_destroy] },
+         :on_behalf_of,
+         :version,
+         :add_works_to_collection,
+         :visibility_during_embargo,
+         :embargo_release_date,
+         :visibility_after_embargo,
+         :visibility_during_lease,
+         :lease_expiration_date,
+         :visibility_after_lease,
+         :visibility,
+         { based_near_attributes: [:id, :_destroy] }]
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      # @param name [Symbol]
+      # @return [Symbol]
+      # @note Added for ActiveModel compatibility.
+      def column_for_attribute(name)
+        name
+      end
+
+      private
+
+      # override this method if you need to initialize more complex RDF assertions (b-nodes)
+      # @return [Hash<String, Array>] the list of unique values per field
+      def initialize_combined_fields
+        # For each of the files in the batch, set the attributes to be the concatenation of all the attributes
+        batch_document_ids.each_with_object({}) do |doc_id, combined_attributes|
+          work = Hyrax.query_service.find_by(id: doc_id)
+          terms.each do |field|
+            combined_attributes[field] ||= []
+            combined_attributes[field] = (combined_attributes[field] + work[field].to_a).uniq
+          end
+          names << work.to_s
+        end
+      end
+    end
+  end
+end

data/app/forms/hyrax/forms/work_embargo_form.rb

@@ -11,6 +11,7 @@ module Hyrax
     #   +EmbargoesControllerBehavior+.
     class WorkEmbargoForm < Hyrax::ChangeSet
       property :embargo, form: Hyrax::Forms::Embargo, populator: :embargo_populator, prepopulator: :embargo_populator
+      property :embargo_history, virtual: true, prepopulator: proc { |_opts| self.embargo_history = model.embargo&.embargo_history }
       property :embargo_release_date, virtual: true, prepopulator: proc { |_opts| self.embargo_release_date = model.embargo&.embargo_release_date }
       property :visibility_after_embargo, virtual: true, prepopulator: proc { |_opts| self.visibility_after_embargo = model.embargo&.visibility_after_embargo }
       property :visibility_during_embargo, virtual: true, prepopulator: proc { |_opts| self.visibility_during_embargo = model.embargo&.visibility_during_embargo }

data/app/forms/hyrax/forms/work_form.rb

@@ -158,7 +158,7 @@ module Hyrax
       # In particular we are discarding any access grant parameters for works that
       # are going into a mediated deposit workflow.
       def self.sanitize_params(form_params)
-        admin_set_id = form_params[:admin_set_id]
+        admin_set_id = Array(form_params[:admin_set_id]).first
         return super if admin_set_id && workflow_for(admin_set_id: admin_set_id).allows_access_grant?
         params_without_permissions = permitted_params.reject { |arg| arg.respond_to?(:key?) && arg.key?(:permissions_attributes) }
         form_params.permit(*params_without_permissions)

data/app/forms/hyrax/forms/work_lease_form.rb

@@ -11,6 +11,7 @@ module Hyrax
     #   +LeasesControllerBehavior+.
     class WorkLeaseForm < Hyrax::ChangeSet
       property :lease, form: Hyrax::Forms::Lease, populator: :lease_populator, prepopulator: :lease_populator
+      property :lease_history, virtual: true, prepopulator: proc { |_opts| self.lease_history = model.lease&.lease_history }
       property :lease_expiration_date, virtual: true, prepopulator: proc { |_opts| self.lease_expiration_date = model.lease&.lease_expiration_date }
       property :visibility_after_lease, virtual: true, prepopulator: proc { |_opts| self.visibility_after_lease = model.lease&.visibility_after_lease }
       property :visibility_during_lease, virtual: true, prepopulator: proc { |_opts| self.visibility_during_lease = model.lease&.visibility_during_lease }

data/app/helpers/hyrax/dashboard_helper_behavior.rb

@@ -6,13 +6,13 @@ module Hyrax
     end
 
     # @param user [User]
-    # @param where [Hash] applied as the where clause when querying the Hyrax::WorkRelation
-    # @return [Integer] number of works matching the where that the user deposited
-    # @see Hyrax::WorkRelation
-    def number_of_works(user = current_user, where: { generic_type_sim: "Work" })
-      field_pairs = field_pairs(user)
-      field_pairs.merge!(where)
-      Hyrax::SolrQueryService.new.with_field_pairs(field_pairs: field_pairs).count
+    # @return [Integer] number of works that the user deposited
+    def number_of_works(user = current_user)
+      Hyrax::SolrQueryService
+        .new
+        .with_field_pairs(field_pairs: field_pairs(user))
+        .with_generic_type(generic_type: 'Work')
+        .count
     rescue RSolr::Error::ConnectionRefused
       'n/a'
     end
@@ -20,7 +20,11 @@ module Hyrax
     # @param user [User]
     # @return [Integer] number of FileSets the user deposited
     def number_of_files(user = current_user)
-      Hyrax::SolrQueryService.new.with_field_pairs(field_pairs: field_pairs(user)).count
+      Hyrax::SolrQueryService
+        .new
+        .with_field_pairs(field_pairs: field_pairs(user))
+        .with_generic_type(generic_type: 'FileSet')
+        .count
     rescue RSolr::Error::ConnectionRefused
       'n/a'
     end
@@ -28,7 +32,11 @@ module Hyrax
     # @param user [User]
     # @return [Integer] number of Collections the user created
     def number_of_collections(user = current_user)
-      Hyrax::SolrQueryService.new.with_field_pairs(field_pairs: field_pairs(user)).count
+      Hyrax::SolrQueryService
+        .new
+        .with_field_pairs(field_pairs: field_pairs(user))
+        .with_generic_type(generic_type: 'Collection')
+        .count
     rescue RSolr::Error::ConnectionRefused
       'n/a'
     end

data/app/helpers/hyrax/membership_helper.rb

@@ -14,18 +14,30 @@ module Hyrax
     #
     # @see app/assets/javascripts/hyrax/relationships.js
     def member_of_collections_json(resource)
+      # this is where we return for dassie
       return resource.member_of_collections_json if
         resource.respond_to?(:member_of_collections_json)
 
       resource = resource.model if resource.respond_to?(:model)
 
-      Hyrax.custom_queries.find_collections_for(resource: resource).map do |collection|
+      existing_collections_array = Hyrax.custom_queries.find_collections_for(resource: resource) + add_collection_from_params
+      existing_collections_array.map do |collection|
         { id: collection.id.to_s,
           label: collection.title.first,
           path: url_for(collection) }
       end.to_json
     end
 
+    def add_collection_from_params
+      # avoid errors when creating Valkyrie resources from Dashboard >> Works
+      return [] if controller.params[:add_works_to_collection].blank?
+
+      # new valkyrie works need the collection from params when depositing directly into an existing collection
+      return [Hyrax.metadata_adapter.query_service.find_by(id: Valkyrie::ID.new(controller.params[:add_works_to_collection]))] if Hyrax.config.use_valkyrie?
+
+      [::Collection.find(@controller.params[:add_works_to_collection])]
+    end
+
     ##
     # @param resource [#work_members_json]
     #

data/app/helpers/hyrax/work_form_helper.rb

@@ -97,112 +97,5 @@ module Hyrax
         hash[presenter.title_or_label] = presenter.id
       end
     end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def in_works_ids_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:in_works_ids]
-      else
-        form.model.errors[:in_works_ids]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def ordered_member_ids_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:ordered_member_ids]
-      else
-        form.model.errors[:ordered_member_ids]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def visibility_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:visibility]
-      else
-        form.model.errors[:visibility]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def embargo_release_date_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:embargo_release_date]
-      else
-        form.model.errors[:embargo_release_date]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def visibility_after_embargo_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:visibility_after_embargo]
-      else
-        form.model.errors[:visibility_after_embargo]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def lease_expiration_date_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:lease_expiration_date_errors]
-      else
-        form.model.errors[:lease_expiration_date_errors]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def visibility_after_lease_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:visibility_after_lease]
-      else
-        form.model.errors[:visibility_after_lease]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def full_collections_errors(form:)
-      form.full_error(:collections) || form.full_error(:member_of_collection_ids)
-    end
   end
 end

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['extracted_text_id_ssi']   = extracted_text_id
         solr_doc['generic_type_si'] = 'FileSet'
       end
     end
@@ -46,6 +47,11 @@ module Hyrax
       Hyrax::VersioningService.versioned_file_id object.original_file
     end
 
+    def extracted_text_id
+      return unless object.extracted_text
+      Hyrax::VersioningService.versioned_file_id object.extracted_text
+    end
+
     def file_format
       if object.mime_type.present? && object.format_label.present?
         "#{object.mime_type.split('/').last} (#{object.format_label.join(', ')})"

data/app/indexers/hyrax/pcdm_collection_indexer.rb

@@ -19,6 +19,14 @@ module Hyrax
         index_document[:member_of_collection_ids_ssim] = resource.member_of_collection_ids.map(&:to_s)
         index_document[:depositor_ssim] = [resource.depositor]
         index_document[:depositor_tesim] = [resource.depositor]
+        # add all attributes that should be indexed for collections here
+        tesim_and_ssim_attributes = ['abstract', 'access_right', 'alternative_title', 'based_near',
+                                     'bibliographic_citation', 'contributor', 'identifier', 'import_url', 'publisher', 'label',
+                                     'language', 'license', 'publisher', 'rights_notes', 'rights_statement', 'source', 'subject']
+        tesim_and_ssim_attributes.each do |attribute|
+          index_document["#{attribute}_ssim"] = resource[attribute.to_s]
+          index_document["#{attribute}_tesim"] = resource[attribute.to_s]
+        end
       end
     end
   end

data/app/indexers/hyrax/valkyrie_file_set_indexer.rb

@@ -3,7 +3,7 @@
 module Hyrax
   ##
   # Indexes Hyrax::FileSet objects
-  class ValkyrieFileSetIndexer < Hyrax::ValkyrieIndexer
+  class ValkyrieFileSetIndexer < Hyrax::ValkyrieIndexer # rubocop:disable Metrics/ClassLength
     include Hyrax::ResourceIndexer
     include Hyrax::PermissionIndexer
     include Hyrax::VisibilityIndexer
@@ -17,11 +17,14 @@ module Hyrax
 
         # 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['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
@@ -36,12 +39,13 @@ module Hyrax
 
         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.size[0]
-        solr_doc['type_tesim']              = file_metadata.type.map(&:to_s) if file_metadata.type.present?
+        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.size if file_metadata.size.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?
@@ -56,10 +60,13 @@ module Hyrax
 
         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?
 
@@ -99,6 +106,11 @@ module Hyrax
 
     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(', ')})"
@@ -108,5 +120,29 @@ module Hyrax
         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
+    end
   end
 end

data/app/indexers/hyrax/valkyrie_work_indexer.rb

@@ -25,6 +25,7 @@ module Hyrax
         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
@@ -43,19 +44,24 @@ module Hyrax
     end
 
     def index_embargo(doc)
-      if Hyrax::EmbargoManager.new(resource: resource).under_embargo?
+      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 Hyrax::LeaseManager.new(resource: resource).under_lease?
+      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

data/app/jobs/valkyrie_create_derivatives_job.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 class ValkyrieCreateDerivativesJob < Hyrax::ApplicationJob
   queue_as Hyrax.config.ingest_queue_name
-  def perform(_file_set_id, file_id, _filepath = nil)
+  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.
@@ -9,15 +9,16 @@ class ValkyrieCreateDerivativesJob < Hyrax::ApplicationJob
     # Call derivatives with the file_set.
     derivative_service = Hyrax::DerivativeService.for(file_metadata)
     derivative_service.create_derivatives(file.disk_path)
+    reindex_parent(file_set_id)
   end
 
   private
 
-  def query_service
-    Hyrax.query_service
-  end
-
-  def storage_adapter
-    Hyrax.storage_adapter
+  def reindex_parent(file_set_id)
+    file_set = Hyrax.query_service.find_by(id: file_set_id)
+    parent = Hyrax.custom_queries.find_parent_work(resource: file_set)
+    return unless parent.thumbnail_id == file_set.id
+    Hyrax.logger.debug { "Reindexing #{parent.id} due to creation of thumbnail derivatives." }
+    Hyrax.index_adapter.save(resource: parent)
   end
 end

data/app/jobs/valkyrie_ingest_job.rb

@@ -25,7 +25,6 @@ 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(
       file: file,
       file_set: file_set,

data/app/models/admin_set.rb

@@ -42,25 +42,6 @@ class AdminSet < ActiveFedora::Base
   before_destroy :check_if_not_default_set, :check_if_empty
   after_destroy :destroy_permission_template
 
-  def self.default_set?(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
-    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
@@ -86,17 +67,6 @@ class AdminSet < ActiveFedora::Base
     Sipity::Workflow.find_active_workflow_for(admin_set_id: id)
   end
 
-  ##
-  # @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_for instead.")
-
-    permission_template.reset_access_controls_for(collection: self)
-  end
-
   # @api public
   #
   # return an id for the AdminSet.
@@ -120,7 +90,7 @@ class AdminSet < ActiveFedora::Base
   end
 
   def check_if_not_default_set
-    return true unless default_set?
+    return true unless Hyrax::AdminSetCreateService.default_admin_set?(id: id)
     errors[:base] << I18n.t('hyrax.admin.admin_sets.delete.error_default_set')
     throw :abort
   end

data/app/models/concerns/hyrax/file_set/derivatives.rb

@@ -43,8 +43,9 @@ module Hyrax
         #          # ./spec/jobs/create_derivatives_job_spec.rb:7:in `block (2 levels) in <top (required)>'
         #
         Hydra::Derivatives.source_file_service = Hyrax::LocalFileService
-        Hydra::Derivatives.output_file_service = Hyrax::PersistDerivatives
-        Hydra::Derivatives::FullTextExtract.output_file_service = Hyrax::PersistDirectlyContainedOutputFileService
+        Hydra::Derivatives.output_file_service = Hyrax::ValkyriePersistDerivatives
+        # Hydra::Derivatives::FullTextExtract.output_file_service = Hyrax::PersistDirectlyContainedOutputFileService
+        Hydra::Derivatives::FullTextExtract.output_file_service = Hyrax::ValkyriePersistDerivatives
         before_destroy :cleanup_derivatives
         # This completely overrides the version in Hydra::Works so that we
         # read and write to a local file. It's important that characterization runs

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

@@ -59,7 +59,7 @@ module Hyrax
     ##
     # @return [Boolean]
     def file_set?
-      hydra_model == ::FileSet
+      hydra_model == ::FileSet || hydra_model == Hyrax::FileSet
     end
 
     ##

data/app/models/hyrax/collection_type.rb

@@ -49,7 +49,10 @@ module Hyrax
     # @return [Hyrax::PcdmCollection | ::Collection] an instance of Hyrax::CollectionType with id = the model_id portion of the gid (e.g. 3)
     # @raise [ActiveRecord::RecordNotFound] if record matching gid is not found
     def self.for(collection:)
-      find_by_gid!(collection.collection_type_gid)
+      gid = collection.collection_type_gid
+      gid = gid.first if gid.is_a?(Enumerable)
+
+      find_by_gid!(gid)
     end
 
     # Find the collection type associated with the Global Identifier (gid)
@@ -67,7 +70,7 @@ module Hyrax
     # @see #gid
     # @see Hyrax::MultipleMembershipChecker
     def self.gids_that_do_not_allow_multiple_membership
-      where(allow_multiple_membership: false).map(&:gid)
+      where(allow_multiple_membership: false).map { |c| c.to_global_id.to_s }
     end
 
     # Find the collection type associated with the Global Identifier (gid)
@@ -95,18 +98,6 @@ module Hyrax
       SETTINGS_ATTRIBUTES
     end
 
-    ##
-    # @deprecation use #to_global_id
-    #
-    # Return the Global Identifier for this collection type.
-    # @return [String, nil] Global Identifier (gid) for this collection_type (e.g. gid://internal/hyrax-collectiontype/3)
-    #
-    # @see https://github.com/rails/globalid#usage
-    def gid
-      Deprecation.warn('use #to_global_id.')
-      to_global_id.to_s if id
-    end
-
     ##
     # @return [Enumerable<Collection, PcdmCollection>]
     def collections(use_valkyrie: Hyrax.config.use_valkyrie?)