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.
Files changed (703) hide show
  1. checksums.yaml +4 -4
  2. data/.eslintrc +0 -1
  3. data/.github/CONTRIBUTING.md +1 -1
  4. data/.rubocop.yml +8 -4
  5. data/.rubocop_fixme.yml +20 -2
  6. data/.travis.yml +3 -3
  7. data/README.md +12 -4
  8. data/app/actors/hyrax/actors/abstract_actor.rb +1 -1
  9. data/app/actors/hyrax/actors/apply_permission_template_actor.rb +17 -1
  10. data/app/actors/hyrax/actors/attach_members_actor.rb +2 -2
  11. data/app/actors/hyrax/actors/collections_membership_actor.rb +147 -12
  12. data/app/actors/hyrax/actors/create_with_remote_files_actor.rb +15 -9
  13. data/app/actors/hyrax/actors/default_admin_set_actor.rb +3 -3
  14. data/app/actors/hyrax/actors/file_set_actor.rb +10 -6
  15. data/app/actors/hyrax/actors/interpret_visibility_actor.rb +1 -1
  16. data/app/assets/javascripts/hyrax.js +13 -7
  17. data/app/assets/javascripts/hyrax/admin/admin_set_controls.es6 +5 -3
  18. data/app/assets/javascripts/hyrax/admin/collection_type/participants.es6 +13 -0
  19. data/app/assets/javascripts/hyrax/admin/collection_type/settings.es6 +60 -0
  20. data/app/assets/javascripts/hyrax/admin/collection_type_controls.es6 +15 -0
  21. data/app/assets/javascripts/hyrax/app.js.erb +29 -7
  22. data/app/assets/javascripts/hyrax/autocomplete.es6 +10 -5
  23. data/app/assets/javascripts/hyrax/autocomplete/default.es6 +1 -1
  24. data/app/assets/javascripts/hyrax/autocomplete/linked_data.es6 +1 -1
  25. data/app/assets/javascripts/hyrax/autocomplete/{work.es6 → resource.es6} +10 -4
  26. data/app/assets/javascripts/hyrax/collection_types.es6 +65 -0
  27. data/app/assets/javascripts/hyrax/collections.js +168 -3
  28. data/app/assets/javascripts/hyrax/collections/editor.es6 +7 -1
  29. data/app/assets/javascripts/hyrax/collections_forms.js +108 -0
  30. data/app/assets/javascripts/hyrax/editor.es6 +17 -3
  31. data/app/assets/javascripts/hyrax/fileupload.js +1 -0
  32. data/app/assets/javascripts/hyrax/relationships.js +2 -1
  33. data/app/assets/javascripts/hyrax/relationships/confirm_remove_dialog.es6 +45 -0
  34. data/app/assets/javascripts/hyrax/relationships/control.es6 +25 -10
  35. data/app/assets/javascripts/hyrax/relationships/registry.es6 +28 -25
  36. data/app/assets/javascripts/hyrax/relationships/registry_entry.es6 +40 -33
  37. data/app/assets/javascripts/hyrax/relationships/resource.es6 +10 -0
  38. data/app/assets/javascripts/hyrax/select_collection_type.es6 +39 -0
  39. data/app/assets/javascripts/hyrax/{per_page.es6 → sort_and_per_page.es6} +1 -1
  40. data/app/assets/javascripts/hyrax/tabbed_form.es6 +35 -0
  41. data/app/assets/stylesheets/_bootstrap-default-overrides.scss +15 -0
  42. data/app/assets/stylesheets/fileupload/jquery.fileupload-ui.scss +6 -0
  43. data/app/assets/stylesheets/hyrax/_accessibility.scss +16 -0
  44. data/app/assets/stylesheets/hyrax/_catalog.scss +88 -1
  45. data/app/assets/stylesheets/hyrax/_collection_types.scss +53 -0
  46. data/app/assets/stylesheets/hyrax/_collections.scss +616 -22
  47. data/app/assets/stylesheets/hyrax/_featured.scss +16 -0
  48. data/app/assets/stylesheets/hyrax/_file-listing.scss +9 -2
  49. data/app/assets/stylesheets/hyrax/_forms.scss +46 -0
  50. data/app/assets/stylesheets/hyrax/_home-page.scss +10 -0
  51. data/app/assets/stylesheets/hyrax/_hyrax.scss +3 -2
  52. data/app/assets/stylesheets/hyrax/_positioning.scss +0 -11
  53. data/app/assets/stylesheets/hyrax/_recent.scss +26 -0
  54. data/app/assets/stylesheets/hyrax/_representative-media.scss +7 -0
  55. data/app/assets/stylesheets/hyrax/_select_collection_type.scss +45 -0
  56. data/app/assets/stylesheets/hyrax/_select_work_type.scss +0 -4
  57. data/app/assets/stylesheets/hyrax/_styles.scss +2 -17
  58. data/app/assets/stylesheets/hyrax/_variables.scss +2 -2
  59. data/app/assets/stylesheets/hyrax/_viewer.scss +8 -0
  60. data/app/assets/stylesheets/hyrax/_work-show.scss +44 -6
  61. data/app/assets/stylesheets/hyrax/dashboard.scss +7 -2
  62. data/app/authorities/qa/authorities/collections.rb +30 -0
  63. data/app/builders/hyrax/manifest_helper.rb +36 -0
  64. data/app/controllers/concerns/hyrax/admin/stats_behavior.rb +1 -1
  65. data/app/controllers/concerns/hyrax/admin/users_controller_behavior.rb +1 -1
  66. data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +37 -40
  67. data/app/controllers/concerns/hyrax/controller.rb +0 -9
  68. data/app/controllers/concerns/hyrax/themed_layout_controller.rb +4 -1
  69. data/app/controllers/concerns/hyrax/works_controller_behavior.rb +22 -11
  70. data/app/controllers/hyrax/admin/admin_sets_controller.rb +24 -15
  71. data/app/controllers/hyrax/admin/appearances_controller.rb +1 -1
  72. data/app/controllers/hyrax/admin/collection_type_participants_controller.rb +44 -0
  73. data/app/controllers/hyrax/admin/collection_types_controller.rb +97 -0
  74. data/app/controllers/hyrax/admin/features_controller.rb +1 -1
  75. data/app/controllers/hyrax/admin/permission_template_accesses_controller.rb +55 -13
  76. data/app/controllers/hyrax/admin/permission_templates_controller.rb +66 -23
  77. data/app/controllers/hyrax/admin/workflow_roles_controller.rb +1 -1
  78. data/app/controllers/hyrax/admin/workflows_controller.rb +1 -1
  79. data/app/controllers/hyrax/batch_edits_controller.rb +1 -1
  80. data/app/controllers/hyrax/batch_uploads_controller.rb +1 -1
  81. data/app/controllers/hyrax/citations_controller.rb +3 -12
  82. data/app/controllers/hyrax/collections_controller.rb +8 -9
  83. data/app/controllers/hyrax/content_blocks_controller.rb +1 -1
  84. data/app/controllers/hyrax/dashboard/collection_members_controller.rb +73 -0
  85. data/app/controllers/hyrax/dashboard/collections_controller.rb +210 -54
  86. data/app/controllers/hyrax/dashboard/nest_collections_controller.rb +106 -0
  87. data/app/controllers/hyrax/dashboard/profiles_controller.rb +1 -1
  88. data/app/controllers/hyrax/dashboard/works_controller.rb +1 -9
  89. data/app/controllers/hyrax/dashboard_controller.rb +1 -1
  90. data/app/controllers/hyrax/file_sets_controller.rb +7 -75
  91. data/app/controllers/hyrax/my/collections_controller.rb +26 -1
  92. data/app/controllers/hyrax/my/works_controller.rb +16 -1
  93. data/app/controllers/hyrax/my_controller.rb +5 -19
  94. data/app/controllers/hyrax/notifications_controller.rb +1 -1
  95. data/app/controllers/hyrax/pages_controller.rb +3 -2
  96. data/app/controllers/hyrax/stats_controller.rb +3 -0
  97. data/app/controllers/hyrax/transfers_controller.rb +1 -1
  98. data/app/forms/hyrax/forms/admin/appearance.rb +2 -2
  99. data/app/forms/hyrax/forms/admin/collection_type_form.rb +24 -0
  100. data/app/forms/hyrax/forms/admin/collection_type_participant_form.rb +16 -0
  101. data/app/forms/hyrax/forms/admin_set_form.rb +1 -1
  102. data/app/forms/hyrax/forms/batch_edit_form.rb +28 -7
  103. data/app/forms/hyrax/forms/collection_form.rb +71 -13
  104. data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb +98 -0
  105. data/app/forms/hyrax/forms/permission_template_form.rb +13 -13
  106. data/app/forms/hyrax/forms/work_form.rb +58 -14
  107. data/app/helpers/hyrax/ability_helper.rb +3 -0
  108. data/app/helpers/hyrax/citations_behaviors/formatters/chicago_formatter.rb +3 -10
  109. data/app/helpers/hyrax/collections_helper.rb +10 -2
  110. data/app/helpers/hyrax/dashboard_helper_behavior.rb +0 -4
  111. data/app/helpers/hyrax/hyrax_helper_behavior.rb +19 -5
  112. data/app/helpers/hyrax/trophy_helper.rb +0 -1
  113. data/app/indexers/hyrax/indexes_workflow.rb +1 -1
  114. data/app/indexers/hyrax/repository_reindexer.rb +19 -0
  115. data/app/jobs/hyrax/application_job.rb +1 -1
  116. data/app/jobs/import_export_job.rb +1 -1
  117. data/app/jobs/user_edit_profile_event_job.rb +1 -1
  118. data/app/models/admin_set.rb +5 -2
  119. data/app/models/collection_branding_info.rb +39 -0
  120. data/app/models/concerns/hyrax/ability.rb +26 -49
  121. data/app/models/concerns/hyrax/ability/admin_set_ability.rb +40 -0
  122. data/app/models/concerns/hyrax/ability/collection_ability.rb +40 -0
  123. data/app/models/concerns/hyrax/ability/collection_type_ability.rb +16 -0
  124. data/app/models/concerns/hyrax/ability/permission_template_ability.rb +18 -0
  125. data/app/models/concerns/hyrax/ability/solr_document_ability.rb +18 -0
  126. data/app/models/concerns/hyrax/collection_behavior.rb +86 -3
  127. data/app/models/concerns/hyrax/collection_nesting.rb +41 -0
  128. data/app/models/concerns/hyrax/file_set/belongs_to_works.rb +0 -15
  129. data/app/models/concerns/hyrax/file_set_behavior.rb +0 -1
  130. data/app/models/concerns/hyrax/has_rendering.rb +11 -0
  131. data/app/models/concerns/hyrax/human_readable_type.rb +3 -0
  132. data/app/models/concerns/hyrax/solr_document/metadata.rb +3 -0
  133. data/app/models/concerns/hyrax/solr_document_behavior.rb +8 -2
  134. data/app/models/concerns/hyrax/user.rb +11 -6
  135. data/app/models/concerns/hyrax/with_events.rb +12 -6
  136. data/app/models/concerns/hyrax/work_behavior.rb +3 -1
  137. data/app/models/hyrax/batch_create_operation.rb +1 -1
  138. data/app/models/hyrax/collection_type.rb +155 -0
  139. data/app/models/hyrax/collection_type_participant.rb +39 -0
  140. data/app/models/hyrax/operation.rb +14 -2
  141. data/app/models/hyrax/permission_template.rb +23 -1
  142. data/app/models/hyrax/permission_template_access.rb +56 -7
  143. data/app/models/hyrax/uploaded_file.rb +4 -1
  144. data/app/models/sipity/workflow.rb +6 -4
  145. data/app/presenters/hyrax/admin/workflow_role_presenter.rb +3 -3
  146. data/app/presenters/hyrax/admin_set_options_presenter.rb +1 -1
  147. data/app/presenters/hyrax/admin_set_presenter.rb +16 -0
  148. data/app/presenters/hyrax/collection_options_presenter.rb +1 -0
  149. data/app/presenters/hyrax/collection_presenter.rb +134 -6
  150. data/app/presenters/hyrax/displays_image.rb +39 -0
  151. data/app/presenters/hyrax/file_set_presenter.rb +1 -4
  152. data/app/presenters/hyrax/fixity_status_presenter.rb +2 -2
  153. data/app/presenters/hyrax/homepage_presenter.rb +20 -0
  154. data/app/presenters/hyrax/menu_presenter.rb +2 -1
  155. data/app/presenters/hyrax/select_collection_type_list_presenter.rb +42 -0
  156. data/app/presenters/hyrax/select_collection_type_presenter.rb +11 -0
  157. data/app/presenters/hyrax/select_type_presenter.rb +13 -4
  158. data/app/presenters/hyrax/work_show_presenter.rb +52 -1
  159. data/app/renderers/hyrax/renderers/attribute_renderer.rb +1 -1
  160. data/app/renderers/hyrax/renderers/license_attribute_renderer.rb +1 -1
  161. data/app/renderers/hyrax/renderers/rights_statement_attribute_renderer.rb +3 -2
  162. data/app/search_builders/hyrax/admin_admin_set_member_search_builder.rb +10 -1
  163. data/app/search_builders/hyrax/admin_set_search_builder.rb +9 -2
  164. data/app/search_builders/hyrax/collection_member_search_builder.rb +21 -8
  165. data/app/search_builders/hyrax/collection_search_builder.rb +37 -0
  166. data/app/search_builders/hyrax/dashboard/collections_search_builder.rb +42 -0
  167. data/app/search_builders/hyrax/dashboard/managed_search_filters.rb +24 -0
  168. data/app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb +123 -0
  169. data/app/search_builders/hyrax/dashboard/works_search_builder.rb +18 -0
  170. data/app/search_builders/hyrax/filter_suppressed_with_roles.rb +5 -1
  171. data/app/search_builders/hyrax/my/collections_search_builder.rb +20 -3
  172. data/app/search_builders/hyrax/nested_collections_parent_search_builder.rb +27 -0
  173. data/app/search_builders/hyrax/search_filters.rb +8 -0
  174. data/app/services/hyrax/adapters/nesting_index_adapter.rb +192 -0
  175. data/app/services/hyrax/admin_set_create_service.rb +3 -2
  176. data/app/services/hyrax/admin_set_member_service.rb +40 -0
  177. data/app/services/hyrax/batch_create_failure_service.rb +4 -3
  178. data/app/services/hyrax/collection_types/create_service.rb +143 -0
  179. data/app/services/hyrax/collection_types/permissions_service.rb +233 -0
  180. data/app/services/hyrax/collections/collection_member_service.rb +91 -0
  181. data/app/services/hyrax/collections/managed_collections_service.rb +16 -0
  182. data/app/services/hyrax/collections/migration_service.rb +81 -0
  183. data/app/services/hyrax/collections/nested_collection_persistence_service.rb +26 -0
  184. data/app/services/hyrax/collections/nested_collection_query_service.rb +187 -0
  185. data/app/services/hyrax/collections/permissions_create_service.rb +71 -0
  186. data/app/services/hyrax/collections/permissions_service.rb +234 -0
  187. data/app/services/hyrax/collections_service.rb +3 -3
  188. data/app/services/hyrax/default_middleware_stack.rb +35 -0
  189. data/app/services/hyrax/file_set_fixity_check_service.rb +1 -1
  190. data/app/services/hyrax/graph_exporter.rb +19 -15
  191. data/app/services/hyrax/iiif_authorization_service.rb +19 -0
  192. data/app/services/hyrax/multiple_membership_checker.rb +78 -0
  193. data/app/services/hyrax/noid.rb +1 -3
  194. data/app/services/hyrax/qa_select_service.rb +11 -2
  195. data/app/services/hyrax/workflow/status_list_service.rb +1 -1
  196. data/app/services/hyrax/working_directory.rb +0 -8
  197. data/app/services/hyrax/works/managed_works_service.rb +16 -0
  198. data/app/views/_flash_msg.html.erb +1 -1
  199. data/app/views/_masthead.html.erb +0 -1
  200. data/app/views/catalog/_document.html.erb +3 -1
  201. data/app/views/catalog/_document_list.html.erb +2 -2
  202. data/app/views/catalog/_index_header_list_collection.html.erb +4 -3
  203. data/app/views/catalog/_index_header_list_default.html.erb +3 -3
  204. data/app/views/catalog/_index_list_default.html.erb +29 -14
  205. data/app/views/catalog/_thumbnail_list_collection.html.erb +3 -4
  206. data/app/views/catalog/_thumbnail_list_default.html.erb +5 -3
  207. data/app/views/hyrax/admin/admin_sets/_form.html.erb +2 -1
  208. data/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb +1 -1
  209. data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb +1 -1
  210. data/app/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb +3 -3
  211. data/app/views/hyrax/admin/admin_sets/edit.html.erb +1 -1
  212. data/app/views/hyrax/admin/collection_types/_form.html.erb +61 -0
  213. data/app/views/hyrax/admin/collection_types/_form_metadata.html.erb +2 -0
  214. data/app/views/hyrax/admin/collection_types/_form_metadata_admin_set.html.erb +2 -0
  215. data/app/views/hyrax/admin/collection_types/_form_participant_table.html.erb +26 -0
  216. data/app/views/hyrax/admin/collection_types/_form_participants.html.erb +62 -0
  217. data/app/views/hyrax/admin/collection_types/_form_settings.html.erb +39 -0
  218. data/app/views/hyrax/admin/collection_types/edit.html.erb +10 -0
  219. data/app/views/hyrax/admin/collection_types/index.html.erb +88 -0
  220. data/app/views/hyrax/admin/collection_types/new.html.erb +10 -0
  221. data/app/views/hyrax/base/_attribute_rows.html.erb +1 -0
  222. data/app/views/hyrax/base/_citations.html.erb +10 -6
  223. data/app/views/hyrax/base/_form_child_work_relationships.html.erb +22 -29
  224. data/app/views/hyrax/base/_form_files.html.erb +29 -16
  225. data/app/views/hyrax/base/_form_media.html.erb +1 -0
  226. data/app/views/hyrax/base/_form_member_of_collections.html.erb +44 -6
  227. data/app/views/hyrax/base/_form_metadata.html.erb +0 -3
  228. data/app/views/hyrax/base/_form_progress.html.erb +2 -1
  229. data/app/views/hyrax/base/_form_relationships.html.erb +3 -2
  230. data/app/views/hyrax/base/_form_rendering.html.erb +14 -0
  231. data/app/views/hyrax/base/_form_representative.html.erb +2 -2
  232. data/app/views/hyrax/base/_form_share.html.erb +44 -41
  233. data/app/views/hyrax/base/_form_thumbnail.html.erb +2 -2
  234. data/app/views/hyrax/base/_guts4form.html.erb +2 -2
  235. data/app/views/hyrax/base/_member.html.erb +3 -4
  236. data/app/views/hyrax/base/_metadata.html.erb +1 -5
  237. data/app/views/hyrax/base/_relationships.html.erb +1 -1
  238. data/app/views/hyrax/base/_relationships_parent_row.html.erb +1 -1
  239. data/app/views/hyrax/base/_representative_media.html.erb +8 -2
  240. data/app/views/hyrax/base/_work_title.erb +14 -7
  241. data/app/views/hyrax/base/_work_type.html.erb +4 -0
  242. data/app/views/hyrax/base/_workflow_actions.html.erb +7 -7
  243. data/app/views/hyrax/base/_workflow_actions_widget.erb +4 -2
  244. data/app/views/hyrax/base/show.html.erb +35 -26
  245. data/app/views/hyrax/batch_edits/edit.html.erb +1 -1
  246. data/app/views/hyrax/collections/_collection_description.erb +1 -1
  247. data/app/views/hyrax/collections/_default_group.html.erb +9 -11
  248. data/app/views/hyrax/collections/_list_collections.html.erb +19 -12
  249. data/app/views/hyrax/collections/_paginate.html.erb +5 -4
  250. data/app/views/hyrax/collections/_search_form.html.erb +1 -1
  251. data/app/views/hyrax/collections/_search_results.html.erb +0 -2
  252. data/app/views/hyrax/collections/_show_descriptions.html.erb +7 -6
  253. data/app/views/hyrax/collections/_show_document_list.html.erb +3 -3
  254. data/app/views/hyrax/collections/_show_document_list_row.html.erb +3 -3
  255. data/app/views/hyrax/collections/_show_parent_collections.html.erb +41 -0
  256. data/app/views/hyrax/collections/_sort_and_per_page.html.erb +16 -24
  257. data/app/views/hyrax/collections/_subcollection_list.html.erb +13 -0
  258. data/app/views/hyrax/collections/_view_type_group.html.erb +1 -1
  259. data/app/views/hyrax/collections/show.html.erb +120 -31
  260. data/app/views/hyrax/dashboard/collections/_button_for_batch_delete_collection.html.erb +4 -0
  261. data/app/views/hyrax/dashboard/collections/_button_for_remove_selected_from_collection.html.erb +0 -1
  262. data/app/views/hyrax/dashboard/collections/_button_for_update_collection.html.erb +1 -1
  263. data/app/views/hyrax/dashboard/collections/_button_remove_from_collection.html.erb +1 -1
  264. data/app/views/hyrax/dashboard/collections/_collection_title.html.erb +25 -0
  265. data/app/views/hyrax/dashboard/collections/_document_list.html.erb +1 -5
  266. data/app/views/hyrax/dashboard/collections/_edit_actions.html.erb +2 -2
  267. data/app/views/hyrax/dashboard/collections/_flash_msg.html.erb +9 -0
  268. data/app/views/hyrax/dashboard/collections/_form.html.erb +46 -24
  269. data/app/views/hyrax/dashboard/collections/_form_branding.html.erb +153 -0
  270. data/app/views/hyrax/dashboard/collections/_form_default_group_delt.html.erb +27 -0
  271. data/app/views/hyrax/dashboard/collections/_form_discovery.html.erb +18 -0
  272. data/app/views/hyrax/dashboard/collections/_form_share.html.erb +69 -81
  273. data/app/views/hyrax/dashboard/collections/_form_share_table.html.erb +31 -0
  274. data/app/views/hyrax/dashboard/collections/_list_collections.html.erb +54 -37
  275. data/app/views/hyrax/dashboard/collections/_modal_remove_from_collection.html.erb +17 -0
  276. data/app/views/hyrax/dashboard/collections/_modal_remove_sub_collection.html.erb +17 -0
  277. data/app/views/hyrax/dashboard/collections/_show_actions.html.erb +27 -21
  278. data/app/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb +25 -0
  279. data/app/views/hyrax/dashboard/collections/_show_document_list.html.erb +4 -3
  280. data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb +6 -5
  281. data/app/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb +6 -0
  282. data/app/views/hyrax/dashboard/collections/_show_parent_collections.html.erb +37 -0
  283. data/app/views/hyrax/dashboard/collections/_show_subcollection_actions.html.erb +26 -0
  284. data/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb +28 -27
  285. data/app/views/hyrax/dashboard/collections/_subcollection_list.html.erb +21 -0
  286. data/app/views/hyrax/dashboard/collections/_work_action_menu.html.erb +1 -1
  287. data/app/views/hyrax/dashboard/collections/edit.html.erb +8 -31
  288. data/app/views/hyrax/dashboard/collections/new.html.erb +2 -3
  289. data/app/views/hyrax/dashboard/collections/show.html.erb +102 -35
  290. data/app/views/hyrax/dashboard/sidebar/_configuration.html.erb +5 -0
  291. data/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb +0 -5
  292. data/app/views/hyrax/dashboard/sidebar/_tasks.html.erb +10 -0
  293. data/app/views/hyrax/dashboard/works/_default_group.html.erb +1 -0
  294. data/app/views/hyrax/dashboard/works/_list_works.html.erb +4 -0
  295. data/app/views/hyrax/file_sets/_extra_fields_modal.html.erb +1 -1
  296. data/app/views/hyrax/file_sets/_form.html.erb +2 -2
  297. data/app/views/hyrax/file_sets/_show_characterization_details.html.erb +1 -1
  298. data/app/views/hyrax/file_sets/media_display/_image.html.erb +3 -5
  299. data/app/views/hyrax/file_sets/media_display/_office_document.html.erb +3 -5
  300. data/app/views/hyrax/file_sets/media_display/_pdf.html.erb +3 -5
  301. data/app/views/hyrax/homepage/_featured.html.erb +5 -5
  302. data/app/views/hyrax/homepage/_featured_fields.html.erb +10 -14
  303. data/app/views/hyrax/homepage/_featured_works.html.erb +1 -1
  304. data/app/views/hyrax/homepage/_home_content.html.erb +2 -2
  305. data/app/views/hyrax/homepage/_recent_document.html.erb +14 -12
  306. data/app/views/hyrax/homepage/_recently_uploaded.html.erb +2 -6
  307. data/app/views/hyrax/homepage/index.html.erb +4 -2
  308. data/app/views/hyrax/my/_admin_set_action_menu.html.erb +54 -0
  309. data/app/views/hyrax/my/_collection_action_menu.html.erb +41 -9
  310. data/app/views/hyrax/my/_facet_pivot.html.erb +26 -0
  311. data/app/views/hyrax/my/_search_header.html.erb +1 -15
  312. data/app/views/hyrax/my/_sort_and_per_page.html.erb +12 -13
  313. data/app/views/hyrax/my/_work_action_menu.html.erb +17 -15
  314. data/app/views/hyrax/my/collections/_batch_actions.html.erb +5 -0
  315. data/app/views/hyrax/my/collections/_default_group.html.erb +21 -12
  316. data/app/views/hyrax/my/collections/_list_collections.html.erb +57 -35
  317. data/app/views/hyrax/my/collections/_modal_add_subcollection.html.erb +38 -0
  318. data/app/views/hyrax/my/collections/_modal_add_to_collection.html.erb +31 -0
  319. data/app/views/hyrax/my/collections/_modal_add_to_collection_deny.html.erb +12 -0
  320. data/app/views/hyrax/my/collections/_modal_add_to_collection_permission_deny.html.erb +12 -0
  321. data/app/views/hyrax/my/collections/_modal_collection_types_to_create.html.erb +36 -0
  322. data/app/views/hyrax/my/collections/_modal_delete_admin_set_deny.html.erb +12 -0
  323. data/app/views/hyrax/my/collections/_modal_delete_collection.html.erb +19 -0
  324. data/app/views/hyrax/my/collections/_modal_delete_collection_deny.html.erb +14 -0
  325. data/app/views/hyrax/my/collections/_modal_delete_deny.html.erb +14 -0
  326. data/app/views/hyrax/my/collections/_modal_delete_empty_collection.html.erb +18 -0
  327. data/app/views/hyrax/my/collections/_modal_delete_selected_collections.html.erb +17 -0
  328. data/app/views/hyrax/my/collections/_modal_edit_deny.html.erb +14 -0
  329. data/app/views/hyrax/my/collections/_tabs.html.erb +3 -3
  330. data/app/views/hyrax/my/collections/index.html.erb +46 -21
  331. data/app/views/hyrax/my/works/_batch_actions.html.erb +14 -0
  332. data/app/views/hyrax/my/works/_default_group.html.erb +10 -12
  333. data/app/views/hyrax/my/works/_tabs.html.erb +1 -1
  334. data/app/views/hyrax/my/works/index.html.erb +7 -5
  335. data/app/views/hyrax/notifications/_notifications.html.erb +3 -3
  336. data/app/views/hyrax/permissions/confirm_access.html.erb +1 -1
  337. data/app/views/hyrax/stats/file.html.erb +1 -1
  338. data/app/views/hyrax/stats/work.html.erb +1 -1
  339. data/app/views/hyrax/transfers/_received.html.erb +1 -1
  340. data/app/views/hyrax/transfers/_sent.html.erb +1 -1
  341. data/app/views/hyrax/uploads/_js_templates_branding.html.erb +120 -0
  342. data/app/views/hyrax/users/_activity_log.html.erb +3 -3
  343. data/app/views/kaminari/blacklight_compact/_paginator.html.erb +23 -0
  344. data/app/views/layouts/hyrax.html.erb +9 -11
  345. data/app/views/layouts/{dashboard.html.erb → hyrax/dashboard.html.erb} +0 -0
  346. data/app/views/shared/_select_work_type_modal.html.erb +25 -26
  347. data/config/features.rb +4 -0
  348. data/config/initializers/hyrax_callbacks.rb +2 -2
  349. data/config/initializers/samvera-nesting_indexer_initializer.rb +15 -0
  350. data/config/locales/hyrax.de.yml +364 -79
  351. data/config/locales/hyrax.en.yml +874 -584
  352. data/config/locales/hyrax.es.yml +323 -35
  353. data/config/locales/hyrax.fr.yml +323 -39
  354. data/config/locales/hyrax.it.yml +322 -39
  355. data/config/locales/hyrax.pt-BR.yml +317 -39
  356. data/config/locales/hyrax.zh.yml +420 -142
  357. data/config/routes.rb +17 -0
  358. data/hyrax.gemspec +58 -57
  359. data/lib/generators/hyrax/assets_generator.rb +2 -4
  360. data/lib/generators/hyrax/clamav_generator.rb +0 -2
  361. data/lib/generators/hyrax/config_generator.rb +0 -2
  362. data/lib/generators/hyrax/install_generator.rb +12 -3
  363. data/lib/generators/hyrax/riiif_generator.rb +54 -0
  364. data/lib/generators/hyrax/templates/app/assets/images/us_404.svg +91 -0
  365. data/lib/generators/hyrax/templates/config/initializers/hyrax.rb +48 -3
  366. data/lib/generators/hyrax/templates/config/initializers/riiif.rb +26 -0
  367. data/lib/generators/hyrax/templates/config/locales/hyrax.en.yml +4 -4
  368. data/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml +0 -4
  369. data/lib/generators/hyrax/templates/db/migrate/20170808160431_create_collection_types.rb.erb +17 -0
  370. data/lib/generators/hyrax/templates/db/migrate/20170808160432_update_collection_type_column_names.rb.erb +9 -0
  371. data/lib/generators/hyrax/templates/db/migrate/20170810190549_update_collection_type_column_options.rb.erb +9 -0
  372. data/lib/generators/hyrax/templates/db/migrate/20170816180307_create_collection_branding_infos.rb.erb +15 -0
  373. data/lib/generators/hyrax/templates/db/migrate/20170817152654_create_collection_type_participants.rb.erb +11 -0
  374. data/lib/generators/hyrax/templates/db/migrate/20170821152307_rename_admin_set_id_to_source_id.rb.erb +5 -0
  375. data/lib/generators/hyrax/templates/db/migrate/20171103080032_add_collection_type_sharing_options.rb.erb +5 -0
  376. data/lib/generators/hyrax/templates/db/seeds.rb +226 -22
  377. data/lib/generators/hyrax/work/templates/controller.rb.erb +1 -1
  378. data/lib/generators/hyrax/work/templates/feature_spec.rb.erb +37 -1
  379. data/lib/generators/hyrax/work/templates/form.rb.erb +1 -0
  380. data/lib/generators/hyrax/work/templates/indexer.rb.erb +0 -1
  381. data/lib/generators/hyrax/work/templates/locale.de.yml.erb +1 -1
  382. data/lib/generators/hyrax/work/templates/locale.en.yml.erb +1 -1
  383. data/lib/generators/hyrax/work/templates/locale.es.yml.erb +1 -1
  384. data/lib/generators/hyrax/work/templates/locale.fr.yml.erb +1 -1
  385. data/lib/generators/hyrax/work/templates/locale.it.yml.erb +1 -1
  386. data/lib/generators/hyrax/work/templates/locale.pt-BR.yml.erb +1 -1
  387. data/lib/generators/hyrax/work/templates/locale.zh.yml.erb +1 -1
  388. data/lib/generators/hyrax/work/templates/model.rb.erb +0 -2
  389. data/lib/hyrax.rb +1 -1
  390. data/lib/hyrax/configuration.rb +96 -7
  391. data/lib/hyrax/engine.rb +5 -4
  392. data/lib/hyrax/rails/routes.rb +1 -1
  393. data/lib/hyrax/version.rb +1 -1
  394. data/lib/tasks/default_admin_set.rake +5 -3
  395. data/lib/tasks/default_collection_type.rake +19 -0
  396. data/lib/tasks/migrate.rake +8 -0
  397. data/spec/abilities/ability_spec.rb +4 -1
  398. data/spec/abilities/admin_set_ability_spec.rb +172 -0
  399. data/spec/abilities/collection_ability_spec.rb +194 -0
  400. data/spec/abilities/collection_type_ability_spec.rb +72 -0
  401. data/spec/abilities/file_set_abilities_spec.rb +3 -3
  402. data/spec/abilities/generic_work_abilities_spec.rb +5 -5
  403. data/spec/abilities/permission_template_ability_spec.rb +145 -0
  404. data/spec/abilities/solr_document_ability_spec.rb +27 -0
  405. data/spec/actors/hyrax/actors/apply_permission_template_actor_spec.rb +96 -28
  406. data/spec/actors/hyrax/actors/collections_membership_actor_spec.rb +283 -15
  407. data/spec/actors/hyrax/actors/create_with_remote_files_actor_spec.rb +7 -7
  408. data/spec/actors/hyrax/actors/default_admin_set_actor_spec.rb +1 -1
  409. data/spec/actors/hyrax/actors/file_actor_spec.rb +0 -1
  410. data/spec/actors/hyrax/actors/file_set_actor_spec.rb +8 -6
  411. data/spec/actors/hyrax/actors/generic_work_actor_spec.rb +11 -39
  412. data/spec/actors/hyrax/actors/interpret_visibility_actor_spec.rb +15 -15
  413. data/spec/actors/hyrax/actors/model_actor_spec.rb +0 -2
  414. data/spec/authorities/qa/authorities/collections_spec.rb +68 -0
  415. data/spec/channels/hyrax/application_cable/channel_spec.rb +1 -1
  416. data/spec/channels/hyrax/application_cable/connection_spec.rb +1 -1
  417. data/spec/channels/hyrax/notifications_channel_spec.rb +1 -1
  418. data/spec/controllers/catalog_controller_spec.rb +1 -1
  419. data/spec/controllers/hyrax/admin/admin_sets_controller_spec.rb +27 -1
  420. data/spec/controllers/hyrax/admin/collection_type_participants_controller_spec.rb +152 -0
  421. data/spec/controllers/hyrax/admin/collection_types_controller_spec.rb +320 -0
  422. data/spec/controllers/hyrax/admin/permission_template_accesses_controller_spec.rb +68 -29
  423. data/spec/controllers/hyrax/admin/permission_templates_controller_spec.rb +37 -10
  424. data/spec/controllers/hyrax/admin/strategies_controller_spec.rb +2 -13
  425. data/spec/controllers/hyrax/admin/workflow_roles_controller_spec.rb +52 -2
  426. data/spec/controllers/hyrax/batch_edits_controller_spec.rb +75 -4
  427. data/spec/controllers/hyrax/batch_uploads_controller_spec.rb +2 -2
  428. data/spec/controllers/hyrax/collections_controller_spec.rb +15 -6
  429. data/spec/controllers/hyrax/content_blocks_controller_spec.rb +5 -5
  430. data/spec/controllers/hyrax/dashboard/collection_members_controller_spec.rb +408 -0
  431. data/spec/controllers/hyrax/dashboard/collections_controller_spec.rb +114 -18
  432. data/spec/controllers/hyrax/dashboard/nest_collections_controller_spec.rb +360 -0
  433. data/spec/controllers/hyrax/dashboard/profiles_controller_spec.rb +2 -2
  434. data/spec/controllers/hyrax/dashboard/works_controller_spec.rb +1 -1
  435. data/spec/controllers/hyrax/downloads_controller_spec.rb +3 -3
  436. data/spec/controllers/hyrax/featured_work_lists_controller_spec.rb +2 -2
  437. data/spec/controllers/hyrax/file_sets_controller_spec.rb +8 -136
  438. data/spec/controllers/hyrax/fixity_checks_controller_spec.rb +1 -1
  439. data/spec/controllers/hyrax/generic_works_controller_spec.rb +64 -2
  440. data/spec/controllers/hyrax/homepage_controller_spec.rb +1 -1
  441. data/spec/controllers/hyrax/my/works_controller_spec.rb +4 -1
  442. data/spec/controllers/hyrax/pages_controller_spec.rb +11 -11
  443. data/spec/controllers/hyrax/users_controller_spec.rb +1 -1
  444. data/spec/controllers/hyrax/workflow_actions_controller_spec.rb +1 -1
  445. data/spec/conversions/power_converters/polymorphic_type_spec.rb +2 -2
  446. data/spec/conversions/power_converters/sipity_agent_spec.rb +1 -1
  447. data/spec/conversions/power_converters/sipity_role_spec.rb +1 -1
  448. data/spec/conversions/power_converters/sipity_workflow_state_spec.rb +1 -1
  449. data/spec/factories/admin_sets.rb +3 -3
  450. data/spec/factories/collection_branding_infos.rb +11 -0
  451. data/spec/factories/collection_type_participants.rb +8 -0
  452. data/spec/factories/collection_types.rb +104 -0
  453. data/spec/factories/collections.rb +323 -0
  454. data/spec/factories/collections_factory.rb +106 -3
  455. data/spec/factories/file_sets.rb +2 -2
  456. data/spec/factories/generic_works.rb +22 -14
  457. data/spec/factories/object_id.rb +6 -0
  458. data/spec/factories/permission_templates.rb +46 -8
  459. data/spec/factories/users.rb +1 -1
  460. data/spec/factory_tests/collections_factory_spec.rb +211 -0
  461. data/spec/features/admin_spec.rb +1 -1
  462. data/spec/features/batch_create_spec.rb +1 -1
  463. data/spec/features/batch_edit_spec.rb +0 -1
  464. data/spec/features/browse_catalog_spec.rb +1 -3
  465. data/spec/features/browse_dashboard_works_spec.rb +0 -1
  466. data/spec/features/collection_multi_membership_spec.rb +188 -0
  467. data/spec/features/collection_spec.rb +45 -7
  468. data/spec/features/collection_type_spec.rb +338 -0
  469. data/spec/features/create_child_work_spec.rb +1 -1
  470. data/spec/features/create_work_admin_spec.rb +44 -0
  471. data/spec/features/create_work_spec.rb +1 -1
  472. data/spec/features/dashboard/all_works.rb +1 -1
  473. data/spec/features/dashboard/collection_spec.rb +724 -115
  474. data/spec/features/delete_work_spec.rb +1 -1
  475. data/spec/features/edit_file_spec.rb +1 -1
  476. data/spec/features/edit_work_spec.rb +1 -1
  477. data/spec/features/embargo_spec.rb +1 -1
  478. data/spec/features/homepage_spec.rb +3 -3
  479. data/spec/features/lease_spec.rb +1 -1
  480. data/spec/features/notifications_spec.rb +2 -2
  481. data/spec/features/ownership_transfer_spec.rb +1 -2
  482. data/spec/features/proxy_spec.rb +1 -1
  483. data/spec/features/search_spec.rb +12 -11
  484. data/spec/features/static_pages_spec.rb +1 -1
  485. data/spec/features/users_spec.rb +1 -1
  486. data/spec/features/work_generator_spec.rb +1 -1
  487. data/spec/features/work_show_spec.rb +4 -4
  488. data/spec/features/workflow_roles_spec.rb +1 -1
  489. data/spec/features/workflow_state_changes_spec.rb +2 -2
  490. data/spec/forms/hyrax/forms/admin/collection_type_form_spec.rb +106 -0
  491. data/spec/forms/hyrax/forms/admin/collection_type_participant_form_spec.rb +10 -0
  492. data/spec/forms/hyrax/forms/admin_set_form_spec.rb +1 -1
  493. data/spec/forms/hyrax/forms/batch_edit_form_spec.rb +1 -1
  494. data/spec/forms/hyrax/forms/batch_upload_form_spec.rb +1 -0
  495. data/spec/forms/hyrax/forms/collection_form_spec.rb +52 -4
  496. data/spec/forms/hyrax/forms/dashboard/nest_collection_form_spec.rb +159 -0
  497. data/spec/forms/hyrax/forms/permission_template_form_spec.rb +15 -12
  498. data/spec/forms/hyrax/forms/work_form_spec.rb +61 -12
  499. data/spec/forms/hyrax/forms/workflow_action_form_spec.rb +1 -1
  500. data/spec/forms/hyrax/generic_work_form_spec.rb +6 -3
  501. data/spec/helpers/hyrax/ability_helper_spec.rb +11 -0
  502. data/spec/helpers/hyrax/collections_helper_spec.rb +17 -39
  503. data/spec/helpers/hyrax/content_block_helper_spec.rb +1 -1
  504. data/spec/helpers/{dashboard_helper_spec.rb → hyrax/dashboard_helper_behavior_spec.rb} +1 -12
  505. data/spec/helpers/hyrax/trophy_helper_spec.rb +1 -1
  506. data/spec/helpers/hyrax_helper_spec.rb +0 -3
  507. data/spec/indexers/hyrax/generic_work_indexer_spec.rb +4 -4
  508. data/spec/indexers/hyrax/repository_reindexer_spec.rb +8 -0
  509. data/spec/javascripts/relationships_control_spec.js.coffee +3 -3
  510. data/spec/javascripts/settings_spec.js +73 -0
  511. data/spec/jobs/user_edit_profile_event_job_spec.rb +1 -1
  512. data/spec/lib/hyrax/configuration_spec.rb +16 -0
  513. data/spec/models/admin_set_spec.rb +42 -4
  514. data/spec/models/collection_branding_info_spec.rb +61 -0
  515. data/spec/models/collection_spec.rb +228 -3
  516. data/spec/models/concerns/hyrax/collection_nesting_spec.rb +64 -0
  517. data/spec/models/file_set_spec.rb +4 -4
  518. data/spec/models/generic_work_spec.rb +1 -1
  519. data/spec/models/hyrax/batch_create_operation_spec.rb +59 -0
  520. data/spec/models/hyrax/collection_type_participant_spec.rb +43 -0
  521. data/spec/models/hyrax/collection_type_spec.rb +235 -0
  522. data/spec/models/hyrax/operation_spec.rb +27 -1
  523. data/spec/models/hyrax/permission_template_access_spec.rb +128 -5
  524. data/spec/models/hyrax/permission_template_spec.rb +85 -29
  525. data/spec/models/hyrax/user_usage_stats_spec.rb +1 -1
  526. data/spec/models/hyrax/work_behavior_spec.rb +12 -2
  527. data/spec/models/sipity/agent_spec.rb +1 -1
  528. data/spec/models/sipity/comment_spec.rb +1 -1
  529. data/spec/models/sipity/entity_spec.rb +3 -3
  530. data/spec/models/sipity/entity_specific_responsibility_spec.rb +1 -1
  531. data/spec/models/sipity/notifiable_context_spec.rb +1 -1
  532. data/spec/models/sipity/notification_recipient_spec.rb +1 -1
  533. data/spec/models/sipity/notification_spec.rb +1 -1
  534. data/spec/models/sipity/role_spec.rb +1 -1
  535. data/spec/models/sipity/workflow_action_spec.rb +1 -1
  536. data/spec/models/sipity/workflow_responsibility_spec.rb +1 -1
  537. data/spec/models/sipity/workflow_role_spec.rb +1 -1
  538. data/spec/models/sipity/workflow_spec.rb +7 -7
  539. data/spec/models/sipity/workflow_state_action_permission_spec.rb +1 -1
  540. data/spec/models/sipity/workflow_state_action_spec.rb +1 -1
  541. data/spec/models/sipity/workflow_state_spec.rb +1 -1
  542. data/spec/models/solr_document_spec.rb +24 -0
  543. data/spec/models/user_mailbox_spec.rb +0 -2
  544. data/spec/models/user_spec.rb +7 -7
  545. data/spec/presenters/hyrax/admin/users_presenter_spec.rb +2 -2
  546. data/spec/presenters/hyrax/admin_set_options_presenter_spec.rb +7 -7
  547. data/spec/presenters/hyrax/admin_set_presenter_spec.rb +20 -0
  548. data/spec/presenters/hyrax/collection_options_presenter_spec.rb +2 -0
  549. data/spec/presenters/hyrax/collection_presenter_spec.rb +375 -6
  550. data/spec/presenters/hyrax/file_set_presenter_spec.rb +124 -5
  551. data/spec/presenters/hyrax/inspect_work_presenter_spec.rb +1 -1
  552. data/spec/presenters/hyrax/menu_presenter_spec.rb +5 -0
  553. data/spec/presenters/hyrax/select_collection_type_list_presenter_spec.rb +59 -0
  554. data/spec/presenters/hyrax/select_collection_type_presenter_spec.rb +10 -0
  555. data/spec/presenters/hyrax/select_type_presenter_spec.rb +12 -0
  556. data/spec/presenters/hyrax/work_show_presenter_spec.rb +116 -1
  557. data/spec/presenters/hyrax/workflow_presenter_spec.rb +1 -1
  558. data/spec/renderers/hyrax/renderers/attribute_renderer_spec.rb +6 -6
  559. data/spec/renderers/hyrax/renderers/date_attribute_renderer_spec.rb +2 -2
  560. data/spec/renderers/hyrax/renderers/external_link_attribute_renderer_spec.rb +1 -1
  561. data/spec/renderers/hyrax/renderers/faceted_attribute_renderer_spec.rb +2 -2
  562. data/spec/renderers/hyrax/renderers/license_attribute_renderer_spec.rb +2 -2
  563. data/spec/renderers/hyrax/renderers/linked_attribute_renderer_spec.rb +2 -2
  564. data/spec/renderers/hyrax/renderers/rights_statement_attribute_renderer_spec.rb +10 -1
  565. data/spec/requests/riiif_spec.rb +32 -0
  566. data/spec/routing/collection_permission_templates_routes_spec.rb +31 -0
  567. data/spec/routing/collection_types_routes.rb +35 -0
  568. data/spec/routing/dashboard_routes_spec.rb +37 -0
  569. data/spec/routing/route_spec.rb +4 -10
  570. data/spec/search_builders/hyrax/admin_admin_set_member_search_builder_spec.rb +2 -2
  571. data/spec/search_builders/hyrax/admin_set_search_builder_spec.rb +4 -40
  572. data/spec/search_builders/hyrax/collection_member_search_builder_spec.rb +53 -0
  573. data/spec/search_builders/hyrax/collection_search_builder_spec.rb +74 -0
  574. data/spec/search_builders/hyrax/dashboard/collections_search_builder_spec.rb +92 -0
  575. data/spec/search_builders/hyrax/dashboard/nested_collections_search_builder_spec.rb +85 -0
  576. data/spec/search_builders/hyrax/dashboard/works_search_builder_spec.rb +44 -0
  577. data/spec/search_builders/hyrax/my/collections_search_builder_spec.rb +35 -0
  578. data/spec/search_builders/hyrax/work_search_builder_spec.rb +47 -10
  579. data/spec/services/hyrax/adapters/nesting_index_adapter_spec.rb +191 -0
  580. data/spec/services/hyrax/admin_set_create_service_spec.rb +6 -2
  581. data/spec/services/hyrax/admin_set_member_service_spec.rb +21 -0
  582. data/spec/services/hyrax/batch_create_failure_service_spec.rb +6 -2
  583. data/spec/services/hyrax/collection_types/create_service_spec.rb +91 -0
  584. data/spec/services/hyrax/collection_types/permissions_service_spec.rb +297 -0
  585. data/spec/services/hyrax/collections/collection_member_service_spec.rb +49 -0
  586. data/spec/services/hyrax/collections/managed_collections_service_spec.rb +17 -0
  587. data/spec/services/hyrax/collections/migration_service_spec.rb +280 -0
  588. data/spec/services/hyrax/collections/nested_collection_persistence_service_spec.rb +28 -0
  589. data/spec/services/hyrax/collections/nested_collection_query_service_spec.rb +353 -0
  590. data/spec/services/hyrax/collections/permissions_create_service_spec.rb +41 -0
  591. data/spec/services/hyrax/collections/permissions_service_spec.rb +278 -0
  592. data/spec/services/hyrax/collections_service_spec.rb +30 -8
  593. data/spec/services/hyrax/embargo_service_spec.rb +26 -5
  594. data/spec/services/hyrax/iiif_authorization_service_spec.rb +43 -0
  595. data/spec/services/hyrax/multiple_membership_checker_spec.rb +155 -0
  596. data/spec/services/hyrax/qa_select_service_spec.rb +8 -2
  597. data/spec/services/hyrax/workflow/notification_configuration_parameter_spec.rb +1 -1
  598. data/spec/services/hyrax/workflow/notification_generator_spec.rb +1 -1
  599. data/spec/services/hyrax/workflow/permission_generator_spec.rb +1 -1
  600. data/spec/services/hyrax/workflow/permission_query_spec.rb +2 -2
  601. data/spec/services/hyrax/workflow/status_list_service_spec.rb +1 -1
  602. data/spec/services/hyrax/workflow/workflow_factory_spec.rb +1 -1
  603. data/spec/services/hyrax/workflow/workflow_schema_spec.rb +1 -1
  604. data/spec/services/hyrax/works/managed_works_service_spec.rb +17 -0
  605. data/spec/spec_helper.rb +34 -4
  606. data/spec/support/features/session_helpers.rb +1 -1
  607. data/spec/support/matchers/collection_type_property_matchers.rb +29 -0
  608. data/spec/test_app_templates/lib/generators/test_app_generator.rb +64 -24
  609. data/spec/views/_flash_msg.html.erb_spec.rb +0 -2
  610. data/spec/views/_user_util_links.html.erb_spec.rb +0 -2
  611. data/spec/views/catalog/_index_list_default.html.erb_spec.rb +9 -9
  612. data/spec/views/hyrax/admin/admin_sets/_form_participant_table.html.erb_spec.rb +42 -20
  613. data/spec/views/hyrax/admin/collection_types/_form.html.erb_spec.rb +43 -0
  614. data/spec/views/hyrax/admin/collection_types/_form_metadata.html.erb_spec.rb +27 -0
  615. data/spec/views/hyrax/admin/collection_types/_form_metadata_admin_set.html.erb_spec.rb +27 -0
  616. data/spec/views/hyrax/admin/collection_types/_form_participants.html.erb_spec.rb +16 -0
  617. data/spec/views/hyrax/admin/collection_types/_form_participants_table.html.erb_spec.rb +73 -0
  618. data/spec/views/hyrax/admin/collection_types/_form_settings.html.erb_spec.rb +106 -0
  619. data/spec/views/hyrax/admin/collection_types/index.html.erb_spec.rb +41 -0
  620. data/spec/views/hyrax/admin/users/index.html.erb_spec.rb +1 -1
  621. data/spec/views/hyrax/base/_form.html.erb_spec.rb +18 -42
  622. data/spec/views/hyrax/base/_form_child_work_relationships.html.erb_spec.rb +11 -22
  623. data/spec/views/hyrax/base/_form_files.html.erb_spec.rb +38 -0
  624. data/spec/views/hyrax/base/_form_progress.html.erb_spec.rb +1 -1
  625. data/spec/views/hyrax/base/_form_relationships.html.erb_spec.rb +1 -2
  626. data/spec/views/hyrax/base/_form_rendering.html.erb_spec.rb +18 -0
  627. data/spec/views/hyrax/base/file_manager.html.erb_spec.rb +1 -1
  628. data/spec/views/hyrax/base/show.html.erb_spec.rb +24 -5
  629. data/spec/views/hyrax/collections/_show_descriptions.html.erb_spec.rb +1 -1
  630. data/spec/views/hyrax/collections/_show_parent_collections.html.erb_spec.rb +124 -0
  631. data/spec/views/hyrax/collections/_sort_and_per_page.html.erb_spec.rb +60 -0
  632. data/spec/views/hyrax/collections/_subcollection_list.html.erb_spec.rb +39 -0
  633. data/spec/views/hyrax/collections/show.html.erb_spec.rb +20 -23
  634. data/spec/views/hyrax/dashboard/_sidebar.html.erb_spec.rb +14 -9
  635. data/spec/views/hyrax/dashboard/collections/_form.html.erb_spec.rb +5 -1
  636. data/spec/views/hyrax/dashboard/collections/_form_branding.html.erb_spec.rb +23 -0
  637. data/spec/views/hyrax/dashboard/collections/_form_discovery.erb_spec.rb +67 -0
  638. data/spec/views/hyrax/dashboard/collections/_form_share.erb_spec.rb +13 -34
  639. data/spec/views/hyrax/dashboard/collections/_form_share_table.html.erb_spec.rb +108 -0
  640. data/spec/views/hyrax/dashboard/collections/_show_actions.html.erb_spec.rb +64 -0
  641. data/spec/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb_spec.rb +44 -0
  642. data/spec/views/hyrax/dashboard/collections/_show_descriptions.html.erb_spec.rb +1 -1
  643. data/spec/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb_spec.rb +23 -0
  644. data/spec/views/hyrax/dashboard/collections/_show_parent_collections.html.erb_spec.rb +118 -0
  645. data/spec/views/hyrax/dashboard/collections/_show_subcollection_actions.html.erb_spec.rb +62 -0
  646. data/spec/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb_spec.rb +60 -0
  647. data/spec/views/hyrax/dashboard/collections/_subcollection_list.html.erb_spec.rb +63 -0
  648. data/spec/views/hyrax/dashboard/collections/_work_action_menu.html.erb_spec.rb +18 -0
  649. data/spec/views/hyrax/dashboard/collections/edit.html.erb_spec.rb +5 -13
  650. data/spec/views/hyrax/dashboard/collections/show.html.erb_spec.rb +86 -9
  651. data/spec/views/hyrax/file_sets/_show_actions.html.erb_spec.rb +1 -1
  652. data/spec/views/hyrax/homepage/_featured_works.html.erb_spec.rb +1 -1
  653. data/spec/views/hyrax/homepage/index.html.erb_spec.rb +14 -5
  654. data/spec/views/hyrax/my/_collection_action_menu.html.erb_spec.rb +65 -0
  655. data/spec/views/hyrax/my/_search_header.html.erb_spec.rb +6 -6
  656. data/spec/views/hyrax/my/_work_action_menu.html.erb_spec.rb +6 -4
  657. data/spec/views/hyrax/my/collections/_list_collections.html.erb_spec.rb +90 -22
  658. data/spec/views/hyrax/my/works/index.html.erb_spec.rb +3 -1
  659. data/spec/views/hyrax/users/_user_info.html.erb_spec.rb +16 -18
  660. data/spec/views/pages/show.html.erb_spec.rb +1 -1
  661. data/spec/views/shared/select_work_type_modal.html.erb_spec.rb +36 -10
  662. data/tasks/hyrax_dev.rake +27 -4
  663. data/template.rb +2 -1
  664. metadata +578 -290
  665. data/.solr_wrapper +0 -6
  666. data/app/assets/javascripts/hyrax/relationships/work.es6 +0 -7
  667. data/app/assets/javascripts/hyrax/workflow_actions_affix.js +0 -14
  668. data/app/assets/stylesheets/hyrax/_work_editor.scss +0 -17
  669. data/app/controllers/concerns/hyrax/parent_container.rb +0 -35
  670. data/app/helpers/dashboard_helper.rb +0 -3
  671. data/app/services/hyrax/parent_service.rb +0 -19
  672. data/app/views/catalog/_show_partials/_default.html.erb +0 -21
  673. data/app/views/catalog/_show_partials/_default_details.html.erb +0 -15
  674. data/app/views/catalog/_show_partials/_facets.html.erb +0 -52
  675. data/app/views/hyrax/base/_browse_everything.html.erb +0 -6
  676. data/app/views/hyrax/base/_find_work_widget.html.erb +0 -10
  677. data/app/views/hyrax/dashboard/collections/_form_default_group.html.erb +0 -25
  678. data/app/views/hyrax/dashboard/collections/_form_permission.html.erb +0 -24
  679. data/app/views/hyrax/file_sets/jq_upload.json.jbuilder +0 -8
  680. data/solr/config/_rest_managed.json +0 -3
  681. data/solr/config/admin-extra.html +0 -31
  682. data/solr/config/elevate.xml +0 -36
  683. data/solr/config/mapping-ISOLatin1Accent.txt +0 -246
  684. data/solr/config/protwords.txt +0 -21
  685. data/solr/config/schema.xml +0 -366
  686. data/solr/config/scripts.conf +0 -24
  687. data/solr/config/solrconfig.xml +0 -322
  688. data/solr/config/spellings.txt +0 -2
  689. data/solr/config/stopwords.txt +0 -58
  690. data/solr/config/stopwords_en.txt +0 -58
  691. data/solr/config/synonyms.txt +0 -31
  692. data/solr/config/xslt/example.xsl +0 -132
  693. data/solr/config/xslt/example_atom.xsl +0 -67
  694. data/solr/config/xslt/example_rss.xsl +0 -66
  695. data/solr/config/xslt/luke.xsl +0 -337
  696. data/spec/abilities/admin_set_abilities_spec.rb +0 -15
  697. data/spec/abilities/collection_abilities_spec.rb +0 -51
  698. data/spec/features/admin_admin_set_spec.rb +0 -30
  699. data/spec/helpers/hyrax/citations_behaviors/formatters/chicago_formatter_spec.rb +0 -10
  700. data/spec/services/hyrax/parent_service_spec.rb +0 -11
  701. data/spec/support/uploaded_file_monkeypatch.rb +0 -6
  702. data/spec/views/hyrax/base/_browse_everything.html.erb_spec.rb +0 -17
  703. data/spec/views/hyrax/base/_find_work_widget.html.erb_spec.rb +0 -20
@@ -0,0 +1,49 @@
1
+ RSpec.describe Hyrax::Collections::CollectionMemberService, clean_repo: true, with_nested_reindexing: true do
2
+ let(:blacklight_config) { CatalogController.blacklight_config }
3
+ let(:repository) { Blacklight::Solr::Repository.new(blacklight_config) }
4
+ let(:current_ability) { instance_double(Ability, admin?: true) }
5
+ let!(:nestable_collection) { create(:public_collection, collection_type_settings: [:nestable]) }
6
+ let(:scope) { double('Scope', current_ability: current_ability, repository: repository, blacklight_config: blacklight_config, collection: nestable_collection) }
7
+ let!(:subcollection) { create(:public_collection, member_of_collections: [nestable_collection], collection_type_settings: [:nestable]) }
8
+ let(:builder) { described_class.new(scope: scope, collection: nestable_collection, params: { "id" => nestable_collection.id.to_s }) }
9
+
10
+ let!(:work1) { create(:generic_work, member_of_collections: [nestable_collection]) }
11
+ let!(:work2) { create(:generic_work) }
12
+ let!(:work3) { create(:generic_work, member_of_collections: [nestable_collection]) }
13
+
14
+ describe '#available_member_subcollections' do
15
+ let(:subject) { builder.available_member_subcollections }
16
+ let(:ids) { subject.response[:docs].map { |col| col[:id] } }
17
+
18
+ it 'returns the members that are collections' do
19
+ expect(ids).to include(subcollection.id)
20
+ expect(ids).not_to include(work1.id)
21
+ expect(ids).not_to include(work3.id)
22
+ expect(ids).not_to include(work2.id)
23
+ end
24
+ end
25
+
26
+ describe '#available_member_works' do
27
+ let(:subject) { builder.available_member_works }
28
+ let(:ids) { subject.response[:docs].map { |col| col[:id] } }
29
+
30
+ it 'returns the members that are collections' do
31
+ expect(ids).to include(work1.id)
32
+ expect(ids).to include(work3.id)
33
+ expect(ids).not_to include(work2.id)
34
+ expect(ids).not_to include(subcollection.id)
35
+ end
36
+ end
37
+
38
+ describe '#available_member_work_ids' do
39
+ let(:subject) { builder.available_member_work_ids }
40
+ let(:ids) { subject.response[:docs].map { |col| col[:id] } }
41
+
42
+ it 'returns the members ids that are works' do
43
+ expect(ids).to include(work1.id)
44
+ expect(ids).to include(work3.id)
45
+ expect(ids).not_to include(work2.id)
46
+ expect(ids).not_to include(subcollection.id)
47
+ end
48
+ end
49
+ end
@@ -0,0 +1,17 @@
1
+ RSpec.describe Hyrax::Collections::ManagedCollectionsService, clean_repo: true do
2
+ let(:blacklight_config) { CatalogController.blacklight_config }
3
+ let(:repository) { Blacklight::Solr::Repository.new(blacklight_config) }
4
+
5
+ let(:current_ability) { instance_double(Ability, admin?: true) }
6
+ let(:scope) { double('Scope', can?: true, current_ability: current_ability, repository: repository, blacklight_config: blacklight_config) }
7
+
8
+ describe '.managed_collections_count' do
9
+ subject { described_class.managed_collections_count(scope: scope) }
10
+
11
+ let!(:collection) { create(:public_collection) }
12
+
13
+ it 'returns number of collections that can be managed' do
14
+ expect(subject).to eq(1)
15
+ end
16
+ end
17
+ end
@@ -0,0 +1,280 @@
1
+ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
2
+ let(:user) { create(:user) }
3
+ let(:editor1) { create(:user) }
4
+ let(:editor2) { create(:user) }
5
+ let(:reader1) { create(:user) }
6
+ let(:reader2) { create(:user) }
7
+ let(:default_gid) { create(:user_collection_type).gid }
8
+
9
+ describe ".migrate_all_collections" do
10
+ context 'when legacy collections are found (e.g. collections created before Hyrax 2.1.0)' do
11
+ let!(:col_none) { build(:typeless_collection, id: 'col_none', user: user, edit_users: [user.user_key], do_save: true) }
12
+ let!(:col_vu) { build(:typeless_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], do_save: true) }
13
+ let!(:col_vg) { build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group1', 'read_group_2'], do_save: true) }
14
+ let!(:col_mu) { build(:typeless_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], do_save: true) }
15
+ let!(:col_mg) { build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group1', 'edit_group_2'], do_save: true) }
16
+
17
+ it 'sets gid and adds permissions' do # rubocop:disable RSpec/ExampleLength
18
+ Collection.all.each do |col|
19
+ expect(col.collection_type_gid).to be_nil
20
+ expect { Hyrax::PermissionTemplate.find_by!(source_id: col.id) }.to raise_error ActiveRecord::RecordNotFound
21
+ end
22
+
23
+ Hyrax::Collections::MigrationService.migrate_all_collections
24
+
25
+ Collection.all.each do |col|
26
+ expect(col.collection_type_gid).to eq default_gid
27
+ pt_id = Hyrax::PermissionTemplate.find_by!(source_id: col.id)
28
+ expect(pt_id).not_to be_nil
29
+ expect_access(pt_id, 'user', :manage, col.edit_users)
30
+ expect_access(pt_id, 'group', :manage, col.edit_groups)
31
+ expect_access(pt_id, 'user', :view, col.read_users)
32
+ expect_access(pt_id, 'group', :view, col.read_groups)
33
+ end
34
+ end
35
+ end
36
+
37
+ context 'when newer collections are found (e.g. collections created at or after Hyrax 2.1.0)' do
38
+ let!(:collection) do
39
+ create(:collection, id: 'col_newer', user: user, with_permission_template: true,
40
+ collection_type_settings: [:discoverable], edit_users: [user.user_key],
41
+ create_access: true)
42
+ end
43
+ let!(:permission_template) { collection.permission_template }
44
+ let!(:collection_type_gid) { collection.collection_type_gid }
45
+ let!(:edit_users) { collection.edit_users }
46
+
47
+ it "doesn't change the collection" do
48
+ expect(collection.collection_type_gid).to eq collection_type_gid
49
+ expect(Hyrax::PermissionTemplate.find_by!(source_id: collection.id).id).to eq permission_template.id
50
+ expect_access(permission_template.id, 'user', :manage, edit_users)
51
+
52
+ Hyrax::Collections::MigrationService.migrate_all_collections
53
+
54
+ expect(collection.collection_type_gid).to eq collection_type_gid
55
+ expect(Hyrax::PermissionTemplate.find_by!(source_id: collection.id).id).to eq permission_template.id
56
+ expect_access(permission_template.id, 'user', :manage, edit_users)
57
+ end
58
+ end
59
+ end
60
+
61
+ describe ".repair_migrated_collections" do
62
+ context 'when legacy collections are found (e.g. collections created before Hyrax 2.1.0)' do
63
+ let!(:col_none) { build(:typeless_collection, id: 'col_none', user: user, edit_users: [user.user_key], do_save: true) }
64
+ let!(:col_vu) { build(:typeless_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], do_save: true) }
65
+ let!(:col_vg) { build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group1', 'read_group_2'], do_save: true) }
66
+ let!(:col_mu) { build(:typeless_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], do_save: true) }
67
+ let!(:col_mg) { build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group1', 'edit_group_2'], do_save: true) }
68
+
69
+ context "and collection wasn't migrated at all" do
70
+ let!(:col_none) { build(:typeless_collection, id: 'col_none', user: user, edit_users: [user.user_key], do_save: true) }
71
+ let!(:col_vu) { build(:typeless_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], do_save: true) }
72
+ let!(:col_vg) { build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group1', 'read_group_2'], do_save: true) }
73
+ let!(:col_mu) { build(:typeless_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], do_save: true) }
74
+ let!(:col_mg) { build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group1', 'edit_group_2'], do_save: true) }
75
+
76
+ it 'sets gid and adds permissions' do # rubocop:disable RSpec/ExampleLength
77
+ Collection.all.each do |col|
78
+ expect(col.collection_type_gid).to be_nil
79
+ expect { Hyrax::PermissionTemplate.find_by!(source_id: col.id) }.to raise_error ActiveRecord::RecordNotFound
80
+ end
81
+
82
+ Hyrax::Collections::MigrationService.repair_migrated_collections
83
+
84
+ Collection.all.each do |col|
85
+ expect(col.collection_type_gid).to eq default_gid
86
+ pt_id = Hyrax::PermissionTemplate.find_by!(source_id: col.id)
87
+ expect(pt_id).not_to be_nil
88
+ expect_access(pt_id, 'user', :manage, col.edit_users)
89
+ expect_access(pt_id, 'group', :manage, col.edit_groups)
90
+ expect_access(pt_id, 'user', :view, col.read_users)
91
+ expect_access(pt_id, 'group', :view, col.read_groups)
92
+ end
93
+ end
94
+ end
95
+
96
+ context "and collection type gid is set but permission template doesn't exist" do
97
+ let!(:col_none) { create(:user_collection, id: 'col_none', user: user, edit_users: [user.user_key], collection_type_gid: default_gid) }
98
+ let!(:col_vu) { create(:user_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], collection_type_gid: default_gid) }
99
+ let!(:col_vg) { create(:user_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group1', 'read_group_2'], collection_type_gid: default_gid) }
100
+ let!(:col_mu) { create(:user_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], collection_type_gid: default_gid) }
101
+ let!(:col_mg) { create(:user_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group1', 'edit_group_2'], collection_type_gid: default_gid) }
102
+
103
+ it 'sets gid and adds permissions' do # rubocop:disable RSpec/ExampleLength
104
+ Collection.all.each do |col|
105
+ expect(col.collection_type_gid).to eq default_gid
106
+ expect { Hyrax::PermissionTemplate.find_by!(source_id: col.id) }.to raise_error ActiveRecord::RecordNotFound
107
+ end
108
+
109
+ Hyrax::Collections::MigrationService.repair_migrated_collections
110
+
111
+ Collection.all.each do |col|
112
+ expect(col.collection_type_gid).to eq default_gid
113
+ pt_id = Hyrax::PermissionTemplate.find_by!(source_id: col.id)
114
+ expect(pt_id).not_to be_nil
115
+ expect_access(pt_id, 'user', :manage, col.edit_users)
116
+ expect_access(pt_id, 'group', :manage, col.edit_groups)
117
+ expect_access(pt_id, 'user', :view, col.read_users)
118
+ expect_access(pt_id, 'group', :view, col.read_groups)
119
+ end
120
+ end
121
+ end
122
+
123
+ context "and collection type gid isn't set but permission template exists with access set" do
124
+ let!(:col_none) { build(:typeless_collection, id: 'col_none', user: user, edit_users: [user.user_key], do_save: true, with_permission_template: true) }
125
+ let!(:col_vu) do
126
+ build(:typeless_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key],
127
+ do_save: true, with_permission_template: true)
128
+ end
129
+ let!(:col_vg) do
130
+ build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group1', 'read_group_2'],
131
+ do_save: true, with_permission_template: true)
132
+ end
133
+ let!(:col_mu) do
134
+ build(:typeless_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key],
135
+ do_save: true, with_permission_template: true)
136
+ end
137
+ let!(:col_mg) do
138
+ build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group1', 'edit_group_2'],
139
+ do_save: true, with_permission_template: true)
140
+ end
141
+
142
+ before do
143
+ pt_id = Hyrax::PermissionTemplate.find_by!(source_id: col_none.id)
144
+ create_access(pt_id, 'user', :manage, [user.user_key])
145
+
146
+ pt_id = Hyrax::PermissionTemplate.find_by!(source_id: col_vu.id)
147
+ create_access(pt_id, 'user', :manage, [user.user_key])
148
+ create_access(pt_id, 'user', :view, col_vu.read_users)
149
+
150
+ pt_id = Hyrax::PermissionTemplate.find_by!(source_id: col_vg.id)
151
+ create_access(pt_id, 'user', :manage, [user.user_key])
152
+ create_access(pt_id, 'group', :view, col_vg.read_groups)
153
+
154
+ pt_id = Hyrax::PermissionTemplate.find_by!(source_id: col_mu.id)
155
+ create_access(pt_id, 'user', :manage, col_mu.edit_users)
156
+
157
+ pt_id = Hyrax::PermissionTemplate.find_by!(source_id: col_mg.id)
158
+ create_access(pt_id, 'user', :manage, [user.user_key])
159
+ create_access(pt_id, 'group', :manage, col_mg.edit_groups)
160
+ end
161
+
162
+ it 'sets gid' do # rubocop:disable RSpec/ExampleLength
163
+ Collection.all.each do |col|
164
+ expect(col.collection_type_gid).to be_nil
165
+ pt_id = Hyrax::PermissionTemplate.find_by!(source_id: col.id)
166
+ expect(pt_id).not_to be_nil
167
+ expect_access(pt_id, 'user', :manage, col.edit_users)
168
+ expect_access(pt_id, 'group', :manage, col.edit_groups)
169
+ expect_access(pt_id, 'user', :view, col.read_users)
170
+ expect_access(pt_id, 'group', :view, col.read_groups)
171
+ end
172
+
173
+ Hyrax::Collections::MigrationService.repair_migrated_collections
174
+
175
+ Collection.all.each do |col|
176
+ expect(col.collection_type_gid).to eq default_gid
177
+ pt_id = Hyrax::PermissionTemplate.find_by!(source_id: col.id)
178
+ expect(pt_id).not_to be_nil
179
+ expect_access(pt_id, 'user', :manage, col.edit_users)
180
+ expect_access(pt_id, 'group', :manage, col.edit_groups)
181
+ expect_access(pt_id, 'user', :view, col.read_users)
182
+ expect_access(pt_id, 'group', :view, col.read_groups)
183
+ end
184
+ end
185
+ end
186
+
187
+ context "and collection type gid isn't set and permission template exists with access not set" do
188
+ let!(:col_none) { build(:typeless_collection, id: 'col_none', user: user, edit_users: [user.user_key], do_save: true, with_permission_template: true) }
189
+ let!(:col_vu) do
190
+ build(:typeless_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key],
191
+ do_save: true, with_permission_template: true)
192
+ end
193
+ let!(:col_vg) do
194
+ build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group1', 'read_group_2'],
195
+ do_save: true, with_permission_template: true)
196
+ end
197
+ let!(:col_mu) do
198
+ build(:typeless_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key],
199
+ do_save: true, with_permission_template: true)
200
+ end
201
+ let!(:col_mg) do
202
+ build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group1', 'edit_group_2'],
203
+ do_save: true, with_permission_template: true)
204
+ end
205
+
206
+ it 'sets gid and adds access permissions' do # rubocop:disable RSpec/ExampleLength
207
+ Collection.all.each do |col|
208
+ expect(col.collection_type_gid).to be_nil
209
+ pt_id = Hyrax::PermissionTemplate.find_by!(source_id: col.id)
210
+ expect(pt_id).not_to be_nil
211
+ expect_no_access(pt_id, 'user', :manage, col.edit_users)
212
+ expect_no_access(pt_id, 'group', :manage, col.edit_groups)
213
+ expect_no_access(pt_id, 'user', :view, col.read_users)
214
+ expect_no_access(pt_id, 'group', :view, col.read_groups)
215
+ end
216
+
217
+ Hyrax::Collections::MigrationService.repair_migrated_collections
218
+
219
+ Collection.all.each do |col|
220
+ expect(col.collection_type_gid).to eq default_gid
221
+ pt_id = Hyrax::PermissionTemplate.find_by!(source_id: col.id)
222
+ expect(pt_id).not_to be_nil
223
+ expect_access(pt_id, 'user', :manage, col.edit_users)
224
+ expect_access(pt_id, 'group', :manage, col.edit_groups)
225
+ expect_access(pt_id, 'user', :view, col.read_users)
226
+ expect_access(pt_id, 'group', :view, col.read_groups)
227
+ end
228
+ end
229
+ end
230
+ end
231
+
232
+ context 'when newer collections are found (e.g. collections created at or after Hyrax 2.1.0)' do
233
+ let!(:collection) do
234
+ create(:collection, id: 'col_newer', user: user, with_permission_template: true, collection_type_settings: [:discoverable],
235
+ edit_users: [user.user_key], create_access: true)
236
+ end
237
+ let!(:permission_template) { collection.permission_template }
238
+ let!(:collection_type_gid) { collection.collection_type_gid }
239
+ let!(:edit_users) { collection.edit_users }
240
+
241
+ it "doesn't change the collection" do
242
+ expect(collection.collection_type_gid).to eq collection_type_gid
243
+ expect(Hyrax::PermissionTemplate.find_by!(source_id: collection.id).id).to eq permission_template.id
244
+ expect_access(permission_template.id, 'user', :manage, edit_users)
245
+
246
+ Hyrax::Collections::MigrationService.repair_migrated_collections
247
+
248
+ expect(collection.collection_type_gid).to eq collection_type_gid
249
+ expect(Hyrax::PermissionTemplate.find_by!(source_id: collection.id).id).to eq permission_template.id
250
+ expect_access(permission_template.id, 'user', :manage, edit_users)
251
+ end
252
+ end
253
+ end
254
+
255
+ def create_access(permission_template_id, agent_type, access, agent_ids)
256
+ agent_ids.each do |agent_id|
257
+ create(:permission_template_access,
258
+ access,
259
+ permission_template: permission_template_id,
260
+ agent_type: agent_type,
261
+ agent_id: agent_id)
262
+ end
263
+ end
264
+
265
+ def expect_access(permission_template_id, agent_type, access, agent_ids)
266
+ agent_ids.each do |agent_id|
267
+ pta = Hyrax::PermissionTemplateAccess.where(permission_template_id: permission_template_id, agent_type: agent_type,
268
+ access: access, agent_id: agent_id)
269
+ expect(pta).not_to be_empty
270
+ end
271
+ end
272
+
273
+ def expect_no_access(permission_template_id, agent_type, access, agent_ids)
274
+ agent_ids.each do |agent_id|
275
+ pta = Hyrax::PermissionTemplateAccess.where(permission_template_id: permission_template_id, agent_type: agent_type,
276
+ access: access, agent_id: agent_id)
277
+ expect(pta).to be_empty
278
+ end
279
+ end
280
+ end
@@ -0,0 +1,28 @@
1
+ RSpec.describe Hyrax::Collections::NestedCollectionPersistenceService do
2
+ let(:parent) { create(:collection) }
3
+ let(:child) { create(:collection) }
4
+
5
+ describe '.persist_nested_collection_for' do
6
+ subject { described_class.persist_nested_collection_for(parent: parent, child: child) }
7
+
8
+ it 'creates the relationship between parent and child' do
9
+ subject
10
+ expect(parent.member_objects).to eq([child])
11
+ expect(child.member_of_collections).to eq([parent])
12
+ end
13
+ end
14
+
15
+ describe '.remove_nested_relationship_for', :clean_repo do
16
+ subject { described_class.remove_nested_relationship_for(parent: parent, child: child) }
17
+
18
+ before do
19
+ described_class.persist_nested_collection_for(parent: parent, child: child)
20
+ end
21
+
22
+ it 'removes the relationship between parent and child' do
23
+ subject
24
+ expect(parent.member_objects).to eq([])
25
+ expect(child.member_of_collections).to eq([])
26
+ end
27
+ end
28
+ end
@@ -0,0 +1,353 @@
1
+ RSpec.describe Hyrax::Collections::NestedCollectionQueryService, clean_repo: true do
2
+ let(:blacklight_config) { CatalogController.blacklight_config }
3
+ let(:repository) { Blacklight::Solr::Repository.new(blacklight_config) }
4
+ let(:user) { create(:user) }
5
+ let(:ability) { ::Ability.new(user) }
6
+ let(:current_ability) { ability }
7
+ let(:scope) { double('Scope', can?: true, current_ability: current_ability, repository: repository, blacklight_config: blacklight_config) }
8
+
9
+ let(:collection_type) { create(:collection_type) }
10
+ let(:another_collection_type) { create(:collection_type) }
11
+
12
+ let(:coll_a) do
13
+ build(:public_collection,
14
+ id: 'Collection_A',
15
+ collection_type_gid: collection_type.gid,
16
+ with_nesting_attributes:
17
+ { ancestors: [],
18
+ parent_ids: [],
19
+ pathnames: ['Collection_A'],
20
+ depth: 1 })
21
+ end
22
+ let(:coll_b) do
23
+ build(:public_collection,
24
+ id: 'Collection_B',
25
+ collection_type_gid: collection_type.gid,
26
+ member_of_collections: [coll_a],
27
+ with_nesting_attributes:
28
+ { ancestors: ['Collection_A'],
29
+ parent_ids: ['Collection_A'],
30
+ pathnames: ['Collection_A/Collection_B'],
31
+ depth: 2 })
32
+ end
33
+ let(:coll_c) do
34
+ build(:public_collection,
35
+ id: 'Collection_C',
36
+ collection_type_gid: collection_type.gid,
37
+ member_of_collections: [coll_b],
38
+ with_nesting_attributes:
39
+ { ancestors: ["Collection_A",
40
+ "Collection_A/Collection_B"],
41
+ parent_ids: ['Collection_B'],
42
+ pathnames: ['Collection_A/Collection_B/Collection_C'],
43
+ depth: 3 })
44
+ end
45
+ let(:coll_d) do
46
+ build(:public_collection,
47
+ id: 'Collection_D',
48
+ collection_type_gid: collection_type.gid,
49
+ member_of_collections: [coll_c],
50
+ with_nesting_attributes:
51
+ { ancestors: ["Collection_A",
52
+ "Collection_A/Collection_B",
53
+ "Collection_A/Collection_B/Collection_C"],
54
+ parent_ids: ['Collection_C'],
55
+ pathnames: ["Collection_A/Collection_B/Collection_C/Collection_D"],
56
+ depth: 4 })
57
+ end
58
+ let(:coll_e) do
59
+ build(:public_collection,
60
+ id: 'Collection_E',
61
+ collection_type_gid: collection_type.gid,
62
+ member_of_collections: [coll_d],
63
+ with_nesting_attributes:
64
+ { ancestors: ["Collection_A",
65
+ "Collection_A/Collection_B",
66
+ "Collection_A/Collection_B/Collection_C",
67
+ "Collection_A/Collection_B/Collection_C/Collection_D"],
68
+ parent_ids: ['Collection_D'],
69
+ pathnames: ['Collection_A/Collection_B/Collection_C/Collection_D/Collection_E'],
70
+ depth: 5 })
71
+ end
72
+ let(:another) do
73
+ build(:public_collection,
74
+ id: 'Another_One',
75
+ collection_type_gid: collection_type.gid,
76
+ with_nesting_attributes:
77
+ { ancestors: [],
78
+ parent_ids: [],
79
+ pathnames: ['Another_One'],
80
+ depth: 1 })
81
+ end
82
+ let(:wrong) do
83
+ build(:public_collection,
84
+ id: 'Wrong_Type',
85
+ collection_type_gid: another_collection_type.gid,
86
+ with_nesting_attributes:
87
+ { ancestors: [],
88
+ parent_ids: [],
89
+ pathnames: ['Wrong_Type'],
90
+ depth: 1 })
91
+ end
92
+
93
+ describe '.available_child_collections' do
94
+ describe 'given parent is not nestable?' do
95
+ subject { described_class.available_child_collections(parent: parent_double, scope: scope) }
96
+
97
+ let(:parent_double) { double(nestable?: false) }
98
+
99
+ it { is_expected.to eq([]) }
100
+ end
101
+
102
+ describe 'given parent is nestable?' do
103
+ subject { described_class.available_child_collections(parent: coll_c, scope: scope) }
104
+
105
+ before do
106
+ coll_e # this will also build coll_a through coll_d
107
+ another
108
+ wrong
109
+ end
110
+
111
+ describe 'and cannot deposit to the parent' do
112
+ it 'returns an empty array' do
113
+ expect(scope).to receive(:can?).with(:deposit, coll_c).and_return(false)
114
+ expect(described_class).not_to receive(:query_solr)
115
+ expect(subject).to eq([])
116
+ end
117
+ end
118
+
119
+ describe 'and can deposit to the parent' do
120
+ describe 'it prevents circular nesting' do
121
+ it 'returns an array of valid collections of the same collection type' do
122
+ expect(scope).to receive(:can?).with(:deposit, coll_c).and_return(true)
123
+ expect(described_class).to receive(:query_solr).with(collection: coll_c, access: :read, scope: scope, limit_to_id: nil, nest_direction: :as_child).and_call_original
124
+ expect(subject.map(&:id)).to contain_exactly(another.id, coll_e.id)
125
+ end
126
+ end
127
+ end
128
+ end
129
+ end
130
+
131
+ describe '.available_parent_collections' do
132
+ describe 'given child is not nestable?' do
133
+ subject { described_class.available_parent_collections(child: child_double, scope: scope) }
134
+
135
+ let(:child_double) { double(nestable?: false) }
136
+
137
+ it { is_expected.to eq([]) }
138
+ end
139
+
140
+ describe 'given child is nestable?' do
141
+ describe 'and cannot read the child' do
142
+ subject { described_class.available_parent_collections(child: coll_c, scope: scope) }
143
+
144
+ it 'returns an empty array' do
145
+ expect(scope).to receive(:can?).with(:read, coll_c).and_return(false)
146
+ expect(described_class).not_to receive(:query_solr)
147
+ expect(subject).to eq([])
148
+ end
149
+ end
150
+
151
+ describe 'and can read the child', with_nested_reindexing: true do
152
+ subject { described_class.available_parent_collections(child: coll_c, scope: scope) }
153
+
154
+ # using create option here because permission template is required for testing :deposit access
155
+ let(:coll_a) do
156
+ create(:public_collection,
157
+ id: 'Collection_A',
158
+ collection_type_gid: collection_type.gid,
159
+ user: user,
160
+ create_access: true)
161
+ end
162
+ let(:coll_b) do
163
+ create(:public_collection,
164
+ id: 'Collection_B',
165
+ collection_type_gid: collection_type.gid,
166
+ user: user,
167
+ create_access: true,
168
+ member_of_collections: [coll_a])
169
+ end
170
+ let(:coll_c) do
171
+ create(:public_collection,
172
+ id: 'Collection_C',
173
+ collection_type_gid: collection_type.gid,
174
+ user: user,
175
+ create_access: true,
176
+ member_of_collections: [coll_b])
177
+ end
178
+ let(:coll_d) do
179
+ create(:public_collection,
180
+ id: 'Collection_D',
181
+ collection_type_gid: collection_type.gid,
182
+ user: user,
183
+ create_access: true,
184
+ member_of_collections: [coll_c])
185
+ end
186
+ let(:coll_e) do
187
+ create(:public_collection,
188
+ id: 'Collection_E',
189
+ collection_type_gid: collection_type.gid,
190
+ user: user,
191
+ create_access: true,
192
+ member_of_collections: [coll_d])
193
+ end
194
+ let(:another) do
195
+ create(:public_collection,
196
+ id: 'Another_One',
197
+ collection_type_gid: collection_type.gid,
198
+ user: user,
199
+ create_access: true)
200
+ end
201
+ let(:wrong) do
202
+ create(:public_collection,
203
+ id: 'Wrong_Type',
204
+ collection_type_gid: another_collection_type.gid,
205
+ user: user,
206
+ create_access: true)
207
+ end
208
+
209
+ before do
210
+ coll_e # this will also build coll_a through coll_d
211
+ another
212
+ wrong
213
+ end
214
+
215
+ describe 'it prevents circular nesting' do
216
+ it 'returns an array of collections of the same collection type excluding the given collection' do
217
+ expect(scope).to receive(:can?).with(:read, coll_c).and_return(true)
218
+ expect(described_class).to receive(:query_solr).with(collection: coll_c, access: :deposit, scope: scope, limit_to_id: nil, nest_direction: :as_parent).and_call_original
219
+ expect(subject.map(&:id)).to contain_exactly(coll_a.id, another.id)
220
+ end
221
+ end
222
+ end
223
+ end
224
+ end
225
+
226
+ describe '.parent_and_child_can_nest?' do
227
+ let(:parent) { coll_c }
228
+ let(:child) { another }
229
+
230
+ subject { described_class.parent_and_child_can_nest?(parent: parent, child: child, scope: scope) }
231
+
232
+ before do
233
+ coll_e
234
+ another
235
+ wrong
236
+ end
237
+
238
+ describe 'given parent and child are nestable' do
239
+ describe 'and are the same object' do
240
+ let(:child) { parent }
241
+
242
+ it { is_expected.to eq(false) }
243
+ end
244
+
245
+ describe 'and are of the same collection type', with_nested_reindexing: true do
246
+ # using create option here because permission template is required for testing :deposit access
247
+ let!(:parent) do
248
+ create(:public_collection,
249
+ id: 'Parent_Collecton',
250
+ collection_type_gid: collection_type.gid,
251
+ user: user,
252
+ create_access: true)
253
+ end
254
+ let!(:child) do
255
+ create(:public_collection,
256
+ id: 'Child_Collection',
257
+ collection_type_gid: collection_type.gid,
258
+ user: user,
259
+ create_access: true)
260
+ end
261
+
262
+ it { is_expected.to eq(true) }
263
+ end
264
+ describe 'and the ability does not permit the actions' do
265
+ before do
266
+ expect(scope).to receive(:can?).and_return(false)
267
+ end
268
+
269
+ it { is_expected.to eq(false) }
270
+ end
271
+ describe 'and are of different collection types' do
272
+ let(:parent) { double(nestable?: true, collection_type_gid: 'another', id: 'parent_collection') }
273
+
274
+ it { is_expected.to eq(false) }
275
+ end
276
+ end
277
+
278
+ describe 'given parent is not nestable?' do
279
+ let(:parent) { double(nestable?: false, collection_type_gid: 'same', id: 'parent_collection') }
280
+
281
+ it { is_expected.to eq(false) }
282
+ end
283
+ describe 'given child is not nestable?' do
284
+ let(:child) { double(nestable?: false, collection_type_gid: 'same', id: 'child_collection') }
285
+
286
+ it { is_expected.to eq(false) }
287
+ end
288
+ describe 'not in available parent collections' do
289
+ before do
290
+ allow(described_class).to receive(:available_parent_collections).with(child: child, scope: scope, limit_to_id: parent.id).and_return([])
291
+ end
292
+
293
+ it { is_expected.to eq(false) }
294
+ end
295
+ describe 'not in available child collections' do
296
+ before do
297
+ allow(described_class).to receive(:available_child_collections).with(parent: parent, scope: scope, limit_to_id: child.id).and_return([])
298
+ end
299
+
300
+ it { is_expected.to eq(false) }
301
+ end
302
+ end
303
+
304
+ describe '.valid_combined_nesting_depth?' do
305
+ subject { described_class.valid_combined_nesting_depth?(parent: parent, child: child, scope: scope) }
306
+
307
+ context 'when total depth > limit' do
308
+ let(:parent) { coll_e }
309
+ let(:child) { another }
310
+
311
+ it 'returns false' do
312
+ expect(subject).to eq false
313
+ end
314
+ end
315
+
316
+ context 'when valid combined depth' do
317
+ let(:parent) { coll_c }
318
+ let(:child) { coll_e }
319
+
320
+ it 'returns true' do
321
+ expect(subject).to eq true
322
+ end
323
+ end
324
+ end
325
+
326
+ describe 'nesting attributes object', with_nested_reindexing: true do
327
+ let(:user) { create(:user) }
328
+ let!(:parent) { create(:collection, id: 'Parent_Coll', collection_type_gid: collection_type.gid, user: user) }
329
+ let!(:child) { create(:user_collection, id: 'Child_Coll', collection_type_gid: collection_type.gid, user: user) }
330
+ let(:nesting_attributes) { Hyrax::Collections::NestedCollectionQueryService::NestingAttributes.new(id: child.id, scope: scope) }
331
+
332
+ before do
333
+ Hyrax::Collections::NestedCollectionPersistenceService.persist_nested_collection_for(parent: parent, child: child)
334
+ end
335
+
336
+ it 'will respond to expected methods' do
337
+ expect(nesting_attributes).to respond_to(:id)
338
+ expect(nesting_attributes).to respond_to(:parents)
339
+ expect(nesting_attributes).to respond_to(:pathnames)
340
+ expect(nesting_attributes).to respond_to(:ancestors)
341
+ expect(nesting_attributes).to respond_to(:depth)
342
+ end
343
+
344
+ it 'will encapsulate the nesting attributes in an object' do
345
+ expect(nesting_attributes).to be_a(Hyrax::Collections::NestedCollectionQueryService::NestingAttributes)
346
+ expect(nesting_attributes.id).to eq('Child_Coll')
347
+ expect(nesting_attributes.parents).to eq(['Parent_Coll'])
348
+ expect(nesting_attributes.pathnames).to eq(['Parent_Coll/Child_Coll'])
349
+ expect(nesting_attributes.ancestors).to eq(['Parent_Coll'])
350
+ expect(nesting_attributes.depth).to eq(2)
351
+ end
352
+ end
353
+ end