hyrax 5.2.0 → 5.3.0

data/chart/hyrax/values.yaml

@@ -235,7 +235,7 @@ fcrepo:
   postgresql:
     enabled: false
     image:
-      repository: bitnami/postgresql
+      repository: bitnamilegacy/postgresql
       tag: 12.17.0-debian-11-r28
 
 # configuration for an external/existing fits service;
@@ -252,13 +252,13 @@ fits:
 memcached:
   enabled: false
   image:
-    repository: bitnami/memcached
+    repository: bitnamilegacy/memcached
     tag: 1.6.15-debian-11-r12
 
 minio:
   enabled: false
   image:
-    repository: bitnami/minio
+    repository: bitnamilegacy/minio
     tag: 2022.7.4-debian-11-r0
   auth:
     rootUser: hyrax-access-key
@@ -270,7 +270,7 @@ minio:
 postgresql:
   enabled: true
   image:
-    repository: bitnami/postgresql
+    repository: bitnamilegacy/postgresql
     tag: 12.11.0-debian-11-r12
   auth:
     database: hyrax
@@ -292,7 +292,7 @@ postgresql:
 nginx:
   enabled: false
   image:
-    repository: bitnami/nginx
+    repository: bitnamilegacy/nginx
     tag: 1.23.0-debian-11-r1
   # this needs to be set since templates/ingress.yaml tries to
   # evaluate .Values.nginx.service.port, and it needs to at least evaluate to
@@ -430,11 +430,10 @@ nginx:
   #       }
   #   }
 
-
 redis:
   enabled: true
   image:
-    repository: bitnami/redis
+    repository: bitnamilegacy/redis
     tag: 7.0.2-debian-11-r7
   auth:
     password: mysecret
@@ -442,7 +441,7 @@ redis:
 solr:
   enabled: true
   image:
-    repository: bitnami/solr
+    repository: bitnamilegacy/solr
     tag: 8.11.2-debian-11-r4
   containerPorts:
     http: 8983
@@ -458,6 +457,9 @@ solr:
     enabled: true
   zookeeper:
     enabled: true
+    image:
+      repository: bitnamilegacy/zookeeper
+      tag: 3.8.2-debian-11-r9
     persistence:
       enabled: true
 

data/config/features.rb

@@ -11,6 +11,16 @@ Flipflop.configure do
             default: false,
             description: "Use Rails.cache to cache the JSON document for IIIF manifests"
 
+    feature :iiif_av,
+            title: "IIIF A/V Support",
+            default: false,
+            description: "Enable support for A/V content in IIIF v3 manifests."
+
+    feature :iiif_pdf,
+            title: "IIIF PDF Support",
+            default: false,
+            description: "Enable support for PDF content in IIIF v3 manifests."
+
     feature :hide_private_items,
             default: false,
             description: "Do not show the private items."
@@ -26,6 +36,10 @@ Flipflop.configure do
     feature :read_only,
             default: false,
             description: "Put the system into read-only mode. Deposits, edits, approvals and anything that makes a change to the data will be disabled."
+
+    feature :validate_local_controlled_vocabulary,
+            default: false,
+            description: "Validate local controlled vocabulary."
   end
 
   group :repository_management do
@@ -56,6 +70,19 @@ Flipflop.configure do
             description: "Depositors may transfer their works to another user"
   end
 
+  group :experimental_features do
+    # See documentation/redirects.md for the redirects feature.
+    if Hyrax.config.redirects_enabled?
+      feature :redirects,
+              default: false,
+              description: "Enable per-record URL redirects from legacy paths to the canonical Hyku URL."
+    end
+
+    feature :copy_permalink_button,
+            default: false,
+            description: "Show a 'Copy permalink' button on work and collection show pages that copies the record's canonical UUID-based URL to the clipboard."
+  end
+
 rescue Flipflop::StrategyError, Flipflop::FeatureError => err
   Hyrax.logger.warn "Ignoring #{err}: #{err.message}"
 end

data/config/initializers/blacklight_dynamic_sitemap.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+require 'hyrax/model_registry'
+
+def build_model_exclusion_filter
+  classes_to_exclude = Hyrax::ModelRegistry.file_set_class_names + Hyrax::ModelRegistry.admin_set_class_names + ["Hyrax::FileMetadata"]
+  classes_to_exclude.map! { |klass| klass.gsub(/^::/, '') }.uniq!
+  "-has_model_ssim:(\"#{classes_to_exclude.join('" OR "')}\")"
+end
+
+BlacklightDynamicSitemap::Engine.config.tap do |config|
+  config.unique_id_field = 'id'
+
+  model_exclusion_filter = build_model_exclusion_filter
+  config.modify_show_params = lambda { |_id, default_params|
+    default_params.merge(
+      fl: "#{default_params[:fl]},has_model_ssim",
+      fq: (default_params[:fq] || []) + [
+        'read_access_group_ssim:public',
+        model_exclusion_filter
+      ]
+    )
+  }
+  config.modify_index_params = lambda { |default_params|
+    default_params.merge(
+      fq: (default_params[:fq] || []) + [
+        'read_access_group_ssim:public',
+        model_exclusion_filter
+      ]
+    )
+  }
+end
+
+Rails.application.config.after_initialize do
+  # New UUID-based apps can use the id field directly for efficient sitemap generation.
+  # Apps using Noids need to add hashed_id_ssi to Solr (see gem documentation).
+  BlacklightDynamicSitemap::Engine.config.hashed_id_field = if Hyrax.config.enable_noids?
+                                                              # Noid IDs use alphanumeric characters - need separate hashed field
+                                                              'hashed_id_ssi'
+                                                            else
+                                                              # UUID IDs are hex-based - can use id field directly
+                                                              'id'
+                                                            end
+end

data/config/initializers/deprecation_patch.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+#
+# OVERRIDE deprecation v1.1.0  – handle calls using either the deprecation gem method signature
+#                                or newer Rails method signatues.
+#                                see: https://github.com/samvera/hyrax/issues/7303
+# Remove when: dependencies no longer pull in the deprecation gem
+
+module Deprecation
+  module DeprecationWarningPatch
+    def warn(*args)
+      # if the first argument being passed is a string,
+      # the caller is using the Rails-style signature,
+      # so we need to pass a dummy first argument to
+      # the older gem method
+      if args.first.is_a?(String)
+        super(nil, *args)
+      else
+        super(*args)
+      end
+    end
+  end
+end
+
+using_deprecation_gem = Object.const_source_location('Deprecation').first.match?('gems/deprecation')
+
+# Only patch if we're using the separate deprecation gem
+Deprecation.singleton_class.prepend(Deprecation::DeprecationWarningPatch) if using_deprecation_gem

data/config/initializers/hydra_works.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+Hydra::Works::Characterization.mapper[:original_checksum] = :checksum

data/config/initializers/i18n_extensions.rb

@@ -0,0 +1,197 @@
+# frozen_string_literal: true
+
+# Extensions to the I18n module to enable reverse lookup of translation keys by their values
+# This is useful for debugging, testing, and finding where specific text comes from in the codebase
+module I18n
+  class << self
+    # Find translation key(s) that have a specific value
+    # @param value [String] The translation value to search for
+    # @param locale [Symbol] The locale to search in (defaults to current locale)
+    # @param scope [String, Symbol, Array] Optional scope to limit search
+    # @param exact [Boolean] Whether to match exactly or use partial matching (default: true)
+    # @return [Array<String>] Array of matching key paths
+    def find_keys_by_value(value, locale: I18n.locale, scope: nil, exact: true)
+      results = []
+      translations = backend.translations[locale] || {}
+
+      # Navigate to scope if provided
+      if scope
+        scope_parts = Array(scope).map(&:to_s)
+        scope_parts.each do |part|
+          translations = translations[part.to_sym] || translations[part.to_s]
+          return [] unless translations
+        end
+      end
+
+      search_nested_translations(translations, value, [], results, exact, scope)
+      results
+    end
+
+    # Find the first translation key that matches a value
+    # @param value [String] The translation value to search for
+    # @param locale [Symbol] The locale to search in
+    # @param scope [String, Symbol, Array] Optional scope to limit search
+    # @return [String, nil] The first matching key path or nil
+    def reverse_lookup(value, locale: I18n.locale, scope: nil)
+      find_keys_by_value(value, locale: locale, scope: scope, exact: true).first
+    end
+
+    # Find all translation keys containing a value (partial match)
+    # @param value [String] The translation value to search for
+    # @param locale [Symbol] The locale to search in
+    # @param scope [String, Symbol, Array] Optional scope to limit search
+    # @return [Array<String>] Array of matching key paths
+    def find_keys_containing(value, locale: I18n.locale, scope: nil)
+      find_keys_by_value(value, locale: locale, scope: scope, exact: false)
+    end
+
+    # Get all translation keys for a given locale
+    # @param locale [Symbol] The locale to get keys for
+    # @param scope [String, Symbol, Array] Optional scope to limit results
+    # @return [Array<String>] Array of all translation keys
+    def all_keys(locale: I18n.locale, scope: nil)
+      translations = backend.translations[locale] || {}
+
+      # Navigate to scope if provided
+      if scope
+        scope_parts = Array(scope).map(&:to_s)
+        scope_parts.each do |part|
+          translations = translations[part.to_sym] || translations[part.to_s]
+          return [] unless translations
+        end
+      end
+
+      keys = []
+      collect_keys(translations, [], keys, scope)
+      keys
+    end
+
+    # Get translation value and its metadata
+    # @param key [String, Symbol] The translation key
+    # @param locale [Symbol] The locale to search in
+    # @return [Hash] Hash containing value, key, locale, and full path
+    def lookup_with_info(key, locale: I18n.locale, **options)
+      value = I18n.t(key, locale: locale, **options)
+
+      {
+        key: key.to_s,
+        value: value,
+        locale: locale,
+        exists: !value.to_s.start_with?('translation missing:'),
+        default: options[:default],
+        scope: options[:scope]
+      }
+    end
+
+    private
+
+    def search_nested_translations(hash, target_value, current_path, results, exact, scope_prefix) # rubocop:disable Metrics/ParameterLists, Metrics/MethodLength
+      hash.each do |key, value|
+        path = current_path + [key]
+
+        if value.is_a?(Hash)
+          search_nested_translations(value, target_value, path, results, exact, scope_prefix)
+        elsif value.is_a?(Array)
+          # Handle array translations (like error messages with multiple items)
+          value.each_with_index do |item, index|
+            if match_value?(item, target_value, exact)
+              full_path = build_key_path(path + [index], scope_prefix)
+              results << full_path
+            end
+          end
+        elsif match_value?(value, target_value, exact)
+          full_path = build_key_path(path, scope_prefix)
+          results << full_path
+        end
+      end
+    end
+
+    def match_value?(value, target_value, exact)
+      value_str = value.to_s
+      target_str = target_value.to_s
+
+      if exact
+        value_str == target_str
+      else
+        value_str.downcase.include?(target_str.downcase)
+      end
+    end
+
+    def build_key_path(path, scope_prefix)
+      key_path = path.map(&:to_s).join('.')
+      if scope_prefix
+        scope_str = Array(scope_prefix).map(&:to_s).join('.')
+        "#{scope_str}.#{key_path}"
+      else
+        key_path
+      end
+    end
+
+    def collect_keys(hash, current_path, keys, scope_prefix)
+      hash.each do |key, value|
+        path = current_path + [key]
+
+        if value.is_a?(Hash)
+          collect_keys(value, path, keys, scope_prefix)
+        else
+          full_path = build_key_path(path, scope_prefix)
+          keys << full_path
+        end
+      end
+    end
+  end
+end
+
+# Convenience module for inclusion in classes
+module I18nReverseLookup
+  extend ActiveSupport::Concern
+
+  # Instance methods
+  def find_translation_key(value, options = {})
+    I18n.reverse_lookup(value, **options)
+  end
+
+  def find_all_translation_keys(value, options = {})
+    I18n.find_keys_by_value(value, **options)
+  end
+
+  # Class methods
+  class_methods do
+    def find_translation_key(value, options = {})
+      I18n.reverse_lookup(value, **options)
+    end
+
+    def find_all_translation_keys(value, options = {})
+      I18n.find_keys_by_value(value, **options)
+    end
+  end
+end
+
+# Add Rails-specific helpers if Rails is defined
+if defined?(Rails)
+  module I18nRailsExtensions
+    # Debug helper to show where a translation comes from
+    def translation_debug(key, options = {})
+      result = I18n.lookup_with_info(key, **options)
+
+      Rails.logger.debug "I18n Debug: #{result.inspect}" if defined?(Rails.logger) && Rails.logger
+
+      result
+    end
+
+    # Find translations in view paths
+    def find_in_views(value, exact: false)
+      results = []
+
+      # Search in all loaded locales
+      I18n.available_locales.each do |locale|
+        keys = I18n.find_keys_by_value(value, locale: locale, exact: exact)
+        results.concat(keys.map { |k| { locale: locale, key: k } })
+      end
+
+      results
+    end
+  end
+
+  I18n.extend(I18nRailsExtensions)
+end

data/config/initializers/storage_adapter_initializer.rb

@@ -1,12 +1,18 @@
 # frozen_string_literal: true
 
-Valkyrie::StorageAdapter.register(
-  Valkyrie::Storage::Disk.new(base_path: Hyrax.config.branding_path,
-                              path_generator: Hyrax::ValkyrieSimplePathGenerator),
-  :branding_disk
-)
+Rails.application.config.after_initialize do
+  unless Valkyrie::StorageAdapter.storage_adapters.key?(:branding_disk)
+    Valkyrie::StorageAdapter.register(
+      Valkyrie::Storage::Disk.new(base_path: Hyrax.config.branding_path,
+                                  path_generator: Hyrax::ValkyrieSimplePathGenerator),
+      :branding_disk
+    )
+  end
 
-Valkyrie::StorageAdapter.register(
-  Valkyrie::Storage::Disk.new(base_path: Hyrax.config.derivatives_path, path_generator: Hyrax::DerivativeBucketedStorage),
-  :derivatives_disk
-)
+  unless Valkyrie::StorageAdapter.storage_adapters.key?(:derivatives_disk)
+    Valkyrie::StorageAdapter.register(
+      Valkyrie::Storage::Disk.new(base_path: Hyrax.config.derivatives_path, path_generator: Hyrax::DerivativeBucketedStorage),
+      :derivatives_disk
+    )
+  end
+end