hyrax 3.0.2 → 3.1.0

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

@@ -1,6 +1,6 @@
 <div class="no-preview">
   <%= t('hyrax.works.show.no_preview') %>
-  <% if Hyrax.config.display_media_download_link? && !workflow_restriction?(file_set.try(:parent)) %>
+  <% if display_media_download_link?(file_set: file_set) %>
     <p /><%= link_to t('hyrax.file_set.show.download'),
       hyrax.download_path(file_set),
       id: "file_download",

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

@@ -1,4 +1,4 @@
-<% if Hyrax.config.display_media_download_link? && can?(:download, file_set.id) && !workflow_restriction?(file_set.try(:parent)) %>
+<% if display_media_download_link?(file_set: file_set) %>
     <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <%= image_tag thumbnail_url(file_set),

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

@@ -1,4 +1,4 @@
-<% if Hyrax.config.display_media_download_link? && !workflow_restriction?(file_set.try(:parent)) %>
+<% if display_media_download_link?(file_set: file_set) %>
     <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <%= image_tag thumbnail_url(file_set),

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

@@ -1,4 +1,4 @@
-<% if Hyrax.config.display_media_download_link? && !workflow_restriction?(file_set.try(:parent)) %>
+<% if display_media_download_link?(file_set: file_set) %>
   <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <%= image_tag thumbnail_url(file_set),

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

@@ -1,4 +1,4 @@
-<% if Hyrax.config.display_media_download_link? && !workflow_restriction?(file_set.try(:parent)) %>
+<% if display_media_download_link?(file_set: file_set) %>
   <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <video controls="controls" class="video-js vjs-default-skin" style="width:100%" data-setup="{}" controlsList="nodownload" preload="auto">

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

@@ -2,7 +2,7 @@
 <div class="container-fluid">
   <div class="row">
     <div class="col-xs-12 col-sm-4">
-      <%= media_display @presenter %>
+      <%= render media_display_partial(@presenter), file_set: @presenter %>
       <%= render 'show_actions', presenter: @presenter %>
       <%= render 'single_use_links', presenter: @presenter if @presenter.editor? %>
     </div>

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

@@ -41,16 +41,5 @@
         <%= t("hyrax.dashboard.my.action.delete_admin_set") %>
       <% end %>
     </li>
-    <% if Hyrax::CollectionType.any_nestable? %>
-        <li role="menuitem" tabindex="-1">
-          <%= link_to "#",
-                      class: 'itemicon add-to-collection',
-                      title: t("hyrax.dashboard.my.action.add_to_collection"),
-                      data: { nestable: false,
-                              hasaccess: (can?(:deposit, admin_set_presenter.solr_document)) } do %>
-              <%= t("hyrax.dashboard.my.action.add_to_collection") %>
-          <% end %>
-        </li>
-    <% end %>
   </ul>
 </div>

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

@@ -6,7 +6,6 @@
     <span class="sr-only"><%= t("hyrax.dashboard.my.sr.press_to") %> </span>
     <%= t("hyrax.dashboard.my.action.select") %> <span class="caret" aria-hidden="true"></span>
   </button>
-
   <ul role="menu" id="<%= ul_id %>" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= id %>">
     <li role="menuitem" tabindex="-1">
       <%= link_to hyrax.dashboard_collection_path(id),
@@ -43,7 +42,7 @@
       <% end %>
     </li>
 
-    <% if Hyrax::CollectionType.any_nestable? %>
+    <% if collection_presenter.collection_type_is_nestable? %>
       <% # The user should have deposit access to the parent we are adding, and read access to the child (the collection we are linking here). %>
       <li role="menuitem" tabindex="-1">
         <%= link_to "#",

data/app/views/hyrax/my/collections/_list_collections.html.erb

@@ -4,7 +4,7 @@
 <tr id="document_<%= id %>"
   data-source="my"
   data-id="<%= id %>"
-  data-colls-hash="<%= collection_presenter.available_parent_collections(scope: controller) %>"
+  data-colls-hash="<%= available_parent_collections_data(collection: collection_presenter) %>"
   data-post-url="<%= hyrax.dashboard_create_nest_collection_within_path(id) %>"
   data-post-delete-url="<%= is_admin_set ? hyrax.admin_admin_set_path(id) : hyrax.dashboard_collection_path(id) %>">
 

data/app/views/hyrax/my/collections/_modal_add_subcollection.html.erb

@@ -1,5 +1,4 @@
 <div class="modal fade disable-unless-selected" id="add-subcollection-modal-<%= id %>" tabindex="-1" role="dialog" aria-labelledby="add-subcollection-label">
-<% collection = ::Collection.find id %>
   <div class="modal-dialog" role="document">
     <div class="modal-content">
 
@@ -14,10 +13,9 @@
         <input type="hidden" name="source" value="<%= source %>" />
         <select name="child_id">
           <option value="none"><%= t("hyrax.dashboard.my.action.select") %></option>
-          <% colls = Hyrax::Collections::NestedCollectionQueryService.available_child_collections(parent: collection, scope: controller, limit_to_id: nil) %>
-          <% colls.each {|coll| %>
+          <% available_child_collections(collection: presenter).each do |coll| %>
             <option value="<%= coll.id %>"><%= coll.title.first %></option>
-          <% } %>
+          <% end %>
         </select>
       </div>
 
@@ -28,7 +26,7 @@
           disabled
           type="button"
           class="btn btn-primary modal-add-button modal-submit-button"
-          data-post-url="<%= dashboard_create_nest_collection_under_path(collection.id) %>"
+          data-post-url="<%= dashboard_create_nest_collection_under_path(presenter.id) %>"
           data-source="<%= source %>">
           <%= t('hyrax.collection.actions.nest_collections.button_label') %>
         </button>

data/bin/solrcloud-assign-configset.sh

@@ -5,20 +5,23 @@ if [ "$SOLR_ADMIN_USER" ]; then
   solr_user_settings="--user $SOLR_ADMIN_USER:$SOLR_ADMIN_PASSWORD"
 fi
 
+solr_config_name="${SOLR_CONFIGSET_NAME:-solrconfig}"
+solr_collection_name="${SOLR_COLLECTION_NAME:-hyrax}"
+
 # Solr Cloud Collection API URLs
 solr_collection_list_url="$SOLR_HOST:$SOLR_PORT/solr/admin/collections?action=LIST"
-solr_collection_modify_url="$SOLR_HOST:$SOLR_PORT/solr/admin/collections?action=MODIFYCOLLECTION&collection=$SOLR_COLLECTION_NAME&collection.configName=$SOLR_CONFIGSET_NAME"
+solr_collection_modify_url="$SOLR_HOST:$SOLR_PORT/solr/admin/collections?action=MODIFYCOLLECTION&collection=${solr_collection_name}&collection.configName=${solr_config_name}"
 
 while [ $COUNTER -lt 30 ]; do
   if nc -z "${SOLR_HOST}" "${SOLR_PORT}"; then
-    if curl --silent $solr_user_settings "$solr_collection_list_url" | grep -q "$SOLR_COLLECTION_NAME"; then
-      echo "-- Collection ${SOLR_COLLECTION_NAME} exists; setting ${SOLR_CONFIGSET_NAME} ConfigSet ..."
+    if curl --silent $solr_user_settings "$solr_collection_list_url" | grep -q "$solr_collection_name"; then
+      echo "-- Collection ${solr_collection_name} exists; setting ${solr_config_name} ConfigSet ..."
       echo $solr_collection_modify_url
       curl $solr_user_settings "$solr_collection_modify_url"
       exit
     else
-      echo "-- Collection ${SOLR_COLLECTION_NAME} does not exist; creating and setting ${SOLR_CONFIGSET_NAME} ConfigSet ..."
-      solr_collection_create_url="$SOLR_HOST:$SOLR_PORT/solr/admin/collections?action=CREATE&name=$SOLR_COLLECTION_NAME&collection.configName=$SOLR_CONFIGSET_NAME&numShards=1"
+      echo "-- Collection ${solr_collection_name} does not exist; creating and setting ${solr_config_name} ConfigSet ..."
+      solr_collection_create_url="$SOLR_HOST:$SOLR_PORT/solr/admin/collections?action=CREATE&name=${solr_collection_name}&collection.configName=${solr_config_name}&numShards=1"
       curl $solr_user_settings "$solr_collection_create_url"
       exit
     fi

data/bin/solrcloud-upload-configset.sh

@@ -8,9 +8,11 @@ if [ "$SOLR_ADMIN_USER" ]; then
   solr_user_settings="--user $SOLR_ADMIN_USER:$SOLR_ADMIN_PASSWORD"
 fi
 
+solr_config_name="${SOLR_CONFIGSET_NAME:-solrconfig}"
+
 # Solr Cloud ConfigSet API URLs
 solr_config_list_url="http://$SOLR_HOST:$SOLR_PORT/api/cluster/configs?omitHeader=true"
-solr_config_upload_url="http://$SOLR_HOST:$SOLR_PORT/solr/admin/configs?action=UPLOAD&name=$SOLR_CONFIGSET_NAME"
+solr_config_upload_url="http://$SOLR_HOST:$SOLR_PORT/solr/admin/configs?action=UPLOAD&name=${solr_config_name}"
 
 while [ $COUNTER -lt 30 ]; do
   echo "-- Looking for Solr (${SOLR_HOST}:${SOLR_PORT})..."
@@ -19,7 +21,7 @@ while [ $COUNTER -lt 30 ]; do
     if curl --silent --user 'fake:fake' "$solr_config_list_url" | grep -q '401'; then
       # the solr pods come up and report available before they are ready to accept trusted configs
       # only try to upload the config if auth is on.
-      if curl --silent $solr_user_settings "$solr_config_list_url" | grep -q "$SOLR_CONFIGSET_NAME"; then
+      if curl --silent $solr_user_settings "$solr_config_list_url" | grep -q "$solr_config_name"; then
         echo "-- ConfigSet already exists; skipping creation ...";
       else
         echo "-- ConfigSet for ${CONFDIR} does not exist; creating ..."

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: 0.18.0
+version: 0.22.0
 appVersion: 3.0.2
 dependencies:
   - name: fcrepo
-    version: 0.6.1
+    version: 0.8.0
     repository: oci://ghcr.io/samvera
     condition: fcrepo.enabled
   - name: memcached
@@ -26,6 +26,6 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
     condition: redis.enabled
   - name: solr
-    version: 0.2.2
+    version: 1.0.1
     repository: https://charts.bitnami.com/bitnami
     condition: solr.enabled

data/chart/hyrax/README.md

@@ -90,12 +90,58 @@ For those interested in trying out or contributing to this Chart, it's helpful
 to setup a simple cluster locally. Various projects exist to make this easy; we
 recommend [`k3d`][k3d] or [minikube][minikube].
 
-For example, with `k3d`:
+### Getting Started with K3D
+
+Make sure you have `docker`, `k3d`, and `helm` installed (e.g., for OSX run `brew install k3d` and `brew install helm`; and install `Docker Desktop`).
+
+Make sure you have Docker up and running.
+
+Run the following command; it will pull images and when finished you'll have a Kubernetes cluster running across a number of Docker containers.
 
 ```sh
 k3d cluster create dev-cluster --api-port 6550 -p 80:80@loadbalancer --agents 3
 ```
 
+When it's done, you should see something like the following output:
+
+```sh
+INFO[0251] You can now use it like this:
+kubectl config use-context k3d-dev-cluster
+kubectl cluster-info
+```
+
+Then update the helm charts with the following:
+
+```sh
+HELM_EXPERIMENTAL_OCI=1 helm dependency update chart/hyrax
+```
+
+Without the `HELM_EXPERIMENTAL_OCI=1` switch you might see the following error:
+
+```sh
+repository oci://ghcr.io/samvera is an OCI registry: this feature has been marked as experimental and is not enabled by default. Please set HELM_EXPERIMENTAL_OCI=1 in your environment to use this feature”
+```
+
+With the following command, you'll next want to install hyrax into a namespace.  The namespace directive helps convey the meaning of the kubernetes cluster; and helps you manage all of the resources for that namespace (e.g., "production" or "testing").
+
+```sh
+helm install --create-namespace --namespace hyrax dassie chart/hyrax
+```
+
+This creates the Helm release named `dassie`, in the namespace `hyrax`.  This command will echo instructions for exposing the running application URL.
+
+You'll be downloading a lot of packages, and this will take quite a bit of time (depending on your bandwidth, and depending on how your ISP allocates resources, you may experience network connectivity issues that are VERY hard to troubleshoot; at least that was Jeremy's experience as he kept getting `ImagePullBackOff` errors.  The recommendation, find a different network to install Kubernetes).
+
+You can check the status by running `kubectl --namespace hyrax get pods --watch`.  To learn more about a failed pod, you can run `kubectl describe pod <named pod> --namespace hyrax`.  The events section (at the bottom of the output) will be useful for troubleshooting.
+
+Some shell commands of house cleaning and destruction:
+
+*  To stop the cluster: `k3d cluster stop dev-cluster`.
+*  To delete the cluster: `k3d cluster delete dev-cluster`.
+*  Remove existing docker instances: `docker rm $(docker ps -q -f status=exited)`
+*  Remove hanging docker instances: `docker rm $(docker ps -a -q) -f`
+*  Removing dangling docker images: `docker rmi $(docker images -f "dangling=true" -q)`
+
 [containers]: ../../CONTAINERS.md#hyrax-image
 [dassie]: ../../.dassie/README.md
 [dassie-image]: https://hub.docker.com/r/samveralabs/dassie

data/chart/hyrax/templates/_helpers.tpl

@@ -74,7 +74,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- if .Values.fcrepo.enabled }}
 {{- include "hyrax.fcrepo.fullname" . }}
 {{- else }}
-{{- .Values.externalFcrepoHost }}
+{{- .Values.externalFcrepoHost | default "NO_FCREPO_HOST_DEFINED" }}
 {{- end }}
 {{- end -}}
 

data/chart/hyrax/templates/configmap-env.yaml

@@ -25,12 +25,10 @@ data:
   {{- if .Values.redis.enabled }}
   REDIS_HOST: {{ template "hyrax.redis.host" . }}
   {{- end }}
-  {{- if .Values.fcrepo.enabled }}
-  FCREPO_BASE_PATH: {{ .Values.fcrepoBasePathOverride | default (printf "/%s" (include "hyrax.fullname" .)) | quote }}
   FCREPO_HOST: {{ template "hyrax.fcrepo.host" . }}
+  FCREPO_BASE_PATH: {{ .Values.fcrepoBasePathOverride | default (printf "/%s" (include "hyrax.fullname" .)) | quote }}
   FCREPO_PORT: {{ .Values.fcrepo.servicePort | default 8080 | quote }}
   FCREPO_REST_PATH: {{ .Values.fcrepo.restPath | default "rest" }}
-  {{- end }}
   REDIS_PROVIDER: SIDEKIQ_REDIS_URL
   {{- if .Values.minio.enabled }}
   MINIO_ENDPOINT: {{ template "hyrax.minio.fullname" . }}

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

@@ -20,9 +20,6 @@ spec:
         {{- include "hyrax.selectorLabels" . | nindent 8 }}
     spec:
       initContainers:
-        {{- if .Values.worker.extraInitContainers }}
-        {{- toYaml .Values.worker.extraInitContainers | nindent 8 }}
-        {{- end }}
         - name: db-wait
           image: "{{ .Values.worker.image.repository }}:{{ .Values.worker.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.worker.image.pullPolicy }}
@@ -37,6 +34,9 @@ spec:
             - sh
             - -c
             - db-wait.sh "$REDIS_HOST:6379"
+        {{- if .Values.worker.extraInitContainers }}
+        {{- toYaml .Values.worker.extraInitContainers | nindent 8 }}
+        {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -82,6 +82,9 @@ spec:
             {{- end }}
           resources:
             {{- toYaml .Values.worker.resources | nindent 12 }}
+          {{- with .Values.extraContainerConfiguration }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
       volumes:
         - name: "derivatives"
           {{- if and .Values.derivativesVolume.enabled .Values.derivativesVolume.existingClaim }}

data/chart/hyrax/templates/deployment.yaml

@@ -21,9 +21,6 @@ spec:
         {{- include "hyrax.selectorLabels" . | nindent 8 }}
     spec:
       initContainers:
-        {{- if .Values.extraInitContainers }}
-        {{- toYaml .Values.extraInitContainers | nindent 8 }}
-        {{- end }}
         {{- if .Values.loadSolrConfigSet }}
         - name: load-solr-config
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
@@ -46,6 +43,7 @@ spec:
               solrcloud-upload-configset.sh /app/samvera/hyrax-webapp/solr/conf &&
               solrcloud-assign-configset.sh
         {{- end }}
+        {{- if not .Values.skipDbMigrateSeed }}
         - name: db-setup
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -67,6 +65,10 @@ spec:
             - sh
             - -c
             - db-migrate-seed.sh
+        {{- end }}
+        {{- if .Values.extraInitContainers }}
+        {{- toYaml .Values.extraInitContainers | nindent 8 }}
+        {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -142,6 +144,9 @@ spec:
             {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          {{- with .Values.extraContainerConfiguration }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
       volumes:
         - name: "branding"
           {{- if and .Values.brandingVolume.enabled .Values.brandingVolume.existingClaim }}

data/chart/hyrax/values.yaml

@@ -12,6 +12,9 @@ image:
 
 # use true to skip loading Hyrax engine database seed file
 skipHyraxEngineSeed: false
+# use true to skip running the `db-setup` initContainer
+# this may be desirable for downstream chart users to customize their database setup
+skipDbMigrateSeed: false
 
 # use false to skip the configset management init container
 loadSolrConfigSet: true
@@ -53,6 +56,15 @@ extraInitContainers: []
 #
 extraEnvFrom: []
 
+# Extra container spec configuration
+# Example: (enabling pry debugging for local development)
+# Note: with this enabled, one can `kubectl attach` to a running container with a binding.pry breakpoint
+#
+#extraContainerConfiguration:
+# stdin: true
+# tty: true
+extraContainerConfiguration: []
+
 # an existing volume containing a Hyrax-based application
 # must be a ReadWriteMany volume if worker is enabled
 applicationExistingClaim: ""

data/config/brakeman.ignore

@@ -68,7 +68,7 @@
       "file": "app/controllers/hyrax/users_controller.rb",
       "line": 38,
       "link": "http://brakemanscanner.org/docs/warning_types/sql_injection/",
-      "code": "::User.where(*base_query).where(\"#{Hydra.config.user_key_field} like lower(?) OR display_name like lower(?)\", (nil or ((\"%\" + query.downcase) + \"%\")), (nil or ((\"%\" + query.downcase) + \"%\"))).registered.where(\"#{Hydra.config.user_key_field} not in (?)\", [::User.batch_user_key, ::User.audit_user_key])",
+      "code": "::User.where(*base_query).where(\"#{Hydra.config.user_key_field} like lower(?) OR display_name like lower(?)\", (nil or ((\"%\" + query.downcase) + \"%\")), (nil or ((\"%\" + query.downcase) + \"%\"))).registered.where(\"#{Hydra.config.user_key_field} not in (?)\", [::User.system_user_key, ::User.batch_user_key, ::User.audit_user_key])",
       "render_path": null,
       "location": {
         "type": "method",
@@ -88,7 +88,7 @@
       "file": "app/models/concerns/hyrax/user.rb",
       "line": 27,
       "link": "http://brakemanscanner.org/docs/warning_types/sql_injection/",
-      "code": "where(\"#{Hydra.config.user_key_field} not in (?)\", [::User.batch_user_key, ::User.audit_user_key])",
+      "code": "where(\"#{Hydra.config.user_key_field} not in (?)\", [::User.system_user_key, ::User.batch_user_key, ::User.audit_user_key])",
       "render_path": null,
       "location": {
         "type": "method",

data/config/locales/hyrax.de.yml

@@ -1215,7 +1215,7 @@ de:
         subject: Stapelweises Hochladen abgeschlossen
         title: Dateien erfolgreich hochgeladen
     models:
-      hyrax/file_set: Dateisatz
+      file_set: Dateisatz
       hyrax/pcdm_collection: Sammlung
       hyrax/work: Arbeit
     my:

data/config/locales/hyrax.en.yml

@@ -1221,7 +1221,7 @@ en:
         subject: Batch upload complete
         title: Files uploaded successfully
     models:
-      hyrax/file_set: File Set
+      file_set: File Set
       hyrax/pcdm_collection: Collection
       hyrax/work: Work
     my:

data/config/locales/hyrax.es.yml

@@ -1222,7 +1222,7 @@ es:
         subject: Subida en lote completa
         title: Archivos cargados satisfactoriamente
     models:
-      hyrax/file_set: Conjunto de archivos
+      file_set: Conjunto de archivos
       hyrax/pcdm_collection: Colección
       hyrax/work: Trabaja
     my:

data/config/locales/hyrax.fr.yml

@@ -1221,7 +1221,7 @@ fr:
         subject: Téléchargement par lots complet
         title: Fichiers téléchargés avec succès
     models:
-      hyrax/file_set: Ensemble de fichiers
+      file_set: Ensemble de fichiers
       hyrax/pcdm_collection: Collection
       hyrax/work: Travailler
     my:

data/config/locales/hyrax.it.yml

@@ -1220,7 +1220,7 @@ it:
         subject: Caricamento batch completato
         title: I file sono stati caricati correttamente
     models:
-      hyrax/file_set: Set di file
+      file_set: Set di file
       hyrax/pcdm_collection: Collezione
       hyrax/work: Opera
     my: