hyrax 4.0.0.beta2 → 4.0.0.rc1

data/config/locales/hyrax.fr.yml

@@ -595,7 +595,7 @@ fr:
         depositor: Déposant
         directions: Indépendamment des paramètres de visibilité pour ce travail, vous pouvez également le partager avec d'autres utilisateurs et groupes.
         group: Groupe
-        permissions_save_note_html: Les autorisations ne sont <strong> pas </ strong> enregistrées tant que le & quot; Enregistrer & quot; bouton est enfoncé en bas de la page.
+        permissions_save_note_html: Les autorisations ne sont <strong> pas </strong> enregistrées tant que le & quot; Enregistrer & quot; bouton est enfoncé en bas de la page.
         use_add_button: Utilisez le bouton Ajouter pour donner accès à un %{account_label} à la fois (il sera ajouté à la liste ci-dessous). Sélectionnez l'utilisateur, par son nom ou par %{account_label} \. Ensuite, sélectionnez le niveau d'accès que vous souhaitez accorder et cliquez sur Ajouter ce %{account_label} pour terminer l'ajout de l'autorisation.
       form_thumbnail:
         help_html: Sélectionnez le fichier à utiliser comme vignette pour ce travail.
@@ -1411,14 +1411,14 @@ fr:
       count:
         collections:
           collections_listing: Liste des collections
-          in_repo: "<strong> Collections %{total_count} </ strong> dans le référentiel"
-          you_manage: "<strong> collections %{total_count} </ strong> que vous pouvez gérer dans le référentiel"
-          you_own: "<strong> collections %{total_count} </ strong> que vous possédez dans le référentiel"
+          in_repo: "<strong> Collections %{total_count} </strong> dans le référentiel"
+          you_manage: "<strong> collections %{total_count} </strong> que vous pouvez gérer dans le référentiel"
+          you_own: "<strong> collections %{total_count} </strong> que vous possédez dans le référentiel"
         works:
-          in_repo: "<strong> %{total_count} fonctionne </ strong> dans le référentiel"
+          in_repo: "<strong> %{total_count} fonctionne </strong> dans le référentiel"
           works_listing: Liste des travaux
-          you_manage: "<strong> %{total_count} fonctionne </ strong> vous pouvez gérer dans le référentiel"
-          you_own: "<strong> %{total_count} fonctionne </ strong> que vous possédez dans le référentiel"
+          you_manage: "<strong> %{total_count} fonctionne </strong> vous pouvez gérer dans le référentiel"
+          you_own: "<strong> %{total_count} fonctionne </strong> que vous possédez dans le référentiel"
       sort_and_per_page:
         number_of_results_to_display_per_page: Nombre de résultats à afficher par page
     nav_safety:
@@ -1839,4 +1839,4 @@ fr:
       html: <span class="badge badge-info required-tag">Champs obligatoires</span>
   total_view:
     one: Ce travail a 1 vue totale
-    other: Ce travail a zxzxxx0 vues au total
+    other: Ce travail a zxzxxx0 vues au total

data/config/locales/hyrax.it.yml

@@ -1410,14 +1410,14 @@ it:
       count:
         collections:
           collections_listing: Elenco delle collezioni
-          in_repo: "<strong> collezioni %{total_count} </ strong> nel repository"
-          you_manage: "<strong> collezioni %{total_count} </ strong> che puoi gestire nel repository"
-          you_own: "<strong> collezioni %{total_count} </ strong> che possiedi nel repository"
+          in_repo: "<strong> collezioni %{total_count} </strong> nel repository"
+          you_manage: "<strong> collezioni %{total_count} </strong> che puoi gestire nel repository"
+          you_own: "<strong> collezioni %{total_count} </strong> che possiedi nel repository"
         works:
-          in_repo: "<strong> %{total_count} funziona </ strong> nel repository"
+          in_repo: "<strong> %{total_count} funziona </strong> nel repository"
           works_listing: Elenco delle opere
-          you_manage: "<strong> %{total_count} funziona </ strong> che puoi gestire nel repository"
-          you_own: "<strong> %{total_count} funziona </ strong> nel repository"
+          you_manage: "<strong> %{total_count} funziona </strong> che puoi gestire nel repository"
+          you_own: "<strong> %{total_count} funziona </strong> nel repository"
       sort_and_per_page:
         number_of_results_to_display_per_page: Numero di risultati da visualizzare per pagina
     nav_safety:
@@ -1838,4 +1838,4 @@ it:
       html: <span class="badge badge-info required-tag">necessario</span>
   total_view:
     one: Quest'opera ha 1 vista totale
-    other: Questo lavoro ha %{count} visualizzazioni totali
+    other: Questo lavoro ha %{count} visualizzazioni totali

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

@@ -1405,14 +1405,14 @@ pt-BR:
       count:
         collections:
           collections_listing: Listagem de coleções
-          in_repo: "<strong> coleções %{total_count} </ strong> no repositório"
-          you_manage: "<strong> %{total_count} coleções</ strong> que você pode curatelar no repositório"
-          you_own: "<strong> %{total_count} coleções </ strong> que você possui no repositório"
+          in_repo: "<strong> coleções %{total_count} </strong> no repositório"
+          you_manage: "<strong> %{total_count} coleções</strong> que você pode curatelar no repositório"
+          you_own: "<strong> %{total_count} coleções </strong> que você possui no repositório"
         works:
-          in_repo: "<strong> %{total_count} obras </ strong> no repositório"
+          in_repo: "<strong> %{total_count} obras </strong> no repositório"
           works_listing: Lista de obras
-          you_manage: "<strong> %{total_count} obras </ strong> que você pode curatelar no repositório"
-          you_own: "<strong> %{total_count} obras </ strong> que você possui no repositório"
+          you_manage: "<strong> %{total_count} obras </strong> que você pode curatelar no repositório"
+          you_own: "<strong> %{total_count} obras </strong> que você possui no repositório"
       sort_and_per_page:
         number_of_results_to_display_per_page: Número de resultados a serem exibidos por página
     nav_safety:
@@ -1833,4 +1833,4 @@ pt-BR:
       html: <span class="badge badge-info required-tag">obrigatórios</span>
   total_view:
     one: Este trabalho tem 1 visualização total
-    other: Este trabalho tem %{count} visualizações totais
+    other: Este trabalho tem %{count} visualizações totais

data/config/locales/hyrax.zh.yml

@@ -592,7 +592,7 @@ zh:
         depositor: 储户
         directions: 无论此工作的可见性设置如何，您也可以与其他用户和组共享。
         group: 组
-        permissions_save_note_html: 权限<strong> </ strong>保存，直到“保存”为止。按钮在页面底部按下。
+        permissions_save_note_html: 权限<strong> </strong>保存，直到“保存”为止。按钮在页面底部按下。
         use_add_button: 使用添加按钮一次可以访问一个%{account_label}（它将被添加到下面的列表中）。按名称或%{account_label} \选择用户。然后选择您要授予的访问级别，并单击“添加此%{account_label}”以完成添加权限。
       form_thumbnail:
         help_html: 选择要用作此作品缩略图的文件。
@@ -1408,14 +1408,14 @@ zh:
       count:
         collections:
           collections_listing: 收藏清单
-          in_repo: 存储库中的<strong> %{total_count}集合</ strong>
-          you_manage: 您可以在存储库中管理<strong> %{total_count}集合</ strong>
-          you_own: 您在存储库中拥有<strong> %{total_count}集合</ strong>
+          in_repo: 存储库中的<strong> %{total_count}集合</strong>
+          you_manage: 您可以在存储库中管理<strong> %{total_count}集合</strong>
+          you_own: 您在存储库中拥有<strong> %{total_count}集合</strong>
         works:
-          in_repo: 存储库中的<strong> %{total_count}有效</ strong>
+          in_repo: 存储库中的<strong> %{total_count}有效</strong>
           works_listing: 作品清单
-          you_manage: 您可以在存储库中管理<strong> %{total_count}作品</ strong>
-          you_own: 您在存储库中拥有<strong> %{total_count}作品</ strong>
+          you_manage: 您可以在存储库中管理<strong> %{total_count}作品</strong>
+          you_own: 您在存储库中拥有<strong> %{total_count}作品</strong>
       sort_and_per_page:
         number_of_results_to_display_per_page: 每页显示的结果数
     nav_safety:
@@ -1836,4 +1836,4 @@ zh:
       html: <span class="badge badge-info required-tag">需要的</span>
   total_view:
     one: 该作品共有 1 次浏览
-    other: 此作品总浏览量为 %{count}
+    other: 此作品总浏览量为 %{count}

data/config/metadata/file_set_metadata.yaml

@@ -0,0 +1,130 @@
+# This is the metadata used for `Hyrax::FileSet`s.` It is similar to
+# `basic_metadata.yaml`, but not exactly the same.
+#
+# Terms which are already present in `core_metadata.yaml` are not repeated here.
+attributes:
+  # Required attributes:
+  creator:
+    type: string
+    multiple: true
+    form:
+      required: true
+      primary: true
+    index_keys:
+      - "creator_tesim"
+  license:
+    type: string
+    multiple: true
+    form:
+      required: true
+      primary: true
+
+  # Other attributes:
+  abstract:
+    type: string
+    multiple: true
+  # form:
+  #   primary: false
+  # missing: access_right
+  # missing: alternative_title
+  based_near:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "based_near_sim"
+      - "based_near_tesim"
+  # missing: bibliograpic_citation
+  contributor:
+    type: string
+    multiple: true
+    form:
+      primary: false
+  # required: creator
+  date_created:
+    type: date_time
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "date_created_tesim"
+  description:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "description_tesim"
+  identifier:
+    type: string
+    multiple: true
+    form:
+      primary: false
+  # missing: import_url
+  keyword:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "keyword_sim"
+      - "keyword_tesim"
+  # missing: publisher
+  label:
+    type: string
+  # form:
+  #   primary: false
+  language:
+    type: string
+    multiple: true
+    form:
+      primary: false
+  # required: license
+  publisher:
+    type: string
+    multiple: true
+    form:
+      primary: false
+  related_url:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "related_url_tesim"
+  relative_path:
+    type: string
+  resource_type:
+    type: string
+    multiple: true
+  # form:
+  #   primary: false
+    index_keys:
+      - "resource_type_sim"
+      - "resource_type_tesim"
+  rights_notes:
+    type: string
+    multiple: true
+  # form:
+  #   primary: false
+  rights_statement:
+    type: string
+    multiple: true
+  # form:
+  #   primary: true
+    index_keys:
+      - "rights_statement_tesim"
+  source:
+    type: string
+    multiple: true
+  # form:
+  #   primary: false
+  subject:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "subject_sim"
+      - "subject_tesim"

data/documentation/MAINTENANCE.md

@@ -0,0 +1,77 @@
+# Maintenance Policy for Hyrax
+January 25, 2023
+
+[Hyrax Maintenance Working Group](https://samvera.atlassian.net/wiki/spaces/samvera/pages/496632295/Hyrax+Maintenance+Working+Group)
+
+## Why do we need a policy? 
+A written policy prevents word-of-mouth policies which create confusion in the community. 
+A written policy also provides a transparent way to communicate our values to people who may 
+not work on the maintenance team consistently. It gives a basis to justify spending time on 
+something that isn’t in the product backlog.
+
+Updated versions of JavaScript libraries, Ruby, and Ruby gems are released all the time. 
+If we don’t keep our applications up-to-date with the latest released versions of their 
+dependencies, we may end up with applications that rely on dependencies with known 
+vulnerabilities, bugs, or deprecated features.
+
+Hyrax releases are managed in two groupings: 
+- Breaking changes which include new features with incompatible changes such as requiring 
+  data migration, bug fixes or security fixes with incompatible changes. 
+- Non-breaking changes which have new features that can be introduced with feature flipper, 
+  backwards compatibility, or that do not require data migration, bug fixes or security fixes
+  that do not require data migration. 
+
+## Semantic Versioning
+
+Hyrax follows [semver](https://semver.org/) for release versioning. All releases are handled in X.Y.Z format.
+
+Current releases are at https://github.com/samvera/hyrax/releases 
+
+### Major X
+New features with incompatible changes such as requiring data migration, bug fixes or security 
+fixes with incompatible changes. Breaking changes are paired with deprecation notices in the 
+previous minor or major release.
+
+### Minor Y
+New features that can be introduced with feature flipper, backwards compatibility, or that do not 
+require data migration. May also contain bug fixes or security fixes that do not require data migration.
+
+### Patch Z
+Bug fixes or security fixes that do not require data migration. No new features.
+
+## Supported Versions
+Supported versions are the highest currently released X version and then backwards to X-1. So when 
+Hyrax 4.0 is released, the latest Hyrax 3.y is supported but Hyrax 2.y is not. Extended support for 
+an otherwise unsupported version may be offered at the Product Owner or Technical Lead’s discretion. 
+See End-of-Life Versions below.
+
+## New features
+New features that are added to the current release may be backported to supported past versions on 
+a case-by-case basis. New features that are not relevant to the current release can be added to a 
+supported past version.
+
+## Bug fixes
+Bug fixes that are added to the current release may be backported to supported past versions on a 
+case-by-case basis. 
+
+## Security fixes
+The current major release will receive patches and new versions in case of a security fix. The last
+release in the previous major version will also receive security updates. So when Hyrax 4.y has a 
+security fix applied, this security fix would also be applied to the latest Hyrax 3.y, but not to 
+Hyrax 2.y.
+
+## Dependency Management
+Deprecated or end-of-life versions of dependencies used as part of building a Hyrax-based application 
+will be removed from the test suite to manage maintenance. If an outdated version of a dependency is 
+still supported that does not pose security issues, it may remain supported in the test suite.
+
+## End-of-Life  Versions
+End-of-life versions are X-1 versions behind the highest currently released X version. So when Hyrax 4.0 
+is released, Hyrax 2.y is end-of-life and no longer supported, but Hyrax 3.y is still supported and is 
+not end-of-life. Extended support for an otherwise unsupported version may be offered at the Product 
+Owner or Technical Lead’s discretion (e.g. many major releases in a short period of time). 
+See Supported Versions above.
+
+End-of-Life versions of Hyrax will not be supported. Applying fixes (security or otherwise) will be 
+up to the implementing entity. We encourage updating to supported versions of Hyrax to receive updates 
+and security fixes.

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

@@ -30,7 +30,7 @@ A Hyrax-based application includes lots of dependencies. We provide a [Docker im
 You can also try [Running Hyrax-based application in local VM](https://github.com/samvera/hyrax/wiki/Hyrax-Development-Guide#running-hyrax-based-application-in-local-vm) which uses Ubuntu.
 
 This document contains instructions specific to setting up an app with __Hyrax
-v3.0.1__. If you are looking for instructions on installing a different
+v4.0.0.rc1__. 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.
 
@@ -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/v4.0.0.beta2/template.rb
+rails _6.1.7.3_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v4.0.0.rc1/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
-v4.0.0.beta2__. If you are looking for instructions on installing a different
+v4.0.0.rc1__. 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.
 
@@ -159,7 +159,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.0.2/template.rb
+rails _6.1.7.3_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v4.0.0.rc1/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/hyrax.gemspec

@@ -44,8 +44,8 @@ SUMMARY
   spec.add_dependency 'draper', '~> 4.0'
   spec.add_dependency 'dry-events', '~> 0.2.0'
   spec.add_dependency 'dry-equalizer', '~> 0.2'
+  spec.add_dependency 'dry-monads', '~> 1.5'
   spec.add_dependency 'dry-struct', '~> 1.0'
-  spec.add_dependency 'dry-transaction', '~> 0.11'
   spec.add_dependency 'dry-validation', '~> 1.3'
   spec.add_dependency 'flipflop', '~> 2.3'
   # Pin more tightly because 0.x gems are potentially unstable
@@ -69,21 +69,21 @@ SUMMARY
   spec.add_dependency 'oauth2', '~> 1.2'
   spec.add_dependency 'openseadragon'
   spec.add_dependency 'posix-spawn'
-  spec.add_dependency 'power_converter', '~> 0.1', '>= 0.1.2'
   spec.add_dependency 'qa', '~> 5.5', '>= 5.5.1' # questioning_authority
   spec.add_dependency 'rails_autolink', '~> 1.1'
   spec.add_dependency 'rdf-rdfxml' # controlled vocabulary importer
   spec.add_dependency 'rdf-vocab', '~> 3.0'
   spec.add_dependency 'redis', '~> 4.0'
   spec.add_dependency 'redis-namespace', '~> 1.5'
-  spec.add_dependency 'redlock', '>= 0.1.2'
+  spec.add_dependency 'redlock', '>= 0.1.2', '< 2.0'
   spec.add_dependency 'reform', '~> 2.3'
   spec.add_dependency 'reform-rails', '~> 0.2.0'
   spec.add_dependency 'retriable', '>= 2.9', '< 4.0'
   spec.add_dependency 'samvera-nesting_indexer', '~> 2.0'
   spec.add_dependency 'signet'
   spec.add_dependency 'tinymce-rails', '~> 5.10'
-  spec.add_dependency 'valkyrie', '~> 2', '>= 2.1.1'
+  spec.add_dependency 'valkyrie', '~> 3.0.1'
+  spec.add_dependency 'view_component', '~> 2.74.1' # Pin until blacklight is updated with workaround for https://github.com/ViewComponent/view_component/issues/1565
   spec.add_dependency 'sprockets', '~> 3.7'
   spec.add_dependency 'sass-rails', '~> 6.0'
   spec.add_dependency 'select2-rails', '~> 3.5'

data/lib/generators/hyrax/templates/catalog_controller.rb

@@ -19,7 +19,7 @@ class CatalogController < ApplicationController
 
     # Because too many times on Samvera tech people raise a problem regarding a failed query to SOLR.
     # Often, it's because they inadvertently exceeded the character limit of a GET request.
-    config.http_method = :post
+    config.http_method = Hyrax.config.solr_default_method
 
     ## Default parameters to send to solr for all search-like requests. See also SolrHelper#solr_search_params
     config.default_solr_params = {

data/lib/hyrax/configuration.rb

@@ -846,6 +846,11 @@ module Hyrax
       @solr_select_path ||= ActiveFedora.solr_config.fetch(:select_path, 'select')
     end
 
+    attr_writer :solr_default_method
+    def solr_default_method
+      @solr_default_method ||= :post
+    end
+
     attr_writer :identifier_registrars
     def identifier_registrars
       @identifier_registrars ||= {}

data/lib/hyrax/engine.rb

@@ -87,7 +87,6 @@ module Hyrax
     end
 
     initializer 'requires' do
-      require 'power_converters'
       require 'wings' unless Hyrax.config.disable_wings
     end
 

data/lib/hyrax/transactions/container.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require "dry/transaction"
-require "dry/transaction/operation"
 
 module Hyrax
   module Transactions

data/lib/hyrax/transactions/steps/save_collection_banner.rb

@@ -9,7 +9,7 @@ module Hyrax
       # to be used as a the banner for the collection.
       #
       class SaveCollectionBanner
-        include Dry::Transaction::Operation
+        include Dry::Monads[:result]
 
         ##
         # @param [Hyrax::ChangeSet] change_set

data/lib/hyrax/transactions/steps/save_collection_logo.rb

@@ -9,7 +9,7 @@ module Hyrax
       # to be used as logo(s) for the collection.
       #
       class SaveCollectionLogo
-        include Dry::Transaction::Operation
+        include Dry::Monads[:result]
 
         ##
         # @param [Hyrax::ChangeSet] change_set

data/lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '4.0.0.beta2'
+  VERSION = '4.0.0.rc1'
 end

data/lib/valkyrie/indexing/solr/indexing_adapter.rb

@@ -62,7 +62,7 @@ module Valkyrie
             # generator now (if not, the application has bigger problems
             # than this missing configuration)
             bl_index = Blacklight.default_index.connection.uri
-          rescue RuntimeError
+          rescue StandardError
             return {}
           end
 

data/lib/wings/active_fedora_converter/file_metadata_node.rb

@@ -9,7 +9,7 @@ module Wings
         # skip reserved attributes, we assume we don't need to translate valkyrie internals
         schema = resource_class.schema.reject do |key|
           resource_class.reserved_attributes.include?(key.name) ||
-            key.name == :size
+            key.name == :size || key.name == :has_model
         end
 
         Wings::ActiveFedoraConverter.apply_properties(self, schema)