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
data/spec/features/admin_spec.rb
CHANGED
@@ -65,7 +65,6 @@ RSpec.describe 'batch', type: :feature, clean_repo: true, js: true do
|
|
65
65
|
describe 'deleting' do
|
66
66
|
it 'destroys the selected works' do
|
67
67
|
accept_confirm { click_button 'Delete Selected' }
|
68
|
-
expect(page).to have_content('Batch delete complete')
|
69
68
|
expect(GenericWork.count).to be_zero
|
70
69
|
end
|
71
70
|
end
|
@@ -50,7 +50,6 @@ RSpec.describe "Browse Dashboard", type: :feature do
|
|
50
50
|
first('input#check_all').click
|
51
51
|
expect do
|
52
52
|
accept_confirm { click_button('Delete Selected') }
|
53
|
-
expect(page).to have_content('Batch delete complete')
|
54
53
|
end.to change { GenericWork.count }.by(-3)
|
55
54
|
end
|
56
55
|
end
|
@@ -0,0 +1,188 @@
|
|
1
|
+
RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_repo: true, js: true, with_nested_reindexing: true do
|
2
|
+
let(:admin_user) { create(:admin, email: 'admin@example.com') }
|
3
|
+
let(:single_membership_type_1) { create(:collection_type, :not_allow_multiple_membership, title: 'Single-membership 1') }
|
4
|
+
let(:single_membership_type_2) { create(:collection_type, :not_allow_multiple_membership, title: 'Single-membership 2') }
|
5
|
+
let(:multi_membership_type_1) { create(:collection_type, :allow_multiple_membership, title: 'Multi-membership 1') }
|
6
|
+
let(:multi_membership_type_2) { create(:collection_type, :allow_multiple_membership, title: 'Multi-membership 2') }
|
7
|
+
|
8
|
+
before do
|
9
|
+
sign_in admin_user
|
10
|
+
end
|
11
|
+
|
12
|
+
describe 'when both collections support multiple membership' do
|
13
|
+
let(:old_collection) { create(:collection_lw, user: admin_user, collection_type_gid: multi_membership_type_1.gid) }
|
14
|
+
let!(:work) { create(:generic_work, user: admin_user, member_of_collections: [old_collection], title: ['The highly valued work that everyone wants in their collection']) }
|
15
|
+
|
16
|
+
context 'and are of different types' do
|
17
|
+
let!(:new_collection) { create(:collection_lw, user: admin_user, collection_type_gid: multi_membership_type_2.gid) }
|
18
|
+
|
19
|
+
it 'then the work is added to both collections' do
|
20
|
+
# Add to second multi-membership collection of a different type
|
21
|
+
visit '/dashboard/my/works'
|
22
|
+
check 'check_all'
|
23
|
+
click_button 'Add to collection' # opens the modal
|
24
|
+
within('div#collection-list-container') do
|
25
|
+
choose new_collection.title.first # selects the collection
|
26
|
+
click_button 'Save changes'
|
27
|
+
end
|
28
|
+
|
29
|
+
# forwards to collection show page
|
30
|
+
expect(page).to have_content new_collection.title.first
|
31
|
+
expect(page).to have_content 'Works (1)'
|
32
|
+
expect(page).to have_content work.title.first
|
33
|
+
expect(page).to have_selector '.alert-success', text: 'Collection was successfully updated.'
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
context 'and are of the same type' do
|
38
|
+
let!(:new_collection) { create(:collection_lw, user: admin_user, collection_type_gid: multi_membership_type_1.gid) }
|
39
|
+
|
40
|
+
it 'then the work is added to both collections' do
|
41
|
+
# Add to second multi-membership collection of a different type
|
42
|
+
visit '/dashboard/my/works'
|
43
|
+
check 'check_all'
|
44
|
+
click_button 'Add to collection' # opens the modal
|
45
|
+
within('div#collection-list-container') do
|
46
|
+
choose new_collection.title.first # selects the collection
|
47
|
+
click_button 'Save changes'
|
48
|
+
end
|
49
|
+
|
50
|
+
# forwards to collection show page
|
51
|
+
expect(page).to have_content new_collection.title.first
|
52
|
+
expect(page).to have_content 'Works (1)'
|
53
|
+
expect(page).to have_content work.title.first
|
54
|
+
expect(page).to have_selector '.alert-success', text: 'Collection was successfully updated.'
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|
58
|
+
|
59
|
+
describe 'when both collections require single membership' do
|
60
|
+
let(:old_collection) { create(:collection_lw, user: admin_user, collection_type_gid: single_membership_type_1.gid) }
|
61
|
+
let!(:work) { create(:generic_work, user: admin_user, member_of_collections: [old_collection], title: ['The highly valued work that everyone wants in their collection']) }
|
62
|
+
|
63
|
+
context 'and are of different types' do
|
64
|
+
let!(:new_collection) { create(:collection_lw, user: admin_user, collection_type_gid: single_membership_type_2.gid) }
|
65
|
+
|
66
|
+
it 'then the work is added to both collections' do
|
67
|
+
# Add to second single-membership collection of a different type
|
68
|
+
visit '/dashboard/my/works'
|
69
|
+
check 'check_all'
|
70
|
+
click_button 'Add to collection' # opens the modal
|
71
|
+
within('div#collection-list-container') do
|
72
|
+
choose new_collection.title.first # selects the collection
|
73
|
+
click_button 'Save changes'
|
74
|
+
end
|
75
|
+
# forwards to collection show page
|
76
|
+
expect(page).to have_content new_collection.title.first
|
77
|
+
expect(page).to have_content 'Works (1)'
|
78
|
+
expect(page).to have_content work.title.first
|
79
|
+
expect(page).to have_selector '.alert-success', text: 'Collection was successfully updated.'
|
80
|
+
end
|
81
|
+
end
|
82
|
+
|
83
|
+
context 'and are of the same type' do
|
84
|
+
let!(:new_collection) { create(:collection_lw, user: admin_user, collection_type_gid: single_membership_type_1.gid) }
|
85
|
+
|
86
|
+
context 'then the work fails to add to the second collection' do
|
87
|
+
it 'from the dashboard->works batch add to collection' do
|
88
|
+
# Attempt to add to second single-membership collection of the same type
|
89
|
+
visit '/dashboard/my/works'
|
90
|
+
check 'check_all'
|
91
|
+
click_button 'Add to collection' # opens the modal
|
92
|
+
within('div#collection-list-container') do
|
93
|
+
choose new_collection.title.first # selects the collection
|
94
|
+
click_button 'Save changes'
|
95
|
+
end
|
96
|
+
# forwards to collections index page and shows flash message
|
97
|
+
expect(page).to have_link 'All Collections'
|
98
|
+
expect(page).to have_link 'Your Collections'
|
99
|
+
|
100
|
+
err_message = "Error: You have specified more than one of the same single-membership collection types: " \
|
101
|
+
"Single-membership 1 (#{new_collection.title.first} and #{old_collection.title.first})"
|
102
|
+
expect(page).to have_selector '.alert', text: err_message
|
103
|
+
end
|
104
|
+
|
105
|
+
it "from the work's edit form Relationships tab" do
|
106
|
+
skip 'Needs additional work to find and select the second collection'
|
107
|
+
# Attempt to add to second single-membership collection of the same type
|
108
|
+
visit edit_hyrax_generic_work_path(work)
|
109
|
+
click_link "Relationships"
|
110
|
+
# TODO: not sure how to find and select the correct collection
|
111
|
+
|
112
|
+
# forwards to work index page and shows flash message
|
113
|
+
expect(page).to have_link 'All Works'
|
114
|
+
expect(page).to have_link 'Your Works'
|
115
|
+
|
116
|
+
err_message = "Error: You have specified more than one of the same single-membership collection types: " \
|
117
|
+
"Single-membership 1 (Collection 1 for SM1)"
|
118
|
+
expect(page).to have_selector '.alert', text: err_message
|
119
|
+
end
|
120
|
+
|
121
|
+
it "from the collection's show page Add to collection" do
|
122
|
+
# Attempt to add to second single-membership collection of the same type
|
123
|
+
visit "/dashboard/collections/#{new_collection.id}"
|
124
|
+
click_link 'Add existing works'
|
125
|
+
check 'check_all'
|
126
|
+
click_button 'Add to collection' # opens the modal
|
127
|
+
within('div#collection-list-container') do
|
128
|
+
choose new_collection.title.first # selects the collection
|
129
|
+
click_button 'Save changes'
|
130
|
+
end
|
131
|
+
# forwards to collections index page and shows flash message
|
132
|
+
expect(page).to have_link 'All Collections'
|
133
|
+
expect(page).to have_link 'Your Collections'
|
134
|
+
|
135
|
+
err_message = "Error: You have specified more than one of the same single-membership collection types: " \
|
136
|
+
"Single-membership 1 (#{new_collection.title.first} and #{old_collection.title.first})"
|
137
|
+
expect(page).to have_selector '.alert', text: err_message
|
138
|
+
end
|
139
|
+
end
|
140
|
+
end
|
141
|
+
end
|
142
|
+
|
143
|
+
describe 'when adding a work already in a collection' do
|
144
|
+
let!(:work) { create(:generic_work, user: admin_user, member_of_collections: [old_collection], title: ['The highly valued work that everyone wants in their collection']) }
|
145
|
+
|
146
|
+
context 'allowing multi-membership' do
|
147
|
+
let(:old_collection) { create(:collection_lw, user: admin_user, collection_type_gid: multi_membership_type_1.gid) }
|
148
|
+
let!(:new_collection) { old_collection }
|
149
|
+
|
150
|
+
it 'then the add is treated as a success' do
|
151
|
+
# Re-add to same multi-membership collection
|
152
|
+
visit '/dashboard/my/works'
|
153
|
+
check 'check_all'
|
154
|
+
click_button 'Add to collection' # opens the modal
|
155
|
+
within('div#collection-list-container') do
|
156
|
+
choose new_collection.title.first # selects the collection
|
157
|
+
click_button 'Save changes'
|
158
|
+
end
|
159
|
+
# forwards to collection show page
|
160
|
+
expect(page).to have_content new_collection.title.first
|
161
|
+
expect(page).to have_content 'Works (1)'
|
162
|
+
expect(page).to have_content work.title.first
|
163
|
+
expect(page).to have_selector '.alert-success', text: 'Collection was successfully updated.'
|
164
|
+
end
|
165
|
+
end
|
166
|
+
|
167
|
+
context 'requiring single-membership' do
|
168
|
+
let(:old_collection) { create(:collection_lw, user: admin_user, collection_type_gid: single_membership_type_1.gid) }
|
169
|
+
let!(:new_collection) { old_collection }
|
170
|
+
|
171
|
+
it 'then the add is treated as a success' do
|
172
|
+
# Re-add to same single-membership collection
|
173
|
+
visit '/dashboard/my/works'
|
174
|
+
check 'check_all'
|
175
|
+
click_button 'Add to collection' # opens the modal
|
176
|
+
within('div#collection-list-container') do
|
177
|
+
choose new_collection.title.first # selects the collection
|
178
|
+
click_button 'Save changes'
|
179
|
+
end
|
180
|
+
# forwards to collection show page
|
181
|
+
expect(page).to have_content new_collection.title.first
|
182
|
+
expect(page).to have_content 'Works (1)'
|
183
|
+
expect(page).to have_content work.title.first
|
184
|
+
expect(page).to have_selector '.alert-success', text: 'Collection was successfully updated.'
|
185
|
+
end
|
186
|
+
end
|
187
|
+
end
|
188
|
+
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
RSpec.describe 'collection', type: :feature do
|
1
|
+
RSpec.describe 'collection', type: :feature, with_nested_reindexing: true do
|
2
2
|
let(:user) { create(:user) }
|
3
3
|
|
4
4
|
let(:collection1) { create(:public_collection, user: user) }
|
@@ -6,10 +6,12 @@ RSpec.describe 'collection', type: :feature do
|
|
6
6
|
|
7
7
|
describe 'collection show page' do
|
8
8
|
let(:collection) do
|
9
|
-
create(:public_collection, user: user, description: ['collection description'])
|
9
|
+
create(:public_collection, user: user, description: ['collection description'], collection_type_settings: :nestable)
|
10
10
|
end
|
11
11
|
let!(:work1) { create(:work, title: ["King Louie"], member_of_collections: [collection], user: user) }
|
12
12
|
let!(:work2) { create(:work, title: ["King Kong"], member_of_collections: [collection], user: user) }
|
13
|
+
let!(:col1) { create(:public_collection, title: ["Sub-collection 1"], member_of_collections: [collection], user: user) }
|
14
|
+
let!(:col2) { create(:public_collection, title: ["Sub-collection 2"], member_of_collections: [collection], user: user) }
|
13
15
|
|
14
16
|
before do
|
15
17
|
sign_in user
|
@@ -19,15 +21,16 @@ RSpec.describe 'collection', type: :feature do
|
|
19
21
|
it "shows a collection with a listing of Descriptive Metadata and catalog-style search results" do
|
20
22
|
expect(page).to have_content(collection.title.first)
|
21
23
|
expect(page).to have_content(collection.description.first)
|
24
|
+
expect(page).to have_content("Collection Details")
|
22
25
|
# Should not show title and description a second time
|
23
26
|
expect(page).not_to have_css('.metadata-collections', text: collection.title.first)
|
24
27
|
expect(page).not_to have_css('.metadata-collections', text: collection.description.first)
|
25
|
-
# Should not have Collection Descriptive metadata table
|
26
|
-
expect(page).to have_content("Descriptions")
|
27
28
|
# Should have search results / contents listing
|
28
29
|
expect(page).to have_content(work1.title.first)
|
29
30
|
expect(page).to have_content(work2.title.first)
|
30
|
-
expect(page).
|
31
|
+
expect(page).to have_content(col1.title.first)
|
32
|
+
expect(page).to have_content(col2.title.first)
|
33
|
+
expect(page).not_to have_css(".pagination")
|
31
34
|
|
32
35
|
click_link "Gallery"
|
33
36
|
expect(page).to have_content(work1.title.first)
|
@@ -50,16 +53,51 @@ RSpec.describe 'collection', type: :feature do
|
|
50
53
|
expect(page).to have_content(work1.title.first)
|
51
54
|
expect(page).not_to have_content(work2.title.first)
|
52
55
|
end
|
56
|
+
|
57
|
+
context "with a non-nestable collection type" do
|
58
|
+
let(:collection) do
|
59
|
+
build(:public_collection_lw, user: user, description: ['collection description'], collection_type_settings: :not_nestable, with_solr_document: true, with_permission_template: true)
|
60
|
+
end
|
61
|
+
|
62
|
+
it "displays basic information on its show page" do
|
63
|
+
expect(page).to have_content(collection.title.first)
|
64
|
+
expect(page).to have_content(collection.description.first)
|
65
|
+
expect(page).to have_content("Collection Details")
|
66
|
+
end
|
67
|
+
end
|
53
68
|
end
|
54
69
|
|
55
70
|
# TODO: this is just like the block above. Merge them.
|
56
|
-
describe 'show pages of a collection' do
|
71
|
+
describe 'show work pages of a collection' do
|
57
72
|
before do
|
58
73
|
docs = (0..12).map do |n|
|
59
74
|
{ "has_model_ssim" => ["GenericWork"], :id => "zs25x871q#{n}",
|
60
75
|
"depositor_ssim" => [user.user_key],
|
61
76
|
"suppressed_bsi" => false,
|
62
77
|
"member_of_collection_ids_ssim" => [collection.id],
|
78
|
+
"nesting_collection__parent_ids_ssim" => [collection.id],
|
79
|
+
"edit_access_person_ssim" => [user.user_key] }
|
80
|
+
end
|
81
|
+
ActiveFedora::SolrService.add(docs, commit: true)
|
82
|
+
|
83
|
+
sign_in user
|
84
|
+
end
|
85
|
+
let(:collection) { create(:named_collection, user: user) }
|
86
|
+
|
87
|
+
it "shows a collection with a listing of Descriptive Metadata and catalog-style search results" do
|
88
|
+
visit "/collections/#{collection.id}"
|
89
|
+
expect(page).to have_css(".pagination")
|
90
|
+
end
|
91
|
+
end
|
92
|
+
|
93
|
+
describe 'show subcollection pages of a collection' do
|
94
|
+
before do
|
95
|
+
docs = (0..12).map do |n|
|
96
|
+
{ "has_model_ssim" => ["Collection"], :id => "zs25x871q#{n}",
|
97
|
+
"depositor_ssim" => [user.user_key],
|
98
|
+
"suppressed_bsi" => false,
|
99
|
+
"member_of_collection_ids_ssim" => [collection.id],
|
100
|
+
"nesting_collection__parent_ids_ssim" => [collection.id],
|
63
101
|
"edit_access_person_ssim" => [user.user_key] }
|
64
102
|
end
|
65
103
|
ActiveFedora::SolrService.add(docs, commit: true)
|
@@ -70,7 +108,7 @@ RSpec.describe 'collection', type: :feature do
|
|
70
108
|
|
71
109
|
it "shows a collection with a listing of Descriptive Metadata and catalog-style search results" do
|
72
110
|
visit "/collections/#{collection.id}"
|
73
|
-
expect(page).to have_css(".
|
111
|
+
expect(page).to have_css(".pagination")
|
74
112
|
end
|
75
113
|
end
|
76
114
|
end
|
@@ -0,0 +1,338 @@
|
|
1
|
+
RSpec.describe 'collection_type', type: :feature, clean_repo: true do
|
2
|
+
let(:admin_user) { create(:admin) }
|
3
|
+
let(:exhibit_title) { 'Exhibit' }
|
4
|
+
let(:exhibit_description) { 'Description for exhibit collection type.' }
|
5
|
+
let(:exhibit_collection_type) { create(:collection_type, title: exhibit_title, description: exhibit_description, creator_user: admin_user) }
|
6
|
+
let(:user_collection_type) { create(:user_collection_type) }
|
7
|
+
let(:admin_set_type) { create(:admin_set_collection_type) }
|
8
|
+
let(:solr_gid) { Collection.collection_type_gid_document_field_name }
|
9
|
+
|
10
|
+
describe 'index' do
|
11
|
+
before do
|
12
|
+
exhibit_collection_type
|
13
|
+
user_collection_type
|
14
|
+
admin_set_type
|
15
|
+
sign_in admin_user
|
16
|
+
visit '/admin/collection_types'
|
17
|
+
end
|
18
|
+
|
19
|
+
it 'has page title and lists collection types' do
|
20
|
+
expect(page).to have_content 'Collection Types'
|
21
|
+
|
22
|
+
expect(page).to have_content 'Admin Set'
|
23
|
+
expect(page).to have_content 'User Collection'
|
24
|
+
expect(page).to have_content 'Collection Type'
|
25
|
+
|
26
|
+
expect(page).to have_link('Edit', count: 3)
|
27
|
+
expect(page).to have_link('Edit', href: hyrax.edit_admin_collection_type_path(admin_set_type.id, locale: 'en'))
|
28
|
+
expect(page).to have_link('Edit', href: hyrax.edit_admin_collection_type_path(user_collection_type.id, locale: 'en'))
|
29
|
+
expect(page).to have_link('Edit', href: hyrax.edit_admin_collection_type_path(exhibit_collection_type.id, locale: 'en'))
|
30
|
+
expect(page).to have_button('Delete', count: 2) # 1: Collection Type, 2: delete modal
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
34
|
+
describe 'create collection type' do
|
35
|
+
let(:title) { 'Test Type' }
|
36
|
+
let(:description) { 'Description for collection type we are testing.' }
|
37
|
+
|
38
|
+
before do
|
39
|
+
sign_in admin_user
|
40
|
+
visit '/admin/collection_types'
|
41
|
+
end
|
42
|
+
|
43
|
+
it 'makes a new collection type', :js do
|
44
|
+
click_link 'Create new collection type'
|
45
|
+
|
46
|
+
expect(page).to have_content 'Create New Collection Type'
|
47
|
+
|
48
|
+
# confirm only Description tab is visible
|
49
|
+
expect(page).to have_link('Description', href: '#metadata')
|
50
|
+
expect(page).not_to have_link('Settings', href: '#settings')
|
51
|
+
expect(page).not_to have_link('Participants', href: '#participants')
|
52
|
+
|
53
|
+
# confirm metadata fields exist
|
54
|
+
expect(page).to have_selector 'input#collection_type_title'
|
55
|
+
expect(page).to have_selector 'textarea#collection_type_description'
|
56
|
+
|
57
|
+
# set values and save
|
58
|
+
fill_in('Type name', with: title)
|
59
|
+
fill_in('Type description', with: description)
|
60
|
+
|
61
|
+
click_button('Save')
|
62
|
+
|
63
|
+
# confirm values were set
|
64
|
+
expect(page).to have_selector "input#collection_type_title[value='#{title}']"
|
65
|
+
expect(page).to have_selector 'textarea#collection_type_description', text: description
|
66
|
+
|
67
|
+
# confirm all edit tabs are now visible
|
68
|
+
expect(page).to have_link('Description', href: '#metadata')
|
69
|
+
expect(page).to have_link('Settings', href: '#settings')
|
70
|
+
expect(page).to have_link('Participants', href: '#participants')
|
71
|
+
end
|
72
|
+
end
|
73
|
+
|
74
|
+
describe 'edit collection type' do
|
75
|
+
context 'when there are no collections of this type' do
|
76
|
+
let(:title_old) { exhibit_title }
|
77
|
+
let(:description_old) { exhibit_description }
|
78
|
+
let(:title_new) { 'Exhibit modified' }
|
79
|
+
let(:description_new) { 'Change in description for exhibit collection type.' }
|
80
|
+
|
81
|
+
before do
|
82
|
+
exhibit_collection_type
|
83
|
+
sign_in admin_user
|
84
|
+
visit "/admin/collection_types/#{exhibit_collection_type.id}/edit"
|
85
|
+
end
|
86
|
+
|
87
|
+
it 'modifies metadata values of a collection type', :js do
|
88
|
+
expect(page).to have_content "Edit Collection Type: #{title_old}"
|
89
|
+
|
90
|
+
# confirm all tabs are visible
|
91
|
+
expect(page).to have_link('Description', href: '#metadata')
|
92
|
+
expect(page).to have_link('Settings', href: '#settings')
|
93
|
+
expect(page).to have_link('Participants', href: '#participants')
|
94
|
+
|
95
|
+
# confirm metadata fields have original values
|
96
|
+
expect(page).to have_selector "input#collection_type_title[value='#{title_old}']"
|
97
|
+
expect(page).to have_selector 'textarea#collection_type_description', text: description_old
|
98
|
+
|
99
|
+
# set values and save
|
100
|
+
fill_in('Type name', with: title_new)
|
101
|
+
fill_in('Type description', with: description_new)
|
102
|
+
|
103
|
+
click_button('Save changes')
|
104
|
+
|
105
|
+
expect(page).to have_content "Edit Collection Type: #{title_new}"
|
106
|
+
|
107
|
+
# confirm values were set
|
108
|
+
expect(page).to have_selector "input#collection_type_title[value='#{title_new}']"
|
109
|
+
expect(page).to have_selector 'textarea#collection_type_description', text: description_new
|
110
|
+
|
111
|
+
click_link('Settings', href: '#settings')
|
112
|
+
|
113
|
+
# confirm all non-admin_set checkboxes are on
|
114
|
+
expect(page).to have_checked_field('collection_type_nestable')
|
115
|
+
expect(page).to have_checked_field('collection_type_discoverable')
|
116
|
+
expect(page).to have_checked_field('collection_type_sharable')
|
117
|
+
expect(page).to have_checked_field('collection_type_share_applies_to_new_works')
|
118
|
+
expect(page).to have_checked_field('collection_type_allow_multiple_membership')
|
119
|
+
|
120
|
+
# confirm all admin_set only checkboxes are off and disabled
|
121
|
+
expect(page).to have_unchecked_field('collection_type_require_membership', disabled: true)
|
122
|
+
expect(page).to have_unchecked_field('collection_type_assigns_workflow', disabled: true)
|
123
|
+
expect(page).to have_unchecked_field('collection_type_assigns_visibility', disabled: true)
|
124
|
+
|
125
|
+
# change settings
|
126
|
+
page.uncheck('NESTABLE')
|
127
|
+
page.uncheck('DISCOVERY')
|
128
|
+
page.check('APPLY TO NEW WORKS')
|
129
|
+
page.uncheck('MULTIPLE MEMBERSHIP')
|
130
|
+
|
131
|
+
# confirm all non-admin_set checkboxes are now off
|
132
|
+
expect(page).to have_unchecked_field('collection_type_nestable')
|
133
|
+
expect(page).to have_unchecked_field('collection_type_discoverable')
|
134
|
+
expect(page).to have_checked_field('collection_type_sharable')
|
135
|
+
expect(page).to have_checked_field('collection_type_share_applies_to_new_works')
|
136
|
+
expect(page).to have_unchecked_field('collection_type_allow_multiple_membership')
|
137
|
+
|
138
|
+
# uncheck sharable should disable sharable options
|
139
|
+
page.uncheck('SHARING')
|
140
|
+
|
141
|
+
expect(page).to have_unchecked_field('collection_type_sharable')
|
142
|
+
expect(page).to have_unchecked_field('collection_type_share_applies_to_new_works', disabled: true)
|
143
|
+
|
144
|
+
# check sharable should enable sharable options
|
145
|
+
page.check('SHARING')
|
146
|
+
|
147
|
+
expect(page).to have_checked_field('collection_type_sharable')
|
148
|
+
expect(page).to have_unchecked_field('collection_type_share_applies_to_new_works', disabled: false)
|
149
|
+
|
150
|
+
click_link('Participants')
|
151
|
+
|
152
|
+
# TODO: Test adding participants
|
153
|
+
end
|
154
|
+
|
155
|
+
context 'when editing default user collection type' do
|
156
|
+
let(:title_old) { user_collection_type.title }
|
157
|
+
let(:description_old) { user_collection_type.description }
|
158
|
+
let(:title_new) { 'User Collection modified' }
|
159
|
+
let(:description_new) { 'Change in description for user collection type.' }
|
160
|
+
|
161
|
+
before do
|
162
|
+
user_collection_type
|
163
|
+
sign_in admin_user
|
164
|
+
visit "/admin/collection_types/#{user_collection_type.id}/edit"
|
165
|
+
end
|
166
|
+
|
167
|
+
it 'allows editing of metadata, but not settings', :js do
|
168
|
+
expect(page).to have_content "Edit Collection Type: #{title_old}"
|
169
|
+
|
170
|
+
# confirm metadata fields have original values
|
171
|
+
expect(page).to have_selector "input#collection_type_title[value='#{title_old}']"
|
172
|
+
expect(page).to have_selector 'textarea#collection_type_description', text: description_old
|
173
|
+
|
174
|
+
# set values and save
|
175
|
+
fill_in('Type name', with: title_new)
|
176
|
+
fill_in('Type description', with: description_new)
|
177
|
+
|
178
|
+
click_button('Save changes')
|
179
|
+
|
180
|
+
expect(page).to have_content "Edit Collection Type: #{title_new}"
|
181
|
+
|
182
|
+
# confirm values were set
|
183
|
+
expect(page).to have_selector "input#collection_type_title[value='#{title_new}']"
|
184
|
+
expect(page).to have_selector 'textarea#collection_type_description', text: description_new
|
185
|
+
|
186
|
+
click_link('Settings', href: '#settings')
|
187
|
+
|
188
|
+
# confirm default user collection checkboxes are set to appropriate values
|
189
|
+
expect(page).to have_checked_field('collection_type_nestable', disabled: true)
|
190
|
+
expect(page).to have_checked_field('collection_type_discoverable', disabled: true)
|
191
|
+
expect(page).to have_checked_field('collection_type_sharable', disabled: true)
|
192
|
+
expect(page).to have_unchecked_field('collection_type_share_applies_to_new_works', disabled: true)
|
193
|
+
expect(page).to have_checked_field('collection_type_allow_multiple_membership', disabled: true)
|
194
|
+
|
195
|
+
# confirm all admin_set only checkboxes are off and disabled
|
196
|
+
expect(page).to have_unchecked_field('collection_type_require_membership', disabled: true)
|
197
|
+
expect(page).to have_unchecked_field('collection_type_assigns_workflow', disabled: true)
|
198
|
+
expect(page).to have_unchecked_field('collection_type_assigns_visibility', disabled: true)
|
199
|
+
end
|
200
|
+
end
|
201
|
+
|
202
|
+
context 'when editing admin set collection type' do
|
203
|
+
let(:title_old) { admin_set_type.title }
|
204
|
+
let(:description_old) { admin_set_type.description }
|
205
|
+
let(:description_new) { 'Change in description for admin set collection type.' }
|
206
|
+
|
207
|
+
before do
|
208
|
+
admin_set_type
|
209
|
+
sign_in admin_user
|
210
|
+
visit "/admin/collection_types/#{admin_set_type.id}/edit"
|
211
|
+
end
|
212
|
+
|
213
|
+
it 'allows editing of metadata except title, but not settings', :js do
|
214
|
+
expect(page).to have_content "Edit Collection Type: #{title_old}"
|
215
|
+
|
216
|
+
# confirm metadata fields have original values
|
217
|
+
expect(page).to have_field("collection_type_title", disabled: true)
|
218
|
+
expect(page).to have_selector 'textarea#collection_type_description', text: description_old
|
219
|
+
|
220
|
+
# set values and save
|
221
|
+
fill_in('Type description', with: description_new)
|
222
|
+
|
223
|
+
click_button('Save changes')
|
224
|
+
|
225
|
+
expect(page).to have_content "Edit Collection Type: #{title_old}"
|
226
|
+
|
227
|
+
# confirm values were set
|
228
|
+
expect(page).to have_selector 'textarea#collection_type_description', text: description_new
|
229
|
+
|
230
|
+
click_link('Settings', href: '#settings')
|
231
|
+
|
232
|
+
# confirm default user collection checkboxes are set to appropriate values
|
233
|
+
expect(page).to have_unchecked_field('collection_type_nestable', disabled: true)
|
234
|
+
expect(page).to have_unchecked_field('collection_type_discoverable', disabled: true)
|
235
|
+
expect(page).to have_checked_field('collection_type_sharable', disabled: true)
|
236
|
+
expect(page).to have_checked_field('collection_type_share_applies_to_new_works', disabled: true)
|
237
|
+
expect(page).to have_unchecked_field('collection_type_allow_multiple_membership', disabled: true)
|
238
|
+
|
239
|
+
# confirm all admin_set only checkboxes are off and disabled
|
240
|
+
expect(page).to have_checked_field('collection_type_require_membership', disabled: true)
|
241
|
+
expect(page).to have_checked_field('collection_type_assigns_workflow', disabled: true)
|
242
|
+
expect(page).to have_checked_field('collection_type_assigns_visibility', disabled: true)
|
243
|
+
end
|
244
|
+
end
|
245
|
+
end
|
246
|
+
|
247
|
+
context 'when collections exist of this type' do
|
248
|
+
let!(:collection1) { create(:public_collection, user: build(:user), collection_type_gid: exhibit_collection_type.gid) }
|
249
|
+
|
250
|
+
before do
|
251
|
+
exhibit_collection_type
|
252
|
+
sign_in admin_user
|
253
|
+
visit "/admin/collection_types/#{exhibit_collection_type.id}/edit"
|
254
|
+
end
|
255
|
+
|
256
|
+
it 'all settings are disabled', :js do
|
257
|
+
expect(exhibit_collection_type.collections?).to be true
|
258
|
+
|
259
|
+
click_link('Settings', href: '#settings')
|
260
|
+
|
261
|
+
# confirm all checkboxes are disabled
|
262
|
+
expect(page).to have_field('collection_type_nestable', disabled: true)
|
263
|
+
expect(page).to have_field('collection_type_discoverable', disabled: true)
|
264
|
+
expect(page).to have_field('collection_type_sharable', disabled: true)
|
265
|
+
expect(page).to have_field('collection_type_share_applies_to_new_works', disabled: true)
|
266
|
+
expect(page).to have_field('collection_type_allow_multiple_membership', disabled: true)
|
267
|
+
expect(page).to have_field('collection_type_require_membership', disabled: true)
|
268
|
+
expect(page).to have_field('collection_type_assigns_workflow', disabled: true)
|
269
|
+
expect(page).to have_field('collection_type_assigns_visibility', disabled: true)
|
270
|
+
end
|
271
|
+
end
|
272
|
+
end
|
273
|
+
|
274
|
+
describe 'delete collection type' do
|
275
|
+
context 'when there are no collections of this type' do
|
276
|
+
let!(:empty_collection_type) { create(:collection_type, title: 'Empty Type', creator_user: admin_user) }
|
277
|
+
let!(:delete_modal_text) { 'Deleting this collection type will permanently remove the type and its settings from the repository. Are you sure you want to delete this collection type?' }
|
278
|
+
|
279
|
+
before do
|
280
|
+
sign_in admin_user
|
281
|
+
visit '/admin/collection_types'
|
282
|
+
end
|
283
|
+
|
284
|
+
it 'shows warning and deletes collection type', :js do
|
285
|
+
expect(page).to have_content(empty_collection_type.title)
|
286
|
+
|
287
|
+
find(:xpath, "//tr[td[contains(.,'#{empty_collection_type.title}')]]/td/button", text: 'Delete').click
|
288
|
+
|
289
|
+
within('div#deleteModal') do
|
290
|
+
expect(page).to have_content(delete_modal_text)
|
291
|
+
click_button('Delete')
|
292
|
+
end
|
293
|
+
|
294
|
+
expect(page).not_to have_content(empty_collection_type.title)
|
295
|
+
end
|
296
|
+
end
|
297
|
+
|
298
|
+
context 'when collections exist of this type' do
|
299
|
+
let!(:not_empty_collection_type) { create(:collection_type, title: 'Not Empty Type', creator_user: admin_user) }
|
300
|
+
let!(:collection1) { create(:public_collection, user: admin_user, collection_type_gid: not_empty_collection_type.gid) }
|
301
|
+
let(:deny_delete_modal_text) do
|
302
|
+
'You cannot delete this collection type because one or more collections of this type have already been created. ' \
|
303
|
+
'To delete this collection type, first ensure that all collections of this type have been deleted.'
|
304
|
+
end
|
305
|
+
|
306
|
+
before do
|
307
|
+
sign_in admin_user
|
308
|
+
visit '/admin/collection_types'
|
309
|
+
end
|
310
|
+
|
311
|
+
it 'shows unable to delete dialog and forwards to All Collections with filter applied', :js do
|
312
|
+
expect(page).to have_content(not_empty_collection_type.title)
|
313
|
+
|
314
|
+
find(:xpath, "//tr[td[contains(.,'#{not_empty_collection_type.title}')]]/td/button", text: 'Delete').click
|
315
|
+
|
316
|
+
within('div#deleteDenyModal') do
|
317
|
+
expect(page).to have_content(deny_delete_modal_text)
|
318
|
+
click_link('View collections of this type')
|
319
|
+
end
|
320
|
+
|
321
|
+
# forwards to Dashboard -> Collections -> All Collections
|
322
|
+
within('li.active') do
|
323
|
+
expect(page).to have_link('All Collections')
|
324
|
+
end
|
325
|
+
|
326
|
+
# filter is applied
|
327
|
+
within('div#appliedParams') do
|
328
|
+
expect(page).to have_content('Filtering by:')
|
329
|
+
expect(page).to have_content('Type')
|
330
|
+
expect(page).to have_content(not_empty_collection_type.title)
|
331
|
+
end
|
332
|
+
|
333
|
+
# collection of this type is in the list of collections
|
334
|
+
expect(page).to have_content(collection1.title.first)
|
335
|
+
end
|
336
|
+
end
|
337
|
+
end
|
338
|
+
end
|