hyrax 3.3.0 → 3.4.0

data/config/locales/hyrax.de.yml

@@ -52,7 +52,7 @@ de:
       cancel: Abbrechen
       close: Schließen
       collection:
-        new: Neue Sammlung
+        new: Neue Sammlung Hinzufügen
       delete: Löschen
       edit: Bearbeiten
       less: Weniger
@@ -60,7 +60,7 @@ de:
       refresh: Aktualisierung
       remove: Entfernen
       work:
-        new: Neue Arbeit hinzufügen
+        new: Neue Arbeit Hinzufügen
     submit:
       admin_set:
         create: Hinzufügen
@@ -701,6 +701,7 @@ de:
         instructions: Jede Datei wird in eine separate, neue Arbeit hochgeladen, d.h. somit wird eine Arbeit pro hochgeladener Datei erstellt.
         upload_type_instructions: Um eine einzelne Arbeit für alle Dateien zu erstellen, gehen Sie zu
       new:
+        breadcrumb: Deponieren von Arbeiten mittels stapelweisem Hochladen
         header: Stapelweises Hochladen neuer Arbeiten
         in_collections: Diese Arbeiten in Sammlungen
         in_other_works: Diese Arbeit in anderen Arbeiten
@@ -1013,15 +1014,15 @@ de:
           edit_collection_deny: Sie verfügen nicht über ausreichende Berechtigungen zum Bearbeiten dieser Sammlung.
           edit_selected: Ausgewählte bearbeiten
           edit_work: Arbeit bearbeiten
-          highlight: Heben Sie die Arbeit in ihrem Profil hervor
+          highlight: Heben sie die arbeit in ihrem profil hervor
           members_no_access: Sie verfügen nicht über ausreichende Berechtigungen für eines der ausgewählten Mitglieder
           nesting_not_allowed: Sammlungen dieses Typs unterstützen keine Verschachtelung.
           nesting_permission_denied: Sie verfügen nicht über ausreichende Berechtigungen, um diese Sammlung einer anderen Sammlung hinzuzufügen.
           select: Auswählen
           select_all: Wählen Sie die aktuelle Seite aus
           select_none: Nichts ausgewählt
-          transfer: Besitz der Arbeit übertragen
-          unhighlight: Hervorhebung der Arbeit entfernen
+          transfer: Besitz der arbeit übertragen
+          unhighlight: Hervorhebung der arbeit entfernen
           view_admin_set: Sammlung anzeigen
           view_collection: Sammlung anzeigen
           work_confirmation: Das Löschen einer Arbeit aus %{application_name} ist dauerhaft. Klicken Sie auf OK, um diese Arbeit aus %{application_name} zu löschen, oder auf Abbrechen, um diesen Vorgang abzubrechen

data/config/locales/hyrax.en.yml

@@ -49,7 +49,7 @@ en:
       cancel: Cancel
       close: Close
       collection:
-        new: New Collection
+        new: Add New Collection
       delete: Delete
       edit: Edit
       less: Less
@@ -57,7 +57,7 @@ en:
       refresh: Refresh
       remove: Remove
       work:
-        new: Add new work
+        new: Add New Work
     submit:
       admin_set:
         create: Save
@@ -91,6 +91,7 @@ en:
           note: Users granted a new role will only gain the role on works that are deposited after that role has been granted.
           permission_destroy_errors:
             admin_group: The repository administrators group cannot be removed
+            participants: The administrative set's participant rights failed to delete.
           permission_update_errors:
             error: Invalid update option for permission template.
             no_date: A date is required for the selected release option.
@@ -193,7 +194,7 @@ en:
             report_header: Custom Collections Report
             report_generated_on: This report was generated on
             enable_analytics: Enable Analytics To View Reports
-          show: 
+          show:
             title: Collection Report
             summary: Summary
             monthly: Monthly
@@ -215,12 +216,12 @@ en:
             this_month: This month
             this_year: This year
             all_time: All time
-          monthly_summary: 
+          monthly_summary:
             monthly_subtitle: Month-by-month status for last 12 months through
             collection_views: Collection home page views
             work_views: Views of works
             work_downloads: Downloads of works
-          custom_range: 
+          custom_range:
             date_range_heading: Customize Date Range
             summary_heading: Summary of user activity
             collection_home_page_views: Collection home page views
@@ -239,7 +240,7 @@ en:
             title: Works Report
             subtitle: Summary of user activity
             repo_summary: in this repository which collectively have had
-            works: works 
+            works: works
             views: views
             and: and
             access_to: You have access to
@@ -248,8 +249,8 @@ en:
             custom_range:  Custom Range
             downloads: downloads
             enable_analytics: Enable Analytics To View Reports
-            report_generated_on: This report was generated on 
-          show: 
+            report_generated_on: This report was generated on
+          show:
             title: Work Report
             summary: Summary
             monthly: Monthly
@@ -264,7 +265,7 @@ en:
           work_files:
             title: Files
             total_downloads: Total Downloads
-          work_counts: 
+          work_counts:
              total_size: total size
              child_works: child works
              files: files
@@ -279,22 +280,22 @@ en:
             this_month: This month
             this_year: This year
             all_time: All time
-          monthly_summary: 
+          monthly_summary:
             monthly_subtitle: Month-by-month status for the last 12 months through
             page_views: Page Views
             file_downloads: File Downloads
-          top_works: 
+          top_works:
             top_works: Top Works
             work_title: Work Title
             work_views: Work Page Views
             file_downloads: File Downloads
             export: Export
-          top_file_set_downloads: 
+          top_file_set_downloads:
             top_downloads: Top File Downloads
             file_name: File Name
             file: File
             file_downloads: File Downloads
-          custom_range: 
+          custom_range:
             summary_heading: Summary of user activity
             unique_visitors: Unique Visitors
             page_views: Page Views
@@ -692,6 +693,7 @@ en:
         instructions: Each file will be uploaded to a separate new work resulting in one work per uploaded file.
         upload_type_instructions: To create a single work for all the files, go to
       new:
+        breadcrumb: Create Batch of Works
         header: Batch Create New Works
         in_collections: These Works in Collections
         in_other_works: This Work in Other Works
@@ -832,7 +834,6 @@ en:
         select_type_of_collection: Select type of collection
       collections:
         collection_title: Collection Title
-        title: Collections
         last_updated: Last updated
         works: Works
         files: Files
@@ -841,6 +842,7 @@ en:
         form:
           permission_update_errors:
             error: Invalid update option for permission template.
+            sharing: The collection's sharing options failed to update.
           permission_update_notices:
             participants: The collection's sharing options have been updated.
             sharing: The collection's sharing options have been updated.
@@ -961,13 +963,13 @@ en:
           show_par_page_html: Show %{select} per page
           sort_by: 'Sort By:'
         work_action_menu:
-          delete_work: Delete Work
+          delete_work: Delete work
           deleting_from_work: Deleting a work from %{application_name} is permanent. Click OK to delete this work from %{application_name}, or Cancel to cancel this operation
-          edit_work: Edit Work
+          edit_work: Edit work
           press_to: Press to
           remove_from_collection: Remove from collection
           select_an_action: Select an action
-          transfer_ownership_of_work: Transfer Ownership of Work
+          transfer_ownership_of_work: Transfer ownership of work
       create_work: Create Work
       current_proxies: Current Proxies
       delete_notification: Delete Notification
@@ -999,21 +1001,21 @@ en:
           delete_collection_deny: You do not have sufficient privileges to delete this collection.
           delete_collections: Delete collections
           delete_collections_deny: You do not have sufficient privileges to delete one or more collections.
-          delete_work: Delete Work
+          delete_work: Delete work
           edit_admin_set: Edit collection
           edit_collection: Edit collection
           edit_collection_deny: You do not have sufficient privileges to edit this collection.
           edit_selected: Edit Selected
-          edit_work: Edit Work
-          highlight: Highlight Work on Profile
+          edit_work: Edit work
+          highlight: Highlight work on profile
           members_no_access: You do not have sufficient privileges to any of the selected members
           nesting_not_allowed: Collections of this type do not support nesting.
           nesting_permission_denied: You do not have sufficient privileges to add this collection to another collection.
           select: Select
           select_all: Select Current Page
           select_none: Select None
-          transfer: Transfer Ownership of Work
-          unhighlight: Unhighlight Work
+          transfer: Transfer ownership of work
+          unhighlight: Unhighlight work
           view_admin_set: View collection
           view_collection: View collection
           work_confirmation: Deleting a work from %{application_name} is permanent. Click OK to delete this work from %{application_name}, or Cancel to cancel this operation
@@ -1128,7 +1130,7 @@ en:
       transfer_of_ownership: Transfers of Ownership
       transfer_works_link: Select works to transfer
       transfers_received: Transfers Received
-      transfers_sent: Transfers Sent        
+      transfers_sent: Transfers Sent
       user_activity:
         date: Date
         new_users: New Users
@@ -1137,7 +1139,7 @@ en:
         new_visitors: New Visitors
         subtitle: New user signups
         title: User Activity
-        total_visitors: Total Visitors   
+        total_visitors: Total Visitors
         user_summary: User Summary
       user_activity_graph:
         date: Date
@@ -1147,7 +1149,7 @@ en:
         total_visits: Total Visits
       user_notifications: User Notifications
       view_files: View Files
-      visibility_graph: 
+      visibility_graph:
         visibility: Visibility
     document_language: en
     edit_profile: Edit Profile
@@ -1521,12 +1523,12 @@ en:
         link_expired_not_found: Single Use Link Expired or Not Found
         link_not_found: Single use link Not Found
     sort_label: Sort the listing of items
-    stats: 
+    stats:
       work:
         header: Work Analytics
         pageviews: Pageviews
         downloads: Downloads
-      pageviews: 
+      pageviews:
         pageviews: Page Views
       downloads:
         downloads: Downloads
@@ -1820,6 +1822,6 @@ en:
   total_view:
     one: This work has 1 total view
     other: This work has %{count} total views
-  download: 
+  download:
     one: and 1 download
     other: and %{count} downloads

data/config/locales/hyrax.es.yml

@@ -52,7 +52,7 @@ es:
       cancel: Cancelar
       close: Cerca
       collection:
-        new: Nueva Colección
+        new: Añadir Nueva Colección
       delete: Borrar
       edit: Editar
       less: Menos
@@ -60,7 +60,7 @@ es:
       refresh: Refrescar
       remove: retirar
       work:
-        new: Crear un nuevo trabajo
+        new: Añadir un Nuevo Trabajo
     submit:
       admin_set:
         create: Guardar
@@ -706,6 +706,7 @@ es:
         instructions: Cada archivo será cargado en un nuevo trabajo separado, resultando en un trabajo por archivo cargado.
         upload_type_instructions: Para crear un único trabajo para todos los archivos, vaya a
       new:
+        breadcrumb: Crear un lote de trabajos
         header: Crear Nuevos Trabajos en Lote
         in_collections: Estos Trabajos en Colecciones
         in_other_works: Este Trabajo en otros Trabajos
@@ -1008,25 +1009,25 @@ es:
           collections_confirmation_singular: esta colección
           delete_admin_set: Eliminar colección
           delete_admin_set_deny: Esta colección se define como Admin Set y no está vacía. Para eliminar este conjunto de administración, primero debe eliminar (eliminar o mover a otra colección del conjunto de administración) todos los elementos del conjunto de administración.
-          delete_collection: Borrar Colección
+          delete_collection: Borrar colección
           delete_collection_deny: No tiene suficientes privilegios para eliminar este documento.
           delete_collections: Eliminar colecciones
           delete_collections_deny: Debe seleccionar una o más colecciones para eliminar.
-          delete_work: Borrar Trabajo
+          delete_work: Borrar trabajo
           edit_admin_set: Editar colección
-          edit_collection: Editar Colección
+          edit_collection: Editar colección
           edit_collection_deny: No tienes suficientes privilegios para editar esta colección.
           edit_selected: Editar Seleccionado
-          edit_work: Editar Trabajo
-          highlight: Resalte Trabajo en Perfil
+          edit_work: Editar trabajo
+          highlight: Resalte trabajo en perfil
           members_no_access: No tiene suficientes privilegios para ninguno de los miembros seleccionados
           nesting_not_allowed: Las colecciones de este tipo no son compatibles con la anidación.
           nesting_permission_denied: No tiene suficientes privilegios para agregar esta colección a otra colección.
           select: Seleccionar
           select_all: Seleccionar la página actual
           select_none: Seleccionar ninguno
-          transfer: Cambiar el Propietario del Trabajo
-          unhighlight: Retire Resalte del Trabajo
+          transfer: Cambiar el propietario del trabajo
+          unhighlight: Retire resalte del trabajo
           view_admin_set: Ver colección
           view_collection: Ver colección
           work_confirmation: El borrado de un trabajo de %{application_name} es permanente. Presione OK para borrar este trabajo de %{application_name}, o Cancelar para cancelar esta operación

data/config/locales/hyrax.fr.yml

@@ -52,7 +52,7 @@ fr:
       cancel: Annuler
       close: Fermer
       collection:
-        new: Nouvelle collection
+        new: Ajouter une nouvelle collection
       delete: Effacer
       edit: modifier
       less: Moins
@@ -707,6 +707,7 @@ fr:
         instructions: Chaque fichier sera téléchargé sur un nouveau travail séparé résultant en un travail par fichier téléchargé.
         upload_type_instructions: Pour créer un travail unique pour tous les fichiers, accédez à
       new:
+        breadcrumb: Créer un lot d'œuvres
         header: Batch Créer de nouveaux travaux
         in_collections: Ces œuvres dans les collections
         in_other_works: Ce travail dans d'autres ouvrages

data/config/locales/hyrax.it.yml

@@ -52,7 +52,7 @@ it:
       cancel: Annulla
       close: Vicino
       collection:
-        new: Nuova collezione
+        new: Aggiungi nuova collezione
       delete: Elimina
       edit: Modifica
       less: Di meno
@@ -706,6 +706,7 @@ it:
         instructions: Ogni file verrà caricato in un nuovo lavoro separato che crea un lavoro per file caricato.
         upload_type_instructions: Per creare un singolo lavoro per tutti i file, vai a
       new:
+        breadcrumb: Crea un gruppo di opere
         header: Creazione di batch di nuove opere
         in_collections: Queste opere in collezioni
         in_other_works: Questo lavoro in altre opere
@@ -1018,7 +1019,7 @@ it:
           edit_collection_deny: Non disponi di privilegi sufficienti per modificare questa raccolta.
           edit_selected: Modifica selezionato
           edit_work: Modifica lavoro
-          highlight: Evidenziare il Savoro sul Profilo
+          highlight: Evidenziare il savoro sul profilo
           members_no_access: Non hai privilegi sufficienti per nessuno dei membri selezionati
           nesting_not_allowed: Le raccolte di questo tipo non supportano il nesting.
           nesting_permission_denied: Non disponi di privilegi sufficienti per aggiungere questa raccolta a un'altra raccolta.

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

@@ -701,6 +701,7 @@ pt-BR:
         instructions: Cada arquivo fará parte de um nova obra, resultando em uma obra por arquivo.
         upload_type_instructions: Para criar uma única obra para todos os arquivos, vá para
       new:
+        breadcrumb: Criar lote de obras
         header: Criar novas obras em lotes
         in_collections: Estas obras em Coleções
         in_other_works: Esta obra em outras obras
@@ -1013,7 +1014,7 @@ pt-BR:
           edit_collection_deny: Você não possui privilégios suficientes para editar esta coleção.
           edit_selected: Editar seleção
           edit_work: Editar obra
-          highlight: Destacar a obra no Perfil
+          highlight: Destacar a obra no perfil
           members_no_access: Você não tem privilégios suficientes para nenhum dos membros selecionados
           nesting_not_allowed: Coleções deste tipo não permitem sub-coleções.
           nesting_permission_denied: Você não possui privilégios suficientes para acrescentar esta coleção a outra coleção.

data/config/locales/hyrax.zh.yml

@@ -52,7 +52,7 @@ zh:
       cancel: 取消
       close: 关
       collection:
-        new: 新收藏集
+        new: 添加新集合
       delete: 删除
       edit: 编辑
       less: 减
@@ -704,6 +704,7 @@ zh:
         instructions: 上传的每份文件都会分别按新作品生成。
         upload_type_instructions: 创建一件包括所有文件的作品，请去
       new:
+        breadcrumb: 创建批量作品
         header: 批量建立新作品
         in_collections: 这些作品包括在收藏集中
         in_other_works: 这件作品包括在其它作品中

data/config/metadata/basic_metadata.yaml

@@ -50,6 +50,8 @@ attributes:
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "description_tesim"
   identifier:
     type: string
     multiple: true

data/config/metadata/core_metadata.yaml

@@ -8,7 +8,7 @@ attributes:
     form:
       required: true
       primary: true
-      multiple: false
+      multiple: true
   date_modified:
     type: date_time
   date_uploaded:

data/docker-compose.yml

@@ -28,8 +28,8 @@ services:
     ports:
       - 3000:3000
     volumes:
-      - .dassie:/app/samvera/hyrax-webapp:cached
-      - .:/app/samvera/hyrax-engine:cached
+      - .dassie:/app/samvera/hyrax-webapp
+      - .:/app/samvera/hyrax-engine
       - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
       - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
       - rails-public:/app/samvera/hyrax-webapp/public
@@ -37,36 +37,67 @@ services:
     networks:
       - hyrax
 
-  chrome:
-    image: selenium/standalone-chrome:3.141
-    logging:
-      driver: none
+  sidekiq:
+    build:
+      context: .
+      target: hyrax-engine-dev-worker
+    image: ghcr.io/samvera/dassie-worker
+    command: sh -l -c 'bundle && bundle exec sidekiq'
+    user: root
+    env_file:
+      - .env
+      - .dassie/.env
+    depends_on:
+      - db_migrate
+      - fcrepo
+      - memcached
+      - postgres
+      - redis
+      - solr
     volumes:
-      - /dev/shm:/dev/shm
-    shm_size: 2G
-    ports:
-      - "4444:4444"
-      - "5959:5900"
+      - .dassie:/app/samvera/hyrax-webapp
+      - .:/app/samvera/hyrax-engine
+      - 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
     networks:
       - hyrax
 
   db_migrate:
+    build:
+      context: .
+      target: hyrax-engine-dev
+      args:
+        - EXTRA_APK_PACKAGES=git less
     image: ghcr.io/samvera/dassie
     user: root
     env_file:
       - .env
-    entrypoint: ["sh", "-c"]
-    command: db-migrate-seed.sh
+    command: sh -l -c 'bundle && db-migrate-seed.sh'
     depends_on:
       - postgres
     volumes:
-      - .dassie:/app/samvera/hyrax-webapp:cached
-      - .:/app/samvera/hyrax-engine:cached
+      - .dassie:/app/samvera/hyrax-webapp
+      - .:/app/samvera/hyrax-engine
       - rails-public:/app/samvera/hyrax-webapp/public
       - rails-tmp:/app/samvera/hyrax-webapp/tmp
     networks:
       - hyrax
 
+  chrome:
+    image: selenium/standalone-chrome:3.141
+    logging:
+      driver: none
+    volumes:
+      - /dev/shm:/dev/shm
+    shm_size: 2G
+    ports:
+      - "4444:4444"
+      - "5959:5900"
+    networks:
+      - hyrax
+
   postgres:
     image: postgres:latest
     restart: always
@@ -105,33 +136,6 @@ services:
     networks:
       - hyrax
 
-  sidekiq:
-    build:
-      context: .
-      target: hyrax-engine-dev-worker
-    image: ghcr.io/samvera/dassie-worker
-    command: sh -l -c 'bundle && bundle exec sidekiq'
-    user: root
-    env_file:
-      - .env
-      - .dassie/.env
-    depends_on:
-      - db_migrate
-      - fcrepo
-      - memcached
-      - postgres
-      - redis
-      - solr
-    volumes:
-      - .dassie:/app/samvera/hyrax-webapp:cached
-      - .:/app/samvera/hyrax-engine:cached
-      - 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
-    networks:
-      - hyrax
-
   solr:
     image: solr:8.11.1
     ports:

data/documentation/developing-your-hyrax-based-app.md

@@ -125,7 +125,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _5.2.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v3.3.0/template.rb
+rails _5.2.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v3.4.0/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/documentation/legacyREADME.md

@@ -50,7 +50,7 @@ The Samvera community is here to help. Please see our [support guide](./.github/
 # Getting started
 
 This document contains instructions specific to setting up an app with __Hyrax
-v3.3.0__. If you are looking for instructions on installing a different
+v3.4.0__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 

data/lib/hyrax/administrative_set_name.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Hyrax
+  ##
+  # A custom name for Valkyrie AdministrativeSet objects. Route keys are mapped to `admin_set`
+  # not be the same as the model name.
+  class AdministrativeSetName < Name
+    def initialize(klass, namespace = nil, name = nil)
+      super
+      @human              = 'AdminSet'
+      @i18n_key           = :admin_set
+      @param_key          = 'admin_set'
+      @plural             = 'admin_sets'
+      @route_key          = 'admin_sets'
+      @singular_route_key = 'admin_set'
+    end
+  end
+end

data/lib/hyrax/collection_name.rb

@@ -14,6 +14,8 @@ module Hyrax
       @plural             = 'collections'
       @route_key          = 'collections'
       @singular_route_key = 'collection'
+      @collection         = 'collections'
+      @element            = 'collection'
     end
   end
 end

data/lib/hyrax/configuration.rb

@@ -449,6 +449,7 @@ module Hyrax
     ##
     # @return [Boolean] whether to use experimental valkyrie storage features
     def use_valkyrie?
+      return true if disable_wings # always return true if wings is disabled
       ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYRAX_VALKYRIE', false))
     end
     # @!endgroup
@@ -495,6 +496,15 @@ module Hyrax
         Hyrax::Characterization::ValkyrieCharacterizationService
     end
 
+    ##
+    # @!attribute [w] characterization_proxy
+    #   Which FileSet file to use for mime type resolution
+    #   @ see Hyrax::FileSetTypeService
+    attr_writer :characterization_proxy
+    def characterization_proxy
+      @characterization_proxy ||= :original_file
+    end
+
     # Attributes for the lock manager which ensures a single process/thread is mutating a ore:Aggregation at once.
     # @!attribute [w] lock_retry_count
     #   How many times to retry to acquire the lock before raising UnableToAcquireLockError

data/lib/hyrax/controlled_vocabularies/location.rb

@@ -4,10 +4,17 @@ module Hyrax
     class Location < ActiveTriples::Resource
       configure rdf_label: ::RDF::Vocab::GEONAMES.name
 
+      include ResourceLabelCaching
+
       # Return a tuple of url & label
       def solrize
-        return [rdf_subject.to_s] if rdf_label.first.to_s.blank? || rdf_label.first.to_s == rdf_subject.to_s
-        [rdf_subject.to_s, { label: "#{rdf_label.first}$#{rdf_subject}" }]
+        label = full_label || rdf_label.first.to_s
+        return [rdf_subject.to_s] if label.blank? || label == rdf_subject.to_s
+        [rdf_subject.to_s, { label: "#{label}$#{rdf_subject}" }]
+      end
+
+      def full_label
+        Hyrax::LocationService.new.full_label(rdf_subject.to_s)
       end
     end
   end