hyrax 5.1.0 → 5.3.0

data/app/views/records/edit_fields/_transcript_ids.html.erb

@@ -0,0 +1,18 @@
+<% if render_transcript_ids_field?(curation_concern) %>
+  <div class="row">
+    <div class="col-md-12 mt-2">
+      <fieldset id="file-set-transcripts">
+        <legend>
+          <%= t("simple_form.labels.file_set.transcript_ids") %>
+        </legend>
+        <div class="form-group">
+          <span class="form-text"><%= sanitize(t("simple_form.hints.file_set.transcript_ids")) %></span>
+          <%= f.select :transcript_ids,
+                       transcript_ids_select_options,
+                       { include_blank: true },
+                       { class: 'form-control', multiple: true } %>
+        </div>
+      </fieldset>
+    </div>
+  </div>
+<% end %>

data/app/views/records/show_fields/_rights.html.erb

@@ -1,4 +1,4 @@
 <% service = Hyrax::LicenseService.new %>
 <% record.rights.each do |r| %>
-  <%= link_to_field('rights', r, service.label(r)) %> <%= iconify_auto_link(r, false) %><br />
+  <%= link_to_field('rights', r, service.label(r) { r }) %> <%= iconify_auto_link(r, false) %><br />
 <% end %>

data/app/views/shared/_citations.html.erb

@@ -4,50 +4,65 @@
   <meta name="twitter:creator" content="<%= @presenter.tweeter %>" />
   <meta property="og:site_name" content="<%= application_name %>" />
   <meta property="og:type" content="object" />
-  <meta property="og:title" content="<%= @presenter.title.first %>" />
-  <meta property="og:description" content="<%= @presenter.description.first.truncate(200) rescue @presenter.title.first %>" />
+  <meta property="og:title" content="<%= Array(@presenter.title).first %>" />
+  <meta property="og:description" content="<%= Array(@presenter.description).first&.truncate(200) || Array(@presenter.title).first %>" />
   <meta property="og:image" content="<%= @presenter.download_url %>" />
   <meta property="og:url" content="<%= polymorphic_url([main_app, @presenter]) %>" />
-  <meta name="twitter:data1" content="<%= @presenter.keyword.join(', ') %>" />
+  <meta name="twitter:data1" content="<%= Array(@presenter.keyword).join(', ') %>" />
   <meta name="twitter:label1" content="Keywords" />
-  <meta name="twitter:data2" content="<%= @presenter.rights_statement.first %>" />
+  <meta name="twitter:data2" content="<%= Array(@presenter.rights_statement).first %>" />
   <meta name="twitter:label2" content="Rights Statement" />
 <% end %>
 
 <% gscholar = Hyrax::GoogleScholarPresenter.new(@presenter) %>
 
 <% if gscholar.scholarly? %>
-<% content_for(:gscholar_meta) do %>
-  <meta name="description" content="<%= gscholar.description %>" />
-  <meta name="citation_title" content="<%= gscholar.title %>" />
+  <% content_for(:gscholar_meta) do %>
+    <meta name="description" content="<%= gscholar.description %>" />
+    <meta name="citation_title" content="<%= gscholar.title %>" />
 
-  <% gscholar.authors.each do |author| %>
-  <meta name="citation_author" content="<%= author %>" />
-  <% end %>
+    <% gscholar.authors.each do |author| %>
+      <meta name="citation_author" content="<%= author %>" />
+    <% end %>
 
-  <% if gscholar.publication_date.present? %>
-  <meta name="citation_publication_date" content="<%= gscholar.publication_date %>" />
-  <% end %>
+    <% if gscholar.publication_date.present? %>
+      <meta name="citation_publication_date" content="<%= gscholar.publication_date %>" />
+    <% end %>
 
-  <% if gscholar.pdf_url.present? %>
-  <meta name="citation_pdf_url" content="<%= gscholar.pdf_url %>" />
-  <% end %>
+    <% if gscholar.pdf_url.present? %>
+      <meta name="citation_pdf_url" content="<%= gscholar.pdf_url %>" />
+    <% end %>
 
-  <% if gscholar.keywords.present? %>
-  <meta name="citation_keywords" content="<%= gscholar.keywords %>" />
-  <% end %>
+    <% if gscholar.keywords.present? %>
+      <meta name="citation_keywords" content="<%= gscholar.keywords %>" />
+    <% end %>
 
-  <% if gscholar.publisher.present? %>
-  <meta name="citation_publisher" content="<%= gscholar.publisher %>" />
-  <% end %>
+    <% if gscholar.publisher.present? %>
+      <meta name="citation_publisher" content="<%= gscholar.publisher %>" />
+    <% end %>
 
-  <!-- Hyrax does not yet support these metadata -->
-  <!--
-    <meta name="citation_journal_title" content=""/>
-    <meta name="citation_volume" content=""/>
-    <meta name="citation_issue" content=""/>
-    <meta name="citation_firstpage" content=""/>
-    <meta name="citation_lastpage" content=""/>
-  -->
-<% end %>
+    <% if gscholar.degree_grantor.present?  %>
+      <meta name="citation_dissertation_institution" content="<%= gscholar.degree_grantor %>" />
+    <% end %>
+
+    <% if gscholar.journal_title.present? %>
+      <meta name="citation_journal_title" content="<%= gscholar.journal_title %>" />
+    <% end %>
+
+    <% if gscholar.volume.present? %>
+      <meta name="citation_volume" content="<%= gscholar.volume %>" />
+    <% end %>
+
+    <% if gscholar.issue.present? %>
+      <meta name="citation_issue" content="<%= gscholar.issue %>" />
+    <% end %>
+
+    <% if gscholar.first_page.present? %>
+      <meta name="citation_firstpage" content="<%= gscholar.first_page %>" />
+    <% end %>
+
+    <% if gscholar.last_page.present? %>
+      <meta name="citation_lastpage" content="<%= gscholar.last_page %>" />
+    <% end %>
+  <% end %>
 <% end %>

data/app/views/shared/_schema_version.html.erb

@@ -0,0 +1,38 @@
+<% schema_version = SolrDocument.find(f.object.id).schema_version if action_name == 'edit' %>
+<% schema_version = Hyrax::FlexibleSchema.current_schema_id if action_name == 'new' %>
+<% updating = (schema_version.to_f < @latest_schema_version.to_f) ? 'updating' : '' %>
+
+<div class='pull-right'>
+  <% if schema_version.present? %>
+    <div class='schema-version text-center'>
+      <span>Created On Version</span>
+      <h4><%= schema_version.to_f %></h4>
+    </div>
+  <% end %>
+  <div class='schema-version text-center <%= updating %>'>
+    <span>Version After Save</span>
+    <h4><%= @latest_schema_version %></h4>
+  </div>
+</div>
+
+<style>
+  .schema-version{
+    background:#FFF;
+    border-radius:8px;
+    box-shadow: 3px 3px 2px rgba(0, 0, 0, 0.2);
+    padding:20px 5px;
+    margin-bottom: 5px;
+    min-width: 10em;
+  }
+
+  .schema-version.updating {
+    background-color: lightgreen;
+  }
+
+  .schema_version h4 {
+    font-size: 14px;
+  }
+  .schema_version span {
+    font-size: 10px;
+  }
+</style>

data/bin/dev-entrypoint.sh

@@ -4,11 +4,18 @@ set -e
 mkdir -p $RAILS_ROOT/tmp/pids
 rm -f $RAILS_ROOT/tmp/pids/*
 
-RUBY_MAJOR=$(ruby -e "puts /^(?'major'\d+)\.(?'minor'\d+)\.(?'patch'\d+)/.match(RUBY_VERSION)[:major]")
+if [ -n "${BUNDLE_PATH}" ]; then
+  # Copy gems installed in the image to /app/bundle so they are retained over stack down/ups.
+  FULL_BUNDLE_PATH=$(ruby -e "require 'bundler'; puts Bundler.bundle_path")
+  echo "Copying gems to $FULL_BUNDLE_PATH"
+  mkdir -p $FULL_BUNDLE_PATH
+  cp -Ru /usr/local/bundle/* $FULL_BUNDLE_PATH
+elif [ "$(id -u)" -eq 0 ]; then
+  # Gems coming from git need to be owned by the user, which is root for dev environment
+  echo "Ensuring root owns /usr/local/bundle"
+  chown -R 0 /usr/local/bundle
+fi
 
-# Copy gems installed in the image to the dev bundle
-mkdir -p /app/bundle/ruby/$RUBY_MAJOR.0
-cp -Rn /usr/local/bundle/* /app/bundle/ruby/$RUBY_MAJOR.0
 bundle install
 yarn install
 
@@ -17,5 +24,8 @@ yarn install
 
 db-migrate-seed.sh
 
+# Update and run ClamAV
+[ "$HYRAX_CLAMAV" = "true" ] && freshclam && clamd
+
 # Run the command
 exec "$@"

data/chart/hyrax/Chart.yaml

@@ -2,12 +2,12 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 3.7.0
-appVersion: 5.0.0
+version: 3.7.3
+appVersion: 5.2.0
 dependencies:
   - name: fcrepo
-    version: 2.0.0
-    repository: oci://ghcr.io/samvera
+    version: 2.0.2
+    repository: oci://ghcr.io/samvera-labs/charts
     condition: fcrepo.enabled
   - name: memcached
     version: 6.6.0

data/chart/hyrax/templates/ingress.yaml

@@ -18,6 +18,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+  {{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{- end }}
   {{- if .Values.ingress.tls }}
   tls:
     {{- range .Values.ingress.tls }}

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

@@ -6,46 +6,83 @@ Flipflop.configure do
   strategy Hyrax::Strategies::YamlStrategy, config: Hyrax.config.feature_config_path
   strategy :default
 
-  feature :proxy_deposit,
-          default: true,
-          description: "Depositors may designate proxies to deposit works on their behalf"
-
-  feature :transfer_works,
-          default: true,
-          description: "Depositors may transfer their works to another user"
-
-  # Note, if this is deactivated, a default admin set will be created and all
-  # works will be assigned to it when they are created.
-  feature :assign_admin_set,
-          default: true,
-          description: "Ability to assign uploaded items to an admin set"
-
-  feature :show_deposit_agreement,
-          default: true,
-          description: "Show a deposit agreement to users creating works"
-
-  feature :active_deposit_agreement_acceptance,
-          default: Hyrax.config.active_deposit_agreement_acceptance?,
-          description: "Require an active acceptance of the deposit agreement by checking a checkbox"
-
-  feature :batch_upload,
-          default: false,
-          description: "Enable uploading batches of works"
-
-  feature :hide_private_items,
-          default: false,
-          description: "Do not show the private items."
-
-  feature :hide_users_list,
-          default: true,
-          description: "Do not show users list unless user has authenticated."
-
-  feature :cache_work_iiif_manifest,
-          default: false,
-          description: "Use Rails.cache to cache the JSON document for IIIF manifests"
-  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."
+  group :site_configuration do
+    feature :cache_work_iiif_manifest,
+            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."
+
+    feature :hide_social_buttons,
+            default: false,
+            description: "Do not show social media share buttons."
+
+    feature :hide_users_list,
+            default: true,
+            description: "Do not show users list unless user has authenticated."
+
+    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
+    feature :active_deposit_agreement_acceptance,
+            default: Hyrax.config.active_deposit_agreement_acceptance?,
+            description: "Require an active acceptance of the deposit agreement by checking a checkbox"
+
+    # Note, if this is deactivated, a default admin set will be created and all
+    # works will be assigned to it when they are created.
+    feature :assign_admin_set,
+            default: true,
+            description: "Ability to assign uploaded items to an admin set"
+
+    feature :batch_upload,
+            default: false,
+            description: "Enable uploading batches of works"
+
+    feature :proxy_deposit,
+            default: true,
+            description: "Depositors may designate proxies to deposit works on their behalf"
+
+    feature :show_deposit_agreement,
+            default: true,
+            description: "Show a deposit agreement to users creating works"
+
+    feature :transfer_works,
+            default: true,
+            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