hyrax 5.0.1 → 5.0.3

data/lib/wings/converter_value_mapper.rb

@@ -246,6 +246,7 @@ module Wings
     attr_reader :attributes
 
     def initialize(attributes)
+      attributes = attributes.merge(file_name: attributes[:original_filename]) if attributes[:original_filename]
       @attributes = attributes
     end
 

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

@@ -19,7 +19,8 @@ module Wings
       # @param global_id [GlobalID] global id for a Hyrax::CollectionType
       #
       # @return [Enumerable<PcdmCollection>]
-      def find_collections_by_type(global_id:)
+      def find_collections_by_type(global_id:, **)
+        # TODO: Consider how to do this without the hard-coded Collection
         ::Collection.where(Hyrax.config.collection_type_index_field.to_sym => global_id.to_s).map(&:valkyrie_resource)
       end
     end

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

@@ -63,7 +63,7 @@ module Wings
       def find_file_metadata_by_alternate_identifier(alternate_identifier:, use_valkyrie: true)
         alternate_identifier = ::Valkyrie::ID.new(alternate_identifier).to_s
         object = Hydra::PCDM::File.find(alternate_identifier)
-        raise Hyrax::ObjectNotFoundError if object.new_record?
+        raise Hyrax::ObjectNotFoundError if object.new_record? || object.empty?
 
         if use_valkyrie == false
           warn_about_deprecation
@@ -108,7 +108,7 @@ module Wings
       #
       def find_many_file_metadata_by_use(resource:, use:, use_valkyrie: true)
         pcdm_files = find_many_file_metadata_by_ids(ids: resource.file_ids, use_valkyrie: false)
-        pcdm_files.select! { |pcdm_file| pcdm_file.metadata_node.type.include?(use) }
+        pcdm_files.select! { |pcdm_file| !pcdm_file.empty? && pcdm_file.metadata_node.type.include?(use) }
 
         if use_valkyrie == false
           warn_about_deprecation

data/lib/wings/setup.rb

@@ -127,9 +127,18 @@ custom_queries.each do |query_handler|
   Valkyrie.config.metadata_adapter.query_service.custom_queries.register_query_handler(query_handler)
 end
 
-Wings::ModelRegistry.register(Hyrax::AccessControl,     Hydra::AccessControl)
-Wings::ModelRegistry.register(Hyrax::AdministrativeSet, AdminSet)
-Wings::ModelRegistry.register(Hyrax::PcdmCollection,    ::Collection)
+Valkyrie.config.resource_class_resolver = lambda do |resource_klass_name|
+  return resource_klass_name.constantize unless defined?(Wings)
+  klass_name = resource_klass_name.gsub(/Resource$/, '')
+  # Second one should throw a name error because we do not know what you want if
+  # it isn't one of these two options
+  klass = klass_name.safe_constantize || resource_klass_name.constantize
+  Wings::ModelRegistry.reverse_lookup(klass) || klass
+end
+
+Wings::ModelRegistry.register(Hyrax::AccessControl, Hydra::AccessControl)
+Wings::ModelRegistry.register(Hyrax.config.admin_set_class_for_wings, AdminSet)
+Wings::ModelRegistry.register(Hyrax.config.collection_class_for_wings, ::Collection)
 Wings::ModelRegistry.register(Hyrax::FileSet,           FileSet)
 Wings::ModelRegistry.register(Hyrax::Embargo,           Hydra::AccessControls::Embargo)
 Wings::ModelRegistry.register(Hyrax::Lease,             Hydra::AccessControls::Lease)

data/lib/wings/transformer_value_mapper.rb

@@ -49,8 +49,12 @@ module Wings
     end
 
     ##
-    # @return [RDF::Term]
+    # Valkyrie objects contain a URI string for location objects so we need
+    # to return just the string for mapping from Fedora
+    #
+    # @return [RDF::Term || String]
     def result
+      return value.id if value.is_a?(Hyrax::ControlledVocabularies::Location)
       value.to_term
     end
   end

data/lib/wings/valkyrie/persister.rb

@@ -24,7 +24,8 @@ module Wings
       # @param [Valkyrie::Resource] resource
       # @param [Boolean] perform_af_validation
       # @return [Valkyrie::Resource] the persisted/updated resource
-      def save(resource:, perform_af_validation: false)
+      # rubocop:disable Lint/UnusedMethodArgument
+      def save(resource:, perform_af_validation: false, external_resource: false)
         af_object = resource_factory.from_resource(resource: resource)
 
         check_lock_tokens(af_object: af_object, resource: resource)
@@ -43,6 +44,7 @@ module Wings
 
         raise FailedSaveError.new(err.message, obj: af_object)
       end
+      # rubocop:enable Lint/UnusedMethodArgument
 
       # Persists a resource using ActiveFedora
       # @param [Valkyrie::Resource] resource

data/template.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
-gem 'hyrax', '5.0.1'
+gem 'hyrax', '5.0.3'
 run 'bundle install'
 generate 'hyrax:install', '-f'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.3
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-29 00:00:00.000000000 Z
+date: 2025-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: breadcrumbs_on_rails
   requirement: !ruby/object:Gem::Requirement
@@ -166,16 +166,16 @@ dependencies:
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
@@ -322,6 +322,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: google-analytics-data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: hydra-derivatives
   requirement: !ruby/object:Gem::Requirement
@@ -528,16 +542,16 @@ dependencies:
   name: openseadragon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: posix-spawn
   requirement: !ruby/object:Gem::Requirement
@@ -744,14 +758,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: view_component
   requirement: !ruby/object:Gem::Requirement
@@ -1106,11 +1120,12 @@ email:
 - escowles@ticklefish.org
 executables:
 - db-migrate-seed.sh
-- db-wait.sh
 - dev-entrypoint.sh
 - hyrax-entrypoint.sh
+- service-wait.sh
 - solrcloud-assign-configset.sh
 - solrcloud-upload-configset.sh
+- worker-entrypoint.sh
 extensions: []
 extra_rdoc_files: []
 files:
@@ -1141,10 +1156,12 @@ files:
 - ".dassie/app/controllers/application_controller.rb"
 - ".dassie/app/controllers/catalog_controller.rb"
 - ".dassie/app/controllers/concerns/.keep"
+- ".dassie/app/controllers/hyrax/generic_work_resources_controller.rb"
 - ".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/generic_work_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"
@@ -1152,18 +1169,21 @@ files:
 - ".dassie/app/helpers/hyrax_helper.rb"
 - ".dassie/app/indexers/collection_resource_indexer.rb"
 - ".dassie/app/indexers/generic_work_indexer.rb"
+- ".dassie/app/indexers/generic_work_resource_indexer.rb"
 - ".dassie/app/indexers/monograph_indexer.rb"
 - ".dassie/app/indexers/namespaced_works/nested_work_indexer.rb"
 - ".dassie/app/jobs/application_job.rb"
 - ".dassie/app/listeners/hyrax_listener.rb"
 - ".dassie/app/mailers/application_mailer.rb"
 - ".dassie/app/models/ability.rb"
+- ".dassie/app/models/admin_set_resource.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"
+- ".dassie/app/models/generic_work_resource.rb"
 - ".dassie/app/models/monograph.rb"
 - ".dassie/app/models/namespaced_works/nested_work.rb"
 - ".dassie/app/models/qa.rb"
@@ -1175,6 +1195,7 @@ files:
 - ".dassie/app/models/user.rb"
 - ".dassie/app/presenters/hyrax/generic_work_presenter.rb"
 - ".dassie/app/presenters/hyrax/namespaced_works/nested_work_presenter.rb"
+- ".dassie/app/views/hyrax/generic_work_resources/_generic_work_resource.html.erb"
 - ".dassie/app/views/hyrax/generic_works/_generic_work.html.erb"
 - ".dassie/app/views/hyrax/monographs/_monograph.html.erb"
 - ".dassie/app/views/hyrax/namespaced_works/nested_works/_nested_work.html.erb"
@@ -1222,6 +1243,7 @@ files:
 - ".dassie/config/initializers/riiif.rb"
 - ".dassie/config/initializers/simple_form.rb"
 - ".dassie/config/initializers/simple_form_bootstrap.rb"
+- ".dassie/config/initializers/wings.rb"
 - ".dassie/config/initializers/wrap_parameters.rb"
 - ".dassie/config/locales/blacklight.en.yml"
 - ".dassie/config/locales/devise.en.yml"
@@ -1247,6 +1269,7 @@ files:
 - ".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/generic_work_resource.yaml"
 - ".dassie/config/metadata/monograph.yaml"
 - ".dassie/config/metadata/sample_metadata.yaml"
 - ".dassie/config/puma.rb"
@@ -1341,6 +1364,7 @@ files:
 - ".dassie/db/migrate/20230803165135_change_work_id_to_string.rb"
 - ".dassie/db/migrate/20230808102105_add_indices_to_hyrax_counter_metrics.hyrax.rb"
 - ".dassie/db/migrate/20230821153635_add_fields_to_counter_metric.rb"
+- ".dassie/db/migrate/20240506070809_valkyrie_id_to_string.rb"
 - ".dassie/db/schema.rb"
 - ".dassie/db/seeds.rb"
 - ".dassie/lib/assets/.keep"
@@ -1368,7 +1392,10 @@ files:
 - ".dassie/solr/sample_solr_documents.yml"
 - ".dassie/spec/forms/collection_resource_form_spec.rb"
 - ".dassie/spec/indexers/collection_resource_indexer_spec.rb"
+- ".dassie/spec/indexers/generic_work_resource_indexer_spec.rb"
 - ".dassie/spec/models/collection_resource_spec.rb"
+- ".dassie/spec/models/generic_work_resource_spec.rb"
+- ".dassie/spec/views/generic_work_resources/_generic_work_resource.html.erb_spec.rb"
 - ".dassie/storage/.keep"
 - ".dassie/tmp/pids/.keep"
 - ".dassie/values.stage.yaml"
@@ -1386,8 +1413,10 @@ files:
 - ".github/release.yml"
 - ".github/stale.yml"
 - ".github/workflows/build.yml"
+- ".github/workflows/lint-build-test.yml"
 - ".github/workflows/main.yml"
 - ".github/workflows/release.yml"
+- ".github/workflows/test-results.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".koppie/.env"
@@ -1617,8 +1646,6 @@ files:
 - ".koppie/public/branding/.keep"
 - ".koppie/public/favicon.ico"
 - ".koppie/public/robots.txt"
-- ".koppie/scripts/db-migrate-seed.sh"
-- ".koppie/scripts/entrypoint.sh"
 - ".koppie/solr/conf/_rest_managed.json"
 - ".koppie/solr/conf/admin-extra.html"
 - ".koppie/solr/conf/elevate.xml"
@@ -1711,6 +1738,7 @@ files:
 - app/assets/images/unauthorized.png
 - app/assets/images/work.png
 - app/assets/images/zotero.png
+- app/assets/javascripts/hydra-editor/field_manager.es6
 - app/assets/javascripts/hyrax.js
 - app/assets/javascripts/hyrax/admin/admin_set/group_participants.es6
 - app/assets/javascripts/hyrax/admin/admin_set/participants.es6
@@ -2067,6 +2095,8 @@ files:
 - app/jobs/ingest_local_file_job.rb
 - app/jobs/inherit_permissions_job.rb
 - app/jobs/lease_expiry_job.rb
+- app/jobs/migrate_files_to_valkyrie_job.rb
+- app/jobs/migrate_resources_job.rb
 - app/jobs/resolrize_job.rb
 - app/jobs/stream_notifications_job.rb
 - app/jobs/user_edit_profile_event_job.rb
@@ -2087,6 +2117,7 @@ files:
 - app/models/concerns/hyrax/ability/permission_template_ability.rb
 - app/models/concerns/hyrax/ability/resource_ability.rb
 - app/models/concerns/hyrax/ability/solr_document_ability.rb
+- app/models/concerns/hyrax/ar_resource.rb
 - app/models/concerns/hyrax/basic_metadata.rb
 - app/models/concerns/hyrax/collection_behavior.rb
 - app/models/concerns/hyrax/core_metadata.rb
@@ -2116,6 +2147,7 @@ files:
 - app/models/concerns/hyrax/suppressible.rb
 - app/models/concerns/hyrax/user.rb
 - app/models/concerns/hyrax/user_usage_stats.rb
+- app/models/concerns/hyrax/valkyrie_lazy_migration.rb
 - app/models/concerns/hyrax/virus_check.rb
 - app/models/concerns/hyrax/with_events.rb
 - app/models/concerns/hyrax/work_behavior.rb
@@ -2302,6 +2334,12 @@ files:
 - app/services/hyrax/admin_set_member_service.rb
 - app/services/hyrax/admin_set_service.rb
 - app/services/hyrax/analytics.rb
+- app/services/hyrax/analytics/ga4.rb
+- app/services/hyrax/analytics/ga4/base.rb
+- app/services/hyrax/analytics/ga4/events.rb
+- app/services/hyrax/analytics/ga4/events_daily.rb
+- app/services/hyrax/analytics/ga4/visits.rb
+- app/services/hyrax/analytics/ga4/visits_daily.rb
 - app/services/hyrax/analytics/google.rb
 - app/services/hyrax/analytics/google/events.rb
 - app/services/hyrax/analytics/google/events_daily.rb
@@ -2485,6 +2523,7 @@ files:
 - app/services/hyrax/working_directory.rb
 - app/services/hyrax/works/managed_works_service.rb
 - app/services/hyrax/works/migration_service.rb
+- app/services/migrate_resource_service.rb
 - app/strategies/hyrax/strategies/yaml_strategy.rb
 - app/uploaders/hyrax/avatar_uploader.rb
 - app/uploaders/hyrax/uploaded_file_uploader.rb
@@ -2917,6 +2956,7 @@ files:
 - app/views/shared/_citations.html.erb
 - app/views/shared/_footer.html.erb
 - app/views/shared/_ga.html.erb
+- app/views/shared/_ga4.html.erb
 - app/views/shared/_locale_picker.html.erb
 - app/views/shared/_matomo.html.erb
 - app/views/shared/_nav_safety_modal.html.erb
@@ -2925,11 +2965,12 @@ files:
 - artifacts/entity-relationship-diagram.dot
 - artifacts/entity-relationship-diagram.pdf
 - bin/db-migrate-seed.sh
-- bin/db-wait.sh
 - bin/dev-entrypoint.sh
 - bin/hyrax-entrypoint.sh
+- bin/service-wait.sh
 - bin/solrcloud-assign-configset.sh
 - bin/solrcloud-upload-configset.sh
+- bin/worker-entrypoint.sh
 - chart/hyrax/.gitignore
 - chart/hyrax/.helmignore
 - chart/hyrax/Chart.yaml
@@ -2986,6 +3027,7 @@ files:
 - config/routes.rb
 - config/schema_org.yml
 - db/seeds.rb
+- docker-compose-dassie.yml
 - docker-compose-koppie.yml
 - docker-compose-sirenia.yml
 - docker-compose.yml
@@ -2995,6 +3037,17 @@ files:
 - documentation/note-about-versions.md
 - hyrax.gemspec
 - karma.conf.js
+- lib/freyja.rb
+- lib/freyja/custom_query_container.rb
+- lib/freyja/metadata_adapter.rb
+- lib/freyja/persister.rb
+- lib/freyja/query_service.rb
+- lib/freyja/resource_factory.rb
+- lib/frigg.rb
+- lib/frigg/custom_query_container.rb
+- lib/frigg/metadata_adapter.rb
+- lib/frigg/persister.rb
+- lib/frigg/query_service.rb
 - lib/generators/hyrax/arkivo_api_generator.rb
 - lib/generators/hyrax/assets_generator.rb
 - lib/generators/hyrax/clamav_generator.rb
@@ -3152,6 +3205,9 @@ files:
 - lib/generators/hyrax/work_resource/templates/work.rb.erb
 - lib/generators/hyrax/work_resource/templates/work_spec.rb.erb
 - lib/generators/hyrax/work_resource/work_resource_generator.rb
+- lib/goddess/custom_query_container.rb
+- lib/goddess/metadata.rb
+- lib/goddess/query.rb
 - lib/hyrax.rb
 - lib/hyrax/active_fedora_dummy_model.rb
 - lib/hyrax/administrative_set_name.rb
@@ -3190,6 +3246,7 @@ files:
 - lib/hyrax/resource_sync/resource_list_writer.rb
 - lib/hyrax/resource_sync/source_description_writer.rb
 - lib/hyrax/role_registry.rb
+- lib/hyrax/rubocop/custom_cops.rb
 - lib/hyrax/schema.rb
 - lib/hyrax/search_state.rb
 - lib/hyrax/specs/capybara.rb
@@ -3265,6 +3322,7 @@ files:
 - lib/hyrax/transactions/steps/delete_access_control.rb
 - lib/hyrax/transactions/steps/delete_all_file_metadata.rb
 - lib/hyrax/transactions/steps/delete_all_file_sets.rb
+- lib/hyrax/transactions/steps/delete_permission_template.rb
 - lib/hyrax/transactions/steps/delete_resource.rb
 - lib/hyrax/transactions/steps/ensure_admin_set.rb
 - lib/hyrax/transactions/steps/file_metadata_delete.rb
@@ -3382,7 +3440,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Samvera framework, providing a user

data/.koppie/scripts/db-migrate-seed.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-db-wait.sh "$DB_HOST:$DB_PORT"
-bundle exec rails db:create
-bundle exec rails db:migrate
-
-db-wait.sh "$SOLR_HOST:$SOLR_PORT"
-bundle exec rails db:seed

data/.koppie/scripts/entrypoint.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-mkdir -p /app/samvera/hyrax-webapp/tmp/pids
-rm -f /app/samvera/hyrax-webapp/tmp/pids/*
-
-bundle install --quiet
-
-# Run the command
-exec "$@"