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
@@ -1,12 +1,66 @@
|
|
1
1
|
FactoryBot.define do
|
2
2
|
factory :collection do
|
3
|
+
# DEPRECATION: This factory is being replaced by collection_lw defined in collections.rb. New tests should use the
|
4
|
+
# light weight collection factory. DO NOT ADD tests using this factory.
|
5
|
+
#
|
6
|
+
# rubocop:disable Metrics/LineLength
|
7
|
+
# @example let(:collection) { build(:collection, collection_type_settings: [:not_nestable, :discoverable, :sharable, :allow_multiple_membership], with_nesting_attributes: {ancestors: [], parent_ids: [], pathnames: [], depth: 1}) }
|
8
|
+
# rubocop:enable Metrics/LineLength
|
9
|
+
|
10
|
+
# Regarding testing nested collections:
|
11
|
+
# To get the nested collection solr fields in the solr document for query purposes there are two options:
|
12
|
+
# => 1) use create(:collection) and add "with_nested_reindexing: true" to the spec will force the collection to be
|
13
|
+
# created and run through the entire indexing.
|
14
|
+
# => when you need a permission template AND nesting fields in the solr_document
|
15
|
+
# => certain ability tests (:discover, for example) require the permission template be created
|
16
|
+
# => 2) use build(:collection) and add with_nesting_attributes: {ancestors: [], parent_ids: [], pathnames: [], depth: 1}
|
17
|
+
# to the build the collection and create a solr document using the given nesting attributes
|
18
|
+
# => this can be used to speed up the specs when a made-up solr document is adequate and no permission template is required
|
19
|
+
|
3
20
|
transient do
|
4
|
-
user {
|
21
|
+
user { create(:user) }
|
22
|
+
# allow defaulting to default user collection
|
23
|
+
collection_type_settings nil
|
24
|
+
with_permission_template false
|
25
|
+
create_access false
|
26
|
+
with_nesting_attributes nil
|
5
27
|
end
|
6
28
|
sequence(:title) { |n| ["Title #{n}"] }
|
7
29
|
|
8
|
-
after(:build) do |
|
9
|
-
|
30
|
+
after(:build) do |collection, evaluator|
|
31
|
+
collection.apply_depositor_metadata(evaluator.user.user_key)
|
32
|
+
if evaluator.collection_type_settings.present?
|
33
|
+
collection.collection_type = create(:collection_type, *evaluator.collection_type_settings)
|
34
|
+
elsif collection.collection_type_gid.nil?
|
35
|
+
collection.collection_type = create(:user_collection_type)
|
36
|
+
end
|
37
|
+
|
38
|
+
# if requested, create a solr document and add the nesting fields into it
|
39
|
+
# when a nestable collection is built. This reduces the need to use
|
40
|
+
# create and :with_nested_indexing for nested collection testing
|
41
|
+
if evaluator.with_nesting_attributes.present? && collection.nestable?
|
42
|
+
Hyrax::Adapters::NestingIndexAdapter.add_nesting_attributes(
|
43
|
+
solr_doc: evaluator.to_solr,
|
44
|
+
ancestors: evaluator.with_nesting_attributes[:ancestors],
|
45
|
+
parent_ids: evaluator.with_nesting_attributes[:parent_ids],
|
46
|
+
pathnames: evaluator.with_nesting_attributes[:pathnames],
|
47
|
+
depth: evaluator.with_nesting_attributes[:depth]
|
48
|
+
)
|
49
|
+
end
|
50
|
+
end
|
51
|
+
|
52
|
+
after(:create) do |collection, evaluator|
|
53
|
+
# create the permission template if it was requested, OR if nested reindexing is included (so we can apply the user's
|
54
|
+
# permissions). Nested indexing requires that the user's permissions be saved on the Fedora object... if simply in
|
55
|
+
# local memory, they are lost when the adapter pulls the object from Fedora to reindex.
|
56
|
+
if evaluator.with_permission_template || evaluator.create_access || RSpec.current_example.metadata[:with_nested_reindexing]
|
57
|
+
attributes = { source_id: collection.id }
|
58
|
+
attributes[:manage_users] = CollectionFactoryHelper.user_managers(evaluator.with_permission_template, evaluator.user,
|
59
|
+
(evaluator.create_access || RSpec.current_example.metadata[:with_nested_reindexing]))
|
60
|
+
attributes = evaluator.with_permission_template.merge(attributes) if evaluator.with_permission_template.respond_to?(:merge)
|
61
|
+
create(:permission_template, attributes) unless Hyrax::PermissionTemplate.find_by(source_id: collection.id)
|
62
|
+
collection.reset_access_controls!
|
63
|
+
end
|
10
64
|
end
|
11
65
|
|
12
66
|
factory :public_collection, traits: [:public]
|
@@ -28,4 +82,53 @@ FactoryBot.define do
|
|
28
82
|
description ['collection description']
|
29
83
|
end
|
30
84
|
end
|
85
|
+
|
86
|
+
factory :user_collection, class: Collection do
|
87
|
+
transient do
|
88
|
+
user { create(:user) }
|
89
|
+
end
|
90
|
+
|
91
|
+
sequence(:title) { |n| ["Title #{n}"] }
|
92
|
+
|
93
|
+
after(:build) do |collection, evaluator|
|
94
|
+
collection.apply_depositor_metadata(evaluator.user.user_key)
|
95
|
+
collection_type = create(:user_collection_type)
|
96
|
+
collection.collection_type_gid = collection_type.gid
|
97
|
+
end
|
98
|
+
end
|
99
|
+
|
100
|
+
factory :typeless_collection, class: Collection do
|
101
|
+
# To create a pre-Hyrax 2.1.0 collection without a collection type gid...
|
102
|
+
# col = build(:typeless_collection, ...)
|
103
|
+
# col.save(validate: false)
|
104
|
+
transient do
|
105
|
+
user { create(:user) }
|
106
|
+
with_permission_template false
|
107
|
+
create_access false
|
108
|
+
do_save false
|
109
|
+
end
|
110
|
+
|
111
|
+
sequence(:title) { |n| ["Title #{n}"] }
|
112
|
+
|
113
|
+
after(:build) do |collection, evaluator|
|
114
|
+
collection.apply_depositor_metadata(evaluator.user.user_key)
|
115
|
+
collection.save(validate: false) if evaluator.do_save || evaluator.with_permission_template
|
116
|
+
if evaluator.with_permission_template
|
117
|
+
attributes = { source_id: collection.id }
|
118
|
+
attributes[:manage_users] = [evaluator.user] if evaluator.create_access
|
119
|
+
attributes = evaluator.with_permission_template.merge(attributes) if evaluator.with_permission_template.respond_to?(:merge)
|
120
|
+
create(:permission_template, attributes) unless Hyrax::PermissionTemplate.find_by(source_id: collection.id)
|
121
|
+
end
|
122
|
+
end
|
123
|
+
end
|
124
|
+
|
125
|
+
class CollectionFactoryHelper
|
126
|
+
def self.user_managers(permission_template_attributes, creator_user, include_creator = false)
|
127
|
+
managers = []
|
128
|
+
managers << creator_user.user_key if include_creator
|
129
|
+
return managers unless permission_template_attributes.respond_to?(:merge)
|
130
|
+
return managers unless permission_template_attributes.key?(:manage_users)
|
131
|
+
managers + permission_template_attributes[:manage_users]
|
132
|
+
end
|
133
|
+
end
|
31
134
|
end
|
data/spec/factories/file_sets.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
FactoryBot.define do
|
2
2
|
factory :file_set do
|
3
3
|
transient do
|
4
|
-
user {
|
4
|
+
user { create(:user) }
|
5
5
|
content nil
|
6
6
|
end
|
7
7
|
after(:build) do |fs, evaluator|
|
@@ -30,7 +30,7 @@ FactoryBot.define do
|
|
30
30
|
if evaluator.content
|
31
31
|
Hydra::Works::UploadFileToFileSet.call(file, evaluator.content)
|
32
32
|
end
|
33
|
-
|
33
|
+
create(:work, user: evaluator.user).members << file
|
34
34
|
end
|
35
35
|
end
|
36
36
|
end
|
@@ -1,7 +1,7 @@
|
|
1
1
|
FactoryBot.define do
|
2
2
|
factory :work, aliases: [:generic_work, :private_generic_work], class: GenericWork do
|
3
3
|
transient do
|
4
|
-
user {
|
4
|
+
user { create(:user) }
|
5
5
|
# Set to true (or a hash) if you want to create an admin set
|
6
6
|
with_admin_set false
|
7
7
|
end
|
@@ -18,6 +18,10 @@ FactoryBot.define do
|
|
18
18
|
end
|
19
19
|
end
|
20
20
|
|
21
|
+
after(:create) do |work, _evaluator|
|
22
|
+
work.save! if work.member_of_collections.present?
|
23
|
+
end
|
24
|
+
|
21
25
|
title ["Test title"]
|
22
26
|
visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
|
23
27
|
|
@@ -31,51 +35,55 @@ FactoryBot.define do
|
|
31
35
|
visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
|
32
36
|
end
|
33
37
|
|
38
|
+
factory :private_work do
|
39
|
+
visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
|
40
|
+
end
|
41
|
+
|
34
42
|
factory :registered_generic_work do
|
35
43
|
read_groups ["registered"]
|
36
44
|
end
|
37
45
|
|
38
46
|
factory :work_with_one_file do
|
39
47
|
before(:create) do |work, evaluator|
|
40
|
-
work.ordered_members <<
|
48
|
+
work.ordered_members << create(:file_set, user: evaluator.user, title: ['A Contained FileSet'], label: 'filename.pdf')
|
41
49
|
end
|
42
50
|
end
|
43
51
|
|
44
52
|
factory :work_with_files do
|
45
|
-
before(:create) { |work, evaluator| 2.times { work.ordered_members <<
|
53
|
+
before(:create) { |work, evaluator| 2.times { work.ordered_members << create(:file_set, user: evaluator.user) } }
|
46
54
|
end
|
47
55
|
|
48
56
|
factory :work_with_ordered_files do
|
49
57
|
before(:create) do |work, evaluator|
|
50
|
-
work.ordered_members <<
|
51
|
-
work.ordered_member_proxies.insert_target_at(0,
|
58
|
+
work.ordered_members << create(:file_set, user: evaluator.user)
|
59
|
+
work.ordered_member_proxies.insert_target_at(0, create(:file_set, user: evaluator.user))
|
52
60
|
end
|
53
61
|
end
|
54
62
|
|
55
63
|
factory :work_with_one_child do
|
56
64
|
before(:create) do |work, evaluator|
|
57
|
-
work.ordered_members <<
|
65
|
+
work.ordered_members << create(:work, user: evaluator.user, title: ['A Contained Work'])
|
58
66
|
end
|
59
67
|
end
|
60
68
|
|
61
69
|
factory :work_with_two_children do
|
62
70
|
before(:create) do |work, evaluator|
|
63
|
-
work.ordered_members <<
|
64
|
-
work.ordered_members <<
|
71
|
+
work.ordered_members << create(:work, user: evaluator.user, title: ['A Contained Work'], id: "BlahBlah1")
|
72
|
+
work.ordered_members << create(:work, user: evaluator.user, title: ['Another Contained Work'], id: "BlahBlah2")
|
65
73
|
end
|
66
74
|
end
|
67
75
|
|
68
76
|
factory :work_with_representative_file do
|
69
77
|
before(:create) do |work, evaluator|
|
70
|
-
work.ordered_members <<
|
78
|
+
work.ordered_members << create(:file_set, user: evaluator.user, title: ['A Contained FileSet'])
|
71
79
|
work.representative_id = work.members[0].id
|
72
80
|
end
|
73
81
|
end
|
74
82
|
|
75
83
|
factory :work_with_file_and_work do
|
76
84
|
before(:create) do |work, evaluator|
|
77
|
-
work.ordered_members <<
|
78
|
-
work.ordered_members <<
|
85
|
+
work.ordered_members << create(:file_set, user: evaluator.user)
|
86
|
+
work.ordered_members << create(:work, user: evaluator.user)
|
79
87
|
end
|
80
88
|
end
|
81
89
|
|
@@ -90,7 +98,7 @@ FactoryBot.define do
|
|
90
98
|
end
|
91
99
|
factory :embargoed_work_with_files do
|
92
100
|
after(:build) { |work, evaluator| work.apply_embargo(evaluator.embargo_date, evaluator.current_state, evaluator.future_state) }
|
93
|
-
after(:create) { |work, evaluator| 2.times { work.ordered_members <<
|
101
|
+
after(:create) { |work, evaluator| 2.times { work.ordered_members << create(:file_set, user: evaluator.user) } }
|
94
102
|
end
|
95
103
|
end
|
96
104
|
|
@@ -105,7 +113,7 @@ FactoryBot.define do
|
|
105
113
|
end
|
106
114
|
factory :leased_work_with_files do
|
107
115
|
after(:build) { |work, evaluator| work.apply_lease(evaluator.lease_date, evaluator.current_state, evaluator.future_state) }
|
108
|
-
after(:create) { |work, evaluator| 2.times { work.ordered_members <<
|
116
|
+
after(:create) { |work, evaluator| 2.times { work.ordered_members << create(:file_set, user: evaluator.user) } }
|
109
117
|
end
|
110
118
|
end
|
111
119
|
end
|
@@ -113,6 +121,6 @@ FactoryBot.define do
|
|
113
121
|
# Doesn't set up any edit_users
|
114
122
|
factory :work_without_access, class: GenericWork do
|
115
123
|
title ['Test title']
|
116
|
-
depositor {
|
124
|
+
depositor { create(:user).user_key }
|
117
125
|
end
|
118
126
|
end
|
@@ -1,23 +1,36 @@
|
|
1
1
|
FactoryBot.define do
|
2
2
|
factory :permission_template, class: Hyrax::PermissionTemplate do
|
3
3
|
# Given that there is a one to one strong relation between permission_template and admin_set,
|
4
|
-
# with a unique index on the
|
5
|
-
sequence(:
|
4
|
+
# with a unique index on the source_id, I don't want to have duplication in source_id
|
5
|
+
sequence(:source_id) { |n| format("%010d", n) }
|
6
6
|
|
7
7
|
before(:create) do |permission_template, evaluator|
|
8
8
|
if evaluator.with_admin_set
|
9
|
-
|
9
|
+
source_id = permission_template.source_id
|
10
10
|
admin_set =
|
11
|
-
if
|
11
|
+
if source_id.present?
|
12
12
|
begin
|
13
|
-
AdminSet.find(
|
14
|
-
rescue
|
15
|
-
create(:admin_set, id:
|
13
|
+
AdminSet.find(source_id)
|
14
|
+
rescue ActiveFedora::ObjectNotFoundError
|
15
|
+
create(:admin_set, id: source_id)
|
16
16
|
end
|
17
17
|
else
|
18
18
|
create(:admin_set)
|
19
19
|
end
|
20
|
-
permission_template.
|
20
|
+
permission_template.source_id = admin_set.id
|
21
|
+
elsif evaluator.with_collection
|
22
|
+
source_id = permission_template.source_id
|
23
|
+
collection =
|
24
|
+
if source_id.present?
|
25
|
+
begin
|
26
|
+
Collection.find(source_id)
|
27
|
+
rescue ActiveFedora::ObjectNotFoundError
|
28
|
+
create(:collection, id: source_id)
|
29
|
+
end
|
30
|
+
else
|
31
|
+
create(:collection)
|
32
|
+
end
|
33
|
+
permission_template.source_id = collection.id
|
21
34
|
end
|
22
35
|
end
|
23
36
|
|
@@ -30,12 +43,37 @@ FactoryBot.define do
|
|
30
43
|
workflow = create(:workflow, active: true, permission_template: permission_template)
|
31
44
|
create(:workflow_action, workflow: workflow) # Need to create a single action that can be taken
|
32
45
|
end
|
46
|
+
AccessHelper.create_access(permission_template, 'user', :manage, evaluator.manage_users) if evaluator.manage_users.present?
|
47
|
+
AccessHelper.create_access(permission_template, 'group', :manage, evaluator.manage_groups) if evaluator.manage_groups.present?
|
48
|
+
AccessHelper.create_access(permission_template, 'user', :deposit, evaluator.deposit_users) if evaluator.deposit_users.present?
|
49
|
+
AccessHelper.create_access(permission_template, 'group', :deposit, evaluator.deposit_groups) if evaluator.deposit_groups.present?
|
50
|
+
AccessHelper.create_access(permission_template, 'user', :view, evaluator.view_users) if evaluator.view_users.present?
|
51
|
+
AccessHelper.create_access(permission_template, 'group', :view, evaluator.view_groups) if evaluator.view_groups.present?
|
33
52
|
end
|
34
53
|
|
35
54
|
transient do
|
36
55
|
with_admin_set false
|
56
|
+
with_collection false
|
37
57
|
with_workflows false
|
38
58
|
with_active_workflow false
|
59
|
+
manage_users nil
|
60
|
+
manage_groups nil
|
61
|
+
deposit_users nil
|
62
|
+
deposit_groups nil
|
63
|
+
view_users nil
|
64
|
+
view_groups nil
|
65
|
+
end
|
66
|
+
end
|
67
|
+
|
68
|
+
class AccessHelper
|
69
|
+
def self.create_access(permission_template_id, agent_type, access, agent_ids)
|
70
|
+
agent_ids.each do |agent_id|
|
71
|
+
FactoryBot.create(:permission_template_access,
|
72
|
+
access,
|
73
|
+
permission_template: permission_template_id,
|
74
|
+
agent_type: agent_type,
|
75
|
+
agent_id: agent_id)
|
76
|
+
end
|
39
77
|
end
|
40
78
|
end
|
41
79
|
end
|
data/spec/factories/users.rb
CHANGED
@@ -0,0 +1,211 @@
|
|
1
|
+
RSpec.describe 'Collections Factory' do # rubocop:disable RSpec/DescribeClass
|
2
|
+
let(:user) { build(:user, email: 'user@example.com') }
|
3
|
+
let(:user_mgr) { build(:user, email: 'user_mgr@example.com') }
|
4
|
+
let(:user_dep) { build(:user, email: 'user_dep@example.com') }
|
5
|
+
let(:user_vw) { build(:user, email: 'user_vw@example.com') }
|
6
|
+
let(:collection_type) { create(:collection_type) }
|
7
|
+
|
8
|
+
describe 'build' do
|
9
|
+
context 'with collection_type_settings and/or collection_type_gid' do
|
10
|
+
it 'will use the default User Collection type when neither is specified' do
|
11
|
+
col = build(:collection_lw)
|
12
|
+
expect(col.collection_type.title).to eq 'User Collection'
|
13
|
+
expect(col.collection_type.machine_id).to eq 'user_collection'
|
14
|
+
end
|
15
|
+
|
16
|
+
it 'uses collection type for passed in collection_type_gid when collection_type_settings is nil' do
|
17
|
+
col = build(:collection_lw, collection_type_gid: collection_type.gid)
|
18
|
+
expect(col.collection_type_gid).to eq collection_type.gid
|
19
|
+
end
|
20
|
+
|
21
|
+
it 'ignores collection_type_gid when collection_type_settings is set to attributes identifying settings' do
|
22
|
+
col = build(:collection_lw, collection_type_settings: [:not_discoverable, :not_sharable], collection_type_gid: collection_type.gid)
|
23
|
+
expect(col.collection_type_gid).not_to eq collection_type.gid
|
24
|
+
end
|
25
|
+
|
26
|
+
it 'will create a collection type when collection_type_settings is set to attributes identifying settings' do
|
27
|
+
expect { build(:collection_lw, collection_type_settings: [:discoverable]) }.to change { Hyrax::CollectionType.count }.by(1)
|
28
|
+
expect { build(:collection_lw, collection_type_settings: [:not_discoverable, :not_sharable]) }.to change { Hyrax::CollectionType.count }.by(1)
|
29
|
+
end
|
30
|
+
|
31
|
+
it 'will create a collection type with specified settings when collection_type_settings is set to attributes identifying settings' do
|
32
|
+
col = build(:collection_lw, collection_type_settings: [:not_discoverable, :not_sharable, :nestable])
|
33
|
+
expect(col.collection_type.discoverable?).to be false
|
34
|
+
expect(col.collection_type.sharable?).to be false
|
35
|
+
expect(col.collection_type.nestable?).to be true
|
36
|
+
end
|
37
|
+
end
|
38
|
+
|
39
|
+
context 'with_permission_template' do
|
40
|
+
it 'will not create a permission template or access when it is the default value of false' do
|
41
|
+
expect { build(:collection_lw) }.not_to change { Hyrax::PermissionTemplate.count }
|
42
|
+
expect { build(:collection_lw) }.not_to change { Hyrax::PermissionTemplateAccess.count }
|
43
|
+
end
|
44
|
+
|
45
|
+
it 'will create a permission template and one access for the creating user when set to true' do
|
46
|
+
expect { build(:collection_lw, with_permission_template: true) }.to change { Hyrax::PermissionTemplate.count }.by(1)
|
47
|
+
expect { build(:collection_lw, with_permission_template: true) }.to change { Hyrax::PermissionTemplateAccess.count }.by(1)
|
48
|
+
end
|
49
|
+
|
50
|
+
it 'will create a permission template and access for each user specified when it is set to attributes identifying access' do
|
51
|
+
expect { build(:collection_lw, with_permission_template: { manage_users: [user_mgr] }) }.to change { Hyrax::PermissionTemplate.count }.by(1)
|
52
|
+
expect { build(:collection_lw, with_permission_template: { manage_users: [user_mgr] }) }.to change { Hyrax::PermissionTemplateAccess.count }.by(2)
|
53
|
+
expect { build(:collection_lw, with_permission_template: { manage_users: [user_mgr], deposit_users: [user_dep], view_users: [user_vw] }) }
|
54
|
+
.to change { Hyrax::PermissionTemplate.count }.by(1)
|
55
|
+
expect { build(:collection_lw, with_permission_template: { manage_users: [user_mgr], deposit_users: [user_dep], view_users: [user_vw] }) }
|
56
|
+
.to change { Hyrax::PermissionTemplateAccess.count }.by(4)
|
57
|
+
end
|
58
|
+
end
|
59
|
+
|
60
|
+
context 'with_solr_document' do
|
61
|
+
it 'will not created a solr document by default' do
|
62
|
+
col = build(:collection_lw)
|
63
|
+
expect(col.id).to eq nil # no real way to confirm a solr document wasn't created if the collection doesn't have an id
|
64
|
+
end
|
65
|
+
|
66
|
+
context 'true' do
|
67
|
+
let(:col) { build(:collection_lw, with_solr_document: true) }
|
68
|
+
|
69
|
+
subject { ActiveFedora::SolrService.get("id:#{col.id}")["response"]["docs"].first }
|
70
|
+
|
71
|
+
it 'will created a solr document' do
|
72
|
+
expect(subject["id"]).to eq col.id
|
73
|
+
expect(subject["has_model_ssim"].first).to eq "Collection"
|
74
|
+
expect(subject["edit_access_person_ssim"]).not_to be_blank
|
75
|
+
end
|
76
|
+
end
|
77
|
+
|
78
|
+
context 'true and with_permission_template defines additional access' do
|
79
|
+
let(:col) do
|
80
|
+
build(:collection_lw, user: user,
|
81
|
+
with_solr_document: true,
|
82
|
+
with_permission_template: { manage_users: [user_mgr],
|
83
|
+
deposit_users: [user_dep],
|
84
|
+
view_users: [user_vw] })
|
85
|
+
end
|
86
|
+
|
87
|
+
subject { ActiveFedora::SolrService.get("id:#{col.id}")["response"]["docs"].first }
|
88
|
+
|
89
|
+
it 'will created a solr document' do
|
90
|
+
expect(subject["id"]).to eq col.id
|
91
|
+
expect(subject["has_model_ssim"].first).to eq "Collection"
|
92
|
+
expect(subject["edit_access_person_ssim"]).to include(user.user_key, user_mgr.user_key)
|
93
|
+
expect(subject["read_access_person_ssim"]).to include(user_dep.user_key, user_vw.user_key)
|
94
|
+
end
|
95
|
+
end
|
96
|
+
end
|
97
|
+
|
98
|
+
context 'with_nesting_attributes' do
|
99
|
+
let(:collection_type) { create(:collection_type) }
|
100
|
+
let(:blacklight_config) { CatalogController.blacklight_config }
|
101
|
+
let(:repository) { Blacklight::Solr::Repository.new(blacklight_config) }
|
102
|
+
let(:current_ability) { instance_double(Ability, admin?: true) }
|
103
|
+
let(:scope) { double('Scope', can?: true, current_ability: current_ability, repository: repository, blacklight_config: blacklight_config) }
|
104
|
+
let(:solr_doc) { ActiveFedora::SolrService.get("id:#{col.id}")["response"]["docs"].first }
|
105
|
+
let(:nesting_attributes) do
|
106
|
+
Hyrax::Collections::NestedCollectionQueryService::NestingAttributes.new(id: col.id, scope: scope)
|
107
|
+
end
|
108
|
+
|
109
|
+
context 'without additional permissions' do
|
110
|
+
let(:col) do
|
111
|
+
build(:collection_lw, id: 'Collection123',
|
112
|
+
collection_type_gid: collection_type.gid,
|
113
|
+
with_nesting_attributes: { ancestors: ['Parent_1'],
|
114
|
+
parent_ids: ['Parent_1'],
|
115
|
+
pathnames: ['Parent_1/Collection123'],
|
116
|
+
depth: 2 })
|
117
|
+
end
|
118
|
+
|
119
|
+
it 'will persist a queryable solr document with the given attributes' do
|
120
|
+
expect(nesting_attributes.id).to eq('Collection123')
|
121
|
+
expect(nesting_attributes.parents).to eq(['Parent_1'])
|
122
|
+
expect(nesting_attributes.pathnames).to eq(['Parent_1/Collection123'])
|
123
|
+
expect(nesting_attributes.ancestors).to eq(['Parent_1'])
|
124
|
+
expect(nesting_attributes.depth).to eq(2)
|
125
|
+
expect(solr_doc["id"]).to eq col.id
|
126
|
+
expect(solr_doc["has_model_ssim"].first).to eq "Collection"
|
127
|
+
expect(solr_doc["edit_access_person_ssim"]).to include(col.depositor)
|
128
|
+
end
|
129
|
+
end
|
130
|
+
|
131
|
+
context ' and with_permission_template' do
|
132
|
+
let(:col) do
|
133
|
+
build(:collection_lw, id: 'Collection123',
|
134
|
+
collection_type_gid: collection_type.gid,
|
135
|
+
with_nesting_attributes: { ancestors: ['Parent_1'],
|
136
|
+
parent_ids: ['Parent_1'],
|
137
|
+
pathnames: ['Parent_1/Collection123'],
|
138
|
+
depth: 2 },
|
139
|
+
with_permission_template: { manage_users: [user_mgr],
|
140
|
+
deposit_users: [user_dep],
|
141
|
+
view_users: [user_vw] })
|
142
|
+
end
|
143
|
+
|
144
|
+
it 'will persist a queryable solr document with the given attributes' do
|
145
|
+
expect(nesting_attributes.id).to eq('Collection123')
|
146
|
+
expect(nesting_attributes.parents).to eq(['Parent_1'])
|
147
|
+
expect(nesting_attributes.pathnames).to eq(['Parent_1/Collection123'])
|
148
|
+
expect(nesting_attributes.ancestors).to eq(['Parent_1'])
|
149
|
+
expect(nesting_attributes.depth).to eq(2)
|
150
|
+
expect(solr_doc["id"]).to eq col.id
|
151
|
+
expect(solr_doc["has_model_ssim"].first).to eq "Collection"
|
152
|
+
expect(solr_doc["edit_access_person_ssim"]).to include(col.depositor, user_mgr.user_key)
|
153
|
+
expect(solr_doc["read_access_person_ssim"]).to include(user_dep.user_key, user_vw.user_key)
|
154
|
+
end
|
155
|
+
end
|
156
|
+
|
157
|
+
context 'and with_permission_template and with_solr_document' do
|
158
|
+
let(:col) do
|
159
|
+
build(:collection_lw, id: 'Collection123',
|
160
|
+
collection_type_gid: collection_type.gid,
|
161
|
+
with_nesting_attributes: { ancestors: ['Parent_1'],
|
162
|
+
parent_ids: ['Parent_1'],
|
163
|
+
pathnames: ['Parent_1/Collection123'],
|
164
|
+
depth: 2 },
|
165
|
+
with_permission_template: { manage_users: [user_mgr],
|
166
|
+
deposit_users: [user_dep],
|
167
|
+
view_users: [user_vw] },
|
168
|
+
with_solr_document: true)
|
169
|
+
end
|
170
|
+
|
171
|
+
it 'will persist a queryable solr document with the given attributes' do
|
172
|
+
expect(nesting_attributes.id).to eq('Collection123')
|
173
|
+
expect(nesting_attributes.parents).to eq(['Parent_1'])
|
174
|
+
expect(nesting_attributes.pathnames).to eq(['Parent_1/Collection123'])
|
175
|
+
expect(nesting_attributes.ancestors).to eq(['Parent_1'])
|
176
|
+
expect(nesting_attributes.depth).to eq(2)
|
177
|
+
expect(solr_doc["id"]).to eq col.id
|
178
|
+
expect(solr_doc["has_model_ssim"].first).to eq "Collection"
|
179
|
+
expect(solr_doc["edit_access_person_ssim"]).to include(col.depositor, user_mgr.user_key)
|
180
|
+
expect(solr_doc["read_access_person_ssim"]).to include(user_dep.user_key, user_vw.user_key)
|
181
|
+
end
|
182
|
+
end
|
183
|
+
end
|
184
|
+
end
|
185
|
+
|
186
|
+
describe 'create' do
|
187
|
+
# collection_type_settings and collection_type_gid are tested by `build` and are the same for `build` and `create`
|
188
|
+
# with_solr_document is tested by build
|
189
|
+
# with_permission_template is tested by build except that the permission template is always created for `create`
|
190
|
+
# with_nested_attributes not supported for create
|
191
|
+
|
192
|
+
context 'with_permission_template' do
|
193
|
+
it 'will create a permission template and access even when it is the default value of false' do
|
194
|
+
expect { create(:collection_lw) }.to change { Hyrax::PermissionTemplate.count }.by(1)
|
195
|
+
expect { create(:collection_lw) }.to change { Hyrax::PermissionTemplateAccess.count }.by(1)
|
196
|
+
end
|
197
|
+
end
|
198
|
+
|
199
|
+
context 'when including nesting indexing', with_nested_reindexing: true do
|
200
|
+
# Nested indexing requires that the user's permissions be saved
|
201
|
+
# on the Fedora object... if simply in local memory, they are
|
202
|
+
# lost when the adapter pulls the object from Fedora to reindex.
|
203
|
+
let(:user) { create(:user) }
|
204
|
+
let(:collection) { create(:collection_lw, user: user) }
|
205
|
+
|
206
|
+
it 'will authorize the creating user' do
|
207
|
+
expect(user.can?(:edit, collection)).to be true
|
208
|
+
end
|
209
|
+
end
|
210
|
+
end
|
211
|
+
end
|