hyrax 5.0.0.rc1 → 5.0.0.rc3

data/chart/hyrax/values.yaml

@@ -119,6 +119,7 @@ externalPostgresql: {}
 #  username:
 #  password:
 #  database:
+#  port:
 
 embargoRelease:
   enabled: true
@@ -225,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
@@ -265,6 +266,8 @@ postgresql:
     database: hyrax
     password: hyrax_pass
     username: hyrax
+  containerPorts:
+    postgresql: 5432
   primary:
     service:
       ports:
@@ -281,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/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/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

@@ -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,20 @@ 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"
+      - "contributor_sim"
+    predicate: http://purl.org/dc/elements/1.1/contributor
   creator:
     type: string
     multiple: true
@@ -38,6 +60,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 +68,7 @@ attributes:
       primary: false
     index_keys:
       - "date_created_tesim"
+    predicate: http://purl.org/dc/terms/created
   description:
     type: string
     multiple: true
@@ -52,13 +76,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 +96,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 +138,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 +147,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 +163,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 +180,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,15 @@ 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
+    index_keys:
+      - "depositor_tesim"

data/config/metadata/file_set_metadata.yaml

@@ -12,17 +12,22 @@ 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
+    index_keys:
+      - "license_tesim"
 
   # Other attributes:
   abstract:
     type: string
     multiple: true
+    predicate: http://purl.org/dc/terms/abstract
   # form:
   #   primary: false
   # missing: access_right
@@ -35,12 +40,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 +56,7 @@ attributes:
       primary: false
     index_keys:
       - "date_created_tesim"
+    predicate: http://purl.org/dc/terms/created
   description:
     type: string
     multiple: true
@@ -56,11 +64,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 +80,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 +92,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 +107,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 +119,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 +133,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 +148,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:
@@ -99,13 +99,13 @@ services:
       - /dev/shm:/dev/shm
     shm_size: 2G
     ports:
-      - "4445:4444"
-      - "5960:5900"
+      - "4446:4444"
+      - "5961:5900"
     networks:
       - 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:
@@ -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
@@ -157,6 +157,7 @@ services:
       - koppie
 
 volumes:
+  bundle:
   db:
   hyrax-storage:
   hyrax-derivatives: