hyrax 4.0.0.beta1 → 4.0.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (493) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +66 -54
  3. data/.dassie/.env +29 -0
  4. data/.dassie/Gemfile +1 -1
  5. data/.dassie/app/controllers/catalog_controller.rb +1 -1
  6. data/.dassie/config/initializers/hyrax.rb +4 -0
  7. data/.github/SUPPORT.md +2 -3
  8. data/.github/workflows/build.yml +79 -0
  9. data/.github/workflows/main.yml +4 -4
  10. data/.github/workflows/release.yml +10 -4
  11. data/{.env → .koppie/.env} +21 -11
  12. data/.koppie/.gitignore +48 -0
  13. data/.koppie/.rspec +2 -0
  14. data/.koppie/CODE_OF_CONDUCT.md +36 -0
  15. data/.koppie/CONTRIBUTING.md +192 -0
  16. data/.koppie/Gemfile +53 -0
  17. data/.koppie/LICENSE +205 -0
  18. data/.koppie/README.md +55 -0
  19. data/.koppie/Rakefile +8 -0
  20. data/.koppie/app/assets/config/manifest.js +5 -0
  21. data/.koppie/app/assets/images/.keep +0 -0
  22. data/.koppie/app/assets/images/unauthorized.png +0 -0
  23. data/.koppie/app/assets/images/us_404.svg +91 -0
  24. data/.koppie/app/assets/javascripts/application.js +30 -0
  25. data/.koppie/app/assets/javascripts/blacklight_gallery.js +1 -0
  26. data/.koppie/app/assets/javascripts/cable.js +13 -0
  27. data/.koppie/app/assets/javascripts/channels/.keep +0 -0
  28. data/.koppie/app/assets/javascripts/openseadragon.js +2 -0
  29. data/.koppie/app/assets/stylesheets/application.css +48 -0
  30. data/.koppie/app/assets/stylesheets/hyrax.scss +17 -0
  31. data/.koppie/app/assets/stylesheets/openseadragon.css +3 -0
  32. data/.koppie/app/channels/application_cable/channel.rb +4 -0
  33. data/.koppie/app/channels/application_cable/connection.rb +4 -0
  34. data/.koppie/app/controllers/application_controller.rb +13 -0
  35. data/.koppie/app/controllers/catalog_controller.rb +314 -0
  36. data/.koppie/app/controllers/concerns/.keep +0 -0
  37. data/.koppie/app/controllers/hyrax/generic_works_controller.rb +17 -0
  38. data/.koppie/app/controllers/hyrax/monographs_controller.rb +17 -0
  39. data/.koppie/app/forms/collection_resource_form.rb +7 -0
  40. data/.koppie/app/forms/generic_work_form.rb +20 -0
  41. data/.koppie/app/forms/monograph_form.rb +20 -0
  42. data/.koppie/app/helpers/application_helper.rb +2 -0
  43. data/.koppie/app/helpers/hyrax_helper.rb +6 -0
  44. data/.koppie/app/indexers/collection_resource_indexer.rb +7 -0
  45. data/.koppie/app/indexers/generic_work_indexer.rb +16 -0
  46. data/.koppie/app/indexers/monograph_indexer.rb +16 -0
  47. data/.koppie/app/jobs/application_job.rb +2 -0
  48. data/.koppie/app/mailers/application_mailer.rb +4 -0
  49. data/.koppie/app/models/ability.rb +25 -0
  50. data/.koppie/app/models/application_record.rb +3 -0
  51. data/.koppie/app/models/collection.rb +1 -0
  52. data/.koppie/app/models/collection_resource.rb +31 -0
  53. data/.koppie/app/models/concerns/.keep +0 -0
  54. data/.koppie/app/models/file_set.rb +4 -0
  55. data/.koppie/app/models/generic_work.rb +8 -0
  56. data/.koppie/app/models/monograph.rb +8 -0
  57. data/.koppie/app/models/qa/local_authority.rb +2 -0
  58. data/.koppie/app/models/qa/local_authority_entry.rb +3 -0
  59. data/.koppie/app/models/qa.rb +5 -0
  60. data/.koppie/app/models/search_builder.rb +16 -0
  61. data/.koppie/app/models/solr_document.rb +28 -0
  62. data/.koppie/app/models/user.rb +24 -0
  63. data/.koppie/app/views/hyrax/generic_works/_generic_work.html.erb +2 -0
  64. data/.koppie/app/views/hyrax/monographs/_monograph.html.erb +2 -0
  65. data/.koppie/app/views/layouts/application.html.erb +15 -0
  66. data/.koppie/app/views/layouts/mailer.html.erb +13 -0
  67. data/.koppie/app/views/layouts/mailer.text.erb +1 -0
  68. data/.koppie/bin/bundle +3 -0
  69. data/.koppie/bin/rails +9 -0
  70. data/.koppie/bin/rake +9 -0
  71. data/.koppie/bin/setup +36 -0
  72. data/.koppie/bin/spring +17 -0
  73. data/.koppie/bin/update +31 -0
  74. data/.koppie/bin/yarn +11 -0
  75. data/.koppie/config/analytics.yml +12 -0
  76. data/.koppie/config/application.rb +33 -0
  77. data/.koppie/config/authorities/licenses.yml +46 -0
  78. data/.koppie/config/authorities/resource_types.yml +41 -0
  79. data/.koppie/config/authorities/rights_statements.yml +37 -0
  80. data/.koppie/config/blacklight.yml +9 -0
  81. data/.koppie/config/boot.rb +4 -0
  82. data/.koppie/config/browse_everything_providers.yml +25 -0
  83. data/.koppie/config/cable.yml +12 -0
  84. data/.koppie/config/credentials.yml.enc +1 -0
  85. data/.koppie/config/database.yml +25 -0
  86. data/.koppie/config/environment.rb +5 -0
  87. data/.koppie/config/environments/development.rb +71 -0
  88. data/.koppie/config/environments/production.rb +97 -0
  89. data/.koppie/config/environments/test.rb +46 -0
  90. data/.koppie/config/initializers/1_valkyrie.rb +56 -0
  91. data/.koppie/config/initializers/application_controller_renderer.rb +8 -0
  92. data/.koppie/config/initializers/assets.rb +14 -0
  93. data/.koppie/config/initializers/backtrace_silencers.rb +7 -0
  94. data/.koppie/config/initializers/clamav.rb +2 -0
  95. data/.koppie/config/initializers/content_security_policy.rb +25 -0
  96. data/.koppie/config/initializers/cookies_serializer.rb +5 -0
  97. data/.koppie/config/initializers/devise.rb +311 -0
  98. data/.koppie/config/initializers/file_services.rb +4 -0
  99. data/.koppie/config/initializers/filter_parameter_logging.rb +4 -0
  100. data/.koppie/config/initializers/hydra_config.rb +24 -0
  101. data/.koppie/config/initializers/hyrax.rb +333 -0
  102. data/.koppie/config/initializers/inflections.rb +16 -0
  103. data/.koppie/config/initializers/mailboxer.rb +22 -0
  104. data/.koppie/config/initializers/mime_types.rb +8 -0
  105. data/.koppie/config/initializers/mini_magick.rb +6 -0
  106. data/.koppie/config/initializers/redis_config.rb +4 -0
  107. data/.koppie/config/initializers/riiif.rb +29 -0
  108. data/.koppie/config/initializers/simple_form.rb +171 -0
  109. data/.koppie/config/initializers/simple_form_bootstrap.rb +151 -0
  110. data/.koppie/config/initializers/wrap_parameters.rb +14 -0
  111. data/.koppie/config/locales/blacklight.en.yml +3 -0
  112. data/.koppie/config/locales/devise.en.yml +65 -0
  113. data/.koppie/config/locales/en.yml +33 -0
  114. data/.koppie/config/locales/hyrax.de.yml +58 -0
  115. data/.koppie/config/locales/hyrax.en.yml +58 -0
  116. data/.koppie/config/locales/hyrax.es.yml +58 -0
  117. data/.koppie/config/locales/hyrax.fr.yml +58 -0
  118. data/.koppie/config/locales/hyrax.it.yml +58 -0
  119. data/.koppie/config/locales/hyrax.pt-BR.yml +58 -0
  120. data/.koppie/config/locales/hyrax.zh.yml +58 -0
  121. data/.koppie/config/metadata/collection_resource.yaml +149 -0
  122. data/.koppie/config/metadata/generic_work.yaml +22 -0
  123. data/.koppie/config/metadata/monograph.yaml +55 -0
  124. data/.koppie/config/puma.rb +37 -0
  125. data/.koppie/config/redis.yml +12 -0
  126. data/.koppie/config/role_map.yml +48 -0
  127. data/.koppie/config/routes.rb +36 -0
  128. data/.koppie/config/sidekiq.yml +15 -0
  129. data/.koppie/config/solr.yml +7 -0
  130. data/.koppie/config/spring.rb +6 -0
  131. data/.koppie/config/storage.yml +34 -0
  132. data/.koppie/config/tinymce.yml +13 -0
  133. data/.koppie/config/uv/uv-config.json +3 -0
  134. data/.koppie/config/uv/uv.html +87 -0
  135. data/.koppie/config/valkyrie_index.yml +12 -0
  136. data/.koppie/config/workflows/default_workflow.json +21 -0
  137. data/.koppie/config/workflows/mediated_deposit_workflow.json +76 -0
  138. data/.koppie/config.ru +5 -0
  139. data/.koppie/db/migrate/20210911143430_create_searches.blacklight.rb +17 -0
  140. data/.koppie/db/migrate/20210911143431_create_bookmarks.blacklight.rb +19 -0
  141. data/.koppie/db/migrate/20210911143432_add_polymorphic_type_to_bookmarks.blacklight.rb +9 -0
  142. data/.koppie/db/migrate/20210911143452_devise_create_users.rb +44 -0
  143. data/.koppie/db/migrate/20210911143456_add_devise_guests_to_users.rb +15 -0
  144. data/.koppie/db/migrate/20210911143532_create_version_committers.hyrax.rb +15 -0
  145. data/.koppie/db/migrate/20210911143533_create_checksum_audit_logs.hyrax.rb +19 -0
  146. data/.koppie/db/migrate/20210911143534_create_single_use_links.hyrax.rb +12 -0
  147. data/.koppie/db/migrate/20210911143535_add_social_to_users.hyrax.rb +13 -0
  148. data/.koppie/db/migrate/20210911143536_add_ldap_attrs_to_user.hyrax.rb +27 -0
  149. data/.koppie/db/migrate/20210911143537_add_avatars_to_users.hyrax.rb +15 -0
  150. data/.koppie/db/migrate/20210911143538_create_trophies.hyrax.rb +10 -0
  151. data/.koppie/db/migrate/20210911143539_add_linkedin_to_users.hyrax.rb +5 -0
  152. data/.koppie/db/migrate/20210911143540_create_tinymce_assets.hyrax.rb +8 -0
  153. data/.koppie/db/migrate/20210911143541_create_content_blocks.hyrax.rb +10 -0
  154. data/.koppie/db/migrate/20210911143542_create_featured_works.hyrax.rb +12 -0
  155. data/.koppie/db/migrate/20210911143543_add_external_key_to_content_blocks.hyrax.rb +6 -0
  156. data/.koppie/db/migrate/20210911143544_create_proxy_deposit_rights.hyrax.rb +10 -0
  157. data/.koppie/db/migrate/20210911143545_create_proxy_deposit_requests.hyrax.rb +15 -0
  158. data/.koppie/db/migrate/20210911143546_create_file_view_stats.hyrax.rb +12 -0
  159. data/.koppie/db/migrate/20210911143547_create_file_download_stats.hyrax.rb +12 -0
  160. data/.koppie/db/migrate/20210911143548_add_orcid_to_users.hyrax.rb +5 -0
  161. data/.koppie/db/migrate/20210911143549_create_user_stats.hyrax.rb +19 -0
  162. data/.koppie/db/migrate/20210911143550_create_work_view_stats.hyrax.rb +12 -0
  163. data/.koppie/db/migrate/20210911143551_add_works_to_user_stats.hyrax.rb +13 -0
  164. data/.koppie/db/migrate/20210911143552_change_trophy_generic_file_id_to_work_id.hyrax.rb +5 -0
  165. data/.koppie/db/migrate/20210911143553_change_proxy_deposit_generic_file_id_to_work_id.hyrax.rb +5 -0
  166. data/.koppie/db/migrate/20210911143554_change_audit_log_generic_file_id_to_file_set_id.hyrax.rb +5 -0
  167. data/.koppie/db/migrate/20210911143555_change_proxy_deposit_request_generic_file_id_to_work_id.hyrax.rb +5 -0
  168. data/.koppie/db/migrate/20210911143556_create_uploaded_files.hyrax.rb +10 -0
  169. data/.koppie/db/migrate/20210911143557_create_features.hyrax.rb +10 -0
  170. data/.koppie/db/migrate/20210911143558_create_operations.hyrax.rb +23 -0
  171. data/.koppie/db/migrate/20210911143559_change_featured_work_generic_file_id_to_work_id.hyrax.rb +6 -0
  172. data/.koppie/db/migrate/20210911143560_add_arkivo_to_users.hyrax.rb +8 -0
  173. data/.koppie/db/migrate/20210911143561_create_sipity.hyrax.rb +163 -0
  174. data/.koppie/db/migrate/20210911143562_create_sipity_workflow_methods.hyrax.rb +10 -0
  175. data/.koppie/db/migrate/20210911143563_create_permission_template.hyrax.rb +11 -0
  176. data/.koppie/db/migrate/20210911143564_create_permission_template_access.hyrax.rb +11 -0
  177. data/.koppie/db/migrate/20210911143565_add_release_to_permission_templates.hyrax.rb +6 -0
  178. data/.koppie/db/migrate/20210911143566_add_permission_template_to_sipity_workflow.hyrax.rb +26 -0
  179. data/.koppie/db/migrate/20210911143567_tidy_up_because_of_bad_exception.hyrax.rb +13 -0
  180. data/.koppie/db/migrate/20210911143568_add_allows_access_grant_to_workflow.hyrax.rb +5 -0
  181. data/.koppie/db/migrate/20210911143569_change_checksum_audit_log.hyrax.rb +18 -0
  182. data/.koppie/db/migrate/20210911143570_create_job_io_wrappers.hyrax.rb +15 -0
  183. data/.koppie/db/migrate/20210911143571_create_collection_types.hyrax.rb +17 -0
  184. data/.koppie/db/migrate/20210911143572_update_collection_type_column_names.hyrax.rb +9 -0
  185. data/.koppie/db/migrate/20210911143573_update_collection_type_column_options.hyrax.rb +17 -0
  186. data/.koppie/db/migrate/20210911143574_create_collection_branding_infos.hyrax.rb +15 -0
  187. data/.koppie/db/migrate/20210911143575_create_collection_type_participants.hyrax.rb +11 -0
  188. data/.koppie/db/migrate/20210911143576_rename_admin_set_id_to_source_id.hyrax.rb +5 -0
  189. data/.koppie/db/migrate/20210911143577_add_preferred_locale_to_users.hyrax.rb +5 -0
  190. data/.koppie/db/migrate/20210911143578_add_collection_type_sharing_options.hyrax.rb +5 -0
  191. data/.koppie/db/migrate/20210911143579_add_unique_constraint_to_permission_template_accesses.hyrax.rb +8 -0
  192. data/.koppie/db/migrate/20210911143580_add_branding_to_collection_type.hyrax.rb +5 -0
  193. data/.koppie/db/migrate/20210911143581_add_badge_color_to_collection_types.hyrax.rb +5 -0
  194. data/.koppie/db/migrate/20210911143582_update_single_use_links_column_names.hyrax.rb +6 -0
  195. data/.koppie/db/migrate/20210911143583_change_sipity_entity_specific_responsibility.hyrax.rb +9 -0
  196. data/.koppie/db/migrate/20210911143584_create_mailboxer.mailboxer_engine.rb +65 -0
  197. data/.koppie/db/migrate/20210911143585_add_conversation_optout.mailboxer_engine.rb +15 -0
  198. data/.koppie/db/migrate/20210911143586_add_missing_indices.mailboxer_engine.rb +20 -0
  199. data/.koppie/db/migrate/20210911143587_add_delivery_tracking_info_to_mailboxer_receipts.mailboxer_engine.rb +8 -0
  200. data/.koppie/db/migrate/20210911143588_create_qa_local_authorities.rb +10 -0
  201. data/.koppie/db/migrate/20210911143602_create_qa_local_authority_entries.rb +12 -0
  202. data/.koppie/db/migrate/20210911143623_create_minter_states.noid_rails_engine.rb +17 -0
  203. data/.koppie/db/migrate/20210911143624_rename_minter_state_random_to_rand.noid_rails_engine.rb +8 -0
  204. data/.koppie/db/migrate/20210921150120_enable_uuid_extension.valkyrie_engine.rb +7 -0
  205. data/.koppie/db/migrate/20210921150121_create_orm_resources.valkyrie_engine.rb +19 -0
  206. data/.koppie/db/migrate/20210921150122_add_model_type_to_orm_resources.valkyrie_engine.rb +7 -0
  207. data/.koppie/db/migrate/20210921150123_change_model_type_to_internal_model.valkyrie_engine.rb +7 -0
  208. data/.koppie/db/migrate/20210921150124_create_path_gin_index.valkyrie_engine.rb +7 -0
  209. data/.koppie/db/migrate/20210921150125_create_internal_resource_index.valkyrie_engine.rb +7 -0
  210. data/.koppie/db/migrate/20210921150126_create_updated_at_index.valkyrie_engine.rb +7 -0
  211. data/.koppie/db/migrate/20210921150127_add_optimistic_locking_to_orm_resources.valkyrie_engine.rb +7 -0
  212. data/.koppie/db/migrate/20211021161136_user_roles.rb +20 -0
  213. data/.koppie/db/migrate/20211207172259_create_default_administrative_set.hyrax.rb +8 -0
  214. data/.koppie/db/schema.rb +595 -0
  215. data/.koppie/db/seeds.rb +79 -0
  216. data/.koppie/lib/assets/.keep +0 -0
  217. data/.koppie/lib/tasks/.keep +0 -0
  218. data/.koppie/log/.keep +0 -0
  219. data/.koppie/package.json +15 -0
  220. data/.koppie/public/404.html +67 -0
  221. data/.koppie/public/422.html +67 -0
  222. data/.koppie/public/500.html +66 -0
  223. data/.koppie/public/apple-touch-icon-precomposed.png +0 -0
  224. data/.koppie/public/apple-touch-icon.png +0 -0
  225. data/.koppie/public/branding/.keep +0 -0
  226. data/.koppie/public/favicon.ico +0 -0
  227. data/.koppie/public/robots.txt +1 -0
  228. data/.koppie/scripts/db-migrate-seed.sh +9 -0
  229. data/.koppie/scripts/entrypoint.sh +10 -0
  230. data/.koppie/solr/conf/_rest_managed.json +3 -0
  231. data/.koppie/solr/conf/admin-extra.html +31 -0
  232. data/.koppie/solr/conf/elevate.xml +36 -0
  233. data/.koppie/solr/conf/mapping-ISOLatin1Accent.txt +246 -0
  234. data/.koppie/solr/conf/protwords.txt +21 -0
  235. data/.koppie/solr/conf/schema.xml +367 -0
  236. data/.koppie/solr/conf/scripts.conf +24 -0
  237. data/.koppie/solr/conf/solrconfig.xml +325 -0
  238. data/.koppie/solr/conf/spellings.txt +2 -0
  239. data/.koppie/solr/conf/stopwords.txt +58 -0
  240. data/.koppie/solr/conf/stopwords_en.txt +58 -0
  241. data/.koppie/solr/conf/synonyms.txt +31 -0
  242. data/.koppie/solr/conf/xslt/example.xsl +132 -0
  243. data/.koppie/solr/conf/xslt/example_atom.xsl +67 -0
  244. data/.koppie/solr/conf/xslt/example_rss.xsl +66 -0
  245. data/.koppie/solr/conf/xslt/luke.xsl +337 -0
  246. data/.koppie/solr/sample_solr_documents.yml +2692 -0
  247. data/.koppie/spec/forms/collection_resource_form_spec.rb +13 -0
  248. data/.koppie/spec/indexers/collection_resource_indexer_spec.rb +14 -0
  249. data/.koppie/spec/indexers/generic_work_indexer_spec.rb +13 -0
  250. data/.koppie/spec/indexers/monograph_indexer_spec.rb +13 -0
  251. data/.koppie/spec/models/collection_resource_spec.rb +13 -0
  252. data/.koppie/spec/models/collection_spec.rb +17 -0
  253. data/.koppie/spec/models/file_set_spec.rb +15 -0
  254. data/.koppie/spec/models/generic_work_spec.rb +13 -0
  255. data/.koppie/spec/models/monograph_spec.rb +13 -0
  256. data/.koppie/spec/models/qa/local_authority_entry_spec.rb +5 -0
  257. data/.koppie/spec/models/qa/local_authority_spec.rb +5 -0
  258. data/.koppie/spec/rails_helper.rb +47 -0
  259. data/.koppie/spec/spec_helper.rb +19 -0
  260. data/.koppie/spec/views/generic_works/_generic_work.html.erb_spec.rb +7 -0
  261. data/.koppie/spec/views/monographs/_monograph.html.erb_spec.rb +7 -0
  262. data/.koppie/storage/.keep +0 -0
  263. data/.koppie/vendor/.keep +0 -0
  264. data/.koppie/yarn.lock +1497 -0
  265. data/CONTAINERS.md +56 -12
  266. data/CONTRIBUTING.md +2 -2
  267. data/Dockerfile +29 -13
  268. data/README.md +24 -97
  269. data/app/actors/hyrax/actors/collections_membership_actor.rb +1 -2
  270. data/app/actors/hyrax/actors/create_with_files_actor.rb +1 -1
  271. data/app/actors/hyrax/actors/create_with_remote_files_actor.rb +2 -2
  272. data/app/actors/hyrax/actors/embargo_actor.rb +11 -4
  273. data/app/actors/hyrax/actors/lease_actor.rb +11 -4
  274. data/app/assets/javascripts/hyrax/app.js.erb +1 -1
  275. data/app/assets/javascripts/hyrax/permissions/control.es6 +8 -1
  276. data/app/assets/stylesheets/hyrax/_catalog.scss +4 -0
  277. data/app/assets/stylesheets/hyrax/_forms.scss +4 -0
  278. data/app/assets/stylesheets/hyrax/dashboard.scss +5 -62
  279. data/app/components/hyrax/dropdown_facet_field_component.html.erb +21 -0
  280. data/app/components/hyrax/dropdown_facet_field_component.rb +30 -0
  281. data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +6 -9
  282. data/app/controllers/concerns/hyrax/controller.rb +1 -23
  283. data/app/controllers/concerns/hyrax/embargoes_controller_behavior.rb +11 -2
  284. data/app/controllers/concerns/hyrax/leases_controller_behavior.rb +11 -2
  285. data/app/controllers/concerns/hyrax/manages_embargoes.rb +13 -1
  286. data/app/controllers/concerns/hyrax/works_controller_behavior.rb +5 -2
  287. data/app/controllers/hyrax/dashboard/collection_members_controller.rb +0 -1
  288. data/app/controllers/hyrax/dashboard/collections_controller.rb +5 -8
  289. data/app/controllers/hyrax/downloads_controller.rb +16 -1
  290. data/app/controllers/hyrax/file_sets_controller.rb +10 -2
  291. data/app/controllers/hyrax/my/collections_controller.rb +1 -0
  292. data/app/controllers/hyrax/my/works_controller.rb +4 -2
  293. data/app/controllers/hyrax/permissions_controller.rb +1 -1
  294. data/app/controllers/hyrax/transfers_controller.rb +4 -3
  295. data/app/controllers/hyrax/workflow_actions_controller.rb +3 -2
  296. data/app/forms/hyrax/forms/batch_upload_form.rb +1 -1
  297. data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb +4 -18
  298. data/app/forms/hyrax/forms/embargo.rb +13 -0
  299. data/app/forms/hyrax/forms/file_set_edit_form.rb +1 -1
  300. data/app/forms/hyrax/forms/file_set_form.rb +8 -35
  301. data/app/forms/hyrax/forms/lease.rb +13 -0
  302. data/app/forms/hyrax/forms/pcdm_object_form.rb +46 -0
  303. data/app/forms/hyrax/forms/resource_form.rb +36 -32
  304. data/app/forms/hyrax/forms/work_embargo_form.rb +35 -0
  305. data/app/forms/hyrax/forms/work_form.rb +2 -2
  306. data/app/forms/hyrax/forms/work_lease_form.rb +35 -0
  307. data/app/helpers/hyrax/collections_helper.rb +4 -32
  308. data/app/helpers/hyrax/embargo_helper.rb +11 -0
  309. data/app/helpers/hyrax/facets_helper.rb +0 -140
  310. data/app/helpers/hyrax/hyrax_helper_behavior.rb +16 -1
  311. data/app/helpers/hyrax/lease_helper.rb +11 -0
  312. data/app/helpers/hyrax/work_form_helper.rb +107 -0
  313. data/app/indexers/hyrax/deep_indexing_service.rb +2 -2
  314. data/app/indexers/hyrax/pcdm_collection_indexer.rb +1 -0
  315. data/app/indexers/hyrax/valkyrie_file_set_indexer.rb +2 -8
  316. data/app/indexers/hyrax/valkyrie_work_indexer.rb +21 -0
  317. data/app/jobs/characterize_job.rb +9 -4
  318. data/app/jobs/import_url_job.rb +2 -2
  319. data/app/jobs/valkyrie_create_derivatives_job.rb +0 -2
  320. data/app/models/admin_set.rb +8 -0
  321. data/app/models/concerns/hyrax/ability.rb +3 -3
  322. data/app/models/concerns/hyrax/collection_behavior.rb +3 -48
  323. data/app/models/concerns/hyrax/file_set_behavior.rb +1 -0
  324. data/app/models/concerns/hyrax/naming.rb +1 -1
  325. data/app/models/concerns/hyrax/solr_document/metadata.rb +1 -0
  326. data/app/models/concerns/hyrax/suppressible.rb +0 -8
  327. data/app/models/concerns/hyrax/work_behavior.rb +0 -1
  328. data/app/models/file_download_stat.rb +5 -5
  329. data/app/models/hyrax/collection_type.rb +9 -17
  330. data/app/models/hyrax/embargo.rb +1 -1
  331. data/app/models/hyrax/file_metadata.rb +5 -12
  332. data/app/models/hyrax/file_set.rb +3 -11
  333. data/app/models/hyrax/lease.rb +1 -1
  334. data/app/models/hyrax/statistic.rb +5 -5
  335. data/app/models/hyrax/work.rb +2 -2
  336. data/app/models/proxy_deposit_request.rb +1 -1
  337. data/app/models/sipity.rb +35 -14
  338. data/app/presenters/hyrax/admin_set_presenter.rb +5 -0
  339. data/app/presenters/hyrax/collection_presenter.rb +1 -1
  340. data/app/presenters/hyrax/displays_image.rb +1 -1
  341. data/app/presenters/hyrax/iiif_manifest_presenter.rb +14 -4
  342. data/app/presenters/hyrax/pcdm_member_presenter_factory.rb +1 -1
  343. data/app/presenters/hyrax/permission_badge.rb +3 -2
  344. data/app/presenters/hyrax/presenter_renderer.rb +1 -1
  345. data/app/presenters/hyrax/presents_attributes.rb +1 -1
  346. data/app/presenters/hyrax/version_list_presenter.rb +6 -1
  347. data/app/presenters/hyrax/work_show_presenter.rb +4 -1
  348. data/app/presenters/hyrax/workflow_presenter.rb +1 -1
  349. data/app/search_builders/hyrax/collection_search_builder.rb +1 -0
  350. data/app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb +7 -67
  351. data/app/search_builders/hyrax/filter_suppressed_with_roles.rb +1 -1
  352. data/app/services/hyrax/admin_set_create_service.rb +2 -2
  353. data/app/services/hyrax/admin_set_service.rb +1 -1
  354. data/app/services/hyrax/analytics/google.rb +1 -1
  355. data/app/services/hyrax/analytics/matomo.rb +1 -1
  356. data/app/services/hyrax/collection_member_service.rb +2 -0
  357. data/app/services/hyrax/collection_types/create_service.rb +1 -1
  358. data/app/services/hyrax/collections/migration_service.rb +8 -8
  359. data/app/services/hyrax/collections/nested_collection_query_service.rb +3 -113
  360. data/app/services/hyrax/database_migrator.rb +1 -1
  361. data/app/services/hyrax/derivative_service.rb +37 -4
  362. data/app/services/hyrax/edit_permissions_service.rb +22 -17
  363. data/app/services/hyrax/embargo_manager.rb +9 -0
  364. data/app/services/hyrax/embargo_service.rb +4 -0
  365. data/app/services/hyrax/file_set_file_service.rb +55 -0
  366. data/app/services/hyrax/lease_manager.rb +9 -0
  367. data/app/services/hyrax/lease_service.rb +4 -0
  368. data/app/services/hyrax/listeners/file_metadata_listener.rb +11 -0
  369. data/app/services/hyrax/listeners/workflow_listener.rb +2 -2
  370. data/app/services/hyrax/local_file_service.rb +3 -1
  371. data/app/services/hyrax/restriction_service.rb +1 -1
  372. data/app/services/hyrax/solr_query_service.rb +10 -2
  373. data/app/services/hyrax/solr_service.rb +22 -16
  374. data/app/services/hyrax/statistics/depositors/summary.rb +1 -1
  375. data/app/services/hyrax/statistics/term_query.rb +1 -1
  376. data/app/services/hyrax/thumbnail_path_service.rb +11 -3
  377. data/app/services/hyrax/user_stat_importer.rb +4 -2
  378. data/app/services/hyrax/valkyrie_persist_derivatives.rb +26 -15
  379. data/app/services/hyrax/valkyrie_upload.rb +24 -31
  380. data/app/services/hyrax/versioning_service.rb +78 -10
  381. data/app/services/hyrax/visibility_map.rb +10 -2
  382. data/app/services/hyrax/visibility_propagator.rb +5 -5
  383. data/app/services/hyrax/work_resource_query_service.rb +45 -0
  384. data/app/services/hyrax/workflow/action_taken_service.rb +4 -4
  385. data/app/services/hyrax/workflow/notification_service.rb +2 -2
  386. data/app/services/hyrax/workflow/status_list_service.rb +1 -1
  387. data/app/services/hyrax/workflow/workflow_importer.rb +2 -2
  388. data/app/services/hyrax/working_directory.rb +3 -3
  389. data/app/services/hyrax/works/migration_service.rb +3 -3
  390. data/app/utils/hyrax/test_data_seeders/user_seeder.rb +3 -2
  391. data/app/validators/hyrax/collection_membership_validator.rb +2 -2
  392. data/app/views/hyrax/admin/analytics/work_reports/show.html.erb +6 -6
  393. data/app/views/hyrax/base/_attribute_rows.html.erb +2 -0
  394. data/app/views/hyrax/base/_form_collections_error.html.erb +1 -1
  395. data/app/views/hyrax/base/_form_in_works_error.html.erb +1 -1
  396. data/app/views/hyrax/base/_form_ordered_members_error.html.erb +1 -1
  397. data/app/views/hyrax/base/_form_progress.html.erb +1 -1
  398. data/app/views/hyrax/base/_form_visibility_component.html.erb +5 -1
  399. data/app/views/hyrax/base/_form_visibility_error.html.erb +19 -5
  400. data/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb +1 -1
  401. data/app/views/hyrax/embargoes/edit.html.erb +4 -4
  402. data/app/views/hyrax/file_sets/_permission.html.erb +1 -1
  403. data/app/views/hyrax/file_sets/_permission_form.html.erb +1 -6
  404. data/app/views/hyrax/file_sets/edit.html.erb +2 -2
  405. data/app/views/hyrax/file_sets/media_display/_audio.html.erb +1 -1
  406. data/app/views/hyrax/file_sets/media_display/_default.html.erb +1 -1
  407. data/app/views/hyrax/file_sets/media_display/_image.html.erb +1 -1
  408. data/app/views/hyrax/file_sets/media_display/_office_document.html.erb +1 -1
  409. data/app/views/hyrax/file_sets/media_display/_pdf.html.erb +1 -1
  410. data/app/views/hyrax/file_sets/media_display/_video.html.erb +1 -1
  411. data/app/views/hyrax/leases/edit.html.erb +3 -3
  412. data/app/views/hyrax/my/collections/_facets.html.erb +7 -5
  413. data/app/views/hyrax/my/works/_facets.html.erb +6 -2
  414. data/app/views/hyrax/transfers/_received.html.erb +1 -1
  415. data/app/views/hyrax/transfers/_sent.html.erb +1 -1
  416. data/app/views/hyrax/transfers/new.html.erb +1 -1
  417. data/app/views/hyrax/uploads/_js_templates.html.erb +8 -8
  418. data/app/views/hyrax/uploads/_js_templates_branding.html.erb +2 -2
  419. data/app/views/hyrax/users/_vitals.html.erb +4 -4
  420. data/chart/hyrax/Chart.yaml +7 -7
  421. data/chart/hyrax/README.md +5 -0
  422. data/chart/hyrax/templates/_helpers.tpl +19 -7
  423. data/chart/hyrax/templates/configmap-env.yaml +1 -1
  424. data/chart/hyrax/templates/cron-embargo.yaml +1 -1
  425. data/chart/hyrax/templates/cron-lease.yaml +1 -1
  426. data/chart/hyrax/templates/deployment-worker.yaml +2 -2
  427. data/chart/hyrax/templates/extra-list.yaml +8 -0
  428. data/chart/hyrax/templates/secrets.yaml +3 -3
  429. data/chart/hyrax/values.yaml +23 -15
  430. data/config/features.rb +1 -1
  431. data/config/initializers/reform_rails_6_1_monkey_patch.rb +27 -0
  432. data/config/locales/hyrax.de.yml +9 -8
  433. data/config/locales/hyrax.en.yml +3 -0
  434. data/config/locales/hyrax.es.yml +8 -7
  435. data/config/locales/hyrax.fr.yml +10 -9
  436. data/config/locales/hyrax.it.yml +8 -7
  437. data/config/locales/hyrax.pt-BR.yml +8 -7
  438. data/config/locales/hyrax.zh.yml +9 -8
  439. data/config/metadata/basic_metadata.yaml +2 -0
  440. data/config/metadata/file_set_metadata.yaml +130 -0
  441. data/docker-compose-koppie.yml +163 -0
  442. data/docker-compose.yml +0 -3
  443. data/documentation/MAINTENANCE.md +77 -0
  444. data/documentation/developing-your-hyrax-based-app.md +2 -2
  445. data/documentation/legacyREADME.md +3 -3
  446. data/hyrax.gemspec +9 -8
  447. data/lib/generators/hyrax/install_generator.rb +4 -4
  448. data/lib/generators/hyrax/templates/catalog_controller.rb +1 -3
  449. data/lib/generators/hyrax/templates/config/initializers/hyrax.rb +8 -1
  450. data/lib/generators/hyrax/templates/config/initializers/riiif.rb +1 -1
  451. data/lib/hyrax/active_fedora_dummy_model.rb +13 -0
  452. data/lib/hyrax/configuration.rb +30 -15
  453. data/lib/hyrax/controlled_vocabulary/importer/language.rb +1 -1
  454. data/lib/hyrax/engine.rb +6 -3
  455. data/lib/hyrax/errors.rb +2 -0
  456. data/lib/hyrax/publisher.rb +4 -0
  457. data/lib/hyrax/search_state.rb +9 -0
  458. data/lib/hyrax/specs/capybara.rb +2 -2
  459. data/lib/hyrax/specs/shared_specs/factories/strategies/json_strategy.rb +4 -0
  460. data/lib/hyrax/specs/shared_specs/factories/strategies/valkyrie_resource.rb +10 -0
  461. data/lib/hyrax/specs/shared_specs/indexers.rb +5 -0
  462. data/lib/hyrax/transactions/container.rb +0 -2
  463. data/lib/hyrax/transactions/steps/remove_file_set_from_work.rb +29 -3
  464. data/lib/hyrax/transactions/steps/save_access_control.rb +17 -1
  465. data/lib/hyrax/transactions/steps/save_collection_banner.rb +1 -1
  466. data/lib/hyrax/transactions/steps/save_collection_logo.rb +1 -1
  467. data/lib/hyrax/version.rb +1 -1
  468. data/lib/hyrax.rb +1 -1
  469. data/lib/tasks/migrate.rake +5 -1
  470. data/lib/valkyrie/indexing/solr/indexing_adapter.rb +1 -1
  471. data/lib/wings/active_fedora_converter/file_metadata_node.rb +1 -1
  472. data/lib/wings/valkyrie/storage.rb +6 -2
  473. data/samvera-fall-TM3.svg +376 -0
  474. data/tasks/benchmark.rake +1 -1
  475. data/tasks/hyrax_dev.rake +0 -32
  476. data/template.rb +1 -1
  477. metadata +326 -65
  478. data/app/conversions/power_converters/polymorphic_type.rb +0 -9
  479. data/app/conversions/power_converters/sipity_action.rb +0 -11
  480. data/app/conversions/power_converters/sipity_action_name.rb +0 -10
  481. data/app/conversions/power_converters/sipity_agent.rb +0 -9
  482. data/app/conversions/power_converters/sipity_entity.rb +0 -14
  483. data/app/conversions/power_converters/sipity_role.rb +0 -10
  484. data/app/conversions/power_converters/sipity_workflow_id.rb +0 -17
  485. data/app/conversions/power_converters/sipity_workflow_state.rb +0 -13
  486. data/app/conversions/power_converters.rb +0 -7
  487. data/app/indexers/hyrax/repository_reindexer.rb +0 -19
  488. data/app/models/concerns/hyrax/collection_nesting.rb +0 -73
  489. data/app/services/hyrax/adapters/nesting_index_adapter.rb +0 -193
  490. data/app/views/hyrax/my/_facet_layout.html.erb +0 -7
  491. data/app/views/hyrax/my/_facet_limit.html.erb +0 -15
  492. data/app/views/hyrax/my/_facet_pivot.html.erb +0 -26
  493. data/config/initializers/nesting_indexer_initializer.rb +0 -16
@@ -1,6 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
  require 'hyrax/role_registry'
3
- require 'samvera/nesting_indexer'
4
3
 
5
4
  module Hyrax
6
5
  ##
@@ -65,12 +64,24 @@ module Hyrax
65
64
  @registered_concerns = []
66
65
  @role_registry = Hyrax::RoleRegistry.new
67
66
  @default_active_workflow_name = DEFAULT_ACTIVE_WORKFLOW_NAME
68
- @nested_relationship_reindexer = default_nested_relationship_reindexer
69
67
  end
70
68
 
71
69
  DEFAULT_ACTIVE_WORKFLOW_NAME = 'default'
72
70
  private_constant :DEFAULT_ACTIVE_WORKFLOW_NAME
73
71
 
72
+ # Set the default logger for Hyrax.
73
+ attr_writer :logger
74
+
75
+ ##
76
+ # @return [Logger]
77
+ def logger
78
+ @logger ||= if defined?(Rails)
79
+ Rails.logger
80
+ else
81
+ Valkyrie.logger
82
+ end
83
+ end
84
+
74
85
  # @api public
75
86
  # When an admin set is created, we need to activate a workflow.
76
87
  # The :default_active_workflow_name is the name of the workflow we will activate.
@@ -643,7 +654,7 @@ module Hyrax
643
654
  # overriding the value in0 their config unless it's already
644
655
  # flipped to false
645
656
  if ENV.fetch('SERVER_SOFTWARE', '').match(/Apache.*Phusion_Passenger/).present?
646
- Rails.logger.warn('Cannot enable realtime notifications atop Passenger + Apache. Coercing `Hyrax.config.realtime_notifications` to `false`. Set this value to `false` in config/initializers/hyrax.rb to stop seeing this warning.') unless @realtime_notifications == false
657
+ Hyrax.logger.warn('Cannot enable realtime notifications atop Passenger + Apache. Coercing `Hyrax.config.realtime_notifications` to `false`. Set this value to `false` in config/initializers/hyrax.rb to stop seeing this warning.') unless @realtime_notifications == false
647
658
  @realtime_notifications = false
648
659
  end
649
660
  return @realtime_notifications unless @realtime_notifications.nil?
@@ -827,18 +838,7 @@ module Hyrax
827
838
 
828
839
  attr_writer :uploader
829
840
  def uploader
830
- @uploader ||= if Rails.env.development?
831
- # use sequential uploads in development to avoid database locking problems with sqlite3.
832
- default_uploader_config.merge(limitConcurrentUploads: 1, sequentialUploads: true)
833
- else
834
- default_uploader_config
835
- end
836
- end
837
-
838
- attr_accessor :nested_relationship_reindexer
839
-
840
- def default_nested_relationship_reindexer
841
- ->(id:, extent:) { Samvera::NestingIndexer.reindex_relationships(id: id, extent: extent) }
841
+ @uploader ||= default_uploader_config
842
842
  end
843
843
 
844
844
  attr_writer :solr_select_path
@@ -846,6 +846,11 @@ module Hyrax
846
846
  @solr_select_path ||= ActiveFedora.solr_config.fetch(:select_path, 'select')
847
847
  end
848
848
 
849
+ attr_writer :solr_default_method
850
+ def solr_default_method
851
+ @solr_default_method ||= :post
852
+ end
853
+
849
854
  attr_writer :identifier_registrars
850
855
  def identifier_registrars
851
856
  @identifier_registrars ||= {}
@@ -865,6 +870,16 @@ module Hyrax
865
870
  @range_for_number_of_results_to_display_per_page ||= [10, 20, 50, 100]
866
871
  end
867
872
 
873
+ attr_writer :derivative_services
874
+ # The registered candidate derivative services. In the array, the first `valid?` candidate will
875
+ # handle the derivative generation.
876
+ #
877
+ # @return [Array] of objects that conform to Hyrax::DerivativeService interface.
878
+ # @see Hyrax::DerivativeService
879
+ def derivative_services
880
+ @derivative_services ||= [Hyrax::FileSetDerivativesService]
881
+ end
882
+
868
883
  private
869
884
 
870
885
  # @param [Symbol, #to_s] model_name - symbol representing the model
@@ -13,7 +13,7 @@ module Hyrax
13
13
  stdout_logger.formatter = proc do |_severity, _datetime, _progname, msg|
14
14
  "#{msg}\n"
15
15
  end
16
- Rails.logger.extend(ActiveSupport::Logger.broadcast(stdout_logger))
16
+ Hyrax.logger.extend(ActiveSupport::Logger.broadcast(stdout_logger))
17
17
  end
18
18
 
19
19
  def import
data/lib/hyrax/engine.rb CHANGED
@@ -68,7 +68,7 @@ module Hyrax
68
68
 
69
69
  can_persist = can_connect && begin
70
70
  Hyrax.config.persist_registered_roles!
71
- Rails.logger.info("Hyrax::Engine.after_initialize - persisting registered roles!")
71
+ Hyrax.logger.info("Hyrax::Engine.after_initialize - persisting registered roles!")
72
72
  true
73
73
  rescue ActiveRecord::StatementInvalid
74
74
  false
@@ -78,12 +78,15 @@ module Hyrax
78
78
  message = "Hyrax::Engine.after_initialize - unable to persist registered roles.\n"
79
79
  message += "It is expected during the application installation - during integration tests, rails install.\n"
80
80
  message += "It is UNEXPECTED if you are booting up a Hyrax powered application via `rails server'"
81
- Rails.logger.info(message)
81
+ Hyrax.logger.info(message)
82
82
  end
83
+
84
+ # Force CatalogController to use our SearchState class, which has an important
85
+ # work-around for some highly suspect SPARQL-gem monkeypatching.
86
+ CatalogController.search_state_class = Hyrax::SearchState if CatalogController.try(:search_state_class) == Blacklight::SearchState
83
87
  end
84
88
 
85
89
  initializer 'requires' do
86
- require 'power_converters'
87
90
  require 'wings' unless Hyrax.config.disable_wings
88
91
  end
89
92
 
data/lib/hyrax/errors.rb CHANGED
@@ -15,4 +15,6 @@ module Hyrax
15
15
  class SingleMembershipError < HyraxError; end
16
16
 
17
17
  class ObjectNotFoundError < ActiveFedora::ObjectNotFoundError; end
18
+
19
+ class ModelMismatchError < HyraxError; end
18
20
  end
@@ -119,6 +119,10 @@ module Hyrax
119
119
  # unique id), AND a `:user` (the ::User responsible for the update).
120
120
  register_event('collection.membership.updated')
121
121
 
122
+ # @since 3.5.0
123
+ # @macro a_registered_event
124
+ register_event('file.characterized')
125
+
122
126
  # @since 3.3.0
123
127
  # @macro a_registered_event
124
128
  register_event('file.downloaded')
@@ -9,5 +9,14 @@ module Hyrax
9
9
  return [hyrax, doc] if doc.collection?
10
10
  [main_app, doc]
11
11
  end
12
+
13
+ # The SPARQL gem stomps on the Rails definition of deep_dup and gives us a Hash instead of
14
+ # a HashWithIndifferentAccess. This is an ugly workaround to get the right contract with
15
+ # the upstream class.
16
+ # https://github.com/ruby-rdf/sparql/blob/develop/lib/sparql/algebra/extensions.rb#L238-L244
17
+ def to_hash
18
+ super.with_indifferent_access
19
+ end
20
+ alias to_h to_hash
12
21
  end
13
22
  end
@@ -23,12 +23,12 @@ if ENV['IN_DOCKER'].present? || ENV['HUB_URL'].present?
23
23
  args = %w[disable-gpu no-sandbox whitelisted-ips window-size=1400,1400]
24
24
  args.push('headless') if ActiveModel::Type::Boolean.new.cast(ENV['CHROME_HEADLESS_MODE'])
25
25
 
26
- capabilities = Selenium::WebDriver::Remote::Capabilities.chrome("goog:chromeOptions" => { args: args })
26
+ options = Selenium::WebDriver::Options.chrome("goog:chromeOptions" => { args: args })
27
27
 
28
28
  Capybara.register_driver :selenium_chrome_headless_sandboxless do |app|
29
29
  driver = Capybara::Selenium::Driver.new(app,
30
30
  browser: :remote,
31
- desired_capabilities: capabilities,
31
+ capabilities: options,
32
32
  url: ENV['HUB_URL'])
33
33
 
34
34
  # Fix for capybara vs remote files. Selenium handles this for us
@@ -10,4 +10,8 @@ class JsonStrategy
10
10
  def result(evaluation)
11
11
  @strategy.result(evaluation).to_json
12
12
  end
13
+
14
+ def to_sym
15
+ :json
16
+ end
13
17
  end
@@ -3,6 +3,12 @@
3
3
  # @example
4
4
  # let(:resource) { FactoryBot.valkyrie_create(:hyrax_work) }
5
5
  class ValkyrieCreateStrategy
6
+ def initialize
7
+ @strategy = FactoryBot.strategy_by_name(:create).new
8
+ end
9
+
10
+ delegate :association, to: :@strategy
11
+
6
12
  def result(evaluation)
7
13
  evaluation.notify(:after_build, evaluation.object)
8
14
  evaluation.notify(:before_create, evaluation.object)
@@ -13,6 +19,10 @@ class ValkyrieCreateStrategy
13
19
  result
14
20
  end
15
21
 
22
+ def to_sym
23
+ :valkyrie_create
24
+ end
25
+
16
26
  private
17
27
 
18
28
  def persister
@@ -266,6 +266,11 @@ RSpec.shared_examples 'a Collection indexer' do
266
266
  .to include(generic_type_sim: a_collection_containing_exactly('Collection'))
267
267
  end
268
268
 
269
+ it 'indexes member_of_collection_ids' do
270
+ expect(indexer.to_solr)
271
+ .to include(member_of_collection_ids_ssim: resource.member_of_collection_ids)
272
+ end
273
+
269
274
  it 'indexes depositor' do
270
275
  expect(indexer.to_solr)
271
276
  .to include(depositor_ssim: [resource.depositor],
@@ -1,6 +1,4 @@
1
1
  # frozen_string_literal: true
2
- require "dry/transaction"
3
- require "dry/transaction/operation"
4
2
 
5
3
  module Hyrax
6
4
  module Transactions
@@ -32,15 +32,41 @@ module Hyrax
32
32
  # @return [Dry::Monads::Result]
33
33
  def call(file_set, user: nil)
34
34
  return Failure('No user provided.') if user.nil?
35
-
36
- @query_service.find_parents(resource: file_set).each do |parent|
35
+ find_parents(resource: file_set).each do |parent|
37
36
  parent.member_ids -= [file_set.id]
37
+ unlink_file_set(parent: parent, file_set: file_set)
38
38
  saved = @persister.save(resource: parent)
39
39
  Hyrax.publisher.publish('object.metadata.updated', object: saved, user: user)
40
40
  end
41
-
42
41
  Success(file_set)
43
42
  end
43
+
44
+ private
45
+
46
+ def find_parents(resource:)
47
+ @query_service.find_parents(resource: resource)
48
+ end
49
+
50
+ def unlink_file_set(parent:, file_set:)
51
+ fid = file_set.id
52
+ unlink_thumbnail_id(fid: fid, parent: parent)
53
+ unlink_representative_id(fid: fid, parent: parent)
54
+ unlink_rendering_ids(fid: fid, parent: parent)
55
+ end
56
+
57
+ def unlink_rendering_ids(fid:, parent:)
58
+ parent.rendering_ids -= [fid] if parent.respond_to?(:rendering_ids) && parent.rendering_ids.present?
59
+ end
60
+
61
+ def unlink_representative_id(fid:, parent:)
62
+ parent.representative_id = nil if parent.representative_id == fid
63
+ end
64
+
65
+ def unlink_thumbnail_id(fid:, parent:)
66
+ return unless parent.thumbnail_id == fid
67
+ parent.thumbnail = nil if parent.respond_to? :thumbnail
68
+ parent.thumbnail_id = nil
69
+ end
44
70
  end
45
71
  end
46
72
  end
@@ -16,13 +16,29 @@ module Hyrax
16
16
  # @param [Valkyrie::Resource] obj
17
17
  #
18
18
  # @return [Dry::Monads::Result]
19
- def call(obj)
19
+ def call(obj, permissions_params: [])
20
20
  return Success(obj) unless obj.respond_to?(:permission_manager)
21
+
21
22
  acl = obj.permission_manager&.acl
23
+ # Translate step args into Hyrax::Permission objects before saving
24
+ Array(permissions_params).each do |param|
25
+ permission = param_to_permission(obj, param)
26
+ acl << permission if permission
27
+ end
28
+
22
29
  acl&.save || (return Failure[:failed_to_save_acl, acl])
23
30
 
24
31
  Success(obj)
25
32
  end
33
+
34
+ private
35
+
36
+ def param_to_permission(obj, param)
37
+ return nil unless param["access"] && param["type"] && param["name"]
38
+ mode = param["access"].to_sym
39
+ agent = param["type"] == "group" ? "group/#{param['name']}" : param["name"]
40
+ Hyrax::Permission.new(access_to: obj.id, mode: mode, agent: agent)
41
+ end
26
42
  end
27
43
  end
28
44
  end
@@ -9,7 +9,7 @@ module Hyrax
9
9
  # to be used as a the banner for the collection.
10
10
  #
11
11
  class SaveCollectionBanner
12
- include Dry::Transaction::Operation
12
+ include Dry::Monads[:result]
13
13
 
14
14
  ##
15
15
  # @param [Hyrax::ChangeSet] change_set
@@ -9,7 +9,7 @@ module Hyrax
9
9
  # to be used as logo(s) for the collection.
10
10
  #
11
11
  class SaveCollectionLogo
12
- include Dry::Transaction::Operation
12
+ include Dry::Monads[:result]
13
13
 
14
14
  ##
15
15
  # @param [Hyrax::ChangeSet] change_set
data/lib/hyrax/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  module Hyrax
3
- VERSION = '4.0.0.beta1'
3
+ VERSION = '4.0.0.rc1'
4
4
  end
data/lib/hyrax.rb CHANGED
@@ -80,7 +80,7 @@ module Hyrax
80
80
  ##
81
81
  # @return [Logger]
82
82
  def self.logger
83
- @logger ||= Valkyrie.logger
83
+ config.logger
84
84
  end
85
85
 
86
86
  def self.primary_work_type
@@ -1,11 +1,13 @@
1
1
  # frozen_string_literal: true
2
2
  namespace :hyrax do
3
3
  namespace :migrate do
4
+ desc 'Move all works to default AdminSet'
4
5
  task move_all_works_to_admin_set: :environment do
5
6
  require 'hyrax/move_all_works_to_admin_set'
6
7
  MoveAllWorksToAdminSet.run(AdminSet.find(AdminSet::DEFAULT_ID))
7
8
  end
8
9
 
10
+ desc 'Add the MANAGING role to legacy works'
9
11
  task add_admin_group_to_admin_sets: :environment do
10
12
  # Force creation of registered MANAGING role if it doesn't exist
11
13
  # This code must be invoked before calling `Sipity::Role.all` or the managing role won't be there
@@ -28,6 +30,7 @@ namespace :hyrax do
28
30
  end
29
31
  end
30
32
 
33
+ desc 'Set collection type and permissions for legacy (<2.1.0) Hyrax collections'
31
34
  task add_collection_type_and_permissions_to_collections: :environment do
32
35
  # Run collection migration which sets the collection_type of legacy collections to User Collection and adds
33
36
  # a permission template assigning users/groups with edit_access to the Manager role and users/groups with
@@ -37,7 +40,8 @@ namespace :hyrax do
37
40
  end
38
41
 
39
42
  # Migrate any orphan fedora data from the first to the second predicate
40
- task migrate_keyword_predicate: :environment do
43
+ desc 'Migrate keywords and license predicates for Hyrax 2.x --> 3.x'
44
+ task migrate_keyword_and_license_predicate: :environment do
41
45
  Hyrax::Works::MigrationService.migrate_predicate(::RDF::Vocab::DC11.relation, ::RDF::Vocab::SCHEMA.keywords)
42
46
  Hyrax::Works::MigrationService.migrate_predicate(::RDF::Vocab::DC.rights, ::RDF::Vocab::DC.license)
43
47
  end
@@ -62,7 +62,7 @@ module Valkyrie
62
62
  # generator now (if not, the application has bigger problems
63
63
  # than this missing configuration)
64
64
  bl_index = Blacklight.default_index.connection.uri
65
- rescue RuntimeError
65
+ rescue StandardError
66
66
  return {}
67
67
  end
68
68
 
@@ -9,7 +9,7 @@ module Wings
9
9
  # skip reserved attributes, we assume we don't need to translate valkyrie internals
10
10
  schema = resource_class.schema.reject do |key|
11
11
  resource_class.reserved_attributes.include?(key.name) ||
12
- key.name == :size
12
+ key.name == :size || key.name == :has_model
13
13
  end
14
14
 
15
15
  Wings::ActiveFedoraConverter.apply_properties(self, schema)
@@ -73,7 +73,7 @@ module Wings
73
73
  version_graph.query([uri, RDF::Vocab::Fcrepo4.created, :created])
74
74
  .first_object
75
75
  .object
76
- Version.new(cast_to_valkyrie_id(uri.to_s), timestamp, self)
76
+ Version.new(id: cast_to_valkyrie_id(uri.to_s), created: timestamp, adapter: self)
77
77
  end.sort
78
78
  end
79
79
 
@@ -86,7 +86,7 @@ module Wings
86
86
  # this implementation uses an orderable {#version_token}. in practice
87
87
  # the token is the fcrepo created date for the version, as extracted from
88
88
  # the versions graph.
89
- Version = Struct.new(:id, :version_token, :adapter) do
89
+ Version = Struct.new("Version", :id, :created, :adapter, keyword_init: true) do
90
90
  include Comparable
91
91
 
92
92
  ##
@@ -95,6 +95,10 @@ module Wings
95
95
  adapter.find_by(id: id)
96
96
  end
97
97
 
98
+ def version_token
99
+ created
100
+ end
101
+
98
102
  def <=>(other)
99
103
  raise ArgumentError unless other.respond_to?(:version_token)
100
104
  version_token <=> other.version_token