hyrax 4.0.0.beta2 → 4.0.0.rc2

data/app/views/hyrax/uploads/_js_templates_branding.html.erb

@@ -37,7 +37,7 @@
 <!-- The template to display the banner once upload is complete -->
 <script id="template-download" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-        <span class="template-download fade">
+        <span class="template-download fade show">
           <div id="banner">
             <div class="row branding-banner-row">
               <div class="col-sm-3">
@@ -69,7 +69,7 @@
 <!-- The template to display logo in the table once upload is complete -->
 <script id="logo-template-download" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-            <span class="template-download fade">
+            <span class="template-download fade show">
             <div class="row branding-logo-row">
               <div class="col-sm-3">
                 <span class="preview">

data/app/views/hyrax/users/_vitals.html.erb

@@ -3,16 +3,16 @@
 </div>
 
 <div class="list-group-item">
-  <span class="badge"><%= number_of_collections(user) %></span>
+  <span class="badge dark-text"><%= number_of_collections(user) %></span>
   <span class="fa fa-folder-open" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.collections"), {generic_type: "Collection", depositor: user.to_s}) %>
 </div>
 
 <div class="list-group-item">
-  <span class="badge"><%= number_of_works(user) %></span>
+  <span class="badge dark-text"><%= number_of_works(user) %></span>
   <span class="fa fa-upload" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.works"), {generic_type: "Work", depositor: user.to_s}) %>
 
   <ul class="views-downloads-dashboard list-unstyled">
-      <li><span class="badge badge-optional"><%= user.total_file_views %></span> <%= t("hyrax.dashboard.stats.file_views").pluralize(user.total_file_views) %></li>
-      <li><span class="badge badge-optional"><%= user.total_file_downloads %></span> <%= t("hyrax.dashboard.stats.file_downloads").pluralize(user.total_file_downloads) %></li>
+      <li><span class="badge badge-optional dark-text"><%= user.total_file_views %></span> <%= t("hyrax.dashboard.stats.file_views").pluralize(user.total_file_views) %></li>
+      <li><span class="badge badge-optional dark-text"><%= user.total_file_downloads %></span> <%= t("hyrax.dashboard.stats.file_downloads").pluralize(user.total_file_downloads) %></li>
   </ul>
 </div>

data/chart/hyrax/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 1.6.0
+version: 3.1.0
 appVersion: 3.3.0
 dependencies:
   - name: fcrepo
@@ -10,26 +10,26 @@ dependencies:
     repository: oci://ghcr.io/samvera
     condition: fcrepo.enabled
   - name: memcached
-    version: 4.2.21
+    version: 6.3.13
     repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: memcached.enabled
   - name: minio
-    version: 6.7.2
+    version: 12.1.14
     repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: minio.enabled
   - name: postgresql
-    version: 10.3.13
+    version: 12.2.5
     repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: postgresql.enabled
   - name: redis
-    version: 10.7.16
+    version: 17.8.7
     repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: redis.enabled
   - name: solr
-    version: 1.0.1
+    version: 7.2.1
     repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: solr.enabled
   - name: nginx
-    version: 9.8.0
+    version: 13.2.30
     repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: nginx.enabled

data/chart/hyrax/README.md

@@ -11,6 +11,11 @@ production-ready setup for Hyrax applications. By default it deploys:
   - Solr (in a cloud configuration, including Apache Zookeeper)
   - Redis
 
+## Minimum requirements
+
+- Kubernetes 1.21
+- Helm 3
+
 ## A base Hyrax deployment
 
 Because Hyrax is a [Rails Engine][engine]---not a stand-alone application---

data/chart/hyrax/templates/_helpers.tpl

@@ -51,6 +51,14 @@ app.kubernetes.io/name: {{ include "hyrax.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
+{{/*
+Worker Selector labels
+*/}}
+{{- define "hyrax.workerSelectorLabels" -}}
+app.kubernetes.io/name: {{ include "hyrax.name" . }}-worker
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
 {{/*
 Create the name of the service account to use
 */}}
@@ -100,7 +108,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 
 {{- define "hyrax.postgresql.database" -}}
 {{- if .Values.postgresql.enabled }}
-{{- .Values.postgresql.postgresqlDatabase }}
+{{- .Values.postgresql.auth.database }}
 {{- else }}
 {{- .Values.externalPostgresql.database | default ( include "hyrax.fullname" . ) }}
 {{- end }}
@@ -108,7 +116,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 
 {{- define "hyrax.postgresql.username" -}}
 {{- if .Values.postgresql.enabled }}
-{{- .Values.postgresql.postgresqlUsername }}
+{{- .Values.postgresql.auth.username }}
 {{- else }}
 {{- .Values.externalPostgresql.username | default "postgres" }}
 {{- end }}
@@ -116,7 +124,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 
 {{- define "hyrax.postgresql.password" -}}
 {{- if .Values.postgresql.enabled }}
-{{- .Values.postgresql.postgresqlPassword }}
+{{- .Values.postgresql.auth.password }}
 {{- else }}
 {{- .Values.externalPostgresql.password }}
 {{- end }}
@@ -149,7 +157,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 
 {{- define "hyrax.solr.username" -}}
 {{- if .Values.solr.enabled }}
-{{- .Values.solr.authentication.adminUsername }}
+{{- .Values.solr.auth.adminUsername }}
 {{- else }}
 {{- .Values.externalSolrUser }}
 {{- end }}
@@ -157,7 +165,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 
 {{- define "hyrax.solr.password" -}}
 {{- if .Values.solr.enabled }}
-{{- .Values.solr.authentication.adminPassword }}
+{{- .Values.solr.auth.adminPassword }}
 {{- else }}
 {{- .Values.externalSolrPassword }}
 {{- end }}
@@ -180,7 +188,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 
 {{- define "hyrax.redis.url" -}}
-{{- printf "redis://:%s@%s:%s" .Values.redis.password (include "hyrax.redis.host" .) "6379/0" -}}
+{{- printf "redis://:%s@%s:%s" .Values.redis.auth.password (include "hyrax.redis.host" .) "6379/0" -}}
 {{- end -}}
 
 {{- define "hyrax.nginx.host" -}}

data/chart/hyrax/templates/cron-embargo.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.embargoRelease.enabled }}
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
 metadata:

data/chart/hyrax/templates/cron-lease.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.leaseRelease.enabled }}
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
 metadata:

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

@@ -9,7 +9,7 @@ spec:
   replicas: {{ .Values.worker.replicaCount }}
   selector:
     matchLabels:
-      {{- include "hyrax.selectorLabels" . | nindent 6 }}
+      {{- include "hyrax.workerSelectorLabels" . | nindent 6 }}
   template:
     metadata:
     {{- with .Values.podAnnotations }}
@@ -17,7 +17,7 @@ spec:
         {{- toYaml . | nindent 8 }}
     {{- end }}
       labels:
-        {{- include "hyrax.selectorLabels" . | nindent 8 }}
+        {{- include "hyrax.workerSelectorLabels" . | nindent 8 }}
     spec:
       initContainers:
         - name: db-wait

data/chart/hyrax/templates/extra-list.yaml

@@ -0,0 +1,8 @@
+{{- range .Values.extraDeploy }}
+---
+{{- if typeIs "string" . }}
+{{- tpl . $ }}
+{{- else }}
+{{- tpl (. | toYaml) $ }}
+{{- end }}
+{{- end }}

data/chart/hyrax/templates/secrets.yaml

@@ -10,13 +10,13 @@ data:
   DB_PASSWORD: {{ include "hyrax.postgresql.password" . | b64enc }}
   DATABASE_URL: {{ printf "postgresql://%s:%s@%s/%s?pool=5" ( include "hyrax.postgresql.username" . ) ( include "hyrax.postgresql.password" . ) ( include "hyrax.postgresql.host" . ) ( include "hyrax.postgresql.database" . ) | b64enc }}
   {{- if .Values.minio.enabled }}
-  MINIO_ACCESS_KEY: {{ .Values.minio.accessKey.password | b64enc}}
-  MINIO_SECRET_KEY: {{ .Values.minio.secretKey.password | b64enc}}
+  MINIO_ACCESS_KEY: {{ .Values.minio.auth.rootUser | b64enc}}
+  MINIO_SECRET_KEY: {{ .Values.minio.auth.rootPassword | b64enc}}
   {{- end }}
   {{- if not .Values.solrExistingSecret }}
   SOLR_ADMIN_PASSWORD: {{ include "hyrax.solr.password" . | b64enc }}
   {{- end }}
   {{- if .Values.redis.enabled }}
-  REDIS_PASSWORD: {{ .Values.redis.password | b64enc}}
+  REDIS_PASSWORD: {{ .Values.redis.auth.password | b64enc}}
   SIDEKIQ_REDIS_URL: {{ include "hyrax.redis.url" . | b64enc }}
   {{- end }}

data/chart/hyrax/values.yaml

@@ -66,6 +66,10 @@ extraEnvFrom: []
 # tty: true
 extraContainerConfiguration: []
 
+## @param extraDeploy Array of extra objects to deploy with the release (evaluated as a template)
+##
+extraDeploy: []
+
 # an existing volume containing a Hyrax-based application
 # must be a ReadWriteMany volume if worker is enabled
 applicationExistingClaim: ""
@@ -229,10 +233,9 @@ memcached:
 
 minio:
   enabled: false
-  accessKey:
-    password: hyrax-access-key
-  secretKey:
-    password: hyrax-secret-key
+  auth:
+    rootUser: hyrax-access-key
+    rootPassword: hyrax-secret-key
   persistence:
     enabled: false
   # defaultBuckets: bucketOne;bucketTwo
@@ -242,15 +245,18 @@ postgresql:
   image:
     repository: bitnami/postgresql
     tag: 12.3.0
-  postgresqlUsername: hyrax
-  postgresqlPassword: hyrax_pass
-  postgresqlDatabase: hyrax
-  servicePort: 5432
-  # cpu: 1000m
-  # memory: 1Gi
-  # persistence:
-  #   size: 10Gi
-
+  auth:
+    database: hyrax
+    password: hyrax_pass
+    username: hyrax
+  primary:
+    service:
+      ports:
+        postgresql: 5432
+  readReplicas:
+    service:
+      ports:
+        postgresql: 5432
 
 ## Nginx proxy is used to keep puma from having to serve static assets
 ## and to act as an auth proxy for Cantelope
@@ -391,14 +397,15 @@ nginx:
 
 redis:
   enabled: true
-  password: mysecret
+  auth:
+    password: mysecret
 
 solr:
   enabled: true
   image:
     repository: bitnami/solr
     tag: 8.11.1
-  authentication:
+  auth:
     enabled: true
     adminUsername: admin
     adminPassword: admin

data/config/initializers/kaminari_engine_patch.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# Add support for engine routes to kaminari
+Rails.application.config.to_prepare do
+  Kaminari::Helpers::Tag.class_eval do
+    def page_url_for(page)
+      params = params_for(page)
+      params[:only_path] = true
+      if @options[:route_set]
+        @options[:route_set].url_for params
+      else
+        @template.url_for params
+      end
+    end
+  end
+end

data/config/locales/hyrax.de.yml

@@ -589,7 +589,7 @@ de:
         depositor: Deponent
         directions: Unabhängig von den Sichtbarkeitseinstellungen für diese Arbeit können Sie sie auch für andere Benutzer und Gruppen freigeben.
         group: Gruppe
-        permissions_save_note_html: Berechtigungen werden <strong> nicht </ strong> gespeichert, bis die Option & quot; Speichern & quot; Die Taste wird unten auf der Seite gedrückt.
+        permissions_save_note_html: Berechtigungen werden <strong> nicht </strong> gespeichert, bis die Option & quot; Speichern & quot; Die Taste wird unten auf der Seite gedrückt.
         use_add_button: Verwenden Sie die Schaltfläche "Hinzufügen", um Zugriff auf jeweils eine %{account_label} zu gewähren (diese wird der folgenden Liste hinzugefügt). Wählen Sie den Benutzer nach Name oder %{account_label} \ aus. Wählen Sie dann die Zugriffsebene aus, die Sie gewähren möchten, und klicken Sie auf Add this %{account_label}, um das Hinzufügen der Berechtigung abzuschließen.
       form_thumbnail:
         help_html: Wählen Sie die Datei aus, die als Miniaturansicht für diese Arbeit verwendet werden soll.
@@ -1405,14 +1405,14 @@ de:
       count:
         collections:
           collections_listing: Auflistung der Sammlungen
-          in_repo: "<strong> %{total_count} Sammlungen </ strong> im Repository"
-          you_manage: "<strong> %{total_count} Sammlungen </ strong>, die Sie im Repository verwalten können"
-          you_own: "<strong> %{total_count} Sammlungen </ strong>, die Sie im Repository besitzen"
+          in_repo: "<strong> %{total_count} Sammlungen </strong> im Repository"
+          you_manage: "<strong> %{total_count} Sammlungen </strong>, die Sie im Repository verwalten können"
+          you_own: "<strong> %{total_count} Sammlungen </strong>, die Sie im Repository besitzen"
         works:
-          in_repo: "<strong> %{total_count} Arbeiten </ strong> im Repository"
+          in_repo: "<strong> %{total_count} Arbeiten </strong> im Repository"
           works_listing: Auflistung der Arbeiten
-          you_manage: "<strong> %{total_count} Arbeiten </ strong>, das Sie im Repository verwalten können"
-          you_own: "<strong> %{total_count} Arbeiten </ strong>, das Sie im Repository besitzen"
+          you_manage: "<strong> %{total_count} Arbeiten </strong>, das Sie im Repository verwalten können"
+          you_own: "<strong> %{total_count} Arbeiten </strong>, das Sie im Repository besitzen"
       sort_and_per_page:
         number_of_results_to_display_per_page: Anzahl der anzuzeigenden Ergebnisse pro Seite
     nav_safety:

data/config/locales/hyrax.es.yml

@@ -1412,14 +1412,14 @@ es:
       count:
         collections:
           collections_listing: Listado de colecciones
-          in_repo: "<strong> colecciones %{total_count} </ strong> en el repositorio"
-          you_manage: "<strong> colecciones %{total_count} </ strong> puede administrar en el repositorio"
-          you_own: "<strong> colecciones %{total_count} </ strong> que posee en el repositorio"
+          in_repo: "<strong> colecciones %{total_count} </strong> en el repositorio"
+          you_manage: "<strong> colecciones %{total_count} </strong> puede administrar en el repositorio"
+          you_own: "<strong> colecciones %{total_count} </strong> que posee en el repositorio"
         works:
-          in_repo: "<strong> %{total_count} funciona </ strong> en el repositorio"
+          in_repo: "<strong> %{total_count} funciona </strong> en el repositorio"
           works_listing: Listado de obras
-          you_manage: "<strong> %{total_count} funciona </ strong> puedes administrar en el repositorio"
-          you_own: "<strong> %{total_count} funciona </ strong> en el repositorio"
+          you_manage: "<strong> %{total_count} funciona </strong> puedes administrar en el repositorio"
+          you_own: "<strong> %{total_count} funciona </strong> en el repositorio"
       sort_and_per_page:
         number_of_results_to_display_per_page: Número de resultados a mostrar por página
     nav_safety:
@@ -1840,4 +1840,4 @@ es:
       html: <span class="badge badge-info required-tag">obligatorio</span>
   total_view:
     one: Este trabajo tiene 1 vista total
-    other: Este trabajo tiene un total de %{count} visualizaciones
+    other: Este trabajo tiene un total de %{count} visualizaciones

data/config/locales/hyrax.fr.yml

@@ -595,7 +595,7 @@ fr:
         depositor: Déposant
         directions: Indépendamment des paramètres de visibilité pour ce travail, vous pouvez également le partager avec d'autres utilisateurs et groupes.
         group: Groupe
-        permissions_save_note_html: Les autorisations ne sont <strong> pas </ strong> enregistrées tant que le & quot; Enregistrer & quot; bouton est enfoncé en bas de la page.
+        permissions_save_note_html: Les autorisations ne sont <strong> pas </strong> enregistrées tant que le & quot; Enregistrer & quot; bouton est enfoncé en bas de la page.
         use_add_button: Utilisez le bouton Ajouter pour donner accès à un %{account_label} à la fois (il sera ajouté à la liste ci-dessous). Sélectionnez l'utilisateur, par son nom ou par %{account_label} \. Ensuite, sélectionnez le niveau d'accès que vous souhaitez accorder et cliquez sur Ajouter ce %{account_label} pour terminer l'ajout de l'autorisation.
       form_thumbnail:
         help_html: Sélectionnez le fichier à utiliser comme vignette pour ce travail.
@@ -1411,14 +1411,14 @@ fr:
       count:
         collections:
           collections_listing: Liste des collections
-          in_repo: "<strong> Collections %{total_count} </ strong> dans le référentiel"
-          you_manage: "<strong> collections %{total_count} </ strong> que vous pouvez gérer dans le référentiel"
-          you_own: "<strong> collections %{total_count} </ strong> que vous possédez dans le référentiel"
+          in_repo: "<strong> Collections %{total_count} </strong> dans le référentiel"
+          you_manage: "<strong> collections %{total_count} </strong> que vous pouvez gérer dans le référentiel"
+          you_own: "<strong> collections %{total_count} </strong> que vous possédez dans le référentiel"
         works:
-          in_repo: "<strong> %{total_count} fonctionne </ strong> dans le référentiel"
+          in_repo: "<strong> %{total_count} fonctionne </strong> dans le référentiel"
           works_listing: Liste des travaux
-          you_manage: "<strong> %{total_count} fonctionne </ strong> vous pouvez gérer dans le référentiel"
-          you_own: "<strong> %{total_count} fonctionne </ strong> que vous possédez dans le référentiel"
+          you_manage: "<strong> %{total_count} fonctionne </strong> vous pouvez gérer dans le référentiel"
+          you_own: "<strong> %{total_count} fonctionne </strong> que vous possédez dans le référentiel"
       sort_and_per_page:
         number_of_results_to_display_per_page: Nombre de résultats à afficher par page
     nav_safety:
@@ -1839,4 +1839,4 @@ fr:
       html: <span class="badge badge-info required-tag">Champs obligatoires</span>
   total_view:
     one: Ce travail a 1 vue totale
-    other: Ce travail a zxzxxx0 vues au total
+    other: Ce travail a zxzxxx0 vues au total

data/config/locales/hyrax.it.yml

@@ -1410,14 +1410,14 @@ it:
       count:
         collections:
           collections_listing: Elenco delle collezioni
-          in_repo: "<strong> collezioni %{total_count} </ strong> nel repository"
-          you_manage: "<strong> collezioni %{total_count} </ strong> che puoi gestire nel repository"
-          you_own: "<strong> collezioni %{total_count} </ strong> che possiedi nel repository"
+          in_repo: "<strong> collezioni %{total_count} </strong> nel repository"
+          you_manage: "<strong> collezioni %{total_count} </strong> che puoi gestire nel repository"
+          you_own: "<strong> collezioni %{total_count} </strong> che possiedi nel repository"
         works:
-          in_repo: "<strong> %{total_count} funziona </ strong> nel repository"
+          in_repo: "<strong> %{total_count} funziona </strong> nel repository"
           works_listing: Elenco delle opere
-          you_manage: "<strong> %{total_count} funziona </ strong> che puoi gestire nel repository"
-          you_own: "<strong> %{total_count} funziona </ strong> nel repository"
+          you_manage: "<strong> %{total_count} funziona </strong> che puoi gestire nel repository"
+          you_own: "<strong> %{total_count} funziona </strong> nel repository"
       sort_and_per_page:
         number_of_results_to_display_per_page: Numero di risultati da visualizzare per pagina
     nav_safety:
@@ -1838,4 +1838,4 @@ it:
       html: <span class="badge badge-info required-tag">necessario</span>
   total_view:
     one: Quest'opera ha 1 vista totale
-    other: Questo lavoro ha %{count} visualizzazioni totali
+    other: Questo lavoro ha %{count} visualizzazioni totali

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

@@ -1405,14 +1405,14 @@ pt-BR:
       count:
         collections:
           collections_listing: Listagem de coleções
-          in_repo: "<strong> coleções %{total_count} </ strong> no repositório"
-          you_manage: "<strong> %{total_count} coleções</ strong> que você pode curatelar no repositório"
-          you_own: "<strong> %{total_count} coleções </ strong> que você possui no repositório"
+          in_repo: "<strong> coleções %{total_count} </strong> no repositório"
+          you_manage: "<strong> %{total_count} coleções</strong> que você pode curatelar no repositório"
+          you_own: "<strong> %{total_count} coleções </strong> que você possui no repositório"
         works:
-          in_repo: "<strong> %{total_count} obras </ strong> no repositório"
+          in_repo: "<strong> %{total_count} obras </strong> no repositório"
           works_listing: Lista de obras
-          you_manage: "<strong> %{total_count} obras </ strong> que você pode curatelar no repositório"
-          you_own: "<strong> %{total_count} obras </ strong> que você possui no repositório"
+          you_manage: "<strong> %{total_count} obras </strong> que você pode curatelar no repositório"
+          you_own: "<strong> %{total_count} obras </strong> que você possui no repositório"
       sort_and_per_page:
         number_of_results_to_display_per_page: Número de resultados a serem exibidos por página
     nav_safety:
@@ -1833,4 +1833,4 @@ pt-BR:
       html: <span class="badge badge-info required-tag">obrigatórios</span>
   total_view:
     one: Este trabalho tem 1 visualização total
-    other: Este trabalho tem %{count} visualizações totais
+    other: Este trabalho tem %{count} visualizações totais

data/config/locales/hyrax.zh.yml

@@ -592,7 +592,7 @@ zh:
         depositor: 储户
         directions: 无论此工作的可见性设置如何，您也可以与其他用户和组共享。
         group: 组
-        permissions_save_note_html: 权限<strong> </ strong>保存，直到“保存”为止。按钮在页面底部按下。
+        permissions_save_note_html: 权限<strong> </strong>保存，直到“保存”为止。按钮在页面底部按下。
         use_add_button: 使用添加按钮一次可以访问一个%{account_label}（它将被添加到下面的列表中）。按名称或%{account_label} \选择用户。然后选择您要授予的访问级别，并单击“添加此%{account_label}”以完成添加权限。
       form_thumbnail:
         help_html: 选择要用作此作品缩略图的文件。
@@ -1408,14 +1408,14 @@ zh:
       count:
         collections:
           collections_listing: 收藏清单
-          in_repo: 存储库中的<strong> %{total_count}集合</ strong>
-          you_manage: 您可以在存储库中管理<strong> %{total_count}集合</ strong>
-          you_own: 您在存储库中拥有<strong> %{total_count}集合</ strong>
+          in_repo: 存储库中的<strong> %{total_count}集合</strong>
+          you_manage: 您可以在存储库中管理<strong> %{total_count}集合</strong>
+          you_own: 您在存储库中拥有<strong> %{total_count}集合</strong>
         works:
-          in_repo: 存储库中的<strong> %{total_count}有效</ strong>
+          in_repo: 存储库中的<strong> %{total_count}有效</strong>
           works_listing: 作品清单
-          you_manage: 您可以在存储库中管理<strong> %{total_count}作品</ strong>
-          you_own: 您在存储库中拥有<strong> %{total_count}作品</ strong>
+          you_manage: 您可以在存储库中管理<strong> %{total_count}作品</strong>
+          you_own: 您在存储库中拥有<strong> %{total_count}作品</strong>
       sort_and_per_page:
         number_of_results_to_display_per_page: 每页显示的结果数
     nav_safety:
@@ -1836,4 +1836,4 @@ zh:
       html: <span class="badge badge-info required-tag">需要的</span>
   total_view:
     one: 该作品共有 1 次浏览
-    other: 此作品总浏览量为 %{count}
+    other: 此作品总浏览量为 %{count}

data/config/metadata/file_set_metadata.yaml

@@ -0,0 +1,130 @@
+# This is the metadata used for `Hyrax::FileSet`s.` It is similar to
+# `basic_metadata.yaml`, but not exactly the same.
+#
+# Terms which are already present in `core_metadata.yaml` are not repeated here.
+attributes:
+  # Required attributes:
+  creator:
+    type: string
+    multiple: true
+    form:
+      required: true
+      primary: true
+    index_keys:
+      - "creator_tesim"
+  license:
+    type: string
+    multiple: true
+    form:
+      required: true
+      primary: true
+
+  # Other attributes:
+  abstract:
+    type: string
+    multiple: true
+  # form:
+  #   primary: false
+  # missing: access_right
+  # missing: alternative_title
+  based_near:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "based_near_sim"
+      - "based_near_tesim"
+  # missing: bibliograpic_citation
+  contributor:
+    type: string
+    multiple: true
+    form:
+      primary: false
+  # required: creator
+  date_created:
+    type: date_time
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "date_created_tesim"
+  description:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "description_tesim"
+  identifier:
+    type: string
+    multiple: true
+    form:
+      primary: false
+  # missing: import_url
+  keyword:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "keyword_sim"
+      - "keyword_tesim"
+  # missing: publisher
+  label:
+    type: string
+  # form:
+  #   primary: false
+  language:
+    type: string
+    multiple: true
+    form:
+      primary: false
+  # required: license
+  publisher:
+    type: string
+    multiple: true
+    form:
+      primary: false
+  related_url:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "related_url_tesim"
+  relative_path:
+    type: string
+  resource_type:
+    type: string
+    multiple: true
+  # form:
+  #   primary: false
+    index_keys:
+      - "resource_type_sim"
+      - "resource_type_tesim"
+  rights_notes:
+    type: string
+    multiple: true
+  # form:
+  #   primary: false
+  rights_statement:
+    type: string
+    multiple: true
+  # form:
+  #   primary: true
+    index_keys:
+      - "rights_statement_tesim"
+  source:
+    type: string
+    multiple: true
+  # form:
+  #   primary: false
+  subject:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "subject_sim"
+      - "subject_tesim"