hyrax 5.0.0.rc2 → 5.0.0

data/app/views/hyrax/collections/show.html.erb

@@ -4,9 +4,9 @@
     <div class="col-md-12">
 
       <% if @presenter.banner_file.present? %>
-          <div class="hyc-banner" style="background-image:url(<%= @presenter.banner_file %>)">
+        <div class="hyc-banner" style="background-image:url(<%= @presenter.banner_file %>)">
       <% else %>
-          <div class="hyc-generic">
+        <div class="hyc-generic">
       <% end %>
 
       <div class="hyc-title">
@@ -80,11 +80,11 @@
   <!-- Search results label -->
   <% if @members_count > 0 || @presenter.subcollection_count > 0 %>
     <div class="hyc-blacklight hyc-bl-title">
-    <% if collection_search_parameters? %>
-      <h2>
-        <%= t('hyrax.dashboard.collections.show.search_results') %>
-      </h2>
-    <% end %>
+      <% if collection_search_parameters? %>
+        <h2>
+          <%= t('hyrax.dashboard.collections.show.search_results') %>
+        </h2>
+      <% end %>
     </div>
   <% end %>
 
@@ -125,6 +125,4 @@
   <% end # if @members_count > 0 %>
 </div>
 
-
 <span class='hide analytics-event' data-category="collection" data-action="collection-page-view" data-name="<%= @presenter.id %>" >
-

data/app/views/hyrax/dashboard/_sidebar.html.erb

@@ -12,9 +12,10 @@
         </div>
       </div>
     </li>
-    <li class="nav-item"><%= link_to hyrax.dashboard_path, class: "nav-link" do %>
-          <span class="fa fa-home" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.dashboard') %></span>
-        <% end %>
+    <li class="nav-item">
+      <%= link_to hyrax.dashboard_path, class: "nav-link", title: t('hyrax.admin.sidebar.dashboard') do %>
+        <span class="fa fa-home" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.dashboard') %></span>
+      <% end %>
     </li>
     <%= render 'hyrax/dashboard/sidebar/activity', menu: menu %>
     <%= render 'hyrax/dashboard/sidebar/repository_content', menu: menu %>

data/app/views/hyrax/dashboard/collections/_form_share_table.html.erb

@@ -2,7 +2,7 @@
                   
   <h3 class="h4"><%= t(".#{access}.title") %></h3>
   <p><%= t(".#{access}.help") %></p>
-  <p><%= t(".#{access}.help_with_works", type_title: @collection_type.title) if @collection_type.share_applies_to_new_works? && access != 'depositors' %></p>
+  <p><%= t(".#{access}.help_with_works", type_title: collection_type.title) if collection_type.share_applies_to_new_works? && access != 'depositors' %></p>
   <% if collection_permission_template_form_for(form: @form).access_grants.select(&filter).any? %>
     <table class="table table-striped share-status">
       <thead>
@@ -31,4 +31,4 @@
   <% else %>
     <p><em><%= t(".#{access}.empty") %></em></p>
   <% end %>
-</div>
+</div>

data/app/views/hyrax/file_sets/media_display/_audio.html.erb

@@ -8,7 +8,7 @@
       </audio>
       <%= link_to t('hyrax.file_set.show.downloadable_content.audio_link'),
                   hyrax.download_path(file_set),
-                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
+                  data: { label: file_set.id.to_s, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
                   target: :_blank,
                   id: "file_download" %>
     </div>

data/app/views/hyrax/file_sets/media_display/_video.html.erb

@@ -8,7 +8,7 @@
       </video>
       <%= link_to t('hyrax.file_set.show.downloadable_content.video_link'),
                   hyrax.download_path(file_set),
-                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
+                  data: { label: file_set.id.to_s, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
                   target: :_blank,
                   id: "file_download" %>
     </div>

data/app/views/hyrax/my/facet.html.erb

@@ -9,7 +9,7 @@
   <%= render partial: 'facet_index_navigation' if @facet.index_range && @display_facet.index? %>
 
   <div class="facet-extended-list">
-    <%= render_facet_limit(@display_facet, layout: false) %>
+    <%= render_facet_limit(@display_facet, layout: false, partial: 'catalog/facet_limit') %>
   </div>
 
   <%# Removed component footer and placed the facet pagination partial within a `container` div %>

data/app/views/layouts/_head_tag_content.html.erb

@@ -9,6 +9,7 @@ signed in %>
 <!-- added for use on small devices like phones -->
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <link rel="resourcesync" href="<%= hyrax.capability_list_url %>" />
+<meta name="generator" content="Samvera Hyrax <%= ::Hyrax::VERSION %>" />
 
 <!-- Twitter card metadata -->
 <%= yield :twitter_meta %>

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

@@ -6,7 +6,7 @@
     </div>
     <div class="navbar-right">
       <div class="navbar-text text-right">
-        <p><%= t('hyrax.footer.copyright_html') %></p>
+        <p><%= t('hyrax.footer.copyright_html', current_year: Time.current.year) %></p>
         <p><%= t('hyrax.background_attribution_html') %></p>
       </div>
     </div>

data/chart/hyrax/Chart.yaml

@@ -2,11 +2,11 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 3.5.0
-appVersion: 3.3.0
+version: 3.6.0
+appVersion: 5.0.0
 dependencies:
   - name: fcrepo
-    version: 1.0.0
+    version: 2.0.0
     repository: oci://ghcr.io/samvera
     condition: fcrepo.enabled
   - name: memcached

data/chart/hyrax/templates/_tmplvalues.tpl

@@ -0,0 +1,38 @@
+{{/*
+Copyright VMware, Inc.
+SPDX-License-Identifier: APACHE-2.0
+*/}}
+
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Renders a value that contains template perhaps with scope if the scope is present.
+Usage:
+{{ include "hyrax.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $ ) }}
+{{ include "hyrax.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $ "scope" $app ) }}
+*/}}
+{{- define "hyrax.tplvalues.render" -}}
+{{- $value := typeIs "string" .value | ternary .value (.value | toYaml) }}
+{{- if contains "{{" (toJson .value) }}
+  {{- if .scope }}
+      {{- tpl (cat "{{- with $.RelativeScope -}}" $value "{{- end }}") (merge (dict "RelativeScope" .scope) .context) }}
+  {{- else }}
+    {{- tpl $value .context }}
+  {{- end }}
+{{- else }}
+    {{- $value }}
+{{- end }}
+{{- end -}}
+
+{{/*
+Merge a list of values that contains template after rendering them.
+Merge precedence is consistent with http://masterminds.github.io/sprig/dicts.html#merge-mustmerge
+Usage:
+{{ include "hyrax.tplvalues.merge" ( dict "values" (list .Values.path.to.the.Value1 .Values.path.to.the.Value2) "context" $ ) }}
+*/}}
+{{- define "hyrax.tplvalues.merge" -}}
+{{- $dst := dict -}}
+{{- range .values -}}
+{{- $dst = include "hyrax.tplvalues.render" (dict "value" . "context" $.context "scope" $.scope) | fromYaml | merge $dst -}}
+{{- end -}}
+{{ $dst | toYaml }}
+{{- end -}}

data/chart/hyrax/templates/deployment-worker.yaml

@@ -29,7 +29,9 @@ spec:
             - secretRef:
                 name: {{ template "hyrax.fullname" . }}
           env:
-            {{- toYaml .Values.worker.extraEnvVars | nindent 12 }}
+            {{- if .Values.extraEnvVars }}
+            {{- include "hyrax.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- end }}
           command:
             - sh
             - -c
@@ -63,7 +65,9 @@ spec:
               {{- toYaml . | nindent 12 }}
             {{- end }}
           env:
-            {{- toYaml .Values.worker.extraEnvVars | nindent 12 }}
+            {{- if .Values.extraEnvVars }}
+            {{- include "hyrax.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- end }}
           {{- if .Values.worker.readinessProbe.enabled }}
           readinessProbe:
             exec:

data/chart/hyrax/templates/deployment.yaml

@@ -38,7 +38,9 @@ spec:
                 name: {{ .Values.solrExistingSecret }}
             {{- end }}
           env:
-            {{- toYaml .Values.extraEnvVars | nindent 12 }}
+            {{- if .Values.extraEnvVars }}
+            {{- include "hyrax.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- end }}
           command:
             - sh
             - -c
@@ -66,7 +68,9 @@ spec:
               {{- toYaml . | nindent 12 }}
             {{- end }}
           env:
-            {{- toYaml .Values.extraEnvVars | nindent 12 }}
+            {{- if .Values.extraEnvVars }}
+            {{- include "hyrax.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- end }}
           command:
             - sh
             - -c
@@ -101,7 +105,9 @@ spec:
               {{- toYaml . | nindent 12 }}
             {{- end }}
           env:
-            {{- toYaml .Values.extraEnvVars | nindent 12 }}
+            {{- if .Values.extraEnvVars }}
+            {{- include "hyrax.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- end }}
           ports:
             - name: http
               containerPort: 3000

data/chart/hyrax/values.yaml

@@ -226,7 +226,7 @@ fcrepo:
     enabled: false
     image:
       repository: bitnami/postgresql
-      tag: 12.11.0-debian-11-r12
+      tag: 12.17.0-debian-11-r28
 
 # configuration for an external/existing fits service;
 #   ignored if `fits.enabled` is true
@@ -284,6 +284,14 @@ nginx:
   image:
     repository: bitnami/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
+  # nil, rather than throw an error (which it does if `service` itself is nil).
+  # you can change to NodePort or LoadBalancer if direct access is needed.
+  # ClusterIP is used as we assume an ingress is in place.
+  service:
+    type: ClusterIP
+    port: 80
   # The set up below does malicious bot / ip blocking and mounts
   # volumes to allow nginx to server assets and other public directory items
   # extraVolumes:

data/config/initializers/listeners.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-Hyrax.publisher.subscribe(Hyrax::Listeners::ActiveFedoraAclIndexListener.new) unless Hyrax.config.disable_wings
+Hyrax.publisher.subscribe(Hyrax::Listeners::ActiveFedoraACLIndexListener.new) unless Hyrax.config.disable_wings
 
 Hyrax.publisher.default_listeners.each do |listener|
   Hyrax.publisher.subscribe(listener)

data/config/locales/hyrax.de.yml

@@ -905,6 +905,11 @@ de:
             collection_title: Sammlungstitel
           this_collection_in_other_collections_description: Sie können diese Sammlung anderen Sammlungen als Untersammlung hinzufügen.
         form_share:
+          access_options:
+            creator: Schöpfer
+            depositor: Einleger
+            manager: Manager
+            viewer: Zuschauer
           add_group: Gruppe hinzufügen
           add_sharing: Freigaben hinzufügen
           add_user: Benutzer hinzufügen

data/config/locales/hyrax.en.yml

@@ -584,6 +584,11 @@ en:
         help_html: Select the file with media that represents this work.
         legend_html: Representative Media
       form_share:
+        access_options:
+          creator: Creator
+          depositor: Depositor
+          manager: Manager
+          viewer: Viewer
         access_type_to_grant: Access type to grant
         account_label_without_suffix: "%{account_label} (without the %{suffix} part)"
         add_sharing: Add Sharing
@@ -903,6 +908,11 @@ en:
             collection_title: Collection Title
           this_collection_in_other_collections_description: You can add this collection to other collections as a sub-collection.
         form_share:
+          access_options:
+            creator: Creator
+            depositor: Depositor
+            manager: Manager
+            viewer: Viewer
           add_group: Add group
           add_sharing: Add Sharing
           add_user: Add user

data/config/locales/hyrax.es.yml

@@ -905,6 +905,11 @@ es:
             collection_title: Título de la colección
           this_collection_in_other_collections_description: Puede agregar esta colección a otras colecciones como una subcolección.
         form_share:
+          access_options:
+            creator: Creador
+            depositor: Depositor
+            manager: Gerente
+            viewer: Espectador        
           add_group: Añadir grupo
           add_sharing: Agregar Compartir
           add_user: Agregar usuario

data/config/locales/hyrax.fr.yml

@@ -906,6 +906,11 @@ fr:
             collection_title: Titre de la collection
           this_collection_in_other_collections_description: Vous pouvez ajouter cette collection à d'autres collections en tant que sous-collection.
         form_share:
+          access_options:
+            creator: Créateur
+            depositor: Déposant
+            manager: Gestionnaire
+            viewer: Téléspectateur
           add_group: Ajouter un groupe
           add_sharing: Ajouter un partage
           add_user: Ajouter un utilisateur

data/config/locales/hyrax.it.yml

@@ -905,6 +905,11 @@ it:
             collection_title: Titolo della collezione
           this_collection_in_other_collections_description: È possibile aggiungere questa raccolta ad altre raccolte come sotto-raccolta.
         form_share:
+          access_options:
+            creator: Creatore
+            depositor: Depositante
+            manager: Gestore
+            viewer: Spettatore        
           add_group: Aggiungere gruppo
           add_sharing: Aggiungi condivisione
           add_user: Aggiungi utente

data/config/locales/hyrax.pt-BR.yml

@@ -904,6 +904,11 @@ pt-BR:
             collection_title: Título da Coleção
           this_collection_in_other_collections_description: Você pode embutir esta coleção em outras coleções como uma sub-coleção.
         form_share:
+          access_options:
+            creator: O Criador
+            depositor: Depositante
+            manager: Gerente
+            viewer: Visualizador        
           add_group: Acrescentar Grupo
           add_sharing: Acrescentar Compartilhamento
           add_user: Acrescentar Usuário

data/config/locales/hyrax.zh.yml

@@ -903,6 +903,11 @@ zh:
             collection_title: 收藏标题
           this_collection_in_other_collections_description: 您可以将此集合作为子集合添加到其他集合。
         form_share:
+          access_options:
+            creator: 造物主
+            depositor: 储户
+            manager: 经理
+            viewer: 查看器
           add_group: 添加组
           add_sharing: 添加共享
           add_user: 添加用户

data/config/metadata/basic_metadata.yaml

@@ -50,6 +50,7 @@ attributes:
       primary: false
     index_keys:
       - "contributor_tesim"
+      - "contributor_sim"
     predicate: http://purl.org/dc/elements/1.1/contributor
   creator:
     type: string

data/config/metadata/core_metadata.yaml

@@ -19,3 +19,5 @@ attributes:
   depositor:
     type: string
     predicate: http://id.loc.gov/vocabulary/relators/dpt
+    index_keys:
+      - "depositor_tesim"

data/config/metadata/file_set_metadata.yaml

@@ -20,6 +20,8 @@ attributes:
       required: false
       primary: true
     predicate: http://purl.org/dc/terms/license
+    index_keys:
+      - "license_tesim"
 
   # Other attributes:
   abstract:

data/docker-compose-koppie.yml

@@ -99,8 +99,8 @@ services:
       - /dev/shm:/dev/shm
     shm_size: 2G
     ports:
-      - "4445:4444"
-      - "5960:5900"
+      - "4446:4444"
+      - "5961:5900"
     networks:
       - koppie
 
@@ -145,7 +145,7 @@ services:
     command:
       - sh
       - "-c"
-      - "precreate-core koppie_test /opt/solr/server/configsets/hyraxconf; solr-precreate koppie /opt/solr/server/configsets/hyraxconf"
+      - "precreate-core hydra-test /opt/solr/server/configsets/hyraxconf; solr-precreate koppie /opt/solr/server/configsets/hyraxconf"
     volumes:
       - solr_home:/var/solr/data:cached
       - .koppie/solr/conf:/opt/solr/server/configsets/hyraxconf

data/docker-compose-sirenia.yml

@@ -129,8 +129,8 @@ services:
     image: fcrepo/fcrepo:6.4.0
     environment:
       - >-
-        CATALINA_OPTS=-Dfcrepo.home=/fcrepo-home -Djava.awt.headless=true -Dfile.encoding=UTF-8 
-        -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m 
+        CATALINA_OPTS=-Dfcrepo.home=/fcrepo-home -Djava.awt.headless=true -Dfile.encoding=UTF-8
+        -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m
         -XX:MaxPermSize=256m -XX:+DisableExplicitGC -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true
       - JAVA_OPTS=-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true
     volumes:
@@ -170,7 +170,7 @@ services:
     command:
       - sh
       - "-c"
-      - "precreate-core koppie_test /opt/solr/server/configsets/hyraxconf; solr-precreate koppie /opt/solr/server/configsets/hyraxconf"
+      - "precreate-core hydra-test /opt/solr/server/configsets/hyraxconf; solr-precreate koppie /opt/solr/server/configsets/hyraxconf"
     volumes:
       - solr_home:/var/solr/data:cached
       - .koppie/solr/conf:/opt/solr/server/configsets/hyraxconf