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
@@ -11,12 +11,16 @@ module Hyrax
11
11
  # # other WorkForm-like configuration here
12
12
  # end
13
13
  #
14
+ # @note The returned class will extend +Hyrax::Forms::PcdmObjectForm+, not
15
+ # only +Hyrax::Forms::ResourceForm+. This is for backwards‐compatibility
16
+ # with existing Hyrax instances and satisfies the expected general use
17
+ # case (building forms for various PCDM object classes), but is *not*
18
+ # necessarily suitable for other kinds of Hyrax resource, like
19
+ # +Hyrax::FileSet+s.
14
20
  def self.ResourceForm(work_class)
15
- Class.new(Hyrax::Forms::ResourceForm) do
21
+ Class.new(Hyrax::Forms::PcdmObjectForm) do
16
22
  self.model_class = work_class
17
23
 
18
- include Hyrax::FormFields(:core_metadata)
19
-
20
24
  ##
21
25
  # @return [String]
22
26
  def self.inspect
@@ -29,7 +33,7 @@ module Hyrax
29
33
  ##
30
34
  # @api public
31
35
  #
32
- # This form wraps `Hyrax::ChangeSet` in the `HydraEditor::Form` interface.
36
+ # This form wraps +Hyrax::ChangeSet+ in the +HydraEditor::Form+ interface.
33
37
  class ResourceForm < Hyrax::ChangeSet # rubocop:disable Metrics/ClassLength
34
38
  ##
35
39
  # @api private
@@ -69,10 +73,8 @@ module Hyrax
69
73
  property :human_readable_type, writable: false
70
74
 
71
75
  property :depositor
72
- property :on_behalf_of
73
- property :proxy_depositor
74
76
 
75
- property :visibility, default: VisibilityIntention::PRIVATE
77
+ property :visibility, default: VisibilityIntention::PRIVATE, populator: :visibility_populator
76
78
 
77
79
  property :date_modified, readable: false
78
80
  property :date_uploaded, readable: false
@@ -85,6 +87,9 @@ module Hyrax
85
87
  populator: :permission_populator,
86
88
  prepopulator: ->(_opts) { self.permissions = Hyrax::AccessControl.for(resource: model).permissions })
87
89
 
90
+ property :embargo, form: Hyrax::Forms::Embargo, populator: :embargo_populator
91
+ property :lease, form: Hyrax::Forms::Lease, populator: :lease_populator
92
+
88
93
  # virtual properties for embargo/lease;
89
94
  property :embargo_release_date, virtual: true, prepopulator: ->(_opts) { self.embargo_release_date = model.embargo&.embargo_release_date }
90
95
  property :visibility_after_embargo, virtual: true, prepopulator: ->(_opts) { self.visibility_after_embargo = model.embargo&.visibility_after_embargo }
@@ -94,17 +99,7 @@ module Hyrax
94
99
  property :visibility_after_lease, virtual: true, prepopulator: ->(_opts) { self.visibility_after_lease = model.lease&.visibility_after_lease }
95
100
  property :visibility_during_lease, virtual: true, prepopulator: ->(_opts) { self.visibility_during_lease = model.lease&.visibility_during_lease }
96
101
 
97
- # pcdm relationships
98
- property :admin_set_id, prepopulator: ->(_opts) { self.admin_set_id = Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s }
99
102
  property :in_works_ids, virtual: true, prepopulator: InWorksPrepopulator
100
- property :member_ids, default: [], type: Valkyrie::Types::Array
101
- property :member_of_collection_ids, default: [], type: Valkyrie::Types::Array
102
- property :member_of_collections_attributes, virtual: true, populator: :in_collections_populator
103
- validates_with CollectionMembershipValidator
104
-
105
- property :representative_id, type: Valkyrie::Types::String
106
- property :thumbnail_id, type: Valkyrie::Types::String
107
- property :rendering_ids, default: [], type: Valkyrie::Types::Array
108
103
 
109
104
  # provide a lock token for optimistic locking; we name this `version` for
110
105
  # backwards compatibility
@@ -116,10 +111,6 @@ module Hyrax
116
111
  # @see https://github.com/samvera/valkyrie/wiki/Optimistic-Locking
117
112
  property :version, virtual: true, prepopulator: LockKeyPrepopulator
118
113
 
119
- # backs the child work search element;
120
- # @todo: look for a way for the view template not to depend on this
121
- property :find_child_work, default: nil, virtual: true
122
-
123
114
  class << self
124
115
  ##
125
116
  # @api public
@@ -140,6 +131,7 @@ module Hyrax
140
131
  when Hyrax::PcdmCollection
141
132
  Hyrax::Forms::PcdmCollectionForm.new(resource)
142
133
  else
134
+ # NOTE: This will create a +Hyrax::Forms::PcdmObjectForm+.
143
135
  Hyrax::Forms::ResourceForm(resource.class).new(resource)
144
136
  end
145
137
  end
@@ -208,18 +200,12 @@ module Hyrax
208
200
 
209
201
  private
210
202
 
211
- def in_collections_populator(fragment:, **_options)
212
- adds = []
213
- deletes = []
214
- fragment.each do |_, h|
215
- if h["_destroy"] == "true"
216
- deletes << Valkyrie::ID.new(h["id"])
217
- else
218
- adds << Valkyrie::ID.new(h["id"])
219
- end
220
- end
203
+ def embargo_populator(**)
204
+ self.embargo = Hyrax::EmbargoManager.embargo_for(resource: model)
205
+ end
221
206
 
222
- self.member_of_collection_ids = ((member_of_collection_ids + adds) - deletes).uniq
207
+ def lease_populator(**)
208
+ self.lease = Hyrax::LeaseManager.lease_for(resource: model)
223
209
  end
224
210
 
225
211
  # https://trailblazer.to/2.1/docs/reform.html#reform-populators-populator-collections
@@ -227,6 +213,24 @@ module Hyrax
227
213
  Hyrax::Forms::Permission.new(collection[index])
228
214
  end
229
215
 
216
+ def visibility_populator(fragment:, doc:, **)
217
+ case fragment
218
+ when "embargo"
219
+ self.visibility = doc['visibility_during_embargo']
220
+
221
+ doc['embargo'] = doc.slice('visibility_after_embargo',
222
+ 'visibility_during_embargo',
223
+ 'embargo_release_date')
224
+ when "lease"
225
+ self.visibility = doc['visibility_during_lease']
226
+ doc['lease'] = doc.slice('visibility_after_lease',
227
+ 'visibility_during_lease',
228
+ 'lease_expiration_date')
229
+ else
230
+ self.visibility = fragment
231
+ end
232
+ end
233
+
230
234
  def _form_field_definitions
231
235
  self.class.definitions
232
236
  end
@@ -0,0 +1,35 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Hyrax
4
+ module Forms
5
+ ##
6
+ # Represents an embargo for edit through a work. That is, this form can
7
+ # be used to wrap a Work in order to capture state changes related only to
8
+ # its embargo, ignoring the work's other fields.
9
+ #
10
+ # @note this supports the edit functionality of
11
+ # +EmbargoesControllerBehavior+.
12
+ class WorkEmbargoForm < Hyrax::ChangeSet
13
+ property :embargo, form: Hyrax::Forms::Embargo, populator: :embargo_populator, prepopulator: :embargo_populator
14
+ property :embargo_release_date, virtual: true, prepopulator: ->(_opts) { self.embargo_release_date = model.embargo&.embargo_release_date }
15
+ property :visibility_after_embargo, virtual: true, prepopulator: ->(_opts) { self.visibility_after_embargo = model.embargo&.visibility_after_embargo }
16
+ property :visibility_during_embargo, virtual: true, prepopulator: ->(_opts) { self.visibility_during_embargo = model.embargo&.visibility_during_embargo }
17
+
18
+ def embargo_populator(**)
19
+ self.embargo = Hyrax::EmbargoManager.embargo_for(resource: model)
20
+ end
21
+
22
+ ##
23
+ # @return [String]
24
+ def human_readable_type
25
+ model.to_model.human_readable_type
26
+ end
27
+
28
+ ##
29
+ # @return [ActiveModel::Name]
30
+ def model_name
31
+ model.to_model.model_name
32
+ end
33
+ end
34
+ end
35
+ end
@@ -21,7 +21,7 @@ module Hyrax
21
21
 
22
22
  self.terms = [:title, :alternative_title, :creator, :contributor, :description, :abstract,
23
23
  :keyword, :license, :rights_statement, :access_right, :rights_notes, :publisher, :date_created,
24
- :subject, :language, :identifier, :based_near, :related_url,
24
+ :subject, :language, :identifier, :based_near, :related_url, :bibliographic_citation,
25
25
  :representative_id, :thumbnail_id, :rendering_ids, :files,
26
26
  :visibility_during_embargo, :embargo_release_date, :visibility_after_embargo,
27
27
  :visibility_during_lease, :lease_expiration_date, :visibility_after_lease,
@@ -120,7 +120,7 @@ module Hyrax
120
120
  primary = (required_fields & terms)
121
121
 
122
122
  (required_fields - primary).each do |missing|
123
- Rails.logger.warn("The form field #{missing} is configured as a " \
123
+ Hyrax.logger.warn("The form field #{missing} is configured as a " \
124
124
  'required field, but not as a term. This can lead ' \
125
125
  'to unexpected behavior. Did you forget to add it ' \
126
126
  "to `#{self.class}#terms`?")
@@ -0,0 +1,35 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Hyrax
4
+ module Forms
5
+ ##
6
+ # Represents a lease for edit through a work. That is, this form can
7
+ # be used to wrap a Work in order to capture state changes related only to
8
+ # its lease, ignoring the work's other fields.
9
+ #
10
+ # @note this supports the edit functionality of
11
+ # +LeasesControllerBehavior+.
12
+ class WorkLeaseForm < Hyrax::ChangeSet
13
+ property :lease, form: Hyrax::Forms::Lease, populator: :lease_populator, prepopulator: :lease_populator
14
+ property :lease_expiration_date, virtual: true, prepopulator: ->(_opts) { self.lease_expiration_date = model.lease&.lease_expiration_date }
15
+ property :visibility_after_lease, virtual: true, prepopulator: ->(_opts) { self.visibility_after_lease = model.lease&.visibility_after_lease }
16
+ property :visibility_during_lease, virtual: true, prepopulator: ->(_opts) { self.visibility_during_lease = model.lease&.visibility_during_lease }
17
+
18
+ def lease_populator(**)
19
+ self.lease = Hyrax::LeaseManager.lease_for(resource: model)
20
+ end
21
+
22
+ ##
23
+ # @return [String]
24
+ def human_readable_type
25
+ model.to_model.human_readable_type
26
+ end
27
+
28
+ ##
29
+ # @return [ActiveModel::Name]
30
+ def model_name
31
+ model.to_model.model_name
32
+ end
33
+ end
34
+ end
35
+ end
@@ -123,14 +123,7 @@ module Hyrax
123
123
  ##
124
124
  # @param collection [Object]
125
125
  def collection_type_label_for(collection:)
126
- case collection
127
- when Valkyrie::Resource
128
- CollectionType
129
- .find_by_gid!(collection.collection_type_gid)
130
- .title
131
- else
132
- collection.collection_type.title
133
- end
126
+ CollectionType.for(collection: collection).title
134
127
  end
135
128
 
136
129
  ##
@@ -138,14 +131,7 @@ module Hyrax
138
131
  #
139
132
  # @return [Boolean]
140
133
  def collection_brandable?(collection:)
141
- case collection
142
- when Valkyrie::Resource
143
- CollectionType
144
- .find_by_gid!(collection.collection_type_gid)
145
- .brandable?
146
- else
147
- collection.try(:brandable?)
148
- end
134
+ CollectionType.for(collection: collection).brandable?
149
135
  end
150
136
 
151
137
  ##
@@ -153,14 +139,7 @@ module Hyrax
153
139
  #
154
140
  # @return [Boolean]
155
141
  def collection_discoverable?(collection:)
156
- case collection
157
- when Valkyrie::Resource
158
- CollectionType
159
- .find_by_gid!(collection.collection_type_gid)
160
- .discoverable?
161
- else
162
- collection.try(:discoverable?)
163
- end
142
+ CollectionType.for(collection: collection).discoverable?
164
143
  end
165
144
 
166
145
  ##
@@ -168,14 +147,7 @@ module Hyrax
168
147
  #
169
148
  # @return [Boolean]
170
149
  def collection_sharable?(collection:)
171
- case collection
172
- when Valkyrie::Resource
173
- CollectionType
174
- .find_by_gid!(collection.collection_type_gid)
175
- .sharable?
176
- else
177
- collection.try(:sharable?)
178
- end
150
+ CollectionType.for(collection: collection).sharable?
179
151
  end
180
152
 
181
153
  ##
@@ -40,5 +40,16 @@ module Hyrax
40
40
  Hyrax::EmbargoManager.new(resource: resource).enforced?
41
41
  end
42
42
  end
43
+
44
+ ##
45
+ # @since 3.5.0
46
+ #
47
+ # @param [#embargo_history, #embargo] resource
48
+ #
49
+ # @return [Array]
50
+ def embargo_history(resource)
51
+ resource.try(:embargo_history) ||
52
+ Array(resource.embargo&.embargo_history)
53
+ end
43
54
  end
44
55
  end
@@ -6,145 +6,5 @@ module Hyrax
6
6
  # This module is used to ensure Hyrax facet views that rely on deprecated Blacklight helper methods are still functional
7
7
 
8
8
  include Blacklight::Facet
9
-
10
- ##
11
- # Renders the list of values
12
- # removes any elements where render_facet_item returns a nil value. This enables an application
13
- # to filter undesireable facet items so they don't appear in the UI
14
- def render_facet_limit_list(paginator, facet_field, wrapping_element = :li)
15
- safe_join(paginator.items.map { |item| render_facet_item(facet_field, item) }.compact.map { |item| content_tag(wrapping_element, item) })
16
- end
17
-
18
- ##
19
- # Renders a single facet item
20
- def render_facet_item(facet_field, item)
21
- if facet_in_params?(facet_field, item.value)
22
- render_selected_facet_value(facet_field, item)
23
- else
24
- render_facet_value(facet_field, item)
25
- end
26
- end
27
-
28
- ##
29
- # Standard display of a facet value in a list. Used in both _facets sidebar
30
- # partial and catalog/facet expanded list. Will output facet value name as
31
- # a link to add that to your restrictions, with count in parens.
32
- #
33
- # @param [Blacklight::Solr::Response::Facets::FacetField] facet_field
34
- # @param [Blacklight::Solr::Response::Facets::FacetItem] item
35
- # @param [Hash] options
36
- # @option options [Boolean] :suppress_link display the facet, but don't link to it
37
- # @return [String]
38
- def render_facet_value(facet_field, item, options = {})
39
- path = path_for_facet(facet_field, item)
40
- content_tag(:span, class: "facet-label") do
41
- link_to_unless(options[:suppress_link], facet_display_value(facet_field, item), path, class: "facet_select")
42
- end + render_facet_count(item.hits)
43
- end
44
-
45
- ##
46
- # Where should this facet link to?
47
- # @param [Blacklight::Solr::Response::Facets::FacetField] facet_field
48
- # @param [String] item
49
- # @return [String]
50
- def path_for_facet(facet_field, item)
51
- facet_config = facet_configuration_for_field(facet_field)
52
- if facet_config.url_method
53
- send(facet_config.url_method, facet_field, item)
54
- else
55
- search_action_path(search_state.add_facet_params_and_redirect(facet_field, item))
56
- end
57
- end
58
-
59
- ##
60
- # Standard display of a SELECTED facet value (e.g. without a link and with a remove button)
61
- # @see #render_facet_value
62
- # @param [Blacklight::Solr::Response::Facets::FacetField] facet_field
63
- # @param [String] item
64
- def render_selected_facet_value(facet_field, item)
65
- remove_href = search_action_path(search_state.remove_facet_params(facet_field, item))
66
- content_tag(:span, class: "facet-label") do
67
- content_tag(:span, facet_display_value(facet_field, item), class: "selected") +
68
- # remove link
69
- link_to(remove_href, class: "remove") do
70
- content_tag(:i, '', class: "fa fa-times") +
71
- content_tag(:span, '[remove]', class: 'sr-only')
72
- end
73
- end + render_facet_count(item.hits, classes: ["selected"])
74
- end
75
-
76
- ##
77
- # Renders a count value for facet limits. Can be over-ridden locally
78
- # to change style. And can be called by plugins to get consistent display.
79
- #
80
- # @param [Integer] num number of facet results
81
- # @param [Hash] options
82
- # @option options [Array<String>] an array of classes to add to count span.
83
- # @return [String]
84
- def render_facet_count(num, options = {})
85
- classes = (options[:classes] || []) << "facet-count"
86
- content_tag("span", t('blacklight.search.facets.count', number: number_with_delimiter(num)), class: classes)
87
- end
88
-
89
- ##
90
- # Check if the query parameters have the given facet field with the
91
- # given value.
92
- #
93
- # @param [Object] field
94
- # @param [Object] item facet value
95
- # @return [Boolean]
96
- def facet_in_params?(field, item)
97
- value = facet_value_for_facet_item(item)
98
-
99
- (facet_params(field) || []).include? value
100
- end
101
-
102
- ##
103
- # Get the values of the facet set in the blacklight query string
104
- def facet_params(field)
105
- config = facet_configuration_for_field(field)
106
-
107
- params[:f][config.key] if params[:f]
108
- end
109
-
110
- ##
111
- # Get the displayable version of a facet's value
112
- #
113
- # @param [Object] field
114
- # @param [String] item value
115
- # @return [String]
116
- # rubocop:disable Metrics/MethodLength
117
- def facet_display_value(field, item)
118
- facet_config = facet_configuration_for_field(field)
119
-
120
- value = if item.respond_to? :label
121
- item.label
122
- else
123
- facet_value_for_facet_item(item)
124
- end
125
-
126
- if facet_config.helper_method
127
- send facet_config.helper_method, value
128
- elsif facet_config.query && facet_config.query[value]
129
- facet_config.query[value][:label]
130
- elsif facet_config.date
131
- localization_options = facet_config.date == true ? {} : facet_config.date
132
-
133
- l(value.to_datetime, localization_options)
134
- else
135
- value
136
- end
137
- end
138
- # rubocop:enable Metrics/MethodLength
139
-
140
- private
141
-
142
- def facet_value_for_facet_item(item)
143
- if item.respond_to? :value
144
- item.value
145
- else
146
- item
147
- end
148
- end
149
9
  end
150
10
  end
@@ -289,7 +289,7 @@ module Hyrax
289
289
  end
290
290
 
291
291
  def collection_title_by_id(id)
292
- solr_docs = controller.repository.find(id).docs
292
+ solr_docs = controller.blacklight_config.repository.find(id).docs
293
293
  return nil if solr_docs.empty?
294
294
  solr_field = solr_docs.first["title_tesim"]
295
295
  return nil if solr_field.nil?
@@ -305,6 +305,21 @@ module Hyrax
305
305
  ""
306
306
  end
307
307
 
308
+ ##
309
+ # @param value [Object] the thing we'll attempt to cast to a formatted date.
310
+ # @param format [String] the `DateTime.strftime` format string
311
+ # @return [String]
312
+ #
313
+ # @see https://github.com/samvera/hyrax/issues/5818
314
+ # @see https://ruby-doc.org/core-3.0.1/Time.html#method-i-strftime
315
+ def cast_to_date_time_format(value, format:)
316
+ return value.strftime(format).to_s if value.respond_to?(:strftime)
317
+
318
+ (Time.zone.parse(value)&.strftime(format) || value).to_s
319
+ rescue ArgumentError, TypeError
320
+ value.to_s
321
+ end
322
+
308
323
  private
309
324
 
310
325
  def user_agent
@@ -40,5 +40,16 @@ module Hyrax
40
40
  Hyrax::LeaseManager.new(resource: resource).enforced?
41
41
  end
42
42
  end
43
+
44
+ ##
45
+ # @since 3.5.0
46
+ #
47
+ # @param [#lease_history, #lease] resource
48
+ #
49
+ # @return [Array]
50
+ def lease_history(resource)
51
+ resource.try(:lease_history) ||
52
+ Array(resource.lease&.lease_history)
53
+ end
43
54
  end
44
55
  end
@@ -97,5 +97,112 @@ module Hyrax
97
97
  hash[presenter.title_or_label] = presenter.id
98
98
  end
99
99
  end
100
+
101
+ ##
102
+ # This helper retrieves errors based on form type.
103
+ #
104
+ # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
105
+ # @return [String] specific error message
106
+ def in_works_ids_errors_for(form:)
107
+ case form
108
+ when Hyrax::ChangeSet
109
+ form.errors[:in_works_ids]
110
+ else
111
+ form.model.errors[:in_works_ids]
112
+ end
113
+ end
114
+
115
+ ##
116
+ # This helper retrieves errors based on form type.
117
+ #
118
+ # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
119
+ # @return [String] specific error message
120
+ def ordered_member_ids_errors_for(form:)
121
+ case form
122
+ when Hyrax::ChangeSet
123
+ form.errors[:ordered_member_ids]
124
+ else
125
+ form.model.errors[:ordered_member_ids]
126
+ end
127
+ end
128
+
129
+ ##
130
+ # This helper retrieves errors based on form type.
131
+ #
132
+ # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
133
+ # @return [String] specific error message
134
+ def visibility_errors_for(form:)
135
+ case form
136
+ when Hyrax::ChangeSet
137
+ form.errors[:visibility]
138
+ else
139
+ form.model.errors[:visibility]
140
+ end
141
+ end
142
+
143
+ ##
144
+ # This helper retrieves errors based on form type.
145
+ #
146
+ # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
147
+ # @return [String] specific error message
148
+ def embargo_release_date_errors_for(form:)
149
+ case form
150
+ when Hyrax::ChangeSet
151
+ form.errors[:embargo_release_date]
152
+ else
153
+ form.model.errors[:embargo_release_date]
154
+ end
155
+ end
156
+
157
+ ##
158
+ # This helper retrieves errors based on form type.
159
+ #
160
+ # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
161
+ # @return [String] specific error message
162
+ def visibility_after_embargo_errors_for(form:)
163
+ case form
164
+ when Hyrax::ChangeSet
165
+ form.errors[:visibility_after_embargo]
166
+ else
167
+ form.model.errors[:visibility_after_embargo]
168
+ end
169
+ end
170
+
171
+ ##
172
+ # This helper retrieves errors based on form type.
173
+ #
174
+ # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
175
+ # @return [String] specific error message
176
+ def lease_expiration_date_errors_for(form:)
177
+ case form
178
+ when Hyrax::ChangeSet
179
+ form.errors[:lease_expiration_date_errors]
180
+ else
181
+ form.model.errors[:lease_expiration_date_errors]
182
+ end
183
+ end
184
+
185
+ ##
186
+ # This helper retrieves errors based on form type.
187
+ #
188
+ # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
189
+ # @return [String] specific error message
190
+ def visibility_after_lease_errors_for(form:)
191
+ case form
192
+ when Hyrax::ChangeSet
193
+ form.errors[:visibility_after_lease]
194
+ else
195
+ form.model.errors[:visibility_after_lease]
196
+ end
197
+ end
198
+
199
+ ##
200
+ # This helper retrieves errors based on form type.
201
+ #
202
+ # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
203
+ # @return [String] specific error message
204
+ def full_collections_errors(form:)
205
+ form.full_error(:collections) || form.full_error(:member_of_collection_ids)
206
+ end
100
207
  end
101
208
  end
@@ -48,12 +48,12 @@ module Hyrax
48
48
  end
49
49
 
50
50
  def fetch_value(value)
51
- Rails.logger.info "Fetching #{value.rdf_subject} from the authorative source. (this is slow)"
51
+ Hyrax.logger.info "Fetching #{value.rdf_subject} from the authorative source. (this is slow)"
52
52
  value.fetch(headers: { 'Accept' => default_accept_header })
53
53
  rescue IOError, SocketError => e
54
54
  # IOError could result from a 500 error on the remote server
55
55
  # SocketError results if there is no server to connect to
56
- Rails.logger.error "Unable to fetch #{value.rdf_subject} from the authorative source.\n#{e.message}"
56
+ Hyrax.logger.error "Unable to fetch #{value.rdf_subject} from the authorative source.\n#{e.message}"
57
57
  end
58
58
 
59
59
  # Stripping off the */* to work around https://github.com/rails/rails/issues/9940
@@ -16,6 +16,7 @@ module Hyrax
16
16
  super.tap do |index_document|
17
17
  index_document[Hyrax.config.collection_type_index_field.to_sym] = Array(resource.try(:collection_type_gid)&.to_s)
18
18
  index_document[:generic_type_sim] = ['Collection']
19
+ index_document[:member_of_collection_ids_ssim] = resource.member_of_collection_ids.map(&:to_s)
19
20
  index_document[:depositor_ssim] = [resource.depositor]
20
21
  index_document[:depositor_tesim] = [resource.depositor]
21
22
  end
@@ -9,7 +9,7 @@ module Hyrax
9
9
  include Hyrax::VisibilityIndexer
10
10
  include Hyrax::ThumbnailIndexer
11
11
  include Hyrax::Indexer(:core_metadata)
12
- include Hyrax::Indexer(:basic_metadata)
12
+ include Hyrax::Indexer(:file_set_metadata)
13
13
 
14
14
  def to_solr # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
15
15
  super.tap do |solr_doc| # rubocop:disable Metrics/BlockLength
@@ -23,7 +23,7 @@ module Hyrax
23
23
  solr_doc['hasRelatedImage_ssim'] = resource.thumbnail_id.to_s
24
24
 
25
25
  # Add in metadata from the original file.
26
- file_metadata = original_file
26
+ file_metadata = Hyrax::FileSetFileService.new(file_set: resource).original_file
27
27
  return solr_doc unless file_metadata
28
28
 
29
29
  # Label is the actual file name. It's not editable by the user.
@@ -99,12 +99,6 @@ module Hyrax
99
99
 
100
100
  private
101
101
 
102
- def original_file
103
- Hyrax.custom_queries.find_original_file(file_set: resource)
104
- rescue Valkyrie::Persistence::ObjectNotFoundError
105
- Hyrax.custom_queries.find_files(file_set: resource).first
106
- end
107
-
108
102
  def file_format(file)
109
103
  if file.mime_type.present? && file.format_label.present?
110
104
  "#{file.mime_type.split('/').last} (#{file.format_label.join(', ')})"