hyrax 5.0.0.rc1 → 5.0.0.rc2

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

@@ -7,7 +7,7 @@
     </label>
 
     <div class="input-group mb-sm-auto col-sm-9">
-      <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
+      <%= text_field_tag :q, current_search_parameters , 'aria-label': 'Search', class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
       <div class="input-group-append">
         <button type="submit" class="btn btn-primary" id="search-submit-header">
           <%= t('hyrax.search.button.html') %>

data/app/views/hyrax/notifications/_notifications.html.erb

@@ -1,6 +1,6 @@
 <% if messages.present? %>
   <div class="table-responsive">
-    <table class="table table-striped datatable">
+    <table class="table table-striped datatable" data-order='[[0, "desc"]]'>
       <thead>
         <tr>
           <th><%= t('hyrax.mailbox.date') %></th>

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

@@ -9,7 +9,7 @@
 
 <div class="list-group-item">
   <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}) %>
+  <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>

data/bin/dev-entrypoint.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+mkdir -p /app/samvera/hyrax-webapp/tmp/pids
+rm -f /app/samvera/hyrax-webapp/tmp/pids/*
+
+# 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
+
+# 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.3.0
+version: 3.5.0
 appVersion: 3.3.0
 dependencies:
   - name: fcrepo
@@ -34,6 +34,6 @@ dependencies:
     repository: oci://registry-1.docker.io/bitnamicharts
     condition: nginx.enabled
   - name: fits
-    version: 0.1.0
-    repository:  https://samvera-labs.github.io/fits-charts
+    version: 0.2.0
+    repository: https://samvera-labs.github.io/fits-charts
     condition: fits.enabled

data/chart/hyrax/templates/_helpers.tpl

@@ -147,6 +147,14 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end }}
 {{- end -}}
 
+{{- define "hyrax.postgresql.port" -}}
+{{- if .Values.postgresql.enabled }}
+{{- .Values.postgresql.containerPorts.postgresql | default 5432 }}
+{{- else }}
+{{- .Values.externalPostgresql.port | default 5432 }}
+{{- end }}
+{{- end -}}
+
 {{- define "hyrax.postgresql.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" . ) -}}
 {{- end -}}

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

@@ -14,7 +14,7 @@ data:
   CH12N_TOOL: "fits"
   {{- end }}
   DB_HOST: {{ template "hyrax.postgresql.host" . }}
-  DB_PORT: {{ .Values.postgresql.containerPorts.postgresql | default 5432 | quote }}
+  DB_PORT: {{ include "hyrax.postgresql.port" . | quote }}
   DB_USERNAME: {{ template "hyrax.postgresql.database" . }}
   {{- if .Values.memcached.enabled }}
   MEMCACHED_HOST: {{ template "hyrax.memcached.fullname" . }}

data/chart/hyrax/values.yaml

@@ -119,6 +119,7 @@ externalPostgresql: {}
 #  username:
 #  password:
 #  database:
+#  port:
 
 embargoRelease:
   enabled: true
@@ -265,6 +266,8 @@ postgresql:
     database: hyrax
     password: hyrax_pass
     username: hyrax
+  containerPorts:
+    postgresql: 5432
   primary:
     service:
       ports:

data/config/initializers/file_length_patch.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# Valkyrie::Storage::Fedora expects io objects to have #length
+class ::File
+  alias length size unless respond_to? :length
+end
+
+class ::Valkyrie::StorageAdapter::StreamFile
+  alias length size unless respond_to? :length
+end

data/config/metadata/basic_metadata.yaml

@@ -1,19 +1,35 @@
+---
 attributes:
   abstract:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "abstract_tesim"
+    predicate: http://purl.org/dc/terms/abstract
   access_right:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "access_right_tesim"
+    predicate: http://purl.org/dc/terms/accessRights
   alternative_title:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "alternative_title_tesim"
+    predicate: http://purl.org/dc/terms/alternative
+  arkivo_checksum:
+    type: string
+    multiple: false
+    form:
+      primary: false
+    predicate: http://scholarsphere.psu.edu/ns#arkivoChecksum
   based_near:
     type: string
     multiple: true
@@ -22,14 +38,19 @@ attributes:
     index_keys:
       - "based_near_sim"
       - "based_near_tesim"
+    predicate: http://xmlns.com/foaf/0.1/based_near
   bibliographic_citation:
     type: string
     multiple: true
+    predicate: http://purl.org/dc/terms/bibliographicCitation
   contributor:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "contributor_tesim"
+    predicate: http://purl.org/dc/elements/1.1/contributor
   creator:
     type: string
     multiple: true
@@ -38,6 +59,7 @@ attributes:
       primary: true
     index_keys:
       - "creator_tesim"
+    predicate: http://purl.org/dc/elements/1.1/creator
   date_created:
     type: date_time
     multiple: true
@@ -45,6 +67,7 @@ attributes:
       primary: false
     index_keys:
       - "date_created_tesim"
+    predicate: http://purl.org/dc/terms/created
   description:
     type: string
     multiple: true
@@ -52,13 +75,18 @@ attributes:
       primary: false
     index_keys:
       - "description_tesim"
+    predicate: http://purl.org/dc/elements/1.1/description
   identifier:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "identifier_tesim"
+    predicate: http://purl.org/dc/terms/identifier
   import_url:
     type: string
+    predicate: http://scholarsphere.psu.edu/ns#importUrl
   keyword:
     type: string
     multiple: true
@@ -67,27 +95,41 @@ attributes:
       - "keyword_tesim"
     form:
       primary: false
+    predicate: http://schema.org/keywords
   publisher:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "publisher_tesim"
+    predicate: http://purl.org/dc/elements/1.1/publisher
   label:
     type: string
     form:
       primary: false
+    index_keys:
+      - "label_tesim"
+    predicate: info:fedora/fedora-system:def/model#downloadFilename
   language:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "language_tesim"
+    predicate: http://purl.org/dc/elements/1.1/language
   license:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "license_tesim"
+    predicate: http://purl.org/dc/terms/license
   relative_path:
     type: string
+    predicate: http://scholarsphere.psu.edu/ns#relativePath
   related_url:
     type: string
     multiple: true
@@ -95,6 +137,7 @@ attributes:
       primary: false
     index_keys:
       - "related_url_tesim"
+    predicate: http://www.w3.org/2000/01/rdf-schema#seeAlso
   resource_type:
     type: string
     multiple: true
@@ -103,11 +146,15 @@ attributes:
     index_keys:
       - "resource_type_sim"
       - "resource_type_tesim"
+    predicate: http://purl.org/dc/terms/type
   rights_notes:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "rights_notes_tesim"
+    predicate: http://purl.org/dc/elements/1.1/rights
   rights_statement:
     type: string
     multiple: true
@@ -115,11 +162,15 @@ attributes:
       primary: true
     index_keys:
       - "rights_statement_tesim"
+    predicate: http://www.europeana.eu/schemas/edm/rights
   source:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "source_tesim"
+    predicate: http://purl.org/dc/terms/source
   subject:
     type: string
     multiple: true
@@ -128,3 +179,4 @@ attributes:
       - "subject_tesim"
     form:
       primary: false
+    predicate: http://purl.org/dc/elements/1.1/subject

data/config/metadata/core_metadata.yaml

@@ -9,9 +9,13 @@ attributes:
       required: true
       primary: true
       multiple: true
+    predicate: http://purl.org/dc/terms/title
   date_modified:
     type: date_time
+    predicate: http://purl.org/dc/terms/modified
   date_uploaded:
     type: date_time
+    predicate: http://purl.org/dc/terms/dateSubmitted
   depositor:
     type: string
+    predicate: http://id.loc.gov/vocabulary/relators/dpt

data/config/metadata/file_set_metadata.yaml

@@ -12,17 +12,20 @@ attributes:
       primary: true
     index_keys:
       - "creator_tesim"
+    predicate: http://purl.org/dc/elements/1.1/creator
   license:
     type: string
     multiple: true
     form:
       required: false
       primary: true
+    predicate: http://purl.org/dc/terms/license
 
   # Other attributes:
   abstract:
     type: string
     multiple: true
+    predicate: http://purl.org/dc/terms/abstract
   # form:
   #   primary: false
   # missing: access_right
@@ -35,12 +38,14 @@ attributes:
     index_keys:
       - "based_near_sim"
       - "based_near_tesim"
+    predicate: http://xmlns.com/foaf/0.1/based_near
   # missing: bibliograpic_citation
   contributor:
     type: string
     multiple: true
     form:
       primary: false
+    predicate: http://purl.org/dc/elements/1.1/contributor
   # required: creator
   date_created:
     type: date_time
@@ -49,6 +54,7 @@ attributes:
       primary: false
     index_keys:
       - "date_created_tesim"
+    predicate: http://purl.org/dc/terms/created
   description:
     type: string
     multiple: true
@@ -56,11 +62,13 @@ attributes:
       primary: false
     index_keys:
       - "description_tesim"
+    predicate: http://purl.org/dc/elements/1.1/description
   identifier:
     type: string
     multiple: true
     form:
       primary: false
+    predicate: http://purl.org/dc/terms/identifier
   # missing: import_url
   keyword:
     type: string
@@ -70,9 +78,11 @@ attributes:
     index_keys:
       - "keyword_sim"
       - "keyword_tesim"
+    predicate: http://schema.org/keywords
   # missing: publisher
   label:
     type: string
+    predicate: info:fedora/fedora-system:def/model#downloadFilename
   # form:
   #   primary: false
   language:
@@ -80,12 +90,14 @@ attributes:
     multiple: true
     form:
       primary: false
+    predicate: http://purl.org/dc/elements/1.1/language
   # required: license
   publisher:
     type: string
     multiple: true
     form:
       primary: false
+    predicate: http://purl.org/dc/elements/1.1/publisher
   related_url:
     type: string
     multiple: true
@@ -93,8 +105,10 @@ attributes:
       primary: false
     index_keys:
       - "related_url_tesim"
+    predicate: http://www.w3.org/2000/01/rdf-schema#seeAlso
   relative_path:
     type: string
+    predicate: http://scholarsphere.psu.edu/ns#relativePath
   resource_type:
     type: string
     multiple: true
@@ -103,9 +117,11 @@ attributes:
     index_keys:
       - "resource_type_sim"
       - "resource_type_tesim"
+    predicate: http://purl.org/dc/terms/type
   rights_notes:
     type: string
     multiple: true
+    predicate: http://purl.org/dc/elements/1.1/rights
   # form:
   #   primary: false
   rights_statement:
@@ -115,9 +131,11 @@ attributes:
   #   primary: true
     index_keys:
       - "rights_statement_tesim"
+    predicate: http://www.europeana.eu/schemas/edm/rights
   source:
     type: string
     multiple: true
+    predicate: http://purl.org/dc/terms/source
   # form:
   #   primary: false
   subject:
@@ -128,3 +146,4 @@ attributes:
     index_keys:
       - "subject_sim"
       - "subject_tesim"
+    predicate: http://purl.org/dc/elements/1.1/subject

data/config/metadata/hyrax_internal_metadata.yaml

@@ -0,0 +1,57 @@
+---
+# This internal metadata config is used to define predicates for hyrax internals only
+attributes:
+  access_to:
+    predicate: http://www.w3.org/ns/auth/acl#accessTo
+  admin_set_id:
+    predicate: http://purl.org/dc/terms/isPartOf
+  agent:
+    predicate: http://www.w3.org/ns/auth/acl#agent
+  byte_order:
+    predicate: http://sweet.jpl.nasa.gov/2.2/reprDataFormat.owl#byteOrder
+  color_space:
+    predicate: http://www.w3.org/2003/12/exif/ns#colorSpace
+  compression:
+    predicate: http://vocabulary.samvera.org/ns#compressionScheme
+  created_at:
+    predicate: http://purl.org/dc/terms/created
+  file_identifier:
+    predicate: http://vocabulary.samvera.org/ns#fileIdentifier
+  file_ids:
+    predicate: http://pcdm.org/models#hasFile
+  file_set_id:
+    predicate: http://vocabulary.samvera.org/ns#fileSetId
+  format_label:
+    predicate: http://www.loc.gov/premis/rdf/v1#hasFormatName
+  height:
+    predicate: http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#height
+  id:
+    predicate: http://purl.org/dc/terms/id
+  internal_resource:
+    predicate: info:fedora/fedora-system:def/model#hasModel
+  mime_type:
+    predicate: http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#hasMimeType
+  mode:
+    predicate: http://www.w3.org/ns/auth/acl#mode
+  original_filename:
+    predicate: http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#filename
+  pcdm_use:
+    predicate: http://vocabulary.samvera.org/ns#pcdmUse
+  permissions:
+    predicate: http://vocabulary.samvera.org/ns#permissions
+  recorded_size:
+    predicate: http://www.loc.gov/premis/rdf/v1#hasSize
+  representative_id:
+    predicate: http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#hasRelatedMediaFragment
+  state:
+    predicate: http://fedora.info/definitions/1/0/access/ObjState#objState
+  thumbnail_id:
+    predicate: http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#hasRelatedImage
+  updated_at:
+    predicate: http://vocabulary.samvera.org/ns#updatedAt
+  valid:
+    predicate: http://vocabulary.samvera.org/ns#valid
+  well_formed:
+    predicate: http://vocabulary.samvera.org/ns#wellFormed
+  width:
+    predicate: http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#width

data/docker-compose-koppie.yml

@@ -6,10 +6,12 @@ services:
       context: .
       target: hyrax-engine-dev
       args:
-        - EXTRA_APK_PACKAGES=git less chromium
+        - EXTRA_APK_PACKAGES=git less
         - APP_PATH=.koppie
-    image: ghcr.io/samvera/koppie
-    command: sh -c 'bundle && yarn && bundle exec puma -v -b tcp://0.0.0.0:3000'
+        - BUNDLE_GEMFILE=Gemfile.koppie
+    image: samvera/koppie
+    entrypoint: dev-entrypoint.sh
+    command: sh -c 'bundle exec puma -v -b tcp://0.0.0.0:3000'
     stdin_open: true
     tty: true
     user: root
@@ -29,8 +31,10 @@ services:
       - 9877:9876
       - 1049:1048
     volumes:
+      - ./bin:/app/samvera
       - .koppie:/app/samvera/hyrax-webapp
       - .:/app/samvera/hyrax-engine
+      - bundle:/app/bundle
       - hyrax-storage:/app/samvera/hyrax-webapp/storage
       - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
       - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
@@ -40,13 +44,9 @@ services:
       - koppie
 
   sidekiq:
-    build:
-      context: .
-      target: hyrax-engine-dev-worker
-      args:
-        - APP_PATH=.koppie
-    image: ghcr.io/samvera/koppie-worker
-    command: sh -c 'bundle && bundle exec sidekiq'
+    image: samvera/koppie
+    entrypoint: dev-entrypoint.sh
+    command: sh -c 'bundle exec sidekiq'
     user: root
     env_file:
       - .koppie/.env
@@ -57,33 +57,33 @@ services:
       - redis
       - solr
     volumes:
+      - ./bin:/app/samvera
       - .koppie:/app/samvera/hyrax-webapp
       - .:/app/samvera/hyrax-engine
+      - bundle:/app/bundle
       - hyrax-storage:/app/samvera/hyrax-webapp/storage
       - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
       - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
-      - sidekiq-public:/app/samvera/hyrax-webapp/public
-      - sidekiq-tmp:/app/samvera/hyrax-webapp/tmp
+      - rails-public:/app/samvera/hyrax-webapp/public
+      - rails-tmp:/app/samvera/hyrax-webapp/tmp
     networks:
       - koppie
 
   db_migrate:
-    build:
-      context: .
-      target: hyrax-engine-dev
-      args:
-        - EXTRA_APK_PACKAGES=git less
-        - APP_PATH=.koppie
-    image: ghcr.io/samvera/koppie
+    image: samvera/koppie
     user: root
     env_file:
       - .koppie/.env
-    command: sh -c 'bundle && db-migrate-seed.sh'
+    entrypoint: dev-entrypoint.sh
+    command: db-migrate-seed.sh
     depends_on:
       - postgres
+      - solr
     volumes:
+      - ./bin:/app/samvera
       - .koppie:/app/samvera/hyrax-webapp
       - .:/app/samvera/hyrax-engine
+      - bundle:/app/bundle
       - rails-public:/app/samvera/hyrax-webapp/public
       - rails-tmp:/app/samvera/hyrax-webapp/tmp
     networks:
@@ -105,7 +105,7 @@ services:
       - koppie
 
   postgres:
-    image: postgres:latest
+    image: postgres:15
     env_file:
       - .koppie/.env
     ports:
@@ -116,7 +116,7 @@ services:
       - koppie
 
   fits:
-    image: harvardlts/fitsservlet_container:1.5.0
+    image: ghcr.io/samvera/fitsservlet:1.6.0
     ports:
       - 8080
     networks:
@@ -157,6 +157,7 @@ services:
       - koppie
 
 volumes:
+  bundle:
   db:
   hyrax-storage:
   hyrax-derivatives: