hyrax 2.0.3 → 2.1.0.beta1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.eslintrc +0 -1
- data/.github/CONTRIBUTING.md +1 -1
- data/.rubocop.yml +8 -4
- data/.rubocop_fixme.yml +20 -2
- data/.travis.yml +3 -3
- data/README.md +12 -4
- data/app/actors/hyrax/actors/abstract_actor.rb +1 -1
- data/app/actors/hyrax/actors/apply_permission_template_actor.rb +17 -1
- data/app/actors/hyrax/actors/attach_members_actor.rb +2 -2
- data/app/actors/hyrax/actors/collections_membership_actor.rb +147 -12
- data/app/actors/hyrax/actors/create_with_remote_files_actor.rb +15 -9
- data/app/actors/hyrax/actors/default_admin_set_actor.rb +3 -3
- data/app/actors/hyrax/actors/file_set_actor.rb +10 -6
- data/app/actors/hyrax/actors/interpret_visibility_actor.rb +1 -1
- data/app/assets/javascripts/hyrax.js +13 -7
- data/app/assets/javascripts/hyrax/admin/admin_set_controls.es6 +5 -3
- data/app/assets/javascripts/hyrax/admin/collection_type/participants.es6 +13 -0
- data/app/assets/javascripts/hyrax/admin/collection_type/settings.es6 +60 -0
- data/app/assets/javascripts/hyrax/admin/collection_type_controls.es6 +15 -0
- data/app/assets/javascripts/hyrax/app.js.erb +29 -7
- data/app/assets/javascripts/hyrax/autocomplete.es6 +10 -5
- data/app/assets/javascripts/hyrax/autocomplete/default.es6 +1 -1
- data/app/assets/javascripts/hyrax/autocomplete/linked_data.es6 +1 -1
- data/app/assets/javascripts/hyrax/autocomplete/{work.es6 → resource.es6} +10 -4
- data/app/assets/javascripts/hyrax/collection_types.es6 +65 -0
- data/app/assets/javascripts/hyrax/collections.js +168 -3
- data/app/assets/javascripts/hyrax/collections/editor.es6 +7 -1
- data/app/assets/javascripts/hyrax/collections_forms.js +108 -0
- data/app/assets/javascripts/hyrax/editor.es6 +17 -3
- data/app/assets/javascripts/hyrax/fileupload.js +1 -0
- data/app/assets/javascripts/hyrax/relationships.js +2 -1
- data/app/assets/javascripts/hyrax/relationships/confirm_remove_dialog.es6 +45 -0
- data/app/assets/javascripts/hyrax/relationships/control.es6 +25 -10
- data/app/assets/javascripts/hyrax/relationships/registry.es6 +28 -25
- data/app/assets/javascripts/hyrax/relationships/registry_entry.es6 +40 -33
- data/app/assets/javascripts/hyrax/relationships/resource.es6 +10 -0
- data/app/assets/javascripts/hyrax/select_collection_type.es6 +39 -0
- data/app/assets/javascripts/hyrax/{per_page.es6 → sort_and_per_page.es6} +1 -1
- data/app/assets/javascripts/hyrax/tabbed_form.es6 +35 -0
- data/app/assets/stylesheets/_bootstrap-default-overrides.scss +15 -0
- data/app/assets/stylesheets/fileupload/jquery.fileupload-ui.scss +6 -0
- data/app/assets/stylesheets/hyrax/_accessibility.scss +16 -0
- data/app/assets/stylesheets/hyrax/_catalog.scss +88 -1
- data/app/assets/stylesheets/hyrax/_collection_types.scss +53 -0
- data/app/assets/stylesheets/hyrax/_collections.scss +616 -22
- data/app/assets/stylesheets/hyrax/_featured.scss +16 -0
- data/app/assets/stylesheets/hyrax/_file-listing.scss +9 -2
- data/app/assets/stylesheets/hyrax/_forms.scss +46 -0
- data/app/assets/stylesheets/hyrax/_home-page.scss +10 -0
- data/app/assets/stylesheets/hyrax/_hyrax.scss +3 -2
- data/app/assets/stylesheets/hyrax/_positioning.scss +0 -11
- data/app/assets/stylesheets/hyrax/_recent.scss +26 -0
- data/app/assets/stylesheets/hyrax/_representative-media.scss +7 -0
- data/app/assets/stylesheets/hyrax/_select_collection_type.scss +45 -0
- data/app/assets/stylesheets/hyrax/_select_work_type.scss +0 -4
- data/app/assets/stylesheets/hyrax/_styles.scss +2 -17
- data/app/assets/stylesheets/hyrax/_variables.scss +2 -2
- data/app/assets/stylesheets/hyrax/_viewer.scss +8 -0
- data/app/assets/stylesheets/hyrax/_work-show.scss +44 -6
- data/app/assets/stylesheets/hyrax/dashboard.scss +7 -2
- data/app/authorities/qa/authorities/collections.rb +30 -0
- data/app/builders/hyrax/manifest_helper.rb +36 -0
- data/app/controllers/concerns/hyrax/admin/stats_behavior.rb +1 -1
- data/app/controllers/concerns/hyrax/admin/users_controller_behavior.rb +1 -1
- data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +37 -40
- data/app/controllers/concerns/hyrax/controller.rb +0 -9
- data/app/controllers/concerns/hyrax/themed_layout_controller.rb +4 -1
- data/app/controllers/concerns/hyrax/works_controller_behavior.rb +22 -11
- data/app/controllers/hyrax/admin/admin_sets_controller.rb +24 -15
- data/app/controllers/hyrax/admin/appearances_controller.rb +1 -1
- data/app/controllers/hyrax/admin/collection_type_participants_controller.rb +44 -0
- data/app/controllers/hyrax/admin/collection_types_controller.rb +97 -0
- data/app/controllers/hyrax/admin/features_controller.rb +1 -1
- data/app/controllers/hyrax/admin/permission_template_accesses_controller.rb +55 -13
- data/app/controllers/hyrax/admin/permission_templates_controller.rb +66 -23
- data/app/controllers/hyrax/admin/workflow_roles_controller.rb +1 -1
- data/app/controllers/hyrax/admin/workflows_controller.rb +1 -1
- data/app/controllers/hyrax/batch_edits_controller.rb +1 -1
- data/app/controllers/hyrax/batch_uploads_controller.rb +1 -1
- data/app/controllers/hyrax/citations_controller.rb +3 -12
- data/app/controllers/hyrax/collections_controller.rb +8 -9
- data/app/controllers/hyrax/content_blocks_controller.rb +1 -1
- data/app/controllers/hyrax/dashboard/collection_members_controller.rb +73 -0
- data/app/controllers/hyrax/dashboard/collections_controller.rb +210 -54
- data/app/controllers/hyrax/dashboard/nest_collections_controller.rb +106 -0
- data/app/controllers/hyrax/dashboard/profiles_controller.rb +1 -1
- data/app/controllers/hyrax/dashboard/works_controller.rb +1 -9
- data/app/controllers/hyrax/dashboard_controller.rb +1 -1
- data/app/controllers/hyrax/file_sets_controller.rb +7 -75
- data/app/controllers/hyrax/my/collections_controller.rb +26 -1
- data/app/controllers/hyrax/my/works_controller.rb +16 -1
- data/app/controllers/hyrax/my_controller.rb +5 -19
- data/app/controllers/hyrax/notifications_controller.rb +1 -1
- data/app/controllers/hyrax/pages_controller.rb +3 -2
- data/app/controllers/hyrax/stats_controller.rb +3 -0
- data/app/controllers/hyrax/transfers_controller.rb +1 -1
- data/app/forms/hyrax/forms/admin/appearance.rb +2 -2
- data/app/forms/hyrax/forms/admin/collection_type_form.rb +24 -0
- data/app/forms/hyrax/forms/admin/collection_type_participant_form.rb +16 -0
- data/app/forms/hyrax/forms/admin_set_form.rb +1 -1
- data/app/forms/hyrax/forms/batch_edit_form.rb +28 -7
- data/app/forms/hyrax/forms/collection_form.rb +71 -13
- data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb +98 -0
- data/app/forms/hyrax/forms/permission_template_form.rb +13 -13
- data/app/forms/hyrax/forms/work_form.rb +58 -14
- data/app/helpers/hyrax/ability_helper.rb +3 -0
- data/app/helpers/hyrax/citations_behaviors/formatters/chicago_formatter.rb +3 -10
- data/app/helpers/hyrax/collections_helper.rb +10 -2
- data/app/helpers/hyrax/dashboard_helper_behavior.rb +0 -4
- data/app/helpers/hyrax/hyrax_helper_behavior.rb +19 -5
- data/app/helpers/hyrax/trophy_helper.rb +0 -1
- data/app/indexers/hyrax/indexes_workflow.rb +1 -1
- data/app/indexers/hyrax/repository_reindexer.rb +19 -0
- data/app/jobs/hyrax/application_job.rb +1 -1
- data/app/jobs/import_export_job.rb +1 -1
- data/app/jobs/user_edit_profile_event_job.rb +1 -1
- data/app/models/admin_set.rb +5 -2
- data/app/models/collection_branding_info.rb +39 -0
- data/app/models/concerns/hyrax/ability.rb +26 -49
- data/app/models/concerns/hyrax/ability/admin_set_ability.rb +40 -0
- data/app/models/concerns/hyrax/ability/collection_ability.rb +40 -0
- data/app/models/concerns/hyrax/ability/collection_type_ability.rb +16 -0
- data/app/models/concerns/hyrax/ability/permission_template_ability.rb +18 -0
- data/app/models/concerns/hyrax/ability/solr_document_ability.rb +18 -0
- data/app/models/concerns/hyrax/collection_behavior.rb +86 -3
- data/app/models/concerns/hyrax/collection_nesting.rb +41 -0
- data/app/models/concerns/hyrax/file_set/belongs_to_works.rb +0 -15
- data/app/models/concerns/hyrax/file_set_behavior.rb +0 -1
- data/app/models/concerns/hyrax/has_rendering.rb +11 -0
- data/app/models/concerns/hyrax/human_readable_type.rb +3 -0
- data/app/models/concerns/hyrax/solr_document/metadata.rb +3 -0
- data/app/models/concerns/hyrax/solr_document_behavior.rb +8 -2
- data/app/models/concerns/hyrax/user.rb +11 -6
- data/app/models/concerns/hyrax/with_events.rb +12 -6
- data/app/models/concerns/hyrax/work_behavior.rb +3 -1
- data/app/models/hyrax/batch_create_operation.rb +1 -1
- data/app/models/hyrax/collection_type.rb +155 -0
- data/app/models/hyrax/collection_type_participant.rb +39 -0
- data/app/models/hyrax/operation.rb +14 -2
- data/app/models/hyrax/permission_template.rb +23 -1
- data/app/models/hyrax/permission_template_access.rb +56 -7
- data/app/models/hyrax/uploaded_file.rb +4 -1
- data/app/models/sipity/workflow.rb +6 -4
- data/app/presenters/hyrax/admin/workflow_role_presenter.rb +3 -3
- data/app/presenters/hyrax/admin_set_options_presenter.rb +1 -1
- data/app/presenters/hyrax/admin_set_presenter.rb +16 -0
- data/app/presenters/hyrax/collection_options_presenter.rb +1 -0
- data/app/presenters/hyrax/collection_presenter.rb +134 -6
- data/app/presenters/hyrax/displays_image.rb +39 -0
- data/app/presenters/hyrax/file_set_presenter.rb +1 -4
- data/app/presenters/hyrax/fixity_status_presenter.rb +2 -2
- data/app/presenters/hyrax/homepage_presenter.rb +20 -0
- data/app/presenters/hyrax/menu_presenter.rb +2 -1
- data/app/presenters/hyrax/select_collection_type_list_presenter.rb +42 -0
- data/app/presenters/hyrax/select_collection_type_presenter.rb +11 -0
- data/app/presenters/hyrax/select_type_presenter.rb +13 -4
- data/app/presenters/hyrax/work_show_presenter.rb +52 -1
- data/app/renderers/hyrax/renderers/attribute_renderer.rb +1 -1
- data/app/renderers/hyrax/renderers/license_attribute_renderer.rb +1 -1
- data/app/renderers/hyrax/renderers/rights_statement_attribute_renderer.rb +3 -2
- data/app/search_builders/hyrax/admin_admin_set_member_search_builder.rb +10 -1
- data/app/search_builders/hyrax/admin_set_search_builder.rb +9 -2
- data/app/search_builders/hyrax/collection_member_search_builder.rb +21 -8
- data/app/search_builders/hyrax/collection_search_builder.rb +37 -0
- data/app/search_builders/hyrax/dashboard/collections_search_builder.rb +42 -0
- data/app/search_builders/hyrax/dashboard/managed_search_filters.rb +24 -0
- data/app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb +123 -0
- data/app/search_builders/hyrax/dashboard/works_search_builder.rb +18 -0
- data/app/search_builders/hyrax/filter_suppressed_with_roles.rb +5 -1
- data/app/search_builders/hyrax/my/collections_search_builder.rb +20 -3
- data/app/search_builders/hyrax/nested_collections_parent_search_builder.rb +27 -0
- data/app/search_builders/hyrax/search_filters.rb +8 -0
- data/app/services/hyrax/adapters/nesting_index_adapter.rb +192 -0
- data/app/services/hyrax/admin_set_create_service.rb +3 -2
- data/app/services/hyrax/admin_set_member_service.rb +40 -0
- data/app/services/hyrax/batch_create_failure_service.rb +4 -3
- data/app/services/hyrax/collection_types/create_service.rb +143 -0
- data/app/services/hyrax/collection_types/permissions_service.rb +233 -0
- data/app/services/hyrax/collections/collection_member_service.rb +91 -0
- data/app/services/hyrax/collections/managed_collections_service.rb +16 -0
- data/app/services/hyrax/collections/migration_service.rb +81 -0
- data/app/services/hyrax/collections/nested_collection_persistence_service.rb +26 -0
- data/app/services/hyrax/collections/nested_collection_query_service.rb +187 -0
- data/app/services/hyrax/collections/permissions_create_service.rb +71 -0
- data/app/services/hyrax/collections/permissions_service.rb +234 -0
- data/app/services/hyrax/collections_service.rb +3 -3
- data/app/services/hyrax/default_middleware_stack.rb +35 -0
- data/app/services/hyrax/file_set_fixity_check_service.rb +1 -1
- data/app/services/hyrax/graph_exporter.rb +19 -15
- data/app/services/hyrax/iiif_authorization_service.rb +19 -0
- data/app/services/hyrax/multiple_membership_checker.rb +78 -0
- data/app/services/hyrax/noid.rb +1 -3
- data/app/services/hyrax/qa_select_service.rb +11 -2
- data/app/services/hyrax/workflow/status_list_service.rb +1 -1
- data/app/services/hyrax/working_directory.rb +0 -8
- data/app/services/hyrax/works/managed_works_service.rb +16 -0
- data/app/views/_flash_msg.html.erb +1 -1
- data/app/views/_masthead.html.erb +0 -1
- data/app/views/catalog/_document.html.erb +3 -1
- data/app/views/catalog/_document_list.html.erb +2 -2
- data/app/views/catalog/_index_header_list_collection.html.erb +4 -3
- data/app/views/catalog/_index_header_list_default.html.erb +3 -3
- data/app/views/catalog/_index_list_default.html.erb +29 -14
- data/app/views/catalog/_thumbnail_list_collection.html.erb +3 -4
- data/app/views/catalog/_thumbnail_list_default.html.erb +5 -3
- data/app/views/hyrax/admin/admin_sets/_form.html.erb +2 -1
- data/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb +1 -1
- data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb +1 -1
- data/app/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb +3 -3
- data/app/views/hyrax/admin/admin_sets/edit.html.erb +1 -1
- data/app/views/hyrax/admin/collection_types/_form.html.erb +61 -0
- data/app/views/hyrax/admin/collection_types/_form_metadata.html.erb +2 -0
- data/app/views/hyrax/admin/collection_types/_form_metadata_admin_set.html.erb +2 -0
- data/app/views/hyrax/admin/collection_types/_form_participant_table.html.erb +26 -0
- data/app/views/hyrax/admin/collection_types/_form_participants.html.erb +62 -0
- data/app/views/hyrax/admin/collection_types/_form_settings.html.erb +39 -0
- data/app/views/hyrax/admin/collection_types/edit.html.erb +10 -0
- data/app/views/hyrax/admin/collection_types/index.html.erb +88 -0
- data/app/views/hyrax/admin/collection_types/new.html.erb +10 -0
- data/app/views/hyrax/base/_attribute_rows.html.erb +1 -0
- data/app/views/hyrax/base/_citations.html.erb +10 -6
- data/app/views/hyrax/base/_form_child_work_relationships.html.erb +22 -29
- data/app/views/hyrax/base/_form_files.html.erb +29 -16
- data/app/views/hyrax/base/_form_media.html.erb +1 -0
- data/app/views/hyrax/base/_form_member_of_collections.html.erb +44 -6
- data/app/views/hyrax/base/_form_metadata.html.erb +0 -3
- data/app/views/hyrax/base/_form_progress.html.erb +2 -1
- data/app/views/hyrax/base/_form_relationships.html.erb +3 -2
- data/app/views/hyrax/base/_form_rendering.html.erb +14 -0
- data/app/views/hyrax/base/_form_representative.html.erb +2 -2
- data/app/views/hyrax/base/_form_share.html.erb +44 -41
- data/app/views/hyrax/base/_form_thumbnail.html.erb +2 -2
- data/app/views/hyrax/base/_guts4form.html.erb +2 -2
- data/app/views/hyrax/base/_member.html.erb +3 -4
- data/app/views/hyrax/base/_metadata.html.erb +1 -5
- data/app/views/hyrax/base/_relationships.html.erb +1 -1
- data/app/views/hyrax/base/_relationships_parent_row.html.erb +1 -1
- data/app/views/hyrax/base/_representative_media.html.erb +8 -2
- data/app/views/hyrax/base/_work_title.erb +14 -7
- data/app/views/hyrax/base/_work_type.html.erb +4 -0
- data/app/views/hyrax/base/_workflow_actions.html.erb +7 -7
- data/app/views/hyrax/base/_workflow_actions_widget.erb +4 -2
- data/app/views/hyrax/base/show.html.erb +35 -26
- data/app/views/hyrax/batch_edits/edit.html.erb +1 -1
- data/app/views/hyrax/collections/_collection_description.erb +1 -1
- data/app/views/hyrax/collections/_default_group.html.erb +9 -11
- data/app/views/hyrax/collections/_list_collections.html.erb +19 -12
- data/app/views/hyrax/collections/_paginate.html.erb +5 -4
- data/app/views/hyrax/collections/_search_form.html.erb +1 -1
- data/app/views/hyrax/collections/_search_results.html.erb +0 -2
- data/app/views/hyrax/collections/_show_descriptions.html.erb +7 -6
- data/app/views/hyrax/collections/_show_document_list.html.erb +3 -3
- data/app/views/hyrax/collections/_show_document_list_row.html.erb +3 -3
- data/app/views/hyrax/collections/_show_parent_collections.html.erb +41 -0
- data/app/views/hyrax/collections/_sort_and_per_page.html.erb +16 -24
- data/app/views/hyrax/collections/_subcollection_list.html.erb +13 -0
- data/app/views/hyrax/collections/_view_type_group.html.erb +1 -1
- data/app/views/hyrax/collections/show.html.erb +120 -31
- data/app/views/hyrax/dashboard/collections/_button_for_batch_delete_collection.html.erb +4 -0
- data/app/views/hyrax/dashboard/collections/_button_for_remove_selected_from_collection.html.erb +0 -1
- data/app/views/hyrax/dashboard/collections/_button_for_update_collection.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_button_remove_from_collection.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_collection_title.html.erb +25 -0
- data/app/views/hyrax/dashboard/collections/_document_list.html.erb +1 -5
- data/app/views/hyrax/dashboard/collections/_edit_actions.html.erb +2 -2
- data/app/views/hyrax/dashboard/collections/_flash_msg.html.erb +9 -0
- data/app/views/hyrax/dashboard/collections/_form.html.erb +46 -24
- data/app/views/hyrax/dashboard/collections/_form_branding.html.erb +153 -0
- data/app/views/hyrax/dashboard/collections/_form_default_group_delt.html.erb +27 -0
- data/app/views/hyrax/dashboard/collections/_form_discovery.html.erb +18 -0
- data/app/views/hyrax/dashboard/collections/_form_share.html.erb +69 -81
- data/app/views/hyrax/dashboard/collections/_form_share_table.html.erb +31 -0
- data/app/views/hyrax/dashboard/collections/_list_collections.html.erb +54 -37
- data/app/views/hyrax/dashboard/collections/_modal_remove_from_collection.html.erb +17 -0
- data/app/views/hyrax/dashboard/collections/_modal_remove_sub_collection.html.erb +17 -0
- data/app/views/hyrax/dashboard/collections/_show_actions.html.erb +27 -21
- data/app/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb +25 -0
- data/app/views/hyrax/dashboard/collections/_show_document_list.html.erb +4 -3
- data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb +6 -5
- data/app/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb +6 -0
- data/app/views/hyrax/dashboard/collections/_show_parent_collections.html.erb +37 -0
- data/app/views/hyrax/dashboard/collections/_show_subcollection_actions.html.erb +26 -0
- data/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb +28 -27
- data/app/views/hyrax/dashboard/collections/_subcollection_list.html.erb +21 -0
- data/app/views/hyrax/dashboard/collections/_work_action_menu.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/edit.html.erb +8 -31
- data/app/views/hyrax/dashboard/collections/new.html.erb +2 -3
- data/app/views/hyrax/dashboard/collections/show.html.erb +102 -35
- data/app/views/hyrax/dashboard/sidebar/_configuration.html.erb +5 -0
- data/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb +0 -5
- data/app/views/hyrax/dashboard/sidebar/_tasks.html.erb +10 -0
- data/app/views/hyrax/dashboard/works/_default_group.html.erb +1 -0
- data/app/views/hyrax/dashboard/works/_list_works.html.erb +4 -0
- data/app/views/hyrax/file_sets/_extra_fields_modal.html.erb +1 -1
- data/app/views/hyrax/file_sets/_form.html.erb +2 -2
- data/app/views/hyrax/file_sets/_show_characterization_details.html.erb +1 -1
- data/app/views/hyrax/file_sets/media_display/_image.html.erb +3 -5
- data/app/views/hyrax/file_sets/media_display/_office_document.html.erb +3 -5
- data/app/views/hyrax/file_sets/media_display/_pdf.html.erb +3 -5
- data/app/views/hyrax/homepage/_featured.html.erb +5 -5
- data/app/views/hyrax/homepage/_featured_fields.html.erb +10 -14
- data/app/views/hyrax/homepage/_featured_works.html.erb +1 -1
- data/app/views/hyrax/homepage/_home_content.html.erb +2 -2
- data/app/views/hyrax/homepage/_recent_document.html.erb +14 -12
- data/app/views/hyrax/homepage/_recently_uploaded.html.erb +2 -6
- data/app/views/hyrax/homepage/index.html.erb +4 -2
- data/app/views/hyrax/my/_admin_set_action_menu.html.erb +54 -0
- data/app/views/hyrax/my/_collection_action_menu.html.erb +41 -9
- data/app/views/hyrax/my/_facet_pivot.html.erb +26 -0
- data/app/views/hyrax/my/_search_header.html.erb +1 -15
- data/app/views/hyrax/my/_sort_and_per_page.html.erb +12 -13
- data/app/views/hyrax/my/_work_action_menu.html.erb +17 -15
- data/app/views/hyrax/my/collections/_batch_actions.html.erb +5 -0
- data/app/views/hyrax/my/collections/_default_group.html.erb +21 -12
- data/app/views/hyrax/my/collections/_list_collections.html.erb +57 -35
- data/app/views/hyrax/my/collections/_modal_add_subcollection.html.erb +38 -0
- data/app/views/hyrax/my/collections/_modal_add_to_collection.html.erb +31 -0
- data/app/views/hyrax/my/collections/_modal_add_to_collection_deny.html.erb +12 -0
- data/app/views/hyrax/my/collections/_modal_add_to_collection_permission_deny.html.erb +12 -0
- data/app/views/hyrax/my/collections/_modal_collection_types_to_create.html.erb +36 -0
- data/app/views/hyrax/my/collections/_modal_delete_admin_set_deny.html.erb +12 -0
- data/app/views/hyrax/my/collections/_modal_delete_collection.html.erb +19 -0
- data/app/views/hyrax/my/collections/_modal_delete_collection_deny.html.erb +14 -0
- data/app/views/hyrax/my/collections/_modal_delete_deny.html.erb +14 -0
- data/app/views/hyrax/my/collections/_modal_delete_empty_collection.html.erb +18 -0
- data/app/views/hyrax/my/collections/_modal_delete_selected_collections.html.erb +17 -0
- data/app/views/hyrax/my/collections/_modal_edit_deny.html.erb +14 -0
- data/app/views/hyrax/my/collections/_tabs.html.erb +3 -3
- data/app/views/hyrax/my/collections/index.html.erb +46 -21
- data/app/views/hyrax/my/works/_batch_actions.html.erb +14 -0
- data/app/views/hyrax/my/works/_default_group.html.erb +10 -12
- data/app/views/hyrax/my/works/_tabs.html.erb +1 -1
- data/app/views/hyrax/my/works/index.html.erb +7 -5
- data/app/views/hyrax/notifications/_notifications.html.erb +3 -3
- data/app/views/hyrax/permissions/confirm_access.html.erb +1 -1
- 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 +1 -1
- data/app/views/hyrax/transfers/_sent.html.erb +1 -1
- data/app/views/hyrax/uploads/_js_templates_branding.html.erb +120 -0
- data/app/views/hyrax/users/_activity_log.html.erb +3 -3
- data/app/views/kaminari/blacklight_compact/_paginator.html.erb +23 -0
- data/app/views/layouts/hyrax.html.erb +9 -11
- data/app/views/layouts/{dashboard.html.erb → hyrax/dashboard.html.erb} +0 -0
- data/app/views/shared/_select_work_type_modal.html.erb +25 -26
- data/config/features.rb +4 -0
- data/config/initializers/hyrax_callbacks.rb +2 -2
- data/config/initializers/samvera-nesting_indexer_initializer.rb +15 -0
- data/config/locales/hyrax.de.yml +364 -79
- data/config/locales/hyrax.en.yml +874 -584
- data/config/locales/hyrax.es.yml +323 -35
- data/config/locales/hyrax.fr.yml +323 -39
- data/config/locales/hyrax.it.yml +322 -39
- data/config/locales/hyrax.pt-BR.yml +317 -39
- data/config/locales/hyrax.zh.yml +420 -142
- data/config/routes.rb +17 -0
- data/hyrax.gemspec +58 -57
- data/lib/generators/hyrax/assets_generator.rb +2 -4
- data/lib/generators/hyrax/clamav_generator.rb +0 -2
- data/lib/generators/hyrax/config_generator.rb +0 -2
- data/lib/generators/hyrax/install_generator.rb +12 -3
- data/lib/generators/hyrax/riiif_generator.rb +54 -0
- data/lib/generators/hyrax/templates/app/assets/images/us_404.svg +91 -0
- data/lib/generators/hyrax/templates/config/initializers/hyrax.rb +48 -3
- data/lib/generators/hyrax/templates/config/initializers/riiif.rb +26 -0
- data/lib/generators/hyrax/templates/config/locales/hyrax.en.yml +4 -4
- data/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml +0 -4
- data/lib/generators/hyrax/templates/db/migrate/20170808160431_create_collection_types.rb.erb +17 -0
- data/lib/generators/hyrax/templates/db/migrate/20170808160432_update_collection_type_column_names.rb.erb +9 -0
- data/lib/generators/hyrax/templates/db/migrate/20170810190549_update_collection_type_column_options.rb.erb +9 -0
- data/lib/generators/hyrax/templates/db/migrate/20170816180307_create_collection_branding_infos.rb.erb +15 -0
- data/lib/generators/hyrax/templates/db/migrate/20170817152654_create_collection_type_participants.rb.erb +11 -0
- data/lib/generators/hyrax/templates/db/migrate/20170821152307_rename_admin_set_id_to_source_id.rb.erb +5 -0
- data/lib/generators/hyrax/templates/db/migrate/20171103080032_add_collection_type_sharing_options.rb.erb +5 -0
- data/lib/generators/hyrax/templates/db/seeds.rb +226 -22
- data/lib/generators/hyrax/work/templates/controller.rb.erb +1 -1
- data/lib/generators/hyrax/work/templates/feature_spec.rb.erb +37 -1
- data/lib/generators/hyrax/work/templates/form.rb.erb +1 -0
- data/lib/generators/hyrax/work/templates/indexer.rb.erb +0 -1
- data/lib/generators/hyrax/work/templates/locale.de.yml.erb +1 -1
- data/lib/generators/hyrax/work/templates/locale.en.yml.erb +1 -1
- data/lib/generators/hyrax/work/templates/locale.es.yml.erb +1 -1
- data/lib/generators/hyrax/work/templates/locale.fr.yml.erb +1 -1
- data/lib/generators/hyrax/work/templates/locale.it.yml.erb +1 -1
- data/lib/generators/hyrax/work/templates/locale.pt-BR.yml.erb +1 -1
- data/lib/generators/hyrax/work/templates/locale.zh.yml.erb +1 -1
- data/lib/generators/hyrax/work/templates/model.rb.erb +0 -2
- data/lib/hyrax.rb +1 -1
- data/lib/hyrax/configuration.rb +96 -7
- data/lib/hyrax/engine.rb +5 -4
- data/lib/hyrax/rails/routes.rb +1 -1
- data/lib/hyrax/version.rb +1 -1
- data/lib/tasks/default_admin_set.rake +5 -3
- data/lib/tasks/default_collection_type.rake +19 -0
- data/lib/tasks/migrate.rake +8 -0
- data/spec/abilities/ability_spec.rb +4 -1
- data/spec/abilities/admin_set_ability_spec.rb +172 -0
- data/spec/abilities/collection_ability_spec.rb +194 -0
- data/spec/abilities/collection_type_ability_spec.rb +72 -0
- data/spec/abilities/file_set_abilities_spec.rb +3 -3
- data/spec/abilities/generic_work_abilities_spec.rb +5 -5
- data/spec/abilities/permission_template_ability_spec.rb +145 -0
- data/spec/abilities/solr_document_ability_spec.rb +27 -0
- data/spec/actors/hyrax/actors/apply_permission_template_actor_spec.rb +96 -28
- data/spec/actors/hyrax/actors/collections_membership_actor_spec.rb +283 -15
- data/spec/actors/hyrax/actors/create_with_remote_files_actor_spec.rb +7 -7
- data/spec/actors/hyrax/actors/default_admin_set_actor_spec.rb +1 -1
- data/spec/actors/hyrax/actors/file_actor_spec.rb +0 -1
- data/spec/actors/hyrax/actors/file_set_actor_spec.rb +8 -6
- data/spec/actors/hyrax/actors/generic_work_actor_spec.rb +11 -39
- data/spec/actors/hyrax/actors/interpret_visibility_actor_spec.rb +15 -15
- data/spec/actors/hyrax/actors/model_actor_spec.rb +0 -2
- data/spec/authorities/qa/authorities/collections_spec.rb +68 -0
- data/spec/channels/hyrax/application_cable/channel_spec.rb +1 -1
- data/spec/channels/hyrax/application_cable/connection_spec.rb +1 -1
- data/spec/channels/hyrax/notifications_channel_spec.rb +1 -1
- data/spec/controllers/catalog_controller_spec.rb +1 -1
- data/spec/controllers/hyrax/admin/admin_sets_controller_spec.rb +27 -1
- data/spec/controllers/hyrax/admin/collection_type_participants_controller_spec.rb +152 -0
- data/spec/controllers/hyrax/admin/collection_types_controller_spec.rb +320 -0
- data/spec/controllers/hyrax/admin/permission_template_accesses_controller_spec.rb +68 -29
- data/spec/controllers/hyrax/admin/permission_templates_controller_spec.rb +37 -10
- data/spec/controllers/hyrax/admin/strategies_controller_spec.rb +2 -13
- data/spec/controllers/hyrax/admin/workflow_roles_controller_spec.rb +52 -2
- data/spec/controllers/hyrax/batch_edits_controller_spec.rb +75 -4
- data/spec/controllers/hyrax/batch_uploads_controller_spec.rb +2 -2
- data/spec/controllers/hyrax/collections_controller_spec.rb +15 -6
- data/spec/controllers/hyrax/content_blocks_controller_spec.rb +5 -5
- data/spec/controllers/hyrax/dashboard/collection_members_controller_spec.rb +408 -0
- data/spec/controllers/hyrax/dashboard/collections_controller_spec.rb +114 -18
- data/spec/controllers/hyrax/dashboard/nest_collections_controller_spec.rb +360 -0
- data/spec/controllers/hyrax/dashboard/profiles_controller_spec.rb +2 -2
- data/spec/controllers/hyrax/dashboard/works_controller_spec.rb +1 -1
- data/spec/controllers/hyrax/downloads_controller_spec.rb +3 -3
- data/spec/controllers/hyrax/featured_work_lists_controller_spec.rb +2 -2
- data/spec/controllers/hyrax/file_sets_controller_spec.rb +8 -136
- data/spec/controllers/hyrax/fixity_checks_controller_spec.rb +1 -1
- data/spec/controllers/hyrax/generic_works_controller_spec.rb +64 -2
- data/spec/controllers/hyrax/homepage_controller_spec.rb +1 -1
- data/spec/controllers/hyrax/my/works_controller_spec.rb +4 -1
- data/spec/controllers/hyrax/pages_controller_spec.rb +11 -11
- data/spec/controllers/hyrax/users_controller_spec.rb +1 -1
- data/spec/controllers/hyrax/workflow_actions_controller_spec.rb +1 -1
- data/spec/conversions/power_converters/polymorphic_type_spec.rb +2 -2
- data/spec/conversions/power_converters/sipity_agent_spec.rb +1 -1
- data/spec/conversions/power_converters/sipity_role_spec.rb +1 -1
- data/spec/conversions/power_converters/sipity_workflow_state_spec.rb +1 -1
- data/spec/factories/admin_sets.rb +3 -3
- data/spec/factories/collection_branding_infos.rb +11 -0
- data/spec/factories/collection_type_participants.rb +8 -0
- data/spec/factories/collection_types.rb +104 -0
- data/spec/factories/collections.rb +323 -0
- data/spec/factories/collections_factory.rb +106 -3
- data/spec/factories/file_sets.rb +2 -2
- data/spec/factories/generic_works.rb +22 -14
- data/spec/factories/object_id.rb +6 -0
- data/spec/factories/permission_templates.rb +46 -8
- data/spec/factories/users.rb +1 -1
- data/spec/factory_tests/collections_factory_spec.rb +211 -0
- data/spec/features/admin_spec.rb +1 -1
- data/spec/features/batch_create_spec.rb +1 -1
- data/spec/features/batch_edit_spec.rb +0 -1
- data/spec/features/browse_catalog_spec.rb +1 -3
- data/spec/features/browse_dashboard_works_spec.rb +0 -1
- data/spec/features/collection_multi_membership_spec.rb +188 -0
- data/spec/features/collection_spec.rb +45 -7
- data/spec/features/collection_type_spec.rb +338 -0
- data/spec/features/create_child_work_spec.rb +1 -1
- data/spec/features/create_work_admin_spec.rb +44 -0
- data/spec/features/create_work_spec.rb +1 -1
- data/spec/features/dashboard/all_works.rb +1 -1
- data/spec/features/dashboard/collection_spec.rb +724 -115
- data/spec/features/delete_work_spec.rb +1 -1
- data/spec/features/edit_file_spec.rb +1 -1
- data/spec/features/edit_work_spec.rb +1 -1
- data/spec/features/embargo_spec.rb +1 -1
- data/spec/features/homepage_spec.rb +3 -3
- data/spec/features/lease_spec.rb +1 -1
- data/spec/features/notifications_spec.rb +2 -2
- data/spec/features/ownership_transfer_spec.rb +1 -2
- data/spec/features/proxy_spec.rb +1 -1
- data/spec/features/search_spec.rb +12 -11
- data/spec/features/static_pages_spec.rb +1 -1
- data/spec/features/users_spec.rb +1 -1
- data/spec/features/work_generator_spec.rb +1 -1
- data/spec/features/work_show_spec.rb +4 -4
- data/spec/features/workflow_roles_spec.rb +1 -1
- data/spec/features/workflow_state_changes_spec.rb +2 -2
- data/spec/forms/hyrax/forms/admin/collection_type_form_spec.rb +106 -0
- data/spec/forms/hyrax/forms/admin/collection_type_participant_form_spec.rb +10 -0
- data/spec/forms/hyrax/forms/admin_set_form_spec.rb +1 -1
- data/spec/forms/hyrax/forms/batch_edit_form_spec.rb +1 -1
- data/spec/forms/hyrax/forms/batch_upload_form_spec.rb +1 -0
- data/spec/forms/hyrax/forms/collection_form_spec.rb +52 -4
- data/spec/forms/hyrax/forms/dashboard/nest_collection_form_spec.rb +159 -0
- data/spec/forms/hyrax/forms/permission_template_form_spec.rb +15 -12
- data/spec/forms/hyrax/forms/work_form_spec.rb +61 -12
- data/spec/forms/hyrax/forms/workflow_action_form_spec.rb +1 -1
- data/spec/forms/hyrax/generic_work_form_spec.rb +6 -3
- data/spec/helpers/hyrax/ability_helper_spec.rb +11 -0
- data/spec/helpers/hyrax/collections_helper_spec.rb +17 -39
- data/spec/helpers/hyrax/content_block_helper_spec.rb +1 -1
- data/spec/helpers/{dashboard_helper_spec.rb → hyrax/dashboard_helper_behavior_spec.rb} +1 -12
- data/spec/helpers/hyrax/trophy_helper_spec.rb +1 -1
- data/spec/helpers/hyrax_helper_spec.rb +0 -3
- data/spec/indexers/hyrax/generic_work_indexer_spec.rb +4 -4
- data/spec/indexers/hyrax/repository_reindexer_spec.rb +8 -0
- data/spec/javascripts/relationships_control_spec.js.coffee +3 -3
- data/spec/javascripts/settings_spec.js +73 -0
- data/spec/jobs/user_edit_profile_event_job_spec.rb +1 -1
- data/spec/lib/hyrax/configuration_spec.rb +16 -0
- data/spec/models/admin_set_spec.rb +42 -4
- data/spec/models/collection_branding_info_spec.rb +61 -0
- data/spec/models/collection_spec.rb +228 -3
- data/spec/models/concerns/hyrax/collection_nesting_spec.rb +64 -0
- data/spec/models/file_set_spec.rb +4 -4
- data/spec/models/generic_work_spec.rb +1 -1
- data/spec/models/hyrax/batch_create_operation_spec.rb +59 -0
- data/spec/models/hyrax/collection_type_participant_spec.rb +43 -0
- data/spec/models/hyrax/collection_type_spec.rb +235 -0
- data/spec/models/hyrax/operation_spec.rb +27 -1
- data/spec/models/hyrax/permission_template_access_spec.rb +128 -5
- data/spec/models/hyrax/permission_template_spec.rb +85 -29
- data/spec/models/hyrax/user_usage_stats_spec.rb +1 -1
- data/spec/models/hyrax/work_behavior_spec.rb +12 -2
- data/spec/models/sipity/agent_spec.rb +1 -1
- data/spec/models/sipity/comment_spec.rb +1 -1
- data/spec/models/sipity/entity_spec.rb +3 -3
- data/spec/models/sipity/entity_specific_responsibility_spec.rb +1 -1
- data/spec/models/sipity/notifiable_context_spec.rb +1 -1
- data/spec/models/sipity/notification_recipient_spec.rb +1 -1
- data/spec/models/sipity/notification_spec.rb +1 -1
- data/spec/models/sipity/role_spec.rb +1 -1
- data/spec/models/sipity/workflow_action_spec.rb +1 -1
- data/spec/models/sipity/workflow_responsibility_spec.rb +1 -1
- data/spec/models/sipity/workflow_role_spec.rb +1 -1
- data/spec/models/sipity/workflow_spec.rb +7 -7
- data/spec/models/sipity/workflow_state_action_permission_spec.rb +1 -1
- data/spec/models/sipity/workflow_state_action_spec.rb +1 -1
- data/spec/models/sipity/workflow_state_spec.rb +1 -1
- data/spec/models/solr_document_spec.rb +24 -0
- data/spec/models/user_mailbox_spec.rb +0 -2
- data/spec/models/user_spec.rb +7 -7
- data/spec/presenters/hyrax/admin/users_presenter_spec.rb +2 -2
- data/spec/presenters/hyrax/admin_set_options_presenter_spec.rb +7 -7
- data/spec/presenters/hyrax/admin_set_presenter_spec.rb +20 -0
- data/spec/presenters/hyrax/collection_options_presenter_spec.rb +2 -0
- data/spec/presenters/hyrax/collection_presenter_spec.rb +375 -6
- data/spec/presenters/hyrax/file_set_presenter_spec.rb +124 -5
- data/spec/presenters/hyrax/inspect_work_presenter_spec.rb +1 -1
- data/spec/presenters/hyrax/menu_presenter_spec.rb +5 -0
- data/spec/presenters/hyrax/select_collection_type_list_presenter_spec.rb +59 -0
- data/spec/presenters/hyrax/select_collection_type_presenter_spec.rb +10 -0
- data/spec/presenters/hyrax/select_type_presenter_spec.rb +12 -0
- data/spec/presenters/hyrax/work_show_presenter_spec.rb +116 -1
- data/spec/presenters/hyrax/workflow_presenter_spec.rb +1 -1
- data/spec/renderers/hyrax/renderers/attribute_renderer_spec.rb +6 -6
- data/spec/renderers/hyrax/renderers/date_attribute_renderer_spec.rb +2 -2
- data/spec/renderers/hyrax/renderers/external_link_attribute_renderer_spec.rb +1 -1
- data/spec/renderers/hyrax/renderers/faceted_attribute_renderer_spec.rb +2 -2
- data/spec/renderers/hyrax/renderers/license_attribute_renderer_spec.rb +2 -2
- data/spec/renderers/hyrax/renderers/linked_attribute_renderer_spec.rb +2 -2
- data/spec/renderers/hyrax/renderers/rights_statement_attribute_renderer_spec.rb +10 -1
- data/spec/requests/riiif_spec.rb +32 -0
- data/spec/routing/collection_permission_templates_routes_spec.rb +31 -0
- data/spec/routing/collection_types_routes.rb +35 -0
- data/spec/routing/dashboard_routes_spec.rb +37 -0
- data/spec/routing/route_spec.rb +4 -10
- data/spec/search_builders/hyrax/admin_admin_set_member_search_builder_spec.rb +2 -2
- data/spec/search_builders/hyrax/admin_set_search_builder_spec.rb +4 -40
- data/spec/search_builders/hyrax/collection_member_search_builder_spec.rb +53 -0
- data/spec/search_builders/hyrax/collection_search_builder_spec.rb +74 -0
- data/spec/search_builders/hyrax/dashboard/collections_search_builder_spec.rb +92 -0
- data/spec/search_builders/hyrax/dashboard/nested_collections_search_builder_spec.rb +85 -0
- data/spec/search_builders/hyrax/dashboard/works_search_builder_spec.rb +44 -0
- data/spec/search_builders/hyrax/my/collections_search_builder_spec.rb +35 -0
- data/spec/search_builders/hyrax/work_search_builder_spec.rb +47 -10
- data/spec/services/hyrax/adapters/nesting_index_adapter_spec.rb +191 -0
- data/spec/services/hyrax/admin_set_create_service_spec.rb +6 -2
- data/spec/services/hyrax/admin_set_member_service_spec.rb +21 -0
- data/spec/services/hyrax/batch_create_failure_service_spec.rb +6 -2
- data/spec/services/hyrax/collection_types/create_service_spec.rb +91 -0
- data/spec/services/hyrax/collection_types/permissions_service_spec.rb +297 -0
- data/spec/services/hyrax/collections/collection_member_service_spec.rb +49 -0
- data/spec/services/hyrax/collections/managed_collections_service_spec.rb +17 -0
- data/spec/services/hyrax/collections/migration_service_spec.rb +280 -0
- data/spec/services/hyrax/collections/nested_collection_persistence_service_spec.rb +28 -0
- data/spec/services/hyrax/collections/nested_collection_query_service_spec.rb +353 -0
- data/spec/services/hyrax/collections/permissions_create_service_spec.rb +41 -0
- data/spec/services/hyrax/collections/permissions_service_spec.rb +278 -0
- data/spec/services/hyrax/collections_service_spec.rb +30 -8
- data/spec/services/hyrax/embargo_service_spec.rb +26 -5
- data/spec/services/hyrax/iiif_authorization_service_spec.rb +43 -0
- data/spec/services/hyrax/multiple_membership_checker_spec.rb +155 -0
- data/spec/services/hyrax/qa_select_service_spec.rb +8 -2
- data/spec/services/hyrax/workflow/notification_configuration_parameter_spec.rb +1 -1
- data/spec/services/hyrax/workflow/notification_generator_spec.rb +1 -1
- data/spec/services/hyrax/workflow/permission_generator_spec.rb +1 -1
- data/spec/services/hyrax/workflow/permission_query_spec.rb +2 -2
- data/spec/services/hyrax/workflow/status_list_service_spec.rb +1 -1
- data/spec/services/hyrax/workflow/workflow_factory_spec.rb +1 -1
- data/spec/services/hyrax/workflow/workflow_schema_spec.rb +1 -1
- data/spec/services/hyrax/works/managed_works_service_spec.rb +17 -0
- data/spec/spec_helper.rb +34 -4
- data/spec/support/features/session_helpers.rb +1 -1
- data/spec/support/matchers/collection_type_property_matchers.rb +29 -0
- data/spec/test_app_templates/lib/generators/test_app_generator.rb +64 -24
- data/spec/views/_flash_msg.html.erb_spec.rb +0 -2
- data/spec/views/_user_util_links.html.erb_spec.rb +0 -2
- data/spec/views/catalog/_index_list_default.html.erb_spec.rb +9 -9
- data/spec/views/hyrax/admin/admin_sets/_form_participant_table.html.erb_spec.rb +42 -20
- data/spec/views/hyrax/admin/collection_types/_form.html.erb_spec.rb +43 -0
- data/spec/views/hyrax/admin/collection_types/_form_metadata.html.erb_spec.rb +27 -0
- data/spec/views/hyrax/admin/collection_types/_form_metadata_admin_set.html.erb_spec.rb +27 -0
- data/spec/views/hyrax/admin/collection_types/_form_participants.html.erb_spec.rb +16 -0
- data/spec/views/hyrax/admin/collection_types/_form_participants_table.html.erb_spec.rb +73 -0
- data/spec/views/hyrax/admin/collection_types/_form_settings.html.erb_spec.rb +106 -0
- data/spec/views/hyrax/admin/collection_types/index.html.erb_spec.rb +41 -0
- data/spec/views/hyrax/admin/users/index.html.erb_spec.rb +1 -1
- data/spec/views/hyrax/base/_form.html.erb_spec.rb +18 -42
- data/spec/views/hyrax/base/_form_child_work_relationships.html.erb_spec.rb +11 -22
- data/spec/views/hyrax/base/_form_files.html.erb_spec.rb +38 -0
- data/spec/views/hyrax/base/_form_progress.html.erb_spec.rb +1 -1
- data/spec/views/hyrax/base/_form_relationships.html.erb_spec.rb +1 -2
- data/spec/views/hyrax/base/_form_rendering.html.erb_spec.rb +18 -0
- data/spec/views/hyrax/base/file_manager.html.erb_spec.rb +1 -1
- data/spec/views/hyrax/base/show.html.erb_spec.rb +24 -5
- data/spec/views/hyrax/collections/_show_descriptions.html.erb_spec.rb +1 -1
- data/spec/views/hyrax/collections/_show_parent_collections.html.erb_spec.rb +124 -0
- data/spec/views/hyrax/collections/_sort_and_per_page.html.erb_spec.rb +60 -0
- data/spec/views/hyrax/collections/_subcollection_list.html.erb_spec.rb +39 -0
- data/spec/views/hyrax/collections/show.html.erb_spec.rb +20 -23
- data/spec/views/hyrax/dashboard/_sidebar.html.erb_spec.rb +14 -9
- data/spec/views/hyrax/dashboard/collections/_form.html.erb_spec.rb +5 -1
- data/spec/views/hyrax/dashboard/collections/_form_branding.html.erb_spec.rb +23 -0
- data/spec/views/hyrax/dashboard/collections/_form_discovery.erb_spec.rb +67 -0
- data/spec/views/hyrax/dashboard/collections/_form_share.erb_spec.rb +13 -34
- data/spec/views/hyrax/dashboard/collections/_form_share_table.html.erb_spec.rb +108 -0
- data/spec/views/hyrax/dashboard/collections/_show_actions.html.erb_spec.rb +64 -0
- data/spec/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb_spec.rb +44 -0
- data/spec/views/hyrax/dashboard/collections/_show_descriptions.html.erb_spec.rb +1 -1
- data/spec/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb_spec.rb +23 -0
- data/spec/views/hyrax/dashboard/collections/_show_parent_collections.html.erb_spec.rb +118 -0
- data/spec/views/hyrax/dashboard/collections/_show_subcollection_actions.html.erb_spec.rb +62 -0
- data/spec/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb_spec.rb +60 -0
- data/spec/views/hyrax/dashboard/collections/_subcollection_list.html.erb_spec.rb +63 -0
- data/spec/views/hyrax/dashboard/collections/_work_action_menu.html.erb_spec.rb +18 -0
- data/spec/views/hyrax/dashboard/collections/edit.html.erb_spec.rb +5 -13
- data/spec/views/hyrax/dashboard/collections/show.html.erb_spec.rb +86 -9
- data/spec/views/hyrax/file_sets/_show_actions.html.erb_spec.rb +1 -1
- data/spec/views/hyrax/homepage/_featured_works.html.erb_spec.rb +1 -1
- data/spec/views/hyrax/homepage/index.html.erb_spec.rb +14 -5
- data/spec/views/hyrax/my/_collection_action_menu.html.erb_spec.rb +65 -0
- data/spec/views/hyrax/my/_search_header.html.erb_spec.rb +6 -6
- data/spec/views/hyrax/my/_work_action_menu.html.erb_spec.rb +6 -4
- data/spec/views/hyrax/my/collections/_list_collections.html.erb_spec.rb +90 -22
- data/spec/views/hyrax/my/works/index.html.erb_spec.rb +3 -1
- data/spec/views/hyrax/users/_user_info.html.erb_spec.rb +16 -18
- data/spec/views/pages/show.html.erb_spec.rb +1 -1
- data/spec/views/shared/select_work_type_modal.html.erb_spec.rb +36 -10
- data/tasks/hyrax_dev.rake +27 -4
- data/template.rb +2 -1
- metadata +578 -290
- data/.solr_wrapper +0 -6
- data/app/assets/javascripts/hyrax/relationships/work.es6 +0 -7
- data/app/assets/javascripts/hyrax/workflow_actions_affix.js +0 -14
- data/app/assets/stylesheets/hyrax/_work_editor.scss +0 -17
- data/app/controllers/concerns/hyrax/parent_container.rb +0 -35
- data/app/helpers/dashboard_helper.rb +0 -3
- data/app/services/hyrax/parent_service.rb +0 -19
- data/app/views/catalog/_show_partials/_default.html.erb +0 -21
- data/app/views/catalog/_show_partials/_default_details.html.erb +0 -15
- data/app/views/catalog/_show_partials/_facets.html.erb +0 -52
- data/app/views/hyrax/base/_browse_everything.html.erb +0 -6
- data/app/views/hyrax/base/_find_work_widget.html.erb +0 -10
- data/app/views/hyrax/dashboard/collections/_form_default_group.html.erb +0 -25
- data/app/views/hyrax/dashboard/collections/_form_permission.html.erb +0 -24
- data/app/views/hyrax/file_sets/jq_upload.json.jbuilder +0 -8
- data/solr/config/_rest_managed.json +0 -3
- data/solr/config/admin-extra.html +0 -31
- data/solr/config/elevate.xml +0 -36
- data/solr/config/mapping-ISOLatin1Accent.txt +0 -246
- data/solr/config/protwords.txt +0 -21
- data/solr/config/schema.xml +0 -366
- data/solr/config/scripts.conf +0 -24
- data/solr/config/solrconfig.xml +0 -322
- data/solr/config/spellings.txt +0 -2
- data/solr/config/stopwords.txt +0 -58
- data/solr/config/stopwords_en.txt +0 -58
- data/solr/config/synonyms.txt +0 -31
- data/solr/config/xslt/example.xsl +0 -132
- data/solr/config/xslt/example_atom.xsl +0 -67
- data/solr/config/xslt/example_rss.xsl +0 -66
- data/solr/config/xslt/luke.xsl +0 -337
- data/spec/abilities/admin_set_abilities_spec.rb +0 -15
- data/spec/abilities/collection_abilities_spec.rb +0 -51
- data/spec/features/admin_admin_set_spec.rb +0 -30
- data/spec/helpers/hyrax/citations_behaviors/formatters/chicago_formatter_spec.rb +0 -10
- data/spec/services/hyrax/parent_service_spec.rb +0 -11
- data/spec/support/uploaded_file_monkeypatch.rb +0 -6
- data/spec/views/hyrax/base/_browse_everything.html.erb_spec.rb +0 -17
- data/spec/views/hyrax/base/_find_work_widget.html.erb_spec.rb +0 -20
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e42502331d699a799fad6da0360519ece766d82c
|
4
|
+
data.tar.gz: a15052167c02906f25795e0ca1032d0e3348db91
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 935f31ae4c0dd84119ea4166186d1da09b941e96d63c72663d5358485b11416ce3ef5d5dabd940555549898836b46c79e5464ab305986b2a609dc2019999a8de
|
7
|
+
data.tar.gz: dfee962f81193815a33cea4417737f4cf6c08981c323df9b9b3035047ead86163d05fc571992846eeed49ac15a693b0537f6a97a405b0942c0f2b275e4e35d59
|
data/.eslintrc
CHANGED
data/.github/CONTRIBUTING.md
CHANGED
@@ -51,7 +51,7 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
|
|
51
51
|
* Please avoid working directly on the `master` branch.
|
52
52
|
* You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
|
53
53
|
* Make sure you have added sufficient tests and documentation for your changes.
|
54
|
-
* Test functionality with RSpec;
|
54
|
+
* Test functionality with RSpec; Test features / UI with Capybara.
|
55
55
|
* Run _all_ the tests to assure nothing else was accidentally broken.
|
56
56
|
|
57
57
|
### Documenting Code
|
data/.rubocop.yml
CHANGED
@@ -44,11 +44,16 @@ Metrics/BlockLength:
|
|
44
44
|
- 'lib/generators/hyrax/templates/catalog_controller.rb'
|
45
45
|
- 'lib/generators/hyrax/templates/config/initializers/simple_form_bootstrap.rb'
|
46
46
|
- 'lib/hyrax/rails/routes.rb'
|
47
|
+
- 'lib/tasks/*.rake'
|
47
48
|
- 'spec/**/*.rb'
|
48
49
|
|
49
50
|
Metrics/MethodLength:
|
50
51
|
Max: 13
|
51
52
|
|
53
|
+
Naming/FileName: # https://github.com/bbatsov/rubocop/issues/2973
|
54
|
+
Exclude:
|
55
|
+
- 'Gemfile'
|
56
|
+
|
52
57
|
Style/AsciiComments:
|
53
58
|
Enabled: false
|
54
59
|
|
@@ -60,10 +65,6 @@ Style/CollectionMethods:
|
|
60
65
|
detect: 'find'
|
61
66
|
find_all: 'select'
|
62
67
|
|
63
|
-
Style/FileName: # https://github.com/bbatsov/rubocop/issues/2973
|
64
|
-
Exclude:
|
65
|
-
- 'Gemfile'
|
66
|
-
|
67
68
|
Style/MethodMissing:
|
68
69
|
Exclude:
|
69
70
|
- 'app/models/concerns/hyrax/file_set/characterization.rb'
|
@@ -140,6 +141,9 @@ RSpec/DescribeClass:
|
|
140
141
|
- 'spec/tasks/rake_spec.rb'
|
141
142
|
- 'spec/views/**/*'
|
142
143
|
|
144
|
+
RSpec/ContextWording:
|
145
|
+
Enabled: false
|
146
|
+
|
143
147
|
# By default RSpec/MessageSpies has the following:
|
144
148
|
# Prefer have_received for setting message expectations. Setup form as a spy using allow or instance_spy.
|
145
149
|
# The default assumes EnforcedStyle is 'have_received'. Most of our specs are 'receive'
|
data/.rubocop_fixme.yml
CHANGED
@@ -5,9 +5,11 @@ Security/MarshalLoad:
|
|
5
5
|
Metrics/ClassLength:
|
6
6
|
Exclude:
|
7
7
|
- 'app/controllers/hyrax/dashboard/collections_controller.rb'
|
8
|
+
- 'app/controllers/hyrax/admin/admin_sets_controller.rb'
|
8
9
|
- 'app/controllers/hyrax/file_sets_controller.rb'
|
9
10
|
- 'app/forms/hyrax/forms/permission_template_form.rb'
|
10
11
|
- 'app/presenters/hyrax/work_show_presenter.rb'
|
12
|
+
- 'app/presenters/hyrax/collection_presenter.rb'
|
11
13
|
- 'app/services/hyrax/user_stat_importer.rb'
|
12
14
|
- 'lib/generators/hyrax/templates/catalog_controller.rb'
|
13
15
|
- 'lib/generators/hyrax/install_generator.rb'
|
@@ -29,6 +31,8 @@ Metrics/ModuleLength:
|
|
29
31
|
- 'app/models/concerns/hyrax/ability.rb'
|
30
32
|
- 'app/services/hyrax/workflow/permission_query.rb'
|
31
33
|
- 'spec/services/hyrax/workflow/permission_query_spec.rb'
|
34
|
+
# TODO: extract CollectionAccessControls or something, so we don't have to skip this check?
|
35
|
+
- 'app/models/concerns/hyrax/collection_behavior.rb'
|
32
36
|
|
33
37
|
Metrics/MethodLength:
|
34
38
|
Exclude:
|
@@ -42,14 +46,28 @@ Metrics/MethodLength:
|
|
42
46
|
- 'lib/hyrax/rails/routes.rb'
|
43
47
|
- 'spec/support/**/*'
|
44
48
|
|
49
|
+
|
50
|
+
Naming/PredicateName:
|
51
|
+
Exclude:
|
52
|
+
- 'app/helpers/hyrax/collections_helper.rb'
|
53
|
+
|
54
|
+
|
45
55
|
# TODO: remove when https://github.com/bbatsov/rubocop/issues/4539 is fixed
|
46
56
|
Style/FormatStringToken:
|
47
57
|
Exclude:
|
48
58
|
- 'config/routes.rb'
|
49
59
|
|
50
|
-
Style/
|
60
|
+
Style/DateTime:
|
61
|
+
Enabled: false
|
62
|
+
|
63
|
+
# TODO: remove when https://github.com/bbatsov/rubocop/issues/5161 is fixed
|
64
|
+
Style/CommentedKeyword:
|
51
65
|
Exclude:
|
52
|
-
- 'app/
|
66
|
+
- 'app/models/vocab/fedora_resource_status.rb'
|
67
|
+
|
68
|
+
Style/SpecialGlobalVars:
|
69
|
+
Exclude:
|
70
|
+
- 'tasks/hyrax_dev.rake'
|
53
71
|
|
54
72
|
Rails/Output:
|
55
73
|
Exclude:
|
data/.travis.yml
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
language: ruby
|
2
|
-
sudo:
|
2
|
+
sudo: false
|
3
3
|
dist: trusty
|
4
4
|
|
5
5
|
addons:
|
@@ -10,10 +10,10 @@ cache:
|
|
10
10
|
before_install:
|
11
11
|
- gem update --system
|
12
12
|
- gem install bundler
|
13
|
-
- google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
|
13
|
+
- google-chrome-stable --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 http://localhost &
|
14
14
|
|
15
15
|
rvm:
|
16
|
-
- 2.
|
16
|
+
- 2.5.0
|
17
17
|
|
18
18
|
env:
|
19
19
|
global:
|
data/README.md
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
![Logo](https://raw.githubusercontent.com/samvera/hyrax/gh-pages/assets/images/hyrax_logo_horizontal_white_background.png)
|
2
2
|
|
3
3
|
Code: [![Version](https://badge.fury.io/rb/hyrax.png)](http://badge.fury.io/rb/hyrax)
|
4
|
-
[![Build Status](https://travis-ci.org/samvera/hyrax.png?branch=
|
4
|
+
[![Build Status](https://travis-ci.org/samvera/hyrax.png?branch=master)](https://travis-ci.org/samvera/hyrax)
|
5
5
|
[![Coverage Status](https://coveralls.io/repos/github/samvera/hyrax/badge.svg?branch=master)](https://coveralls.io/github/samvera/hyrax?branch=master)
|
6
6
|
[![Code Climate](https://codeclimate.com/github/samvera/hyrax/badges/gpa.svg)](https://codeclimate.com/github/samvera/hyrax)
|
7
7
|
[![Dependency Update Status](https://gemnasium.com/samvera/hyrax.png)](https://gemnasium.com/samvera/hyrax)
|
@@ -63,7 +63,7 @@ The Samvera community is here to help. Please see our [support guide](./.github/
|
|
63
63
|
# Getting started
|
64
64
|
|
65
65
|
This document contains instructions specific to setting up an app with __Hyrax
|
66
|
-
v2.0.
|
66
|
+
v2.1.0.beta1__. If you are looking for instructions on installing a different
|
67
67
|
version, be sure to select the appropriate branch or tag from the drop-down
|
68
68
|
menu above.
|
69
69
|
|
@@ -160,7 +160,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
|
|
160
160
|
Generate a new Rails application using the template.
|
161
161
|
|
162
162
|
```
|
163
|
-
rails _5.0.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.0.
|
163
|
+
rails _5.0.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.1.0.beta1/template.rb
|
164
164
|
```
|
165
165
|
|
166
166
|
Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:
|
@@ -249,12 +249,20 @@ You may wish to [customize your work type](https://github.com/samvera/hyrax/wiki
|
|
249
249
|
|
250
250
|
Hyrax 2 uses a WebSocket-based user notifications system, which requires Redis. To enable user notifications, make sure that you have configured ActionCable to use Redis as the adapter in your application's `config/cable.yml`. E.g., for the `development` Rails environment:
|
251
251
|
|
252
|
-
```
|
252
|
+
```yaml
|
253
253
|
development:
|
254
254
|
adapter: redis
|
255
255
|
url: redis://localhost:6379
|
256
256
|
```
|
257
257
|
|
258
|
+
Using Rails up to version 5.1.4, ActionCable will not work with the 4.x series of the `redis` gem, so you will also need to pin your application to a 3.x release by adding this to your `Gemfile`:
|
259
|
+
|
260
|
+
```ruby
|
261
|
+
gem 'redis', '~> 3.0'
|
262
|
+
```
|
263
|
+
|
264
|
+
And then run `bundle update redis`.
|
265
|
+
|
258
266
|
Note that the Hyrax Management Guide contains additional information on [how to configure ActionCable in production environments](https://github.com/samvera/hyrax/wiki/Hyrax-Management-Guide#notifications).
|
259
267
|
|
260
268
|
# Managing a Hyrax-based app
|
@@ -1,7 +1,7 @@
|
|
1
1
|
module Hyrax
|
2
2
|
module Actors
|
3
3
|
##
|
4
|
-
# `Hyrax::AbstractActor` implements the base (no-op) case for Hyrax Actor
|
4
|
+
# `Hyrax::Actors::AbstractActor` implements the base (no-op) case for Hyrax Actor
|
5
5
|
# middleware. Concrete implementations may override any or all of the three
|
6
6
|
# primary actions:
|
7
7
|
#
|
@@ -13,8 +13,24 @@ module Hyrax
|
|
13
13
|
private
|
14
14
|
|
15
15
|
def add_edit_users(env)
|
16
|
+
add_admin_set_participants(env)
|
17
|
+
add_collection_participants(env)
|
18
|
+
end
|
19
|
+
|
20
|
+
def add_admin_set_participants(env)
|
16
21
|
return if env.attributes[:admin_set_id].blank?
|
17
|
-
template = Hyrax::PermissionTemplate.find_by!(
|
22
|
+
template = Hyrax::PermissionTemplate.find_by!(source_id: env.attributes[:admin_set_id])
|
23
|
+
set_curation_concern_access(env, template)
|
24
|
+
end
|
25
|
+
|
26
|
+
def add_collection_participants(env)
|
27
|
+
return if env.attributes[:collection_id].blank?
|
28
|
+
collection_id = env.attributes.delete(:collection_id) # delete collection_id from attributes because works do not have a collection_id property
|
29
|
+
template = Hyrax::PermissionTemplate.find_by!(source_id: collection_id)
|
30
|
+
set_curation_concern_access(env, template)
|
31
|
+
end
|
32
|
+
|
33
|
+
def set_curation_concern_access(env, template)
|
18
34
|
env.curation_concern.edit_users += template.agent_ids_for(agent_type: 'user', access: 'manage')
|
19
35
|
env.curation_concern.edit_groups += template.agent_ids_for(agent_type: 'group', access: 'manage')
|
20
36
|
env.curation_concern.read_users += template.agent_ids_for(agent_type: 'user', access: 'view')
|
@@ -56,11 +56,11 @@ module Hyrax
|
|
56
56
|
end
|
57
57
|
|
58
58
|
# Determines if a hash contains a truthy _destroy key.
|
59
|
-
# rubocop:disable
|
59
|
+
# rubocop:disable Naming/PredicateName
|
60
60
|
def has_destroy_flag?(hash)
|
61
61
|
ActiveFedora::Type::Boolean.new.cast(hash['_destroy'])
|
62
62
|
end
|
63
|
-
# rubocop:enable
|
63
|
+
# rubocop:enable Naming/PredicateName
|
64
64
|
end
|
65
65
|
end
|
66
66
|
end
|
@@ -1,35 +1,170 @@
|
|
1
1
|
module Hyrax
|
2
2
|
module Actors
|
3
|
-
# Adds membership to and removes membership from collections
|
3
|
+
# Adds membership to and removes membership from collections.
|
4
|
+
# This decodes parameters that follow the rails nested parameters conventions:
|
5
|
+
#
|
6
|
+
# @example a collections attribute hash
|
7
|
+
# 'member_of_collections_attributes' => {
|
8
|
+
# '0' => { 'id' = '12312412'},
|
9
|
+
# '1' => { 'id' = '99981228', '_destroy' => 'true' }
|
10
|
+
# }
|
11
|
+
#
|
4
12
|
class CollectionsMembershipActor < AbstractActor
|
5
13
|
# @param [Hyrax::Actors::Environment] env
|
6
14
|
# @return [Boolean] true if create was successful
|
7
15
|
def create(env)
|
8
|
-
|
9
|
-
|
16
|
+
extract_collection_id(env)
|
17
|
+
assign_nested_attributes_for_collection(env) && next_actor.create(env)
|
10
18
|
end
|
11
19
|
|
12
20
|
# @param [Hyrax::Actors::Environment] env
|
13
21
|
# @return [Boolean] true if update was successful
|
14
22
|
def update(env)
|
15
|
-
|
16
|
-
assign_collections(env, collection_ids) && next_actor.update(env)
|
23
|
+
assign_nested_attributes_for_collection(env) && next_actor.update(env)
|
17
24
|
end
|
18
25
|
|
19
26
|
private
|
20
27
|
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
+
##
|
29
|
+
# Attaches any unattached members. Deletes those that are marked _delete
|
30
|
+
#
|
31
|
+
# @param env [Hyrax::Actors::Enviornment]
|
32
|
+
# @return [Boolean]
|
33
|
+
#
|
34
|
+
# rubocop:disable Metrics/MethodLength
|
35
|
+
# rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
|
36
|
+
def assign_nested_attributes_for_collection(env)
|
37
|
+
attributes_collection = env.attributes.delete(:member_of_collections_attributes)
|
38
|
+
|
39
|
+
return assign_for_collection_ids(env) unless attributes_collection
|
40
|
+
|
41
|
+
emit_deprecation if env.attributes.delete(:member_of_collection_ids)
|
42
|
+
|
43
|
+
return false unless
|
44
|
+
valid_membership?(env, collection_ids: attributes_collection.map { |_, attributes| attributes['id'] })
|
45
|
+
|
46
|
+
attributes_collection = attributes_collection.sort_by { |i, _| i.to_i }.map { |_, attributes| attributes }
|
47
|
+
# checking for existing works to avoid rewriting/loading works that are already attached
|
48
|
+
existing_collections = env.curation_concern.member_of_collection_ids
|
49
|
+
attributes_collection.each do |attributes|
|
50
|
+
next if attributes['id'].blank?
|
51
|
+
if existing_collections.include?(attributes['id'])
|
52
|
+
remove(env.curation_concern, attributes['id']) if has_destroy_flag?(attributes)
|
53
|
+
else
|
54
|
+
add(env, attributes['id'])
|
55
|
+
end
|
56
|
+
end
|
57
|
+
|
58
|
+
true
|
59
|
+
end
|
60
|
+
# rubocop:enable Metrics/MethodLength
|
61
|
+
# rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
|
62
|
+
|
63
|
+
##
|
64
|
+
# @deprecated supports old :member_of_collection_ids arguments
|
65
|
+
def emit_deprecation
|
66
|
+
Deprecation.warn(self, ':member_of_collections_attributes and :member_of_collection_ids were both ' \
|
67
|
+
' passed. :member_of_collection_ids is ignored when both are passed and is ' \
|
68
|
+
'deprecated for removal in Hyrax 3.0.')
|
69
|
+
end
|
70
|
+
|
71
|
+
##
|
72
|
+
# @deprecated supports old :member_of_collection_ids arguments
|
73
|
+
def assign_for_collection_ids(env)
|
74
|
+
collection_ids = env.attributes.delete(:member_of_collection_ids)
|
75
|
+
|
76
|
+
return false unless valid_membership?(env, collection_ids: collection_ids)
|
77
|
+
|
78
|
+
if collection_ids
|
79
|
+
Deprecation.warn(self, ':member_of_collection_ids has been deprecated for removal in Hyrax 3.0. ' \
|
80
|
+
'use :member_of_collections_attributes instead.')
|
81
|
+
|
82
|
+
other_collections = collections_without_edit_access(env)
|
83
|
+
|
84
|
+
collections = ::Collection.find(collection_ids)
|
85
|
+
raise "Tried to assign collections with ids: #{collection_ids}, but none were found" unless
|
86
|
+
collections
|
87
|
+
|
88
|
+
env.curation_concern.member_of_collections = collections
|
89
|
+
env.curation_concern.member_of_collections.concat(other_collections)
|
90
|
+
end
|
91
|
+
|
92
|
+
true
|
28
93
|
end
|
29
94
|
|
95
|
+
##
|
96
|
+
# @deprecated supports old :member_of_collection_ids arguments
|
30
97
|
def collections_without_edit_access(env)
|
31
98
|
env.curation_concern.member_of_collections.select { |coll| env.current_ability.cannot?(:edit, coll) }
|
32
99
|
end
|
100
|
+
|
101
|
+
# Adds the item to the ordered members so that it displays in the items
|
102
|
+
# along side the FileSets on the show page
|
103
|
+
def add(env, id)
|
104
|
+
collection = Collection.find(id)
|
105
|
+
return unless env.current_ability.can?(:deposit, collection)
|
106
|
+
env.curation_concern.member_of_collections << collection
|
107
|
+
end
|
108
|
+
|
109
|
+
# Remove the object from the members set and the ordered members list
|
110
|
+
def remove(curation_concern, id)
|
111
|
+
collection = Collection.find(id)
|
112
|
+
curation_concern.member_of_collections.delete(collection)
|
113
|
+
end
|
114
|
+
|
115
|
+
# Determines if a hash contains a truthy _destroy key.
|
116
|
+
# rubocop:disable Naming/PredicateName
|
117
|
+
def has_destroy_flag?(hash)
|
118
|
+
ActiveFedora::Type::Boolean.new.cast(hash['_destroy'])
|
119
|
+
end
|
120
|
+
# rubocop:enable Naming/PredicateName
|
121
|
+
|
122
|
+
# Extact a singleton collection id from the collection attributes and save it in env. Later in the actor stack,
|
123
|
+
# in apply_permission_template_actor.rb, `env.attributes[:collection_id]` will be used to apply the
|
124
|
+
# permissions of the collection to the created work. With one and only one collection, the work is seen as
|
125
|
+
# being created directly in that collection. The permissions will not be applied to the work if the collection
|
126
|
+
# type is configured not to allow that or if the work is being created in more than one collection.
|
127
|
+
#
|
128
|
+
# @param env [Hyrax::Actors::Enviornment]
|
129
|
+
#
|
130
|
+
# Given an array of collection_attributes when it is size:
|
131
|
+
# * 0 do not set `env.attributes[:collection_id]`
|
132
|
+
# * 1 set `env.attributes[:collection_id]` to the one and only one collection
|
133
|
+
# * 2+ do not set `env.attributes[:collection_id]`
|
134
|
+
#
|
135
|
+
# NOTE: Only called from create. All collections are being added as parents of a work. None are being removed.
|
136
|
+
def extract_collection_id(env)
|
137
|
+
attributes_collection =
|
138
|
+
env.attributes.fetch(:member_of_collections_attributes) { nil }
|
139
|
+
|
140
|
+
if attributes_collection
|
141
|
+
# Determine if the work is being created in one and only one collection.
|
142
|
+
return unless attributes_collection && attributes_collection.size == 1
|
143
|
+
|
144
|
+
# Extract the collection id from attributes_collection,
|
145
|
+
collection_id = attributes_collection.first.second['id']
|
146
|
+
else
|
147
|
+
collection_ids = env.attributes.fetch(:member_of_collection_ids) { [] }
|
148
|
+
return unless collection_ids.size == 1
|
149
|
+
collection_id = collection_ids.first
|
150
|
+
end
|
151
|
+
|
152
|
+
# Do not apply permissions to work if collection type is configured not to
|
153
|
+
collection = ::Collection.find(collection_id)
|
154
|
+
return unless collection.share_applies_to_new_works?
|
155
|
+
|
156
|
+
# Save the collection id in env for use in apply_permission_template_actor
|
157
|
+
env.attributes[:collection_id] = collection_id
|
158
|
+
end
|
159
|
+
|
160
|
+
def valid_membership?(env, collection_ids:)
|
161
|
+
multiple_memberships = Hyrax::MultipleMembershipChecker.new(item: env.curation_concern).check(collection_ids: collection_ids)
|
162
|
+
if multiple_memberships
|
163
|
+
env.curation_concern.errors.add(:collections, multiple_memberships)
|
164
|
+
return false
|
165
|
+
end
|
166
|
+
true
|
167
|
+
end
|
33
168
|
end
|
34
169
|
end
|
35
170
|
end
|
@@ -5,6 +5,9 @@ module Hyrax
|
|
5
5
|
# attributes[:remote_files] = filenames.map do |name|
|
6
6
|
# { url: "https://example.com/file/#{name}", file_name: name }
|
7
7
|
# end
|
8
|
+
#
|
9
|
+
# Browse everything may also return a local file. And although it's in the
|
10
|
+
# url property, it may have spaces, and not be a valid URI.
|
8
11
|
class CreateWithRemoteFilesActor < Hyrax::Actors::AbstractActor
|
9
12
|
# @param [Hyrax::Actors::Environment] env
|
10
13
|
# @return [Boolean] true if create was successful
|
@@ -26,10 +29,10 @@ module Hyrax
|
|
26
29
|
Hyrax.config.whitelisted_ingest_dirs
|
27
30
|
end
|
28
31
|
|
29
|
-
|
30
|
-
|
32
|
+
# @param uri [URI] the uri fo the resource to import
|
33
|
+
def validate_remote_url(uri)
|
31
34
|
if uri.scheme == 'file'
|
32
|
-
path = File.absolute_path(
|
35
|
+
path = File.absolute_path(CGI.unescape(uri.path))
|
33
36
|
whitelisted_ingest_dirs.any? do |dir|
|
34
37
|
path.start_with?(dir) && path.length > dir.length
|
35
38
|
end
|
@@ -46,26 +49,29 @@ module Hyrax
|
|
46
49
|
return true unless remote_files
|
47
50
|
remote_files.each do |file_info|
|
48
51
|
next if file_info.blank? || file_info[:url].blank?
|
49
|
-
|
52
|
+
# Escape any space characters, so that this is a legal URI
|
53
|
+
uri = URI.parse(Addressable::URI.escape(file_info[:url]))
|
54
|
+
unless validate_remote_url(uri)
|
50
55
|
Rails.logger.error "User #{env.user.user_key} attempted to ingest file from url #{file_info[:url]}, which doesn't pass validation"
|
51
56
|
return false
|
52
57
|
end
|
53
|
-
create_file_from_url(env,
|
58
|
+
create_file_from_url(env, uri, file_info[:file_name])
|
54
59
|
end
|
55
60
|
true
|
56
61
|
end
|
57
62
|
|
58
63
|
# Generic utility for creating FileSet from a URL
|
59
64
|
# Used in to import files using URLs from a file picker like browse_everything
|
60
|
-
def create_file_from_url(env,
|
61
|
-
::FileSet.new(import_url:
|
65
|
+
def create_file_from_url(env, uri, file_name)
|
66
|
+
::FileSet.new(import_url: uri.to_s, label: file_name) do |fs|
|
62
67
|
actor = Hyrax::Actors::FileSetActor.new(fs, env.user)
|
63
68
|
actor.create_metadata(visibility: env.curation_concern.visibility)
|
64
69
|
actor.attach_to_work(env.curation_concern)
|
65
70
|
fs.save!
|
66
|
-
uri = URI.parse(URI.encode(url))
|
67
71
|
if uri.scheme == 'file'
|
68
|
-
|
72
|
+
# Turn any %20 into spaces.
|
73
|
+
file_path = CGI.unescape(uri.path)
|
74
|
+
IngestLocalFileJob.perform_later(fs, file_path, env.user)
|
69
75
|
else
|
70
76
|
ImportUrlJob.perform_later(fs, operation_for(user: actor.user))
|
71
77
|
end
|