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
@@ -0,0 +1,187 @@
|
|
1
|
+
module Hyrax
|
2
|
+
module Collections
|
3
|
+
module NestedCollectionQueryService
|
4
|
+
# @api private
|
5
|
+
#
|
6
|
+
# an encapsulation of a collection's nesting index attributes
|
7
|
+
#
|
8
|
+
# @param id [String] a collection id
|
9
|
+
# @param scope [Object] Typically a controller object that responds to `repository`, `can?`, `blacklight_config`, `current_ability`
|
10
|
+
# @return object [NestingAttributes]
|
11
|
+
class NestingAttributes
|
12
|
+
attr_accessor :parents, :pathnames, :ancestors, :depth, :id
|
13
|
+
|
14
|
+
def initialize(id:, scope:)
|
15
|
+
query_builder = Hyrax::CollectionSearchBuilder.new(scope).where(id: id)
|
16
|
+
query = Hyrax::Collections::NestedCollectionQueryService.clean_lucene_error(builder: query_builder)
|
17
|
+
response = scope.repository.search(query)
|
18
|
+
collection_doc = response.documents.first
|
19
|
+
@id = id
|
20
|
+
@parents = collection_doc[Samvera::NestingIndexer.configuration.solr_field_name_for_storing_parent_ids]
|
21
|
+
@pathnames = collection_doc[Samvera::NestingIndexer.configuration.solr_field_name_for_storing_pathnames]
|
22
|
+
@ancestors = collection_doc[Samvera::NestingIndexer.configuration.solr_field_name_for_storing_ancestors]
|
23
|
+
@depth = collection_doc[Hyrax::Adapters::NestingIndexAdapter.solr_field_name_for_deepest_nested_depth]
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
27
|
+
# @api public
|
28
|
+
#
|
29
|
+
# What possible collections can be nested within the given parent collection?
|
30
|
+
#
|
31
|
+
# @param parent [Collection]
|
32
|
+
# @param scope [Object] Typically a controller object that responds to `repository`, `can?`, `blacklight_config`, `current_ability`
|
33
|
+
# @param limit_to_id [nil, String] Limit the query to just check if the given id is in the response. Useful for validation.
|
34
|
+
# @return [Array<SolrDocument>]
|
35
|
+
def self.available_child_collections(parent:, scope:, limit_to_id: nil)
|
36
|
+
return [] unless parent.try(:nestable?)
|
37
|
+
return [] unless scope.can?(:deposit, parent)
|
38
|
+
query_solr(collection: parent, access: :read, scope: scope, limit_to_id: limit_to_id, nest_direction: :as_child).documents
|
39
|
+
end
|
40
|
+
|
41
|
+
# @api public
|
42
|
+
#
|
43
|
+
# What possible collections can the given child be nested within?
|
44
|
+
#
|
45
|
+
# @param child [Collection]
|
46
|
+
# @param scope [Object] Typically a controller object that responds to `repository`, `can?`, `blacklight_config`, `current_ability`
|
47
|
+
# @param limit_to_id [nil, String] Limit the query to just check if the given id is in the response. Useful for validation.
|
48
|
+
# @return [Array<SolrDocument>]
|
49
|
+
def self.available_parent_collections(child:, scope:, limit_to_id: nil)
|
50
|
+
return [] unless child.try(:nestable?)
|
51
|
+
return [] unless scope.can?(:read, child)
|
52
|
+
query_solr(collection: child, access: :deposit, scope: scope, limit_to_id: limit_to_id, nest_direction: :as_parent).documents
|
53
|
+
end
|
54
|
+
|
55
|
+
# @api public
|
56
|
+
#
|
57
|
+
# What collections is the given child nested within?
|
58
|
+
#
|
59
|
+
# @param child [Collection]
|
60
|
+
# @param scope [Object] Typically a controller object that responds to `repository`, `can?`, `blacklight_config`, `current_ability`
|
61
|
+
# @param page [Integer] Starting page for pagination
|
62
|
+
# @param limit [Integer] Limit to number of collections for pagination
|
63
|
+
# @return [Blacklight::Solr::Response]
|
64
|
+
def self.parent_collections(child:, scope:, page: 1)
|
65
|
+
return [] unless child.try(:nestable?)
|
66
|
+
query_builder = Hyrax::NestedCollectionsParentSearchBuilder.new(scope: scope, child: child, page: page)
|
67
|
+
query = clean_lucene_error(builder: query_builder)
|
68
|
+
scope.repository.search(query)
|
69
|
+
end
|
70
|
+
|
71
|
+
# @api private
|
72
|
+
#
|
73
|
+
# @param collection [Collection]
|
74
|
+
# @param access [Symbol] I need this kind of permission on the queried objects.
|
75
|
+
# @param scope [Object] Typically a controller object that responds to `repository`, `can?`, `blacklight_config`, `current_ability`
|
76
|
+
# @param limit_to_id [nil, String] Limit the query to just check if the given id is in the response. Useful for validation.
|
77
|
+
# @param nest_direction [Symbol] :as_child or :as_parent
|
78
|
+
def self.query_solr(collection:, access:, scope:, limit_to_id:, nest_direction:)
|
79
|
+
nesting_attributes = NestingAttributes.new(id: collection.id, scope: scope)
|
80
|
+
query_builder = Hyrax::Dashboard::NestedCollectionsSearchBuilder.new(
|
81
|
+
access: access,
|
82
|
+
collection: collection,
|
83
|
+
scope: scope,
|
84
|
+
nesting_attributes: nesting_attributes,
|
85
|
+
nest_direction: nest_direction
|
86
|
+
)
|
87
|
+
|
88
|
+
query_builder.where(id: limit_to_id) if limit_to_id
|
89
|
+
query = clean_lucene_error(builder: query_builder)
|
90
|
+
scope.repository.search(query)
|
91
|
+
end
|
92
|
+
private_class_method :query_solr
|
93
|
+
|
94
|
+
# @api private
|
95
|
+
#
|
96
|
+
# clean query for {!lucene} error
|
97
|
+
#
|
98
|
+
# @param builder [SearchBuilder]
|
99
|
+
# @return [Blacklight::Solr::Request] cleaned and functional query
|
100
|
+
def self.clean_lucene_error(builder:)
|
101
|
+
# TODO: Need to investigate further to understand why these particular queries using the where cause fail when others in the app apparently work
|
102
|
+
query = builder.query.to_hash
|
103
|
+
query['q'].gsub!('{!lucene}', '') if query.key? 'q'
|
104
|
+
query
|
105
|
+
end
|
106
|
+
|
107
|
+
# @api public
|
108
|
+
#
|
109
|
+
# @note There is a short-circuit of logic; To be robust, we should ensure that the child and parent are in the corresponding available collections
|
110
|
+
#
|
111
|
+
# Is it valid to nest the given child within the given parent?
|
112
|
+
#
|
113
|
+
# @param parent [Collection]
|
114
|
+
# @param child [Collection]
|
115
|
+
# @param scope [Object] Typically a controller object that responds to `repository`, `can?`, `blacklight_config`, `current_ability`
|
116
|
+
# @return [Boolean] true if the parent can nest the child; false otherwise
|
117
|
+
# @todo Consider expanding from same collection type to a lookup table that says "This collection type can have within it, these collection types"
|
118
|
+
def self.parent_and_child_can_nest?(parent:, child:, scope:)
|
119
|
+
return false if parent == child # Short-circuit
|
120
|
+
return false unless parent.collection_type_gid == child.collection_type_gid
|
121
|
+
return false if available_parent_collections(child: child, scope: scope, limit_to_id: parent.id).none?
|
122
|
+
return false if available_child_collections(parent: parent, scope: scope, limit_to_id: child.id).none?
|
123
|
+
true
|
124
|
+
end
|
125
|
+
|
126
|
+
# @api public
|
127
|
+
#
|
128
|
+
# Does the nesting depth fall within defined limit?
|
129
|
+
#
|
130
|
+
# @param parent [Collection]
|
131
|
+
# @param child [nil, Collection] will be nil if we are nesting a new collection under the parent
|
132
|
+
# @param scope [Object] Typically a controller object that responds to `repository`, `can?`, `blacklight_config`, `current_ability`
|
133
|
+
# @return [Boolean] true if the parent can nest the child; false otherwise
|
134
|
+
def self.valid_combined_nesting_depth?(parent:, child: nil, scope:)
|
135
|
+
# We limit the total depth of collections to the size specified in the samvera-nesting_indexer configuration.
|
136
|
+
child_depth = child_nesting_depth(child: child, scope: scope)
|
137
|
+
parent_depth = parent_nesting_depth(parent: parent, scope: scope)
|
138
|
+
return false if parent_depth + child_depth > Samvera::NestingIndexer.configuration.maximum_nesting_depth
|
139
|
+
true
|
140
|
+
end
|
141
|
+
|
142
|
+
# @api private
|
143
|
+
#
|
144
|
+
# Get the child collection's nesting depth
|
145
|
+
#
|
146
|
+
# @param child [Collection]
|
147
|
+
# @return [Fixnum] the largest number of collections in a path nested under this collection (including this collection)
|
148
|
+
def self.child_nesting_depth(child:, scope:)
|
149
|
+
return 1 if child.nil?
|
150
|
+
# The nesting depth of a child collection is found by finding the largest nesting depth
|
151
|
+
# among all collections and works which have the child collection in the paths, and
|
152
|
+
# subtracting the nesting depth of the child collection itself.
|
153
|
+
# => 1) First we find all the collections with this child in the path, sort the results in descending order, and take the first result.
|
154
|
+
# note: We need to include works in this search. They are included in the depth validations in
|
155
|
+
# the indexer, so we do NOT use collection search builder here.
|
156
|
+
builder = Hyrax::SearchBuilder.new(scope).where("#{Samvera::NestingIndexer.configuration.solr_field_name_for_storing_pathnames}:/.*#{child.id}.*/")
|
157
|
+
builder.query[:sort] = "#{Hyrax::Adapters::NestingIndexAdapter.solr_field_name_for_deepest_nested_depth} desc"
|
158
|
+
builder.query[:rows] = 1
|
159
|
+
query = clean_lucene_error(builder: builder)
|
160
|
+
response = scope.repository.search(query).documents.first
|
161
|
+
|
162
|
+
# Now we have the largest nesting depth for all paths containing this collection
|
163
|
+
descendant_depth = response[Hyrax::Adapters::NestingIndexAdapter.solr_field_name_for_deepest_nested_depth]
|
164
|
+
|
165
|
+
# => 2) Then we get the stored depth of the child collection itself to eliminate the collections above this one from our count, and add 1 to add back in this collection itself
|
166
|
+
child_depth = NestingAttributes.new(id: child.id, scope: scope).depth
|
167
|
+
nesting_depth = descendant_depth - child_depth + 1
|
168
|
+
|
169
|
+
return nesting_depth if nesting_depth > 0 # this should always be > 0, but just being safe
|
170
|
+
1
|
171
|
+
end
|
172
|
+
private_class_method :child_nesting_depth
|
173
|
+
|
174
|
+
# @api private
|
175
|
+
#
|
176
|
+
# Get the parent collection's nesting depth
|
177
|
+
#
|
178
|
+
# @param parent [Collection]
|
179
|
+
# @return [Fixnum] the largest number of collections above this collection (includes this collection)
|
180
|
+
def self.parent_nesting_depth(parent:, scope:)
|
181
|
+
return 1 if parent.nil?
|
182
|
+
NestingAttributes.new(id: parent.id, scope: scope).depth
|
183
|
+
end
|
184
|
+
private_class_method :parent_nesting_depth
|
185
|
+
end
|
186
|
+
end
|
187
|
+
end
|
@@ -0,0 +1,71 @@
|
|
1
|
+
module Hyrax
|
2
|
+
module Collections
|
3
|
+
class PermissionsCreateService
|
4
|
+
# @api public
|
5
|
+
#
|
6
|
+
# Set the default permissions for a (newly created) collection
|
7
|
+
#
|
8
|
+
# @param collection [Collection] the collection the new permissions will act on
|
9
|
+
# @param creating_user [User] the user that created the collection
|
10
|
+
# @param grants [Array<Hash>] additional grants to apply to the new collection
|
11
|
+
# @return [Hyrax::PermissionTemplate]
|
12
|
+
def self.create_default(collection:, creating_user:, grants: [])
|
13
|
+
collection_type = Hyrax::CollectionType.find_by_gid!(collection.collection_type_gid)
|
14
|
+
access_grants = access_grants_attributes(collection_type: collection_type, creating_user: creating_user, grants: grants)
|
15
|
+
PermissionTemplate.create!(source_id: collection.id,
|
16
|
+
access_grants_attributes: access_grants.uniq)
|
17
|
+
collection.reset_access_controls!
|
18
|
+
end
|
19
|
+
|
20
|
+
# @api private
|
21
|
+
#
|
22
|
+
# Gather the default permissions needed for a new collection
|
23
|
+
#
|
24
|
+
# @param collection_type [CollectionType] the collection type of the new collection
|
25
|
+
# @param creating_user [User] the user that created the collection
|
26
|
+
# @param grants [Array<Hash>] additional grants to apply to the new collection
|
27
|
+
# @return [Hash] a hash containing permission attributes
|
28
|
+
def self.access_grants_attributes(collection_type:, creating_user:, grants:)
|
29
|
+
[
|
30
|
+
{ agent_type: 'group', agent_id: admin_group_name, access: Hyrax::PermissionTemplateAccess::MANAGE }
|
31
|
+
].tap do |attribute_list|
|
32
|
+
# Grant manage access to the creating_user if it exists
|
33
|
+
if creating_user
|
34
|
+
attribute_list << { agent_type: 'user', agent_id: creating_user.user_key, access: Hyrax::PermissionTemplateAccess::MANAGE }
|
35
|
+
end
|
36
|
+
end + managers_of_collection_type(collection_type: collection_type) + grants
|
37
|
+
end
|
38
|
+
private_class_method :access_grants_attributes
|
39
|
+
|
40
|
+
# @api private
|
41
|
+
#
|
42
|
+
# Retrieve the users or groups with manage permissions for a collection type
|
43
|
+
#
|
44
|
+
# @param collection_type [CollectionType] the collection type of the new collection
|
45
|
+
# @return [Hash] a hash containing permission attributes
|
46
|
+
def self.managers_of_collection_type(collection_type:)
|
47
|
+
attribute_list = []
|
48
|
+
user_managers = Hyrax::CollectionTypes::PermissionsService.user_edit_grants_for_collection_of_type(collection_type: collection_type)
|
49
|
+
user_managers.each do |user|
|
50
|
+
attribute_list << { agent_type: 'user', agent_id: user, access: Hyrax::PermissionTemplateAccess::MANAGE }
|
51
|
+
end
|
52
|
+
group_managers = Hyrax::CollectionTypes::PermissionsService.group_edit_grants_for_collection_of_type(collection_type: collection_type)
|
53
|
+
group_managers.each do |group|
|
54
|
+
attribute_list << { agent_type: 'group', agent_id: group, access: Hyrax::PermissionTemplateAccess::MANAGE }
|
55
|
+
end
|
56
|
+
attribute_list
|
57
|
+
end
|
58
|
+
private_class_method :managers_of_collection_type
|
59
|
+
|
60
|
+
# @api private
|
61
|
+
#
|
62
|
+
# The value of the admin group name
|
63
|
+
#
|
64
|
+
# @return [String] a string representation of the admin group name
|
65
|
+
def self.admin_group_name
|
66
|
+
::Ability.admin_group_name
|
67
|
+
end
|
68
|
+
private_class_method :admin_group_name
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
@@ -0,0 +1,234 @@
|
|
1
|
+
module Hyrax
|
2
|
+
module Collections
|
3
|
+
class PermissionsService
|
4
|
+
# @api private
|
5
|
+
#
|
6
|
+
# IDs of collections/or admin_sets a user can access based on participant roles.
|
7
|
+
#
|
8
|
+
# @param access [Array<String>] one or more types of access (e.g. Hyrax::PermissionTemplateAccess::MANAGE, Hyrax::PermissionTemplateAccess::DEPOSIT, Hyrax::PermissionTemplateAccess::VIEW)
|
9
|
+
# @param ability [Ability] the ability coming from cancan ability check
|
10
|
+
# @param source_type [String] 'collection', 'admin_set', or nil to get all types
|
11
|
+
# @return [Array<String>] IDs of collections and admin sets for which the user has specified roles
|
12
|
+
def self.source_ids_for_user(access:, ability:, source_type: nil)
|
13
|
+
scope = PermissionTemplateAccess.for_user(ability: ability, access: access)
|
14
|
+
.joins(:permission_template)
|
15
|
+
ids = scope.pluck('DISTINCT source_id')
|
16
|
+
return ids unless source_type
|
17
|
+
filter_source(source_type: source_type, ids: ids)
|
18
|
+
end
|
19
|
+
private_class_method :source_ids_for_user
|
20
|
+
|
21
|
+
def self.filter_source(source_type:, ids:)
|
22
|
+
return [] if ids.empty?
|
23
|
+
id_clause = "{!terms f=id}#{ids.join(',')}"
|
24
|
+
query = case source_type
|
25
|
+
when 'admin_set'
|
26
|
+
"_query_:\"{!raw f=has_model_ssim}AdminSet\""
|
27
|
+
when 'collection'
|
28
|
+
"_query_:\"{!raw f=has_model_ssim}Collection\""
|
29
|
+
end
|
30
|
+
query += " AND #{id_clause}"
|
31
|
+
ActiveFedora::SolrService.query(query, fl: 'id', rows: ids.count).map { |hit| hit['id'] }
|
32
|
+
end
|
33
|
+
private_class_method :filter_source
|
34
|
+
|
35
|
+
# @api private
|
36
|
+
#
|
37
|
+
# IDs of admin sets a user can access based on participant roles.
|
38
|
+
#
|
39
|
+
# @param access [Array<String>] one or more types of access (e.g. Hyrax::PermissionTemplateAccess::MANAGE, Hyrax::PermissionTemplateAccess::DEPOSIT, Hyrax::PermissionTemplateAccess::VIEW)
|
40
|
+
# @param ability [Ability] the ability coming from cancan ability check
|
41
|
+
# @return [Array<String>] IDs of admin sets for which the user has specified roles
|
42
|
+
# @note Several checks get the user's groups from the user's ability. The same values can be retrieved directly from a passed in ability.
|
43
|
+
# TODO: MOVE TO ABILITY
|
44
|
+
def self.admin_set_ids_for_user(access:, ability:)
|
45
|
+
source_ids_for_user(access: access, ability: ability, source_type: 'admin_set')
|
46
|
+
end
|
47
|
+
private_class_method :admin_set_ids_for_user
|
48
|
+
|
49
|
+
# @api public
|
50
|
+
#
|
51
|
+
# IDs of collections a user can access based on participant roles.
|
52
|
+
#
|
53
|
+
# @param access [Array<String>] one or more types of access (e.g. Hyrax::PermissionTemplateAccess::MANAGE, Hyrax::PermissionTemplateAccess::DEPOSIT, Hyrax::PermissionTemplateAccess::VIEW)
|
54
|
+
# @param ability [Ability] the ability coming from cancan ability check
|
55
|
+
# @return [Array<String>] IDs of collections for which the user has specified roles
|
56
|
+
# @note Several checks get the user's groups from the user's ability. The same values can be retrieved directly from a passed in ability.
|
57
|
+
def self.collection_ids_for_user(access:, ability:)
|
58
|
+
source_ids_for_user(access: access, ability: ability, source_type: 'collection')
|
59
|
+
end
|
60
|
+
|
61
|
+
# @api public
|
62
|
+
#
|
63
|
+
# IDs of collections and/or admin_sets into which a user can deposit.
|
64
|
+
#
|
65
|
+
# @param ability [Ability] the ability coming from cancan ability check
|
66
|
+
# @param source_type [String] 'collection', 'admin_set', or nil to get all types
|
67
|
+
# @return [Array<String>] IDs of collections and/or admin_sets into which the user can deposit
|
68
|
+
# @note Several checks get the user's groups from the user's ability. The same values can be retrieved directly from a passed in ability.
|
69
|
+
def self.source_ids_for_deposit(ability:, source_type: nil)
|
70
|
+
access = [Hyrax::PermissionTemplateAccess::MANAGE, Hyrax::PermissionTemplateAccess::DEPOSIT]
|
71
|
+
source_ids_for_user(access: access, ability: ability, source_type: source_type)
|
72
|
+
end
|
73
|
+
|
74
|
+
# @api public
|
75
|
+
#
|
76
|
+
# IDs of collections and/or admin_sets that a user can manage.
|
77
|
+
#
|
78
|
+
# @param ability [Ability] the ability coming from cancan ability check
|
79
|
+
# @param source_type [String] 'collection', 'admin_set', or nil to get all types
|
80
|
+
# @return [Array<String>] IDs of collections and/or admin_sets that the user can manage
|
81
|
+
# @note Several checks get the user's groups from the user's ability. The same values can be retrieved directly from a passed in ability.
|
82
|
+
def self.source_ids_for_manage(ability:, source_type: nil)
|
83
|
+
access = [Hyrax::PermissionTemplateAccess::MANAGE, Hyrax::PermissionTemplateAccess::MANAGE]
|
84
|
+
source_ids_for_user(access: access, ability: ability, source_type: source_type)
|
85
|
+
end
|
86
|
+
|
87
|
+
# @api public
|
88
|
+
#
|
89
|
+
# IDs of collections into which a user can deposit.
|
90
|
+
#
|
91
|
+
# @param ability [Ability] the ability coming from cancan ability check
|
92
|
+
# @return [Array<String>] IDs of collections into which the user can deposit
|
93
|
+
# @note Several checks get the user's groups from the user's ability. The same values can be retrieved directly from a passed in ability.
|
94
|
+
def self.collection_ids_for_deposit(ability:)
|
95
|
+
source_ids_for_deposit(ability: ability, source_type: 'collection')
|
96
|
+
end
|
97
|
+
|
98
|
+
# @api public
|
99
|
+
#
|
100
|
+
# Determine if the given user has permissions to view the admin show page for at least one collection
|
101
|
+
#
|
102
|
+
# @param ability [Ability] the ability coming from cancan ability check
|
103
|
+
# @return [Boolean] true if the user has permission to view the admin show page for at least one collection
|
104
|
+
# @note Several checks get the user's groups from the user's ability. The same values can be retrieved directly from a passed in ability.
|
105
|
+
def self.can_view_admin_show_for_any_collection?(ability:)
|
106
|
+
collection_ids_for_user(ability: ability, access: [Hyrax::PermissionTemplateAccess::MANAGE,
|
107
|
+
Hyrax::PermissionTemplateAccess::DEPOSIT,
|
108
|
+
Hyrax::PermissionTemplateAccess::VIEW]).present?
|
109
|
+
end
|
110
|
+
|
111
|
+
# @api public
|
112
|
+
#
|
113
|
+
# Determine if the given user has permissions to view the admin show page for at least one admin set
|
114
|
+
#
|
115
|
+
# @param ability [Ability] the ability coming from cancan ability check
|
116
|
+
# @return [Boolean] true if the user has permission to view the admin show page for at least one admin_set
|
117
|
+
# @note Several checks get the user's groups from the user's ability. The same values can be retrieved directly from a passed in ability.
|
118
|
+
# TODO: MOVE TO ABILITY
|
119
|
+
def self.can_view_admin_show_for_any_admin_set?(ability:)
|
120
|
+
admin_set_ids_for_user(ability: ability, access: [Hyrax::PermissionTemplateAccess::MANAGE,
|
121
|
+
Hyrax::PermissionTemplateAccess::DEPOSIT,
|
122
|
+
Hyrax::PermissionTemplateAccess::VIEW]).present?
|
123
|
+
end
|
124
|
+
|
125
|
+
# @api public
|
126
|
+
#
|
127
|
+
# Determine if the given user has permissions to manage at least one collection
|
128
|
+
#
|
129
|
+
# @param ability [Ability] the ability coming from cancan ability check
|
130
|
+
# @return [Boolean] true if the user has permission to manage at least one collection
|
131
|
+
# @note Several checks get the user's groups from the user's ability. The same values can be retrieved directly from a passed in ability.
|
132
|
+
def self.can_manage_any_collection?(ability:)
|
133
|
+
collection_ids_for_user(ability: ability, access: [Hyrax::PermissionTemplateAccess::MANAGE]).present?
|
134
|
+
end
|
135
|
+
|
136
|
+
# @api public
|
137
|
+
#
|
138
|
+
# Determine if the given user has permissions to manage at least one admin set
|
139
|
+
#
|
140
|
+
# @param ability [Ability] the ability coming from cancan ability check
|
141
|
+
# @return [Boolean] true if the user has permission to manage at least one admin_set
|
142
|
+
# @note Several checks get the user's groups from the user's ability. The same values can be retrieved directly from a passed in ability.
|
143
|
+
# TODO: MOVE TO ABILITY
|
144
|
+
|
145
|
+
def self.can_manage_any_admin_set?(ability:)
|
146
|
+
admin_set_ids_for_user(ability: ability, access: [Hyrax::PermissionTemplateAccess::MANAGE]).present?
|
147
|
+
end
|
148
|
+
|
149
|
+
# @api public
|
150
|
+
#
|
151
|
+
# Determine if the given user has permissions to deposit into the given collection
|
152
|
+
#
|
153
|
+
# @param collection_id [String] id of the collection we are checking permissions on
|
154
|
+
# @param ability [Ability] the ability coming from cancan ability check
|
155
|
+
# @return [Boolean] true if the user has permission to deposit into the collection
|
156
|
+
# @note Several checks get the user's groups from the user's ability. The same values can be retrieved directly from a passed in ability.
|
157
|
+
def self.can_deposit_in_collection?(collection_id:, ability:)
|
158
|
+
deposit_access_to_collection?(collection_id: collection_id, ability: ability) ||
|
159
|
+
manage_access_to_collection?(collection_id: collection_id, ability: ability)
|
160
|
+
end
|
161
|
+
|
162
|
+
# @api public
|
163
|
+
#
|
164
|
+
# Determine if the given user has permissions to view the admin show page for the collection
|
165
|
+
#
|
166
|
+
# @param collection_id [String] id of the collection we are checking permissions on
|
167
|
+
# @param ability [Ability] the ability coming from cancan ability check
|
168
|
+
# @return [Boolean] true if the user has permission to view the admin show page for the collection
|
169
|
+
# @note Several checks get the user's groups from the user's ability. The same values can be retrieved directly from a passed in ability.
|
170
|
+
def self.can_view_admin_show_for_collection?(collection_id:, ability:)
|
171
|
+
deposit_access_to_collection?(collection_id: collection_id, ability: ability) ||
|
172
|
+
manage_access_to_collection?(collection_id: collection_id, ability: ability) ||
|
173
|
+
view_access_to_collection?(collection_id: collection_id, ability: ability)
|
174
|
+
end
|
175
|
+
|
176
|
+
# @api private
|
177
|
+
#
|
178
|
+
# Determine if the given user has :deposit access for the given collection
|
179
|
+
#
|
180
|
+
# @param collection_id [String] id of the collection we are checking permissions on
|
181
|
+
# @param ability [Ability] the ability coming from cancan ability check
|
182
|
+
# @return [Boolean] true if the user has :deposit access to the collection
|
183
|
+
# @note Several checks get the user's groups from the user's ability. The same values can be retrieved directly from a passed in ability.
|
184
|
+
def self.deposit_access_to_collection?(collection_id:, ability: nil)
|
185
|
+
access_to_collection?(collection_id: collection_id, access: 'deposit', ability: ability)
|
186
|
+
end
|
187
|
+
private_class_method :deposit_access_to_collection?
|
188
|
+
|
189
|
+
# @api private
|
190
|
+
#
|
191
|
+
# Determine if the given user has :manage access for the given collection
|
192
|
+
#
|
193
|
+
# @param collection_id [String] id of the collection we are checking permissions on
|
194
|
+
# @param ability [Ability] the ability coming from cancan ability check
|
195
|
+
# @return [Boolean] true if the user has :manage access to the collection
|
196
|
+
# @note Several checks get the user's groups from the user's ability. The same values can be retrieved directly from a passed in ability.
|
197
|
+
def self.manage_access_to_collection?(collection_id:, ability:)
|
198
|
+
access_to_collection?(collection_id: collection_id, access: 'manage', ability: ability)
|
199
|
+
end
|
200
|
+
private_class_method :manage_access_to_collection?
|
201
|
+
|
202
|
+
# @api private
|
203
|
+
#
|
204
|
+
# Determine if the given user has :view access for the given collection
|
205
|
+
#
|
206
|
+
# @param collection_id [String] id of the collection we are checking permissions on
|
207
|
+
# @param ability [Ability] the ability coming from cancan ability check
|
208
|
+
# @return [Boolean] true if the user has permission to view the collection
|
209
|
+
# @note Several checks get the user's groups from the user's ability. The same values can be retrieved directly from a passed in ability.
|
210
|
+
def self.view_access_to_collection?(collection_id:, ability:)
|
211
|
+
access_to_collection?(collection_id: collection_id, access: 'view', ability: ability)
|
212
|
+
end
|
213
|
+
private_class_method :view_access_to_collection?
|
214
|
+
|
215
|
+
# @api private
|
216
|
+
#
|
217
|
+
# Determine if the given user has specified access for the given collection
|
218
|
+
#
|
219
|
+
# @param collection_id [String] id of the collection we are checking permissions on
|
220
|
+
# @param access [Symbol] the access level to check
|
221
|
+
# @param ability [Ability] the ability coming from cancan ability check
|
222
|
+
# @return [Boolean] true if the user has permission to view the collection
|
223
|
+
# @note Several checks get the user's groups from the user's ability. The same values can be retrieved directly from a passed in ability.
|
224
|
+
def self.access_to_collection?(collection_id:, access:, ability:)
|
225
|
+
return false unless collection_id
|
226
|
+
template = Hyrax::PermissionTemplate.find_by!(source_id: collection_id)
|
227
|
+
return true if ([ability.current_user.user_key] & template.agent_ids_for(agent_type: 'user', access: access)).present?
|
228
|
+
return true if (ability.user_groups & template.agent_ids_for(agent_type: 'group', access: access)).present?
|
229
|
+
false
|
230
|
+
end
|
231
|
+
private_class_method :access_to_collection?
|
232
|
+
end
|
233
|
+
end
|
234
|
+
end
|