hyrax 3.4.1 → 3.5.0

data/lib/hyrax/transactions/steps/save_collection_logo.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+module Hyrax
+  module Transactions
+    module Steps
+      ##
+      # Adds logo info via `ChangeSet`.
+      #
+      # During the update collection process this step is called to update the file(s)
+      # to be used as logo(s) for the collection.
+      #
+      class SaveCollectionLogo
+        include Dry::Transaction::Operation
+
+        ##
+        # @param [Hyrax::ChangeSet] change_set
+        # @param [Array<#Integer>] update_logo_file_ids
+        # @param [Array<String>] alttext_values
+        # @param [Array<String>] linkurl_values
+        #
+        # @return [Dry::Monads::Result] `Failure` if the work fails to save;
+        #   `Success(input)`, otherwise.
+        def call(collection_resource, update_logo_file_ids: nil, alttext_values: nil, linkurl_values: nil)
+          collection_id = collection_resource.id.to_s
+          process_logo_input(collection_id: collection_id, update_logo_file_ids: update_logo_file_ids, alttext_values: alttext_values, linkurl_values: linkurl_values)
+          Success(collection_resource)
+        end
+
+        private
+
+        def process_logo_input(collection_id:, update_logo_file_ids:, alttext_values:, linkurl_values:)
+          uploaded_file_ids = update_logo_file_ids
+          public_files = []
+
+          if uploaded_file_ids.nil?
+            # all logo files were removed, so delete all files previously uploaded
+            remove_redundant_files(collection_id: collection_id, public_files: public_files)
+            return
+          end
+
+          public_files = process_logo_records(collection_id: collection_id, uploaded_file_ids: uploaded_file_ids, alttext_values: alttext_values, linkurl_values: linkurl_values)
+          remove_redundant_files(collection_id: collection_id, public_files: public_files)
+        end
+
+        def process_logo_records(collection_id:, uploaded_file_ids:, alttext_values:, linkurl_values:)
+          public_files = []
+          uploaded_file_ids.each_with_index do |ufi, i|
+            # If the user has chosen a new logo, the ufi will be an integer
+            # If the logo was previously chosen, the ufi will be a path
+            # If it is a path, update the rec, else create a new rec
+            if !ufi.match(/\D/).nil?
+              update_logo_info(collection_id: collection_id, uploaded_file_id: ufi, alttext: alttext_values[i], linkurl: verify_linkurl(linkurl_values[i]))
+              public_files << ufi
+            else # brand new one, insert in the database
+              logo_info = create_logo_info(collection_id: collection_id, uploaded_file_id: ufi, alttext: alttext_values[i], linkurl: verify_linkurl(linkurl_values[i]))
+              public_files << logo_info.local_path
+            end
+          end
+          public_files
+        end
+
+        def update_logo_info(collection_id:, uploaded_file_id:, alttext:, linkurl:)
+          logo_info = CollectionBrandingInfo.where(collection_id: collection_id).where(role: "logo").where(local_path: uploaded_file_id.to_s).first
+          logo_info.alt_text = alttext
+          logo_info.target_url = linkurl
+          logo_info.local_path = uploaded_file_id
+          logo_info.save(uploaded_file_id, false)
+        end
+
+        def create_logo_info(collection_id:, uploaded_file_id:, alttext:, linkurl:)
+          file = uploaded_files(uploaded_file_id)
+          logo_info = CollectionBrandingInfo.new(
+            collection_id: collection_id,
+            filename: File.split(file.file_url).last,
+            role: "logo",
+            alt_txt: alttext,
+            target_url: linkurl
+          )
+          logo_info.save file.file_url
+          logo_info
+        end
+
+        def uploaded_files(uploaded_file_ids)
+          return [] if uploaded_file_ids.empty?
+          UploadedFile.find(uploaded_file_ids)
+        end
+
+        def remove_redundant_files(collection_id:, public_files:)
+          # remove any public ones that were not included in the selection.
+          logos_info = CollectionBrandingInfo.where(collection_id: collection_id).where(role: "logo")
+          logos_info.each do |logo_info|
+            logo_info.delete(logo_info.local_path) unless public_files.include? logo_info.local_path
+            logo_info.destroy unless public_files.include? logo_info.local_path
+          end
+        end
+
+        # Only accept HTTP|HTTPS urls;
+        # @return <String> the url
+        def verify_linkurl(linkurl)
+          url = Loofah.scrub_fragment(linkurl, :prune).to_s
+          url if valid_url?(url)
+        end
+
+        def valid_url?(url)
+          (url =~ URI.regexp(['http', 'https']))
+        end
+      end
+    end
+  end
+end

data/lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '3.4.1'
+  VERSION = '3.5.0'
 end

data/lib/wings/active_fedora_converter/file_metadata_node.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Wings
+  class ActiveFedoraConverter
+    def self.FileMetadataNode(resource_class) # rubocop:disable Naming/MethodName
+      class_cache[resource_class] ||= Class.new(FileMetadataNode) do
+        self.valkyrie_class = resource_class
+
+        # skip reserved attributes, we assume we don't need to translate valkyrie internals
+        schema = resource_class.schema.reject do |key|
+          resource_class.reserved_attributes.include?(key.name) ||
+            key.name == :size
+        end
+
+        Wings::ActiveFedoraConverter.apply_properties(self, schema)
+      end
+    end
+  end
+
+  class FileMetadataNode < ActiveFedora::Base
+    property :file_set_id, predicate: ::RDF::URI.intern("http://hyrax.samvera.org/ns/wings#file_set_id")
+    property :file_identifier, predicate: ::RDF::URI.intern("http://hyrax.samvera.org/ns/wings#file_identifier")
+
+    class_attribute :valkyrie_class
+
+    class << self
+      def model_name(*)
+        Hyrax::Name.new(valkyrie_class)
+      end
+
+      def to_rdf_representation
+        "Wings(#{valkyrie_class})"
+      end
+      alias inspect to_rdf_representation
+      alias to_s inspect
+    end
+
+    def indexing_service
+      Hyrax::ValkyrieIndexer.for(resource: valkyrie_resource)
+    end
+
+    def to_solr
+      super.tap do |doc|
+        doc[:file_identifier_ssim] = file_identifier
+      end
+    end
+  end
+end

data/lib/wings/active_fedora_converter/instance_builder.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Wings
+  class ActiveFedoraConverter
+    ##
+    # Constructs an instance for the given converter. +converter+ must provide
+    # an +id+, +resource+, and +active_fedora_class+.
+    #
+    # This interface allows handling for special cases based on the target
+    # class, instance data for +resource+, or the id format. This originated as
+    # an extraction of some such special handling from the converter code.
+    class InstanceBuilder
+      ##
+      # @!attribute [r] converter
+      #   @return [#active_fedora_class, #id, #resource]
+      # @!attribute [r] resource
+      #   @return [Valkyrie::Resource]
+      attr_reader :converter, :resource
+
+      ##
+      # @param [#active_fedora_class, #id, #resource]
+      def initialize(converter)
+        @converter = converter
+        @resource = converter.resource
+      end
+
+      ##
+      # @return [ActiveFedora::Common]
+      def build
+        if builds_file_metadata? && !builds_metadata_for_active_fedora_file?
+          # convert to a generic/generated FileMetadataNode class with
+          # properties matching the source class
+          Wings::ActiveFedoraConverter::FileMetadataNode(resource.class)
+                                      .new(file_identifier: Array(resource.file_identifier)
+            .map(&:to_s))
+        elsif converter.id.present?
+          converter.active_fedora_class.find(converter.id)
+        else
+          converter.active_fedora_class.new
+        end
+      rescue ActiveFedora::ObjectNotFoundError
+        converter.active_fedora_class.new
+      end
+
+      ##
+      # @return [Boolean]
+      def builds_file_metadata?
+        resource.try(:file_identifier).present?
+      end
+
+      ##
+      # @return [Boolean]
+      def builds_metadata_for_active_fedora_file?
+        return false unless builds_file_metadata?
+
+        adapter_for_file = begin
+                             ::Valkyrie::StorageAdapter.adapter_for(id: resource.file_identifier)
+                           rescue ::Valkyrie::StorageAdapter::AdapterNotFoundError => err
+                             Hyrax.logger.warn "Processing a FileMetadata (id: #{converter.id}) referencing " \
+                                               "a file #{resource.file_identifier}; could not find a " \
+                                               "storage adapter to handle that file.\n\t#{err.message}"
+                           end
+
+        adapter_for_file.is_a?(::Valkyrie::Storage::Fedora)
+      end
+    end
+  end
+end

data/lib/wings/active_fedora_converter.rb

@@ -2,6 +2,8 @@
 
 require 'wings/converter_value_mapper'
 require 'wings/active_fedora_converter/default_work'
+require 'wings/active_fedora_converter/file_metadata_node'
+require 'wings/active_fedora_converter/instance_builder'
 require 'wings/active_fedora_converter/nested_resource'
 
 module Wings
@@ -100,9 +102,7 @@ module Wings
     private
 
     def instance
-      id.present? ? active_fedora_class.find(id) : active_fedora_class.new
-    rescue ActiveFedora::ObjectNotFoundError
-      active_fedora_class.new
+      InstanceBuilder.new(self).build
     end
 
     def attributes_class

data/lib/wings/services/custom_queries/find_file_metadata.rb

@@ -33,7 +33,20 @@ module Wings
       #
       # @raise [Hyrax::ObjectNotFoundError]
       def find_file_metadata_by(id:, use_valkyrie: true)
-        find_file_metadata_by_alternate_identifier(alternate_identifier: id, use_valkyrie: use_valkyrie)
+        fcrepo_flag =
+          begin
+            ::Valkyrie::StorageAdapter.adapter_for(id: id).is_a?(::Valkyrie::Storage::Fedora)
+          rescue ::Valkyrie::StorageAdapter::AdapterNotFoundError
+            true # assume fcrepo if we can't find an adapter
+          end
+
+        if fcrepo_flag
+          find_file_metadata_by_alternate_identifier(alternate_identifier: id, use_valkyrie: use_valkyrie)
+        else
+          result = ActiveFedora::Base.where(file_identifier_ssim: id.to_s).first ||
+                   raise(Hyrax::ObjectNotFoundError)
+          result.valkyrie_resource
+        end
       end
 
       # Find a Hyrax::FileMetadata using an alternate ID, and map it to a
@@ -48,8 +61,8 @@ module Wings
       #
       # @raise [Hyrax::ObjectNotFoundError]
       def find_file_metadata_by_alternate_identifier(alternate_identifier:, use_valkyrie: true)
-        alternate_identifier = ::Valkyrie::ID.new(alternate_identifier)
-        object = Hydra::PCDM::File.find(alternate_identifier.to_s)
+        alternate_identifier = ::Valkyrie::ID.new(alternate_identifier).to_s
+        object = Hydra::PCDM::File.find(alternate_identifier)
         raise Hyrax::ObjectNotFoundError if object.new_record?
 
         if use_valkyrie == false
@@ -73,11 +86,9 @@ module Wings
       #   if there are no ids or none of the ids map to Hyrax::FileMetadata
       def find_many_file_metadata_by_ids(ids:, use_valkyrie: true)
         ids.each_with_object([]) do |alt_id, results|
-          begin
-            results << find_file_metadata_by_alternate_identifier(alternate_identifier: alt_id, use_valkyrie: use_valkyrie)
-          rescue Hyrax::ObjectNotFoundError
-            next
-          end
+          results << find_file_metadata_by_alternate_identifier(alternate_identifier: alt_id, use_valkyrie: use_valkyrie)
+        rescue Hyrax::ObjectNotFoundError
+          next
         end
       end
 

data/lib/wings/valkyrie/query_service.rb

@@ -86,12 +86,10 @@ module Wings
         return enum_for(:find_many_by_ids, ids: ids) unless block_given?
 
         ids.map(&:to_s).uniq.each do |id|
-          begin
-            af_object = ActiveFedora::Base.find(id)
-            yield resource_factory.to_resource(object: af_object)
-          rescue ::ActiveFedora::ObjectNotFoundError, Ldp::Gone
-            next
-          end
+          af_object = ActiveFedora::Base.find(id)
+          yield resource_factory.to_resource(object: af_object)
+        rescue ::ActiveFedora::ObjectNotFoundError, Ldp::Gone
+          next
         end
       end
 

data/lib/wings/valkyrie/storage.rb

@@ -73,7 +73,7 @@ module Wings
             version_graph.query([uri, RDF::Vocab::Fcrepo4.created, :created])
                          .first_object
                          .object
-          Version.new(cast_to_valkyrie_id(uri.to_s), timestamp, self)
+          Version.new(id: cast_to_valkyrie_id(uri.to_s), created: timestamp, adapter: self)
         end.sort
       end
 
@@ -86,7 +86,7 @@ module Wings
       # this implementation uses an orderable {#version_token}. in practice
       # the token is the fcrepo created date for the version, as extracted from
       # the versions graph.
-      Version = Struct.new(:id, :version_token, :adapter) do
+      Version = Struct.new("Version", :id, :created, :adapter, keyword_init: true) do
         include Comparable
 
         ##
@@ -95,6 +95,10 @@ module Wings
           adapter.find_by(id: id)
         end
 
+        def version_token
+          created
+        end
+
         def <=>(other)
           raise ArgumentError unless other.respond_to?(:version_token)
           version_token <=> other.version_token

data/template.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 # Hack for https://github.com/rails/rails/issues/35153
 gsub_file 'Gemfile', /^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.0"'
-gem 'hyrax', '3.4.1'
+gem 'hyrax', '3.5.0'
 run 'bundle install'
 generate 'hyrax:install', '-f'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.5.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -224,6 +224,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: dry-monads
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: dry-transaction
   requirement: !ruby/object:Gem::Requirement
@@ -424,6 +438,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: json-ld
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
@@ -584,6 +612,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: qa
   requirement: !ruby/object:Gem::Requirement
@@ -646,6 +688,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -768,16 +824,16 @@ dependencies:
   name: tinymce-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: valkyrie
   requirement: !ruby/object:Gem::Requirement
@@ -1102,20 +1158,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 5.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 5.0.2
 - !ruby/object:Gem::Dependency
   name: shoulda-callback-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -1234,11 +1290,13 @@ files:
 - ".dassie/app/controllers/hyrax/generic_works_controller.rb"
 - ".dassie/app/controllers/hyrax/monographs_controller.rb"
 - ".dassie/app/controllers/hyrax/namespaced_works/nested_works_controller.rb"
+- ".dassie/app/forms/collection_resource_form.rb"
 - ".dassie/app/forms/hyrax/generic_work_form.rb"
 - ".dassie/app/forms/hyrax/namespaced_works/nested_work_form.rb"
 - ".dassie/app/forms/monograph_form.rb"
 - ".dassie/app/helpers/application_helper.rb"
 - ".dassie/app/helpers/hyrax_helper.rb"
+- ".dassie/app/indexers/collection_resource_indexer.rb"
 - ".dassie/app/indexers/generic_work_indexer.rb"
 - ".dassie/app/indexers/monograph_indexer.rb"
 - ".dassie/app/indexers/namespaced_works/nested_work_indexer.rb"
@@ -1247,6 +1305,7 @@ files:
 - ".dassie/app/models/ability.rb"
 - ".dassie/app/models/application_record.rb"
 - ".dassie/app/models/collection.rb"
+- ".dassie/app/models/collection_resource.rb"
 - ".dassie/app/models/concerns/.keep"
 - ".dassie/app/models/file_set.rb"
 - ".dassie/app/models/generic_work.rb"
@@ -1296,6 +1355,7 @@ files:
 - ".dassie/config/initializers/clamav.rb"
 - ".dassie/config/initializers/cookies_serializer.rb"
 - ".dassie/config/initializers/devise.rb"
+- ".dassie/config/initializers/file_services.rb"
 - ".dassie/config/initializers/filter_parameter_logging.rb"
 - ".dassie/config/initializers/hydra_config.rb"
 - ".dassie/config/initializers/hyrax.rb"
@@ -1330,6 +1390,7 @@ files:
 - ".dassie/config/locales/namespaced_works/nested_work.it.yml"
 - ".dassie/config/locales/namespaced_works/nested_work.pt-BR.yml"
 - ".dassie/config/locales/namespaced_works/nested_work.zh.yml"
+- ".dassie/config/metadata/collection_resource.yaml"
 - ".dassie/config/metadata/monograph.yaml"
 - ".dassie/config/metadata/sample_metadata.yaml"
 - ".dassie/config/puma.rb"
@@ -1445,6 +1506,9 @@ files:
 - ".dassie/solr/conf/xslt/example_rss.xsl"
 - ".dassie/solr/conf/xslt/luke.xsl"
 - ".dassie/solr/sample_solr_documents.yml"
+- ".dassie/spec/forms/collection_resource_form_spec.rb"
+- ".dassie/spec/indexers/collection_resource_indexer_spec.rb"
+- ".dassie/spec/models/collection_resource_spec.rb"
 - ".dassie/storage/.keep"
 - ".dassie/tmp/pids/.keep"
 - ".dassie/values.stage.yaml"
@@ -1761,17 +1825,22 @@ files:
 - app/forms/hyrax/forms/batch_upload_form.rb
 - app/forms/hyrax/forms/collection_form.rb
 - app/forms/hyrax/forms/dashboard/nest_collection_form.rb
+- app/forms/hyrax/forms/embargo.rb
 - app/forms/hyrax/forms/failed_submission_form_wrapper.rb
 - app/forms/hyrax/forms/file_manager_form.rb
 - app/forms/hyrax/forms/file_set_edit_form.rb
 - app/forms/hyrax/forms/file_set_form.rb
+- app/forms/hyrax/forms/lease.rb
 - app/forms/hyrax/forms/pcdm_collection_form.rb
+- app/forms/hyrax/forms/pcdm_object_form.rb
 - app/forms/hyrax/forms/permission.rb
 - app/forms/hyrax/forms/permission_template_form.rb
 - app/forms/hyrax/forms/resource_form.rb
 - app/forms/hyrax/forms/widgets/admin_set_embargo_period.rb
 - app/forms/hyrax/forms/widgets/admin_set_visibility.rb
+- app/forms/hyrax/forms/work_embargo_form.rb
 - app/forms/hyrax/forms/work_form.rb
+- app/forms/hyrax/forms/work_lease_form.rb
 - app/forms/hyrax/forms/workflow_action_form.rb
 - app/forms/hyrax/forms/workflow_responsibility_form.rb
 - app/helpers/hyrax/ability_helper.rb
@@ -2150,6 +2219,7 @@ files:
 - app/services/hyrax/ensure_well_formed_admin_set_service.rb
 - app/services/hyrax/file_set_csv_service.rb
 - app/services/hyrax/file_set_derivatives_service.rb
+- app/services/hyrax/file_set_file_service.rb
 - app/services/hyrax/file_set_fixity_check_service.rb
 - app/services/hyrax/file_set_type_service.rb
 - app/services/hyrax/file_set_visibility_propagator.rb
@@ -2227,6 +2297,8 @@ files:
 - app/services/hyrax/time_service.rb
 - app/services/hyrax/tolerant_select_service.rb
 - app/services/hyrax/user_stat_importer.rb
+- app/services/hyrax/valkyrie_persist_derivatives.rb
+- app/services/hyrax/valkyrie_upload.rb
 - app/services/hyrax/versioning_service.rb
 - app/services/hyrax/virus_checker_service.rb
 - app/services/hyrax/visibility_intention.rb
@@ -2237,6 +2309,7 @@ files:
 - app/services/hyrax/visibility_writer.rb
 - app/services/hyrax/work_form_service.rb
 - app/services/hyrax/work_query_service.rb
+- app/services/hyrax/work_resource_query_service.rb
 - app/services/hyrax/work_thumbnail_path_service.rb
 - app/services/hyrax/work_uploads_handler.rb
 - app/services/hyrax/workflow/abstract_notification.rb
@@ -2303,7 +2376,6 @@ files:
 - app/views/catalog/_index_gallery_collection_wrapper.html.erb
 - app/views/catalog/_index_header_list_collection.html.erb
 - app/views/catalog/_index_header_list_default.html.erb
-- app/views/catalog/_index_header_list_hyrax_pcdm_collection.html.erb
 - app/views/catalog/_index_list_default.html.erb
 - app/views/catalog/_search_form.html.erb
 - app/views/catalog/_thumbnail_list_collection.html.erb
@@ -2748,7 +2820,7 @@ files:
 - config/initializers/listeners.rb
 - config/initializers/nesting_indexer_initializer.rb
 - config/initializers/simple_form.rb
-- config/initializers/valkryrie_storage.rb
+- config/initializers/storage_adapter_initializer.rb
 - config/initializers/valkyrie_id_equality.rb
 - config/locales/hyrax.de.yml
 - config/locales/hyrax.en.yml
@@ -2766,6 +2838,7 @@ files:
 - config/locales/simple_form.zh.yml
 - config/metadata/basic_metadata.yaml
 - config/metadata/core_metadata.yaml
+- config/metadata/file_set_metadata.yaml
 - config/routes.rb
 - config/schema_org.yml
 - db/seeds.rb
@@ -2778,6 +2851,15 @@ files:
 - lib/generators/hyrax/assets_generator.rb
 - lib/generators/hyrax/clamav_generator.rb
 - lib/generators/hyrax/collection_generator.rb
+- lib/generators/hyrax/collection_resource/USAGE
+- lib/generators/hyrax/collection_resource/collection_resource_generator.rb
+- lib/generators/hyrax/collection_resource/templates/collection.rb.erb
+- lib/generators/hyrax/collection_resource/templates/collection_form.rb.erb
+- lib/generators/hyrax/collection_resource/templates/collection_form_spec.rb.erb
+- lib/generators/hyrax/collection_resource/templates/collection_indexer.rb.erb
+- lib/generators/hyrax/collection_resource/templates/collection_indexer_spec.rb.erb
+- lib/generators/hyrax/collection_resource/templates/collection_metadata.yaml
+- lib/generators/hyrax/collection_resource/templates/collection_spec.rb.erb
 - lib/generators/hyrax/config_generator.rb
 - lib/generators/hyrax/health_check_generator.rb
 - lib/generators/hyrax/install_generator.rb
@@ -2996,6 +3078,8 @@ files:
 - lib/hyrax/transactions/steps/remove_file_set_from_work.rb
 - lib/hyrax/transactions/steps/save.rb
 - lib/hyrax/transactions/steps/save_access_control.rb
+- lib/hyrax/transactions/steps/save_collection_banner.rb
+- lib/hyrax/transactions/steps/save_collection_logo.rb
 - lib/hyrax/transactions/steps/save_work.rb
 - lib/hyrax/transactions/steps/set_collection_type_gid.rb
 - lib/hyrax/transactions/steps/set_default_admin_set.rb
@@ -3036,6 +3120,8 @@ files:
 - lib/wings/active_fedora_classifier.rb
 - lib/wings/active_fedora_converter.rb
 - lib/wings/active_fedora_converter/default_work.rb
+- lib/wings/active_fedora_converter/file_metadata_node.rb
+- lib/wings/active_fedora_converter/instance_builder.rb
 - lib/wings/active_fedora_converter/nested_resource.rb
 - lib/wings/attribute_transformer.rb
 - lib/wings/converter_value_mapper.rb
@@ -3098,7 +3184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.6
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Samvera framework, providing a user

data/app/views/catalog/_index_header_list_hyrax_pcdm_collection.html.erb

@@ -1,4 +0,0 @@
-<div class="search-results-title-row">
-  <h3 class="search-result-title"><%= link_to document.title_or_label, [hyrax, document] %></h3>
-  <%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>
-</div>