hyrax 5.2.0 → 5.3.0

data/app/indexers/hyrax/indexers/pcdm_collection_indexer.rb

@@ -9,7 +9,9 @@ module Hyrax
       include Hyrax::VisibilityIndexer
       include Hyrax::LocationIndexer
       include Hyrax::ThumbnailIndexer
-      include Hyrax::Indexer(:core_metadata)
+      include Hyrax::Indexer(:core_metadata) if Hyrax.config.collection_include_metadata?
+      include Hyrax::Indexers::RedirectsIndexer if Hyrax.config.redirects_enabled?
+      check_if_flexible(Hyrax::PcdmCollection)
 
       self.thumbnail_path_service = CollectionThumbnailPathService
 
@@ -20,8 +22,16 @@ 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]
+          index_document['thumbnail_alt_text_tesim'] = thumbnail_alt_text(resource.id.to_s)
         end
       end
+
+      private
+
+      def thumbnail_alt_text(collection_id)
+        branding = CollectionBrandingInfo.where(collection_id: collection_id, role: "thumbnail").first
+        branding&.alt_text.presence
+      end
     end
   end
 end

data/app/indexers/hyrax/indexers/pcdm_object_indexer.rb

@@ -9,7 +9,8 @@ module Hyrax
       include Hyrax::VisibilityIndexer
       include Hyrax::LocationIndexer
       include Hyrax::ThumbnailIndexer
-      include Hyrax::Indexer(:core_metadata)
+      include Hyrax::WorkflowIndexer
+      include Hyrax::Indexers::RedirectsIndexer if Hyrax.config.redirects_enabled?
 
       def to_solr # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
         super.tap do |solr_doc|
@@ -20,13 +21,15 @@ module Hyrax
           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['member_of_collection_ids_ssim'] = resource.member_of_collection_ids&.map(&:to_s)
+          solr_doc['member_of_collections_ssim'] = collection_titles_for(resource.member_of_collection_ids)
+          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?
+          solr_doc['thumbnail_alt_text_tesim'] = thumbnail_alt_text(resource.thumbnail_id)
+          solr_doc['hasFormat_ssim'] = resource.rendering_ids&.map(&:to_s) if resource.rendering_ids.present?
           index_embargo(solr_doc)
           index_lease(solr_doc)
         end
@@ -34,6 +37,14 @@ module Hyrax
 
       private
 
+      def thumbnail_alt_text(thumbnail_id)
+        return if thumbnail_id.blank?
+        file_set = Hyrax.query_service.find_by(id: thumbnail_id)
+        Array(file_set.try(:alt_text)).first.presence
+      rescue Valkyrie::Persistence::ObjectNotFoundError, Hyrax::ObjectNotFoundError
+        nil
+      end
+
       def suppressed?(resource)
         Hyrax::ResourceStatus.new(resource: resource).inactive?
       end
@@ -44,6 +55,16 @@ module Hyrax
         admin_set.title
       end
 
+      def collection_titles_for(collection_ids)
+        return [] if collection_ids.blank?
+        collection_ids.map do |id|
+          collection = Hyrax.query_service.find_by(id: id)
+          collection.title&.first
+        rescue Valkyrie::Persistence::ObjectNotFoundError
+          nil
+        end.compact
+      end
+
       def index_embargo(doc)
         if resource.embargo&.active?
           doc['embargo_release_date_dtsi'] = resource.embargo.embargo_release_date&.to_datetime

data/app/indexers/hyrax/indexers/redirects_indexer.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Indexers
+    ##
+    # Indexer mixin that emits the `redirects_path_tesim` Solr field for
+    # resources that carry a `redirects` attribute. The field is consumed
+    # by the show-page renderer via `SolrDocument#redirects_path`.
+    #
+    # @example
+    #   class WorkIndexer < Hyrax::Indexers::PcdmObjectIndexer
+    #     include Hyrax::Indexers::RedirectsIndexer
+    #   end
+    module RedirectsIndexer
+      def to_solr(*args)
+        super.tap do |document|
+          next document unless Hyrax.config.redirects_active?
+          next document unless resource.respond_to?(:redirects)
+          # Valkyrie's JSONValueMapper symbolizes hash keys on read; accept either.
+          # Paths are normalized at write time by Hyrax::RedirectsNormalization.
+          paths = Array(resource.redirects)
+                  .map { |entry| entry['path'] || entry[:path] }
+                  .reject(&:blank?)
+          document['redirects_path_tesim'] = paths
+        end
+      end
+    end
+  end
+end

data/app/indexers/hyrax/indexers/resource_indexer.rb

@@ -60,6 +60,10 @@ module Hyrax
       end
 
       class << self
+        def check_if_flexible(model)
+          include Hyrax::Indexer(model.to_s, index_loader: Hyrax::Schema.m3_schema_loader) if model.flexible?
+        end
+
         ##
         # @api public
         # @param resource [Valkyrie::Resource] an instance of a

data/app/indexers/hyrax/indexers.rb

@@ -11,6 +11,8 @@ module Hyrax
     def self.PcdmObjectIndexer(work_class) # rubocop:disable Naming/MethodName
       Class.new(Hyrax::Indexers::PcdmObjectIndexer) do
         @model_class = work_class
+        include Hyrax::Indexer(:core_metadata) if work_class.ancestors.detect { |k| k.inspect == "Hyrax::Schema(core_metadata)" }
+        check_if_flexible(work_class)
 
         class << self
           attr_reader :model_class

data/app/inputs/controlled_vocabulary_input.rb

@@ -44,7 +44,13 @@ 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.try(:node?) ? '' : value.rdf_subject
+    hidden_value = if value.try(:node?) || value.is_a?(ActionController::Parameters)
+                     ''
+                   elsif value.respond_to?(:rdf_subject)
+                     value.rdf_subject
+                   else
+                     value.to_s
+                   end
     @builder.hidden_field(attribute_name, name: name, id: id, value: hidden_value, data: { id: 'remote' })
   end
 

data/app/jobs/content_deposit_error_event_job.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+# Log a concern deposit to activity streams
+class ContentDepositErrorEventJob < ContentEventJob
+  attr_accessor :reason
+
+  def perform(repo_object, depositor, reason: '')
+    self.reason = reason
+    super(repo_object, depositor)
+  end
+
+  def action
+    "User #{link_to_profile depositor} deposit of #{link_to repo_object.title.first, polymorphic_path(repo_object)} has failed for #{reason}"
+  end
+end

data/app/jobs/create_work_job.rb

@@ -2,6 +2,7 @@
 # This is a job spawned by the BatchCreateJob
 class CreateWorkJob < Hyrax::ApplicationJob
   queue_as Hyrax.config.ingest_queue_name
+  discard_on StandardError
 
   before_enqueue do |job|
     operation = job.arguments.last
@@ -28,6 +29,7 @@ class CreateWorkJob < Hyrax::ApplicationJob
 
     return operation.success! if status
     operation.fail!(errors.full_messages.join(' '))
+    raise StandardError, operation.message
   end
 
   private

data/app/jobs/migrate_files_to_valkyrie_job.rb

@@ -59,8 +59,14 @@ class MigrateFilesToValkyrieJob < Hyrax::ApplicationJob
       begin
         # If it doesn't start with fedora, we've likely already migrated it.
         next unless /^fedora:/.match?(file.file_identifier.to_s)
+
         resource.file_ids.delete(file.id)
 
+        # We've observed cases where the extracted text (which doesn't get created in Valkyrie)
+        # does not have a filename and it overrides the original file.  The extracted text should
+        # be in the derivatives, not with the file set.
+        next if file.original_filename.blank?
+
         Tempfile.create do |tempfile|
           tempfile.binmode
           tempfile.write(URI.open(file.file_identifier.to_s.gsub("fedora:", "http:")).read)
@@ -68,7 +74,7 @@ class MigrateFilesToValkyrieJob < Hyrax::ApplicationJob
 
           # valkyrie_file = Hyrax.storage_adapter.upload(resource: resource, file: tempfile, original_filename: file.original_filename)
           valkyrie_file = Hyrax::ValkyrieUpload.file(
-            filename: resource.label,
+            filename: file.original_filename,
             file_set: resource,
             io: tempfile,
             use: file.pcdm_use.select {|use| Hyrax::FileMetadata::Use.use_list.include?(use)},

data/app/models/batch_upload_item.rb

@@ -18,4 +18,8 @@ class BatchUploadItem < ActiveFedora::Base
   def create_or_update
     raise "This is a read only record"
   end
+
+  def flexible?
+    false
+  end
 end

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+module Hyrax
+  module Ability
+    module FlexibleMetadataAbility
+      def flexible_metadata_abilities
+        can :manage, Hyrax::FlexibleSchema if admin? && Hyrax.config.flexible?
+      end
+    end
+  end
+end

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

@@ -55,6 +55,7 @@ module Hyrax
       include Hyrax::Ability::PermissionTemplateAbility
       include Hyrax::Ability::ResourceAbility
       include Hyrax::Ability::SolrDocumentAbility
+      include Hyrax::Ability::FlexibleMetadataAbility
 
       class_attribute :admin_group_name, :registered_group_name, :public_group_name
       self.admin_group_name = Hyrax.config.admin_user_group_name
@@ -79,7 +80,8 @@ module Hyrax
                              :permission_template_abilities,
                              :resource_abilities,
                              :solr_document_abilities,
-                             :trophy_abilities]
+                             :trophy_abilities,
+                             :flexible_metadata_abilities]
     end
 
     # Samvera doesn't use download user/groups, so make it an alias to read

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

@@ -68,6 +68,10 @@ module Hyrax
       title.present? ? title.join(' | ') : 'No Title'
     end
 
+    def flexible?
+      false
+    end
+
     module ClassMethods
       # This governs which partial to draw when you render this type of object
       def _to_partial_path # :nodoc:

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+module Hyrax
+  class FileSet
+    module Transcripts
+      extend ActiveSupport::Concern
+
+      included do
+        if Hyrax.config.file_set_include_metadata?
+          property :transcript_ids, predicate: ::RDF::URI.new('http://vocabulary.samvera.org/ns#transcriptIds'), multiple: true do |index|
+            index.as :stored_sortable
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -14,6 +14,7 @@ module Hyrax
     include Hyrax::FileSet::Indexing
     include Hyrax::FileSet::BelongsToWorks
     include Hyrax::FileSet::Querying
+    include Hyrax::FileSet::Transcripts
     include HumanReadableType
     include CoreMetadata
     include Hyrax::BasicMetadata
@@ -38,5 +39,13 @@ module Hyrax
       Deprecation.warn "Method #to_presenter will be removed in Hyrax 5.0. Use Hyrax::FileSetsController#presenter.solr_document or `@presenter.solr_document` from a view instead."
       Blacklight::SearchService.new(config: CatalogController.blacklight_config).fetch(id).last
     end
+
+    def self.flexible?
+      false
+    end
+
+    def flexible?
+      false
+    end
   end
 end

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

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Flexibility
+    extend ActiveSupport::Concern
+    included do
+      attribute :schema_version,       Valkyrie::Types::String
+      attribute :contexts,          Valkyrie::Types::Set.of(Valkyrie::Types::String)
+    end
+
+    class_methods do
+      def try(term)
+        # This logic is necessary to handle method :try on a class
+        # otherwise load(attributes) tries to use the term as a schema to load and errors
+        return nil unless self.respond_to?(term)
+        self.send(term)
+      end
+
+      def flexible?
+        true
+      end
+
+      ## Override dry-struct 1.6.0 to enable redefining schemas on the fly
+      def attributes(new_schema)
+        keys = new_schema.keys.map { |k| k.to_s.chomp("?").to_sym }
+        schema_location = singleton_class? ? self.superclass : self
+        schema schema_location.schema.schema(new_schema)
+
+        define_accessors(keys)
+
+        @attribute_names = nil
+
+        direct_descendants = descendants&.select { |d| d.superclass == self }
+        direct_descendants&.each do |d|
+          inherited_attrs = new_schema.reject { |k, _| d.has_attribute?(k.to_s.chomp("?").to_sym) }
+          d.attributes(inherited_attrs)
+        end
+
+        new_schema.each_key do |key|
+          key = key.to_s.chomp('?')
+          next if instance_methods.include?("#{key}=".to_sym)
+
+          class_eval(<<-RUBY)
+          def #{key}=(value)
+            set_value("#{key}".to_sym, value)
+          end
+        RUBY
+        end
+
+        self
+      end
+
+      ## Override dry-struct 1.6.0 to filter attributes after schema reload happens
+      def new(attributes = default_attributes, safe = false, &block) # rubocop:disable Style/OptionalBooleanParameter
+        if attributes.is_a?(Struct)
+          if equal?(attributes.class)
+            attributes
+          else
+            # This implicit coercion is arguable but makes sense overall
+            # in cases there you pass child struct to the base struct constructor
+            # User.new(super_user)
+            #
+            # We may deprecate this behavior in future forcing people to be explicit
+            new(attributes.to_h, safe, &block)
+          end
+        else
+          load(attributes, safe)
+        end
+      rescue Dry::Types::CoercionError => e
+        raise RuntimeError, "[#{self}.new] #{e.class}: #{e.message}", e.backtrace
+      end
+
+      ## Read the schema from the database and load the correct schemas for the instance in to the class
+      def load(attributes, safe = false)
+        attributes[:schema_version] ||=  Hyrax::FlexibleSchema.order('id DESC').pick(:id)
+        struct = allocate
+        schema_version = attributes[:schema_version]
+        contexts = attributes[:contexts] || []
+        struct.singleton_class.attributes(Hyrax::Schema(self, schema_loader: Hyrax::Schema.m3_schema_loader, schema_version:, contexts:).attributes)
+        clean_attributes = safe ? struct.singleton_class.schema.call_safe(attributes) { |output = attributes| return yield output } : struct.singleton_class.schema.call_unsafe(attributes)
+        struct.__send__(:initialize, clean_attributes)
+        struct
+      end
+    end
+
+    def contexts=(value)
+      val = Array.wrap(value).map { |v| v.split }.flatten
+      @attributes[:contexts] = val
+    end
+
+    # Override set_value from valkyrie 3.1.1 to enable dynamic schema loading
+    def set_value(key, value)
+      @attributes[key.to_sym] = self.singleton_class.schema.key(key.to_sym).type.call(value)
+    end
+
+    def flexible?
+      self.class.flexible?
+    end
+
+    # Override inspect from dry-struct 1.6.0 to enable dynamic schema loading
+    def inspect
+      klass = self.singleton_class
+      attrs = klass.attribute_names.map { |key| " #{key}=#{@attributes[key].inspect}" }.join
+      "#<#{klass.name || klass.inspect}#{attrs}>"
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Hyrax
+  # Normalizes redirect path entries on assignment so every write path —
+  # form submissions, console writes, importers, change-set saves —
+  # produces canonical data. Read-side consumers can trust the persisted
+  # shape and skip their own normalization.
+  #
+  # Included next to Hyrax::Schema(:redirects) on Hyrax::Work and
+  # Hyrax::PcdmCollection. The override sits on Valkyrie's set_value
+  # primitive so it fires under both flex modes (the simple schema's
+  # generated setter and the m3 singleton-class setter both route through
+  # set_value).
+  #
+  # See documentation/redirects.md.
+  module RedirectsNormalization
+    extend ActiveSupport::Concern
+
+    def set_value(key, value)
+      value = normalize_redirects(value) if key.to_sym == :redirects
+      super
+    end
+
+    private
+
+    def normalize_redirects(value)
+      Array(value).map { |entry| normalize_entry(entry) }
+    end
+
+    def normalize_entry(entry)
+      return entry unless entry.is_a?(Hash)
+      normalized = entry.dup
+      path_key = normalized.key?(:path) ? :path : 'path'
+      normalized[path_key] = Hyrax::RedirectPathNormalizer.call(normalized[path_key])
+      normalized
+    end
+  end
+end

data/app/models/concerns/hyrax/solr_document/characterization.rb

@@ -133,7 +133,7 @@ module Hyrax
       end
 
       def original_checksum
-        self["original_checksum_tesim"]
+        self["original_checksum_tesim"] || self["checksum_tesim"]
       end
 
       def alpha_channels

data/app/models/concerns/hyrax/solr_document/metadata.rb

@@ -40,11 +40,20 @@ module Hyrax
         end
       end
 
+      def alt_text_for_view
+        return alt_text.first.presence || title.first if file_set?
+
+        thumbnail_alt_text.first || "#{title.first} #{I18n.t('hyrax.homepage.admin_sets.thumbnail')}"
+      end
+
       included do
         attribute :alternative_title, Solr::Array, "alternative_title_tesim"
+        attribute :alt_text, Solr::Array, "alt_text_tesim"
+        attribute :thumbnail_alt_text, Solr::Array, "thumbnail_alt_text_tesim"
         attribute :identifier, Solr::Array, "identifier_tesim"
         attribute :based_near, Solr::Array, "based_near_tesim"
         attribute :based_near_label, Solr::Array, "based_near_label_tesim"
+        attribute :redirects_path, Solr::Array, "redirects_path_tesim"
         attribute :related_url, Solr::Array, "related_url_tesim"
         attribute :resource_type, Solr::Array, "resource_type_tesim"
         attribute :edit_groups, Solr::Array, ::Ability.edit_group_field

data/app/models/concerns/hyrax/solr_document/ordered_members.rb

@@ -30,6 +30,10 @@ module Hyrax
         @ordered_member_ids ||= valkyrie? ? member_ids : query_for_ordered_ids
       end
 
+      def flexible?
+        respond_to?(:schema_version) && schema_version.present?
+      end
+
       private
 
       def query_for_ordered_ids(limit: 10_000,

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

@@ -12,6 +12,8 @@ module Hyrax
   #   end
   #
   # @see https://github.com/projectblacklight/blacklight/wiki/Understanding-Rails-and-Blacklight#models
+
+  # rubocop:disable Metrics/ModuleLength
   module SolrDocumentBehavior
     ModelWrapper = ActiveFedoraDummyModel # alias for backward compatibility
 
@@ -82,12 +84,15 @@ module Hyrax
 
     # Method to return the model
     def hydra_model(classifier: nil)
-      # finds the model from the solr document
-      model = first('has_model_ssim')&.safe_constantize
-      # this returns nil if it isn't a valid model
-      resource_model = (first('has_model_ssim')&.+ 'Resource')&.safe_constantize if Hyrax.config.valkyrie_transition?
-      # if valkyrie_transition is enabled, we generally want to use the resource model if it exists
-      resource_model || model || model_classifier(classifier).classifier(self).best_model
+      valkyrie_model = Valkyrie.config.resource_class_resolver.call(hydra_model_name) if Hyrax.config.valkyrie_transition?
+
+      valkyrie_model ||
+        hydra_model_name&.safe_constantize ||
+        model_classifier(classifier).classifier(self).best_model
+    end
+
+    def hydra_model_name
+      @has_model ||= first('has_model_ssim')
     end
 
     def depositor(default = '')
@@ -149,10 +154,27 @@ module Hyrax
       JSON.parse(self['extensions_and_mime_types_ssm'].first).map(&:with_indifferent_access) if self['extensions_and_mime_types_ssm']
     end
 
+    def schema_version
+      self['schema_version_ssi']
+    end
+
+    def contexts
+      self['contexts_ssim']
+    end
+
+    def flexible?
+      schema_version.present?
+    end
+
+    def transcript_ids
+      self['transcript_ids_ssim']
+    end
+
     private
 
     def model_classifier(classifier)
       classifier || ActiveFedora.model_mapper
     end
   end
+  # rubocop:enable Metrics/ModuleLength
 end

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

@@ -6,7 +6,7 @@ module Hyrax
 
     included do
       # This holds the workflow state
-      property :state, predicate: Vocab::FedoraResourceStatus.objState, multiple: false
+      property :state, predicate: Vocab::FedoraResourceStatus.objState, multiple: false if respond_to?(:property)
     end
 
     ##

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

@@ -50,7 +50,7 @@ module Hyrax
     #     Hyrax::ValkyrieLazyMigration.migrating(self, from: MyWork)
     #   end
     def self.migrating(klass, from:, name_class: Hyrax::ValkyrieLazyMigration::ResourceName)
-      Wings::ModelRegistry.register(klass, from)
+      Wings::ModelRegistry.register(klass, from) if defined?(Wings::ModelRegistry)
       from.singleton_class.define_method(:migrating_from) { from }
       from.singleton_class.define_method(:migrating_to) { klass }
       klass.singleton_class.define_method(:migrating_from) { from }

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+module Hyrax
+  module WithEmbargoesAndLeases
+    extend ActiveSupport::Concern
+
+    def embargo=(value)
+      raise TypeError "can't convert #{value.class} into Hyrax::Embargo" unless value.is_a? Hyrax::Embargo
+
+      @embargo = value
+      self.embargo_id = @embargo.id
+    end
+
+    def embargo
+      return @embargo if @embargo
+      @embargo = Hyrax.query_service.find_by(id: embargo_id) if embargo_id.present?
+    end
+
+    def lease=(value)
+      raise TypeError "can't convert #{value.class} into Hyrax::Lease" unless value.is_a? Hyrax::Lease
+
+      @lease = value
+      self.lease_id = @lease.id
+    end
+
+    def lease
+      return @lease if @lease
+      @lease = Hyrax.query_service.find_by(id: lease_id) if lease_id.present?
+    end
+  end
+end

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

@@ -34,6 +34,10 @@ module Hyrax
       self.class.to_rdf_representation
     end
 
+    def flexible?
+      false
+    end
+
     module ClassMethods
       # This governs which partial to draw when you render this type of object
       def _to_partial_path # :nodoc:
@@ -43,6 +47,10 @@ module Hyrax
           "hyrax/#{collection}/#{element}"
         end
       end
+
+      def flexible?
+        false
+      end
     end
   end
 end

data/app/models/hyrax/administrative_set.rb

@@ -25,7 +25,7 @@ module Hyrax
   # @see Valkyrie query adapter's #find_inverse_references_by
   #
   class AdministrativeSet < Hyrax::Resource
-    include Hyrax::Schema(:core_metadata)
+    include Hyrax::Schema(:core_metadata) if Hyrax.config.admin_set_include_metadata?
 
     attribute :alternative_title, Valkyrie::Types::Set.of(Valkyrie::Types::String)
     attribute :creator,           Valkyrie::Types::Set.of(Valkyrie::Types::String)

data/app/models/hyrax/change_set.rb

@@ -13,7 +13,7 @@ module Hyrax
   # @example
   #   Hyrax::ChangeSet(Monograph)
   def self.ChangeSet(resource_class)
-    klass = (resource_class.to_s + "ChangeSet").safe_constantize || Hyrax::ChangeSet
+    klass = (resource_class.name + "ChangeSet").safe_constantize || Hyrax::ChangeSet
     Class.new(klass) do
       (resource_class.fields - resource_class.reserved_attributes).each do |field|
         property field, default: nil
@@ -29,6 +29,8 @@ module Hyrax
   end
 
   class ChangeSet < Valkyrie::ChangeSet
+    validates_with Hyrax::ControlledVocabularyValidator
+
     ##
     # @api public
     #