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
@@ -1,10 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
PowerConverter.define_conversion_for(:sipity_action_name) do |input|
|
3
|
-
Deprecation.warn('PowerConverter is deprecated. Use `Sipity::WorkflowAction.name_for(input)` instead')
|
4
|
-
case input
|
5
|
-
when String, Symbol
|
6
|
-
input.to_s.sub(/[\?\!]\Z/, '')
|
7
|
-
when Sipity::WorkflowAction
|
8
|
-
input.name
|
9
|
-
end
|
10
|
-
end
|
@@ -1,14 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
PowerConverter.define_conversion_for(:sipity_entity) do |input|
|
3
|
-
Deprecation.warn('PowerConverter is deprecated. Use `Sipity::Entity(input)` instead')
|
4
|
-
case input
|
5
|
-
when URI::GID
|
6
|
-
Sipity::Entity.find_by(proxy_for_global_id: input.to_s)
|
7
|
-
when SolrDocument
|
8
|
-
PowerConverter.convert_to_sipity_entity(input.to_model.to_global_id)
|
9
|
-
when Sipity::Entity
|
10
|
-
input
|
11
|
-
when Sipity::Comment
|
12
|
-
PowerConverter.convert_to_sipity_entity(input.entity)
|
13
|
-
end
|
14
|
-
end
|
@@ -1,10 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
PowerConverter.define_conversion_for(:sipity_role) do |input|
|
3
|
-
Deprecation.warn('PowerConverter is deprecated. Use `Sipity::WorkflowAction.name_for(input)` instead')
|
4
|
-
case input
|
5
|
-
when Sipity::Role
|
6
|
-
input
|
7
|
-
when String, Symbol
|
8
|
-
Sipity::Role.find_or_create_by(name: input)
|
9
|
-
end
|
10
|
-
end
|
@@ -1,17 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
PowerConverter.define_conversion_for(:sipity_workflow_id) do |input|
|
3
|
-
case input
|
4
|
-
when Sipity::Workflow
|
5
|
-
input.id
|
6
|
-
when Integer
|
7
|
-
input
|
8
|
-
when String
|
9
|
-
input.to_i
|
10
|
-
else
|
11
|
-
if input.respond_to?(:workflow_id)
|
12
|
-
input.workflow_id
|
13
|
-
else
|
14
|
-
PowerConverter.convert_to_sipity_workflow_id(PowerConverter.convert_to_sipity_entity(input))
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|
@@ -1,13 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
require 'power_converter'
|
3
|
-
|
4
|
-
PowerConverter.define_conversion_for(:sipity_workflow_state) do |input, workflow|
|
5
|
-
Deprecation.warn('PowerConverter is deprecated. Use `Sipity::WorkflowState(input, workflow)` instead')
|
6
|
-
|
7
|
-
case input
|
8
|
-
when Sipity::WorkflowState
|
9
|
-
input
|
10
|
-
when Symbol, String
|
11
|
-
Sipity::WorkflowState.where(workflow_id: workflow.id, name: input).first
|
12
|
-
end
|
13
|
-
end
|
@@ -1,19 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
require 'active_fedora/base'
|
3
|
-
require 'active_fedora/version'
|
4
|
-
|
5
|
-
module Hyrax
|
6
|
-
module RepositoryReindexer
|
7
|
-
extend ActiveSupport::Concern
|
8
|
-
|
9
|
-
module ClassMethods
|
10
|
-
# overrides https://github.com/samvera/active_fedora/blob/master/lib/active_fedora/indexing.rb#L95-L125
|
11
|
-
# see implementation details in adapters/nesting_index_adapter.rb#each_perservation_document_id_and_parent_ids
|
12
|
-
def reindex_everything(*)
|
13
|
-
Samvera::NestingIndexer.reindex_all!(extent: Hyrax::Adapters::NestingIndexAdapter::FULL_REINDEX)
|
14
|
-
end
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|
18
|
-
|
19
|
-
ActiveFedora::Base.module_eval { include Hyrax::RepositoryReindexer }
|
@@ -1,73 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
module Hyrax
|
3
|
-
# Responsible for adding the necessary callbacks for updating the nested collection information
|
4
|
-
# This is part of the after update index because it is a potentially very expensive process.
|
5
|
-
#
|
6
|
-
# @todo Consider extracting the update_index callback to ActiveFedora::Base
|
7
|
-
module CollectionNesting
|
8
|
-
extend ActiveSupport::Concern
|
9
|
-
|
10
|
-
included do
|
11
|
-
extend ActiveModel::Callbacks
|
12
|
-
include ActiveModel::Validations::Callbacks
|
13
|
-
|
14
|
-
define_model_callbacks :update_index, only: :after
|
15
|
-
after_update_index :update_nested_collection_relationship_indices
|
16
|
-
after_destroy :update_child_nested_collection_relationship_indices
|
17
|
-
before_save :before_update_nested_collection_relationship_indices
|
18
|
-
after_save :after_update_nested_collection_relationship_indices
|
19
|
-
|
20
|
-
def before_update_nested_collection_relationship_indices
|
21
|
-
@during_save = true
|
22
|
-
end
|
23
|
-
|
24
|
-
def after_update_nested_collection_relationship_indices
|
25
|
-
@during_save = false
|
26
|
-
reindex_nested_relationships_for(id: id, extent: reindex_extent)
|
27
|
-
end
|
28
|
-
|
29
|
-
def update_nested_collection_relationship_indices
|
30
|
-
return if @during_save
|
31
|
-
reindex_nested_relationships_for(id: id, extent: reindex_extent)
|
32
|
-
end
|
33
|
-
|
34
|
-
def update_child_nested_collection_relationship_indices
|
35
|
-
children = find_children_of(destroyed_id: id)
|
36
|
-
children.each do |child|
|
37
|
-
reindex_nested_relationships_for(id: child.id, extent: Hyrax::Adapters::NestingIndexAdapter::FULL_REINDEX)
|
38
|
-
end
|
39
|
-
end
|
40
|
-
end
|
41
|
-
|
42
|
-
def update_index(*args)
|
43
|
-
_run_update_index_callbacks { super }
|
44
|
-
end
|
45
|
-
|
46
|
-
def find_children_of(destroyed_id:)
|
47
|
-
Hyrax::SolrService.query(Hyrax::SolrQueryBuilderService.construct_query(member_of_collection_ids_ssim: destroyed_id))
|
48
|
-
end
|
49
|
-
|
50
|
-
# Only models which include Hyrax::CollectionNesting will respond to this method.
|
51
|
-
# Used to determine whether a model gets reindexed via Samvera::NestingIndexer during full repository reindexing,
|
52
|
-
def use_nested_reindexing?
|
53
|
-
true
|
54
|
-
end
|
55
|
-
|
56
|
-
# The following methods allow an option to reindex an object only if the nesting indexer fields are not
|
57
|
-
# already in the object's solr document. Added to prevent unnecessary indexing of all ancestors of a parent
|
58
|
-
# when one child gets added to the parent. By default, we do the full graph indexing.
|
59
|
-
def reindex_extent
|
60
|
-
@reindex_extent ||= Hyrax::Adapters::NestingIndexAdapter::FULL_REINDEX
|
61
|
-
end
|
62
|
-
|
63
|
-
def reindex_extent=(val)
|
64
|
-
@reindex_extent = val
|
65
|
-
end
|
66
|
-
|
67
|
-
private
|
68
|
-
|
69
|
-
def reindex_nested_relationships_for(id:, extent:)
|
70
|
-
Hyrax.config.nested_relationship_reindexer.call(id: id, extent: extent)
|
71
|
-
end
|
72
|
-
end
|
73
|
-
end
|
@@ -1,193 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
module Hyrax
|
3
|
-
module Adapters
|
4
|
-
module NestingIndexAdapter
|
5
|
-
FULL_REINDEX = "full"
|
6
|
-
LIMITED_REINDEX = "limited"
|
7
|
-
|
8
|
-
# @!group Providing interface for a Samvera::NestingIndexer::Adapter
|
9
|
-
|
10
|
-
##
|
11
|
-
# @api public
|
12
|
-
#
|
13
|
-
# @param id [String]
|
14
|
-
# @return Samvera::NestingIndexer::Document::PreservationDocument
|
15
|
-
def self.find_preservation_document_by(id:)
|
16
|
-
# Not everything is guaranteed to have library_collection_ids
|
17
|
-
# If it doesn't have it, what do we do?
|
18
|
-
parent_ids = find_preservation_parent_ids_for(id: id)
|
19
|
-
Samvera::NestingIndexer::Documents::PreservationDocument.new(id: id, parent_ids: parent_ids)
|
20
|
-
end
|
21
|
-
|
22
|
-
##
|
23
|
-
# @api public
|
24
|
-
#
|
25
|
-
# @param id [String]
|
26
|
-
# @return Samvera::NestingIndexer::Document::PreservationDocument
|
27
|
-
def self.find_preservation_parent_ids_for(id:)
|
28
|
-
# Not everything is guaranteed to have library_collection_ids
|
29
|
-
# If it doesn't have it, what do we do?
|
30
|
-
fedora_object = Hyrax::Base.uncached do
|
31
|
-
fedora_object = ActiveFedora::Base.find(id)
|
32
|
-
end
|
33
|
-
|
34
|
-
if fedora_object.respond_to?(:member_of_collection_ids)
|
35
|
-
fedora_object.member_of_collection_ids
|
36
|
-
else
|
37
|
-
[]
|
38
|
-
end
|
39
|
-
end
|
40
|
-
|
41
|
-
##
|
42
|
-
# @api public
|
43
|
-
#
|
44
|
-
# @param id [String]
|
45
|
-
# @return Samvera::NestingIndexer::Documents::IndexDocument
|
46
|
-
def self.find_index_document_by(id:)
|
47
|
-
solr_document = find_solr_document_by(id: id)
|
48
|
-
coerce_solr_document_to_index_document(original_solr_document: solr_document, id: id)
|
49
|
-
end
|
50
|
-
|
51
|
-
##
|
52
|
-
# @api public
|
53
|
-
# @yieldparam id [String]
|
54
|
-
# @yieldparam parent_id [Array<String>]
|
55
|
-
#
|
56
|
-
# @see Samvera::NestingIndexer.reindex_all!(extent: FULL_REINDEX)
|
57
|
-
def self.each_perservation_document_id_and_parent_ids(&block) # rubocop:disable Lint/UnusedMethodArgument
|
58
|
-
ActiveFedora::Base.descendant_uris(ActiveFedora.fedora.base_uri, exclude_uri: true).each do |uri|
|
59
|
-
id = Hyrax.config.translate_uri_to_id.call(uri)
|
60
|
-
object = ActiveFedora::Base.find(id)
|
61
|
-
parent_ids = object.try(:member_of_collection_ids) || []
|
62
|
-
|
63
|
-
# NOTE: we do not yield when the object has parents. Calling the nested indexer for the
|
64
|
-
# top id will reindex all descendants as well.
|
65
|
-
if object.try(:use_nested_reindexing?)
|
66
|
-
yield(id, parent_ids) if parent_ids.empty?
|
67
|
-
else
|
68
|
-
Rails.logger.info "Re-indexing via to_solr ... #{id}"
|
69
|
-
Hyrax::SolrService.add(object.to_solr, commit: true)
|
70
|
-
end
|
71
|
-
end
|
72
|
-
end
|
73
|
-
|
74
|
-
##
|
75
|
-
# @api public
|
76
|
-
#
|
77
|
-
# From the nesting_document, we will need to add the nesting attributes to the underlying SOLR document for the object
|
78
|
-
#
|
79
|
-
# @param nesting_document [Samvera::NestingIndexer::Documents::IndexDocument]
|
80
|
-
# @return Hash - the attributes written to the indexing layer
|
81
|
-
def self.write_nesting_document_to_index_layer(nesting_document:)
|
82
|
-
solr_doc = Hyrax::Base.uncached do
|
83
|
-
ActiveFedora::Base.find(nesting_document.id).to_solr # What is the current state of the solr document
|
84
|
-
end
|
85
|
-
|
86
|
-
# Now add the details from the nesting indexer to the document
|
87
|
-
add_nesting_attributes(
|
88
|
-
solr_doc: solr_doc,
|
89
|
-
ancestors: nesting_document.ancestors,
|
90
|
-
parent_ids: nesting_document.parent_ids,
|
91
|
-
pathnames: nesting_document.pathnames,
|
92
|
-
depth: nesting_document.deepest_nested_depth
|
93
|
-
)
|
94
|
-
end
|
95
|
-
|
96
|
-
##
|
97
|
-
# @api public
|
98
|
-
#
|
99
|
-
# @param solr_doc [SolrDocument]
|
100
|
-
# @param ancestors [Array]
|
101
|
-
# @param parent_ids [Array]
|
102
|
-
# @param pathnames [Array]
|
103
|
-
# @param depth [Array] the object's deepest nesting depth
|
104
|
-
# @return [SolrDocument]
|
105
|
-
def self.add_nesting_attributes(solr_doc:, ancestors:, parent_ids:, pathnames:, depth:)
|
106
|
-
solr_doc[solr_field_name_for_storing_ancestors] = ancestors
|
107
|
-
solr_doc[solr_field_name_for_storing_parent_ids] = parent_ids
|
108
|
-
solr_doc[solr_field_name_for_storing_pathnames] = pathnames
|
109
|
-
solr_doc[solr_field_name_for_deepest_nested_depth] = depth
|
110
|
-
Hyrax::SolrService.add(solr_doc, commit: true)
|
111
|
-
solr_doc
|
112
|
-
end
|
113
|
-
|
114
|
-
##
|
115
|
-
# @api public
|
116
|
-
#
|
117
|
-
# @param document [Samvera::NestingIndexer::Documents::IndexDocument]
|
118
|
-
# @param extent [String] if not "full" or nil, doesn't yield children for reindexing
|
119
|
-
# @yield Samvera::NestingIndexer::Documents::IndexDocument
|
120
|
-
#
|
121
|
-
# @return [void]
|
122
|
-
def self.each_child_document_of(document:, extent:, &block) # rubocop:disable Lint/UnusedMethodArgument
|
123
|
-
raw_child_solr_documents_of(parent_document: document).each do |solr_document|
|
124
|
-
child_document = coerce_solr_document_to_index_document(original_solr_document: solr_document, id: solr_document.fetch('id'))
|
125
|
-
# during light reindexing, we want to reindex the child only if fields aren't already there
|
126
|
-
yield(child_document) if full_reindex?(extent: extent) || child_document.pathnames.empty?
|
127
|
-
end
|
128
|
-
end
|
129
|
-
|
130
|
-
# @!endgroup
|
131
|
-
# @!group Supporting methods for interface implementation
|
132
|
-
|
133
|
-
##
|
134
|
-
# @api private
|
135
|
-
#
|
136
|
-
# @todo Need to implement retrieving parent_ids, pathnames, and ancestors from the given document
|
137
|
-
def self.coerce_solr_document_to_index_document(original_solr_document:, id:)
|
138
|
-
Samvera::NestingIndexer::Documents::IndexDocument.new(
|
139
|
-
id: id,
|
140
|
-
parent_ids: original_solr_document.fetch(solr_field_name_for_storing_parent_ids) { [] },
|
141
|
-
pathnames: original_solr_document.fetch(solr_field_name_for_storing_pathnames) { [] },
|
142
|
-
ancestors: original_solr_document.fetch(solr_field_name_for_storing_ancestors) { [] }
|
143
|
-
)
|
144
|
-
end
|
145
|
-
private_class_method :coerce_solr_document_to_index_document
|
146
|
-
|
147
|
-
##
|
148
|
-
# @api private
|
149
|
-
def self.find_solr_document_by(id:)
|
150
|
-
query = Hyrax::SolrQueryService.new.with_ids(ids: [id]).build
|
151
|
-
document = Hyrax::SolrService.query(query, rows: 1).first
|
152
|
-
document = ActiveFedora::Base.find(id).to_solr if document.nil?
|
153
|
-
raise "Unable to find SolrDocument with ID=#{id}" if document.nil?
|
154
|
-
document
|
155
|
-
end
|
156
|
-
private_class_method :find_solr_document_by
|
157
|
-
|
158
|
-
##
|
159
|
-
# @api private
|
160
|
-
def self.nesting_configuration
|
161
|
-
@nesting_configuration ||= Samvera::NestingIndexer.configuration
|
162
|
-
end
|
163
|
-
|
164
|
-
class << self
|
165
|
-
delegate :solr_field_name_for_storing_pathnames,
|
166
|
-
:solr_field_name_for_storing_ancestors,
|
167
|
-
:solr_field_name_for_storing_parent_ids,
|
168
|
-
:solr_field_name_for_deepest_nested_depth, to: :nesting_configuration
|
169
|
-
end
|
170
|
-
|
171
|
-
##
|
172
|
-
# @api private
|
173
|
-
# @param parent_document [Curate::Indexer::Documents::IndexDocument]
|
174
|
-
# @return [Hash] A raw response document from SOLR
|
175
|
-
#
|
176
|
-
# @todo What is the appropriate suffix to apply to the solr_field_name?
|
177
|
-
def self.raw_child_solr_documents_of(parent_document:)
|
178
|
-
# query Solr for all of the documents included as a member_of_collection parent. Or up to 10000 of them.
|
179
|
-
child_query = Hyrax::SolrQueryBuilderService.construct_query(member_of_collection_ids_ssim: parent_document.id)
|
180
|
-
Hyrax::SolrService.query(child_query, rows: 10_000.to_i)
|
181
|
-
end
|
182
|
-
private_class_method :raw_child_solr_documents_of
|
183
|
-
|
184
|
-
def self.full_reindex?(extent:)
|
185
|
-
return true if extent == FULL_REINDEX
|
186
|
-
false
|
187
|
-
end
|
188
|
-
private_class_method :full_reindex?
|
189
|
-
|
190
|
-
# @!endgroup
|
191
|
-
end
|
192
|
-
end
|
193
|
-
end
|
@@ -1,7 +0,0 @@
|
|
1
|
-
<fieldset class="btn-group">
|
2
|
-
<legend class="sr-only"><%= facet_field_label(facet_field.field) %></legend>
|
3
|
-
<button class="btn btn-secondary dropdown-toggle" type="button" id="<%= facet_field.field.parameterize %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" aria-controls="<%= facet_field.field.parameterize + '-dropdown-options' %>">
|
4
|
-
<%= facet_field_label(facet_field.field) %>
|
5
|
-
</button>
|
6
|
-
<%= yield %>
|
7
|
-
</fieldset>
|
@@ -1,15 +0,0 @@
|
|
1
|
-
<%# This template is used to render the initial facet list (#index action)
|
2
|
-
and a paginated facet list in a modal (#facet action). The `dropdown-menu`
|
3
|
-
class in only necessary for the former and causes display issues in the latter. -%>
|
4
|
-
<ul id="<%= facet_field.field.parameterize + '-dropdown-options' %>" class="<%= 'dropdown-menu ' if action_name == 'index' %>facet-values" aria-labelledby="<%= facet_field.field.parameterize %>">
|
5
|
-
<% paginator = facet_paginator(facet_field, display_facet) %>
|
6
|
-
<%= render_facet_limit_list(paginator, facet_field.key) %>
|
7
|
-
|
8
|
-
<% unless paginator.last_page? || params[:action] == "facet" %>
|
9
|
-
<li role="separator" class="dropdown-divider"></li>
|
10
|
-
<li class="dropdown-item more_facets_link">
|
11
|
-
<%= link_to t("more_#{field_name}_html", scope: 'blacklight.search.facets', default: :more_html, field_name: facet_field_label(facet_field.field).pluralize),
|
12
|
-
search_facet_path(id: facet_field.key), class: "more_facets_link", data: { blacklight_modal: 'trigger' } %>
|
13
|
-
</li>
|
14
|
-
<% end %>
|
15
|
-
</ul>
|
@@ -1,26 +0,0 @@
|
|
1
|
-
<% if !subfacet ||= false %>
|
2
|
-
<ul class="dropdown-menu pivot-facet list-unstyled" id="<%= facet_field.field.parameterize + '-dropdown-options' %>">
|
3
|
-
<% end %>
|
4
|
-
|
5
|
-
<% display_facet.items.each do |item| -%>
|
6
|
-
<li class="dropdown-item">
|
7
|
-
<span class="facet-values">
|
8
|
-
<% # This prevents model Collection from being shown as a second filter along with the collection type. %>
|
9
|
-
<% item.fq= {} if subfacet %>
|
10
|
-
|
11
|
-
<% # The unless prevents Collection from being included in the select list for the Collection Type filter. %>
|
12
|
-
<%= render_facet_item(item.field, item) unless subfacet != true && item.value == "Collection" %>
|
13
|
-
</span>
|
14
|
-
|
15
|
-
<% unless item.items.blank? %>
|
16
|
-
<%= render partial: 'facet_pivot', locals: { subfacet: true,
|
17
|
-
display_facet: item,
|
18
|
-
field_name: field_name,
|
19
|
-
solr_field: field_name } %>
|
20
|
-
<% end %>
|
21
|
-
</li>
|
22
|
-
<% end %>
|
23
|
-
|
24
|
-
<% if !subfacet %>
|
25
|
-
</ul>
|
26
|
-
<% end %>
|
@@ -1,16 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require 'samvera/nesting_indexer'
|
4
|
-
require 'hyrax/repository_reindexer'
|
5
|
-
|
6
|
-
Samvera::NestingIndexer.configure do |config|
|
7
|
-
# How many layers of nesting are allowed for collections
|
8
|
-
# For maximum_nesting_depth of 3 the following will raise an exception
|
9
|
-
# C1 <- C2 <- C3 <- W1
|
10
|
-
config.maximum_nesting_depth = 5
|
11
|
-
config.adapter = Hyrax::Adapters::NestingIndexAdapter
|
12
|
-
config.solr_field_name_for_storing_parent_ids = "nesting_collection__parent_ids_ssim"
|
13
|
-
config.solr_field_name_for_storing_ancestors = "nesting_collection__ancestors_ssim"
|
14
|
-
config.solr_field_name_for_storing_pathnames = "nesting_collection__pathnames_ssim"
|
15
|
-
config.solr_field_name_for_deepest_nested_depth = 'nesting_collection__deepest_nested_depth_isi'
|
16
|
-
end
|