hyrax 4.0.0.beta1 → 4.0.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.circleci/config.yml +66 -54
- data/.dassie/.env +29 -0
- data/.dassie/Gemfile +1 -1
- data/.dassie/app/controllers/catalog_controller.rb +1 -1
- data/.dassie/config/initializers/hyrax.rb +4 -0
- data/.github/SUPPORT.md +2 -3
- data/.github/workflows/build.yml +79 -0
- data/.github/workflows/main.yml +4 -4
- data/.github/workflows/release.yml +10 -4
- data/{.env → .koppie/.env} +21 -11
- data/.koppie/.gitignore +48 -0
- data/.koppie/.rspec +2 -0
- data/.koppie/CODE_OF_CONDUCT.md +36 -0
- data/.koppie/CONTRIBUTING.md +192 -0
- data/.koppie/Gemfile +53 -0
- data/.koppie/LICENSE +205 -0
- data/.koppie/README.md +55 -0
- data/.koppie/Rakefile +8 -0
- data/.koppie/app/assets/config/manifest.js +5 -0
- data/.koppie/app/assets/images/.keep +0 -0
- data/.koppie/app/assets/images/unauthorized.png +0 -0
- data/.koppie/app/assets/images/us_404.svg +91 -0
- data/.koppie/app/assets/javascripts/application.js +30 -0
- data/.koppie/app/assets/javascripts/blacklight_gallery.js +1 -0
- data/.koppie/app/assets/javascripts/cable.js +13 -0
- data/.koppie/app/assets/javascripts/channels/.keep +0 -0
- data/.koppie/app/assets/javascripts/openseadragon.js +2 -0
- data/.koppie/app/assets/stylesheets/application.css +48 -0
- data/.koppie/app/assets/stylesheets/hyrax.scss +17 -0
- data/.koppie/app/assets/stylesheets/openseadragon.css +3 -0
- data/.koppie/app/channels/application_cable/channel.rb +4 -0
- data/.koppie/app/channels/application_cable/connection.rb +4 -0
- data/.koppie/app/controllers/application_controller.rb +13 -0
- data/.koppie/app/controllers/catalog_controller.rb +314 -0
- data/.koppie/app/controllers/concerns/.keep +0 -0
- data/.koppie/app/controllers/hyrax/generic_works_controller.rb +17 -0
- data/.koppie/app/controllers/hyrax/monographs_controller.rb +17 -0
- data/.koppie/app/forms/collection_resource_form.rb +7 -0
- data/.koppie/app/forms/generic_work_form.rb +20 -0
- data/.koppie/app/forms/monograph_form.rb +20 -0
- data/.koppie/app/helpers/application_helper.rb +2 -0
- data/.koppie/app/helpers/hyrax_helper.rb +6 -0
- data/.koppie/app/indexers/collection_resource_indexer.rb +7 -0
- data/.koppie/app/indexers/generic_work_indexer.rb +16 -0
- data/.koppie/app/indexers/monograph_indexer.rb +16 -0
- data/.koppie/app/jobs/application_job.rb +2 -0
- data/.koppie/app/mailers/application_mailer.rb +4 -0
- data/.koppie/app/models/ability.rb +25 -0
- data/.koppie/app/models/application_record.rb +3 -0
- data/.koppie/app/models/collection.rb +1 -0
- data/.koppie/app/models/collection_resource.rb +31 -0
- data/.koppie/app/models/concerns/.keep +0 -0
- data/.koppie/app/models/file_set.rb +4 -0
- data/.koppie/app/models/generic_work.rb +8 -0
- data/.koppie/app/models/monograph.rb +8 -0
- data/.koppie/app/models/qa/local_authority.rb +2 -0
- data/.koppie/app/models/qa/local_authority_entry.rb +3 -0
- data/.koppie/app/models/qa.rb +5 -0
- data/.koppie/app/models/search_builder.rb +16 -0
- data/.koppie/app/models/solr_document.rb +28 -0
- data/.koppie/app/models/user.rb +24 -0
- data/.koppie/app/views/hyrax/generic_works/_generic_work.html.erb +2 -0
- data/.koppie/app/views/hyrax/monographs/_monograph.html.erb +2 -0
- data/.koppie/app/views/layouts/application.html.erb +15 -0
- data/.koppie/app/views/layouts/mailer.html.erb +13 -0
- data/.koppie/app/views/layouts/mailer.text.erb +1 -0
- data/.koppie/bin/bundle +3 -0
- data/.koppie/bin/rails +9 -0
- data/.koppie/bin/rake +9 -0
- data/.koppie/bin/setup +36 -0
- data/.koppie/bin/spring +17 -0
- data/.koppie/bin/update +31 -0
- data/.koppie/bin/yarn +11 -0
- data/.koppie/config/analytics.yml +12 -0
- data/.koppie/config/application.rb +33 -0
- data/.koppie/config/authorities/licenses.yml +46 -0
- data/.koppie/config/authorities/resource_types.yml +41 -0
- data/.koppie/config/authorities/rights_statements.yml +37 -0
- data/.koppie/config/blacklight.yml +9 -0
- data/.koppie/config/boot.rb +4 -0
- data/.koppie/config/browse_everything_providers.yml +25 -0
- data/.koppie/config/cable.yml +12 -0
- data/.koppie/config/credentials.yml.enc +1 -0
- data/.koppie/config/database.yml +25 -0
- data/.koppie/config/environment.rb +5 -0
- data/.koppie/config/environments/development.rb +71 -0
- data/.koppie/config/environments/production.rb +97 -0
- data/.koppie/config/environments/test.rb +46 -0
- data/.koppie/config/initializers/1_valkyrie.rb +56 -0
- data/.koppie/config/initializers/application_controller_renderer.rb +8 -0
- data/.koppie/config/initializers/assets.rb +14 -0
- data/.koppie/config/initializers/backtrace_silencers.rb +7 -0
- data/.koppie/config/initializers/clamav.rb +2 -0
- data/.koppie/config/initializers/content_security_policy.rb +25 -0
- data/.koppie/config/initializers/cookies_serializer.rb +5 -0
- data/.koppie/config/initializers/devise.rb +311 -0
- data/.koppie/config/initializers/file_services.rb +4 -0
- data/.koppie/config/initializers/filter_parameter_logging.rb +4 -0
- data/.koppie/config/initializers/hydra_config.rb +24 -0
- data/.koppie/config/initializers/hyrax.rb +333 -0
- data/.koppie/config/initializers/inflections.rb +16 -0
- data/.koppie/config/initializers/mailboxer.rb +22 -0
- data/.koppie/config/initializers/mime_types.rb +8 -0
- data/.koppie/config/initializers/mini_magick.rb +6 -0
- data/.koppie/config/initializers/redis_config.rb +4 -0
- data/.koppie/config/initializers/riiif.rb +29 -0
- data/.koppie/config/initializers/simple_form.rb +171 -0
- data/.koppie/config/initializers/simple_form_bootstrap.rb +151 -0
- data/.koppie/config/initializers/wrap_parameters.rb +14 -0
- data/.koppie/config/locales/blacklight.en.yml +3 -0
- data/.koppie/config/locales/devise.en.yml +65 -0
- data/.koppie/config/locales/en.yml +33 -0
- data/.koppie/config/locales/hyrax.de.yml +58 -0
- data/.koppie/config/locales/hyrax.en.yml +58 -0
- data/.koppie/config/locales/hyrax.es.yml +58 -0
- data/.koppie/config/locales/hyrax.fr.yml +58 -0
- data/.koppie/config/locales/hyrax.it.yml +58 -0
- data/.koppie/config/locales/hyrax.pt-BR.yml +58 -0
- data/.koppie/config/locales/hyrax.zh.yml +58 -0
- data/.koppie/config/metadata/collection_resource.yaml +149 -0
- data/.koppie/config/metadata/generic_work.yaml +22 -0
- data/.koppie/config/metadata/monograph.yaml +55 -0
- data/.koppie/config/puma.rb +37 -0
- data/.koppie/config/redis.yml +12 -0
- data/.koppie/config/role_map.yml +48 -0
- data/.koppie/config/routes.rb +36 -0
- data/.koppie/config/sidekiq.yml +15 -0
- data/.koppie/config/solr.yml +7 -0
- data/.koppie/config/spring.rb +6 -0
- data/.koppie/config/storage.yml +34 -0
- data/.koppie/config/tinymce.yml +13 -0
- data/.koppie/config/uv/uv-config.json +3 -0
- data/.koppie/config/uv/uv.html +87 -0
- data/.koppie/config/valkyrie_index.yml +12 -0
- data/.koppie/config/workflows/default_workflow.json +21 -0
- data/.koppie/config/workflows/mediated_deposit_workflow.json +76 -0
- data/.koppie/config.ru +5 -0
- data/.koppie/db/migrate/20210911143430_create_searches.blacklight.rb +17 -0
- data/.koppie/db/migrate/20210911143431_create_bookmarks.blacklight.rb +19 -0
- data/.koppie/db/migrate/20210911143432_add_polymorphic_type_to_bookmarks.blacklight.rb +9 -0
- data/.koppie/db/migrate/20210911143452_devise_create_users.rb +44 -0
- data/.koppie/db/migrate/20210911143456_add_devise_guests_to_users.rb +15 -0
- data/.koppie/db/migrate/20210911143532_create_version_committers.hyrax.rb +15 -0
- data/.koppie/db/migrate/20210911143533_create_checksum_audit_logs.hyrax.rb +19 -0
- data/.koppie/db/migrate/20210911143534_create_single_use_links.hyrax.rb +12 -0
- data/.koppie/db/migrate/20210911143535_add_social_to_users.hyrax.rb +13 -0
- data/.koppie/db/migrate/20210911143536_add_ldap_attrs_to_user.hyrax.rb +27 -0
- data/.koppie/db/migrate/20210911143537_add_avatars_to_users.hyrax.rb +15 -0
- data/.koppie/db/migrate/20210911143538_create_trophies.hyrax.rb +10 -0
- data/.koppie/db/migrate/20210911143539_add_linkedin_to_users.hyrax.rb +5 -0
- data/.koppie/db/migrate/20210911143540_create_tinymce_assets.hyrax.rb +8 -0
- data/.koppie/db/migrate/20210911143541_create_content_blocks.hyrax.rb +10 -0
- data/.koppie/db/migrate/20210911143542_create_featured_works.hyrax.rb +12 -0
- data/.koppie/db/migrate/20210911143543_add_external_key_to_content_blocks.hyrax.rb +6 -0
- data/.koppie/db/migrate/20210911143544_create_proxy_deposit_rights.hyrax.rb +10 -0
- data/.koppie/db/migrate/20210911143545_create_proxy_deposit_requests.hyrax.rb +15 -0
- data/.koppie/db/migrate/20210911143546_create_file_view_stats.hyrax.rb +12 -0
- data/.koppie/db/migrate/20210911143547_create_file_download_stats.hyrax.rb +12 -0
- data/.koppie/db/migrate/20210911143548_add_orcid_to_users.hyrax.rb +5 -0
- data/.koppie/db/migrate/20210911143549_create_user_stats.hyrax.rb +19 -0
- data/.koppie/db/migrate/20210911143550_create_work_view_stats.hyrax.rb +12 -0
- data/.koppie/db/migrate/20210911143551_add_works_to_user_stats.hyrax.rb +13 -0
- data/.koppie/db/migrate/20210911143552_change_trophy_generic_file_id_to_work_id.hyrax.rb +5 -0
- data/.koppie/db/migrate/20210911143553_change_proxy_deposit_generic_file_id_to_work_id.hyrax.rb +5 -0
- data/.koppie/db/migrate/20210911143554_change_audit_log_generic_file_id_to_file_set_id.hyrax.rb +5 -0
- data/.koppie/db/migrate/20210911143555_change_proxy_deposit_request_generic_file_id_to_work_id.hyrax.rb +5 -0
- data/.koppie/db/migrate/20210911143556_create_uploaded_files.hyrax.rb +10 -0
- data/.koppie/db/migrate/20210911143557_create_features.hyrax.rb +10 -0
- data/.koppie/db/migrate/20210911143558_create_operations.hyrax.rb +23 -0
- data/.koppie/db/migrate/20210911143559_change_featured_work_generic_file_id_to_work_id.hyrax.rb +6 -0
- data/.koppie/db/migrate/20210911143560_add_arkivo_to_users.hyrax.rb +8 -0
- data/.koppie/db/migrate/20210911143561_create_sipity.hyrax.rb +163 -0
- data/.koppie/db/migrate/20210911143562_create_sipity_workflow_methods.hyrax.rb +10 -0
- data/.koppie/db/migrate/20210911143563_create_permission_template.hyrax.rb +11 -0
- data/.koppie/db/migrate/20210911143564_create_permission_template_access.hyrax.rb +11 -0
- data/.koppie/db/migrate/20210911143565_add_release_to_permission_templates.hyrax.rb +6 -0
- data/.koppie/db/migrate/20210911143566_add_permission_template_to_sipity_workflow.hyrax.rb +26 -0
- data/.koppie/db/migrate/20210911143567_tidy_up_because_of_bad_exception.hyrax.rb +13 -0
- data/.koppie/db/migrate/20210911143568_add_allows_access_grant_to_workflow.hyrax.rb +5 -0
- data/.koppie/db/migrate/20210911143569_change_checksum_audit_log.hyrax.rb +18 -0
- data/.koppie/db/migrate/20210911143570_create_job_io_wrappers.hyrax.rb +15 -0
- data/.koppie/db/migrate/20210911143571_create_collection_types.hyrax.rb +17 -0
- data/.koppie/db/migrate/20210911143572_update_collection_type_column_names.hyrax.rb +9 -0
- data/.koppie/db/migrate/20210911143573_update_collection_type_column_options.hyrax.rb +17 -0
- data/.koppie/db/migrate/20210911143574_create_collection_branding_infos.hyrax.rb +15 -0
- data/.koppie/db/migrate/20210911143575_create_collection_type_participants.hyrax.rb +11 -0
- data/.koppie/db/migrate/20210911143576_rename_admin_set_id_to_source_id.hyrax.rb +5 -0
- data/.koppie/db/migrate/20210911143577_add_preferred_locale_to_users.hyrax.rb +5 -0
- data/.koppie/db/migrate/20210911143578_add_collection_type_sharing_options.hyrax.rb +5 -0
- data/.koppie/db/migrate/20210911143579_add_unique_constraint_to_permission_template_accesses.hyrax.rb +8 -0
- data/.koppie/db/migrate/20210911143580_add_branding_to_collection_type.hyrax.rb +5 -0
- data/.koppie/db/migrate/20210911143581_add_badge_color_to_collection_types.hyrax.rb +5 -0
- data/.koppie/db/migrate/20210911143582_update_single_use_links_column_names.hyrax.rb +6 -0
- data/.koppie/db/migrate/20210911143583_change_sipity_entity_specific_responsibility.hyrax.rb +9 -0
- data/.koppie/db/migrate/20210911143584_create_mailboxer.mailboxer_engine.rb +65 -0
- data/.koppie/db/migrate/20210911143585_add_conversation_optout.mailboxer_engine.rb +15 -0
- data/.koppie/db/migrate/20210911143586_add_missing_indices.mailboxer_engine.rb +20 -0
- data/.koppie/db/migrate/20210911143587_add_delivery_tracking_info_to_mailboxer_receipts.mailboxer_engine.rb +8 -0
- data/.koppie/db/migrate/20210911143588_create_qa_local_authorities.rb +10 -0
- data/.koppie/db/migrate/20210911143602_create_qa_local_authority_entries.rb +12 -0
- data/.koppie/db/migrate/20210911143623_create_minter_states.noid_rails_engine.rb +17 -0
- data/.koppie/db/migrate/20210911143624_rename_minter_state_random_to_rand.noid_rails_engine.rb +8 -0
- data/.koppie/db/migrate/20210921150120_enable_uuid_extension.valkyrie_engine.rb +7 -0
- data/.koppie/db/migrate/20210921150121_create_orm_resources.valkyrie_engine.rb +19 -0
- data/.koppie/db/migrate/20210921150122_add_model_type_to_orm_resources.valkyrie_engine.rb +7 -0
- data/.koppie/db/migrate/20210921150123_change_model_type_to_internal_model.valkyrie_engine.rb +7 -0
- data/.koppie/db/migrate/20210921150124_create_path_gin_index.valkyrie_engine.rb +7 -0
- data/.koppie/db/migrate/20210921150125_create_internal_resource_index.valkyrie_engine.rb +7 -0
- data/.koppie/db/migrate/20210921150126_create_updated_at_index.valkyrie_engine.rb +7 -0
- data/.koppie/db/migrate/20210921150127_add_optimistic_locking_to_orm_resources.valkyrie_engine.rb +7 -0
- data/.koppie/db/migrate/20211021161136_user_roles.rb +20 -0
- data/.koppie/db/migrate/20211207172259_create_default_administrative_set.hyrax.rb +8 -0
- data/.koppie/db/schema.rb +595 -0
- data/.koppie/db/seeds.rb +79 -0
- data/.koppie/lib/assets/.keep +0 -0
- data/.koppie/lib/tasks/.keep +0 -0
- data/.koppie/log/.keep +0 -0
- data/.koppie/package.json +15 -0
- data/.koppie/public/404.html +67 -0
- data/.koppie/public/422.html +67 -0
- data/.koppie/public/500.html +66 -0
- data/.koppie/public/apple-touch-icon-precomposed.png +0 -0
- data/.koppie/public/apple-touch-icon.png +0 -0
- data/.koppie/public/branding/.keep +0 -0
- data/.koppie/public/favicon.ico +0 -0
- data/.koppie/public/robots.txt +1 -0
- data/.koppie/scripts/db-migrate-seed.sh +9 -0
- data/.koppie/scripts/entrypoint.sh +10 -0
- data/.koppie/solr/conf/_rest_managed.json +3 -0
- data/.koppie/solr/conf/admin-extra.html +31 -0
- data/.koppie/solr/conf/elevate.xml +36 -0
- data/.koppie/solr/conf/mapping-ISOLatin1Accent.txt +246 -0
- data/.koppie/solr/conf/protwords.txt +21 -0
- data/.koppie/solr/conf/schema.xml +367 -0
- data/.koppie/solr/conf/scripts.conf +24 -0
- data/.koppie/solr/conf/solrconfig.xml +325 -0
- data/.koppie/solr/conf/spellings.txt +2 -0
- data/.koppie/solr/conf/stopwords.txt +58 -0
- data/.koppie/solr/conf/stopwords_en.txt +58 -0
- data/.koppie/solr/conf/synonyms.txt +31 -0
- data/.koppie/solr/conf/xslt/example.xsl +132 -0
- data/.koppie/solr/conf/xslt/example_atom.xsl +67 -0
- data/.koppie/solr/conf/xslt/example_rss.xsl +66 -0
- data/.koppie/solr/conf/xslt/luke.xsl +337 -0
- data/.koppie/solr/sample_solr_documents.yml +2692 -0
- data/.koppie/spec/forms/collection_resource_form_spec.rb +13 -0
- data/.koppie/spec/indexers/collection_resource_indexer_spec.rb +14 -0
- data/.koppie/spec/indexers/generic_work_indexer_spec.rb +13 -0
- data/.koppie/spec/indexers/monograph_indexer_spec.rb +13 -0
- data/.koppie/spec/models/collection_resource_spec.rb +13 -0
- data/.koppie/spec/models/collection_spec.rb +17 -0
- data/.koppie/spec/models/file_set_spec.rb +15 -0
- data/.koppie/spec/models/generic_work_spec.rb +13 -0
- data/.koppie/spec/models/monograph_spec.rb +13 -0
- data/.koppie/spec/models/qa/local_authority_entry_spec.rb +5 -0
- data/.koppie/spec/models/qa/local_authority_spec.rb +5 -0
- data/.koppie/spec/rails_helper.rb +47 -0
- data/.koppie/spec/spec_helper.rb +19 -0
- data/.koppie/spec/views/generic_works/_generic_work.html.erb_spec.rb +7 -0
- data/.koppie/spec/views/monographs/_monograph.html.erb_spec.rb +7 -0
- data/.koppie/storage/.keep +0 -0
- data/.koppie/vendor/.keep +0 -0
- data/.koppie/yarn.lock +1497 -0
- data/CONTAINERS.md +56 -12
- data/CONTRIBUTING.md +2 -2
- data/Dockerfile +29 -13
- data/README.md +24 -97
- data/app/actors/hyrax/actors/collections_membership_actor.rb +1 -2
- data/app/actors/hyrax/actors/create_with_files_actor.rb +1 -1
- data/app/actors/hyrax/actors/create_with_remote_files_actor.rb +2 -2
- data/app/actors/hyrax/actors/embargo_actor.rb +11 -4
- data/app/actors/hyrax/actors/lease_actor.rb +11 -4
- data/app/assets/javascripts/hyrax/app.js.erb +1 -1
- data/app/assets/javascripts/hyrax/permissions/control.es6 +8 -1
- data/app/assets/stylesheets/hyrax/_catalog.scss +4 -0
- data/app/assets/stylesheets/hyrax/_forms.scss +4 -0
- data/app/assets/stylesheets/hyrax/dashboard.scss +5 -62
- data/app/components/hyrax/dropdown_facet_field_component.html.erb +21 -0
- data/app/components/hyrax/dropdown_facet_field_component.rb +30 -0
- data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +6 -9
- data/app/controllers/concerns/hyrax/controller.rb +1 -23
- data/app/controllers/concerns/hyrax/embargoes_controller_behavior.rb +11 -2
- data/app/controllers/concerns/hyrax/leases_controller_behavior.rb +11 -2
- data/app/controllers/concerns/hyrax/manages_embargoes.rb +13 -1
- data/app/controllers/concerns/hyrax/works_controller_behavior.rb +5 -2
- data/app/controllers/hyrax/dashboard/collection_members_controller.rb +0 -1
- data/app/controllers/hyrax/dashboard/collections_controller.rb +5 -8
- data/app/controllers/hyrax/downloads_controller.rb +16 -1
- data/app/controllers/hyrax/file_sets_controller.rb +10 -2
- data/app/controllers/hyrax/my/collections_controller.rb +1 -0
- data/app/controllers/hyrax/my/works_controller.rb +4 -2
- data/app/controllers/hyrax/permissions_controller.rb +1 -1
- data/app/controllers/hyrax/transfers_controller.rb +4 -3
- data/app/controllers/hyrax/workflow_actions_controller.rb +3 -2
- data/app/forms/hyrax/forms/batch_upload_form.rb +1 -1
- data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb +4 -18
- data/app/forms/hyrax/forms/embargo.rb +13 -0
- data/app/forms/hyrax/forms/file_set_edit_form.rb +1 -1
- data/app/forms/hyrax/forms/file_set_form.rb +8 -35
- data/app/forms/hyrax/forms/lease.rb +13 -0
- data/app/forms/hyrax/forms/pcdm_object_form.rb +46 -0
- data/app/forms/hyrax/forms/resource_form.rb +36 -32
- data/app/forms/hyrax/forms/work_embargo_form.rb +35 -0
- data/app/forms/hyrax/forms/work_form.rb +2 -2
- data/app/forms/hyrax/forms/work_lease_form.rb +35 -0
- data/app/helpers/hyrax/collections_helper.rb +4 -32
- data/app/helpers/hyrax/embargo_helper.rb +11 -0
- data/app/helpers/hyrax/facets_helper.rb +0 -140
- data/app/helpers/hyrax/hyrax_helper_behavior.rb +16 -1
- data/app/helpers/hyrax/lease_helper.rb +11 -0
- data/app/helpers/hyrax/work_form_helper.rb +107 -0
- data/app/indexers/hyrax/deep_indexing_service.rb +2 -2
- data/app/indexers/hyrax/pcdm_collection_indexer.rb +1 -0
- data/app/indexers/hyrax/valkyrie_file_set_indexer.rb +2 -8
- data/app/indexers/hyrax/valkyrie_work_indexer.rb +21 -0
- data/app/jobs/characterize_job.rb +9 -4
- data/app/jobs/import_url_job.rb +2 -2
- data/app/jobs/valkyrie_create_derivatives_job.rb +0 -2
- data/app/models/admin_set.rb +8 -0
- data/app/models/concerns/hyrax/ability.rb +3 -3
- data/app/models/concerns/hyrax/collection_behavior.rb +3 -48
- data/app/models/concerns/hyrax/file_set_behavior.rb +1 -0
- data/app/models/concerns/hyrax/naming.rb +1 -1
- data/app/models/concerns/hyrax/solr_document/metadata.rb +1 -0
- data/app/models/concerns/hyrax/suppressible.rb +0 -8
- data/app/models/concerns/hyrax/work_behavior.rb +0 -1
- data/app/models/file_download_stat.rb +5 -5
- data/app/models/hyrax/collection_type.rb +9 -17
- data/app/models/hyrax/embargo.rb +1 -1
- data/app/models/hyrax/file_metadata.rb +5 -12
- data/app/models/hyrax/file_set.rb +3 -11
- data/app/models/hyrax/lease.rb +1 -1
- data/app/models/hyrax/statistic.rb +5 -5
- data/app/models/hyrax/work.rb +2 -2
- data/app/models/proxy_deposit_request.rb +1 -1
- data/app/models/sipity.rb +35 -14
- data/app/presenters/hyrax/admin_set_presenter.rb +5 -0
- data/app/presenters/hyrax/collection_presenter.rb +1 -1
- data/app/presenters/hyrax/displays_image.rb +1 -1
- data/app/presenters/hyrax/iiif_manifest_presenter.rb +14 -4
- data/app/presenters/hyrax/pcdm_member_presenter_factory.rb +1 -1
- data/app/presenters/hyrax/permission_badge.rb +3 -2
- data/app/presenters/hyrax/presenter_renderer.rb +1 -1
- data/app/presenters/hyrax/presents_attributes.rb +1 -1
- data/app/presenters/hyrax/version_list_presenter.rb +6 -1
- data/app/presenters/hyrax/work_show_presenter.rb +4 -1
- data/app/presenters/hyrax/workflow_presenter.rb +1 -1
- data/app/search_builders/hyrax/collection_search_builder.rb +1 -0
- data/app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb +7 -67
- data/app/search_builders/hyrax/filter_suppressed_with_roles.rb +1 -1
- data/app/services/hyrax/admin_set_create_service.rb +2 -2
- data/app/services/hyrax/admin_set_service.rb +1 -1
- data/app/services/hyrax/analytics/google.rb +1 -1
- data/app/services/hyrax/analytics/matomo.rb +1 -1
- data/app/services/hyrax/collection_member_service.rb +2 -0
- data/app/services/hyrax/collection_types/create_service.rb +1 -1
- data/app/services/hyrax/collections/migration_service.rb +8 -8
- data/app/services/hyrax/collections/nested_collection_query_service.rb +3 -113
- data/app/services/hyrax/database_migrator.rb +1 -1
- data/app/services/hyrax/derivative_service.rb +37 -4
- data/app/services/hyrax/edit_permissions_service.rb +22 -17
- data/app/services/hyrax/embargo_manager.rb +9 -0
- data/app/services/hyrax/embargo_service.rb +4 -0
- data/app/services/hyrax/file_set_file_service.rb +55 -0
- data/app/services/hyrax/lease_manager.rb +9 -0
- data/app/services/hyrax/lease_service.rb +4 -0
- data/app/services/hyrax/listeners/file_metadata_listener.rb +11 -0
- data/app/services/hyrax/listeners/workflow_listener.rb +2 -2
- data/app/services/hyrax/local_file_service.rb +3 -1
- data/app/services/hyrax/restriction_service.rb +1 -1
- data/app/services/hyrax/solr_query_service.rb +10 -2
- data/app/services/hyrax/solr_service.rb +22 -16
- data/app/services/hyrax/statistics/depositors/summary.rb +1 -1
- data/app/services/hyrax/statistics/term_query.rb +1 -1
- data/app/services/hyrax/thumbnail_path_service.rb +11 -3
- data/app/services/hyrax/user_stat_importer.rb +4 -2
- data/app/services/hyrax/valkyrie_persist_derivatives.rb +26 -15
- data/app/services/hyrax/valkyrie_upload.rb +24 -31
- data/app/services/hyrax/versioning_service.rb +78 -10
- data/app/services/hyrax/visibility_map.rb +10 -2
- data/app/services/hyrax/visibility_propagator.rb +5 -5
- data/app/services/hyrax/work_resource_query_service.rb +45 -0
- data/app/services/hyrax/workflow/action_taken_service.rb +4 -4
- data/app/services/hyrax/workflow/notification_service.rb +2 -2
- data/app/services/hyrax/workflow/status_list_service.rb +1 -1
- data/app/services/hyrax/workflow/workflow_importer.rb +2 -2
- data/app/services/hyrax/working_directory.rb +3 -3
- data/app/services/hyrax/works/migration_service.rb +3 -3
- data/app/utils/hyrax/test_data_seeders/user_seeder.rb +3 -2
- data/app/validators/hyrax/collection_membership_validator.rb +2 -2
- data/app/views/hyrax/admin/analytics/work_reports/show.html.erb +6 -6
- data/app/views/hyrax/base/_attribute_rows.html.erb +2 -0
- data/app/views/hyrax/base/_form_collections_error.html.erb +1 -1
- data/app/views/hyrax/base/_form_in_works_error.html.erb +1 -1
- data/app/views/hyrax/base/_form_ordered_members_error.html.erb +1 -1
- data/app/views/hyrax/base/_form_progress.html.erb +1 -1
- data/app/views/hyrax/base/_form_visibility_component.html.erb +5 -1
- data/app/views/hyrax/base/_form_visibility_error.html.erb +19 -5
- data/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb +1 -1
- data/app/views/hyrax/embargoes/edit.html.erb +4 -4
- data/app/views/hyrax/file_sets/_permission.html.erb +1 -1
- data/app/views/hyrax/file_sets/_permission_form.html.erb +1 -6
- data/app/views/hyrax/file_sets/edit.html.erb +2 -2
- data/app/views/hyrax/file_sets/media_display/_audio.html.erb +1 -1
- data/app/views/hyrax/file_sets/media_display/_default.html.erb +1 -1
- data/app/views/hyrax/file_sets/media_display/_image.html.erb +1 -1
- data/app/views/hyrax/file_sets/media_display/_office_document.html.erb +1 -1
- data/app/views/hyrax/file_sets/media_display/_pdf.html.erb +1 -1
- data/app/views/hyrax/file_sets/media_display/_video.html.erb +1 -1
- data/app/views/hyrax/leases/edit.html.erb +3 -3
- data/app/views/hyrax/my/collections/_facets.html.erb +7 -5
- data/app/views/hyrax/my/works/_facets.html.erb +6 -2
- data/app/views/hyrax/transfers/_received.html.erb +1 -1
- data/app/views/hyrax/transfers/_sent.html.erb +1 -1
- data/app/views/hyrax/transfers/new.html.erb +1 -1
- data/app/views/hyrax/uploads/_js_templates.html.erb +8 -8
- data/app/views/hyrax/uploads/_js_templates_branding.html.erb +2 -2
- data/app/views/hyrax/users/_vitals.html.erb +4 -4
- data/chart/hyrax/Chart.yaml +7 -7
- data/chart/hyrax/README.md +5 -0
- data/chart/hyrax/templates/_helpers.tpl +19 -7
- data/chart/hyrax/templates/configmap-env.yaml +1 -1
- data/chart/hyrax/templates/cron-embargo.yaml +1 -1
- data/chart/hyrax/templates/cron-lease.yaml +1 -1
- data/chart/hyrax/templates/deployment-worker.yaml +2 -2
- data/chart/hyrax/templates/extra-list.yaml +8 -0
- data/chart/hyrax/templates/secrets.yaml +3 -3
- data/chart/hyrax/values.yaml +23 -15
- data/config/features.rb +1 -1
- data/config/initializers/reform_rails_6_1_monkey_patch.rb +27 -0
- data/config/locales/hyrax.de.yml +9 -8
- data/config/locales/hyrax.en.yml +3 -0
- data/config/locales/hyrax.es.yml +8 -7
- data/config/locales/hyrax.fr.yml +10 -9
- data/config/locales/hyrax.it.yml +8 -7
- data/config/locales/hyrax.pt-BR.yml +8 -7
- data/config/locales/hyrax.zh.yml +9 -8
- data/config/metadata/basic_metadata.yaml +2 -0
- data/config/metadata/file_set_metadata.yaml +130 -0
- data/docker-compose-koppie.yml +163 -0
- data/docker-compose.yml +0 -3
- data/documentation/MAINTENANCE.md +77 -0
- data/documentation/developing-your-hyrax-based-app.md +2 -2
- data/documentation/legacyREADME.md +3 -3
- data/hyrax.gemspec +9 -8
- data/lib/generators/hyrax/install_generator.rb +4 -4
- data/lib/generators/hyrax/templates/catalog_controller.rb +1 -3
- data/lib/generators/hyrax/templates/config/initializers/hyrax.rb +8 -1
- data/lib/generators/hyrax/templates/config/initializers/riiif.rb +1 -1
- data/lib/hyrax/active_fedora_dummy_model.rb +13 -0
- data/lib/hyrax/configuration.rb +30 -15
- data/lib/hyrax/controlled_vocabulary/importer/language.rb +1 -1
- data/lib/hyrax/engine.rb +6 -3
- data/lib/hyrax/errors.rb +2 -0
- data/lib/hyrax/publisher.rb +4 -0
- data/lib/hyrax/search_state.rb +9 -0
- data/lib/hyrax/specs/capybara.rb +2 -2
- data/lib/hyrax/specs/shared_specs/factories/strategies/json_strategy.rb +4 -0
- data/lib/hyrax/specs/shared_specs/factories/strategies/valkyrie_resource.rb +10 -0
- data/lib/hyrax/specs/shared_specs/indexers.rb +5 -0
- data/lib/hyrax/transactions/container.rb +0 -2
- data/lib/hyrax/transactions/steps/remove_file_set_from_work.rb +29 -3
- data/lib/hyrax/transactions/steps/save_access_control.rb +17 -1
- data/lib/hyrax/transactions/steps/save_collection_banner.rb +1 -1
- data/lib/hyrax/transactions/steps/save_collection_logo.rb +1 -1
- data/lib/hyrax/version.rb +1 -1
- data/lib/hyrax.rb +1 -1
- data/lib/tasks/migrate.rake +5 -1
- data/lib/valkyrie/indexing/solr/indexing_adapter.rb +1 -1
- data/lib/wings/active_fedora_converter/file_metadata_node.rb +1 -1
- data/lib/wings/valkyrie/storage.rb +6 -2
- data/samvera-fall-TM3.svg +376 -0
- data/tasks/benchmark.rake +1 -1
- data/tasks/hyrax_dev.rake +0 -32
- data/template.rb +1 -1
- metadata +326 -65
- data/app/conversions/power_converters/polymorphic_type.rb +0 -9
- data/app/conversions/power_converters/sipity_action.rb +0 -11
- data/app/conversions/power_converters/sipity_action_name.rb +0 -10
- data/app/conversions/power_converters/sipity_agent.rb +0 -9
- data/app/conversions/power_converters/sipity_entity.rb +0 -14
- data/app/conversions/power_converters/sipity_role.rb +0 -10
- data/app/conversions/power_converters/sipity_workflow_id.rb +0 -17
- data/app/conversions/power_converters/sipity_workflow_state.rb +0 -13
- data/app/conversions/power_converters.rb +0 -7
- data/app/indexers/hyrax/repository_reindexer.rb +0 -19
- data/app/models/concerns/hyrax/collection_nesting.rb +0 -73
- data/app/services/hyrax/adapters/nesting_index_adapter.rb +0 -193
- data/app/views/hyrax/my/_facet_layout.html.erb +0 -7
- data/app/views/hyrax/my/_facet_limit.html.erb +0 -15
- data/app/views/hyrax/my/_facet_pivot.html.erb +0 -26
- data/config/initializers/nesting_indexer_initializer.rb +0 -16
@@ -3,16 +3,16 @@
|
|
3
3
|
</div>
|
4
4
|
|
5
5
|
<div class="list-group-item">
|
6
|
-
<span class="badge"><%= number_of_collections(user) %></span>
|
6
|
+
<span class="badge dark-text"><%= number_of_collections(user) %></span>
|
7
7
|
<span class="fa fa-folder-open" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.collections"), {generic_type: "Collection", depositor: user.to_s}) %>
|
8
8
|
</div>
|
9
9
|
|
10
10
|
<div class="list-group-item">
|
11
|
-
<span class="badge"><%= number_of_works(user) %></span>
|
11
|
+
<span class="badge dark-text"><%= number_of_works(user) %></span>
|
12
12
|
<span class="fa fa-upload" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.works"), {generic_type: "Work", depositor: user.to_s}) %>
|
13
13
|
|
14
14
|
<ul class="views-downloads-dashboard list-unstyled">
|
15
|
-
<li><span class="badge badge-optional"><%= user.total_file_views %></span> <%= t("hyrax.dashboard.stats.file_views").pluralize(user.total_file_views) %></li>
|
16
|
-
<li><span class="badge badge-optional"><%= user.total_file_downloads %></span> <%= t("hyrax.dashboard.stats.file_downloads").pluralize(user.total_file_downloads) %></li>
|
15
|
+
<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>
|
16
|
+
<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>
|
17
17
|
</ul>
|
18
18
|
</div>
|
data/chart/hyrax/Chart.yaml
CHANGED
@@ -2,7 +2,7 @@ apiVersion: v2
|
|
2
2
|
name: hyrax
|
3
3
|
description: An open-source, Samvera-powered digital repository system
|
4
4
|
type: application
|
5
|
-
version: 1.
|
5
|
+
version: 3.1.0
|
6
6
|
appVersion: 3.3.0
|
7
7
|
dependencies:
|
8
8
|
- name: fcrepo
|
@@ -10,26 +10,26 @@ dependencies:
|
|
10
10
|
repository: oci://ghcr.io/samvera
|
11
11
|
condition: fcrepo.enabled
|
12
12
|
- name: memcached
|
13
|
-
version:
|
13
|
+
version: 6.3.13
|
14
14
|
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
|
15
15
|
condition: memcached.enabled
|
16
16
|
- name: minio
|
17
|
-
version:
|
17
|
+
version: 12.1.14
|
18
18
|
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
|
19
19
|
condition: minio.enabled
|
20
20
|
- name: postgresql
|
21
|
-
version:
|
21
|
+
version: 12.2.5
|
22
22
|
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
|
23
23
|
condition: postgresql.enabled
|
24
24
|
- name: redis
|
25
|
-
version:
|
25
|
+
version: 17.8.7
|
26
26
|
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
|
27
27
|
condition: redis.enabled
|
28
28
|
- name: solr
|
29
|
-
version:
|
29
|
+
version: 7.2.1
|
30
30
|
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
|
31
31
|
condition: solr.enabled
|
32
32
|
- name: nginx
|
33
|
-
version:
|
33
|
+
version: 13.2.30
|
34
34
|
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
|
35
35
|
condition: nginx.enabled
|
data/chart/hyrax/README.md
CHANGED
@@ -11,6 +11,11 @@ production-ready setup for Hyrax applications. By default it deploys:
|
|
11
11
|
- Solr (in a cloud configuration, including Apache Zookeeper)
|
12
12
|
- Redis
|
13
13
|
|
14
|
+
## Minimum requirements
|
15
|
+
|
16
|
+
- Kubernetes 1.21
|
17
|
+
- Helm 3
|
18
|
+
|
14
19
|
## A base Hyrax deployment
|
15
20
|
|
16
21
|
Because Hyrax is a [Rails Engine][engine]---not a stand-alone application---
|
@@ -51,6 +51,14 @@ app.kubernetes.io/name: {{ include "hyrax.name" . }}
|
|
51
51
|
app.kubernetes.io/instance: {{ .Release.Name }}
|
52
52
|
{{- end }}
|
53
53
|
|
54
|
+
{{/*
|
55
|
+
Worker Selector labels
|
56
|
+
*/}}
|
57
|
+
{{- define "hyrax.workerSelectorLabels" -}}
|
58
|
+
app.kubernetes.io/name: {{ include "hyrax.name" . }}-worker
|
59
|
+
app.kubernetes.io/instance: {{ .Release.Name }}
|
60
|
+
{{- end }}
|
61
|
+
|
54
62
|
{{/*
|
55
63
|
Create the name of the service account to use
|
56
64
|
*/}}
|
@@ -100,7 +108,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
|
|
100
108
|
|
101
109
|
{{- define "hyrax.postgresql.database" -}}
|
102
110
|
{{- if .Values.postgresql.enabled }}
|
103
|
-
{{- .Values.postgresql.
|
111
|
+
{{- .Values.postgresql.auth.database }}
|
104
112
|
{{- else }}
|
105
113
|
{{- .Values.externalPostgresql.database | default ( include "hyrax.fullname" . ) }}
|
106
114
|
{{- end }}
|
@@ -108,7 +116,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
|
|
108
116
|
|
109
117
|
{{- define "hyrax.postgresql.username" -}}
|
110
118
|
{{- if .Values.postgresql.enabled }}
|
111
|
-
{{- .Values.postgresql.
|
119
|
+
{{- .Values.postgresql.auth.username }}
|
112
120
|
{{- else }}
|
113
121
|
{{- .Values.externalPostgresql.username | default "postgres" }}
|
114
122
|
{{- end }}
|
@@ -116,7 +124,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
|
|
116
124
|
|
117
125
|
{{- define "hyrax.postgresql.password" -}}
|
118
126
|
{{- if .Values.postgresql.enabled }}
|
119
|
-
{{- .Values.postgresql.
|
127
|
+
{{- .Values.postgresql.auth.password }}
|
120
128
|
{{- else }}
|
121
129
|
{{- .Values.externalPostgresql.password }}
|
122
130
|
{{- end }}
|
@@ -149,7 +157,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
|
|
149
157
|
|
150
158
|
{{- define "hyrax.solr.username" -}}
|
151
159
|
{{- if .Values.solr.enabled }}
|
152
|
-
{{- .Values.solr.
|
160
|
+
{{- .Values.solr.auth.adminUsername }}
|
153
161
|
{{- else }}
|
154
162
|
{{- .Values.externalSolrUser }}
|
155
163
|
{{- end }}
|
@@ -157,14 +165,18 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
|
|
157
165
|
|
158
166
|
{{- define "hyrax.solr.password" -}}
|
159
167
|
{{- if .Values.solr.enabled }}
|
160
|
-
{{- .Values.solr.
|
168
|
+
{{- .Values.solr.auth.adminPassword }}
|
161
169
|
{{- else }}
|
162
170
|
{{- .Values.externalSolrPassword }}
|
163
171
|
{{- end }}
|
164
172
|
{{- end -}}
|
165
173
|
|
174
|
+
{{- define "hyrax.solr.port" -}}
|
175
|
+
{{- .Values.externalSolrPort | default "8983" }}
|
176
|
+
{{- end -}}
|
177
|
+
|
166
178
|
{{- define "hyrax.solr.url" -}}
|
167
|
-
{{- printf "http://%s:%s@%s:%s/solr/%s" (include "hyrax.solr.username" .) (include "hyrax.solr.password" .) (include "hyrax.solr.host" .) "
|
179
|
+
{{- printf "http://%s:%s@%s:%s/solr/%s" (include "hyrax.solr.username" .) (include "hyrax.solr.password" .) (include "hyrax.solr.host" .) (include "hyrax.solr.port" .) (include "hyrax.solr.collectionName" .) -}}
|
168
180
|
{{- end -}}
|
169
181
|
|
170
182
|
{{- define "hyrax.zk.fullname" -}}
|
@@ -176,7 +188,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
|
|
176
188
|
{{- end -}}
|
177
189
|
|
178
190
|
{{- define "hyrax.redis.url" -}}
|
179
|
-
{{- printf "redis://:%s@%s:%s" .Values.redis.password (include "hyrax.redis.host" .) "6379/0" -}}
|
191
|
+
{{- printf "redis://:%s@%s:%s" .Values.redis.auth.password (include "hyrax.redis.host" .) "6379/0" -}}
|
180
192
|
{{- end -}}
|
181
193
|
|
182
194
|
{{- define "hyrax.nginx.host" -}}
|
@@ -38,5 +38,5 @@ data:
|
|
38
38
|
SOLR_COLLECTION_NAME: {{ template "hyrax.solr.collectionName" . }}
|
39
39
|
SOLR_CONFIGSET_NAME: {{ template "hyrax.fullname" . }}
|
40
40
|
SOLR_HOST: {{ template "hyrax.solr.host" . }}
|
41
|
-
SOLR_PORT: "
|
41
|
+
SOLR_PORT: {{ (include "hyrax.solr.port" .) | quote }}
|
42
42
|
SOLR_URL: {{ template "hyrax.solr.url" . }}
|
@@ -9,7 +9,7 @@ spec:
|
|
9
9
|
replicas: {{ .Values.worker.replicaCount }}
|
10
10
|
selector:
|
11
11
|
matchLabels:
|
12
|
-
{{- include "hyrax.
|
12
|
+
{{- include "hyrax.workerSelectorLabels" . | nindent 6 }}
|
13
13
|
template:
|
14
14
|
metadata:
|
15
15
|
{{- with .Values.podAnnotations }}
|
@@ -17,7 +17,7 @@ spec:
|
|
17
17
|
{{- toYaml . | nindent 8 }}
|
18
18
|
{{- end }}
|
19
19
|
labels:
|
20
|
-
{{- include "hyrax.
|
20
|
+
{{- include "hyrax.workerSelectorLabels" . | nindent 8 }}
|
21
21
|
spec:
|
22
22
|
initContainers:
|
23
23
|
- name: db-wait
|
@@ -10,13 +10,13 @@ data:
|
|
10
10
|
DB_PASSWORD: {{ include "hyrax.postgresql.password" . | b64enc }}
|
11
11
|
DATABASE_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" . ) | b64enc }}
|
12
12
|
{{- if .Values.minio.enabled }}
|
13
|
-
MINIO_ACCESS_KEY: {{ .Values.minio.
|
14
|
-
MINIO_SECRET_KEY: {{ .Values.minio.
|
13
|
+
MINIO_ACCESS_KEY: {{ .Values.minio.auth.rootUser | b64enc}}
|
14
|
+
MINIO_SECRET_KEY: {{ .Values.minio.auth.rootPassword | b64enc}}
|
15
15
|
{{- end }}
|
16
16
|
{{- if not .Values.solrExistingSecret }}
|
17
17
|
SOLR_ADMIN_PASSWORD: {{ include "hyrax.solr.password" . | b64enc }}
|
18
18
|
{{- end }}
|
19
19
|
{{- if .Values.redis.enabled }}
|
20
|
-
REDIS_PASSWORD: {{ .Values.redis.password | b64enc}}
|
20
|
+
REDIS_PASSWORD: {{ .Values.redis.auth.password | b64enc}}
|
21
21
|
SIDEKIQ_REDIS_URL: {{ include "hyrax.redis.url" . | b64enc }}
|
22
22
|
{{- end }}
|
data/chart/hyrax/values.yaml
CHANGED
@@ -22,6 +22,7 @@ loadSolrConfigSet: true
|
|
22
22
|
# ignored if `solr.enabled` is true
|
23
23
|
solrExistingSecret: ""
|
24
24
|
externalSolrHost: ""
|
25
|
+
externalSolrPort: ""
|
25
26
|
externalSolrUser: ""
|
26
27
|
externalSolrPassword: ""
|
27
28
|
externalSolrCollection: "hyrax"
|
@@ -65,6 +66,10 @@ extraEnvFrom: []
|
|
65
66
|
# tty: true
|
66
67
|
extraContainerConfiguration: []
|
67
68
|
|
69
|
+
## @param extraDeploy Array of extra objects to deploy with the release (evaluated as a template)
|
70
|
+
##
|
71
|
+
extraDeploy: []
|
72
|
+
|
68
73
|
# an existing volume containing a Hyrax-based application
|
69
74
|
# must be a ReadWriteMany volume if worker is enabled
|
70
75
|
applicationExistingClaim: ""
|
@@ -228,10 +233,9 @@ memcached:
|
|
228
233
|
|
229
234
|
minio:
|
230
235
|
enabled: false
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
password: hyrax-secret-key
|
236
|
+
auth:
|
237
|
+
rootUser: hyrax-access-key
|
238
|
+
rootPassword: hyrax-secret-key
|
235
239
|
persistence:
|
236
240
|
enabled: false
|
237
241
|
# defaultBuckets: bucketOne;bucketTwo
|
@@ -241,15 +245,18 @@ postgresql:
|
|
241
245
|
image:
|
242
246
|
repository: bitnami/postgresql
|
243
247
|
tag: 12.3.0
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
|
249
|
-
|
250
|
-
|
251
|
-
|
252
|
-
|
248
|
+
auth:
|
249
|
+
database: hyrax
|
250
|
+
password: hyrax_pass
|
251
|
+
username: hyrax
|
252
|
+
primary:
|
253
|
+
service:
|
254
|
+
ports:
|
255
|
+
postgresql: 5432
|
256
|
+
readReplicas:
|
257
|
+
service:
|
258
|
+
ports:
|
259
|
+
postgresql: 5432
|
253
260
|
|
254
261
|
## Nginx proxy is used to keep puma from having to serve static assets
|
255
262
|
## and to act as an auth proxy for Cantelope
|
@@ -390,14 +397,15 @@ nginx:
|
|
390
397
|
|
391
398
|
redis:
|
392
399
|
enabled: true
|
393
|
-
|
400
|
+
auth:
|
401
|
+
password: mysecret
|
394
402
|
|
395
403
|
solr:
|
396
404
|
enabled: true
|
397
405
|
image:
|
398
406
|
repository: bitnami/solr
|
399
407
|
tag: 8.11.1
|
400
|
-
|
408
|
+
auth:
|
401
409
|
enabled: true
|
402
410
|
adminUsername: admin
|
403
411
|
adminPassword: admin
|
data/config/features.rb
CHANGED
@@ -47,5 +47,5 @@ Flipflop.configure do
|
|
47
47
|
default: false,
|
48
48
|
description: "Put the system into read-only mode. Deposits, edits, approvals and anything that makes a change to the data will be disabled."
|
49
49
|
rescue Flipflop::StrategyError, Flipflop::FeatureError => err
|
50
|
-
|
50
|
+
Hyrax.logger.warn "Ignoring #{err}: #{err.message}"
|
51
51
|
end
|
@@ -0,0 +1,27 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# Taken from https://github.com/trailblazer/reform-rails/issues/86#issuecomment-763120151
|
4
|
+
# rubocop:disable Metrics/CyclomaticComplexity
|
5
|
+
# rubocop:disable Lint/UselessAssignment
|
6
|
+
module Reform
|
7
|
+
class Contract < Disposable::Twin
|
8
|
+
class Result
|
9
|
+
private
|
10
|
+
|
11
|
+
# this doesn't do nested errors (e.g. )
|
12
|
+
def filter_for(method, *args)
|
13
|
+
@results.collect { |r| r.public_send(method, *args).to_h }
|
14
|
+
.inject({}) { |hah, err| hah.merge(err) { |_key, old_v, new_v| (new_v.is_a?(Array) ? (old_v |= new_v) : old_v.merge(new_v)) } }
|
15
|
+
.find_all do |_k, v| # filter :nested=>{:something=>["too nested!"]} #DISCUSS: do we want that here?
|
16
|
+
if v.is_a?(Hash)
|
17
|
+
nested_errors = v.select { |attr_key, val| attr_key.is_a?(Integer) && val.is_a?(Array) && val.any? }
|
18
|
+
v = nested_errors.to_a if nested_errors.any?
|
19
|
+
end
|
20
|
+
v.is_a?(ActiveModel::DeprecationHandlingMessageArray)
|
21
|
+
end.to_h
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
# rubocop:enable Metrics/CyclomaticComplexity
|
27
|
+
# rubocop:disable Lint/UselessAssignment
|
data/config/locales/hyrax.de.yml
CHANGED
@@ -557,7 +557,7 @@ de:
|
|
557
557
|
actions: Aktion
|
558
558
|
title: Sammlungstitel
|
559
559
|
form_permission:
|
560
|
-
visibility: Sichtbarkeit <small> Wer sollte diesen Inhalt anzeigen oder herunterladen können? </
|
560
|
+
visibility: Sichtbarkeit <small> Wer sollte diesen Inhalt anzeigen oder herunterladen können? </small>
|
561
561
|
form_permission_under_embargo:
|
562
562
|
help_html: "<strong>Diese Arbeit ist unter Embargo.</strong> Hier können Sie die Einstellungen des Embargos ändern, oder Sie können den %{edit_link} besuchen, um ihn zu deaktivieren."
|
563
563
|
legend_html: Sichtbarkeit <small>Wer sollte in der Lage sein, diesen Inhalt anzusehen oder herunterzuladen?</small>
|
@@ -589,13 +589,14 @@ de:
|
|
589
589
|
depositor: Deponent
|
590
590
|
directions: Unabhängig von den Sichtbarkeitseinstellungen für diese Arbeit können Sie sie auch für andere Benutzer und Gruppen freigeben.
|
591
591
|
group: Gruppe
|
592
|
-
permissions_save_note_html: Berechtigungen werden <strong> nicht </
|
592
|
+
permissions_save_note_html: Berechtigungen werden <strong> nicht </strong> gespeichert, bis die Option & quot; Speichern & quot; Die Taste wird unten auf der Seite gedrückt.
|
593
593
|
use_add_button: Verwenden Sie die Schaltfläche "Hinzufügen", um Zugriff auf jeweils eine %{account_label} zu gewähren (diese wird der folgenden Liste hinzugefügt). Wählen Sie den Benutzer nach Name oder %{account_label} \ aus. Wählen Sie dann die Zugriffsebene aus, die Sie gewähren möchten, und klicken Sie auf Add this %{account_label}, um das Hinzufügen der Berechtigung abzuschließen.
|
594
594
|
form_thumbnail:
|
595
595
|
help_html: Wählen Sie die Datei aus, die als Miniaturansicht für diese Arbeit verwendet werden soll.
|
596
596
|
legend_html: Miniaturansicht
|
597
597
|
form_visibility_component:
|
598
598
|
visibility: Sichtbarkeit
|
599
|
+
subtitle_html: <small>Wer sollte diesen Inhalt anzeigen oder herunterladen können?</small>
|
599
600
|
inspect_work:
|
600
601
|
back_to: Zurück zu
|
601
602
|
entity_id: Mandanten-ID
|
@@ -1404,14 +1405,14 @@ de:
|
|
1404
1405
|
count:
|
1405
1406
|
collections:
|
1406
1407
|
collections_listing: Auflistung der Sammlungen
|
1407
|
-
in_repo: "<strong> %{total_count} Sammlungen </
|
1408
|
-
you_manage: "<strong> %{total_count} Sammlungen </
|
1409
|
-
you_own: "<strong> %{total_count} Sammlungen </
|
1408
|
+
in_repo: "<strong> %{total_count} Sammlungen </strong> im Repository"
|
1409
|
+
you_manage: "<strong> %{total_count} Sammlungen </strong>, die Sie im Repository verwalten können"
|
1410
|
+
you_own: "<strong> %{total_count} Sammlungen </strong>, die Sie im Repository besitzen"
|
1410
1411
|
works:
|
1411
|
-
in_repo: "<strong> %{total_count} Arbeiten </
|
1412
|
+
in_repo: "<strong> %{total_count} Arbeiten </strong> im Repository"
|
1412
1413
|
works_listing: Auflistung der Arbeiten
|
1413
|
-
you_manage: "<strong> %{total_count} Arbeiten </
|
1414
|
-
you_own: "<strong> %{total_count} Arbeiten </
|
1414
|
+
you_manage: "<strong> %{total_count} Arbeiten </strong>, das Sie im Repository verwalten können"
|
1415
|
+
you_own: "<strong> %{total_count} Arbeiten </strong>, das Sie im Repository besitzen"
|
1415
1416
|
sort_and_per_page:
|
1416
1417
|
number_of_results_to_display_per_page: Anzahl der anzuzeigenden Ergebnisse pro Seite
|
1417
1418
|
nav_safety:
|
data/config/locales/hyrax.en.yml
CHANGED
@@ -588,6 +588,7 @@ en:
|
|
588
588
|
legend_html: Thumbnail
|
589
589
|
form_visibility_component:
|
590
590
|
visibility: Visibility
|
591
|
+
subtitle_html: <small>Who should be able to view or download this content?</small>
|
591
592
|
inspect_work:
|
592
593
|
back_to: Back to
|
593
594
|
entity_id: Entity ID
|
@@ -1687,6 +1688,8 @@ en:
|
|
1687
1688
|
note_html: Keep to myself with option to share.
|
1688
1689
|
text: Private
|
1689
1690
|
restricted_title_attr: Change the visibility of this resource
|
1691
|
+
unknown:
|
1692
|
+
text: Unknown
|
1690
1693
|
work_button_row:
|
1691
1694
|
attach_child: Attach Child
|
1692
1695
|
workflow:
|
data/config/locales/hyrax.es.yml
CHANGED
@@ -601,6 +601,7 @@ es:
|
|
601
601
|
legend_html: Miniatura
|
602
602
|
form_visibility_component:
|
603
603
|
visibility: La visibilidad
|
604
|
+
subtitle_html: <small>¿Quién debería poder ver o descargar este contenido?</small>
|
604
605
|
inspect_work:
|
605
606
|
back_to: De regreso
|
606
607
|
entity_id: ID de entidad
|
@@ -1411,14 +1412,14 @@ es:
|
|
1411
1412
|
count:
|
1412
1413
|
collections:
|
1413
1414
|
collections_listing: Listado de colecciones
|
1414
|
-
in_repo: "<strong> colecciones %{total_count} </
|
1415
|
-
you_manage: "<strong> colecciones %{total_count} </
|
1416
|
-
you_own: "<strong> colecciones %{total_count} </
|
1415
|
+
in_repo: "<strong> colecciones %{total_count} </strong> en el repositorio"
|
1416
|
+
you_manage: "<strong> colecciones %{total_count} </strong> puede administrar en el repositorio"
|
1417
|
+
you_own: "<strong> colecciones %{total_count} </strong> que posee en el repositorio"
|
1417
1418
|
works:
|
1418
|
-
in_repo: "<strong> %{total_count} funciona </
|
1419
|
+
in_repo: "<strong> %{total_count} funciona </strong> en el repositorio"
|
1419
1420
|
works_listing: Listado de obras
|
1420
|
-
you_manage: "<strong> %{total_count} funciona </
|
1421
|
-
you_own: "<strong> %{total_count} funciona </
|
1421
|
+
you_manage: "<strong> %{total_count} funciona </strong> puedes administrar en el repositorio"
|
1422
|
+
you_own: "<strong> %{total_count} funciona </strong> en el repositorio"
|
1422
1423
|
sort_and_per_page:
|
1423
1424
|
number_of_results_to_display_per_page: Número de resultados a mostrar por página
|
1424
1425
|
nav_safety:
|
@@ -1839,4 +1840,4 @@ es:
|
|
1839
1840
|
html: <span class="badge badge-info required-tag">obligatorio</span>
|
1840
1841
|
total_view:
|
1841
1842
|
one: Este trabajo tiene 1 vista total
|
1842
|
-
other: Este trabajo tiene un total de %{count} visualizaciones
|
1843
|
+
other: Este trabajo tiene un total de %{count} visualizaciones
|
data/config/locales/hyrax.fr.yml
CHANGED
@@ -563,7 +563,7 @@ fr:
|
|
563
563
|
actions: action
|
564
564
|
title: Titre de la collection
|
565
565
|
form_permission:
|
566
|
-
visibility: Visibilité <small> Qui devrait être en mesure d’afficher ou de télécharger ce contenu? </
|
566
|
+
visibility: Visibilité <small> Qui devrait être en mesure d’afficher ou de télécharger ce contenu? </small>
|
567
567
|
form_permission_under_embargo:
|
568
568
|
help_html: "<strong>Ce travail est sous embargo.</strong> Vous pouvez modifier les paramètres de l'embargo ici, ou vous pouvez visiter le %{edit_link} pour le désactiver."
|
569
569
|
legend_html: Visibilité <small>Qui devrait pouvoir afficher ou télécharger ce contenu?</small>
|
@@ -595,13 +595,14 @@ fr:
|
|
595
595
|
depositor: Déposant
|
596
596
|
directions: Indépendamment des paramètres de visibilité pour ce travail, vous pouvez également le partager avec d'autres utilisateurs et groupes.
|
597
597
|
group: Groupe
|
598
|
-
permissions_save_note_html: Les autorisations ne sont <strong> pas </
|
598
|
+
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.
|
599
599
|
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.
|
600
600
|
form_thumbnail:
|
601
601
|
help_html: Sélectionnez le fichier à utiliser comme vignette pour ce travail.
|
602
602
|
legend_html: La vignette
|
603
603
|
form_visibility_component:
|
604
604
|
visibility: Visibilité
|
605
|
+
subtitle_html: <small>Qui devrait être en mesure d’afficher ou de télécharger ce contenu?</small>
|
605
606
|
inspect_work:
|
606
607
|
back_to: Retour à
|
607
608
|
entity_id: ID d'entité
|
@@ -1410,14 +1411,14 @@ fr:
|
|
1410
1411
|
count:
|
1411
1412
|
collections:
|
1412
1413
|
collections_listing: Liste des collections
|
1413
|
-
in_repo: "<strong> Collections %{total_count} </
|
1414
|
-
you_manage: "<strong> collections %{total_count} </
|
1415
|
-
you_own: "<strong> collections %{total_count} </
|
1414
|
+
in_repo: "<strong> Collections %{total_count} </strong> dans le référentiel"
|
1415
|
+
you_manage: "<strong> collections %{total_count} </strong> que vous pouvez gérer dans le référentiel"
|
1416
|
+
you_own: "<strong> collections %{total_count} </strong> que vous possédez dans le référentiel"
|
1416
1417
|
works:
|
1417
|
-
in_repo: "<strong> %{total_count} fonctionne </
|
1418
|
+
in_repo: "<strong> %{total_count} fonctionne </strong> dans le référentiel"
|
1418
1419
|
works_listing: Liste des travaux
|
1419
|
-
you_manage: "<strong> %{total_count} fonctionne </
|
1420
|
-
you_own: "<strong> %{total_count} fonctionne </
|
1420
|
+
you_manage: "<strong> %{total_count} fonctionne </strong> vous pouvez gérer dans le référentiel"
|
1421
|
+
you_own: "<strong> %{total_count} fonctionne </strong> que vous possédez dans le référentiel"
|
1421
1422
|
sort_and_per_page:
|
1422
1423
|
number_of_results_to_display_per_page: Nombre de résultats à afficher par page
|
1423
1424
|
nav_safety:
|
@@ -1838,4 +1839,4 @@ fr:
|
|
1838
1839
|
html: <span class="badge badge-info required-tag">Champs obligatoires</span>
|
1839
1840
|
total_view:
|
1840
1841
|
one: Ce travail a 1 vue totale
|
1841
|
-
other: Ce travail a zxzxxx0 vues au total
|
1842
|
+
other: Ce travail a zxzxxx0 vues au total
|
data/config/locales/hyrax.it.yml
CHANGED
@@ -601,6 +601,7 @@ it:
|
|
601
601
|
legend_html: Thumbnail
|
602
602
|
form_visibility_component:
|
603
603
|
visibility: Visibilità
|
604
|
+
subtitle_html: <small>Chi dovrebbe essere in grado di visualizzare o scaricare questo contenuto?</small>
|
604
605
|
inspect_work:
|
605
606
|
back_to: Torna a
|
606
607
|
entity_id: ID entità
|
@@ -1409,14 +1410,14 @@ it:
|
|
1409
1410
|
count:
|
1410
1411
|
collections:
|
1411
1412
|
collections_listing: Elenco delle collezioni
|
1412
|
-
in_repo: "<strong> collezioni %{total_count} </
|
1413
|
-
you_manage: "<strong> collezioni %{total_count} </
|
1414
|
-
you_own: "<strong> collezioni %{total_count} </
|
1413
|
+
in_repo: "<strong> collezioni %{total_count} </strong> nel repository"
|
1414
|
+
you_manage: "<strong> collezioni %{total_count} </strong> che puoi gestire nel repository"
|
1415
|
+
you_own: "<strong> collezioni %{total_count} </strong> che possiedi nel repository"
|
1415
1416
|
works:
|
1416
|
-
in_repo: "<strong> %{total_count} funziona </
|
1417
|
+
in_repo: "<strong> %{total_count} funziona </strong> nel repository"
|
1417
1418
|
works_listing: Elenco delle opere
|
1418
|
-
you_manage: "<strong> %{total_count} funziona </
|
1419
|
-
you_own: "<strong> %{total_count} funziona </
|
1419
|
+
you_manage: "<strong> %{total_count} funziona </strong> che puoi gestire nel repository"
|
1420
|
+
you_own: "<strong> %{total_count} funziona </strong> nel repository"
|
1420
1421
|
sort_and_per_page:
|
1421
1422
|
number_of_results_to_display_per_page: Numero di risultati da visualizzare per pagina
|
1422
1423
|
nav_safety:
|
@@ -1837,4 +1838,4 @@ it:
|
|
1837
1838
|
html: <span class="badge badge-info required-tag">necessario</span>
|
1838
1839
|
total_view:
|
1839
1840
|
one: Quest'opera ha 1 vista totale
|
1840
|
-
other: Questo lavoro ha %{count} visualizzazioni totali
|
1841
|
+
other: Questo lavoro ha %{count} visualizzazioni totali
|
@@ -596,6 +596,7 @@ pt-BR:
|
|
596
596
|
legend_html: Miniatura
|
597
597
|
form_visibility_component:
|
598
598
|
visibility: Visibilidade
|
599
|
+
subtitle_html: <small>Quem deve conseguir visualizar ou baixar este conteúdo?</small>
|
599
600
|
inspect_work:
|
600
601
|
back_to: De volta a
|
601
602
|
entity_id: ID da entidade
|
@@ -1404,14 +1405,14 @@ pt-BR:
|
|
1404
1405
|
count:
|
1405
1406
|
collections:
|
1406
1407
|
collections_listing: Listagem de coleções
|
1407
|
-
in_repo: "<strong> coleções %{total_count} </
|
1408
|
-
you_manage: "<strong> %{total_count} coleções</
|
1409
|
-
you_own: "<strong> %{total_count} coleções </
|
1408
|
+
in_repo: "<strong> coleções %{total_count} </strong> no repositório"
|
1409
|
+
you_manage: "<strong> %{total_count} coleções</strong> que você pode curatelar no repositório"
|
1410
|
+
you_own: "<strong> %{total_count} coleções </strong> que você possui no repositório"
|
1410
1411
|
works:
|
1411
|
-
in_repo: "<strong> %{total_count} obras </
|
1412
|
+
in_repo: "<strong> %{total_count} obras </strong> no repositório"
|
1412
1413
|
works_listing: Lista de obras
|
1413
|
-
you_manage: "<strong> %{total_count} obras </
|
1414
|
-
you_own: "<strong> %{total_count} obras </
|
1414
|
+
you_manage: "<strong> %{total_count} obras </strong> que você pode curatelar no repositório"
|
1415
|
+
you_own: "<strong> %{total_count} obras </strong> que você possui no repositório"
|
1415
1416
|
sort_and_per_page:
|
1416
1417
|
number_of_results_to_display_per_page: Número de resultados a serem exibidos por página
|
1417
1418
|
nav_safety:
|
@@ -1832,4 +1833,4 @@ pt-BR:
|
|
1832
1833
|
html: <span class="badge badge-info required-tag">obrigatórios</span>
|
1833
1834
|
total_view:
|
1834
1835
|
one: Este trabalho tem 1 visualização total
|
1835
|
-
other: Este trabalho tem %{count} visualizações totais
|
1836
|
+
other: Este trabalho tem %{count} visualizações totais
|
data/config/locales/hyrax.zh.yml
CHANGED
@@ -592,13 +592,14 @@ zh:
|
|
592
592
|
depositor: 储户
|
593
593
|
directions: 无论此工作的可见性设置如何,您也可以与其他用户和组共享。
|
594
594
|
group: 组
|
595
|
-
permissions_save_note_html: 权限<strong> </
|
595
|
+
permissions_save_note_html: 权限<strong> </strong>保存,直到“保存”为止。按钮在页面底部按下。
|
596
596
|
use_add_button: 使用添加按钮一次可以访问一个%{account_label}(它将被添加到下面的列表中)。按名称或%{account_label} \选择用户。然后选择您要授予的访问级别,并单击“添加此%{account_label}”以完成添加权限。
|
597
597
|
form_thumbnail:
|
598
598
|
help_html: 选择要用作此作品缩略图的文件。
|
599
599
|
legend_html: 缩略图
|
600
600
|
form_visibility_component:
|
601
601
|
visibility: 可见性
|
602
|
+
subtitle_html: <small>谁应该能够查看或下载此内容?</ small>
|
602
603
|
inspect_work:
|
603
604
|
back_to: 回到
|
604
605
|
entity_id: 实体ID
|
@@ -1407,14 +1408,14 @@ zh:
|
|
1407
1408
|
count:
|
1408
1409
|
collections:
|
1409
1410
|
collections_listing: 收藏清单
|
1410
|
-
in_repo: 存储库中的<strong> %{total_count}集合</
|
1411
|
-
you_manage: 您可以在存储库中管理<strong> %{total_count}集合</
|
1412
|
-
you_own: 您在存储库中拥有<strong> %{total_count}集合</
|
1411
|
+
in_repo: 存储库中的<strong> %{total_count}集合</strong>
|
1412
|
+
you_manage: 您可以在存储库中管理<strong> %{total_count}集合</strong>
|
1413
|
+
you_own: 您在存储库中拥有<strong> %{total_count}集合</strong>
|
1413
1414
|
works:
|
1414
|
-
in_repo: 存储库中的<strong> %{total_count}有效</
|
1415
|
+
in_repo: 存储库中的<strong> %{total_count}有效</strong>
|
1415
1416
|
works_listing: 作品清单
|
1416
|
-
you_manage: 您可以在存储库中管理<strong> %{total_count}作品</
|
1417
|
-
you_own: 您在存储库中拥有<strong> %{total_count}作品</
|
1417
|
+
you_manage: 您可以在存储库中管理<strong> %{total_count}作品</strong>
|
1418
|
+
you_own: 您在存储库中拥有<strong> %{total_count}作品</strong>
|
1418
1419
|
sort_and_per_page:
|
1419
1420
|
number_of_results_to_display_per_page: 每页显示的结果数
|
1420
1421
|
nav_safety:
|
@@ -1835,4 +1836,4 @@ zh:
|
|
1835
1836
|
html: <span class="badge badge-info required-tag">需要的</span>
|
1836
1837
|
total_view:
|
1837
1838
|
one: 该作品共有 1 次浏览
|
1838
|
-
other: 此作品总浏览量为 %{count}
|
1839
|
+
other: 此作品总浏览量为 %{count}
|