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
@@ -27,7 +27,7 @@ RSpec.describe 'User' do
|
|
27
27
|
end
|
28
28
|
|
29
29
|
describe 'as a repository manager' do
|
30
|
-
let(:manager_user) {
|
30
|
+
let(:manager_user) { create(:admin) }
|
31
31
|
let(:creating_user) { user }
|
32
32
|
let(:current_user) { manager_user }
|
33
33
|
|
@@ -41,7 +41,7 @@ RSpec.describe 'User' do
|
|
41
41
|
end
|
42
42
|
|
43
43
|
describe 'another authenticated user' do
|
44
|
-
let(:creating_user) {
|
44
|
+
let(:creating_user) { create(:user) }
|
45
45
|
let(:current_user) { user }
|
46
46
|
|
47
47
|
it do
|
@@ -54,7 +54,7 @@ RSpec.describe 'User' do
|
|
54
54
|
end
|
55
55
|
|
56
56
|
describe 'a nil user' do
|
57
|
-
let(:creating_user) {
|
57
|
+
let(:creating_user) { create(:user) }
|
58
58
|
let(:current_user) { nil }
|
59
59
|
|
60
60
|
it do
|
@@ -4,8 +4,8 @@ RSpec.describe 'User' do
|
|
4
4
|
describe 'Abilities' do
|
5
5
|
subject { Ability.new(current_user) }
|
6
6
|
|
7
|
-
let(:generic_work) {
|
8
|
-
let(:user) {
|
7
|
+
let(:generic_work) { create(:private_generic_work, user: creating_user) }
|
8
|
+
let(:user) { create(:user) }
|
9
9
|
|
10
10
|
describe 'without embargo' do
|
11
11
|
describe 'creator of object' do
|
@@ -21,7 +21,7 @@ RSpec.describe 'User' do
|
|
21
21
|
end
|
22
22
|
|
23
23
|
describe 'as a repository manager' do
|
24
|
-
let(:manager_user) {
|
24
|
+
let(:manager_user) { create(:admin) }
|
25
25
|
let(:creating_user) { user }
|
26
26
|
let(:current_user) { manager_user }
|
27
27
|
|
@@ -34,7 +34,7 @@ RSpec.describe 'User' do
|
|
34
34
|
end
|
35
35
|
|
36
36
|
describe 'another authenticated user' do
|
37
|
-
let(:creating_user) {
|
37
|
+
let(:creating_user) { create(:user) }
|
38
38
|
let(:current_user) { user }
|
39
39
|
|
40
40
|
it do
|
@@ -47,7 +47,7 @@ RSpec.describe 'User' do
|
|
47
47
|
end
|
48
48
|
|
49
49
|
describe 'a nil user' do
|
50
|
-
let(:creating_user) {
|
50
|
+
let(:creating_user) { create(:user) }
|
51
51
|
let(:current_user) { nil }
|
52
52
|
|
53
53
|
it do
|
@@ -0,0 +1,145 @@
|
|
1
|
+
require 'cancan/matchers'
|
2
|
+
|
3
|
+
RSpec.describe 'PermissionTemplateAbility' do
|
4
|
+
subject { ability }
|
5
|
+
|
6
|
+
let(:ability) { Ability.new(current_user) }
|
7
|
+
let(:user) { create(:user) }
|
8
|
+
let(:current_user) { user }
|
9
|
+
let(:collection_type_gid) { create(:collection_type).gid }
|
10
|
+
|
11
|
+
let!(:collection) { create(:collection, with_permission_template: true, collection_type_gid: collection_type_gid) }
|
12
|
+
let(:permission_template) { collection.permission_template }
|
13
|
+
let!(:permission_template_access) do
|
14
|
+
create(:permission_template_access,
|
15
|
+
:manage,
|
16
|
+
permission_template: permission_template,
|
17
|
+
agent_type: 'group',
|
18
|
+
agent_id: 'manage_group')
|
19
|
+
end
|
20
|
+
|
21
|
+
context 'when admin user' do
|
22
|
+
let(:user) { FactoryBot.create(:admin) }
|
23
|
+
|
24
|
+
it 'allows all template abilities' do
|
25
|
+
is_expected.to be_able_to(:manage, Hyrax::PermissionTemplate)
|
26
|
+
is_expected.to be_able_to(:create, permission_template)
|
27
|
+
is_expected.to be_able_to(:edit, permission_template)
|
28
|
+
is_expected.to be_able_to(:update, permission_template)
|
29
|
+
is_expected.to be_able_to(:destroy, permission_template)
|
30
|
+
end
|
31
|
+
|
32
|
+
it 'allows all template access abilities' do
|
33
|
+
is_expected.to be_able_to(:manage, Hyrax::PermissionTemplateAccess)
|
34
|
+
is_expected.to be_able_to(:create, permission_template_access)
|
35
|
+
is_expected.to be_able_to(:edit, permission_template_access)
|
36
|
+
is_expected.to be_able_to(:update, permission_template_access)
|
37
|
+
is_expected.to be_able_to(:destroy, permission_template_access)
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
41
|
+
context 'when user has manage access for the source' do
|
42
|
+
before do
|
43
|
+
create(:permission_template_access,
|
44
|
+
:manage,
|
45
|
+
permission_template: permission_template,
|
46
|
+
agent_type: 'user',
|
47
|
+
agent_id: user.user_key)
|
48
|
+
collection.reset_access_controls!
|
49
|
+
end
|
50
|
+
|
51
|
+
it 'allows most template abilities' do
|
52
|
+
is_expected.to be_able_to(:create, permission_template)
|
53
|
+
is_expected.to be_able_to(:edit, permission_template)
|
54
|
+
is_expected.to be_able_to(:update, permission_template)
|
55
|
+
is_expected.to be_able_to(:destroy, permission_template)
|
56
|
+
end
|
57
|
+
|
58
|
+
it 'denies manage ability for template' do
|
59
|
+
is_expected.not_to be_able_to(:manage, Hyrax::PermissionTemplate)
|
60
|
+
end
|
61
|
+
|
62
|
+
it 'allows most template access abilities' do
|
63
|
+
is_expected.to be_able_to(:create, permission_template_access)
|
64
|
+
is_expected.to be_able_to(:edit, permission_template_access)
|
65
|
+
is_expected.to be_able_to(:update, permission_template_access)
|
66
|
+
is_expected.to be_able_to(:destroy, permission_template_access)
|
67
|
+
end
|
68
|
+
|
69
|
+
it 'denies manage ability for template access' do
|
70
|
+
is_expected.not_to be_able_to(:manage, Hyrax::PermissionTemplateAccess)
|
71
|
+
end
|
72
|
+
end
|
73
|
+
|
74
|
+
context 'when user has deposit access for the source' do
|
75
|
+
before do
|
76
|
+
create(:permission_template_access,
|
77
|
+
:deposit,
|
78
|
+
permission_template: permission_template,
|
79
|
+
agent_type: 'user',
|
80
|
+
agent_id: user.user_key)
|
81
|
+
collection.reset_access_controls!
|
82
|
+
end
|
83
|
+
|
84
|
+
it 'denies all template abilities' do
|
85
|
+
is_expected.not_to be_able_to(:manage, Hyrax::PermissionTemplate)
|
86
|
+
is_expected.not_to be_able_to(:create, permission_template)
|
87
|
+
is_expected.not_to be_able_to(:edit, permission_template)
|
88
|
+
is_expected.not_to be_able_to(:update, permission_template)
|
89
|
+
is_expected.not_to be_able_to(:destroy, permission_template)
|
90
|
+
end
|
91
|
+
|
92
|
+
it 'denies all template access abilities' do
|
93
|
+
is_expected.not_to be_able_to(:manage, Hyrax::PermissionTemplateAccess)
|
94
|
+
is_expected.not_to be_able_to(:create, permission_template_access)
|
95
|
+
is_expected.not_to be_able_to(:edit, permission_template_access)
|
96
|
+
is_expected.not_to be_able_to(:update, permission_template_access)
|
97
|
+
is_expected.not_to be_able_to(:destroy, permission_template_access)
|
98
|
+
end
|
99
|
+
end
|
100
|
+
|
101
|
+
context 'when user has view access for the source' do
|
102
|
+
before do
|
103
|
+
create(:permission_template_access,
|
104
|
+
:view,
|
105
|
+
permission_template: permission_template,
|
106
|
+
agent_type: 'user',
|
107
|
+
agent_id: user.user_key)
|
108
|
+
collection.reset_access_controls!
|
109
|
+
end
|
110
|
+
|
111
|
+
it 'denies all template abilities' do
|
112
|
+
is_expected.not_to be_able_to(:manage, Hyrax::PermissionTemplate)
|
113
|
+
is_expected.not_to be_able_to(:create, permission_template)
|
114
|
+
is_expected.not_to be_able_to(:edit, permission_template)
|
115
|
+
is_expected.not_to be_able_to(:update, permission_template)
|
116
|
+
is_expected.not_to be_able_to(:destroy, permission_template)
|
117
|
+
end
|
118
|
+
|
119
|
+
it 'denies all template access abilities' do
|
120
|
+
is_expected.not_to be_able_to(:manage, Hyrax::PermissionTemplateAccess)
|
121
|
+
is_expected.not_to be_able_to(:create, permission_template_access)
|
122
|
+
is_expected.not_to be_able_to(:edit, permission_template_access)
|
123
|
+
is_expected.not_to be_able_to(:update, permission_template_access)
|
124
|
+
is_expected.not_to be_able_to(:destroy, permission_template_access)
|
125
|
+
end
|
126
|
+
end
|
127
|
+
|
128
|
+
context 'when user has no special access' do
|
129
|
+
it 'denies all template abilities' do
|
130
|
+
is_expected.not_to be_able_to(:manage, Hyrax::PermissionTemplate)
|
131
|
+
is_expected.not_to be_able_to(:create, permission_template)
|
132
|
+
is_expected.not_to be_able_to(:edit, permission_template)
|
133
|
+
is_expected.not_to be_able_to(:update, permission_template)
|
134
|
+
is_expected.not_to be_able_to(:destroy, permission_template)
|
135
|
+
end
|
136
|
+
|
137
|
+
it 'denies all template access abilities' do
|
138
|
+
is_expected.not_to be_able_to(:manage, Hyrax::PermissionTemplateAccess)
|
139
|
+
is_expected.not_to be_able_to(:create, permission_template_access)
|
140
|
+
is_expected.not_to be_able_to(:edit, permission_template_access)
|
141
|
+
is_expected.not_to be_able_to(:update, permission_template_access)
|
142
|
+
is_expected.not_to be_able_to(:destroy, permission_template_access)
|
143
|
+
end
|
144
|
+
end
|
145
|
+
end
|
@@ -0,0 +1,27 @@
|
|
1
|
+
require 'cancan/matchers'
|
2
|
+
|
3
|
+
# rubocop:disable RSpec/EmptyExampleGroup
|
4
|
+
RSpec.describe 'SolrDocumentAbility' do
|
5
|
+
subject { ability }
|
6
|
+
|
7
|
+
let(:ability) { Ability.new(current_user) }
|
8
|
+
let(:user) { create(:user) }
|
9
|
+
let(:current_user) { user }
|
10
|
+
|
11
|
+
context 'with Collection solr doc' do
|
12
|
+
# tested with collection's solr doc in collection_ability_spec.rb
|
13
|
+
end
|
14
|
+
|
15
|
+
context 'with admin_set' do
|
16
|
+
# tested with admin_set's solr doc in admin_set_ability_spec.rb
|
17
|
+
end
|
18
|
+
|
19
|
+
context 'with works' do
|
20
|
+
# TODO: Need tests for works
|
21
|
+
end
|
22
|
+
|
23
|
+
context 'with files' do
|
24
|
+
# TODO: Need tests for files
|
25
|
+
end
|
26
|
+
end
|
27
|
+
# rubocop:enable RSpec/EmptyExampleGroup
|
@@ -5,12 +5,15 @@ RSpec.describe Hyrax::Actors::ApplyPermissionTemplateActor do
|
|
5
5
|
let(:depositor) { create(:user) }
|
6
6
|
let(:work) do
|
7
7
|
build(:generic_work,
|
8
|
+
user: depositor,
|
8
9
|
edit_users: ['Kevin'],
|
9
10
|
read_users: ['Taraji'])
|
10
11
|
end
|
11
|
-
let(:attributes) { {
|
12
|
+
let(:attributes) { { source_id: admin_set.id } }
|
12
13
|
let(:admin_set) { create(:admin_set, with_permission_template: true) }
|
13
|
-
let(:
|
14
|
+
let(:as_permission_template) { admin_set.permission_template }
|
15
|
+
let(:collection) { create(:collection, with_permission_template: true) }
|
16
|
+
let(:col_permission_template) { collection.permission_template }
|
14
17
|
|
15
18
|
subject(:middleware) do
|
16
19
|
stack = ActionDispatch::MiddlewareStack.new.tap do |middleware|
|
@@ -20,7 +23,7 @@ RSpec.describe Hyrax::Actors::ApplyPermissionTemplateActor do
|
|
20
23
|
end
|
21
24
|
|
22
25
|
describe "create" do
|
23
|
-
context "when
|
26
|
+
context "when source_id is blank" do
|
24
27
|
let(:attributes) { { admin_set_id: '' } }
|
25
28
|
|
26
29
|
it "returns true" do
|
@@ -28,40 +31,105 @@ RSpec.describe Hyrax::Actors::ApplyPermissionTemplateActor do
|
|
28
31
|
end
|
29
32
|
end
|
30
33
|
|
31
|
-
context "when admin_set_id is provided" do
|
34
|
+
context "when admin_set_id only is provided" do
|
32
35
|
let(:attributes) { { admin_set_id: admin_set.id } }
|
33
36
|
|
34
37
|
before do
|
35
|
-
|
36
|
-
:manage,
|
37
|
-
permission_template: permission_template,
|
38
|
-
agent_type: 'user',
|
39
|
-
agent_id: 'hannah')
|
40
|
-
create(:permission_template_access,
|
41
|
-
:manage,
|
42
|
-
permission_template: permission_template,
|
43
|
-
agent_type: 'group',
|
44
|
-
agent_id: 'librarians')
|
45
|
-
create(:permission_template_access,
|
46
|
-
:view,
|
47
|
-
permission_template: permission_template,
|
48
|
-
agent_type: 'user',
|
49
|
-
agent_id: 'gary')
|
50
|
-
create(:permission_template_access,
|
51
|
-
:view,
|
52
|
-
permission_template: permission_template,
|
53
|
-
agent_type: 'group',
|
54
|
-
agent_id: 'readers')
|
38
|
+
admin_set_access(as_permission_template)
|
55
39
|
allow(terminator).to receive(:create).and_return(true)
|
56
40
|
end
|
57
41
|
|
58
42
|
it "adds the template users to the work" do
|
59
43
|
expect(middleware.create(env)).to be true
|
60
|
-
expect(work.edit_users).to
|
61
|
-
expect(work.edit_groups).to
|
62
|
-
expect(work.read_users).to
|
63
|
-
expect(work.read_groups).to
|
44
|
+
expect(work.edit_users).to match_array [depositor.user_key, 'Kevin', 'hannah a. smith']
|
45
|
+
expect(work.edit_groups).to match_array ['librarians_as']
|
46
|
+
expect(work.read_users).to match_array ['Taraji', 'gary a. stevens']
|
47
|
+
expect(work.read_groups).to match_array ['readers_as']
|
64
48
|
end
|
65
49
|
end
|
50
|
+
|
51
|
+
context "when admin_set_id and collection_id is provided" do
|
52
|
+
let(:attributes) { { admin_set_id: admin_set.id, collection_id: collection.id } }
|
53
|
+
|
54
|
+
before do
|
55
|
+
admin_set_access(as_permission_template)
|
56
|
+
collection_access(col_permission_template)
|
57
|
+
allow(terminator).to receive(:create).and_return(true)
|
58
|
+
end
|
59
|
+
|
60
|
+
it "adds the template users to the work" do
|
61
|
+
expect(middleware.create(env)).to be true
|
62
|
+
expect(work.edit_users).to match_array [depositor.user_key, 'Kevin', 'hannah a. smith', 'joe conrad']
|
63
|
+
expect(work.edit_groups).to match_array ['librarians_as', 'managers_c']
|
64
|
+
expect(work.read_users).to match_array ['Taraji', 'gary a. stevens', 'carol cassidy']
|
65
|
+
expect(work.read_groups).to match_array ['readers_as', 'viewers_c']
|
66
|
+
end
|
67
|
+
end
|
68
|
+
|
69
|
+
def admin_set_access(permission_template) # rubocop:disable Metrics/MethodLength
|
70
|
+
create(:permission_template_access,
|
71
|
+
:manage,
|
72
|
+
permission_template: permission_template,
|
73
|
+
agent_type: 'user',
|
74
|
+
agent_id: 'hannah a. smith')
|
75
|
+
create(:permission_template_access,
|
76
|
+
:manage,
|
77
|
+
permission_template: permission_template,
|
78
|
+
agent_type: 'group',
|
79
|
+
agent_id: 'librarians_as')
|
80
|
+
create(:permission_template_access,
|
81
|
+
:deposit,
|
82
|
+
permission_template: permission_template,
|
83
|
+
agent_type: 'user',
|
84
|
+
agent_id: 'mike a. steward')
|
85
|
+
create(:permission_template_access,
|
86
|
+
:deposit,
|
87
|
+
permission_template: permission_template,
|
88
|
+
agent_type: 'group',
|
89
|
+
agent_id: 'staff_as')
|
90
|
+
create(:permission_template_access,
|
91
|
+
:view,
|
92
|
+
permission_template: permission_template,
|
93
|
+
agent_type: 'user',
|
94
|
+
agent_id: 'gary a. stevens')
|
95
|
+
create(:permission_template_access,
|
96
|
+
:view,
|
97
|
+
permission_template: permission_template,
|
98
|
+
agent_type: 'group',
|
99
|
+
agent_id: 'readers_as')
|
100
|
+
end
|
101
|
+
|
102
|
+
def collection_access(permission_template) # rubocop:disable Metrics/MethodLength
|
103
|
+
create(:permission_template_access,
|
104
|
+
:manage,
|
105
|
+
permission_template: permission_template,
|
106
|
+
agent_type: 'user',
|
107
|
+
agent_id: "joe conrad")
|
108
|
+
create(:permission_template_access,
|
109
|
+
:manage,
|
110
|
+
permission_template: permission_template,
|
111
|
+
agent_type: 'group',
|
112
|
+
agent_id: "managers_c")
|
113
|
+
create(:permission_template_access,
|
114
|
+
:deposit,
|
115
|
+
permission_template: permission_template,
|
116
|
+
agent_type: 'user',
|
117
|
+
agent_id: "donny cartwright")
|
118
|
+
create(:permission_template_access,
|
119
|
+
:deposit,
|
120
|
+
permission_template: permission_template,
|
121
|
+
agent_type: 'group',
|
122
|
+
agent_id: "depositors_c")
|
123
|
+
create(:permission_template_access,
|
124
|
+
:view,
|
125
|
+
permission_template: permission_template,
|
126
|
+
agent_type: 'user',
|
127
|
+
agent_id: "carol cassidy")
|
128
|
+
create(:permission_template_access,
|
129
|
+
:view,
|
130
|
+
permission_template: permission_template,
|
131
|
+
agent_type: 'group',
|
132
|
+
agent_id: "viewers_c")
|
133
|
+
end
|
66
134
|
end
|
67
135
|
end
|
@@ -1,7 +1,7 @@
|
|
1
1
|
RSpec.describe Hyrax::Actors::CollectionsMembershipActor do
|
2
2
|
let(:user) { create(:user) }
|
3
3
|
let(:ability) { ::Ability.new(user) }
|
4
|
-
let(:curation_concern) {
|
4
|
+
let(:curation_concern) { build(:work, user: user) }
|
5
5
|
let(:attributes) { {} }
|
6
6
|
let(:terminator) { Hyrax::Actors::Terminator.new }
|
7
7
|
let(:env) { Hyrax::Actors::Environment.new(curation_concern, ability, attributes) }
|
@@ -9,22 +9,27 @@ RSpec.describe Hyrax::Actors::CollectionsMembershipActor do
|
|
9
9
|
subject(:middleware) do
|
10
10
|
stack = ActionDispatch::MiddlewareStack.new.tap do |middleware|
|
11
11
|
middleware.use described_class
|
12
|
+
middleware.use RemoveCollectionActor
|
12
13
|
middleware.use Hyrax::Actors::GenericWorkActor
|
13
14
|
end
|
14
15
|
stack.build(terminator)
|
15
16
|
end
|
16
17
|
|
17
18
|
describe 'the next actor' do
|
19
|
+
let(:collection) { create(:collection, create_access: true) }
|
18
20
|
let(:attributes) do
|
19
|
-
{
|
21
|
+
{
|
22
|
+
member_of_collections_attributes: { '0' => { id: '123' } },
|
23
|
+
title: ['test']
|
24
|
+
}
|
20
25
|
end
|
21
26
|
|
22
27
|
before do
|
23
|
-
allow(Collection).to receive(:find).with(
|
28
|
+
allow(Collection).to receive(:find).with('123').and_return(collection)
|
24
29
|
allow(curation_concern).to receive(:member_of_collections=)
|
25
30
|
end
|
26
31
|
|
27
|
-
it 'does not receive the
|
32
|
+
it 'does not receive the member_of_collections_attributes' do
|
28
33
|
expect(terminator).to receive(:create).with(Hyrax::Actors::Environment) do |k|
|
29
34
|
expect(k.attributes).to eq("title" => ["test"])
|
30
35
|
end
|
@@ -33,9 +38,12 @@ RSpec.describe Hyrax::Actors::CollectionsMembershipActor do
|
|
33
38
|
end
|
34
39
|
|
35
40
|
describe 'create' do
|
36
|
-
let(:collection) { create(:collection) }
|
41
|
+
let(:collection) { create(:collection, collection_type_settings: [:discoverable], user: user, create_access: true) }
|
37
42
|
let(:attributes) do
|
38
|
-
{
|
43
|
+
{
|
44
|
+
member_of_collections_attributes: { '0' => { id: collection.id } },
|
45
|
+
title: ['test']
|
46
|
+
}
|
39
47
|
end
|
40
48
|
|
41
49
|
it 'adds it to the collection' do
|
@@ -43,13 +51,31 @@ RSpec.describe Hyrax::Actors::CollectionsMembershipActor do
|
|
43
51
|
expect(collection.reload.member_objects).to eq [curation_concern]
|
44
52
|
end
|
45
53
|
|
46
|
-
|
47
|
-
|
48
|
-
|
54
|
+
context 'when multiple membership checker returns a non-nil value' do
|
55
|
+
before do
|
56
|
+
allow(Hyrax::MultipleMembershipChecker).to receive(:new).and_return(checker)
|
57
|
+
allow(checker).to receive(:check).and_return(error_message)
|
58
|
+
end
|
59
|
+
|
60
|
+
let(:checker) { double('checker') }
|
61
|
+
let(:error_message) { 'Error: foo bar' }
|
62
|
+
|
63
|
+
it 'adds an error and returns false' do
|
64
|
+
expect(env.curation_concern.errors).to receive(:add).with(:collections, error_message)
|
65
|
+
expect(subject.create(env)).to be false
|
66
|
+
expect(curation_concern.member_of_collections).to be_empty
|
67
|
+
end
|
68
|
+
end
|
69
|
+
|
70
|
+
context "when work is in user's own collection and destroy is passed" do
|
71
|
+
let(:collection) { create(:collection, user: user, title: ['A good title'], create_access: true) }
|
72
|
+
let(:attributes) do
|
73
|
+
{ member_of_collections_attributes: { '0' => { id: collection.id, _destroy: 'true' } } }
|
74
|
+
end
|
49
75
|
|
50
76
|
before do
|
51
|
-
|
52
|
-
|
77
|
+
curation_concern.member_of_collections = [collection]
|
78
|
+
curation_concern.save!
|
53
79
|
end
|
54
80
|
|
55
81
|
it "removes the work from that collection" do
|
@@ -58,15 +84,257 @@ RSpec.describe Hyrax::Actors::CollectionsMembershipActor do
|
|
58
84
|
end
|
59
85
|
end
|
60
86
|
|
61
|
-
|
87
|
+
context "when work is in another user's collection" do
|
62
88
|
let(:other_user) { create(:user) }
|
63
|
-
let(:
|
89
|
+
let(:other_collection) { create(:collection, user: other_user, title: ['A good title'], create_access: true) }
|
90
|
+
|
91
|
+
before do
|
92
|
+
curation_concern.member_of_collections = [other_collection]
|
93
|
+
curation_concern.save!
|
94
|
+
end
|
64
95
|
|
65
|
-
it "doesn't remove the work from
|
96
|
+
it "doesn't remove the work from the other user's collection" do
|
66
97
|
subject.create(env)
|
67
98
|
expect(subject.create(env)).to be true
|
68
|
-
expect(curation_concern.member_of_collections).to
|
99
|
+
expect(curation_concern.member_of_collections).to match_array [collection, other_collection]
|
69
100
|
end
|
70
101
|
end
|
102
|
+
|
103
|
+
context 'when passing `member_of_collection_ids`' do
|
104
|
+
let(:attributes) { { member_of_collection_ids: [collection.id], title: ['test'] } }
|
105
|
+
|
106
|
+
it 'adds it to the collection' do
|
107
|
+
skip 'this behavior past its deprecation sunset time and can be removed' if
|
108
|
+
Hyrax::VERSION.split('.').first.to_i >= 3
|
109
|
+
|
110
|
+
expect(subject.create(env)).to be true
|
111
|
+
expect(collection.reload.member_objects).to eq [curation_concern]
|
112
|
+
end
|
113
|
+
|
114
|
+
context "when work is in user's own collection" do
|
115
|
+
let(:attributes) { { member_of_collection_ids: [] } }
|
116
|
+
|
117
|
+
it "removes the work from that collection" do
|
118
|
+
skip 'this behavior past its deprecation sunset time and can be removed' if
|
119
|
+
Hyrax::VERSION.split('.').first.to_i >= 3
|
120
|
+
|
121
|
+
expect(subject.create(env)).to be true
|
122
|
+
expect(collection.reload.member_objects).to be_empty
|
123
|
+
end
|
124
|
+
end
|
125
|
+
|
126
|
+
describe "when work is in another user's collection" do
|
127
|
+
let(:other_user) { create(:user) }
|
128
|
+
let(:collection) { create(:collection, user: other_user, title: ['A good title']) }
|
129
|
+
let(:my_collection) { create(:collection, title: ['My good title']) }
|
130
|
+
|
131
|
+
let(:attributes) { { member_of_collection_ids: [my_collection.id] } }
|
132
|
+
|
133
|
+
before do
|
134
|
+
curation_concern.member_of_collections = [collection]
|
135
|
+
curation_concern.save!
|
136
|
+
end
|
137
|
+
|
138
|
+
it "doesn't remove the work from the other user's collection" do
|
139
|
+
skip 'this behavior past its deprecation sunset time and can be removed' if
|
140
|
+
Hyrax::VERSION.split('.').first.to_i >= 3
|
141
|
+
|
142
|
+
expect(subject.create(env)).to be true
|
143
|
+
expect(curation_concern.member_of_collections)
|
144
|
+
.to contain_exactly(collection, my_collection)
|
145
|
+
end
|
146
|
+
end
|
147
|
+
end
|
148
|
+
|
149
|
+
context "updates env" do
|
150
|
+
let!(:collection_type) { create(:collection_type) }
|
151
|
+
let!(:collection) { create(:collection, collection_type_gid: collection_type.gid, create_access: true) }
|
152
|
+
|
153
|
+
subject(:middleware) do
|
154
|
+
stack = ActionDispatch::MiddlewareStack.new.tap do |middleware|
|
155
|
+
middleware.use described_class
|
156
|
+
end
|
157
|
+
stack.build(terminator)
|
158
|
+
end
|
159
|
+
|
160
|
+
context "when share applies to works" do
|
161
|
+
before do
|
162
|
+
allow(collection.collection_type).to receive(:share_applies_to_works).and_return(true)
|
163
|
+
end
|
164
|
+
|
165
|
+
context "and only one collection" do
|
166
|
+
let(:attributes) do
|
167
|
+
{
|
168
|
+
member_of_collections_attributes: { '0' => { id: collection.id } },
|
169
|
+
title: ['test']
|
170
|
+
}
|
171
|
+
end
|
172
|
+
|
173
|
+
it "removes member_of_collections_attributes and adds collection_id to env" do
|
174
|
+
expect(env.attributes).to have_key(:member_of_collections_attributes)
|
175
|
+
expect(env.attributes[:member_of_collections_attributes].size).to eq 1
|
176
|
+
expect(subject.create(env)).to be true
|
177
|
+
expect(env.attributes).not_to have_key(:member_of_collections_attributes)
|
178
|
+
expect(env.attributes).to have_key(:collection_id)
|
179
|
+
expect(env.attributes[:collection_id]).to eq collection.id
|
180
|
+
end
|
181
|
+
end
|
182
|
+
|
183
|
+
context "when more than one collection" do
|
184
|
+
let(:collection2) { create(:collection, create_access: true) }
|
185
|
+
let(:attributes) do
|
186
|
+
{
|
187
|
+
member_of_collections_attributes: {
|
188
|
+
'0' => { id: collection.id },
|
189
|
+
'1' => { id: collection2.id }
|
190
|
+
},
|
191
|
+
title: ['test']
|
192
|
+
}
|
193
|
+
end
|
194
|
+
|
195
|
+
it "removes member_of_collections_attributes and does NOT add collection_id" do
|
196
|
+
expect(env.attributes).to have_key(:member_of_collections_attributes)
|
197
|
+
expect(env.attributes[:member_of_collections_attributes].size).to eq 2
|
198
|
+
expect(subject.create(env)).to be true
|
199
|
+
expect(env.attributes).not_to have_key(:member_of_collections_attributes)
|
200
|
+
expect(env.attributes).not_to have_key(:collection_id)
|
201
|
+
end
|
202
|
+
end
|
203
|
+
end
|
204
|
+
|
205
|
+
context "when share does NOT apply to works" do
|
206
|
+
before do
|
207
|
+
allow(collection.collection_type).to receive(:share_applies_to_new_works?).and_return(false)
|
208
|
+
allow(Collection).to receive(:find).with(collection.id).and_return(collection)
|
209
|
+
allow(Collection).to receive(:find).with([collection.id]).and_return([collection])
|
210
|
+
end
|
211
|
+
|
212
|
+
context "and only one collection" do
|
213
|
+
let(:attributes) do
|
214
|
+
{
|
215
|
+
member_of_collections_attributes: { '0' => { id: collection.id } },
|
216
|
+
title: ['test']
|
217
|
+
}
|
218
|
+
end
|
219
|
+
|
220
|
+
it "removes member_of_collection_ids and does NOT add collection_id" do
|
221
|
+
expect(env.attributes).to have_key(:member_of_collections_attributes)
|
222
|
+
expect(env.attributes[:member_of_collections_attributes].size).to eq 1
|
223
|
+
expect(subject.create(env)).to be true
|
224
|
+
expect(env.attributes).not_to have_key(:member_of_collections_attributes)
|
225
|
+
expect(env.attributes).not_to have_key(:collection_id)
|
226
|
+
end
|
227
|
+
end
|
228
|
+
end
|
229
|
+
end
|
230
|
+
end
|
231
|
+
|
232
|
+
context 'when old style env parameter' do
|
233
|
+
describe 'create' do
|
234
|
+
let(:collection) { create(:collection) }
|
235
|
+
let(:attributes) do
|
236
|
+
{ member_of_collection_ids: [collection.id], title: ['test'] }
|
237
|
+
end
|
238
|
+
|
239
|
+
it 'adds it to the collection' do
|
240
|
+
expect(subject.create(env)).to be true
|
241
|
+
expect(collection.reload.member_objects).to eq [curation_concern]
|
242
|
+
end
|
243
|
+
|
244
|
+
context 'when multiple membership checker returns a non-nil value' do
|
245
|
+
before do
|
246
|
+
allow(Hyrax::MultipleMembershipChecker).to receive(:new).and_return(checker)
|
247
|
+
allow(checker).to receive(:check).and_return(error_message)
|
248
|
+
end
|
249
|
+
|
250
|
+
let(:checker) { double('checker') }
|
251
|
+
let(:error_message) { 'Error: foo bar' }
|
252
|
+
|
253
|
+
it 'adds an error and returns false' do
|
254
|
+
expect(env.curation_concern.errors).to receive(:add).with(:collections, error_message)
|
255
|
+
expect(subject.create(env)).to be false
|
256
|
+
expect(curation_concern.member_of_collections).to be_empty
|
257
|
+
end
|
258
|
+
end
|
259
|
+
|
260
|
+
context "when work is in user's own collection" do
|
261
|
+
let(:collection) { create(:collection, user: user, title: ['A good title']) }
|
262
|
+
let(:attributes) { { member_of_collection_ids: [] } }
|
263
|
+
|
264
|
+
before do
|
265
|
+
subject.create(Hyrax::Actors::Environment.new(curation_concern, ability,
|
266
|
+
member_of_collection_ids: [collection.id], title: ['test']))
|
267
|
+
end
|
268
|
+
|
269
|
+
it "removes the work from that collection" do
|
270
|
+
expect(subject.create(env)).to be true
|
271
|
+
expect(curation_concern.member_of_collections).to eq []
|
272
|
+
end
|
273
|
+
end
|
274
|
+
|
275
|
+
context "when work is in another user's collection" do
|
276
|
+
let(:other_user) { create(:user) }
|
277
|
+
let(:collection) { create(:collection, user: other_user, title: ['A good title']) }
|
278
|
+
|
279
|
+
it "doesn't remove the work from that collection" do
|
280
|
+
subject.create(env)
|
281
|
+
expect(subject.create(env)).to be true
|
282
|
+
expect(curation_concern.member_of_collections).to eq [collection]
|
283
|
+
end
|
284
|
+
end
|
285
|
+
|
286
|
+
context "updates env" do
|
287
|
+
let(:collection) do
|
288
|
+
create(:collection, collection_type_settings: [:discoverable, :sharable])
|
289
|
+
end
|
290
|
+
|
291
|
+
subject(:middleware) do
|
292
|
+
stack = ActionDispatch::MiddlewareStack.new.tap do |middleware|
|
293
|
+
middleware.use described_class
|
294
|
+
end
|
295
|
+
stack.build(terminator)
|
296
|
+
end
|
297
|
+
|
298
|
+
context "when only one collection" do
|
299
|
+
let(:attributes) do
|
300
|
+
{ member_of_collection_ids: [collection.id], title: ['test'] }
|
301
|
+
end
|
302
|
+
|
303
|
+
it "removes member_of_collection_ids and adds collection_id to env" do
|
304
|
+
expect(env.attributes).to have_key(:member_of_collection_ids)
|
305
|
+
expect(env.attributes[:member_of_collection_ids].size).to eq 1
|
306
|
+
expect(subject.create(env)).to be true
|
307
|
+
expect(env.attributes).not_to have_key(:member_of_collection_ids)
|
308
|
+
expect(env.attributes).to have_key(:collection_id)
|
309
|
+
expect(env.attributes[:collection_id]).to eq collection.id
|
310
|
+
end
|
311
|
+
end
|
312
|
+
|
313
|
+
context "when more than one collection" do
|
314
|
+
let(:collection2) { create(:collection) }
|
315
|
+
let(:attributes) do
|
316
|
+
{ member_of_collection_ids: [collection.id, collection2.id], title: ['test'] }
|
317
|
+
end
|
318
|
+
|
319
|
+
it "removes member_of_collection_ids and does NOT add collection_id" do
|
320
|
+
expect(env.attributes).to have_key(:member_of_collection_ids)
|
321
|
+
expect(env.attributes[:member_of_collection_ids].size).to eq 2
|
322
|
+
expect(subject.create(env)).to be true
|
323
|
+
expect(env.attributes).not_to have_key(:member_of_collection_ids)
|
324
|
+
expect(env.attributes).not_to have_key(:collection_id)
|
325
|
+
end
|
326
|
+
end
|
327
|
+
end
|
328
|
+
end
|
329
|
+
end
|
330
|
+
|
331
|
+
class RemoveCollectionActor < Hyrax::Actors::AbstractActor
|
332
|
+
# The collection is normally removed by ApplyPermissionTemplateActor, but this test doesn't setup and call that actor.
|
333
|
+
# So we are faking it here and removing it before the GenericWorkActor is called. Otherwise, it tries to save a
|
334
|
+
# property named collection_id which doesn't exist in GenericWork.
|
335
|
+
def create(env)
|
336
|
+
env.attributes.delete(:collection_id)
|
337
|
+
next_actor.create(env)
|
338
|
+
end
|
71
339
|
end
|
72
340
|
end
|