hyrax 4.0.0 → 5.0.0.rc1

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

@@ -29,10 +29,15 @@ module Hyrax
         # @return [Dry::Monads::Result] `Success(work)` if the change_set is
         #   applied and the resource is saved;
         #   `Failure([#to_s, change_set.resource])`, otherwise.
+        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         def call(change_set, user: nil)
           begin
+            valid_future_date?(change_set.lease, 'lease_expiration_date') if change_set.respond_to?(:lease) && change_set.lease
+            valid_future_date?(change_set.embargo, 'embargo_release_date') if change_set.respond_to?(:embargo) && change_set.embargo
             new_collections = changed_collection_membership(change_set)
+
             unsaved = change_set.sync
+            save_lease_or_embargo(unsaved)
             saved = @persister.save(resource: unsaved)
           rescue StandardError => err
             return Failure(["Failed save on #{change_set}\n\t#{err.message}", change_set.resource])
@@ -48,9 +53,25 @@ module Hyrax
           publish_changes(resource: saved, user: user, new: unsaved.new_record, new_collections: new_collections)
           Success(saved)
         end
+        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
         private
 
+        def valid_future_date?(item, attribute)
+          raise StandardError, "#{item.model} must use a future date" if item.fields[attribute] < Time.zone.now
+        end
+
+        def save_lease_or_embargo(unsaved)
+          if unsaved.embargo.present?
+            unsaved.embargo.embargo_release_date = unsaved.embargo.embargo_release_date&.to_datetime
+            unsaved.embargo = @persister.save(resource: unsaved.embargo)
+          end
+          return if unsaved.lease.blank?
+
+          unsaved.lease.lease_expiration_date = unsaved.lease.lease_expiration_date&.to_datetime
+          unsaved.lease = @persister.save(resource: unsaved.lease)
+        end
+
         ##
         # @param [Hyrax::ChangeSet] change_set
         #

data/lib/hyrax/transactions/work_create.rb

@@ -12,6 +12,7 @@ module Hyrax
                        'change_set.ensure_admin_set',
                        'change_set.set_user_as_depositor',
                        'change_set.apply',
+                       'work_resource.apply_permission_template',
                        'work_resource.save_acl',
                        'work_resource.add_file_sets',
                        'work_resource.change_depositor',

data/lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '4.0.0'
+  VERSION = '5.0.0.rc1'
 end

data/lib/hyrax.rb

@@ -20,6 +20,7 @@ require 'hyrax/version'
 require 'hyrax/inflections'
 require 'hyrax/name'
 require 'hyrax/valkyrie_can_can_adapter'
+require 'retriable'
 require 'valkyrie/indexing_adapter'
 require 'valkyrie/indexing/solr/indexing_adapter'
 require 'valkyrie/indexing/null_indexing_adapter'

data/lib/wings/active_fedora_converter/default_work.rb

@@ -27,7 +27,7 @@ module Wings
       #
       # @return [void] apply the property
       def apply(klass)
-        return if klass.properties.keys.include?(name) ||
+        return if klass.properties.keys.include?(name.to_s) ||
                   klass.protected_property_name?(name)
         klass.send(definition_method, name, options)
       end
@@ -98,6 +98,7 @@ module Wings
       include Hyrax::Noid
       include Hyrax::Permissions
       include Hydra::AccessControls::Embargoable
+      include Hyrax::CoreMetadata
       property :nested_resource, predicate: ::RDF::URI("http://example.com/nested_resource"), class_name: "Wings::ActiveFedoraConverter::NestedResource"
 
       validates :lease_expiration_date, 'hydra/future_date': true, on: :create
@@ -118,7 +119,7 @@ module Wings
         end
 
         def to_rdf_representation
-          "Wings(#{valkyrie_class})"
+          "Wings(#{valkyrie_class})" unless valkyrie_class&.to_s&.include?('Wings(')
         end
         alias inspect to_rdf_representation
         alias to_s inspect
@@ -136,6 +137,10 @@ module Wings
         false
       end
 
+      def file_sets
+        members.select(&:file_set?)
+      end
+
       def indexing_service
         Hyrax::ValkyrieIndexer.for(resource: valkyrie_resource)
       end

data/lib/wings/active_fedora_converter/file_metadata_node.rb

@@ -29,7 +29,7 @@ module Wings
       end
 
       def to_rdf_representation
-        "Wings(#{valkyrie_class})"
+        "Wings(#{valkyrie_class})" unless valkyrie_class&.to_s&.include?('Wings(')
       end
       alias inspect to_rdf_representation
       alias to_s inspect

data/lib/wings/active_fedora_converter.rb

@@ -18,7 +18,7 @@ module Wings
   #
   # @note the `Valkyrie::Resource` object passed to this class **must** have an
   #   `#internal_resource` mapping it to an `ActiveFedora::Base` class.
-  class ActiveFedoraConverter
+  class ActiveFedoraConverter # rubocop:disable Metrics/ClassLength
     ##
     # Accesses the Class implemented for handling resource attributes
     # @return [Class]
@@ -93,7 +93,7 @@ module Wings
     # then the id hasn't been minted and shouldn't yet be set.
     # @return [String]
     def id
-      return resource[:id].to_s if resource[:id]&.is_a?(::Valkyrie::ID) && resource[:id].present?
+      return resource[:id].to_s if resource[:id].present? && resource[:id]&.is_a?(::Valkyrie::ID)
       return "" unless resource.respond_to?(:alternate_ids)
 
       resource.alternate_ids.first.to_s
@@ -130,6 +130,7 @@ module Wings
 
     ##
     # apply attributes to the ActiveFedora model
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
     def apply_attributes_to_model(af_object)
       case af_object
       when Hydra::AccessControl
@@ -137,15 +138,29 @@ module Wings
       when ActiveFedora::File
         add_file_attributes(af_object)
       else
-        converted_attrs = normal_attributes
-        members = Array.wrap(converted_attrs.delete(:members))
-        files = converted_attrs.delete(:files)
-        af_object.attributes = converted_attrs
-        members.empty? ? af_object.try(:ordered_members)&.clear : af_object.try(:ordered_members=, members)
-        af_object.try(:members)&.replace(members)
-        af_object.files.build_or_set(files) if files
+        parse_attributes(af_object)
       end
     end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength
+
+    def parse_attributes(af_object)
+      converted_attrs = normal_attributes
+      members = Array.wrap(converted_attrs.delete(:members))
+      files = converted_attrs.delete(:files)
+      af_object.attributes = converted_attrs
+      af_object.extracted_text = create_extrated_text(af_object) if resource.attributes[:extracted_text_id].present?
+      perform_lease_conversion(af_object: af_object, resource: resource)
+      perform_embargo_conversion(af_object: af_object, resource: resource)
+      members.empty? ? af_object.try(:ordered_members)&.clear : af_object.try(:ordered_members=, members)
+      af_object.try(:members)&.replace(members)
+      af_object.files.build_or_set(files) if files
+    end
+
+    def create_extrated_text(af_object)
+      pcdm_et_file = af_object.extracted_text.presence || af_object.create_extracted_text
+      pcdm_et_file.content = Hyrax.custom_queries.find_many_file_metadata_by_use(resource: resource, use: Hyrax::FileMetadata::Use::EXTRACTED_TEXT).first&.content
+      pcdm_et_file
+    end
 
     # Add attributes from resource which aren't AF properties into af_object
     def add_access_control_attributes(af_object)
@@ -155,11 +170,32 @@ module Wings
 
     # for files, add attributes to metadata_node, plus some other work
     def add_file_attributes(af_object)
-      af_object.metadata_node.attributes = normal_attributes
+      converted_attrs = normal_attributes
+      pcdm_use = converted_attrs.delete(:pcdm_use)
+      af_object.metadata_node.attributes = converted_attrs
+      af_object.pcdm_use = pcdm_use.first if pcdm_use.present? && pcdm_use.first.present?
       af_object.original_name = resource.original_filename
-      new_type = (resource.type - af_object.metadata_node.type.to_a).first
+      new_type = (resource.pcdm_use - af_object.metadata_node.type.to_a).first
       af_object.metadata_node.type = new_type if new_type
       af_object.mime_type = resource.mime_type
     end
+
+    def perform_lease_conversion(af_object:, resource:)
+      # TODO(#6134): af_object.lease.class has the same name as resource.lease.class; however, each class has a different object_id
+      # so a type mismatch happens. the code below coerces the one object into the other
+      return if !resource.try(:lease) || !af_object.reflections.include?(:lease) || af_object.lease&.id
+
+      resource_lease_dup = af_object.reflections.fetch(:lease).klass.new(resource.lease.attributes.except(:id, :internal_resource, :created_at, :updated_at, :new_record))
+      af_object.lease = resource_lease_dup
+    end
+
+    def perform_embargo_conversion(af_object:, resource:)
+      # TODO(#6134): af_object.embargo.class has the same name as resource.embargo.class; however, each class has a different object_id
+      # so a type mismatch happens. the code below coerces the one object into the other
+      return if !resource.try(:embargo) || !af_object.reflections.include?(:embargo) || af_object.embargo&.id
+
+      resource_embargo_dup = af_object.reflections.fetch(:embargo).klass.new(resource.embargo.attributes.except(:id, :internal_resource, :created_at, :updated_at, :new_record))
+      af_object.embargo = resource_embargo_dup
+    end
   end
 end

data/lib/wings/model_transformer.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/ClassLength
 module Wings
   ##
   # Transforms ActiveFedora models or objects into Valkyrie::Resource models or
@@ -34,7 +35,7 @@ module Wings
     #
     # @param pcdm_object [ActiveFedora::Base]
     #
-    # @return [::Valkyrie::Resource] a resource mirroiring `pcdm_object`
+    # @return [::Valkyrie::Resource] a resource mirroring `pcdm_object`
     def self.for(pcdm_object)
       new(pcdm_object: pcdm_object).build
     end
@@ -43,6 +44,7 @@ module Wings
     # Builds a `Valkyrie::Resource` equivalent to the `pcdm_object`
     #
     # @return [::Valkyrie::Resource] a resource mirroring `pcdm_object`
+    # rubocop:disable Metrics/AbcSize
     def build
       klass = cache.fetch(pcdm_object.class) do
         OrmConverter.to_valkyrie_resource_class(klass: pcdm_object.class)
@@ -53,7 +55,25 @@ module Wings
       attrs = attributes.tap { |hash| hash[:new_record] = pcdm_object.new_record? }
       attrs[:alternate_ids] = [::Valkyrie::ID.new(pcdm_object.id)] if pcdm_object.id
 
-      klass.new(**attrs).tap { |resource| ensure_current_permissions(resource) }
+      klass.new(**attrs).tap do |resource|
+        resource.lease = pcdm_object.lease&.valkyrie_resource if pcdm_object.respond_to?(:lease) && pcdm_object.lease
+        resource.embargo = pcdm_object.embargo&.valkyrie_resource if pcdm_object.respond_to?(:embargo) && pcdm_object.embargo
+        check_size(resource)
+        check_pcdm_use(resource)
+        ensure_current_permissions(resource)
+      end
+    end
+
+    def check_size(resource)
+      return unless resource.respond_to?(:recorded_size) && pcdm_object.respond_to?(:size)
+      resource.recorded_size = [pcdm_object.size.to_i]
+    end
+
+    def check_pcdm_use(resource)
+      return unless resource.respond_to?(:pcdm_use) &&
+                    pcdm_object.respond_to?(:metadata_node) &&
+                    pcdm_object&.metadata_node&.respond_to?(:type)
+      resource.pcdm_use = pcdm_object.metadata_node.type.to_a
     end
 
     def ensure_current_permissions(resource)
@@ -155,7 +175,6 @@ module Wings
     def append_embargo(attrs)
       return unless pcdm_object.try(:embargo)
       embargo_attrs = pcdm_object.embargo.attributes.symbolize_keys
-      embargo_attrs[:embargo_history] = embargo_attrs[:embargo_history].to_a
       embargo_attrs[:id] = ::Valkyrie::ID.new(embargo_attrs[:id]) if embargo_attrs[:id]
 
       attrs[:embargo] = Hyrax::Embargo.new(**embargo_attrs)
@@ -164,7 +183,6 @@ module Wings
     def append_lease(attrs)
       return unless pcdm_object.try(:lease)
       lease_attrs = pcdm_object.lease.attributes.symbolize_keys
-      lease_attrs[:lease_history] = lease_attrs[:embargo_history].to_a
       lease_attrs[:id] = ::Valkyrie::ID.new(lease_attrs[:id]) if lease_attrs[:id]
 
       attrs[:lease] = Hyrax::Lease.new(**lease_attrs)
@@ -186,3 +204,4 @@ module Wings
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

data/lib/wings/setup.rb

@@ -36,6 +36,7 @@ module ActiveFedora
     alias eql? ==
 
     def self.supports_property?(property)
+      return true if ['pcdm_use'].include?(property.to_s)
       properties.key?(property.to_s)
     end
 
@@ -46,6 +47,14 @@ module ActiveFedora
     def self.default_sort_params
       ["system_create_dtsi asc"]
     end
+
+    def pcdm_use
+      metadata.type
+    end
+
+    def pcdm_use=(value)
+      metadata.type = value
+    end
   end
 
   module WithMetadata
@@ -56,6 +65,14 @@ module ActiveFedora
       def changed_attributes
         super.except(:file_hash)
       end
+
+      def pcdm_use
+        type
+      end
+
+      def pcdm_use=(value)
+        self.type = value
+      end
     end
   end
 
@@ -102,7 +119,10 @@ custom_queries = [Hyrax::CustomQueries::Navigators::CollectionMembers,
                   Wings::CustomQueries::FindCollectionsByType,
                   Wings::CustomQueries::FindFileMetadata, # override Hyrax::CustomQueries::FindFileMetadata
                   Wings::CustomQueries::FindIdsByModel,
-                  Wings::CustomQueries::FindManyByAlternateIds] # override Hyrax::CustomQueries::FindManyByAlternateIds
+                  Wings::CustomQueries::FindManyByAlternateIds,
+                  Hyrax::CustomQueries::FindModelsByAccess,
+                  Hyrax::CustomQueries::FindCountBy,
+                  Hyrax::CustomQueries::FindByDateRange] # override Hyrax::CustomQueries::FindManyByAlternateIds
 custom_queries.each do |query_handler|
   Valkyrie.config.metadata_adapter.query_service.custom_queries.register_query_handler(query_handler)
 end

data/lib/wings/valkyrie/persister.rb

@@ -22,8 +22,9 @@ module Wings
 
       # Persists a resource using ActiveFedora
       # @param [Valkyrie::Resource] resource
+      # @param [Boolean] perform_af_validation
       # @return [Valkyrie::Resource] the persisted/updated resource
-      def save(resource:)
+      def save(resource:, perform_af_validation: false)
         af_object = resource_factory.from_resource(resource: resource)
 
         check_lock_tokens(af_object: af_object, resource: resource)
@@ -31,7 +32,8 @@ module Wings
         # the #save! api differs between ActiveFedora::Base and ActiveFedora::File objects,
         # if we get a falsey response, we expect we have a File that has failed to save due
         # to empty content
-        af_object.save! ||
+        # we disable validation on the Active Fedora object, only if validations have already been run and passed
+        af_object.save!(validate: perform_af_validation) ||
           raise(FailedSaveError.new("#{af_object.class}#save! returned non-true. It might be missing required content.", obj: af_object))
 
         resource_factory.to_resource(object: af_object)

data/package.json

@@ -6,6 +6,8 @@
     "karma-chrome-launcher": "^3.1.1",
     "karma-coffee-preprocessor": "^1.0.1",
     "karma-jasmine": "^4.0.2",
-    "karma-spec-reporter": "^0.0.34"
+    "karma-selenium-grid-launcher": "^0.3.0",
+    "karma-spec-reporter": "^0.0.34",
+    "selenium-webdriver": "^4.10.0"
   }
 }

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', '4.0.0'
+gem 'hyrax', '5.0.0.rc1'
 run 'bundle install'
 generate 'hyrax:install', '-f'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0.rc1
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-30 00:00:00.000000000 Z
+date: 2023-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1888,6 +1888,7 @@ files:
 - app/controllers/concerns/hyrax/manages_embargoes.rb
 - app/controllers/concerns/hyrax/singular_subresource_controller.rb
 - app/controllers/concerns/hyrax/themed_layout_controller.rb
+- app/controllers/concerns/hyrax/valkyrie_downloads_controller_behavior.rb
 - app/controllers/concerns/hyrax/works_controller_behavior.rb
 - app/controllers/hyrax/admin/admin_sets_controller.rb
 - app/controllers/hyrax/admin/analytics/analytics_controller.rb
@@ -1957,7 +1958,6 @@ files:
 - 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
@@ -1965,6 +1965,7 @@ files:
 - 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_batch_edit_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
@@ -2278,6 +2279,8 @@ files:
 - app/search_builders/hyrax/single_result.rb
 - app/search_builders/hyrax/single_use_link_search_builder.rb
 - app/search_builders/hyrax/stats/work_status_search_builder.rb
+- app/search_builders/hyrax/valkyrie_abstract_type_relation.rb
+- app/search_builders/hyrax/valkyrie_work_relation.rb
 - app/search_builders/hyrax/work_relation.rb
 - app/search_builders/hyrax/work_search_builder.rb
 - app/search_builders/hyrax/works_search_builder.rb
@@ -2311,7 +2314,6 @@ files:
 - app/services/hyrax/collections/collection_member_search_service.rb
 - app/services/hyrax/collections/collection_member_service.rb
 - app/services/hyrax/collections/managed_collections_service.rb
-- app/services/hyrax/collections/migration_service.rb
 - app/services/hyrax/collections/nested_collection_persistence_service.rb
 - app/services/hyrax/collections/nested_collection_query_service.rb
 - app/services/hyrax/collections/permissions_create_service.rb
@@ -2323,10 +2325,13 @@ files:
 - app/services/hyrax/custom_queries.rb
 - app/services/hyrax/custom_queries/find_access_control.rb
 - app/services/hyrax/custom_queries/find_by_collection_type.rb
+- app/services/hyrax/custom_queries/find_by_date_range.rb
 - app/services/hyrax/custom_queries/find_collections_by_type.rb
+- app/services/hyrax/custom_queries/find_count_by.rb
 - app/services/hyrax/custom_queries/find_file_metadata.rb
 - app/services/hyrax/custom_queries/find_ids_by_model.rb
 - app/services/hyrax/custom_queries/find_many_by_alternate_ids.rb
+- app/services/hyrax/custom_queries/find_models_by_access.rb
 - app/services/hyrax/custom_queries/navigators/child_collections_navigator.rb
 - app/services/hyrax/custom_queries/navigators/child_file_sets_navigator.rb
 - app/services/hyrax/custom_queries/navigators/child_filesets_navigator.rb
@@ -2337,6 +2342,7 @@ files:
 - app/services/hyrax/custom_queries/navigators/parent_work_navigator.rb
 - app/services/hyrax/database_migrator.rb
 - app/services/hyrax/default_middleware_stack.rb
+- app/services/hyrax/derivative_bucketed_storage.rb
 - app/services/hyrax/derivative_path.rb
 - app/services/hyrax/derivative_service.rb
 - app/services/hyrax/edit_permissions_service.rb
@@ -2415,6 +2421,7 @@ files:
 - app/services/hyrax/statistics/system_stats.rb
 - app/services/hyrax/statistics/term_query.rb
 - app/services/hyrax/statistics/users/over_time.rb
+- app/services/hyrax/statistics/valkyrie_query_service.rb
 - app/services/hyrax/statistics/works/by_depositor.rb
 - app/services/hyrax/statistics/works/by_resource_type.rb
 - app/services/hyrax/statistics/works/count.rb
@@ -2562,6 +2569,7 @@ files:
 - app/views/hyrax/admin/stats/show.html.erb
 - app/views/hyrax/admin/users/index.html.erb
 - app/views/hyrax/admin/workflow_roles/index.html.erb
+- app/views/hyrax/admin/workflows/_tabs.html.erb
 - app/views/hyrax/admin/workflows/index.html.erb
 - app/views/hyrax/base/_actions.html.erb
 - app/views/hyrax/base/_attribute_rows.html.erb
@@ -2578,14 +2586,11 @@ files:
 - app/views/hyrax/base/_file_manager_thumbnail.html.erb
 - app/views/hyrax/base/_form.html.erb
 - app/views/hyrax/base/_form_child_work_relationships.html.erb
-- app/views/hyrax/base/_form_collections_error.html.erb
 - app/views/hyrax/base/_form_files.html.erb
 - app/views/hyrax/base/_form_in_works.html.erb
-- app/views/hyrax/base/_form_in_works_error.html.erb
 - app/views/hyrax/base/_form_media.html.erb
 - app/views/hyrax/base/_form_member_of_collections.html.erb
 - app/views/hyrax/base/_form_metadata.html.erb
-- app/views/hyrax/base/_form_ordered_members_error.html.erb
 - app/views/hyrax/base/_form_permission.html.erb
 - app/views/hyrax/base/_form_permission_embargo.html.erb
 - app/views/hyrax/base/_form_permission_lease.html.erb
@@ -2598,7 +2603,6 @@ files:
 - app/views/hyrax/base/_form_share.html.erb
 - app/views/hyrax/base/_form_thumbnail.html.erb
 - app/views/hyrax/base/_form_visibility_component.html.erb
-- app/views/hyrax/base/_form_visibility_error.html.erb
 - app/views/hyrax/base/_guts4form.html.erb
 - app/views/hyrax/base/_items.html.erb
 - app/views/hyrax/base/_member.html.erb
@@ -3192,6 +3196,7 @@ files:
 - lib/hyrax/transactions/steps/add_to_collections.rb
 - lib/hyrax/transactions/steps/add_to_parent.rb
 - lib/hyrax/transactions/steps/apply_collection_type_permissions.rb
+- lib/hyrax/transactions/steps/apply_permission_template.rb
 - lib/hyrax/transactions/steps/change_depositor.rb
 - lib/hyrax/transactions/steps/check_for_empty_admin_set.rb
 - lib/hyrax/transactions/steps/delete_access_control.rb
@@ -3303,14 +3308,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Samvera framework, providing a user

data/app/forms/hyrax/forms/file_manager_form.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-module Hyrax
-  module Forms
-    class FileManagerForm
-      include HydraEditor::Form
-      self.terms = []
-      delegate :id, :thumbnail_id, :representative_id, :to_s, to: :model
-      attr_reader :current_ability, :request
-
-      ##
-      # @param work [Object] a work with members
-      # @param ability [::Ability] the current ability
-      # @param member_factory [Class] the member_presenter factory object to use
-      #   when constructing presenters
-      def initialize(work, ability, member_factory: MemberPresenterFactory)
-        super(work)
-        @current_ability = ability
-        @request = nil
-        @member_factory = member_factory
-      end
-
-      def version
-        model.etag
-      end
-
-      delegate :member_presenters, to: :member_presenter_factory
-
-      private
-
-      def member_presenter_factory
-        @member_factory.new(model, current_ability)
-      end
-    end
-  end
-end

data/app/services/hyrax/collections/migration_service.rb

@@ -1,113 +0,0 @@
-# frozen_string_literal: true
-module Hyrax
-  module Collections
-    ##
-    # @deprecated this migration tool should no longer be useful after Hyrax 2.1.0; Removal is planned for 4.0
-    # Responsible for migrating legacy collections.  Legacy collections are those created before Hyrax 2.1.0 and
-    # are identified by the lack of the collection having a collection type gid.
-    class MigrationService
-      # @api public
-      #
-      # Migrate all legacy collections to extended collections with collection type assigned.  Legacy collections are those
-      # created before Hyrax 2.1.0 and are identified by the lack of the collection having a collection type gid.
-      def self.migrate_all_collections
-        Deprecation.warn('This migration tool will be removed in Hyrax 4.0.0.')
-
-        Hyrax.logger.info "*** Migrating #{::Collection.count} collections"
-        ::Collection.all.each do |col|
-          migrate_collection(col)
-          Hyrax.logger.info "  migrating collection - id: #{col.id}, title: #{col.title}"
-        end
-
-        AdminSet.all.each do |adminset|
-          migrate_adminset(adminset)
-          Hyrax.logger.info "  migrating adminset - id: #{adminset.id}, title: #{adminset.title}"
-        end
-        Hyrax.logger.info "--- Migration Complete"
-      end
-
-      # @api private
-      #
-      # Migrate a single legacy collection to extended collections with collection type assigned.  Legacy collections are those
-      # created before Hyrax 2.1.0 and are identified by the lack of the collection having a collection type gid.
-      #
-      # @param collection [::Collection] collection object to be migrated
-      def self.migrate_collection(collection)
-        return if collection.collection_type_gid.present? # already migrated
-        collection.collection_type_gid = Hyrax::CollectionType.find_or_create_default_collection_type.to_global_id
-        create_permissions(collection)
-        collection.save
-      end
-      private_class_method :migrate_collection
-
-      ##
-      # @api private
-      #
-      # Migrate a single adminset to grant depositors and viewers read access to the admin set unless the grant is for
-      # registered (authenticated users) or public (anyone) groups.  The adjustment is being made to adminsets created
-      # before Hyrax 2.1.0.  Migrating twice will not adversely impact the adminset.
-      #
-      # @param adminset [AdminSet] adminset object to be migrated
-      def self.migrate_adminset(adminset)
-        Hyrax::PermissionTemplateAccess.find_or_create_by(permission_template_id: adminset.permission_template.id,
-                                                          agent_type: "group", agent_id: "admin", access: "manage")
-
-        adminset.permission_template.reset_access_controls_for(collection: adminset)
-      end
-      private_class_method :migrate_adminset
-
-      # @api public
-      #
-      # Validate that migrated collections have both the collection type gid assigned and the permission template with
-      # access created and associated with the collection.  Any collection without collection type gid as nil or assigned
-      # the default collection type are ignored.
-      def self.repair_migrated_collections
-        Deprecation.warn('This migration tool will be removed in Hyrax 4.0.0.')
-
-        Hyrax.logger.info "*** Repairing migrated collections"
-        ::Collection.all.each do |col|
-          repair_migrated_collection(col)
-          Hyrax.logger.info "  repairing collection - id: #{col.id}, title: #{col.title}"
-        end
-        AdminSet.all.each do |adminset|
-          migrate_adminset(adminset)
-          Hyrax.logger.info "  repairing adminset - id: #{adminset.id}, title: #{adminset.title}"
-        end
-        Hyrax.logger.info "--- Repairing Complete"
-      end
-
-      # @api private
-      #
-      # Validate and repair a migrated collection if needed.
-      #
-      # @param collection [::Collection] collection object to be migrated/repaired
-      def self.repair_migrated_collection(collection)
-        return if collection.collection_type_gid.present? && collection.collection_type_gid != Hyrax::CollectionType.find_or_create_default_collection_type.to_global_id
-        collection.collection_type_gid = Hyrax::CollectionType.find_or_create_default_collection_type.to_global_id
-        permission_template = Hyrax::PermissionTemplate.find_by(source_id: collection.id)
-        if permission_template.present?
-          permission_template.reset_access_controls_for(collection: collection, interpret_visibility: true)
-        else
-          create_permissions(collection)
-        end
-        collection.save
-      end
-      private_class_method :repair_migrated_collection
-
-      # @api private
-      #
-      # Determine if collection was already migrated.
-      #
-      # @param [Collection] collection object to be validated
-      def self.create_permissions(collection)
-        grants = []
-        collection.edit_groups.each { |g| grants << { agent_type: 'group', agent_id: g, access: Hyrax::PermissionTemplateAccess::MANAGE } }
-        collection.edit_users.each { |u| grants << { agent_type: 'user', agent_id: u, access: Hyrax::PermissionTemplateAccess::MANAGE } }
-        collection.read_groups.each { |g| grants << { agent_type: 'group', agent_id: g, access: Hyrax::PermissionTemplateAccess::VIEW } }
-        collection.read_users.each { |u| grants << { agent_type: 'user', agent_id: u, access: Hyrax::PermissionTemplateAccess::VIEW } }
-        Hyrax::Collections::PermissionsCreateService.create_default(collection: collection, creating_user: ::User.find_by_user_key(collection.depositor), grants: grants)
-      end
-      private_class_method :create_permissions
-    end
-  end
-end

data/app/views/hyrax/base/_form_collections_error.html.erb

@@ -1 +0,0 @@
-<%= full_collections_errors(form: f) %>