hyrax 3.3.0 → 4.0.0.beta1
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 +41 -52
- data/.dassie/.env +2 -1
- data/.dassie/Gemfile +4 -4
- data/.dassie/app/assets/javascripts/application.js +8 -4
- data/.dassie/app/assets/stylesheets/application.css +1 -1
- data/.dassie/app/assets/stylesheets/hyrax.scss +1 -2
- data/.dassie/app/controllers/application_controller.rb +1 -3
- data/.dassie/app/controllers/catalog_controller.rb +23 -19
- data/.dassie/app/forms/collection_resource_form.rb +8 -0
- data/.dassie/app/indexers/collection_resource_indexer.rb +8 -0
- data/.dassie/app/models/collection_resource.rb +35 -0
- data/.dassie/app/models/user.rb +0 -3
- data/.dassie/config/application.rb +1 -1
- data/.dassie/config/initializers/file_services.rb +4 -0
- data/.dassie/config/initializers/hyrax.rb +12 -1
- data/.dassie/config/initializers/riiif.rb +1 -1
- data/.dassie/config/metadata/collection_resource.yaml +23 -0
- data/.dassie/db/schema.rb +5 -5
- data/.dassie/db/seeds.rb +74 -17
- data/.dassie/package.json +7 -7
- data/.dassie/spec/forms/collection_resource_form_spec.rb +13 -0
- data/.dassie/spec/indexers/collection_resource_indexer_spec.rb +14 -0
- data/.dassie/spec/models/collection_resource_spec.rb +13 -0
- data/.engine_cart.yml +2 -39
- data/.env +1 -0
- data/.github/release.yml +26 -0
- data/.gitignore +3 -0
- data/.regen +2 -1
- data/.rubocop.yml +1 -1
- data/.rubocop_fixme.yml +22 -3
- data/CONTAINERS.md +18 -13
- data/CONTRIBUTING.md +22 -24
- data/Dockerfile +4 -3
- data/Rakefile +0 -4
- data/app/actors/hyrax/actors/base_actor.rb +1 -1
- data/app/actors/hyrax/actors/create_with_remote_files_actor.rb +5 -11
- data/app/actors/hyrax/actors/file_actor.rb +9 -35
- data/app/actors/hyrax/actors/file_set_actor.rb +13 -62
- data/app/actors/hyrax/actors/transfer_request_actor.rb +3 -7
- data/app/assets/javascripts/hyrax/analytics_events.js +8 -2
- data/app/assets/javascripts/hyrax/app.js.erb +1 -1
- data/app/assets/javascripts/hyrax/autocomplete/linked_data.es6 +1 -3
- data/app/assets/javascripts/hyrax/batch.js +2 -2
- data/app/assets/javascripts/hyrax/batch_edit.js +4 -4
- data/app/assets/javascripts/hyrax/batch_select_all.js +13 -13
- data/app/assets/javascripts/hyrax/browse_everything.js +4 -2
- data/app/assets/javascripts/hyrax/collection_types.es6 +1 -1
- data/app/assets/javascripts/hyrax/collections/editor.es6 +5 -1
- data/app/assets/javascripts/hyrax/collections_v2.es6 +13 -0
- data/app/assets/javascripts/hyrax/dashboard_actions.js +5 -5
- data/app/assets/javascripts/hyrax/editor/controlled_vocabulary.es6 +3 -3
- data/app/assets/javascripts/hyrax/editor.es6 +3 -3
- data/app/assets/javascripts/hyrax/facets.js +6 -4
- data/app/assets/javascripts/hyrax/file_manager/member.es6 +1 -1
- data/app/assets/javascripts/hyrax/file_manager/save_manager.es6 +2 -2
- data/app/assets/javascripts/hyrax/file_manager/sorting.es6 +2 -2
- data/app/assets/javascripts/hyrax/file_manager.es6 +2 -17
- data/app/assets/javascripts/hyrax/notification.es6 +1 -1
- data/app/assets/javascripts/hyrax/permissions/registry.es6 +4 -4
- data/app/assets/javascripts/hyrax/permissions/user_controls.es6 +3 -1
- data/app/assets/javascripts/hyrax/relationships/confirm_remove_dialog.es6 +1 -1
- data/app/assets/javascripts/hyrax/relationships/control.es6 +2 -2
- data/app/assets/javascripts/hyrax/relationships/registry_entry.es6 +1 -1
- data/app/assets/javascripts/hyrax/reports-buttons.js +9 -9
- data/app/assets/javascripts/hyrax/save_work/required_fields.es6 +1 -1
- data/app/assets/javascripts/hyrax/save_work/save_work_control.es6 +6 -6
- data/app/assets/javascripts/hyrax/save_work/uploaded_files.es6 +2 -2
- data/app/assets/javascripts/hyrax/single_use_links_manager.js +1 -1
- data/app/assets/javascripts/hyrax/skip_to_content.js +1 -1
- data/app/assets/javascripts/hyrax/sorting.js +1 -1
- data/app/assets/javascripts/hyrax/trophy.js +1 -1
- data/app/assets/javascripts/hyrax/uploader.js +3 -3
- data/app/assets/javascripts/hyrax.js +1 -19
- data/app/assets/stylesheets/_bootstrap-default-overrides.scss +4 -4
- data/app/assets/stylesheets/hyrax/_accessibility.scss +1 -1
- data/app/assets/stylesheets/hyrax/_badge.scss +7 -0
- data/app/assets/stylesheets/hyrax/_batch-edit.scss +8 -8
- data/app/assets/stylesheets/hyrax/_browse_everything_overrides.scss +1 -1
- data/app/assets/stylesheets/hyrax/_buttons.scss +31 -1
- data/app/assets/stylesheets/hyrax/_card.scss +10 -0
- data/app/assets/stylesheets/hyrax/_catalog.scss +22 -48
- data/app/assets/stylesheets/hyrax/_collection_types.scss +1 -1
- data/app/assets/stylesheets/hyrax/_collections.scss +13 -13
- data/app/assets/stylesheets/hyrax/_facets.scss +46 -0
- data/app/assets/stylesheets/hyrax/_featured.scss +1 -1
- data/app/assets/stylesheets/hyrax/_file-listing.scss +3 -3
- data/app/assets/stylesheets/hyrax/_file_manager.scss +17 -17
- data/app/assets/stylesheets/hyrax/_file_sets.scss +1 -1
- data/app/assets/stylesheets/hyrax/_file_upload.scss +4 -4
- data/app/assets/stylesheets/hyrax/_fixedsticky.scss +1 -1
- data/app/assets/stylesheets/hyrax/_footer.scss +3 -3
- data/app/assets/stylesheets/hyrax/_form-progress.scss +9 -9
- data/app/assets/stylesheets/hyrax/_form.scss +3 -4
- data/app/assets/stylesheets/hyrax/_forms.scss +62 -29
- data/app/assets/stylesheets/hyrax/_header.scss +0 -17
- data/app/assets/stylesheets/hyrax/_home-page.scss +13 -51
- data/app/assets/stylesheets/hyrax/_html.scss +11 -0
- data/app/assets/stylesheets/hyrax/_hyrax.scss +16 -14
- data/app/assets/stylesheets/hyrax/_nestable.scss +1 -1
- data/app/assets/stylesheets/hyrax/_select_work_type.scss +2 -2
- data/app/assets/stylesheets/hyrax/_styles.scss +9 -14
- data/app/assets/stylesheets/hyrax/_users.scss +2 -2
- data/app/assets/stylesheets/hyrax/_variables.scss +20 -1
- data/app/assets/stylesheets/hyrax/_work-show.scss +21 -13
- data/app/assets/stylesheets/hyrax/blacklight_gallery.scss +75 -2
- data/app/assets/stylesheets/hyrax/dashboard.scss +70 -95
- data/app/assets/stylesheets/hyrax/sidebar.scss +39 -19
- data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +10 -3
- data/app/controllers/concerns/hyrax/controller.rb +21 -0
- data/app/controllers/concerns/hyrax/works_controller_behavior.rb +87 -68
- data/app/controllers/hyrax/admin/admin_sets_controller.rb +105 -19
- data/app/controllers/hyrax/admin/permission_template_accesses_controller.rb +12 -19
- data/app/controllers/hyrax/batch_edits_controller.rb +13 -4
- data/app/controllers/hyrax/batch_uploads_controller.rb +4 -0
- data/app/controllers/hyrax/citations_controller.rb +1 -1
- data/app/controllers/hyrax/dashboard/collections_controller.rb +176 -83
- data/app/controllers/hyrax/dashboard/nest_collections_controller.rb +0 -32
- data/app/controllers/hyrax/file_sets_controller.rb +3 -0
- data/app/controllers/hyrax/homepage_controller.rb +0 -1
- data/app/controllers/hyrax/my_controller.rb +0 -6
- data/app/controllers/hyrax/single_use_links_controller.rb +1 -2
- data/app/controllers/hyrax/single_use_links_viewer_controller.rb +1 -1
- data/app/forms/hyrax/forms/administrative_set_form.rb +19 -1
- data/app/forms/hyrax/forms/batch_edit_form.rb +1 -1
- data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb +21 -6
- data/app/forms/hyrax/forms/pcdm_collection_form.rb +30 -2
- data/app/forms/hyrax/forms/permission_template_form.rb +17 -9
- data/app/forms/hyrax/forms/resource_form.rb +23 -5
- data/app/forms/hyrax/forms/widgets/admin_set_visibility.rb +1 -1
- data/app/helpers/hyrax/collections_helper.rb +14 -0
- data/app/helpers/hyrax/facets_helper.rb +150 -0
- data/app/helpers/hyrax/hyrax_helper_behavior.rb +5 -5
- data/app/helpers/hyrax/membership_helper.rb +1 -1
- data/app/helpers/hyrax/trophy_helper.rb +1 -1
- data/app/indexers/hyrax/administrative_set_indexer.rb +8 -2
- data/app/indexers/hyrax/basic_metadata_indexer.rb +3 -9
- data/app/indexers/hyrax/deep_indexing_service.rb +1 -1
- data/app/indexers/hyrax/file_set_indexer.rb +1 -0
- data/app/indexers/hyrax/pcdm_collection_indexer.rb +3 -2
- data/app/indexers/hyrax/thumbnail_indexer.rb +31 -0
- data/app/indexers/hyrax/valkyrie_file_set_indexer.rb +6 -6
- data/app/indexers/hyrax/valkyrie_indexer.rb +4 -2
- data/app/indexers/hyrax/valkyrie_work_indexer.rb +13 -0
- data/app/inputs/controlled_vocabulary_input.rb +2 -0
- data/app/jobs/change_depositor_event_job.rb +47 -0
- data/app/jobs/characterize_job.rb +40 -3
- data/app/jobs/concerns/hyrax/members_permission_job_behavior.rb +1 -1
- data/app/jobs/create_derivatives_job.rb +4 -2
- data/app/jobs/hyrax/propagate_change_depositor_job.rb +32 -0
- data/app/jobs/import_url_job.rb +4 -6
- data/app/jobs/ingest_local_file_job.rb +5 -13
- data/app/jobs/inherit_permissions_job.rb +2 -6
- data/app/jobs/valkyrie_create_derivatives_job.rb +25 -0
- data/app/jobs/valkyrie_ingest_job.rb +41 -35
- data/app/models/admin_set.rb +2 -2
- data/app/models/collection_branding_info.rb +8 -6
- data/app/models/concerns/hyrax/collection_behavior.rb +4 -4
- data/app/models/concerns/hyrax/file_set/characterization.rb +7 -1
- data/app/models/concerns/hyrax/file_set_behavior.rb +1 -1
- data/app/models/concerns/hyrax/in_admin_set.rb +0 -7
- data/app/models/concerns/hyrax/solr_document/metadata.rb +1 -0
- data/app/models/concerns/hyrax/solr_document_behavior.rb +9 -3
- data/app/models/concerns/hyrax/user.rb +14 -3
- data/app/models/concerns/hyrax/work_behavior.rb +1 -2
- data/app/models/content_block.rb +0 -6
- data/app/models/featured_work_list.rb +0 -1
- data/app/models/hyrax/administrative_set.rb +36 -1
- data/app/models/hyrax/collection_type.rb +2 -2
- data/app/models/hyrax/file_metadata.rb +36 -2
- data/app/models/hyrax/file_set.rb +43 -4
- data/app/models/hyrax/group.rb +19 -0
- data/app/models/hyrax/pcdm_collection.rb +56 -1
- data/app/models/hyrax/permission_template.rb +5 -34
- data/app/models/hyrax/work.rb +91 -0
- data/app/models/job_io_wrapper.rb +1 -1
- data/app/models/proxy_deposit_request.rb +1 -1
- data/app/presenters/hyrax/admin/repository_object_presenter.rb +0 -2
- data/app/presenters/hyrax/admin_set_presenter.rb +2 -2
- data/app/presenters/hyrax/collapsable_section_presenter.rb +2 -2
- data/app/presenters/hyrax/collection_presenter.rb +1 -1
- data/app/presenters/hyrax/fixity_status_presenter.rb +2 -2
- data/app/presenters/hyrax/member_presenter_factory.rb +2 -4
- data/app/presenters/hyrax/menu_presenter.rb +1 -1
- data/app/presenters/hyrax/pcdm_member_presenter_factory.rb +2 -2
- data/app/presenters/hyrax/permission_badge.rb +7 -7
- data/app/presenters/hyrax/work_show_presenter.rb +10 -6
- data/app/presenters/hyrax/workflow_presenter.rb +1 -1
- data/app/renderers/hyrax/renderers/external_link_attribute_renderer.rb +1 -1
- data/app/search_builders/hyrax/dashboard/collections_search_builder.rb +2 -2
- data/app/search_builders/hyrax/dashboard/managed_search_filters.rb +44 -4
- data/app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb +2 -2
- data/app/search_builders/hyrax/deposit_search_builder.rb +1 -1
- data/app/search_builders/hyrax/my/collections_search_builder.rb +11 -4
- data/app/search_builders/hyrax/nested_collections_parent_search_builder.rb +10 -1
- data/app/search_builders/hyrax/single_result.rb +1 -1
- data/app/search_builders/hyrax/stats/work_status_search_builder.rb +1 -1
- data/app/services/hyrax/access_control_list.rb +20 -6
- data/app/services/hyrax/adapters/nesting_index_adapter.rb +4 -4
- data/app/services/hyrax/admin_set_create_service.rb +21 -37
- data/app/services/hyrax/change_content_depositor_service.rb +2 -2
- data/app/services/hyrax/change_depositor_service.rb +70 -0
- data/app/services/hyrax/characterization/valkyrie_characterization_service.rb +4 -6
- data/app/services/hyrax/collection_member_service.rb +1 -2
- data/app/services/hyrax/collections/collection_member_service.rb +3 -5
- data/app/services/hyrax/collections/nested_collection_query_service.rb +24 -12
- data/app/services/hyrax/collections/search_service.rb +0 -1
- data/app/services/hyrax/custom_queries/navigators/child_file_sets_navigator.rb +45 -0
- data/app/services/hyrax/custom_queries/navigators/child_filesets_navigator.rb +7 -2
- data/app/services/hyrax/custom_queries/navigators/parent_work_navigator.rb +54 -0
- data/app/services/hyrax/custom_queries.rb +25 -0
- data/app/services/hyrax/default_middleware_stack.rb +3 -0
- data/app/services/hyrax/file_set_csv_service.rb +1 -1
- data/app/services/hyrax/file_set_derivatives_service.rb +21 -2
- data/app/services/hyrax/file_set_type_service.rb +2 -5
- data/app/services/hyrax/graph_exporter.rb +3 -8
- data/app/services/hyrax/iiif_authorization_service.rb +1 -1
- data/app/services/hyrax/listeners/file_metadata_listener.rb +20 -1
- data/app/services/hyrax/listeners/member_cleanup_listener.rb +27 -11
- data/app/services/hyrax/listeners/metadata_index_listener.rb +39 -0
- data/app/services/hyrax/listeners/proxy_deposit_listener.rb +14 -8
- data/app/services/hyrax/location_service.rb +33 -0
- data/app/services/hyrax/multiple_membership_checker.rb +46 -1
- data/app/services/hyrax/resource_visibility_propagator.rb +1 -1
- data/app/services/hyrax/search_service.rb +1 -81
- data/app/services/hyrax/simple_schema_loader.rb +5 -1
- data/app/services/hyrax/solr_query_service.rb +12 -7
- data/app/services/hyrax/statistics/depositors/summary.rb +1 -3
- data/app/services/hyrax/thumbnail_path_service.rb +1 -1
- data/app/services/hyrax/valkyrie_persist_derivatives.rb +50 -0
- data/app/services/hyrax/valkyrie_upload.rb +106 -0
- data/app/services/hyrax/work_query_service.rb +1 -1
- data/app/services/hyrax/work_uploads_handler.rb +0 -10
- data/app/services/hyrax/workflow/workflow_importer.rb +7 -9
- data/app/services/hyrax/workflow/workflow_schema.rb +3 -5
- data/app/services/hyrax/working_directory.rb +2 -0
- data/app/strategies/hyrax/strategies/yaml_strategy.rb +4 -6
- data/app/uploaders/hyrax/uploaded_file_uploader.rb +4 -4
- data/app/utils/hyrax/data_destroyers/collection_branding_destroyer.rb +29 -0
- data/app/utils/hyrax/data_destroyers/collection_types_destroyer.rb +26 -0
- data/app/utils/hyrax/data_destroyers/default_admin_set_id_cache_destroyer.rb +26 -0
- data/app/utils/hyrax/data_destroyers/featured_works_destroyer.rb +27 -0
- data/app/utils/hyrax/data_destroyers/permission_templates_destroyer.rb +30 -0
- data/app/utils/hyrax/data_destroyers/repository_metadata_destroyer.rb +42 -0
- data/app/utils/hyrax/data_destroyers/stats_destroyer.rb +33 -0
- data/app/utils/hyrax/data_maintenance.rb +51 -0
- data/app/utils/hyrax/required_data_seeder.rb +21 -0
- data/app/utils/hyrax/required_data_seeders/collection_seeder.rb +26 -0
- data/app/utils/hyrax/required_data_seeders/collection_type_seeder.rb +36 -0
- data/app/utils/hyrax/test_data_seeder.rb +24 -0
- data/app/utils/hyrax/test_data_seeders/collection_seeder.rb +91 -0
- data/app/utils/hyrax/test_data_seeders/collection_type_seeder.rb +72 -0
- data/app/utils/hyrax/test_data_seeders/user_seeder.rb +52 -0
- data/app/validators/hyrax/collection_membership_validator.rb +39 -0
- data/app/views/_controls.html.erb +14 -18
- data/app/views/_logo.html.erb +0 -1
- data/app/views/_masthead.html.erb +8 -18
- data/app/views/_user_util_links.html.erb +16 -18
- data/app/views/catalog/_document.html.erb +2 -2
- data/app/views/catalog/_document_list.html.erb +1 -1
- data/app/views/catalog/_facet_limit.html.erb +1 -1
- data/app/views/catalog/_index_gallery_collection_wrapper.html.erb +1 -1
- data/app/views/catalog/_index_header_list_collection.html.erb +2 -2
- data/app/views/catalog/_index_header_list_default.html.erb +9 -2
- data/app/views/catalog/_index_list_default.html.erb +7 -5
- data/app/views/catalog/_search_form.html.erb +13 -15
- data/app/views/catalog/_thumbnail_list_collection.html.erb +2 -2
- data/app/views/catalog/_thumbnail_list_default.html.erb +9 -4
- data/app/views/catalog/facet.html.erb +21 -0
- data/app/views/catalog/index.html.erb +6 -4
- data/app/views/collections/edit_fields/_based_near.html.erb +7 -7
- data/app/views/hyrax/admin/admin_sets/_form.html.erb +16 -16
- data/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb +35 -33
- data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb +11 -10
- data/app/views/hyrax/admin/admin_sets/_form_visibility.html.erb +26 -26
- data/app/views/hyrax/admin/admin_sets/_form_workflow.erb +6 -6
- data/app/views/hyrax/admin/admin_sets/_show_actions.html.erb +3 -3
- data/app/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb +9 -9
- data/app/views/hyrax/admin/admin_sets/index.html.erb +3 -3
- data/app/views/hyrax/admin/admin_sets/show.html.erb +4 -4
- data/app/views/hyrax/admin/analytics/_date_range_form.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/collection_reports/_custom_range.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/collection_reports/_monthly_summary.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/collection_reports/_summary.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/collection_reports/_top_collections.html.erb +7 -7
- data/app/views/hyrax/admin/analytics/collection_reports/index.html.erb +6 -6
- data/app/views/hyrax/admin/analytics/collection_reports/show.html.erb +10 -10
- data/app/views/hyrax/admin/analytics/work_reports/_custom_range.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/work_reports/_monthly_summary.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/work_reports/_summary.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/work_reports/_top_file_set_downloads.html.erb +5 -5
- data/app/views/hyrax/admin/analytics/work_reports/_top_works.html.erb +7 -7
- data/app/views/hyrax/admin/analytics/work_reports/_work_counts.html.erb +4 -4
- data/app/views/hyrax/admin/analytics/work_reports/_work_files.html.erb +5 -5
- data/app/views/hyrax/admin/analytics/work_reports/index.html.erb +7 -7
- data/app/views/hyrax/admin/analytics/work_reports/show.html.erb +10 -10
- data/app/views/hyrax/admin/appearances/show.html.erb +2 -2
- data/app/views/hyrax/admin/collection_types/_form.html.erb +24 -23
- data/app/views/hyrax/admin/collection_types/_form_appearance.html.erb +2 -2
- data/app/views/hyrax/admin/collection_types/_form_participants.html.erb +4 -4
- data/app/views/hyrax/admin/collection_types/_form_settings.html.erb +9 -9
- data/app/views/hyrax/admin/collection_types/index.html.erb +7 -7
- data/app/views/hyrax/admin/features/index.html.erb +3 -3
- data/app/views/hyrax/admin/stats/_new_users.html.erb +1 -1
- data/app/views/hyrax/admin/stats/show.html.erb +4 -6
- data/app/views/hyrax/admin/users/index.html.erb +3 -3
- data/app/views/hyrax/admin/workflow_roles/index.html.erb +8 -8
- data/app/views/hyrax/admin/workflows/index.html.erb +13 -13
- data/app/views/hyrax/base/_citations.html.erb +6 -6
- data/app/views/hyrax/base/_currently_shared.html.erb +3 -3
- data/app/views/hyrax/base/_file_manager_actions.html.erb +5 -3
- data/app/views/hyrax/base/_file_manager_member.html.erb +5 -5
- data/app/views/hyrax/base/_file_manager_member_resource_options.html.erb +6 -6
- data/app/views/hyrax/base/_file_manager_members.html.erb +1 -1
- data/app/views/hyrax/base/_file_manager_thumbnail.html.erb +1 -1
- data/app/views/hyrax/base/_form.html.erb +1 -1
- data/app/views/hyrax/base/_form_child_work_relationships.html.erb +4 -4
- data/app/views/hyrax/base/_form_files.html.erb +9 -9
- data/app/views/hyrax/base/_form_member_of_collections.html.erb +3 -3
- data/app/views/hyrax/base/_form_metadata.html.erb +1 -1
- data/app/views/hyrax/base/_form_permission.html.erb +30 -20
- data/app/views/hyrax/base/_form_permission_under_embargo.html.erb +1 -1
- data/app/views/hyrax/base/_form_permission_under_lease.html.erb +1 -1
- data/app/views/hyrax/base/_form_progress.html.erb +6 -6
- data/app/views/hyrax/base/_form_relationships.html.erb +1 -1
- data/app/views/hyrax/base/_form_rendering.html.erb +1 -1
- data/app/views/hyrax/base/_form_representative.html.erb +1 -1
- data/app/views/hyrax/base/_form_share.html.erb +6 -6
- data/app/views/hyrax/base/_form_thumbnail.html.erb +1 -1
- data/app/views/hyrax/base/_form_visibility_component.html.erb +15 -15
- data/app/views/hyrax/base/_guts4form.html.erb +12 -20
- data/app/views/hyrax/base/_member.html.erb +1 -1
- data/app/views/hyrax/base/_metadata.html.erb +1 -1
- data/app/views/hyrax/base/_show_actions.html.erb +9 -9
- data/app/views/hyrax/base/_work_button_row.html.erb +16 -15
- data/app/views/hyrax/base/_workflow_actions.html.erb +10 -10
- data/app/views/hyrax/base/_workflow_actions_widget.erb +1 -1
- data/app/views/hyrax/base/file_manager.html.erb +4 -5
- data/app/views/hyrax/base/inspect_work.html.erb +1 -1
- data/app/views/hyrax/base/show.html.erb +12 -12
- data/app/views/hyrax/base/unavailable.html.erb +2 -2
- data/app/views/hyrax/batch_edits/_check_all.html.erb +0 -1
- data/app/views/hyrax/batch_edits/_delete_selected.html.erb +1 -1
- data/app/views/hyrax/batch_edits/edit.html.erb +26 -18
- data/app/views/hyrax/collections/_bookmark_control.html.erb +2 -2
- data/app/views/hyrax/collections/_list_collections.html.erb +6 -6
- data/app/views/hyrax/collections/_list_works.html.erb +3 -1
- data/app/views/hyrax/collections/_search_form.html.erb +4 -4
- data/app/views/hyrax/collections/_show_document_list_row.html.erb +5 -2
- data/app/views/hyrax/collections/_sort_and_per_page.html.erb +3 -3
- data/app/views/hyrax/collections/_view_type_group.html.erb +2 -2
- data/app/views/hyrax/contact_form/new.html.erb +12 -13
- data/app/views/hyrax/content_blocks/_form.html.erb +29 -23
- data/app/views/hyrax/content_blocks/templates/agreement.html.erb +3 -3
- data/app/views/hyrax/dashboard/_admin_sets.html.erb +22 -28
- data/app/views/hyrax/dashboard/_index_partials/_current_proxy_rights.html.erb +2 -2
- data/app/views/hyrax/dashboard/_index_partials/_proxy_rights.html.erb +4 -4
- data/app/views/hyrax/dashboard/_index_partials/_transfers.html.erb +2 -2
- data/app/views/hyrax/dashboard/_repository_growth.html.erb +28 -28
- data/app/views/hyrax/dashboard/_resource_type_graph.html.erb +4 -4
- data/app/views/hyrax/dashboard/_sidebar.html.erb +3 -3
- data/app/views/hyrax/dashboard/_tabs.html.erb +6 -2
- data/app/views/hyrax/dashboard/_user_activity.html.erb +22 -19
- data/app/views/hyrax/dashboard/_visibility_graph.html.erb +4 -4
- data/app/views/hyrax/dashboard/_work_type_graph.html.erb +4 -4
- data/app/views/hyrax/dashboard/collections/_batch_edits_actions.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_bookmark_control.html.erb +2 -2
- data/app/views/hyrax/dashboard/collections/_default_group.html.erb +2 -2
- data/app/views/hyrax/dashboard/collections/_edit_actions.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_form.html.erb +48 -33
- data/app/views/hyrax/dashboard/collections/_form_branding.html.erb +20 -19
- data/app/views/hyrax/dashboard/collections/_form_discovery.html.erb +14 -7
- data/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb +7 -7
- data/app/views/hyrax/dashboard/collections/_form_share.html.erb +13 -11
- data/app/views/hyrax/dashboard/collections/_form_share_table.html.erb +34 -31
- data/app/views/hyrax/dashboard/collections/_list_collections.html.erb +3 -3
- data/app/views/hyrax/dashboard/collections/_list_works.html.erb +3 -1
- data/app/views/hyrax/dashboard/collections/_modal_remove_from_collection.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_modal_remove_sub_collection.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_show_descriptions.html.erb +5 -3
- data/app/views/hyrax/dashboard/collections/_show_document_list_menu.html.erb +4 -4
- data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb +12 -10
- data/app/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb +2 -2
- data/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb +4 -4
- data/app/views/hyrax/dashboard/collections/_subcollection_list.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_work_action_menu.html.erb +10 -10
- data/app/views/hyrax/dashboard/collections/show.html.erb +4 -4
- data/app/views/hyrax/dashboard/profiles/_edit_primary.html.erb +21 -21
- data/app/views/hyrax/dashboard/profiles/_trophy_edit.html.erb +5 -5
- data/app/views/hyrax/dashboard/profiles/_zotero.html.erb +2 -2
- data/app/views/hyrax/dashboard/profiles/edit.html.erb +2 -2
- data/app/views/hyrax/dashboard/profiles/show.html.erb +3 -3
- data/app/views/hyrax/dashboard/show_admin.html.erb +36 -34
- data/app/views/hyrax/dashboard/show_user.html.erb +16 -16
- data/app/views/hyrax/dashboard/sidebar/_activity.html.erb +11 -11
- data/app/views/hyrax/dashboard/sidebar/_configuration.html.erb +8 -8
- data/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb +3 -1
- data/app/views/hyrax/dashboard/sidebar/_tasks.html.erb +5 -1
- data/app/views/hyrax/dashboard/works/_default_group.html.erb +1 -1
- data/app/views/hyrax/dashboard/works/_list_works.html.erb +5 -2
- data/app/views/hyrax/depositors/index.html.erb +2 -2
- data/app/views/hyrax/embargoes/edit.html.erb +11 -11
- data/app/views/hyrax/embargoes/index.html.erb +18 -6
- data/app/views/hyrax/file_sets/_actions.html.erb +7 -8
- data/app/views/hyrax/file_sets/_descriptions.html.erb +1 -1
- data/app/views/hyrax/file_sets/_extra_fields_modal.html.erb +1 -1
- data/app/views/hyrax/file_sets/_form.html.erb +1 -1
- data/app/views/hyrax/file_sets/_permission_form.html.erb +33 -29
- data/app/views/hyrax/file_sets/_show_actions.html.erb +2 -2
- data/app/views/hyrax/file_sets/_show_details.html.erb +27 -17
- data/app/views/hyrax/file_sets/_single_use_link_rows.html.erb +2 -2
- data/app/views/hyrax/file_sets/_single_use_links.html.erb +2 -2
- data/app/views/hyrax/file_sets/_versioning.html.erb +9 -9
- data/app/views/hyrax/file_sets/edit.html.erb +17 -11
- data/app/views/hyrax/file_sets/media_display/_image.html.erb +4 -4
- data/app/views/hyrax/file_sets/show.html.erb +2 -2
- data/app/views/hyrax/homepage/_announcement.html.erb +2 -2
- data/app/views/hyrax/homepage/_explore_collections.html.erb +6 -4
- data/app/views/hyrax/homepage/_featured_fields.html.erb +1 -1
- data/app/views/hyrax/homepage/_featured_works.html.erb +1 -1
- data/app/views/hyrax/homepage/_home_content.html.erb +24 -10
- data/app/views/hyrax/homepage/_marketing.html.erb +1 -1
- data/app/views/hyrax/homepage/_recent_document.html.erb +4 -1
- data/app/views/hyrax/homepage/_sortable_featured.html.erb +3 -3
- data/app/views/hyrax/homepage/index.html.erb +4 -4
- data/app/views/hyrax/leases/edit.html.erb +11 -11
- data/app/views/hyrax/leases/index.html.erb +18 -6
- data/app/views/hyrax/my/_admin_set_action_menu.html.erb +5 -5
- data/app/views/hyrax/my/_collection_action_menu.html.erb +6 -6
- data/app/views/hyrax/my/_constraints.html.erb +2 -2
- data/app/views/hyrax/my/_document_list.html.erb +1 -1
- data/app/views/hyrax/my/_facet_layout.html.erb +1 -2
- data/app/views/hyrax/my/_facet_limit.html.erb +4 -4
- data/app/views/hyrax/my/_facet_pagination.html.erb +1 -22
- data/app/views/hyrax/my/_facet_pivot.html.erb +1 -1
- data/app/views/hyrax/my/_facet_selected.html.erb +1 -1
- data/app/views/hyrax/my/_search_form.html.erb +7 -8
- data/app/views/hyrax/my/_sort_and_per_page.html.erb +10 -12
- data/app/views/hyrax/my/_work_action_menu.html.erb +12 -14
- data/app/views/hyrax/my/collections/_default_group.html.erb +2 -2
- data/app/views/hyrax/my/collections/_facets.html.erb +2 -2
- data/app/views/hyrax/my/collections/_list_collections.html.erb +3 -3
- data/app/views/hyrax/my/collections/_modal_add_subcollection.html.erb +2 -2
- data/app/views/hyrax/my/collections/_modal_add_to_collection.html.erb +2 -2
- data/app/views/hyrax/my/collections/_modal_collection_types_to_create.html.erb +5 -5
- data/app/views/hyrax/my/collections/_modal_delete_collection.html.erb +1 -1
- data/app/views/hyrax/my/collections/_modal_delete_empty_collection.html.erb +1 -1
- data/app/views/hyrax/my/collections/_modal_delete_selected_collections.html.erb +1 -1
- data/app/views/hyrax/my/collections/_tabs.html.erb +11 -4
- data/app/views/hyrax/my/collections/index.html.erb +6 -5
- data/app/views/hyrax/my/facet.html.erb +17 -16
- data/app/views/hyrax/my/index.html.erb +2 -2
- data/app/views/hyrax/my/works/_batch_actions.html.erb +1 -1
- data/app/views/hyrax/my/works/_default_group.html.erb +1 -1
- data/app/views/hyrax/my/works/_facets.html.erb +2 -2
- data/app/views/hyrax/my/works/_list_works.html.erb +7 -9
- data/app/views/hyrax/my/works/_tabs.html.erb +9 -4
- data/app/views/hyrax/my/works/index.html.erb +22 -18
- data/app/views/hyrax/notifications/_notifications.html.erb +1 -1
- data/app/views/hyrax/notifications/index.html.erb +4 -4
- data/app/views/hyrax/operations/index.html.erb +1 -1
- data/app/views/hyrax/operations/show.html.erb +2 -2
- data/app/views/hyrax/pages/_form.html.erb +76 -64
- data/app/views/hyrax/permissions/confirm.html.erb +4 -4
- data/app/views/hyrax/permissions/confirm_access.html.erb +4 -4
- data/app/views/hyrax/stats/file.html.erb +1 -1
- data/app/views/hyrax/stats/work.html.erb +1 -1
- data/app/views/hyrax/transfers/_received.html.erb +4 -4
- data/app/views/hyrax/transfers/index.html.erb +8 -8
- data/app/views/hyrax/uploads/_js_templates.html.erb +14 -14
- data/app/views/hyrax/uploads/_js_templates_branding.html.erb +5 -5
- data/app/views/hyrax/uploads/_js_templates_versioning.html.erb +15 -15
- data/app/views/hyrax/users/_activity.html.erb +3 -3
- data/app/views/hyrax/users/_contributions.html.erb +3 -3
- data/app/views/hyrax/users/_left_sidebar.html.erb +1 -1
- data/app/views/hyrax/users/_profile_tabs.html.erb +16 -8
- data/app/views/hyrax/users/_search_form.html.erb +2 -2
- data/app/views/hyrax/users/_user.html.erb +5 -5
- data/app/views/hyrax/users/_user_info.html.erb +4 -4
- data/app/views/hyrax/users/_vitals.html.erb +3 -3
- data/app/views/hyrax/users/show.html.erb +2 -2
- data/app/views/layouts/hyrax/dashboard.html.erb +4 -4
- data/app/views/layouts/hyrax.html.erb +4 -3
- data/app/views/shared/_appearance_styles.html.erb +8 -8
- data/app/views/shared/_footer.html.erb +1 -1
- data/app/views/shared/_locale_picker.html.erb +5 -8
- data/app/views/shared/_nav_safety_modal.html.erb +2 -2
- data/app/views/shared/_select_work_type_modal.html.erb +2 -2
- data/chart/hyrax/Chart.yaml +11 -7
- data/chart/hyrax/README.md +22 -1
- data/chart/hyrax/templates/_helpers.tpl +4 -0
- data/chart/hyrax/templates/cron-embargo.yaml +5 -0
- data/chart/hyrax/templates/cron-lease.yaml +5 -0
- data/chart/hyrax/templates/deployment-worker.yaml +11 -0
- data/chart/hyrax/templates/ingress.yaml +7 -6
- data/chart/hyrax/values.yaml +152 -0
- data/config/features.rb +48 -50
- data/config/initializers/listeners.rb +0 -1
- data/config/initializers/{valkryrie_storage.rb → storage_adapter_initializer.rb} +5 -0
- data/config/locales/hyrax.de.yml +22 -21
- data/config/locales/hyrax.en.yml +34 -32
- data/config/locales/hyrax.es.yml +16 -15
- data/config/locales/hyrax.fr.yml +9 -8
- data/config/locales/hyrax.it.yml +9 -8
- data/config/locales/hyrax.pt-BR.yml +8 -7
- data/config/locales/hyrax.zh.yml +8 -7
- data/config/metadata/basic_metadata.yaml +2 -0
- data/config/metadata/core_metadata.yaml +1 -1
- data/docker-compose.yml +49 -43
- data/documentation/developing-your-hyrax-based-app.md +1 -1
- data/documentation/legacyREADME.md +1 -1
- data/hyrax.gemspec +15 -22
- data/karma.conf.js +104 -0
- data/lib/generators/hyrax/assets_generator.rb +2 -5
- data/lib/generators/hyrax/collection_resource/USAGE +20 -0
- data/lib/generators/hyrax/collection_resource/collection_resource_generator.rb +133 -0
- data/lib/generators/hyrax/collection_resource/templates/collection.rb.erb +34 -0
- data/lib/generators/hyrax/collection_resource/templates/collection_form.rb.erb +7 -0
- data/lib/generators/hyrax/collection_resource/templates/collection_form_spec.rb.erb +13 -0
- data/lib/generators/hyrax/collection_resource/templates/collection_indexer.rb.erb +7 -0
- data/lib/generators/hyrax/collection_resource/templates/collection_indexer_spec.rb.erb +13 -0
- data/lib/generators/hyrax/collection_resource/templates/collection_metadata.yaml +22 -0
- data/lib/generators/hyrax/collection_resource/templates/collection_spec.rb.erb +12 -0
- data/lib/generators/hyrax/install_generator.rb +9 -24
- data/lib/generators/hyrax/templates/catalog_controller.rb +20 -13
- data/lib/generators/hyrax/templates/config/initializers/riiif.rb +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.de.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.en.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.es.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.it.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.zh.yml +1 -1
- data/lib/generators/hyrax/templates/hyrax.scss +1 -2
- data/lib/generators/hyrax/templates/package.json +7 -8
- data/lib/hyrax/administrative_set_name.rb +18 -0
- data/lib/hyrax/collection_name.rb +2 -0
- data/lib/hyrax/configuration.rb +22 -40
- data/lib/hyrax/controlled_vocabularies/location.rb +9 -2
- data/lib/hyrax/controlled_vocabularies/resource_label_caching.rb +42 -0
- data/lib/hyrax/controlled_vocabularies.rb +1 -0
- data/lib/hyrax/engine.rb +1 -2
- data/lib/hyrax/publisher.rb +45 -0
- data/lib/hyrax/schema.rb +16 -13
- data/lib/hyrax/specs/capybara.rb +6 -4
- data/lib/hyrax/specs/shared_specs/hydra_works.rb +11 -5
- data/lib/hyrax/specs/shared_specs/indexers.rb +117 -3
- data/lib/hyrax/transactions/admin_set_create.rb +2 -1
- data/lib/hyrax/transactions/admin_set_destroy.rb +22 -0
- data/lib/hyrax/transactions/admin_set_update.rb +21 -0
- data/lib/hyrax/transactions/collection_destroy.rb +22 -0
- data/lib/hyrax/transactions/collection_update.rb +5 -2
- data/lib/hyrax/transactions/container.rb +76 -56
- data/lib/hyrax/transactions/steps/change_depositor.rb +46 -0
- data/lib/hyrax/transactions/steps/check_for_empty_admin_set.rb +36 -0
- data/lib/hyrax/transactions/steps/delete_access_control.rb +32 -0
- data/lib/hyrax/transactions/steps/delete_resource.rb +19 -3
- data/lib/hyrax/transactions/steps/save.rb +24 -6
- data/lib/hyrax/transactions/steps/save_access_control.rb +2 -2
- data/lib/hyrax/transactions/steps/save_collection_banner.rb +59 -0
- data/lib/hyrax/transactions/steps/save_collection_logo.rb +109 -0
- data/lib/hyrax/transactions/steps/set_user_as_creator.rb +41 -0
- data/lib/hyrax/transactions/steps/update_work_members.rb +51 -0
- data/lib/hyrax/transactions/work_create.rb +1 -1
- data/lib/hyrax/transactions/work_destroy.rb +2 -1
- data/lib/hyrax/transactions/{update_work.rb → work_update.rb} +4 -3
- data/lib/hyrax/version.rb +1 -1
- data/lib/valkyrie/indexing/solr/indexing_adapter.rb +1 -1
- data/lib/wings/active_fedora_converter/file_metadata_node.rb +48 -0
- data/lib/wings/active_fedora_converter/instance_builder.rb +68 -0
- data/lib/wings/active_fedora_converter.rb +3 -3
- data/lib/wings/attribute_transformer.rb +5 -1
- data/lib/wings/services/custom_queries/find_file_metadata.rb +19 -8
- data/lib/wings/setup.rb +3 -1
- data/lib/wings/valkyrie/persister.rb +4 -1
- data/lib/wings/valkyrie/query_service.rb +6 -7
- data/lib/wings/valkyrie/storage.rb +7 -1
- data/package.json +11 -0
- data/tasks/hyrax_dev.rake +32 -0
- data/template.rb +1 -1
- data/vendor/assets/javascripts/dataTables.bootstrap4.js +184 -0
- data/vendor/assets/javascripts/fileupload/jquery.fileupload-ui.js +1 -1
- data/vendor/assets/javascripts/fileupload/jquery.fileupload.js +2 -2
- data/vendor/assets/javascripts/fileupload/jquery.iframe-transport.js +1 -1
- data/vendor/assets/javascripts/handlebars.js +5214 -0
- data/vendor/assets/javascripts/jquery-ui.js +19057 -0
- data/vendor/assets/javascripts/jquery.dataTables.js +15336 -0
- data/vendor/assets/javascripts/morris/morris.min.js +9 -1
- data/vendor/assets/javascripts/morris/raphael-min.js +4 -6
- data/vendor/assets/javascripts/nestable.js +1 -1
- data/vendor/assets/stylesheets/dataTables.bootstrap4.css +307 -0
- data/vendor/assets/stylesheets/jquery-ui.css +1315 -0
- data/vendor/assets/stylesheets/morris.css +3 -0
- metadata +162 -155
- data/app/actors/hyrax/actors/initialize_workflow_actor.rb +0 -35
- data/app/helpers/hyrax/url_helper.rb +0 -13
- data/app/jobs/content_depositor_change_event_job.rb +0 -47
- data/app/models/concerns/hyrax/with_file_sets.rb +0 -17
- data/lib/hyrax/transactions/create_work.rb +0 -62
- data/lib/hyrax/transactions/destroy_work.rb +0 -25
- data/lib/hyrax/transactions/steps/apply_collection_permission_template.rb +0 -32
- data/lib/hyrax/transactions/steps/apply_permission_template.rb +0 -30
- data/lib/hyrax/transactions/steps/apply_visibility.rb +0 -39
- data/lib/hyrax/transactions/steps/destroy_work.rb +0 -25
- data/lib/hyrax/transactions/steps/ensure_permission_template.rb +0 -27
- data/lib/hyrax/transactions/steps/save_work.rb +0 -35
- data/lib/wings/services/file_converter_service.rb +0 -19
- data/lib/wings/services/file_metadata_builder.rb +0 -94
- data/vendor/assets/javascripts/handlebars-v4.0.5.js +0 -4612
- data/vendor/assets/stylesheets/morris.js/0.5.1/morris.css +0 -2
@@ -29,7 +29,7 @@ module Hyrax
|
|
29
29
|
:page_count, :file_title, :last_modified, :original_checksum,
|
30
30
|
:duration, :sample_rate, :alpha_channels
|
31
31
|
]
|
32
|
-
self.characterization_proxy =
|
32
|
+
self.characterization_proxy = Hyrax.config.characterization_proxy
|
33
33
|
|
34
34
|
delegate(*characterization_terms, to: :characterization_proxy)
|
35
35
|
|
@@ -64,6 +64,12 @@ module Hyrax
|
|
64
64
|
end
|
65
65
|
|
66
66
|
ActiveFedora::WithMetadata::DefaultMetadataClassFactory.file_metadata_schemas << AlphaChannelsSchema
|
67
|
+
|
68
|
+
# Add file_set_id for Valkyrie support.
|
69
|
+
class FileSetIdSchema < ActiveTriples::Schema
|
70
|
+
property :file_set_id, predicate: ::RDF::URI.new('http://vocabulary.samvera.org/ns#fileSetId')
|
71
|
+
end
|
72
|
+
ActiveFedora::WithMetadata::DefaultMetadataClassFactory.file_metadata_schemas << FileSetIdSchema
|
67
73
|
end
|
68
74
|
end
|
69
75
|
end
|
@@ -6,12 +6,5 @@ module Hyrax
|
|
6
6
|
included do
|
7
7
|
belongs_to :admin_set, predicate: Hyrax.config.admin_set_predicate
|
8
8
|
end
|
9
|
-
|
10
|
-
##
|
11
|
-
# @deprecated Use `Sipity::Workflow.find_active_workflow_for` instead.
|
12
|
-
def active_workflow
|
13
|
-
Deprecation.warn 'Use `Sipity::Workflow.find_active_workflow_for` instead.'
|
14
|
-
Sipity::Workflow.find_active_workflow_for(admin_set_id: admin_set_id)
|
15
|
-
end
|
16
9
|
end
|
17
10
|
end
|
@@ -52,6 +52,7 @@ module Hyrax
|
|
52
52
|
attribute :read_groups, Solr::Array, ::Ability.read_group_field
|
53
53
|
attribute :collection_ids, Solr::Array, 'collection_ids_tesim'
|
54
54
|
attribute :admin_set, Solr::Array, "admin_set_tesim"
|
55
|
+
attribute :admin_set_id, Solr::Array, "admin_set_id_ssim"
|
55
56
|
attribute :member_ids, Solr::Array, "member_ids_ssim"
|
56
57
|
attribute :member_of_collection_ids, Solr::Array, "member_of_collection_ids_ssim"
|
57
58
|
attribute :member_of_collections, Solr::Array, "member_of_collections_ssim"
|
@@ -65,7 +65,7 @@ module Hyrax
|
|
65
65
|
##
|
66
66
|
# @return [Boolean]
|
67
67
|
def admin_set?
|
68
|
-
hydra_model ==
|
68
|
+
hydra_model == Hyrax.config.admin_set_class
|
69
69
|
end
|
70
70
|
|
71
71
|
##
|
@@ -75,9 +75,9 @@ module Hyrax
|
|
75
75
|
end
|
76
76
|
|
77
77
|
# Method to return the model
|
78
|
-
def hydra_model(classifier:
|
78
|
+
def hydra_model(classifier: nil)
|
79
79
|
first('has_model_ssim')&.safe_constantize ||
|
80
|
-
classifier.classifier(self).best_model
|
80
|
+
model_classifier(classifier).classifier(self).best_model
|
81
81
|
end
|
82
82
|
|
83
83
|
def depositor(default = '')
|
@@ -107,5 +107,11 @@ module Hyrax
|
|
107
107
|
def collection_type_gid
|
108
108
|
first(Hyrax.config.collection_type_index_field)
|
109
109
|
end
|
110
|
+
|
111
|
+
private
|
112
|
+
|
113
|
+
def model_classifier(classifier)
|
114
|
+
classifier || ActiveFedora.model_mapper
|
115
|
+
end
|
110
116
|
end
|
111
117
|
end
|
@@ -34,12 +34,12 @@ module Hyrax::User
|
|
34
34
|
scope :without_system_accounts, -> { where("#{::User.user_key_field} not in (?)", [::User.batch_user_key, ::User.audit_user_key, ::User.system_user_key]) }
|
35
35
|
|
36
36
|
# Validate and normalize ORCIDs
|
37
|
-
validates_with OrcidValidator
|
37
|
+
validates_with Hyrax::OrcidValidator
|
38
38
|
after_validation :normalize_orcid
|
39
39
|
|
40
40
|
# Set up user profile avatars
|
41
|
-
mount_uploader :avatar, AvatarUploader, mount_on: :avatar_file_name
|
42
|
-
validates_with AvatarValidator
|
41
|
+
mount_uploader :avatar, Hyrax::AvatarUploader, mount_on: :avatar_file_name
|
42
|
+
validates_with Hyrax::AvatarValidator
|
43
43
|
|
44
44
|
# Add token to authenticate Arkivo API calls
|
45
45
|
after_initialize :set_arkivo_token, unless: :persisted? if Hyrax.config.arkivo_api?
|
@@ -53,6 +53,13 @@ module Hyrax::User
|
|
53
53
|
public_send(self.class.user_key_field)
|
54
54
|
end
|
55
55
|
|
56
|
+
##
|
57
|
+
# @return [String] a local identifier for this user; for use (e.g.) in ACL
|
58
|
+
# data
|
59
|
+
def agent_key
|
60
|
+
user_key
|
61
|
+
end
|
62
|
+
|
56
63
|
# Look for, in order:
|
57
64
|
# A cached version of the agent
|
58
65
|
# A non-cached version (direct read of the database)
|
@@ -177,6 +184,10 @@ module Hyrax::User
|
|
177
184
|
User.find_by_user_key(user_key) || User.create!(user_key_field => user_key, password: Devise.friendly_token[0, 20])
|
178
185
|
end
|
179
186
|
|
187
|
+
def from_agent_key(key)
|
188
|
+
User.find_by_user_key(key)
|
189
|
+
end
|
190
|
+
|
180
191
|
def from_url_component(component)
|
181
192
|
User.find_by_user_key(component.gsub(/-dot-/, '.'))
|
182
193
|
end
|
@@ -10,7 +10,6 @@ module Hyrax
|
|
10
10
|
include Hydra::WithDepositor
|
11
11
|
include HasRepresentative
|
12
12
|
include HasRendering
|
13
|
-
include WithFileSets
|
14
13
|
include Naming
|
15
14
|
include CoreMetadata
|
16
15
|
include InAdminSet
|
@@ -34,7 +33,7 @@ module Hyrax
|
|
34
33
|
|
35
34
|
module ClassMethods
|
36
35
|
# This governs which partial to draw when you render this type of object
|
37
|
-
def _to_partial_path
|
36
|
+
def _to_partial_path # :nodoc:
|
38
37
|
@_to_partial_path ||= begin
|
39
38
|
element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(name))
|
40
39
|
collection = ActiveSupport::Inflector.tableize(name)
|
data/app/models/content_block.rb
CHANGED
@@ -24,12 +24,6 @@ class ContentBlock < ActiveRecord::Base
|
|
24
24
|
end
|
25
25
|
|
26
26
|
class << self
|
27
|
-
# @deprecated
|
28
|
-
def whitelisted?(key)
|
29
|
-
Deprecation.warn(self, "Samvera is deprecating '#{self}.whitelisted?' in Hyrax 3.0. Use #{self}.registered? instead.")
|
30
|
-
registered?(key)
|
31
|
-
end
|
32
|
-
|
33
27
|
def registered?(key)
|
34
28
|
NAME_REGISTRY.include?(key)
|
35
29
|
end
|
@@ -1,18 +1,53 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require_dependency 'hyrax/administrative_set_name'
|
4
|
+
|
3
5
|
module Hyrax
|
4
6
|
##
|
5
7
|
# Valkyrie model for Admin Set domain objects.
|
8
|
+
#
|
9
|
+
# ## Relationships
|
10
|
+
#
|
11
|
+
# ### Administrative Set and Work
|
12
|
+
#
|
13
|
+
# * Defined: The relationship is defined by the inverse relationship stored in the
|
14
|
+
# work's `:admin_set_id` attribute.
|
15
|
+
# * Tested: The work tests the relationship.
|
16
|
+
# * Administrative Set to Work: (1..m) An admin set can have many works.
|
17
|
+
#
|
18
|
+
# @example Get works in an admin set:
|
19
|
+
# works = Hyrax.query_service.find_inverse_references_by(id: admin_set.id, property: :admin_set_id)
|
20
|
+
#
|
21
|
+
# * Work to Administrative Set: (1..1) A work must be in one and only one admin set.
|
22
|
+
# * See Hyrax::Work for code to get and set the admin set for the work.
|
23
|
+
#
|
24
|
+
# @see Hyrax::Work
|
25
|
+
# @see Valkyrie query adapter's #find_inverse_references_by
|
26
|
+
#
|
6
27
|
class AdministrativeSet < Hyrax::Resource
|
7
28
|
include Hyrax::Schema(:core_metadata)
|
8
29
|
|
9
30
|
attribute :alternative_title, Valkyrie::Types::Set.of(Valkyrie::Types::String)
|
10
31
|
attribute :creator, Valkyrie::Types::Set.of(Valkyrie::Types::String)
|
11
|
-
attribute :description, Valkyrie::Types::
|
32
|
+
attribute :description, Valkyrie::Types::String
|
33
|
+
|
34
|
+
##
|
35
|
+
# @return [Boolean] true
|
36
|
+
def collection?
|
37
|
+
true
|
38
|
+
end
|
12
39
|
|
13
40
|
def collection_type_gid
|
14
41
|
# allow AdministrativeSet to behave more like a regular PcdmCollection
|
15
42
|
Hyrax::CollectionType.find_or_create_admin_set_type.to_global_id
|
16
43
|
end
|
44
|
+
|
45
|
+
##
|
46
|
+
# @api private
|
47
|
+
#
|
48
|
+
# @return [Class] an ActiveModel::Name compatible class
|
49
|
+
def self._hyrax_default_name_class
|
50
|
+
Hyrax::AdministrativeSetName
|
51
|
+
end
|
17
52
|
end
|
18
53
|
end
|
@@ -109,9 +109,9 @@ module Hyrax
|
|
109
109
|
|
110
110
|
##
|
111
111
|
# @return [Enumerable<Collection, PcdmCollection>]
|
112
|
-
def collections(use_valkyrie:
|
112
|
+
def collections(use_valkyrie: Hyrax.config.use_valkyrie?)
|
113
113
|
return [] unless id
|
114
|
-
return Hyrax.custom_queries.find_collections_by_type(global_id: to_global_id) if use_valkyrie
|
114
|
+
return Hyrax.custom_queries.find_collections_by_type(global_id: to_global_id.to_s) if use_valkyrie
|
115
115
|
ActiveFedora::Base.where(Hyrax.config.collection_type_index_field.to_sym => to_global_id.to_s)
|
116
116
|
end
|
117
117
|
|
@@ -1,7 +1,30 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
module Hyrax
|
4
|
+
##
|
5
|
+
# Casts a resource to an associated FileMetadata
|
6
|
+
#
|
7
|
+
# @param [Valkyrie::StorageAdapter::File] file
|
8
|
+
#
|
9
|
+
# @return [Hyrax::FileMetadata]
|
10
|
+
# @raise [ArgumentError]
|
11
|
+
def self.FileMetadata(file)
|
12
|
+
raise(ArgumentError, "Expected a Valkyrie::StorageAdapter::File; got #{file.class}: #{file}") if
|
13
|
+
file.is_a?(Valkyrie::Resource)
|
14
|
+
|
15
|
+
Hyrax.custom_queries.find_file_metadata_by(id: file.id)
|
16
|
+
rescue Hyrax::ObjectNotFoundError, Ldp::BadRequest
|
17
|
+
Hyrax.logger.debug('Could not find an existing metadata node for file ' \
|
18
|
+
"with id #{file.id}. Initializing a new one")
|
19
|
+
|
20
|
+
FileMetadata.new(file_identifier: file.id, alternative_ids: [file.id])
|
21
|
+
end
|
22
|
+
|
4
23
|
class FileMetadata < Valkyrie::Resource
|
24
|
+
# Include mime-types for Hydra Derivatives mime-type checking. We may want
|
25
|
+
# to move this logic someday.
|
26
|
+
include Hydra::Works::MimeTypes
|
27
|
+
|
5
28
|
GENERIC_MIME_TYPE = 'application/octet-stream'
|
6
29
|
|
7
30
|
##
|
@@ -35,7 +58,7 @@ module Hyrax
|
|
35
58
|
end
|
36
59
|
|
37
60
|
attribute :file_identifier, Valkyrie::Types::ID # id of the file stored by the storage adapter
|
38
|
-
attribute :alternate_ids, Valkyrie::Types::Set.of(Valkyrie::Types::ID) # id of the
|
61
|
+
attribute :alternate_ids, Valkyrie::Types::Set.of(Valkyrie::Types::ID) # id of the file, populated for queryability
|
39
62
|
attribute :file_set_id, ::Valkyrie::Types::ID # id of parent file set resource
|
40
63
|
|
41
64
|
# all remaining attributes are on AF::File metadata_node unless otherwise noted
|
@@ -103,7 +126,9 @@ module Hyrax
|
|
103
126
|
attribute :aspect_ratio, ::Valkyrie::Types::Set
|
104
127
|
|
105
128
|
# @param [ActionDispatch::Http::UploadedFile] file
|
129
|
+
# @deprecated Use #new instead; for removal in 4.0.0
|
106
130
|
def self.for(file:)
|
131
|
+
Deprecation.warn "#{self.class}##{__method__} is deprecated; use #new instead."
|
107
132
|
new(label: file.original_filename,
|
108
133
|
original_filename: file.original_filename,
|
109
134
|
mime_type: file.content_type)
|
@@ -151,8 +176,17 @@ module Hyrax
|
|
151
176
|
''
|
152
177
|
end
|
153
178
|
|
179
|
+
##
|
180
|
+
# @return [Valkyrie::StorageAdapter::File]
|
181
|
+
#
|
182
|
+
# @raise [Valkyrie::StorageAdapter::AdapterNotFoundError] if no adapter
|
183
|
+
# could be found matching the file_identifier's scheme
|
184
|
+
# @raise [Valkyrie::StorageAdapter::FileNotFound] when the file can't
|
185
|
+
# be found in the registered adapter
|
154
186
|
def file
|
155
|
-
|
187
|
+
Valkyrie::StorageAdapter
|
188
|
+
.adapter_for(id: file_identifier)
|
189
|
+
.find_by(id: file_identifier)
|
156
190
|
end
|
157
191
|
end
|
158
192
|
end
|
@@ -4,22 +4,61 @@ module Hyrax
|
|
4
4
|
##
|
5
5
|
# Valkyrie model for `FileSet` domain objects in the Hydra Works model.
|
6
6
|
#
|
7
|
+
# ## Relationships
|
8
|
+
#
|
9
|
+
# ### File Set and Work
|
10
|
+
#
|
11
|
+
# * Defined: The relationship is defined by the inverse relationship stored in the
|
12
|
+
# work's `:member_ids` attribute.
|
13
|
+
# * Tested: The work tests the relationship.
|
14
|
+
# * File Set to Work: (1..1) A file set must be in one and only one work.
|
15
|
+
#
|
16
|
+
# @example Get work for a file set:
|
17
|
+
# work = Hyrax.custom_queries.find_parent_work(resource: file_set)
|
18
|
+
#
|
19
|
+
# * Work to File Set: (0..m) A work can have many file sets.
|
20
|
+
# * See Hyrax::Work for code to get and set file sets for the work.
|
21
|
+
#
|
22
|
+
# ### File Set and File (TBD)
|
23
|
+
#
|
24
|
+
# @see Hyrax::Work
|
25
|
+
# @see Hyrax::CustomQueries::Navigators::ParentWorkNavigator#find_parent_work
|
26
|
+
#
|
27
|
+
# @todo The description in Hydra::Works Shared Modeling is out of date and uses
|
28
|
+
# terminology to describe the relationships that is no longer used in code.
|
29
|
+
# Update the model and link to it. This can be a simple relationship diagram
|
30
|
+
# with a link to the original Works Shared Modeling for historical perspective.
|
7
31
|
# @see https://wiki.duraspace.org/display/samvera/Hydra%3A%3AWorks+Shared+Modeling
|
8
32
|
class FileSet < Hyrax::Resource
|
9
33
|
include Hyrax::Schema(:core_metadata)
|
10
34
|
include Hyrax::Schema(:basic_metadata)
|
11
35
|
|
12
36
|
def self.model_name(name_class: Hyrax::Name)
|
13
|
-
@_model_name ||=
|
14
|
-
name_class.new(self, nil, 'FileSet')
|
15
|
-
end
|
37
|
+
@_model_name ||= name_class.new(self, nil, 'FileSet')
|
16
38
|
end
|
17
39
|
|
40
|
+
class_attribute :characterization_proxy
|
41
|
+
self.characterization_proxy = Hyrax.config.characterization_proxy
|
42
|
+
|
18
43
|
attribute :file_ids, Valkyrie::Types::Array.of(Valkyrie::Types::ID) # id for FileMetadata resources
|
44
|
+
attribute :thumbnail_id, Valkyrie::Types::ID.optional # id for FileMetadata resource
|
19
45
|
attribute :original_file_id, Valkyrie::Types::ID # id for FileMetadata resource
|
20
|
-
attribute :thumbnail_id, Valkyrie::Types::ID # id for FileMetadata resource
|
21
46
|
attribute :extracted_text_id, Valkyrie::Types::ID # id for FileMetadata resource
|
22
47
|
|
48
|
+
##
|
49
|
+
# @return [Valkyrie::ID]
|
50
|
+
def representative_id
|
51
|
+
id
|
52
|
+
end
|
53
|
+
|
54
|
+
##
|
55
|
+
# @return [Valkyrie::ID]
|
56
|
+
# If one is set then return it, otherwise use self as the ID to allow for
|
57
|
+
# derivative generators to find the on-disk path for the thumbnail.
|
58
|
+
def thumbnail_id
|
59
|
+
self.[](:thumbnail_id) || id
|
60
|
+
end
|
61
|
+
|
23
62
|
##
|
24
63
|
# @return [Boolean] true
|
25
64
|
def pcdm_object?
|
data/app/models/hyrax/group.rb
CHANGED
@@ -7,12 +7,31 @@ module Hyrax
|
|
7
7
|
DEFAULT_NAME_PREFIX
|
8
8
|
end
|
9
9
|
|
10
|
+
##
|
11
|
+
# @return [Hyrax::Group]
|
12
|
+
def self.from_agent_key(key)
|
13
|
+
new(key.delete_prefix(name_prefix))
|
14
|
+
end
|
15
|
+
|
10
16
|
def initialize(name)
|
11
17
|
@name = name
|
12
18
|
end
|
13
19
|
|
14
20
|
attr_reader :name
|
15
21
|
|
22
|
+
##
|
23
|
+
# @return [Boolean]
|
24
|
+
def ==(other)
|
25
|
+
other.class == self.class && other.name == name
|
26
|
+
end
|
27
|
+
|
28
|
+
##
|
29
|
+
# @return [String] a local identifier for this group; for use (e.g.) in ACL
|
30
|
+
# data
|
31
|
+
def agent_key
|
32
|
+
self.class.name_prefix + name
|
33
|
+
end
|
34
|
+
|
16
35
|
def to_sipity_agent
|
17
36
|
sipity_agent || create_sipity_agent!
|
18
37
|
end
|
@@ -5,9 +5,42 @@ require_dependency 'hyrax/collection_name'
|
|
5
5
|
module Hyrax
|
6
6
|
##
|
7
7
|
# Valkyrie model for Collection domain objects in the Hydra Works model.
|
8
|
+
#
|
9
|
+
# ## Relationships
|
10
|
+
#
|
11
|
+
# ### Collection and Collection (TBA)
|
12
|
+
#
|
13
|
+
# ### Collection and Work
|
14
|
+
#
|
15
|
+
# * Defined: The relationship is defined by the inverse relationship stored in the
|
16
|
+
# work's `:member_of_collection_ids` attribute.
|
17
|
+
# * Tested: The work tests the relationship.
|
18
|
+
# * Collection to Work: (0..m) A collection can have many works.
|
19
|
+
#
|
20
|
+
# @example Get works in a collection:
|
21
|
+
# works = Hyrax.custom_queries.find_child_works(resource: collection)
|
22
|
+
#
|
23
|
+
# * Work to Collection: (0..m) A work can be in many collections.
|
24
|
+
# * See Hyrax::Work for code to get and set collections for the work.
|
25
|
+
#
|
26
|
+
# @note Some collection types limit a work to belong to one and only one collection of that type.
|
27
|
+
#
|
28
|
+
# ### All children
|
29
|
+
#
|
30
|
+
# * There are additional methods for finding all children without respect to
|
31
|
+
# the child's type.
|
32
|
+
#
|
33
|
+
# @example Get works and child collections in a collection using:
|
34
|
+
# members = Hyrax.custom_queries.find_members_of(resource: collection)
|
35
|
+
#
|
36
|
+
# @see Hyrax::Work
|
37
|
+
#
|
38
|
+
# @see Hyrax::CustomQueries::Navigators::ChildCollectionsNavigator#find_child_collections
|
39
|
+
# @see Hyrax::CustomQueries::Navigators::ChildWorksNavigator#find_child_works
|
40
|
+
# @see Hyrax::CustomQueries::Navigators::CollectionMembers#find_members_of
|
41
|
+
#
|
8
42
|
class PcdmCollection < Hyrax::Resource
|
9
43
|
include Hyrax::Schema(:core_metadata)
|
10
|
-
include Hyrax::Schema(:basic_metadata)
|
11
44
|
|
12
45
|
attribute :collection_type_gid, Valkyrie::Types::String
|
13
46
|
attribute :member_ids, Valkyrie::Types::Array.of(Valkyrie::Types::ID).meta(ordered: true)
|
@@ -32,5 +65,27 @@ module Hyrax
|
|
32
65
|
def pcdm_object?
|
33
66
|
true
|
34
67
|
end
|
68
|
+
|
69
|
+
def permission_manager
|
70
|
+
@permission_manager ||= Hyrax::PermissionManager.new(resource: self)
|
71
|
+
end
|
72
|
+
|
73
|
+
def visibility=(value)
|
74
|
+
visibility_writer.assign_access_for(visibility: value)
|
75
|
+
end
|
76
|
+
|
77
|
+
def visibility
|
78
|
+
visibility_reader.read
|
79
|
+
end
|
80
|
+
|
81
|
+
protected
|
82
|
+
|
83
|
+
def visibility_writer
|
84
|
+
Hyrax::VisibilityWriter.new(resource: self)
|
85
|
+
end
|
86
|
+
|
87
|
+
def visibility_reader
|
88
|
+
Hyrax::VisibilityReader.new(resource: self)
|
89
|
+
end
|
35
90
|
end
|
36
91
|
end
|
@@ -4,7 +4,7 @@ module Hyrax
|
|
4
4
|
# Holds policy data about the workflow and permissions applied objects when
|
5
5
|
# they are deposited through an Administrative Set or a Collection. Each
|
6
6
|
# template record has a {#source} (through {#source_id}); the template's
|
7
|
-
# rules inform the behavior of objects deposited through that {#
|
7
|
+
# rules inform the behavior of objects deposited through that {#source}.
|
8
8
|
#
|
9
9
|
# The {PermissionTemplate} specifies:
|
10
10
|
#
|
@@ -81,36 +81,16 @@ module Hyrax
|
|
81
81
|
# A bit of an analogue for a `belongs_to :source_model` as it crosses from Fedora to the DB
|
82
82
|
# @return [AdminSet, ::Collection]
|
83
83
|
# @raise [Hyrax::ObjectNotFoundError] when neither an AdminSet or Collection is found
|
84
|
+
# @note This method will eventually be replaced by #source which returns a Hyrax::Resource
|
85
|
+
# object. Many methods are equally able to process both Hyrax::Resource and
|
86
|
+
# ActiveFedora::Base. Only call this method if you need the ActiveFedora::Base object.
|
87
|
+
# @see #source
|
84
88
|
def source_model
|
85
89
|
ActiveFedora::Base.find(source_id)
|
86
90
|
rescue ActiveFedora::ObjectNotFoundError
|
87
91
|
raise Hyrax::ObjectNotFoundError
|
88
92
|
end
|
89
93
|
|
90
|
-
# A bit of an analogue for a `belongs_to :admin_set` as it crosses from Fedora to the DB
|
91
|
-
# @deprecated Use #source_model instead
|
92
|
-
# @return [AdminSet]
|
93
|
-
# @raise [Hyrax::ObjectNotFoundError] when the we cannot find the AdminSet
|
94
|
-
def admin_set
|
95
|
-
Deprecation.warn('Use #source_model instead')
|
96
|
-
return AdminSet.find(source_id) if AdminSet.exists?(source_id)
|
97
|
-
raise Hyrax::ObjectNotFoundError
|
98
|
-
rescue ActiveFedora::ActiveFedoraError # TODO: remove the rescue when active_fedora issue #1276 is fixed
|
99
|
-
raise Hyrax::ObjectNotFoundError
|
100
|
-
end
|
101
|
-
|
102
|
-
# A bit of an analogue for a `belongs_to :collection` as it crosses from Fedora to the DB
|
103
|
-
# @deprecated Use #source_model instead
|
104
|
-
# @return [Collection]
|
105
|
-
# @raise [Hyrax::ObjectNotFoundError] when the we cannot find the Collection
|
106
|
-
def collection
|
107
|
-
Deprecation.warn('Use #source_model instead')
|
108
|
-
return ::Collection.find(source_id) if ::Collection.exists?(source_id)
|
109
|
-
raise Hyrax::ObjectNotFoundError
|
110
|
-
rescue ActiveFedora::ActiveFedoraError # TODO: remove the rescue when active_fedora issue #1276 is fixed
|
111
|
-
raise Hyrax::ObjectNotFoundError
|
112
|
-
end
|
113
|
-
|
114
94
|
# Valid Release Period values
|
115
95
|
RELEASE_TEXT_VALUE_FIXED = 'fixed'
|
116
96
|
RELEASE_TEXT_VALUE_NO_DELAY = 'now'
|
@@ -215,15 +195,6 @@ module Hyrax
|
|
215
195
|
[::Ability.registered_group_name, ::Ability.public_group_name]
|
216
196
|
end
|
217
197
|
|
218
|
-
##
|
219
|
-
# @param interpret_visibility [Boolean] whether to retain the existing
|
220
|
-
# visibility when applying permission template ACLs
|
221
|
-
# @return [Boolean]
|
222
|
-
def reset_access_controls(interpret_visibility: false)
|
223
|
-
reset_access_controls_for(collection: source_model,
|
224
|
-
interpret_visibility: interpret_visibility)
|
225
|
-
end
|
226
|
-
|
227
198
|
##
|
228
199
|
# @param collection [::Collection, Hyrax::Resource]
|
229
200
|
# @param interpret_visibility [Boolean] whether to retain the existing
|
data/app/models/hyrax/work.rb
CHANGED
@@ -4,6 +4,97 @@ module Hyrax
|
|
4
4
|
##
|
5
5
|
# Valkyrie model for `Work` domain objects in the Hydra Works model.
|
6
6
|
#
|
7
|
+
# ## Relationships
|
8
|
+
#
|
9
|
+
# ### Administrative Set and Work
|
10
|
+
#
|
11
|
+
# * Defined: The relationship is defined by the work's `:admin_set_id` attribute.
|
12
|
+
# * Tested: The relationship is tested in shared spec `'a Hyrax::Work'` by testing
|
13
|
+
# `#admin_set_id`. Shared specs are defined in /lib/hyrax/specs/shared_specs/hydra_works.rb.
|
14
|
+
# * Administrative Set to Work: (1..m) An admin set can have many works.
|
15
|
+
# * See Hyrax::AdministrativeSet for code to get works in an admin set.
|
16
|
+
# * Work to Administrative Set: (1..1) A work must be in one and only one admin set.
|
17
|
+
#
|
18
|
+
# @example Set admin set for a work:
|
19
|
+
# work.admin_set_id = admin_set.id
|
20
|
+
# @example Get admin set a work is in:
|
21
|
+
# admin_set = Hyrax.query_service.find_by(id: work.admin_set_id)
|
22
|
+
#
|
23
|
+
# ### Collection and Work
|
24
|
+
#
|
25
|
+
# * Defined: The relationship is defined by the work's `:member_of_collection_ids` attribute.
|
26
|
+
# * Tested: The relationship is tested in shared spec `'a Hyrax::Work'` by testing
|
27
|
+
# `it_behaves_like 'belongs to collections'`. Shared specs are defined in /lib/hyrax/specs/shared_specs/hydra_works.rb.
|
28
|
+
# * Collection to Work: (0..m) A collection can have many works.
|
29
|
+
# * See Hyrax::PcdmCollection for code to get works in a collection.
|
30
|
+
# * Work to Collection: (0..m) A work can be in many collections.
|
31
|
+
#
|
32
|
+
# @example Add a work to a collection using Hyrax::CollectionMemberService (multiple method options)
|
33
|
+
# Hyrax::CollectionMemberService.add_members(collection_id: col.id, members: works, user: current_user)
|
34
|
+
# @example Get collections a work is in:
|
35
|
+
# collections = Hyrax.custom_queries.find_collections_for(resource: work)
|
36
|
+
#
|
37
|
+
# @note Some collection types limit a work to belong to one and only one collection of that type.
|
38
|
+
#
|
39
|
+
# ### Work and Work
|
40
|
+
#
|
41
|
+
# * Defined: The relationship is defined in the parent work's `:member_ids` attribute.
|
42
|
+
# * Tested: The relationship is tested in shared spec `'a Hyrax::Work'` by testing
|
43
|
+
# `it_behaves_like 'has_members'`. Shared specs are defined in /lib/hyrax/specs/shared_specs/hydra_works.rb.
|
44
|
+
# * Work to child Work: (0..m) A work can have many child works.
|
45
|
+
#
|
46
|
+
# @example Add a child work to a work:
|
47
|
+
# Hyrax::Transactions::Container['work_resource.add_to_parent']
|
48
|
+
# .call(child_work, parent_id: parent_work.id, user: current_user)
|
49
|
+
# @example Get child works:
|
50
|
+
# works = Hyrax.custom_queries.find_child_works(resource: parent_work)
|
51
|
+
#
|
52
|
+
# * Work to parent Work: (0..1) A work can be in at most one parent work.
|
53
|
+
#
|
54
|
+
# @example Get parent work:
|
55
|
+
# parent_work = Hyrax.custom_queries.find_parent_work(resource: child_work)
|
56
|
+
#
|
57
|
+
# @note `:member_ids` holds ids of child works and file sets.
|
58
|
+
#
|
59
|
+
# ### Work and File Set
|
60
|
+
#
|
61
|
+
# * Defined: The relationship is defined in the parent work's `:member_ids` attribute.
|
62
|
+
# * Tested: The relationship is tested in shared spec `'a Hyrax::Work'` by testing
|
63
|
+
# `it_behaves_like 'has_members'`. Shared specs are defined in /lib/hyrax/specs/shared_specs/hydra_works.rb.
|
64
|
+
# * Work to File Set: (0..m) A work can have many file sets.
|
65
|
+
# @example Add a file set to a work (code from Hyrax::WorkUploadsHandler#append_to_work)
|
66
|
+
# work.member_ids << file_set.id
|
67
|
+
# work.representative_id = file_set.id if work.respond_to?(:representative_id) && work.representative_id.blank?
|
68
|
+
# work.thumbnail_id = file_set.id if work.respond_to?(:thumbnail_id) && work.thumbnail_id.blank?
|
69
|
+
# Hyrax.persister.save(resource: work)
|
70
|
+
# Hyrax.publisher.publish('object.metadata.updated', object: work, user: files.first.user)
|
71
|
+
# @example Get file sets:
|
72
|
+
# file_sets = Hyrax.custom_queries.find_child_file_sets(resource: work)
|
73
|
+
#
|
74
|
+
# * File Set to Work: (1..1) A file set must be in one and only one work.
|
75
|
+
# * See Hyrax::FileSet for code to get the work a file set is in.
|
76
|
+
#
|
77
|
+
# @see Hyrax::AdministrativeSet
|
78
|
+
# @see Hyrax::PcdmCollection
|
79
|
+
# @see Hyrax::FileSet
|
80
|
+
#
|
81
|
+
# @see Hyrax::CollectionMemberService
|
82
|
+
# @see Hyrax::Transactions::Steps::AddToParent
|
83
|
+
# @see Hyrax::Transactions::Steps::AddFileSets
|
84
|
+
# @see Hyrax::WorksControllerBehavior
|
85
|
+
# @see Hyrax::WorkUploadsHandler#append_to_work
|
86
|
+
#
|
87
|
+
# @see Valkyrie query adapter's #find_by
|
88
|
+
# @see Hyrax::CustomQueries::Navigators::CollectionMembers#find_collections_for
|
89
|
+
# @see Hyrax::CustomQueries::Navigators::ParentWorkNavigator#find_parent_work
|
90
|
+
# @see Hyrax::CustomQueries::Navigators::ChildFileSetsNavigator#find_child_file_sets
|
91
|
+
#
|
92
|
+
# @see /lib/hyrax/specs/shared_specs/hydra_works.rb
|
93
|
+
#
|
94
|
+
# @todo The description in Hydra::Works Shared Modeling is out of date and uses
|
95
|
+
# terminology to describe the relationships that is no longer used in code.
|
96
|
+
# Update the model and link to it. This can be a simple relationship diagram
|
97
|
+
# with a link to the original Works Shared Modeling for historical perspective.
|
7
98
|
# @see https://wiki.lyrasis.org/display/samvera/Hydra::Works+Shared+Modeling
|
8
99
|
class Work < Hyrax::Resource
|
9
100
|
include Hyrax::Schema(:core_metadata)
|
@@ -94,7 +94,7 @@ class JobIoWrapper < ApplicationRecord
|
|
94
94
|
|
95
95
|
def extracted_original_name
|
96
96
|
eon = uploaded_file.uploader.filename if uploaded_file
|
97
|
-
eon ||= File.basename(path) if path.present? #
|
97
|
+
eon ||= File.basename(path) if path.present? # NOTE: uploader.filename is `nil` with uncached remote files (e.g. AWSFile)
|
98
98
|
eon
|
99
99
|
end
|
100
100
|
|
@@ -129,7 +129,7 @@ class ProxyDepositRequest < ActiveRecord::Base
|
|
129
129
|
|
130
130
|
# @param [TrueClass,FalseClass] reset (false) if true, reset the access controls. This revokes edit access from the depositor
|
131
131
|
def transfer!(reset = false)
|
132
|
-
|
132
|
+
Hyrax::ChangeDepositorService.call(work, receiving_user, reset)
|
133
133
|
fulfill!(status: ACCEPTED)
|
134
134
|
end
|
135
135
|
|