hyrax 3.3.0 → 4.0.0.beta1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (611) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +41 -52
  3. data/.dassie/.env +2 -1
  4. data/.dassie/Gemfile +4 -4
  5. data/.dassie/app/assets/javascripts/application.js +8 -4
  6. data/.dassie/app/assets/stylesheets/application.css +1 -1
  7. data/.dassie/app/assets/stylesheets/hyrax.scss +1 -2
  8. data/.dassie/app/controllers/application_controller.rb +1 -3
  9. data/.dassie/app/controllers/catalog_controller.rb +23 -19
  10. data/.dassie/app/forms/collection_resource_form.rb +8 -0
  11. data/.dassie/app/indexers/collection_resource_indexer.rb +8 -0
  12. data/.dassie/app/models/collection_resource.rb +35 -0
  13. data/.dassie/app/models/user.rb +0 -3
  14. data/.dassie/config/application.rb +1 -1
  15. data/.dassie/config/initializers/file_services.rb +4 -0
  16. data/.dassie/config/initializers/hyrax.rb +12 -1
  17. data/.dassie/config/initializers/riiif.rb +1 -1
  18. data/.dassie/config/metadata/collection_resource.yaml +23 -0
  19. data/.dassie/db/schema.rb +5 -5
  20. data/.dassie/db/seeds.rb +74 -17
  21. data/.dassie/package.json +7 -7
  22. data/.dassie/spec/forms/collection_resource_form_spec.rb +13 -0
  23. data/.dassie/spec/indexers/collection_resource_indexer_spec.rb +14 -0
  24. data/.dassie/spec/models/collection_resource_spec.rb +13 -0
  25. data/.engine_cart.yml +2 -39
  26. data/.env +1 -0
  27. data/.github/release.yml +26 -0
  28. data/.gitignore +3 -0
  29. data/.regen +2 -1
  30. data/.rubocop.yml +1 -1
  31. data/.rubocop_fixme.yml +22 -3
  32. data/CONTAINERS.md +18 -13
  33. data/CONTRIBUTING.md +22 -24
  34. data/Dockerfile +4 -3
  35. data/Rakefile +0 -4
  36. data/app/actors/hyrax/actors/base_actor.rb +1 -1
  37. data/app/actors/hyrax/actors/create_with_remote_files_actor.rb +5 -11
  38. data/app/actors/hyrax/actors/file_actor.rb +9 -35
  39. data/app/actors/hyrax/actors/file_set_actor.rb +13 -62
  40. data/app/actors/hyrax/actors/transfer_request_actor.rb +3 -7
  41. data/app/assets/javascripts/hyrax/analytics_events.js +8 -2
  42. data/app/assets/javascripts/hyrax/app.js.erb +1 -1
  43. data/app/assets/javascripts/hyrax/autocomplete/linked_data.es6 +1 -3
  44. data/app/assets/javascripts/hyrax/batch.js +2 -2
  45. data/app/assets/javascripts/hyrax/batch_edit.js +4 -4
  46. data/app/assets/javascripts/hyrax/batch_select_all.js +13 -13
  47. data/app/assets/javascripts/hyrax/browse_everything.js +4 -2
  48. data/app/assets/javascripts/hyrax/collection_types.es6 +1 -1
  49. data/app/assets/javascripts/hyrax/collections/editor.es6 +5 -1
  50. data/app/assets/javascripts/hyrax/collections_v2.es6 +13 -0
  51. data/app/assets/javascripts/hyrax/dashboard_actions.js +5 -5
  52. data/app/assets/javascripts/hyrax/editor/controlled_vocabulary.es6 +3 -3
  53. data/app/assets/javascripts/hyrax/editor.es6 +3 -3
  54. data/app/assets/javascripts/hyrax/facets.js +6 -4
  55. data/app/assets/javascripts/hyrax/file_manager/member.es6 +1 -1
  56. data/app/assets/javascripts/hyrax/file_manager/save_manager.es6 +2 -2
  57. data/app/assets/javascripts/hyrax/file_manager/sorting.es6 +2 -2
  58. data/app/assets/javascripts/hyrax/file_manager.es6 +2 -17
  59. data/app/assets/javascripts/hyrax/notification.es6 +1 -1
  60. data/app/assets/javascripts/hyrax/permissions/registry.es6 +4 -4
  61. data/app/assets/javascripts/hyrax/permissions/user_controls.es6 +3 -1
  62. data/app/assets/javascripts/hyrax/relationships/confirm_remove_dialog.es6 +1 -1
  63. data/app/assets/javascripts/hyrax/relationships/control.es6 +2 -2
  64. data/app/assets/javascripts/hyrax/relationships/registry_entry.es6 +1 -1
  65. data/app/assets/javascripts/hyrax/reports-buttons.js +9 -9
  66. data/app/assets/javascripts/hyrax/save_work/required_fields.es6 +1 -1
  67. data/app/assets/javascripts/hyrax/save_work/save_work_control.es6 +6 -6
  68. data/app/assets/javascripts/hyrax/save_work/uploaded_files.es6 +2 -2
  69. data/app/assets/javascripts/hyrax/single_use_links_manager.js +1 -1
  70. data/app/assets/javascripts/hyrax/skip_to_content.js +1 -1
  71. data/app/assets/javascripts/hyrax/sorting.js +1 -1
  72. data/app/assets/javascripts/hyrax/trophy.js +1 -1
  73. data/app/assets/javascripts/hyrax/uploader.js +3 -3
  74. data/app/assets/javascripts/hyrax.js +1 -19
  75. data/app/assets/stylesheets/_bootstrap-default-overrides.scss +4 -4
  76. data/app/assets/stylesheets/hyrax/_accessibility.scss +1 -1
  77. data/app/assets/stylesheets/hyrax/_badge.scss +7 -0
  78. data/app/assets/stylesheets/hyrax/_batch-edit.scss +8 -8
  79. data/app/assets/stylesheets/hyrax/_browse_everything_overrides.scss +1 -1
  80. data/app/assets/stylesheets/hyrax/_buttons.scss +31 -1
  81. data/app/assets/stylesheets/hyrax/_card.scss +10 -0
  82. data/app/assets/stylesheets/hyrax/_catalog.scss +22 -48
  83. data/app/assets/stylesheets/hyrax/_collection_types.scss +1 -1
  84. data/app/assets/stylesheets/hyrax/_collections.scss +13 -13
  85. data/app/assets/stylesheets/hyrax/_facets.scss +46 -0
  86. data/app/assets/stylesheets/hyrax/_featured.scss +1 -1
  87. data/app/assets/stylesheets/hyrax/_file-listing.scss +3 -3
  88. data/app/assets/stylesheets/hyrax/_file_manager.scss +17 -17
  89. data/app/assets/stylesheets/hyrax/_file_sets.scss +1 -1
  90. data/app/assets/stylesheets/hyrax/_file_upload.scss +4 -4
  91. data/app/assets/stylesheets/hyrax/_fixedsticky.scss +1 -1
  92. data/app/assets/stylesheets/hyrax/_footer.scss +3 -3
  93. data/app/assets/stylesheets/hyrax/_form-progress.scss +9 -9
  94. data/app/assets/stylesheets/hyrax/_form.scss +3 -4
  95. data/app/assets/stylesheets/hyrax/_forms.scss +62 -29
  96. data/app/assets/stylesheets/hyrax/_header.scss +0 -17
  97. data/app/assets/stylesheets/hyrax/_home-page.scss +13 -51
  98. data/app/assets/stylesheets/hyrax/_html.scss +11 -0
  99. data/app/assets/stylesheets/hyrax/_hyrax.scss +16 -14
  100. data/app/assets/stylesheets/hyrax/_nestable.scss +1 -1
  101. data/app/assets/stylesheets/hyrax/_select_work_type.scss +2 -2
  102. data/app/assets/stylesheets/hyrax/_styles.scss +9 -14
  103. data/app/assets/stylesheets/hyrax/_users.scss +2 -2
  104. data/app/assets/stylesheets/hyrax/_variables.scss +20 -1
  105. data/app/assets/stylesheets/hyrax/_work-show.scss +21 -13
  106. data/app/assets/stylesheets/hyrax/blacklight_gallery.scss +75 -2
  107. data/app/assets/stylesheets/hyrax/dashboard.scss +70 -95
  108. data/app/assets/stylesheets/hyrax/sidebar.scss +39 -19
  109. data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +10 -3
  110. data/app/controllers/concerns/hyrax/controller.rb +21 -0
  111. data/app/controllers/concerns/hyrax/works_controller_behavior.rb +87 -68
  112. data/app/controllers/hyrax/admin/admin_sets_controller.rb +105 -19
  113. data/app/controllers/hyrax/admin/permission_template_accesses_controller.rb +12 -19
  114. data/app/controllers/hyrax/batch_edits_controller.rb +13 -4
  115. data/app/controllers/hyrax/batch_uploads_controller.rb +4 -0
  116. data/app/controllers/hyrax/citations_controller.rb +1 -1
  117. data/app/controllers/hyrax/dashboard/collections_controller.rb +176 -83
  118. data/app/controllers/hyrax/dashboard/nest_collections_controller.rb +0 -32
  119. data/app/controllers/hyrax/file_sets_controller.rb +3 -0
  120. data/app/controllers/hyrax/homepage_controller.rb +0 -1
  121. data/app/controllers/hyrax/my_controller.rb +0 -6
  122. data/app/controllers/hyrax/single_use_links_controller.rb +1 -2
  123. data/app/controllers/hyrax/single_use_links_viewer_controller.rb +1 -1
  124. data/app/forms/hyrax/forms/administrative_set_form.rb +19 -1
  125. data/app/forms/hyrax/forms/batch_edit_form.rb +1 -1
  126. data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb +21 -6
  127. data/app/forms/hyrax/forms/pcdm_collection_form.rb +30 -2
  128. data/app/forms/hyrax/forms/permission_template_form.rb +17 -9
  129. data/app/forms/hyrax/forms/resource_form.rb +23 -5
  130. data/app/forms/hyrax/forms/widgets/admin_set_visibility.rb +1 -1
  131. data/app/helpers/hyrax/collections_helper.rb +14 -0
  132. data/app/helpers/hyrax/facets_helper.rb +150 -0
  133. data/app/helpers/hyrax/hyrax_helper_behavior.rb +5 -5
  134. data/app/helpers/hyrax/membership_helper.rb +1 -1
  135. data/app/helpers/hyrax/trophy_helper.rb +1 -1
  136. data/app/indexers/hyrax/administrative_set_indexer.rb +8 -2
  137. data/app/indexers/hyrax/basic_metadata_indexer.rb +3 -9
  138. data/app/indexers/hyrax/deep_indexing_service.rb +1 -1
  139. data/app/indexers/hyrax/file_set_indexer.rb +1 -0
  140. data/app/indexers/hyrax/pcdm_collection_indexer.rb +3 -2
  141. data/app/indexers/hyrax/thumbnail_indexer.rb +31 -0
  142. data/app/indexers/hyrax/valkyrie_file_set_indexer.rb +6 -6
  143. data/app/indexers/hyrax/valkyrie_indexer.rb +4 -2
  144. data/app/indexers/hyrax/valkyrie_work_indexer.rb +13 -0
  145. data/app/inputs/controlled_vocabulary_input.rb +2 -0
  146. data/app/jobs/change_depositor_event_job.rb +47 -0
  147. data/app/jobs/characterize_job.rb +40 -3
  148. data/app/jobs/concerns/hyrax/members_permission_job_behavior.rb +1 -1
  149. data/app/jobs/create_derivatives_job.rb +4 -2
  150. data/app/jobs/hyrax/propagate_change_depositor_job.rb +32 -0
  151. data/app/jobs/import_url_job.rb +4 -6
  152. data/app/jobs/ingest_local_file_job.rb +5 -13
  153. data/app/jobs/inherit_permissions_job.rb +2 -6
  154. data/app/jobs/valkyrie_create_derivatives_job.rb +25 -0
  155. data/app/jobs/valkyrie_ingest_job.rb +41 -35
  156. data/app/models/admin_set.rb +2 -2
  157. data/app/models/collection_branding_info.rb +8 -6
  158. data/app/models/concerns/hyrax/collection_behavior.rb +4 -4
  159. data/app/models/concerns/hyrax/file_set/characterization.rb +7 -1
  160. data/app/models/concerns/hyrax/file_set_behavior.rb +1 -1
  161. data/app/models/concerns/hyrax/in_admin_set.rb +0 -7
  162. data/app/models/concerns/hyrax/solr_document/metadata.rb +1 -0
  163. data/app/models/concerns/hyrax/solr_document_behavior.rb +9 -3
  164. data/app/models/concerns/hyrax/user.rb +14 -3
  165. data/app/models/concerns/hyrax/work_behavior.rb +1 -2
  166. data/app/models/content_block.rb +0 -6
  167. data/app/models/featured_work_list.rb +0 -1
  168. data/app/models/hyrax/administrative_set.rb +36 -1
  169. data/app/models/hyrax/collection_type.rb +2 -2
  170. data/app/models/hyrax/file_metadata.rb +36 -2
  171. data/app/models/hyrax/file_set.rb +43 -4
  172. data/app/models/hyrax/group.rb +19 -0
  173. data/app/models/hyrax/pcdm_collection.rb +56 -1
  174. data/app/models/hyrax/permission_template.rb +5 -34
  175. data/app/models/hyrax/work.rb +91 -0
  176. data/app/models/job_io_wrapper.rb +1 -1
  177. data/app/models/proxy_deposit_request.rb +1 -1
  178. data/app/presenters/hyrax/admin/repository_object_presenter.rb +0 -2
  179. data/app/presenters/hyrax/admin_set_presenter.rb +2 -2
  180. data/app/presenters/hyrax/collapsable_section_presenter.rb +2 -2
  181. data/app/presenters/hyrax/collection_presenter.rb +1 -1
  182. data/app/presenters/hyrax/fixity_status_presenter.rb +2 -2
  183. data/app/presenters/hyrax/member_presenter_factory.rb +2 -4
  184. data/app/presenters/hyrax/menu_presenter.rb +1 -1
  185. data/app/presenters/hyrax/pcdm_member_presenter_factory.rb +2 -2
  186. data/app/presenters/hyrax/permission_badge.rb +7 -7
  187. data/app/presenters/hyrax/work_show_presenter.rb +10 -6
  188. data/app/presenters/hyrax/workflow_presenter.rb +1 -1
  189. data/app/renderers/hyrax/renderers/external_link_attribute_renderer.rb +1 -1
  190. data/app/search_builders/hyrax/dashboard/collections_search_builder.rb +2 -2
  191. data/app/search_builders/hyrax/dashboard/managed_search_filters.rb +44 -4
  192. data/app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb +2 -2
  193. data/app/search_builders/hyrax/deposit_search_builder.rb +1 -1
  194. data/app/search_builders/hyrax/my/collections_search_builder.rb +11 -4
  195. data/app/search_builders/hyrax/nested_collections_parent_search_builder.rb +10 -1
  196. data/app/search_builders/hyrax/single_result.rb +1 -1
  197. data/app/search_builders/hyrax/stats/work_status_search_builder.rb +1 -1
  198. data/app/services/hyrax/access_control_list.rb +20 -6
  199. data/app/services/hyrax/adapters/nesting_index_adapter.rb +4 -4
  200. data/app/services/hyrax/admin_set_create_service.rb +21 -37
  201. data/app/services/hyrax/change_content_depositor_service.rb +2 -2
  202. data/app/services/hyrax/change_depositor_service.rb +70 -0
  203. data/app/services/hyrax/characterization/valkyrie_characterization_service.rb +4 -6
  204. data/app/services/hyrax/collection_member_service.rb +1 -2
  205. data/app/services/hyrax/collections/collection_member_service.rb +3 -5
  206. data/app/services/hyrax/collections/nested_collection_query_service.rb +24 -12
  207. data/app/services/hyrax/collections/search_service.rb +0 -1
  208. data/app/services/hyrax/custom_queries/navigators/child_file_sets_navigator.rb +45 -0
  209. data/app/services/hyrax/custom_queries/navigators/child_filesets_navigator.rb +7 -2
  210. data/app/services/hyrax/custom_queries/navigators/parent_work_navigator.rb +54 -0
  211. data/app/services/hyrax/custom_queries.rb +25 -0
  212. data/app/services/hyrax/default_middleware_stack.rb +3 -0
  213. data/app/services/hyrax/file_set_csv_service.rb +1 -1
  214. data/app/services/hyrax/file_set_derivatives_service.rb +21 -2
  215. data/app/services/hyrax/file_set_type_service.rb +2 -5
  216. data/app/services/hyrax/graph_exporter.rb +3 -8
  217. data/app/services/hyrax/iiif_authorization_service.rb +1 -1
  218. data/app/services/hyrax/listeners/file_metadata_listener.rb +20 -1
  219. data/app/services/hyrax/listeners/member_cleanup_listener.rb +27 -11
  220. data/app/services/hyrax/listeners/metadata_index_listener.rb +39 -0
  221. data/app/services/hyrax/listeners/proxy_deposit_listener.rb +14 -8
  222. data/app/services/hyrax/location_service.rb +33 -0
  223. data/app/services/hyrax/multiple_membership_checker.rb +46 -1
  224. data/app/services/hyrax/resource_visibility_propagator.rb +1 -1
  225. data/app/services/hyrax/search_service.rb +1 -81
  226. data/app/services/hyrax/simple_schema_loader.rb +5 -1
  227. data/app/services/hyrax/solr_query_service.rb +12 -7
  228. data/app/services/hyrax/statistics/depositors/summary.rb +1 -3
  229. data/app/services/hyrax/thumbnail_path_service.rb +1 -1
  230. data/app/services/hyrax/valkyrie_persist_derivatives.rb +50 -0
  231. data/app/services/hyrax/valkyrie_upload.rb +106 -0
  232. data/app/services/hyrax/work_query_service.rb +1 -1
  233. data/app/services/hyrax/work_uploads_handler.rb +0 -10
  234. data/app/services/hyrax/workflow/workflow_importer.rb +7 -9
  235. data/app/services/hyrax/workflow/workflow_schema.rb +3 -5
  236. data/app/services/hyrax/working_directory.rb +2 -0
  237. data/app/strategies/hyrax/strategies/yaml_strategy.rb +4 -6
  238. data/app/uploaders/hyrax/uploaded_file_uploader.rb +4 -4
  239. data/app/utils/hyrax/data_destroyers/collection_branding_destroyer.rb +29 -0
  240. data/app/utils/hyrax/data_destroyers/collection_types_destroyer.rb +26 -0
  241. data/app/utils/hyrax/data_destroyers/default_admin_set_id_cache_destroyer.rb +26 -0
  242. data/app/utils/hyrax/data_destroyers/featured_works_destroyer.rb +27 -0
  243. data/app/utils/hyrax/data_destroyers/permission_templates_destroyer.rb +30 -0
  244. data/app/utils/hyrax/data_destroyers/repository_metadata_destroyer.rb +42 -0
  245. data/app/utils/hyrax/data_destroyers/stats_destroyer.rb +33 -0
  246. data/app/utils/hyrax/data_maintenance.rb +51 -0
  247. data/app/utils/hyrax/required_data_seeder.rb +21 -0
  248. data/app/utils/hyrax/required_data_seeders/collection_seeder.rb +26 -0
  249. data/app/utils/hyrax/required_data_seeders/collection_type_seeder.rb +36 -0
  250. data/app/utils/hyrax/test_data_seeder.rb +24 -0
  251. data/app/utils/hyrax/test_data_seeders/collection_seeder.rb +91 -0
  252. data/app/utils/hyrax/test_data_seeders/collection_type_seeder.rb +72 -0
  253. data/app/utils/hyrax/test_data_seeders/user_seeder.rb +52 -0
  254. data/app/validators/hyrax/collection_membership_validator.rb +39 -0
  255. data/app/views/_controls.html.erb +14 -18
  256. data/app/views/_logo.html.erb +0 -1
  257. data/app/views/_masthead.html.erb +8 -18
  258. data/app/views/_user_util_links.html.erb +16 -18
  259. data/app/views/catalog/_document.html.erb +2 -2
  260. data/app/views/catalog/_document_list.html.erb +1 -1
  261. data/app/views/catalog/_facet_limit.html.erb +1 -1
  262. data/app/views/catalog/_index_gallery_collection_wrapper.html.erb +1 -1
  263. data/app/views/catalog/_index_header_list_collection.html.erb +2 -2
  264. data/app/views/catalog/_index_header_list_default.html.erb +9 -2
  265. data/app/views/catalog/_index_list_default.html.erb +7 -5
  266. data/app/views/catalog/_search_form.html.erb +13 -15
  267. data/app/views/catalog/_thumbnail_list_collection.html.erb +2 -2
  268. data/app/views/catalog/_thumbnail_list_default.html.erb +9 -4
  269. data/app/views/catalog/facet.html.erb +21 -0
  270. data/app/views/catalog/index.html.erb +6 -4
  271. data/app/views/collections/edit_fields/_based_near.html.erb +7 -7
  272. data/app/views/hyrax/admin/admin_sets/_form.html.erb +16 -16
  273. data/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb +35 -33
  274. data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb +11 -10
  275. data/app/views/hyrax/admin/admin_sets/_form_visibility.html.erb +26 -26
  276. data/app/views/hyrax/admin/admin_sets/_form_workflow.erb +6 -6
  277. data/app/views/hyrax/admin/admin_sets/_show_actions.html.erb +3 -3
  278. data/app/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb +9 -9
  279. data/app/views/hyrax/admin/admin_sets/index.html.erb +3 -3
  280. data/app/views/hyrax/admin/admin_sets/show.html.erb +4 -4
  281. data/app/views/hyrax/admin/analytics/_date_range_form.html.erb +3 -3
  282. data/app/views/hyrax/admin/analytics/collection_reports/_custom_range.html.erb +3 -3
  283. data/app/views/hyrax/admin/analytics/collection_reports/_monthly_summary.html.erb +3 -3
  284. data/app/views/hyrax/admin/analytics/collection_reports/_summary.html.erb +3 -3
  285. data/app/views/hyrax/admin/analytics/collection_reports/_top_collections.html.erb +7 -7
  286. data/app/views/hyrax/admin/analytics/collection_reports/index.html.erb +6 -6
  287. data/app/views/hyrax/admin/analytics/collection_reports/show.html.erb +10 -10
  288. data/app/views/hyrax/admin/analytics/work_reports/_custom_range.html.erb +3 -3
  289. data/app/views/hyrax/admin/analytics/work_reports/_monthly_summary.html.erb +3 -3
  290. data/app/views/hyrax/admin/analytics/work_reports/_summary.html.erb +3 -3
  291. data/app/views/hyrax/admin/analytics/work_reports/_top_file_set_downloads.html.erb +5 -5
  292. data/app/views/hyrax/admin/analytics/work_reports/_top_works.html.erb +7 -7
  293. data/app/views/hyrax/admin/analytics/work_reports/_work_counts.html.erb +4 -4
  294. data/app/views/hyrax/admin/analytics/work_reports/_work_files.html.erb +5 -5
  295. data/app/views/hyrax/admin/analytics/work_reports/index.html.erb +7 -7
  296. data/app/views/hyrax/admin/analytics/work_reports/show.html.erb +10 -10
  297. data/app/views/hyrax/admin/appearances/show.html.erb +2 -2
  298. data/app/views/hyrax/admin/collection_types/_form.html.erb +24 -23
  299. data/app/views/hyrax/admin/collection_types/_form_appearance.html.erb +2 -2
  300. data/app/views/hyrax/admin/collection_types/_form_participants.html.erb +4 -4
  301. data/app/views/hyrax/admin/collection_types/_form_settings.html.erb +9 -9
  302. data/app/views/hyrax/admin/collection_types/index.html.erb +7 -7
  303. data/app/views/hyrax/admin/features/index.html.erb +3 -3
  304. data/app/views/hyrax/admin/stats/_new_users.html.erb +1 -1
  305. data/app/views/hyrax/admin/stats/show.html.erb +4 -6
  306. data/app/views/hyrax/admin/users/index.html.erb +3 -3
  307. data/app/views/hyrax/admin/workflow_roles/index.html.erb +8 -8
  308. data/app/views/hyrax/admin/workflows/index.html.erb +13 -13
  309. data/app/views/hyrax/base/_citations.html.erb +6 -6
  310. data/app/views/hyrax/base/_currently_shared.html.erb +3 -3
  311. data/app/views/hyrax/base/_file_manager_actions.html.erb +5 -3
  312. data/app/views/hyrax/base/_file_manager_member.html.erb +5 -5
  313. data/app/views/hyrax/base/_file_manager_member_resource_options.html.erb +6 -6
  314. data/app/views/hyrax/base/_file_manager_members.html.erb +1 -1
  315. data/app/views/hyrax/base/_file_manager_thumbnail.html.erb +1 -1
  316. data/app/views/hyrax/base/_form.html.erb +1 -1
  317. data/app/views/hyrax/base/_form_child_work_relationships.html.erb +4 -4
  318. data/app/views/hyrax/base/_form_files.html.erb +9 -9
  319. data/app/views/hyrax/base/_form_member_of_collections.html.erb +3 -3
  320. data/app/views/hyrax/base/_form_metadata.html.erb +1 -1
  321. data/app/views/hyrax/base/_form_permission.html.erb +30 -20
  322. data/app/views/hyrax/base/_form_permission_under_embargo.html.erb +1 -1
  323. data/app/views/hyrax/base/_form_permission_under_lease.html.erb +1 -1
  324. data/app/views/hyrax/base/_form_progress.html.erb +6 -6
  325. data/app/views/hyrax/base/_form_relationships.html.erb +1 -1
  326. data/app/views/hyrax/base/_form_rendering.html.erb +1 -1
  327. data/app/views/hyrax/base/_form_representative.html.erb +1 -1
  328. data/app/views/hyrax/base/_form_share.html.erb +6 -6
  329. data/app/views/hyrax/base/_form_thumbnail.html.erb +1 -1
  330. data/app/views/hyrax/base/_form_visibility_component.html.erb +15 -15
  331. data/app/views/hyrax/base/_guts4form.html.erb +12 -20
  332. data/app/views/hyrax/base/_member.html.erb +1 -1
  333. data/app/views/hyrax/base/_metadata.html.erb +1 -1
  334. data/app/views/hyrax/base/_show_actions.html.erb +9 -9
  335. data/app/views/hyrax/base/_work_button_row.html.erb +16 -15
  336. data/app/views/hyrax/base/_workflow_actions.html.erb +10 -10
  337. data/app/views/hyrax/base/_workflow_actions_widget.erb +1 -1
  338. data/app/views/hyrax/base/file_manager.html.erb +4 -5
  339. data/app/views/hyrax/base/inspect_work.html.erb +1 -1
  340. data/app/views/hyrax/base/show.html.erb +12 -12
  341. data/app/views/hyrax/base/unavailable.html.erb +2 -2
  342. data/app/views/hyrax/batch_edits/_check_all.html.erb +0 -1
  343. data/app/views/hyrax/batch_edits/_delete_selected.html.erb +1 -1
  344. data/app/views/hyrax/batch_edits/edit.html.erb +26 -18
  345. data/app/views/hyrax/collections/_bookmark_control.html.erb +2 -2
  346. data/app/views/hyrax/collections/_list_collections.html.erb +6 -6
  347. data/app/views/hyrax/collections/_list_works.html.erb +3 -1
  348. data/app/views/hyrax/collections/_search_form.html.erb +4 -4
  349. data/app/views/hyrax/collections/_show_document_list_row.html.erb +5 -2
  350. data/app/views/hyrax/collections/_sort_and_per_page.html.erb +3 -3
  351. data/app/views/hyrax/collections/_view_type_group.html.erb +2 -2
  352. data/app/views/hyrax/contact_form/new.html.erb +12 -13
  353. data/app/views/hyrax/content_blocks/_form.html.erb +29 -23
  354. data/app/views/hyrax/content_blocks/templates/agreement.html.erb +3 -3
  355. data/app/views/hyrax/dashboard/_admin_sets.html.erb +22 -28
  356. data/app/views/hyrax/dashboard/_index_partials/_current_proxy_rights.html.erb +2 -2
  357. data/app/views/hyrax/dashboard/_index_partials/_proxy_rights.html.erb +4 -4
  358. data/app/views/hyrax/dashboard/_index_partials/_transfers.html.erb +2 -2
  359. data/app/views/hyrax/dashboard/_repository_growth.html.erb +28 -28
  360. data/app/views/hyrax/dashboard/_resource_type_graph.html.erb +4 -4
  361. data/app/views/hyrax/dashboard/_sidebar.html.erb +3 -3
  362. data/app/views/hyrax/dashboard/_tabs.html.erb +6 -2
  363. data/app/views/hyrax/dashboard/_user_activity.html.erb +22 -19
  364. data/app/views/hyrax/dashboard/_visibility_graph.html.erb +4 -4
  365. data/app/views/hyrax/dashboard/_work_type_graph.html.erb +4 -4
  366. data/app/views/hyrax/dashboard/collections/_batch_edits_actions.html.erb +1 -1
  367. data/app/views/hyrax/dashboard/collections/_bookmark_control.html.erb +2 -2
  368. data/app/views/hyrax/dashboard/collections/_default_group.html.erb +2 -2
  369. data/app/views/hyrax/dashboard/collections/_edit_actions.html.erb +1 -1
  370. data/app/views/hyrax/dashboard/collections/_form.html.erb +48 -33
  371. data/app/views/hyrax/dashboard/collections/_form_branding.html.erb +20 -19
  372. data/app/views/hyrax/dashboard/collections/_form_discovery.html.erb +14 -7
  373. data/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb +7 -7
  374. data/app/views/hyrax/dashboard/collections/_form_share.html.erb +13 -11
  375. data/app/views/hyrax/dashboard/collections/_form_share_table.html.erb +34 -31
  376. data/app/views/hyrax/dashboard/collections/_list_collections.html.erb +3 -3
  377. data/app/views/hyrax/dashboard/collections/_list_works.html.erb +3 -1
  378. data/app/views/hyrax/dashboard/collections/_modal_remove_from_collection.html.erb +1 -1
  379. data/app/views/hyrax/dashboard/collections/_modal_remove_sub_collection.html.erb +1 -1
  380. data/app/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb +1 -1
  381. data/app/views/hyrax/dashboard/collections/_show_descriptions.html.erb +5 -3
  382. data/app/views/hyrax/dashboard/collections/_show_document_list_menu.html.erb +4 -4
  383. data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb +12 -10
  384. data/app/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb +2 -2
  385. data/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb +4 -4
  386. data/app/views/hyrax/dashboard/collections/_subcollection_list.html.erb +1 -1
  387. data/app/views/hyrax/dashboard/collections/_work_action_menu.html.erb +10 -10
  388. data/app/views/hyrax/dashboard/collections/show.html.erb +4 -4
  389. data/app/views/hyrax/dashboard/profiles/_edit_primary.html.erb +21 -21
  390. data/app/views/hyrax/dashboard/profiles/_trophy_edit.html.erb +5 -5
  391. data/app/views/hyrax/dashboard/profiles/_zotero.html.erb +2 -2
  392. data/app/views/hyrax/dashboard/profiles/edit.html.erb +2 -2
  393. data/app/views/hyrax/dashboard/profiles/show.html.erb +3 -3
  394. data/app/views/hyrax/dashboard/show_admin.html.erb +36 -34
  395. data/app/views/hyrax/dashboard/show_user.html.erb +16 -16
  396. data/app/views/hyrax/dashboard/sidebar/_activity.html.erb +11 -11
  397. data/app/views/hyrax/dashboard/sidebar/_configuration.html.erb +8 -8
  398. data/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb +3 -1
  399. data/app/views/hyrax/dashboard/sidebar/_tasks.html.erb +5 -1
  400. data/app/views/hyrax/dashboard/works/_default_group.html.erb +1 -1
  401. data/app/views/hyrax/dashboard/works/_list_works.html.erb +5 -2
  402. data/app/views/hyrax/depositors/index.html.erb +2 -2
  403. data/app/views/hyrax/embargoes/edit.html.erb +11 -11
  404. data/app/views/hyrax/embargoes/index.html.erb +18 -6
  405. data/app/views/hyrax/file_sets/_actions.html.erb +7 -8
  406. data/app/views/hyrax/file_sets/_descriptions.html.erb +1 -1
  407. data/app/views/hyrax/file_sets/_extra_fields_modal.html.erb +1 -1
  408. data/app/views/hyrax/file_sets/_form.html.erb +1 -1
  409. data/app/views/hyrax/file_sets/_permission_form.html.erb +33 -29
  410. data/app/views/hyrax/file_sets/_show_actions.html.erb +2 -2
  411. data/app/views/hyrax/file_sets/_show_details.html.erb +27 -17
  412. data/app/views/hyrax/file_sets/_single_use_link_rows.html.erb +2 -2
  413. data/app/views/hyrax/file_sets/_single_use_links.html.erb +2 -2
  414. data/app/views/hyrax/file_sets/_versioning.html.erb +9 -9
  415. data/app/views/hyrax/file_sets/edit.html.erb +17 -11
  416. data/app/views/hyrax/file_sets/media_display/_image.html.erb +4 -4
  417. data/app/views/hyrax/file_sets/show.html.erb +2 -2
  418. data/app/views/hyrax/homepage/_announcement.html.erb +2 -2
  419. data/app/views/hyrax/homepage/_explore_collections.html.erb +6 -4
  420. data/app/views/hyrax/homepage/_featured_fields.html.erb +1 -1
  421. data/app/views/hyrax/homepage/_featured_works.html.erb +1 -1
  422. data/app/views/hyrax/homepage/_home_content.html.erb +24 -10
  423. data/app/views/hyrax/homepage/_marketing.html.erb +1 -1
  424. data/app/views/hyrax/homepage/_recent_document.html.erb +4 -1
  425. data/app/views/hyrax/homepage/_sortable_featured.html.erb +3 -3
  426. data/app/views/hyrax/homepage/index.html.erb +4 -4
  427. data/app/views/hyrax/leases/edit.html.erb +11 -11
  428. data/app/views/hyrax/leases/index.html.erb +18 -6
  429. data/app/views/hyrax/my/_admin_set_action_menu.html.erb +5 -5
  430. data/app/views/hyrax/my/_collection_action_menu.html.erb +6 -6
  431. data/app/views/hyrax/my/_constraints.html.erb +2 -2
  432. data/app/views/hyrax/my/_document_list.html.erb +1 -1
  433. data/app/views/hyrax/my/_facet_layout.html.erb +1 -2
  434. data/app/views/hyrax/my/_facet_limit.html.erb +4 -4
  435. data/app/views/hyrax/my/_facet_pagination.html.erb +1 -22
  436. data/app/views/hyrax/my/_facet_pivot.html.erb +1 -1
  437. data/app/views/hyrax/my/_facet_selected.html.erb +1 -1
  438. data/app/views/hyrax/my/_search_form.html.erb +7 -8
  439. data/app/views/hyrax/my/_sort_and_per_page.html.erb +10 -12
  440. data/app/views/hyrax/my/_work_action_menu.html.erb +12 -14
  441. data/app/views/hyrax/my/collections/_default_group.html.erb +2 -2
  442. data/app/views/hyrax/my/collections/_facets.html.erb +2 -2
  443. data/app/views/hyrax/my/collections/_list_collections.html.erb +3 -3
  444. data/app/views/hyrax/my/collections/_modal_add_subcollection.html.erb +2 -2
  445. data/app/views/hyrax/my/collections/_modal_add_to_collection.html.erb +2 -2
  446. data/app/views/hyrax/my/collections/_modal_collection_types_to_create.html.erb +5 -5
  447. data/app/views/hyrax/my/collections/_modal_delete_collection.html.erb +1 -1
  448. data/app/views/hyrax/my/collections/_modal_delete_empty_collection.html.erb +1 -1
  449. data/app/views/hyrax/my/collections/_modal_delete_selected_collections.html.erb +1 -1
  450. data/app/views/hyrax/my/collections/_tabs.html.erb +11 -4
  451. data/app/views/hyrax/my/collections/index.html.erb +6 -5
  452. data/app/views/hyrax/my/facet.html.erb +17 -16
  453. data/app/views/hyrax/my/index.html.erb +2 -2
  454. data/app/views/hyrax/my/works/_batch_actions.html.erb +1 -1
  455. data/app/views/hyrax/my/works/_default_group.html.erb +1 -1
  456. data/app/views/hyrax/my/works/_facets.html.erb +2 -2
  457. data/app/views/hyrax/my/works/_list_works.html.erb +7 -9
  458. data/app/views/hyrax/my/works/_tabs.html.erb +9 -4
  459. data/app/views/hyrax/my/works/index.html.erb +22 -18
  460. data/app/views/hyrax/notifications/_notifications.html.erb +1 -1
  461. data/app/views/hyrax/notifications/index.html.erb +4 -4
  462. data/app/views/hyrax/operations/index.html.erb +1 -1
  463. data/app/views/hyrax/operations/show.html.erb +2 -2
  464. data/app/views/hyrax/pages/_form.html.erb +76 -64
  465. data/app/views/hyrax/permissions/confirm.html.erb +4 -4
  466. data/app/views/hyrax/permissions/confirm_access.html.erb +4 -4
  467. data/app/views/hyrax/stats/file.html.erb +1 -1
  468. data/app/views/hyrax/stats/work.html.erb +1 -1
  469. data/app/views/hyrax/transfers/_received.html.erb +4 -4
  470. data/app/views/hyrax/transfers/index.html.erb +8 -8
  471. data/app/views/hyrax/uploads/_js_templates.html.erb +14 -14
  472. data/app/views/hyrax/uploads/_js_templates_branding.html.erb +5 -5
  473. data/app/views/hyrax/uploads/_js_templates_versioning.html.erb +15 -15
  474. data/app/views/hyrax/users/_activity.html.erb +3 -3
  475. data/app/views/hyrax/users/_contributions.html.erb +3 -3
  476. data/app/views/hyrax/users/_left_sidebar.html.erb +1 -1
  477. data/app/views/hyrax/users/_profile_tabs.html.erb +16 -8
  478. data/app/views/hyrax/users/_search_form.html.erb +2 -2
  479. data/app/views/hyrax/users/_user.html.erb +5 -5
  480. data/app/views/hyrax/users/_user_info.html.erb +4 -4
  481. data/app/views/hyrax/users/_vitals.html.erb +3 -3
  482. data/app/views/hyrax/users/show.html.erb +2 -2
  483. data/app/views/layouts/hyrax/dashboard.html.erb +4 -4
  484. data/app/views/layouts/hyrax.html.erb +4 -3
  485. data/app/views/shared/_appearance_styles.html.erb +8 -8
  486. data/app/views/shared/_footer.html.erb +1 -1
  487. data/app/views/shared/_locale_picker.html.erb +5 -8
  488. data/app/views/shared/_nav_safety_modal.html.erb +2 -2
  489. data/app/views/shared/_select_work_type_modal.html.erb +2 -2
  490. data/chart/hyrax/Chart.yaml +11 -7
  491. data/chart/hyrax/README.md +22 -1
  492. data/chart/hyrax/templates/_helpers.tpl +4 -0
  493. data/chart/hyrax/templates/cron-embargo.yaml +5 -0
  494. data/chart/hyrax/templates/cron-lease.yaml +5 -0
  495. data/chart/hyrax/templates/deployment-worker.yaml +11 -0
  496. data/chart/hyrax/templates/ingress.yaml +7 -6
  497. data/chart/hyrax/values.yaml +152 -0
  498. data/config/features.rb +48 -50
  499. data/config/initializers/listeners.rb +0 -1
  500. data/config/initializers/{valkryrie_storage.rb → storage_adapter_initializer.rb} +5 -0
  501. data/config/locales/hyrax.de.yml +22 -21
  502. data/config/locales/hyrax.en.yml +34 -32
  503. data/config/locales/hyrax.es.yml +16 -15
  504. data/config/locales/hyrax.fr.yml +9 -8
  505. data/config/locales/hyrax.it.yml +9 -8
  506. data/config/locales/hyrax.pt-BR.yml +8 -7
  507. data/config/locales/hyrax.zh.yml +8 -7
  508. data/config/metadata/basic_metadata.yaml +2 -0
  509. data/config/metadata/core_metadata.yaml +1 -1
  510. data/docker-compose.yml +49 -43
  511. data/documentation/developing-your-hyrax-based-app.md +1 -1
  512. data/documentation/legacyREADME.md +1 -1
  513. data/hyrax.gemspec +15 -22
  514. data/karma.conf.js +104 -0
  515. data/lib/generators/hyrax/assets_generator.rb +2 -5
  516. data/lib/generators/hyrax/collection_resource/USAGE +20 -0
  517. data/lib/generators/hyrax/collection_resource/collection_resource_generator.rb +133 -0
  518. data/lib/generators/hyrax/collection_resource/templates/collection.rb.erb +34 -0
  519. data/lib/generators/hyrax/collection_resource/templates/collection_form.rb.erb +7 -0
  520. data/lib/generators/hyrax/collection_resource/templates/collection_form_spec.rb.erb +13 -0
  521. data/lib/generators/hyrax/collection_resource/templates/collection_indexer.rb.erb +7 -0
  522. data/lib/generators/hyrax/collection_resource/templates/collection_indexer_spec.rb.erb +13 -0
  523. data/lib/generators/hyrax/collection_resource/templates/collection_metadata.yaml +22 -0
  524. data/lib/generators/hyrax/collection_resource/templates/collection_spec.rb.erb +12 -0
  525. data/lib/generators/hyrax/install_generator.rb +9 -24
  526. data/lib/generators/hyrax/templates/catalog_controller.rb +20 -13
  527. data/lib/generators/hyrax/templates/config/initializers/riiif.rb +1 -1
  528. data/lib/generators/hyrax/templates/config/locales/hyrax.de.yml +1 -1
  529. data/lib/generators/hyrax/templates/config/locales/hyrax.en.yml +1 -1
  530. data/lib/generators/hyrax/templates/config/locales/hyrax.es.yml +1 -1
  531. data/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml +1 -1
  532. data/lib/generators/hyrax/templates/config/locales/hyrax.it.yml +1 -1
  533. data/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml +1 -1
  534. data/lib/generators/hyrax/templates/config/locales/hyrax.zh.yml +1 -1
  535. data/lib/generators/hyrax/templates/hyrax.scss +1 -2
  536. data/lib/generators/hyrax/templates/package.json +7 -8
  537. data/lib/hyrax/administrative_set_name.rb +18 -0
  538. data/lib/hyrax/collection_name.rb +2 -0
  539. data/lib/hyrax/configuration.rb +22 -40
  540. data/lib/hyrax/controlled_vocabularies/location.rb +9 -2
  541. data/lib/hyrax/controlled_vocabularies/resource_label_caching.rb +42 -0
  542. data/lib/hyrax/controlled_vocabularies.rb +1 -0
  543. data/lib/hyrax/engine.rb +1 -2
  544. data/lib/hyrax/publisher.rb +45 -0
  545. data/lib/hyrax/schema.rb +16 -13
  546. data/lib/hyrax/specs/capybara.rb +6 -4
  547. data/lib/hyrax/specs/shared_specs/hydra_works.rb +11 -5
  548. data/lib/hyrax/specs/shared_specs/indexers.rb +117 -3
  549. data/lib/hyrax/transactions/admin_set_create.rb +2 -1
  550. data/lib/hyrax/transactions/admin_set_destroy.rb +22 -0
  551. data/lib/hyrax/transactions/admin_set_update.rb +21 -0
  552. data/lib/hyrax/transactions/collection_destroy.rb +22 -0
  553. data/lib/hyrax/transactions/collection_update.rb +5 -2
  554. data/lib/hyrax/transactions/container.rb +76 -56
  555. data/lib/hyrax/transactions/steps/change_depositor.rb +46 -0
  556. data/lib/hyrax/transactions/steps/check_for_empty_admin_set.rb +36 -0
  557. data/lib/hyrax/transactions/steps/delete_access_control.rb +32 -0
  558. data/lib/hyrax/transactions/steps/delete_resource.rb +19 -3
  559. data/lib/hyrax/transactions/steps/save.rb +24 -6
  560. data/lib/hyrax/transactions/steps/save_access_control.rb +2 -2
  561. data/lib/hyrax/transactions/steps/save_collection_banner.rb +59 -0
  562. data/lib/hyrax/transactions/steps/save_collection_logo.rb +109 -0
  563. data/lib/hyrax/transactions/steps/set_user_as_creator.rb +41 -0
  564. data/lib/hyrax/transactions/steps/update_work_members.rb +51 -0
  565. data/lib/hyrax/transactions/work_create.rb +1 -1
  566. data/lib/hyrax/transactions/work_destroy.rb +2 -1
  567. data/lib/hyrax/transactions/{update_work.rb → work_update.rb} +4 -3
  568. data/lib/hyrax/version.rb +1 -1
  569. data/lib/valkyrie/indexing/solr/indexing_adapter.rb +1 -1
  570. data/lib/wings/active_fedora_converter/file_metadata_node.rb +48 -0
  571. data/lib/wings/active_fedora_converter/instance_builder.rb +68 -0
  572. data/lib/wings/active_fedora_converter.rb +3 -3
  573. data/lib/wings/attribute_transformer.rb +5 -1
  574. data/lib/wings/services/custom_queries/find_file_metadata.rb +19 -8
  575. data/lib/wings/setup.rb +3 -1
  576. data/lib/wings/valkyrie/persister.rb +4 -1
  577. data/lib/wings/valkyrie/query_service.rb +6 -7
  578. data/lib/wings/valkyrie/storage.rb +7 -1
  579. data/package.json +11 -0
  580. data/tasks/hyrax_dev.rake +32 -0
  581. data/template.rb +1 -1
  582. data/vendor/assets/javascripts/dataTables.bootstrap4.js +184 -0
  583. data/vendor/assets/javascripts/fileupload/jquery.fileupload-ui.js +1 -1
  584. data/vendor/assets/javascripts/fileupload/jquery.fileupload.js +2 -2
  585. data/vendor/assets/javascripts/fileupload/jquery.iframe-transport.js +1 -1
  586. data/vendor/assets/javascripts/handlebars.js +5214 -0
  587. data/vendor/assets/javascripts/jquery-ui.js +19057 -0
  588. data/vendor/assets/javascripts/jquery.dataTables.js +15336 -0
  589. data/vendor/assets/javascripts/morris/morris.min.js +9 -1
  590. data/vendor/assets/javascripts/morris/raphael-min.js +4 -6
  591. data/vendor/assets/javascripts/nestable.js +1 -1
  592. data/vendor/assets/stylesheets/dataTables.bootstrap4.css +307 -0
  593. data/vendor/assets/stylesheets/jquery-ui.css +1315 -0
  594. data/vendor/assets/stylesheets/morris.css +3 -0
  595. metadata +162 -155
  596. data/app/actors/hyrax/actors/initialize_workflow_actor.rb +0 -35
  597. data/app/helpers/hyrax/url_helper.rb +0 -13
  598. data/app/jobs/content_depositor_change_event_job.rb +0 -47
  599. data/app/models/concerns/hyrax/with_file_sets.rb +0 -17
  600. data/lib/hyrax/transactions/create_work.rb +0 -62
  601. data/lib/hyrax/transactions/destroy_work.rb +0 -25
  602. data/lib/hyrax/transactions/steps/apply_collection_permission_template.rb +0 -32
  603. data/lib/hyrax/transactions/steps/apply_permission_template.rb +0 -30
  604. data/lib/hyrax/transactions/steps/apply_visibility.rb +0 -39
  605. data/lib/hyrax/transactions/steps/destroy_work.rb +0 -25
  606. data/lib/hyrax/transactions/steps/ensure_permission_template.rb +0 -27
  607. data/lib/hyrax/transactions/steps/save_work.rb +0 -35
  608. data/lib/wings/services/file_converter_service.rb +0 -19
  609. data/lib/wings/services/file_metadata_builder.rb +0 -94
  610. data/vendor/assets/javascripts/handlebars-v4.0.5.js +0 -4612
  611. data/vendor/assets/stylesheets/morris.js/0.5.1/morris.css +0 -2
@@ -29,7 +29,7 @@ module Hyrax
29
29
  :page_count, :file_title, :last_modified, :original_checksum,
30
30
  :duration, :sample_rate, :alpha_channels
31
31
  ]
32
- self.characterization_proxy = :original_file
32
+ self.characterization_proxy = Hyrax.config.characterization_proxy
33
33
 
34
34
  delegate(*characterization_terms, to: :characterization_proxy)
35
35
 
@@ -64,6 +64,12 @@ module Hyrax
64
64
  end
65
65
 
66
66
  ActiveFedora::WithMetadata::DefaultMetadataClassFactory.file_metadata_schemas << AlphaChannelsSchema
67
+
68
+ # Add file_set_id for Valkyrie support.
69
+ class FileSetIdSchema < ActiveTriples::Schema
70
+ property :file_set_id, predicate: ::RDF::URI.new('http://vocabulary.samvera.org/ns#fileSetId')
71
+ end
72
+ ActiveFedora::WithMetadata::DefaultMetadataClassFactory.file_metadata_schemas << FileSetIdSchema
67
73
  end
68
74
  end
69
75
  end
@@ -35,7 +35,7 @@ module Hyrax
35
35
 
36
36
  # Cast to a SolrDocument by querying from Solr
37
37
  def to_presenter
38
- CatalogController.new.fetch(id).last
38
+ Blacklight::SearchService.new(config: CatalogController.blacklight_config).fetch(id).last
39
39
  end
40
40
  end
41
41
  end
@@ -6,12 +6,5 @@ module Hyrax
6
6
  included do
7
7
  belongs_to :admin_set, predicate: Hyrax.config.admin_set_predicate
8
8
  end
9
-
10
- ##
11
- # @deprecated Use `Sipity::Workflow.find_active_workflow_for` instead.
12
- def active_workflow
13
- Deprecation.warn 'Use `Sipity::Workflow.find_active_workflow_for` instead.'
14
- Sipity::Workflow.find_active_workflow_for(admin_set_id: admin_set_id)
15
- end
16
9
  end
17
10
  end
@@ -52,6 +52,7 @@ module Hyrax
52
52
  attribute :read_groups, Solr::Array, ::Ability.read_group_field
53
53
  attribute :collection_ids, Solr::Array, 'collection_ids_tesim'
54
54
  attribute :admin_set, Solr::Array, "admin_set_tesim"
55
+ attribute :admin_set_id, Solr::Array, "admin_set_id_ssim"
55
56
  attribute :member_ids, Solr::Array, "member_ids_ssim"
56
57
  attribute :member_of_collection_ids, Solr::Array, "member_of_collection_ids_ssim"
57
58
  attribute :member_of_collections, Solr::Array, "member_of_collections_ssim"
@@ -65,7 +65,7 @@ module Hyrax
65
65
  ##
66
66
  # @return [Boolean]
67
67
  def admin_set?
68
- hydra_model == ::AdminSet
68
+ hydra_model == Hyrax.config.admin_set_class
69
69
  end
70
70
 
71
71
  ##
@@ -75,9 +75,9 @@ module Hyrax
75
75
  end
76
76
 
77
77
  # Method to return the model
78
- def hydra_model(classifier: ActiveFedora.model_mapper)
78
+ def hydra_model(classifier: nil)
79
79
  first('has_model_ssim')&.safe_constantize ||
80
- classifier.classifier(self).best_model
80
+ model_classifier(classifier).classifier(self).best_model
81
81
  end
82
82
 
83
83
  def depositor(default = '')
@@ -107,5 +107,11 @@ module Hyrax
107
107
  def collection_type_gid
108
108
  first(Hyrax.config.collection_type_index_field)
109
109
  end
110
+
111
+ private
112
+
113
+ def model_classifier(classifier)
114
+ classifier || ActiveFedora.model_mapper
115
+ end
110
116
  end
111
117
  end
@@ -34,12 +34,12 @@ module Hyrax::User
34
34
  scope :without_system_accounts, -> { where("#{::User.user_key_field} not in (?)", [::User.batch_user_key, ::User.audit_user_key, ::User.system_user_key]) }
35
35
 
36
36
  # Validate and normalize ORCIDs
37
- validates_with OrcidValidator
37
+ validates_with Hyrax::OrcidValidator
38
38
  after_validation :normalize_orcid
39
39
 
40
40
  # Set up user profile avatars
41
- mount_uploader :avatar, AvatarUploader, mount_on: :avatar_file_name
42
- validates_with AvatarValidator
41
+ mount_uploader :avatar, Hyrax::AvatarUploader, mount_on: :avatar_file_name
42
+ validates_with Hyrax::AvatarValidator
43
43
 
44
44
  # Add token to authenticate Arkivo API calls
45
45
  after_initialize :set_arkivo_token, unless: :persisted? if Hyrax.config.arkivo_api?
@@ -53,6 +53,13 @@ module Hyrax::User
53
53
  public_send(self.class.user_key_field)
54
54
  end
55
55
 
56
+ ##
57
+ # @return [String] a local identifier for this user; for use (e.g.) in ACL
58
+ # data
59
+ def agent_key
60
+ user_key
61
+ end
62
+
56
63
  # Look for, in order:
57
64
  # A cached version of the agent
58
65
  # A non-cached version (direct read of the database)
@@ -177,6 +184,10 @@ module Hyrax::User
177
184
  User.find_by_user_key(user_key) || User.create!(user_key_field => user_key, password: Devise.friendly_token[0, 20])
178
185
  end
179
186
 
187
+ def from_agent_key(key)
188
+ User.find_by_user_key(key)
189
+ end
190
+
180
191
  def from_url_component(component)
181
192
  User.find_by_user_key(component.gsub(/-dot-/, '.'))
182
193
  end
@@ -10,7 +10,6 @@ module Hyrax
10
10
  include Hydra::WithDepositor
11
11
  include HasRepresentative
12
12
  include HasRendering
13
- include WithFileSets
14
13
  include Naming
15
14
  include CoreMetadata
16
15
  include InAdminSet
@@ -34,7 +33,7 @@ module Hyrax
34
33
 
35
34
  module ClassMethods
36
35
  # This governs which partial to draw when you render this type of object
37
- def _to_partial_path #:nodoc:
36
+ def _to_partial_path # :nodoc:
38
37
  @_to_partial_path ||= begin
39
38
  element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(name))
40
39
  collection = ActiveSupport::Inflector.tableize(name)
@@ -24,12 +24,6 @@ class ContentBlock < ActiveRecord::Base
24
24
  end
25
25
 
26
26
  class << self
27
- # @deprecated
28
- def whitelisted?(key)
29
- Deprecation.warn(self, "Samvera is deprecating '#{self}.whitelisted?' in Hyrax 3.0. Use #{self}.registered? instead.")
30
- registered?(key)
31
- end
32
-
33
27
  def registered?(key)
34
28
  NAME_REGISTRY.include?(key)
35
29
  end
@@ -18,7 +18,6 @@ class FeaturedWorkList
18
18
  @works = FeaturedWork.all
19
19
  add_solr_document_to_works
20
20
  @works = @works.reject do |work|
21
- work.destroy if work.presenter.blank?
22
21
  work.presenter.blank?
23
22
  end
24
23
  end
@@ -1,18 +1,53 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_dependency 'hyrax/administrative_set_name'
4
+
3
5
  module Hyrax
4
6
  ##
5
7
  # Valkyrie model for Admin Set domain objects.
8
+ #
9
+ # ## Relationships
10
+ #
11
+ # ### Administrative Set and Work
12
+ #
13
+ # * Defined: The relationship is defined by the inverse relationship stored in the
14
+ # work's `:admin_set_id` attribute.
15
+ # * Tested: The work tests the relationship.
16
+ # * Administrative Set to Work: (1..m) An admin set can have many works.
17
+ #
18
+ # @example Get works in an admin set:
19
+ # works = Hyrax.query_service.find_inverse_references_by(id: admin_set.id, property: :admin_set_id)
20
+ #
21
+ # * Work to Administrative Set: (1..1) A work must be in one and only one admin set.
22
+ # * See Hyrax::Work for code to get and set the admin set for the work.
23
+ #
24
+ # @see Hyrax::Work
25
+ # @see Valkyrie query adapter's #find_inverse_references_by
26
+ #
6
27
  class AdministrativeSet < Hyrax::Resource
7
28
  include Hyrax::Schema(:core_metadata)
8
29
 
9
30
  attribute :alternative_title, Valkyrie::Types::Set.of(Valkyrie::Types::String)
10
31
  attribute :creator, Valkyrie::Types::Set.of(Valkyrie::Types::String)
11
- attribute :description, Valkyrie::Types::Set.of(Valkyrie::Types::String)
32
+ attribute :description, Valkyrie::Types::String
33
+
34
+ ##
35
+ # @return [Boolean] true
36
+ def collection?
37
+ true
38
+ end
12
39
 
13
40
  def collection_type_gid
14
41
  # allow AdministrativeSet to behave more like a regular PcdmCollection
15
42
  Hyrax::CollectionType.find_or_create_admin_set_type.to_global_id
16
43
  end
44
+
45
+ ##
46
+ # @api private
47
+ #
48
+ # @return [Class] an ActiveModel::Name compatible class
49
+ def self._hyrax_default_name_class
50
+ Hyrax::AdministrativeSetName
51
+ end
17
52
  end
18
53
  end
@@ -109,9 +109,9 @@ module Hyrax
109
109
 
110
110
  ##
111
111
  # @return [Enumerable<Collection, PcdmCollection>]
112
- def collections(use_valkyrie: false)
112
+ def collections(use_valkyrie: Hyrax.config.use_valkyrie?)
113
113
  return [] unless id
114
- return Hyrax.custom_queries.find_collections_by_type(global_id: to_global_id) if use_valkyrie
114
+ return Hyrax.custom_queries.find_collections_by_type(global_id: to_global_id.to_s) if use_valkyrie
115
115
  ActiveFedora::Base.where(Hyrax.config.collection_type_index_field.to_sym => to_global_id.to_s)
116
116
  end
117
117
 
@@ -1,7 +1,30 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Hyrax
4
+ ##
5
+ # Casts a resource to an associated FileMetadata
6
+ #
7
+ # @param [Valkyrie::StorageAdapter::File] file
8
+ #
9
+ # @return [Hyrax::FileMetadata]
10
+ # @raise [ArgumentError]
11
+ def self.FileMetadata(file)
12
+ raise(ArgumentError, "Expected a Valkyrie::StorageAdapter::File; got #{file.class}: #{file}") if
13
+ file.is_a?(Valkyrie::Resource)
14
+
15
+ Hyrax.custom_queries.find_file_metadata_by(id: file.id)
16
+ rescue Hyrax::ObjectNotFoundError, Ldp::BadRequest
17
+ Hyrax.logger.debug('Could not find an existing metadata node for file ' \
18
+ "with id #{file.id}. Initializing a new one")
19
+
20
+ FileMetadata.new(file_identifier: file.id, alternative_ids: [file.id])
21
+ end
22
+
4
23
  class FileMetadata < Valkyrie::Resource
24
+ # Include mime-types for Hydra Derivatives mime-type checking. We may want
25
+ # to move this logic someday.
26
+ include Hydra::Works::MimeTypes
27
+
5
28
  GENERIC_MIME_TYPE = 'application/octet-stream'
6
29
 
7
30
  ##
@@ -35,7 +58,7 @@ module Hyrax
35
58
  end
36
59
 
37
60
  attribute :file_identifier, Valkyrie::Types::ID # id of the file stored by the storage adapter
38
- attribute :alternate_ids, Valkyrie::Types::Set.of(Valkyrie::Types::ID) # id of the Hydra::PCDM::File which holds metadata and the file in ActiveFedora
61
+ attribute :alternate_ids, Valkyrie::Types::Set.of(Valkyrie::Types::ID) # id of the file, populated for queryability
39
62
  attribute :file_set_id, ::Valkyrie::Types::ID # id of parent file set resource
40
63
 
41
64
  # all remaining attributes are on AF::File metadata_node unless otherwise noted
@@ -103,7 +126,9 @@ module Hyrax
103
126
  attribute :aspect_ratio, ::Valkyrie::Types::Set
104
127
 
105
128
  # @param [ActionDispatch::Http::UploadedFile] file
129
+ # @deprecated Use #new instead; for removal in 4.0.0
106
130
  def self.for(file:)
131
+ Deprecation.warn "#{self.class}##{__method__} is deprecated; use #new instead."
107
132
  new(label: file.original_filename,
108
133
  original_filename: file.original_filename,
109
134
  mime_type: file.content_type)
@@ -151,8 +176,17 @@ module Hyrax
151
176
  ''
152
177
  end
153
178
 
179
+ ##
180
+ # @return [Valkyrie::StorageAdapter::File]
181
+ #
182
+ # @raise [Valkyrie::StorageAdapter::AdapterNotFoundError] if no adapter
183
+ # could be found matching the file_identifier's scheme
184
+ # @raise [Valkyrie::StorageAdapter::FileNotFound] when the file can't
185
+ # be found in the registered adapter
154
186
  def file
155
- Hyrax.storage_adapter.find_by(id: file_identifier)
187
+ Valkyrie::StorageAdapter
188
+ .adapter_for(id: file_identifier)
189
+ .find_by(id: file_identifier)
156
190
  end
157
191
  end
158
192
  end
@@ -4,22 +4,61 @@ module Hyrax
4
4
  ##
5
5
  # Valkyrie model for `FileSet` domain objects in the Hydra Works model.
6
6
  #
7
+ # ## Relationships
8
+ #
9
+ # ### File Set and Work
10
+ #
11
+ # * Defined: The relationship is defined by the inverse relationship stored in the
12
+ # work's `:member_ids` attribute.
13
+ # * Tested: The work tests the relationship.
14
+ # * File Set to Work: (1..1) A file set must be in one and only one work.
15
+ #
16
+ # @example Get work for a file set:
17
+ # work = Hyrax.custom_queries.find_parent_work(resource: file_set)
18
+ #
19
+ # * Work to File Set: (0..m) A work can have many file sets.
20
+ # * See Hyrax::Work for code to get and set file sets for the work.
21
+ #
22
+ # ### File Set and File (TBD)
23
+ #
24
+ # @see Hyrax::Work
25
+ # @see Hyrax::CustomQueries::Navigators::ParentWorkNavigator#find_parent_work
26
+ #
27
+ # @todo The description in Hydra::Works Shared Modeling is out of date and uses
28
+ # terminology to describe the relationships that is no longer used in code.
29
+ # Update the model and link to it. This can be a simple relationship diagram
30
+ # with a link to the original Works Shared Modeling for historical perspective.
7
31
  # @see https://wiki.duraspace.org/display/samvera/Hydra%3A%3AWorks+Shared+Modeling
8
32
  class FileSet < Hyrax::Resource
9
33
  include Hyrax::Schema(:core_metadata)
10
34
  include Hyrax::Schema(:basic_metadata)
11
35
 
12
36
  def self.model_name(name_class: Hyrax::Name)
13
- @_model_name ||= begin
14
- name_class.new(self, nil, 'FileSet')
15
- end
37
+ @_model_name ||= name_class.new(self, nil, 'FileSet')
16
38
  end
17
39
 
40
+ class_attribute :characterization_proxy
41
+ self.characterization_proxy = Hyrax.config.characterization_proxy
42
+
18
43
  attribute :file_ids, Valkyrie::Types::Array.of(Valkyrie::Types::ID) # id for FileMetadata resources
44
+ attribute :thumbnail_id, Valkyrie::Types::ID.optional # id for FileMetadata resource
19
45
  attribute :original_file_id, Valkyrie::Types::ID # id for FileMetadata resource
20
- attribute :thumbnail_id, Valkyrie::Types::ID # id for FileMetadata resource
21
46
  attribute :extracted_text_id, Valkyrie::Types::ID # id for FileMetadata resource
22
47
 
48
+ ##
49
+ # @return [Valkyrie::ID]
50
+ def representative_id
51
+ id
52
+ end
53
+
54
+ ##
55
+ # @return [Valkyrie::ID]
56
+ # If one is set then return it, otherwise use self as the ID to allow for
57
+ # derivative generators to find the on-disk path for the thumbnail.
58
+ def thumbnail_id
59
+ self.[](:thumbnail_id) || id
60
+ end
61
+
23
62
  ##
24
63
  # @return [Boolean] true
25
64
  def pcdm_object?
@@ -7,12 +7,31 @@ module Hyrax
7
7
  DEFAULT_NAME_PREFIX
8
8
  end
9
9
 
10
+ ##
11
+ # @return [Hyrax::Group]
12
+ def self.from_agent_key(key)
13
+ new(key.delete_prefix(name_prefix))
14
+ end
15
+
10
16
  def initialize(name)
11
17
  @name = name
12
18
  end
13
19
 
14
20
  attr_reader :name
15
21
 
22
+ ##
23
+ # @return [Boolean]
24
+ def ==(other)
25
+ other.class == self.class && other.name == name
26
+ end
27
+
28
+ ##
29
+ # @return [String] a local identifier for this group; for use (e.g.) in ACL
30
+ # data
31
+ def agent_key
32
+ self.class.name_prefix + name
33
+ end
34
+
16
35
  def to_sipity_agent
17
36
  sipity_agent || create_sipity_agent!
18
37
  end
@@ -5,9 +5,42 @@ require_dependency 'hyrax/collection_name'
5
5
  module Hyrax
6
6
  ##
7
7
  # Valkyrie model for Collection domain objects in the Hydra Works model.
8
+ #
9
+ # ## Relationships
10
+ #
11
+ # ### Collection and Collection (TBA)
12
+ #
13
+ # ### Collection and Work
14
+ #
15
+ # * Defined: The relationship is defined by the inverse relationship stored in the
16
+ # work's `:member_of_collection_ids` attribute.
17
+ # * Tested: The work tests the relationship.
18
+ # * Collection to Work: (0..m) A collection can have many works.
19
+ #
20
+ # @example Get works in a collection:
21
+ # works = Hyrax.custom_queries.find_child_works(resource: collection)
22
+ #
23
+ # * Work to Collection: (0..m) A work can be in many collections.
24
+ # * See Hyrax::Work for code to get and set collections for the work.
25
+ #
26
+ # @note Some collection types limit a work to belong to one and only one collection of that type.
27
+ #
28
+ # ### All children
29
+ #
30
+ # * There are additional methods for finding all children without respect to
31
+ # the child's type.
32
+ #
33
+ # @example Get works and child collections in a collection using:
34
+ # members = Hyrax.custom_queries.find_members_of(resource: collection)
35
+ #
36
+ # @see Hyrax::Work
37
+ #
38
+ # @see Hyrax::CustomQueries::Navigators::ChildCollectionsNavigator#find_child_collections
39
+ # @see Hyrax::CustomQueries::Navigators::ChildWorksNavigator#find_child_works
40
+ # @see Hyrax::CustomQueries::Navigators::CollectionMembers#find_members_of
41
+ #
8
42
  class PcdmCollection < Hyrax::Resource
9
43
  include Hyrax::Schema(:core_metadata)
10
- include Hyrax::Schema(:basic_metadata)
11
44
 
12
45
  attribute :collection_type_gid, Valkyrie::Types::String
13
46
  attribute :member_ids, Valkyrie::Types::Array.of(Valkyrie::Types::ID).meta(ordered: true)
@@ -32,5 +65,27 @@ module Hyrax
32
65
  def pcdm_object?
33
66
  true
34
67
  end
68
+
69
+ def permission_manager
70
+ @permission_manager ||= Hyrax::PermissionManager.new(resource: self)
71
+ end
72
+
73
+ def visibility=(value)
74
+ visibility_writer.assign_access_for(visibility: value)
75
+ end
76
+
77
+ def visibility
78
+ visibility_reader.read
79
+ end
80
+
81
+ protected
82
+
83
+ def visibility_writer
84
+ Hyrax::VisibilityWriter.new(resource: self)
85
+ end
86
+
87
+ def visibility_reader
88
+ Hyrax::VisibilityReader.new(resource: self)
89
+ end
35
90
  end
36
91
  end
@@ -4,7 +4,7 @@ module Hyrax
4
4
  # Holds policy data about the workflow and permissions applied objects when
5
5
  # they are deposited through an Administrative Set or a Collection. Each
6
6
  # template record has a {#source} (through {#source_id}); the template's
7
- # rules inform the behavior of objects deposited through that {#source_model}.
7
+ # rules inform the behavior of objects deposited through that {#source}.
8
8
  #
9
9
  # The {PermissionTemplate} specifies:
10
10
  #
@@ -81,36 +81,16 @@ module Hyrax
81
81
  # A bit of an analogue for a `belongs_to :source_model` as it crosses from Fedora to the DB
82
82
  # @return [AdminSet, ::Collection]
83
83
  # @raise [Hyrax::ObjectNotFoundError] when neither an AdminSet or Collection is found
84
+ # @note This method will eventually be replaced by #source which returns a Hyrax::Resource
85
+ # object. Many methods are equally able to process both Hyrax::Resource and
86
+ # ActiveFedora::Base. Only call this method if you need the ActiveFedora::Base object.
87
+ # @see #source
84
88
  def source_model
85
89
  ActiveFedora::Base.find(source_id)
86
90
  rescue ActiveFedora::ObjectNotFoundError
87
91
  raise Hyrax::ObjectNotFoundError
88
92
  end
89
93
 
90
- # A bit of an analogue for a `belongs_to :admin_set` as it crosses from Fedora to the DB
91
- # @deprecated Use #source_model instead
92
- # @return [AdminSet]
93
- # @raise [Hyrax::ObjectNotFoundError] when the we cannot find the AdminSet
94
- def admin_set
95
- Deprecation.warn('Use #source_model instead')
96
- return AdminSet.find(source_id) if AdminSet.exists?(source_id)
97
- raise Hyrax::ObjectNotFoundError
98
- rescue ActiveFedora::ActiveFedoraError # TODO: remove the rescue when active_fedora issue #1276 is fixed
99
- raise Hyrax::ObjectNotFoundError
100
- end
101
-
102
- # A bit of an analogue for a `belongs_to :collection` as it crosses from Fedora to the DB
103
- # @deprecated Use #source_model instead
104
- # @return [Collection]
105
- # @raise [Hyrax::ObjectNotFoundError] when the we cannot find the Collection
106
- def collection
107
- Deprecation.warn('Use #source_model instead')
108
- return ::Collection.find(source_id) if ::Collection.exists?(source_id)
109
- raise Hyrax::ObjectNotFoundError
110
- rescue ActiveFedora::ActiveFedoraError # TODO: remove the rescue when active_fedora issue #1276 is fixed
111
- raise Hyrax::ObjectNotFoundError
112
- end
113
-
114
94
  # Valid Release Period values
115
95
  RELEASE_TEXT_VALUE_FIXED = 'fixed'
116
96
  RELEASE_TEXT_VALUE_NO_DELAY = 'now'
@@ -215,15 +195,6 @@ module Hyrax
215
195
  [::Ability.registered_group_name, ::Ability.public_group_name]
216
196
  end
217
197
 
218
- ##
219
- # @param interpret_visibility [Boolean] whether to retain the existing
220
- # visibility when applying permission template ACLs
221
- # @return [Boolean]
222
- def reset_access_controls(interpret_visibility: false)
223
- reset_access_controls_for(collection: source_model,
224
- interpret_visibility: interpret_visibility)
225
- end
226
-
227
198
  ##
228
199
  # @param collection [::Collection, Hyrax::Resource]
229
200
  # @param interpret_visibility [Boolean] whether to retain the existing
@@ -4,6 +4,97 @@ module Hyrax
4
4
  ##
5
5
  # Valkyrie model for `Work` domain objects in the Hydra Works model.
6
6
  #
7
+ # ## Relationships
8
+ #
9
+ # ### Administrative Set and Work
10
+ #
11
+ # * Defined: The relationship is defined by the work's `:admin_set_id` attribute.
12
+ # * Tested: The relationship is tested in shared spec `'a Hyrax::Work'` by testing
13
+ # `#admin_set_id`. Shared specs are defined in /lib/hyrax/specs/shared_specs/hydra_works.rb.
14
+ # * Administrative Set to Work: (1..m) An admin set can have many works.
15
+ # * See Hyrax::AdministrativeSet for code to get works in an admin set.
16
+ # * Work to Administrative Set: (1..1) A work must be in one and only one admin set.
17
+ #
18
+ # @example Set admin set for a work:
19
+ # work.admin_set_id = admin_set.id
20
+ # @example Get admin set a work is in:
21
+ # admin_set = Hyrax.query_service.find_by(id: work.admin_set_id)
22
+ #
23
+ # ### Collection and Work
24
+ #
25
+ # * Defined: The relationship is defined by the work's `:member_of_collection_ids` attribute.
26
+ # * Tested: The relationship is tested in shared spec `'a Hyrax::Work'` by testing
27
+ # `it_behaves_like 'belongs to collections'`. Shared specs are defined in /lib/hyrax/specs/shared_specs/hydra_works.rb.
28
+ # * Collection to Work: (0..m) A collection can have many works.
29
+ # * See Hyrax::PcdmCollection for code to get works in a collection.
30
+ # * Work to Collection: (0..m) A work can be in many collections.
31
+ #
32
+ # @example Add a work to a collection using Hyrax::CollectionMemberService (multiple method options)
33
+ # Hyrax::CollectionMemberService.add_members(collection_id: col.id, members: works, user: current_user)
34
+ # @example Get collections a work is in:
35
+ # collections = Hyrax.custom_queries.find_collections_for(resource: work)
36
+ #
37
+ # @note Some collection types limit a work to belong to one and only one collection of that type.
38
+ #
39
+ # ### Work and Work
40
+ #
41
+ # * Defined: The relationship is defined in the parent work's `:member_ids` attribute.
42
+ # * Tested: The relationship is tested in shared spec `'a Hyrax::Work'` by testing
43
+ # `it_behaves_like 'has_members'`. Shared specs are defined in /lib/hyrax/specs/shared_specs/hydra_works.rb.
44
+ # * Work to child Work: (0..m) A work can have many child works.
45
+ #
46
+ # @example Add a child work to a work:
47
+ # Hyrax::Transactions::Container['work_resource.add_to_parent']
48
+ # .call(child_work, parent_id: parent_work.id, user: current_user)
49
+ # @example Get child works:
50
+ # works = Hyrax.custom_queries.find_child_works(resource: parent_work)
51
+ #
52
+ # * Work to parent Work: (0..1) A work can be in at most one parent work.
53
+ #
54
+ # @example Get parent work:
55
+ # parent_work = Hyrax.custom_queries.find_parent_work(resource: child_work)
56
+ #
57
+ # @note `:member_ids` holds ids of child works and file sets.
58
+ #
59
+ # ### Work and File Set
60
+ #
61
+ # * Defined: The relationship is defined in the parent work's `:member_ids` attribute.
62
+ # * Tested: The relationship is tested in shared spec `'a Hyrax::Work'` by testing
63
+ # `it_behaves_like 'has_members'`. Shared specs are defined in /lib/hyrax/specs/shared_specs/hydra_works.rb.
64
+ # * Work to File Set: (0..m) A work can have many file sets.
65
+ # @example Add a file set to a work (code from Hyrax::WorkUploadsHandler#append_to_work)
66
+ # work.member_ids << file_set.id
67
+ # work.representative_id = file_set.id if work.respond_to?(:representative_id) && work.representative_id.blank?
68
+ # work.thumbnail_id = file_set.id if work.respond_to?(:thumbnail_id) && work.thumbnail_id.blank?
69
+ # Hyrax.persister.save(resource: work)
70
+ # Hyrax.publisher.publish('object.metadata.updated', object: work, user: files.first.user)
71
+ # @example Get file sets:
72
+ # file_sets = Hyrax.custom_queries.find_child_file_sets(resource: work)
73
+ #
74
+ # * File Set to Work: (1..1) A file set must be in one and only one work.
75
+ # * See Hyrax::FileSet for code to get the work a file set is in.
76
+ #
77
+ # @see Hyrax::AdministrativeSet
78
+ # @see Hyrax::PcdmCollection
79
+ # @see Hyrax::FileSet
80
+ #
81
+ # @see Hyrax::CollectionMemberService
82
+ # @see Hyrax::Transactions::Steps::AddToParent
83
+ # @see Hyrax::Transactions::Steps::AddFileSets
84
+ # @see Hyrax::WorksControllerBehavior
85
+ # @see Hyrax::WorkUploadsHandler#append_to_work
86
+ #
87
+ # @see Valkyrie query adapter's #find_by
88
+ # @see Hyrax::CustomQueries::Navigators::CollectionMembers#find_collections_for
89
+ # @see Hyrax::CustomQueries::Navigators::ParentWorkNavigator#find_parent_work
90
+ # @see Hyrax::CustomQueries::Navigators::ChildFileSetsNavigator#find_child_file_sets
91
+ #
92
+ # @see /lib/hyrax/specs/shared_specs/hydra_works.rb
93
+ #
94
+ # @todo The description in Hydra::Works Shared Modeling is out of date and uses
95
+ # terminology to describe the relationships that is no longer used in code.
96
+ # Update the model and link to it. This can be a simple relationship diagram
97
+ # with a link to the original Works Shared Modeling for historical perspective.
7
98
  # @see https://wiki.lyrasis.org/display/samvera/Hydra::Works+Shared+Modeling
8
99
  class Work < Hyrax::Resource
9
100
  include Hyrax::Schema(:core_metadata)
@@ -94,7 +94,7 @@ class JobIoWrapper < ApplicationRecord
94
94
 
95
95
  def extracted_original_name
96
96
  eon = uploaded_file.uploader.filename if uploaded_file
97
- eon ||= File.basename(path) if path.present? # note: uploader.filename is `nil` with uncached remote files (e.g. AWSFile)
97
+ eon ||= File.basename(path) if path.present? # NOTE: uploader.filename is `nil` with uncached remote files (e.g. AWSFile)
98
98
  eon
99
99
  end
100
100
 
@@ -129,7 +129,7 @@ class ProxyDepositRequest < ActiveRecord::Base
129
129
 
130
130
  # @param [TrueClass,FalseClass] reset (false) if true, reset the access controls. This revokes edit access from the depositor
131
131
  def transfer!(reset = false)
132
- ContentDepositorChangeEventJob.perform_later(work, receiving_user, reset)
132
+ Hyrax::ChangeDepositorService.call(work, receiving_user, reset)
133
133
  fulfill!(status: ACCEPTED)
134
134
  end
135
135
 
@@ -2,8 +2,6 @@
2
2
  module Hyrax
3
3
  module Admin
4
4
  class RepositoryObjectPresenter
5
- include Blacklight::SearchHelper
6
-
7
5
  def as_json(*)
8
6
  counts.map do |k, v|
9
7
  { label: I18n.translate(k, scope: 'hyrax.admin.stats.repository_objects.series'),