hyrax 5.0.0 → 5.0.3

data/app/views/hyrax/pages/_form.html.erb

@@ -2,22 +2,22 @@
 <div class="card tabs">
 
   <ul class="nav nav-tabs" role="tablist">
-    <li class="nav-item">
+    <li class="nav-item" role="presentation">
       <a href="#about" role="tab" data-toggle="tab" class="nav-link active nav-safety-confirm">
         <%= t(:'hyrax.pages.tabs.about_page') %>
       </a>
     </li>
-    <li class="nav-item">
+    <li class="nav-item" role="presentation">
       <a href="#help" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
         <%= t(:'hyrax.pages.tabs.help_page') %>
       </a>
     </li>
-    <li class="nav-item">
+    <li class="nav-item" role="presentation">
       <a href="#agreement" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
         <%= t(:'hyrax.pages.tabs.agreement_page') %>
       </a>
     </li>
-    <li class="nav-item">
+    <li class="nav-item" role="presentation">
       <a href="#terms" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
         <%= t(:'hyrax.pages.tabs.terms_page') %>
       </a>
@@ -36,7 +36,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.edit_pages_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
@@ -52,7 +52,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.edit_pages_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
@@ -68,7 +68,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.edit_pages_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
@@ -84,7 +84,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.edit_pages_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>

data/app/views/hyrax/transfers/_received.html.erb

@@ -23,7 +23,7 @@
         <% if req.pending? %>
             <div class="btn-group">
               <button class="btn btn-sm btn-primary" href="#"><%= t(".accept") %></button>
-              <button class="btn btn-sm dropdown-toggle accept" data-toggle="dropdown" href="#"></button>
+              <button class="btn btn-sm dropdown-toggle accept" data-toggle="dropdown" href="#"><span class="sr-only">accept options</span></button>
               <ul class="dropdown-menu">
                 <li class="dropdown-item">
                   <%= link_to t(".allow_depositor_to_retain_edit_access"), hyrax.accept_transfer_path(req), method: :put, class: 'accept-retain', title: t(".accept_the_file_and_allow_the_original_depositor_to_retain_access_to_edit_the_file_and_metadata") %>

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

@@ -1,20 +1,20 @@
 <!-- The template to display files available for upload -->
-<% fade_class_if_not_test = Rails.env.test? ? 'show' : 'fade show' %>
+<% fade_class_if_not_test = Rails.env.test? ? '' : 'fade' %>
 <script id="template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
     <tr class="template-upload <%= fade_class_if_not_test %>">
-        <span>
+        <td>
             <span class="preview"></span>
-        </span>
-        <span>
+        </td>
+        <td>
             <p class="name">{%=file.name%}</p>
             <strong class="error text-danger"></strong>
-        </span>
-        <span>
+        </td>
+        <td>
             <p class="size">Processing...</p>
             <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div></div>
-        </span>
-        <span class="text-right">
+        </td>
+        <td class="text-right">
             {% if (!i && !o.options.autoUpload) { %}
                 <button class="btn btn-primary start" disabled>
                     <span class="fa fa-upload"></span>
@@ -27,7 +27,7 @@
                     <span><%= t('helpers.action.cancel') %></span>
                 </button>
             {% } %}
-        </span>
+        </td>
     </tr>
 {% } %}
 </script>

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

@@ -1,7 +1,7 @@
 <!-- The template to display files available for upload -->
 <script id="template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-upload fade show">
+    <tr class="template-upload fade">
       <td>
         <span class="preview"></span>
       </td>
@@ -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 show">
+        <span class="template-download fade">
           <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 show">
+            <span class="template-download fade">
             <div class="row branding-logo-row">
               <div class="col-sm-3">
                 <span class="preview">

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

@@ -1,5 +1,5 @@
 <!-- The template to display files available for upload -->
-<% fade_class_if_not_test = Rails.env.test? ? 'show' : 'fade show' %>
+<% fade_class_if_not_test = Rails.env.test? ? '' : 'fade' %>
 <script id="versioning-template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
     <tr class="template-upload <%= fade_class_if_not_test %>">

data/app/views/hyrax/uploads/create.json.jbuilder

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 json.files [@upload] do |uploaded_file|
   json.id uploaded_file.id
-  json.name uploaded_file.file.file.filename
-  json.size uploaded_file.file.file.size
+  json.name uploaded_file.file&.file&.filename
+  json.size uploaded_file.file&.file&.size
   # TODO: implement these
   # json.url  "/uploads/#{uploaded_file.id}"
   # json.thumbnail_url uploaded_file.id

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

@@ -7,17 +7,23 @@
       </tr>
     </thead>
     <tbody>
-    <% events.each do |event| %>
-      <% next if event[:action].blank? or event[:timestamp].blank? %>
+    <% valid_events = events.reject { |event| event[:action].blank? || event[:timestamp].blank? } %>
+    <% if valid_events.empty? %>
       <tr>
-        <td class="ensure-wrapped"><%= sanitize event[:action] %></td>
-        <% time = Time.zone.at(event[:timestamp].to_i) %>
-        <td data-sort="<%= time.getutc.iso8601(5) %>">
-          <relative-time datetime="<%= time.getutc.iso8601 %>" title="<%= time.to_formatted_s(:standard) %>">
-            <%= time.to_formatted_s(:long_ordinal) %>
-          </relative-time>
-        </td>
+        <td colspan="2">No user activity</td>
       </tr>
+    <% else %>
+      <% valid_events.each do |event| %>
+        <tr>
+          <td class="ensure-wrapped"><%= sanitize event[:action] %></td>
+          <% time = Time.zone.at(event[:timestamp].to_i) %>
+          <td data-sort="<%= time.getutc.iso8601(5) %>">
+            <relative-time datetime="<%= time.getutc.iso8601 %>" title="<%= time.to_formatted_s(:standard) %>">
+              <%= time.to_formatted_s(:long_ordinal) %>
+            </relative-time>
+          </td>
+        </tr>
+      <% end %>
     <% end %>
     </tbody>
   </table>

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

@@ -1,8 +1,11 @@
 <tr>
-  <td><%= link_to hyrax.user_path(user) do %>
-        <%= image_tag(user.avatar.url(:thumb), width: 30) if user.avatar.file %>
+   <td>
+     <% if user.avatar.file %>
+      <%= link_to hyrax.user_path(user) do %>
+        <%= image_tag(user.avatar.url(:thumb), width: 30, alt: user.name) %>
       <% end %>
-  </td>
+     <% end %>
+   </td>
    <td><%= link_to user.name, hyrax.user_path(user) %></td>
    <td><%= link_to user.user_key, hyrax.user_path(user) %></td>
    <td><%= user.department %></td>

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

@@ -12,7 +12,8 @@
   <span class="fa fa-upload" aria-hidden="true"></span> <%= link_to_works(user) %>
 
   <ul class="views-downloads-dashboard list-unstyled">
-      <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>
+    <li><span class="badge badge-optional dark-text"><%= user.total_work_views %></span> <%= t("hyrax.dashboard.stats.work_views").pluralize(user.total_work_views) %></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/app/views/layouts/_head_tag_content.html.erb

@@ -29,6 +29,8 @@ signed in %>
 <% if Hyrax.config.analytics? %>
   <% if Hyrax.config.analytics_provider == 'google' %>
     <%= render partial: 'shared/ga', formats: [:html]  %>
+  <% elsif Hyrax.config.analytics_provider == 'ga4' %>
+    <%= render partial: 'shared/ga4', formats: [:html] %>
   <% elsif Hyrax.config.analytics_provider == 'matomo' %>
     <%= render partial: 'shared/matomo', formats: [:html] %>
   <% end %>

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

@@ -14,11 +14,15 @@ a { color: <%= appearance.link_color %>; }
 .navbar-dark.bg-dark .navbar-text,
 .navbar-dark.bg-dark .navbar-brand { color: <%= appearance.header_text_color %>; }
 
-.btn-primary {
+.btn-primary, .page-item.active .page-link {
   background-color: <%= appearance.primary_button_background_color %>;
   border-color: <%= appearance.primary_button_border_color %>;
 }
 
+.page-link {
+  color: <%= appearance.primary_button_background_color %>;
+}
+
 .btn-primary:focus,
 .btn-primary.focus {
   background-color: <%= appearance.primary_button_focus_background_color %>;

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

@@ -0,0 +1,11 @@
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=<%= Hyrax::Analytics.config.analytics_id %>"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', '<%= Hyrax::Analytics.config.analytics_id %>');
+  window.analytics = gtag;
+</script>
+<meta name="analytics-provider" content="ga4">

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

@@ -7,12 +7,21 @@
         <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.heading_actions.close') %>"><span aria-hidden="true">&times;</span></button>
       </div>
       <div class="modal-body">
+        <% if Flipflop.assign_admin_set? %>
+          <div class="select-work-admin-set">
+            <div class="admin-set-title">
+              <%= t('hyrax.dashboard.heading_actions.select_admin_set') %>
+            </div>
+            <%= select_tag(:admin_set_id, options_for_select(@admin_sets_for_select), class: 'form-control') if @admin_sets_for_select %>
+          </div>
+        <% end %>
         <% create_work_presenter.each do |row_presenter| %>
           <div class="select-worktype">
             <label>
               <input type="radio" name="payload_concern" value="<%= row_presenter.concern %>"
                                                            data-single="<%= row_presenter.switch_to_new_work_path(route_set: main_app, params: params) %>"
-                                                           data-batch="<%= row_presenter.switch_to_batch_upload_path(route_set: hyrax, params: params) %>" />
+                                                           data-batch="<%= row_presenter.switch_to_batch_upload_path(route_set: hyrax, params: params) %>"
+                                                           required />
               <div class="select-work-icon">
                 <span class="<%= row_presenter.icon_class %>"></span>
               </div>

data/bin/db-migrate-seed.sh

@@ -1,13 +1,13 @@
 #!/bin/sh
 set -e
 
-db-wait.sh "$DB_HOST:$DB_PORT"
+service-wait.sh "$DB_HOST:$DB_PORT"
 bundle exec rails db:create
 bundle exec rails db:migrate
 
 if [ "$FCREPO_HOST" ]; then
-  db-wait.sh "$FCREPO_HOST:$FCREPO_PORT"
+  service-wait.sh "$FCREPO_HOST:$FCREPO_PORT"
 fi
-db-wait.sh "$SOLR_HOST:$SOLR_PORT"
+service-wait.sh "$SOLR_HOST:$SOLR_PORT"
 
 bundle exec rails db:seed

data/bin/dev-entrypoint.sh

@@ -1,13 +1,18 @@
 #!/bin/sh
 set -e
 
-mkdir -p /app/samvera/hyrax-webapp/tmp/pids
-rm -f /app/samvera/hyrax-webapp/tmp/pids/*
+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]")
 
 # 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
+
+db-migrate-seed.sh
 
 # Run the command
 exec "$@"

data/bin/{db-wait.sh → service-wait.sh}

@@ -5,9 +5,9 @@ port=$(printf "%s\n" "$1"| cut -d : -f 2)
 
 shift 1
 
+echo "silently waiting for $host:$port"
 while ! nc -z "$host" "$port"
 do
-  echo "waiting for $host:$port"
   sleep 1
 done
 

data/bin/worker-entrypoint.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+# Wait for web app to avoid racing during bundle install
+service-wait.sh web:3000
+
+# Run the command
+exec "$@"

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: 3.6.0
+version: 3.7.0
 appVersion: 5.0.0
 dependencies:
   - name: fcrepo

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

@@ -20,7 +20,7 @@ spec:
         {{- include "hyrax.workerSelectorLabels" . | nindent 8 }}
     spec:
       initContainers:
-        - name: db-wait
+        - name: service-wait
           image: "{{ .Values.worker.image.repository }}:{{ .Values.worker.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.worker.image.pullPolicy }}
           envFrom:
@@ -35,7 +35,7 @@ spec:
           command:
             - sh
             - -c
-            - db-wait.sh "$REDIS_HOST:6379"
+            - service-wait.sh "$REDIS_HOST:6379"
         {{- if .Values.worker.extraInitContainers }}
         {{- toYaml .Values.worker.extraInitContainers | nindent 8 }}
         {{- end }}

data/chart/hyrax/templates/deployment.yaml

@@ -112,6 +112,18 @@ spec:
             - name: http
               containerPort: 3000
               protocol: TCP
+          {{- if .Values.startupProbe.enabled }}
+          startupProbe:
+            initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds | default 5 }}
+            timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds | default 5 }}
+            failureThreshold: {{ .Values.startupProbe.failureThreshold | default 3 }}
+            periodSeconds: {{ .Values.startupProbe.periodSeconds | default 10}}
+            successThreshold: {{ .Values.startupProbe.successThreshold | default 1 }}
+            httpGet:
+              scheme: "HTTP"
+              path: {{ .Values.startupProbe.path | default "/" }}
+              port: 3000
+          {{- end }}
           {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 5 }}

data/chart/hyrax/values.yaml

@@ -188,6 +188,16 @@ readinessProbe:
   # failureThreshold: 6
   # successThreshold: 1
 
+# consider enabling if you are experiencing slow startup times
+startupProbe:
+  enabled: false
+  # path: "/healthz"
+  # initialDelaySeconds: 30
+  # periodSeconds: 30
+  # timeoutSeconds: 5
+  # failureThreshold: 3
+  # successThreshold: 1
+
 resources: {}
 
 worker:

data/config/locales/hyrax.en.yml

@@ -998,6 +998,7 @@ en:
       heading_actions:
         close: Close
         create_work: Create work
+        select_admin_set: Deposit into admin set
         select_type_of_work: Select type of work
       manage_proxies: Manage Proxies
       managed:
@@ -1140,8 +1141,9 @@ en:
         graph_reports: Customized Graph Reports
       stats:
         collections: Collections created
-        file_downloads: Download
-        file_views: View
+        work_views: Metadata View
+        file_downloads: File Download
+        file_views: File View
         files: Files deposited
         heading: Your Statistics
         joined_on: Joined on

data/config/metadata/basic_metadata.yaml

@@ -6,6 +6,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "abstract_sim"
       - "abstract_tesim"
     predicate: http://purl.org/dc/terms/abstract
   access_right:
@@ -14,6 +15,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "access_right_sim"
       - "access_right_tesim"
     predicate: http://purl.org/dc/terms/accessRights
   alternative_title:
@@ -22,6 +24,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "alternative_title_sim"
       - "alternative_title_tesim"
     predicate: http://purl.org/dc/terms/alternative
   arkivo_checksum:
@@ -42,6 +45,11 @@ attributes:
   bibliographic_citation:
     type: string
     multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "bibliographic_citation_sim"
+      - "bibliographic_citation_tesim"
     predicate: http://purl.org/dc/terms/bibliographicCitation
   contributor:
     type: string
@@ -59,6 +67,7 @@ attributes:
       required: true
       primary: true
     index_keys:
+      - "creator_sim"
       - "creator_tesim"
     predicate: http://purl.org/dc/elements/1.1/creator
   date_created:
@@ -67,6 +76,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "date_created_sim"
       - "date_created_tesim"
     predicate: http://purl.org/dc/terms/created
   description:
@@ -75,6 +85,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "description_sim"
       - "description_tesim"
     predicate: http://purl.org/dc/elements/1.1/description
   identifier:
@@ -83,6 +94,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "identifier_sim"
       - "identifier_tesim"
     predicate: http://purl.org/dc/terms/identifier
   import_url:
@@ -103,6 +115,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "publisher_sim"
       - "publisher_tesim"
     predicate: http://purl.org/dc/elements/1.1/publisher
   label:
@@ -110,6 +123,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "label_sim"
       - "label_tesim"
     predicate: info:fedora/fedora-system:def/model#downloadFilename
   language:
@@ -118,6 +132,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "language_sim"
       - "language_tesim"
     predicate: http://purl.org/dc/elements/1.1/language
   license:
@@ -126,6 +141,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "license_sim"
       - "license_tesim"
     predicate: http://purl.org/dc/terms/license
   relative_path:
@@ -137,6 +153,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "related_url_sim"
       - "related_url_tesim"
     predicate: http://www.w3.org/2000/01/rdf-schema#seeAlso
   resource_type:
@@ -154,6 +171,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "rights_notes_sim"
       - "rights_notes_tesim"
     predicate: http://purl.org/dc/elements/1.1/rights
   rights_statement:
@@ -162,6 +180,7 @@ attributes:
     form:
       primary: true
     index_keys:
+      - "rights_statement_sim"
       - "rights_statement_tesim"
     predicate: http://www.europeana.eu/schemas/edm/rights
   source:
@@ -170,6 +189,7 @@ attributes:
     form:
       primary: false
     index_keys:
+      - "source_sim"
       - "source_tesim"
     predicate: http://purl.org/dc/terms/source
   subject:

data/config/metadata/hyrax_internal_metadata.yaml

@@ -14,7 +14,7 @@ attributes:
   compression:
     predicate: http://vocabulary.samvera.org/ns#compressionScheme
   created_at:
-    predicate: http://purl.org/dc/terms/created
+    predicate: http://vocabulary.samvera.org/ns#created_at
   file_identifier:
     predicate: http://vocabulary.samvera.org/ns#fileIdentifier
   file_ids: