hyrax 4.0.0.beta1 → 4.0.0.beta2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (426) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +4 -4
  3. data/.dassie/.env +29 -0
  4. data/.github/workflows/build.yml +79 -0
  5. data/{.env → .koppie/.env} +21 -11
  6. data/.koppie/.gitignore +48 -0
  7. data/.koppie/.rspec +2 -0
  8. data/.koppie/CODE_OF_CONDUCT.md +36 -0
  9. data/.koppie/CONTRIBUTING.md +192 -0
  10. data/.koppie/Gemfile +54 -0
  11. data/.koppie/LICENSE +205 -0
  12. data/.koppie/README.md +55 -0
  13. data/.koppie/Rakefile +8 -0
  14. data/.koppie/app/assets/config/manifest.js +5 -0
  15. data/.koppie/app/assets/images/.keep +0 -0
  16. data/.koppie/app/assets/images/unauthorized.png +0 -0
  17. data/.koppie/app/assets/images/us_404.svg +91 -0
  18. data/.koppie/app/assets/javascripts/application.js +30 -0
  19. data/.koppie/app/assets/javascripts/blacklight_gallery.js +1 -0
  20. data/.koppie/app/assets/javascripts/cable.js +13 -0
  21. data/.koppie/app/assets/javascripts/channels/.keep +0 -0
  22. data/.koppie/app/assets/javascripts/openseadragon.js +2 -0
  23. data/.koppie/app/assets/stylesheets/application.css +48 -0
  24. data/.koppie/app/assets/stylesheets/hyrax.scss +17 -0
  25. data/.koppie/app/assets/stylesheets/openseadragon.css +3 -0
  26. data/.koppie/app/channels/application_cable/channel.rb +4 -0
  27. data/.koppie/app/channels/application_cable/connection.rb +4 -0
  28. data/.koppie/app/controllers/application_controller.rb +13 -0
  29. data/.koppie/app/controllers/catalog_controller.rb +314 -0
  30. data/.koppie/app/controllers/concerns/.keep +0 -0
  31. data/.koppie/app/controllers/hyrax/generic_works_controller.rb +17 -0
  32. data/.koppie/app/controllers/hyrax/monographs_controller.rb +17 -0
  33. data/.koppie/app/forms/collection_resource_form.rb +7 -0
  34. data/.koppie/app/forms/generic_work_form.rb +20 -0
  35. data/.koppie/app/forms/monograph_form.rb +20 -0
  36. data/.koppie/app/helpers/application_helper.rb +2 -0
  37. data/.koppie/app/helpers/hyrax_helper.rb +6 -0
  38. data/.koppie/app/indexers/collection_resource_indexer.rb +7 -0
  39. data/.koppie/app/indexers/generic_work_indexer.rb +16 -0
  40. data/.koppie/app/indexers/monograph_indexer.rb +16 -0
  41. data/.koppie/app/jobs/application_job.rb +2 -0
  42. data/.koppie/app/mailers/application_mailer.rb +4 -0
  43. data/.koppie/app/models/ability.rb +25 -0
  44. data/.koppie/app/models/application_record.rb +3 -0
  45. data/.koppie/app/models/collection.rb +1 -0
  46. data/.koppie/app/models/collection_resource.rb +31 -0
  47. data/.koppie/app/models/concerns/.keep +0 -0
  48. data/.koppie/app/models/file_set.rb +4 -0
  49. data/.koppie/app/models/generic_work.rb +8 -0
  50. data/.koppie/app/models/monograph.rb +8 -0
  51. data/.koppie/app/models/qa/local_authority.rb +2 -0
  52. data/.koppie/app/models/qa/local_authority_entry.rb +3 -0
  53. data/.koppie/app/models/qa.rb +5 -0
  54. data/.koppie/app/models/search_builder.rb +16 -0
  55. data/.koppie/app/models/solr_document.rb +28 -0
  56. data/.koppie/app/models/user.rb +24 -0
  57. data/.koppie/app/views/hyrax/generic_works/_generic_work.html.erb +2 -0
  58. data/.koppie/app/views/hyrax/monographs/_monograph.html.erb +2 -0
  59. data/.koppie/app/views/layouts/application.html.erb +15 -0
  60. data/.koppie/app/views/layouts/mailer.html.erb +13 -0
  61. data/.koppie/app/views/layouts/mailer.text.erb +1 -0
  62. data/.koppie/bin/bundle +3 -0
  63. data/.koppie/bin/rails +9 -0
  64. data/.koppie/bin/rake +9 -0
  65. data/.koppie/bin/setup +36 -0
  66. data/.koppie/bin/spring +17 -0
  67. data/.koppie/bin/update +31 -0
  68. data/.koppie/bin/yarn +11 -0
  69. data/.koppie/config/analytics.yml +12 -0
  70. data/.koppie/config/application.rb +33 -0
  71. data/.koppie/config/authorities/licenses.yml +46 -0
  72. data/.koppie/config/authorities/resource_types.yml +41 -0
  73. data/.koppie/config/authorities/rights_statements.yml +37 -0
  74. data/.koppie/config/blacklight.yml +9 -0
  75. data/.koppie/config/boot.rb +4 -0
  76. data/.koppie/config/browse_everything_providers.yml +25 -0
  77. data/.koppie/config/cable.yml +12 -0
  78. data/.koppie/config/credentials.yml.enc +1 -0
  79. data/.koppie/config/database.yml +25 -0
  80. data/.koppie/config/environment.rb +5 -0
  81. data/.koppie/config/environments/development.rb +71 -0
  82. data/.koppie/config/environments/production.rb +97 -0
  83. data/.koppie/config/environments/test.rb +46 -0
  84. data/.koppie/config/initializers/1_valkyrie.rb +56 -0
  85. data/.koppie/config/initializers/application_controller_renderer.rb +8 -0
  86. data/.koppie/config/initializers/assets.rb +14 -0
  87. data/.koppie/config/initializers/backtrace_silencers.rb +7 -0
  88. data/.koppie/config/initializers/clamav.rb +2 -0
  89. data/.koppie/config/initializers/content_security_policy.rb +25 -0
  90. data/.koppie/config/initializers/cookies_serializer.rb +5 -0
  91. data/.koppie/config/initializers/devise.rb +311 -0
  92. data/.koppie/config/initializers/filter_parameter_logging.rb +4 -0
  93. data/.koppie/config/initializers/hydra_config.rb +24 -0
  94. data/.koppie/config/initializers/hyrax.rb +333 -0
  95. data/.koppie/config/initializers/inflections.rb +16 -0
  96. data/.koppie/config/initializers/mailboxer.rb +22 -0
  97. data/.koppie/config/initializers/mime_types.rb +8 -0
  98. data/.koppie/config/initializers/mini_magick.rb +6 -0
  99. data/.koppie/config/initializers/redis_config.rb +4 -0
  100. data/.koppie/config/initializers/riiif.rb +29 -0
  101. data/.koppie/config/initializers/simple_form.rb +171 -0
  102. data/.koppie/config/initializers/simple_form_bootstrap.rb +151 -0
  103. data/.koppie/config/initializers/wrap_parameters.rb +14 -0
  104. data/.koppie/config/locales/blacklight.en.yml +3 -0
  105. data/.koppie/config/locales/devise.en.yml +65 -0
  106. data/.koppie/config/locales/en.yml +33 -0
  107. data/.koppie/config/locales/hyrax.de.yml +58 -0
  108. data/.koppie/config/locales/hyrax.en.yml +58 -0
  109. data/.koppie/config/locales/hyrax.es.yml +58 -0
  110. data/.koppie/config/locales/hyrax.fr.yml +58 -0
  111. data/.koppie/config/locales/hyrax.it.yml +58 -0
  112. data/.koppie/config/locales/hyrax.pt-BR.yml +58 -0
  113. data/.koppie/config/locales/hyrax.zh.yml +58 -0
  114. data/.koppie/config/metadata/collection_resource.yaml +149 -0
  115. data/.koppie/config/metadata/generic_work.yaml +22 -0
  116. data/.koppie/config/metadata/monograph.yaml +55 -0
  117. data/.koppie/config/puma.rb +37 -0
  118. data/.koppie/config/redis.yml +12 -0
  119. data/.koppie/config/role_map.yml +48 -0
  120. data/.koppie/config/routes.rb +36 -0
  121. data/.koppie/config/sidekiq.yml +15 -0
  122. data/.koppie/config/solr.yml +7 -0
  123. data/.koppie/config/spring.rb +6 -0
  124. data/.koppie/config/storage.yml +34 -0
  125. data/.koppie/config/tinymce.yml +13 -0
  126. data/.koppie/config/uv/uv-config.json +3 -0
  127. data/.koppie/config/uv/uv.html +87 -0
  128. data/.koppie/config/valkyrie_index.yml +12 -0
  129. data/.koppie/config/workflows/default_workflow.json +21 -0
  130. data/.koppie/config/workflows/mediated_deposit_workflow.json +76 -0
  131. data/.koppie/config.ru +5 -0
  132. data/.koppie/db/migrate/20210911143430_create_searches.blacklight.rb +17 -0
  133. data/.koppie/db/migrate/20210911143431_create_bookmarks.blacklight.rb +19 -0
  134. data/.koppie/db/migrate/20210911143432_add_polymorphic_type_to_bookmarks.blacklight.rb +9 -0
  135. data/.koppie/db/migrate/20210911143452_devise_create_users.rb +44 -0
  136. data/.koppie/db/migrate/20210911143456_add_devise_guests_to_users.rb +15 -0
  137. data/.koppie/db/migrate/20210911143532_create_version_committers.hyrax.rb +15 -0
  138. data/.koppie/db/migrate/20210911143533_create_checksum_audit_logs.hyrax.rb +19 -0
  139. data/.koppie/db/migrate/20210911143534_create_single_use_links.hyrax.rb +12 -0
  140. data/.koppie/db/migrate/20210911143535_add_social_to_users.hyrax.rb +13 -0
  141. data/.koppie/db/migrate/20210911143536_add_ldap_attrs_to_user.hyrax.rb +27 -0
  142. data/.koppie/db/migrate/20210911143537_add_avatars_to_users.hyrax.rb +15 -0
  143. data/.koppie/db/migrate/20210911143538_create_trophies.hyrax.rb +10 -0
  144. data/.koppie/db/migrate/20210911143539_add_linkedin_to_users.hyrax.rb +5 -0
  145. data/.koppie/db/migrate/20210911143540_create_tinymce_assets.hyrax.rb +8 -0
  146. data/.koppie/db/migrate/20210911143541_create_content_blocks.hyrax.rb +10 -0
  147. data/.koppie/db/migrate/20210911143542_create_featured_works.hyrax.rb +12 -0
  148. data/.koppie/db/migrate/20210911143543_add_external_key_to_content_blocks.hyrax.rb +6 -0
  149. data/.koppie/db/migrate/20210911143544_create_proxy_deposit_rights.hyrax.rb +10 -0
  150. data/.koppie/db/migrate/20210911143545_create_proxy_deposit_requests.hyrax.rb +15 -0
  151. data/.koppie/db/migrate/20210911143546_create_file_view_stats.hyrax.rb +12 -0
  152. data/.koppie/db/migrate/20210911143547_create_file_download_stats.hyrax.rb +12 -0
  153. data/.koppie/db/migrate/20210911143548_add_orcid_to_users.hyrax.rb +5 -0
  154. data/.koppie/db/migrate/20210911143549_create_user_stats.hyrax.rb +19 -0
  155. data/.koppie/db/migrate/20210911143550_create_work_view_stats.hyrax.rb +12 -0
  156. data/.koppie/db/migrate/20210911143551_add_works_to_user_stats.hyrax.rb +13 -0
  157. data/.koppie/db/migrate/20210911143552_change_trophy_generic_file_id_to_work_id.hyrax.rb +5 -0
  158. data/.koppie/db/migrate/20210911143553_change_proxy_deposit_generic_file_id_to_work_id.hyrax.rb +5 -0
  159. data/.koppie/db/migrate/20210911143554_change_audit_log_generic_file_id_to_file_set_id.hyrax.rb +5 -0
  160. data/.koppie/db/migrate/20210911143555_change_proxy_deposit_request_generic_file_id_to_work_id.hyrax.rb +5 -0
  161. data/.koppie/db/migrate/20210911143556_create_uploaded_files.hyrax.rb +10 -0
  162. data/.koppie/db/migrate/20210911143557_create_features.hyrax.rb +10 -0
  163. data/.koppie/db/migrate/20210911143558_create_operations.hyrax.rb +23 -0
  164. data/.koppie/db/migrate/20210911143559_change_featured_work_generic_file_id_to_work_id.hyrax.rb +6 -0
  165. data/.koppie/db/migrate/20210911143560_add_arkivo_to_users.hyrax.rb +8 -0
  166. data/.koppie/db/migrate/20210911143561_create_sipity.hyrax.rb +163 -0
  167. data/.koppie/db/migrate/20210911143562_create_sipity_workflow_methods.hyrax.rb +10 -0
  168. data/.koppie/db/migrate/20210911143563_create_permission_template.hyrax.rb +11 -0
  169. data/.koppie/db/migrate/20210911143564_create_permission_template_access.hyrax.rb +11 -0
  170. data/.koppie/db/migrate/20210911143565_add_release_to_permission_templates.hyrax.rb +6 -0
  171. data/.koppie/db/migrate/20210911143566_add_permission_template_to_sipity_workflow.hyrax.rb +26 -0
  172. data/.koppie/db/migrate/20210911143567_tidy_up_because_of_bad_exception.hyrax.rb +13 -0
  173. data/.koppie/db/migrate/20210911143568_add_allows_access_grant_to_workflow.hyrax.rb +5 -0
  174. data/.koppie/db/migrate/20210911143569_change_checksum_audit_log.hyrax.rb +18 -0
  175. data/.koppie/db/migrate/20210911143570_create_job_io_wrappers.hyrax.rb +15 -0
  176. data/.koppie/db/migrate/20210911143571_create_collection_types.hyrax.rb +17 -0
  177. data/.koppie/db/migrate/20210911143572_update_collection_type_column_names.hyrax.rb +9 -0
  178. data/.koppie/db/migrate/20210911143573_update_collection_type_column_options.hyrax.rb +17 -0
  179. data/.koppie/db/migrate/20210911143574_create_collection_branding_infos.hyrax.rb +15 -0
  180. data/.koppie/db/migrate/20210911143575_create_collection_type_participants.hyrax.rb +11 -0
  181. data/.koppie/db/migrate/20210911143576_rename_admin_set_id_to_source_id.hyrax.rb +5 -0
  182. data/.koppie/db/migrate/20210911143577_add_preferred_locale_to_users.hyrax.rb +5 -0
  183. data/.koppie/db/migrate/20210911143578_add_collection_type_sharing_options.hyrax.rb +5 -0
  184. data/.koppie/db/migrate/20210911143579_add_unique_constraint_to_permission_template_accesses.hyrax.rb +8 -0
  185. data/.koppie/db/migrate/20210911143580_add_branding_to_collection_type.hyrax.rb +5 -0
  186. data/.koppie/db/migrate/20210911143581_add_badge_color_to_collection_types.hyrax.rb +5 -0
  187. data/.koppie/db/migrate/20210911143582_update_single_use_links_column_names.hyrax.rb +6 -0
  188. data/.koppie/db/migrate/20210911143583_change_sipity_entity_specific_responsibility.hyrax.rb +9 -0
  189. data/.koppie/db/migrate/20210911143584_create_mailboxer.mailboxer_engine.rb +65 -0
  190. data/.koppie/db/migrate/20210911143585_add_conversation_optout.mailboxer_engine.rb +15 -0
  191. data/.koppie/db/migrate/20210911143586_add_missing_indices.mailboxer_engine.rb +20 -0
  192. data/.koppie/db/migrate/20210911143587_add_delivery_tracking_info_to_mailboxer_receipts.mailboxer_engine.rb +8 -0
  193. data/.koppie/db/migrate/20210911143588_create_qa_local_authorities.rb +10 -0
  194. data/.koppie/db/migrate/20210911143602_create_qa_local_authority_entries.rb +12 -0
  195. data/.koppie/db/migrate/20210911143623_create_minter_states.noid_rails_engine.rb +17 -0
  196. data/.koppie/db/migrate/20210911143624_rename_minter_state_random_to_rand.noid_rails_engine.rb +8 -0
  197. data/.koppie/db/migrate/20210921150120_enable_uuid_extension.valkyrie_engine.rb +7 -0
  198. data/.koppie/db/migrate/20210921150121_create_orm_resources.valkyrie_engine.rb +19 -0
  199. data/.koppie/db/migrate/20210921150122_add_model_type_to_orm_resources.valkyrie_engine.rb +7 -0
  200. data/.koppie/db/migrate/20210921150123_change_model_type_to_internal_model.valkyrie_engine.rb +7 -0
  201. data/.koppie/db/migrate/20210921150124_create_path_gin_index.valkyrie_engine.rb +7 -0
  202. data/.koppie/db/migrate/20210921150125_create_internal_resource_index.valkyrie_engine.rb +7 -0
  203. data/.koppie/db/migrate/20210921150126_create_updated_at_index.valkyrie_engine.rb +7 -0
  204. data/.koppie/db/migrate/20210921150127_add_optimistic_locking_to_orm_resources.valkyrie_engine.rb +7 -0
  205. data/.koppie/db/migrate/20211021161136_user_roles.rb +20 -0
  206. data/.koppie/db/migrate/20211207172259_create_default_administrative_set.hyrax.rb +8 -0
  207. data/.koppie/db/schema.rb +595 -0
  208. data/.koppie/db/seeds.rb +79 -0
  209. data/.koppie/lib/assets/.keep +0 -0
  210. data/.koppie/lib/tasks/.keep +0 -0
  211. data/.koppie/log/.keep +0 -0
  212. data/.koppie/package.json +15 -0
  213. data/.koppie/public/404.html +67 -0
  214. data/.koppie/public/422.html +67 -0
  215. data/.koppie/public/500.html +66 -0
  216. data/.koppie/public/apple-touch-icon-precomposed.png +0 -0
  217. data/.koppie/public/apple-touch-icon.png +0 -0
  218. data/.koppie/public/branding/.keep +0 -0
  219. data/.koppie/public/favicon.ico +0 -0
  220. data/.koppie/public/robots.txt +1 -0
  221. data/.koppie/scripts/db-migrate-seed.sh +9 -0
  222. data/.koppie/scripts/entrypoint.sh +10 -0
  223. data/.koppie/solr/conf/_rest_managed.json +3 -0
  224. data/.koppie/solr/conf/admin-extra.html +31 -0
  225. data/.koppie/solr/conf/elevate.xml +36 -0
  226. data/.koppie/solr/conf/mapping-ISOLatin1Accent.txt +246 -0
  227. data/.koppie/solr/conf/protwords.txt +21 -0
  228. data/.koppie/solr/conf/schema.xml +367 -0
  229. data/.koppie/solr/conf/scripts.conf +24 -0
  230. data/.koppie/solr/conf/solrconfig.xml +325 -0
  231. data/.koppie/solr/conf/spellings.txt +2 -0
  232. data/.koppie/solr/conf/stopwords.txt +58 -0
  233. data/.koppie/solr/conf/stopwords_en.txt +58 -0
  234. data/.koppie/solr/conf/synonyms.txt +31 -0
  235. data/.koppie/solr/conf/xslt/example.xsl +132 -0
  236. data/.koppie/solr/conf/xslt/example_atom.xsl +67 -0
  237. data/.koppie/solr/conf/xslt/example_rss.xsl +66 -0
  238. data/.koppie/solr/conf/xslt/luke.xsl +337 -0
  239. data/.koppie/solr/sample_solr_documents.yml +2692 -0
  240. data/.koppie/spec/forms/collection_resource_form_spec.rb +13 -0
  241. data/.koppie/spec/indexers/collection_resource_indexer_spec.rb +14 -0
  242. data/.koppie/spec/indexers/generic_work_indexer_spec.rb +13 -0
  243. data/.koppie/spec/indexers/monograph_indexer_spec.rb +13 -0
  244. data/.koppie/spec/models/collection_resource_spec.rb +13 -0
  245. data/.koppie/spec/models/collection_spec.rb +17 -0
  246. data/.koppie/spec/models/file_set_spec.rb +15 -0
  247. data/.koppie/spec/models/generic_work_spec.rb +13 -0
  248. data/.koppie/spec/models/monograph_spec.rb +13 -0
  249. data/.koppie/spec/models/qa/local_authority_entry_spec.rb +5 -0
  250. data/.koppie/spec/models/qa/local_authority_spec.rb +5 -0
  251. data/.koppie/spec/rails_helper.rb +47 -0
  252. data/.koppie/spec/spec_helper.rb +19 -0
  253. data/.koppie/spec/views/generic_works/_generic_work.html.erb_spec.rb +7 -0
  254. data/.koppie/spec/views/monographs/_monograph.html.erb_spec.rb +7 -0
  255. data/.koppie/storage/.keep +0 -0
  256. data/.koppie/vendor/.keep +0 -0
  257. data/.koppie/yarn.lock +1497 -0
  258. data/CONTAINERS.md +54 -10
  259. data/Dockerfile +9 -5
  260. data/app/actors/hyrax/actors/collections_membership_actor.rb +1 -2
  261. data/app/actors/hyrax/actors/create_with_files_actor.rb +1 -1
  262. data/app/actors/hyrax/actors/create_with_remote_files_actor.rb +2 -2
  263. data/app/actors/hyrax/actors/embargo_actor.rb +11 -4
  264. data/app/actors/hyrax/actors/lease_actor.rb +11 -4
  265. data/app/assets/javascripts/hyrax/app.js.erb +1 -1
  266. data/app/assets/javascripts/hyrax/permissions/control.es6 +8 -1
  267. data/app/assets/stylesheets/hyrax/dashboard.scss +5 -62
  268. data/app/components/hyrax/dropdown_facet_field_component.html.erb +21 -0
  269. data/app/components/hyrax/dropdown_facet_field_component.rb +30 -0
  270. data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +6 -9
  271. data/app/controllers/concerns/hyrax/embargoes_controller_behavior.rb +11 -2
  272. data/app/controllers/concerns/hyrax/leases_controller_behavior.rb +11 -2
  273. data/app/controllers/concerns/hyrax/manages_embargoes.rb +13 -1
  274. data/app/controllers/concerns/hyrax/works_controller_behavior.rb +4 -2
  275. data/app/controllers/hyrax/dashboard/collection_members_controller.rb +0 -1
  276. data/app/controllers/hyrax/dashboard/collections_controller.rb +4 -7
  277. data/app/controllers/hyrax/file_sets_controller.rb +1 -0
  278. data/app/controllers/hyrax/my/collections_controller.rb +1 -0
  279. data/app/controllers/hyrax/my/works_controller.rb +1 -1
  280. data/app/controllers/hyrax/permissions_controller.rb +1 -1
  281. data/app/controllers/hyrax/transfers_controller.rb +0 -2
  282. data/app/forms/hyrax/forms/batch_upload_form.rb +1 -1
  283. data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb +4 -18
  284. data/app/forms/hyrax/forms/embargo.rb +13 -0
  285. data/app/forms/hyrax/forms/lease.rb +13 -0
  286. data/app/forms/hyrax/forms/resource_form.rb +30 -1
  287. data/app/forms/hyrax/forms/work_embargo_form.rb +35 -0
  288. data/app/forms/hyrax/forms/work_form.rb +2 -2
  289. data/app/forms/hyrax/forms/work_lease_form.rb +35 -0
  290. data/app/helpers/hyrax/collections_helper.rb +4 -32
  291. data/app/helpers/hyrax/embargo_helper.rb +11 -0
  292. data/app/helpers/hyrax/facets_helper.rb +0 -140
  293. data/app/helpers/hyrax/hyrax_helper_behavior.rb +15 -0
  294. data/app/helpers/hyrax/lease_helper.rb +11 -0
  295. data/app/helpers/hyrax/work_form_helper.rb +107 -0
  296. data/app/indexers/hyrax/deep_indexing_service.rb +2 -2
  297. data/app/indexers/hyrax/pcdm_collection_indexer.rb +1 -0
  298. data/app/indexers/hyrax/valkyrie_file_set_indexer.rb +1 -7
  299. data/app/indexers/hyrax/valkyrie_work_indexer.rb +21 -0
  300. data/app/jobs/characterize_job.rb +6 -2
  301. data/app/jobs/import_url_job.rb +2 -2
  302. data/app/models/admin_set.rb +8 -0
  303. data/app/models/concerns/hyrax/ability.rb +2 -2
  304. data/app/models/concerns/hyrax/collection_behavior.rb +3 -1
  305. data/app/models/concerns/hyrax/file_set_behavior.rb +1 -0
  306. data/app/models/concerns/hyrax/naming.rb +1 -1
  307. data/app/models/concerns/hyrax/work_behavior.rb +0 -1
  308. data/app/models/file_download_stat.rb +1 -1
  309. data/app/models/hyrax/collection_type.rb +9 -1
  310. data/app/models/hyrax/embargo.rb +1 -1
  311. data/app/models/hyrax/file_set.rb +2 -2
  312. data/app/models/hyrax/lease.rb +1 -1
  313. data/app/models/hyrax/statistic.rb +1 -1
  314. data/app/models/hyrax/work.rb +2 -2
  315. data/app/models/proxy_deposit_request.rb +1 -1
  316. data/app/models/sipity.rb +8 -8
  317. data/app/presenters/hyrax/admin_set_presenter.rb +5 -0
  318. data/app/presenters/hyrax/displays_image.rb +1 -1
  319. data/app/presenters/hyrax/pcdm_member_presenter_factory.rb +1 -1
  320. data/app/presenters/hyrax/permission_badge.rb +3 -2
  321. data/app/presenters/hyrax/presenter_renderer.rb +1 -1
  322. data/app/presenters/hyrax/presents_attributes.rb +1 -1
  323. data/app/presenters/hyrax/version_list_presenter.rb +6 -1
  324. data/app/presenters/hyrax/work_show_presenter.rb +3 -0
  325. data/app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb +7 -67
  326. data/app/services/hyrax/admin_set_create_service.rb +2 -2
  327. data/app/services/hyrax/analytics/google.rb +1 -1
  328. data/app/services/hyrax/analytics/matomo.rb +1 -1
  329. data/app/services/hyrax/collection_member_service.rb +2 -0
  330. data/app/services/hyrax/collection_types/create_service.rb +1 -1
  331. data/app/services/hyrax/collections/migration_service.rb +8 -8
  332. data/app/services/hyrax/collections/nested_collection_query_service.rb +3 -113
  333. data/app/services/hyrax/derivative_service.rb +37 -4
  334. data/app/services/hyrax/edit_permissions_service.rb +1 -14
  335. data/app/services/hyrax/embargo_manager.rb +9 -0
  336. data/app/services/hyrax/embargo_service.rb +4 -0
  337. data/app/services/hyrax/file_set_file_service.rb +55 -0
  338. data/app/services/hyrax/lease_manager.rb +9 -0
  339. data/app/services/hyrax/lease_service.rb +4 -0
  340. data/app/services/hyrax/listeners/file_metadata_listener.rb +11 -0
  341. data/app/services/hyrax/listeners/workflow_listener.rb +2 -2
  342. data/app/services/hyrax/local_file_service.rb +3 -1
  343. data/app/services/hyrax/solr_service.rb +1 -1
  344. data/app/services/hyrax/statistics/depositors/summary.rb +1 -1
  345. data/app/services/hyrax/statistics/term_query.rb +1 -1
  346. data/app/services/hyrax/thumbnail_path_service.rb +1 -1
  347. data/app/services/hyrax/user_stat_importer.rb +4 -2
  348. data/app/services/hyrax/valkyrie_persist_derivatives.rb +1 -1
  349. data/app/services/hyrax/valkyrie_upload.rb +1 -1
  350. data/app/services/hyrax/versioning_service.rb +78 -10
  351. data/app/services/hyrax/visibility_map.rb +10 -2
  352. data/app/services/hyrax/work_resource_query_service.rb +45 -0
  353. data/app/services/hyrax/workflow/action_taken_service.rb +4 -4
  354. data/app/services/hyrax/workflow/notification_service.rb +2 -2
  355. data/app/services/hyrax/workflow/workflow_importer.rb +2 -2
  356. data/app/services/hyrax/working_directory.rb +3 -3
  357. data/app/services/hyrax/works/migration_service.rb +3 -3
  358. data/app/utils/hyrax/test_data_seeders/user_seeder.rb +3 -2
  359. data/app/validators/hyrax/collection_membership_validator.rb +2 -2
  360. data/app/views/hyrax/admin/analytics/work_reports/show.html.erb +6 -6
  361. data/app/views/hyrax/base/_form_collections_error.html.erb +1 -1
  362. data/app/views/hyrax/base/_form_in_works_error.html.erb +1 -1
  363. data/app/views/hyrax/base/_form_ordered_members_error.html.erb +1 -1
  364. data/app/views/hyrax/base/_form_progress.html.erb +1 -1
  365. data/app/views/hyrax/base/_form_visibility_component.html.erb +5 -1
  366. data/app/views/hyrax/base/_form_visibility_error.html.erb +19 -5
  367. data/app/views/hyrax/embargoes/edit.html.erb +4 -4
  368. data/app/views/hyrax/file_sets/_permission_form.html.erb +1 -6
  369. data/app/views/hyrax/file_sets/edit.html.erb +1 -1
  370. data/app/views/hyrax/leases/edit.html.erb +3 -3
  371. data/app/views/hyrax/my/collections/_facets.html.erb +7 -5
  372. data/app/views/hyrax/my/works/_facets.html.erb +6 -2
  373. data/app/views/hyrax/transfers/_received.html.erb +1 -1
  374. data/app/views/hyrax/transfers/_sent.html.erb +1 -1
  375. data/app/views/hyrax/transfers/new.html.erb +1 -1
  376. data/chart/hyrax/Chart.yaml +1 -1
  377. data/chart/hyrax/templates/_helpers.tpl +5 -1
  378. data/chart/hyrax/templates/configmap-env.yaml +1 -1
  379. data/chart/hyrax/values.yaml +1 -0
  380. data/config/features.rb +1 -1
  381. data/config/initializers/reform_rails_6_1_monkey_patch.rb +27 -0
  382. data/config/locales/hyrax.de.yml +2 -1
  383. data/config/locales/hyrax.en.yml +3 -0
  384. data/config/locales/hyrax.es.yml +1 -0
  385. data/config/locales/hyrax.fr.yml +2 -1
  386. data/config/locales/hyrax.it.yml +1 -0
  387. data/config/locales/hyrax.pt-BR.yml +1 -0
  388. data/config/locales/hyrax.zh.yml +1 -0
  389. data/config/metadata/basic_metadata.yaml +2 -0
  390. data/docker-compose-koppie.yml +163 -0
  391. data/docker-compose.yml +0 -3
  392. data/documentation/developing-your-hyrax-based-app.md +1 -1
  393. data/documentation/legacyREADME.md +2 -2
  394. data/hyrax.gemspec +5 -4
  395. data/lib/generators/hyrax/install_generator.rb +4 -4
  396. data/lib/generators/hyrax/templates/catalog_controller.rb +0 -2
  397. data/lib/generators/hyrax/templates/config/initializers/hyrax.rb +8 -1
  398. data/lib/generators/hyrax/templates/config/initializers/riiif.rb +1 -1
  399. data/lib/hyrax/active_fedora_dummy_model.rb +13 -0
  400. data/lib/hyrax/configuration.rb +25 -15
  401. data/lib/hyrax/controlled_vocabulary/importer/language.rb +1 -1
  402. data/lib/hyrax/engine.rb +6 -2
  403. data/lib/hyrax/errors.rb +2 -0
  404. data/lib/hyrax/publisher.rb +4 -0
  405. data/lib/hyrax/search_state.rb +9 -0
  406. data/lib/hyrax/specs/capybara.rb +2 -2
  407. data/lib/hyrax/specs/shared_specs/factories/strategies/json_strategy.rb +4 -0
  408. data/lib/hyrax/specs/shared_specs/factories/strategies/valkyrie_resource.rb +10 -0
  409. data/lib/hyrax/specs/shared_specs/indexers.rb +5 -0
  410. data/lib/hyrax/transactions/steps/remove_file_set_from_work.rb +29 -3
  411. data/lib/hyrax/transactions/steps/save_access_control.rb +17 -1
  412. data/lib/hyrax/version.rb +1 -1
  413. data/lib/hyrax.rb +1 -1
  414. data/lib/tasks/migrate.rake +5 -1
  415. data/lib/wings/valkyrie/storage.rb +6 -2
  416. data/tasks/benchmark.rake +1 -1
  417. data/tasks/hyrax_dev.rake +0 -32
  418. data/template.rb +1 -1
  419. metadata +293 -23
  420. data/app/indexers/hyrax/repository_reindexer.rb +0 -19
  421. data/app/models/concerns/hyrax/collection_nesting.rb +0 -73
  422. data/app/services/hyrax/adapters/nesting_index_adapter.rb +0 -193
  423. data/app/views/hyrax/my/_facet_layout.html.erb +0 -7
  424. data/app/views/hyrax/my/_facet_limit.html.erb +0 -15
  425. data/app/views/hyrax/my/_facet_pivot.html.erb +0 -26
  426. data/config/initializers/nesting_indexer_initializer.rb +0 -16
@@ -0,0 +1,45 @@
1
+ # frozen_string_literal: true
2
+ module Hyrax
3
+ # Responsible for retrieving information based on the given work.
4
+ #
5
+ # @see ProxyDepositRequest
6
+ # @see SolrDocument
7
+ # @see Hyrax::SolrService
8
+ # @note This was extracted from the ProxyDepositRequest, which was coordinating lots of effort. It was also an ActiveRecord object that required lots of Fedora/Solr interactions.
9
+ class WorkResourceQueryService
10
+ # @param [String] id - The id of the work
11
+ def initialize(id:)
12
+ @id = id
13
+ end
14
+ attr_reader :id
15
+
16
+ # @return [Boolean] if the work has been deleted
17
+ def deleted_work?
18
+ Hyrax.query_service.find_by(id: id)
19
+ false
20
+ rescue Valkyrie::Persistence::ObjectNotFoundError
21
+ true
22
+ end
23
+
24
+ def work
25
+ # Need to ensure it is a work?
26
+ resource = Hyrax.query_service.find_by(id: id)
27
+ raise ModelMismatchError, "Expected work but got #{resource.class}" unless resource.work?
28
+ resource
29
+ end
30
+
31
+ def to_s
32
+ if deleted_work?
33
+ 'work not found'
34
+ else
35
+ solr_doc.to_s
36
+ end
37
+ end
38
+
39
+ private
40
+
41
+ def solr_doc
42
+ @solr_doc ||= ::SolrDocument.new(Hyrax::SolrService.search_by_id(id))
43
+ end
44
+ end
45
+ end
@@ -35,12 +35,12 @@ module Hyrax
35
35
  return unless action.triggered_methods.any?
36
36
  success = action.triggered_methods.order(:weight).all? do |method|
37
37
  status = process_action(method.service_name)
38
- Rails.logger.debug("Result of #{method.service_name} is #{status}")
38
+ Hyrax.logger.debug("Result of #{method.service_name} is #{status}")
39
39
  status
40
40
  end
41
41
 
42
42
  return save_target if success
43
- Rails.logger.error "Not all workflow methods were successful, so not saving (#{target.id})"
43
+ Hyrax.logger.error "Not all workflow methods were successful, so not saving (#{target.id})"
44
44
  false
45
45
  end
46
46
 
@@ -63,11 +63,11 @@ module Hyrax
63
63
  klass = begin
64
64
  class_name.constantize
65
65
  rescue NameError
66
- Rails.logger.error "Unable to find '#{class_name}', so not running workflow callback"
66
+ Hyrax.logger.error "Unable to find '#{class_name}', so not running workflow callback"
67
67
  return nil
68
68
  end
69
69
  return klass if klass.respond_to?(:call)
70
- Rails.logger.error "Expected '#{class_name}' to respond to 'call', but it didn't, so not running workflow callback"
70
+ Hyrax.logger.error "Expected '#{class_name}' to respond to 'call', but it didn't, so not running workflow callback"
71
71
  nil
72
72
  end
73
73
 
@@ -60,11 +60,11 @@ module Hyrax
60
60
  klass = begin
61
61
  class_name.constantize
62
62
  rescue NameError
63
- Rails.logger.error "Unable to find '#{class_name}', so not sending notification"
63
+ Hyrax.logger.error "Unable to find '#{class_name}', so not sending notification"
64
64
  return nil
65
65
  end
66
66
  return klass if klass.respond_to?(:send_notification)
67
- Rails.logger.error "Expected '#{class_name}' to respond to 'send_notification', but it didn't, so not sending notification"
67
+ Hyrax.logger.error "Expected '#{class_name}' to respond to 'send_notification', but it didn't, so not sending notification"
68
68
  nil
69
69
  end
70
70
  end
@@ -7,7 +7,7 @@ module Hyrax
7
7
  # @see .generate_from_json_file
8
8
  class WorkflowImporter
9
9
  class_attribute :default_logger
10
- self.default_logger = Rails.logger
10
+ self.default_logger = Hyrax.logger
11
11
  class_attribute :path_to_workflow_files
12
12
  self.path_to_workflow_files = Rails.root.join('config', 'workflows', '*.json')
13
13
 
@@ -132,7 +132,7 @@ module Hyrax
132
132
  rescue InvalidStateRemovalException => e
133
133
  e.states.each do |state|
134
134
  error = I18n.t('hyrax.workflow.load.state_error', workflow_name: state.workflow.name, state_name: state.name, entity_count: state.entities.count)
135
- Rails.logger.error(error)
135
+ Hyrax.logger.error(error)
136
136
  errors << error
137
137
  end
138
138
  Sipity::Workflow.find_by(name: configuration[:name])
@@ -16,7 +16,7 @@ module Hyrax
16
16
  repository_file = Hydra::PCDM::File.find(repository_file_id)
17
17
  working_path = full_filename(id, repository_file.original_name)
18
18
  if File.exist?(working_path)
19
- Rails.logger.debug "#{repository_file.original_name} already exists in the working directory at #{working_path}"
19
+ Hyrax.logger.debug "#{repository_file.original_name} already exists in the working directory at #{working_path}"
20
20
  return working_path
21
21
  end
22
22
  copy_repository_resource_to_working_directory(repository_file, id)
@@ -26,7 +26,7 @@ module Hyrax
26
26
  # @param [String] id the identifier of the FileSet
27
27
  # @return [String] path of the working file
28
28
  def copy_repository_resource_to_working_directory(file, id)
29
- Rails.logger.debug "Loading #{file.original_name} (#{file.id}) from the repository to the working directory"
29
+ Hyrax.logger.debug "Loading #{file.original_name} (#{file.id}) from the repository to the working directory"
30
30
  copy_stream_to_working_directory(id, file.original_name, StringIO.new(file.content))
31
31
  end
32
32
 
@@ -38,7 +38,7 @@ module Hyrax
38
38
  # @return [String] path of the working file
39
39
  def copy_stream_to_working_directory(id, name, stream)
40
40
  working_path = full_filename(id, name)
41
- Rails.logger.debug "Writing #{name} to the working directory at #{working_path}"
41
+ Hyrax.logger.debug "Writing #{name} to the working directory at #{working_path}"
42
42
  FileUtils.mkdir_p(File.dirname(working_path))
43
43
  IO.copy_stream(stream, working_path)
44
44
  working_path
@@ -10,13 +10,13 @@ module Hyrax
10
10
  # and the original data cleaned up.
11
11
  def self.migrate_predicate(predicate_from, predicate_to, works_to_update = ActiveFedora::Base.all)
12
12
  migrated = 0
13
- Rails.logger.info "*** Migrating #{predicate_from} to #{predicate_to} in #{works_to_update.count} works"
13
+ Hyrax.logger.info "*** Migrating #{predicate_from} to #{predicate_to} in #{works_to_update.count} works"
14
14
  works_to_update.each do |work|
15
15
  next unless work.ldp_source.content.include?(predicate_from.to_s)
16
16
  migrate_data(predicate_from, predicate_to, work)
17
17
  migrated += 1
18
18
  end
19
- Rails.logger.info "--- Migration Complete (#{migrated} migrated)"
19
+ Hyrax.logger.info "--- Migration Complete (#{migrated} migrated)"
20
20
  end
21
21
 
22
22
  # @api private
@@ -27,7 +27,7 @@ module Hyrax
27
27
  orm.value(predicate_from).each { |val| orm.graph.insert([orm.resource.subject_uri, predicate_to, val.to_s]) }
28
28
  orm.graph.delete([orm.resource.subject_uri, predicate_from, nil])
29
29
  orm.save
30
- Rails.logger.info " Data migrated from #{predicate_from} to #{predicate_to} - id: #{work.id}"
30
+ Hyrax.logger.info " Data migrated from #{predicate_from} to #{predicate_to} - id: #{work.id}"
31
31
  end
32
32
  end
33
33
  end
@@ -25,14 +25,14 @@ module Hyrax
25
25
  private
26
26
 
27
27
  def admin_role
28
- unless defined? Role
28
+ unless ::User.reflect_on_association(:roles)
29
29
  logger.warn("Cannot create `Role` because the `hyrda-role-management` gem, or " \
30
30
  "other gem providing a definition for a Role class, is not installed. " \
31
31
  "For development, you can edit `config/role_map.yml` and add the user's " \
32
32
  "email under the role you want to assign.")
33
33
  return
34
34
  end
35
- @admin_role ||= Role.find_by(name: Hyrax.config.admin_user_group_name)
35
+ @admin_role ||= Role.find_or_create_by(name: Hyrax.config.admin_user_group_name)
36
36
  end
37
37
 
38
38
  def add_user(email, password, role = nil)
@@ -43,6 +43,7 @@ module Hyrax
43
43
  end
44
44
  logger.info(" #{email} -- #{created ? 'CREATED' : 'ALREADY EXISTS'}")
45
45
  return unless role && !user.roles.include?(role)
46
+ logger.info("Adding #{role.name} to #{user.email}")
46
47
  user.roles << role
47
48
  user.save
48
49
  end
@@ -16,8 +16,8 @@ module Hyrax
16
16
  checker = @multiple_membership_checker.new(item: nil)
17
17
  ids = collections_ids(record)
18
18
 
19
- errors = Array(checker.check(collection_ids: ids))
20
- record.errors[:member_of_collection_ids].concat(errors)
19
+ error = checker.check(collection_ids: ids)
20
+ record.errors.add(:member_of_collection_ids, error) if error
21
21
  end
22
22
 
23
23
  private
@@ -10,7 +10,7 @@
10
10
  <div class="row">
11
11
  <div class="col-sm-12">
12
12
  <div class="work-reports">
13
-
13
+
14
14
  <div class="card">
15
15
  <div class="card-header">
16
16
  <div class="col-sm-10">
@@ -23,7 +23,7 @@
23
23
  <div class="card-body">
24
24
  <div class="row">
25
25
  <div class="col-12 col-md-5">
26
- <p><%= t('.deposited_by') %> <b><%= @document.depositor %></b> on <b><%= @document.date_uploaded.strftime("%Y-%m-%d") %></b></p>
26
+ <p><%= t('.deposited_by') %> <b><%= @document.depositor %></b> on <b><%= cast_to_date_time_format(@document.date_uploaded, format: "%Y-%m-%d") %></b></p>
27
27
  <p><%= t('.work_type') %> <b><%= @document.human_readable_type %></b></p>
28
28
  <p><%= t('.resource_type') %> <b><%= @document.resource_type.join(", ") %></b></p>
29
29
  </div>
@@ -34,7 +34,7 @@
34
34
  </div>
35
35
  </div>
36
36
  </div>
37
-
37
+
38
38
  <div class="row text-center">
39
39
  <div class="nav nav-pills btn-group" role="group">
40
40
  <% if params[:start_date] %>
@@ -69,7 +69,7 @@
69
69
  <div class="tab-pane" id="monthly">
70
70
  <%= render "monthly_summary" %>
71
71
  </div>
72
-
72
+
73
73
  <% if params[:start_date] %>
74
74
  <div class="tab-pane active" id="custom-range">
75
75
  <% else %>
@@ -79,12 +79,12 @@
79
79
  <%= render "custom_range" %>
80
80
  </div>
81
81
  </div>
82
-
82
+
83
83
  <% unless @files.nil? %>
84
84
  <%= render "work_files" %>
85
85
  <%= render "work_counts" %>
86
86
  <% end %>
87
-
87
+
88
88
  </div>
89
89
  </div>
90
90
  </div>
@@ -1 +1 @@
1
- <%= f.full_error(:collections) %>
1
+ <%= full_collections_errors(form: f) %>
@@ -1,3 +1,3 @@
1
- <% unless f.object.model.errors[:in_works_ids].empty? %>
1
+ <% unless in_works_ids_errors_for(form: f.object).empty? %>
2
2
  <%= f.full_error(:in_works_ids) %>
3
3
  <% end %>
@@ -1,3 +1,3 @@
1
- <% unless f.object.model.errors[:ordered_member_ids].empty? %>
1
+ <% unless ordered_member_ids_errors_for(form: f.object).empty? %>
2
2
  <%= f.full_error(:ordered_member_ids) %>
3
3
  <% end %>
@@ -19,7 +19,7 @@
19
19
  </div>
20
20
 
21
21
  <div class="set-access-controls list-group-item">
22
- <%= render 'form_visibility_component', f: f %>
22
+ <%= render 'form_visibility_component', f: f, save_work: true %>
23
23
  </div>
24
24
  <% if Flipflop.proxy_deposit? && current_user.can_make_deposits_for.any? %>
25
25
  <div class="list-group-item">
@@ -4,7 +4,11 @@
4
4
  <%= render 'form_permission_under_lease', f: f %>
5
5
  <% else %>
6
6
  <fieldset>
7
- <legend class="legend-save-work"><%= t('.visibility') %></legend>
7
+ <% if local_assigns[:save_work] %>
8
+ <legend class="legend-save-work"><%= t('.visibility') %></legend>
9
+ <% else %>
10
+ <legend><%= t('.visibility') %><%= raw(t('.subtitle_html')) %></legend>
11
+ <% end %>
8
12
  <ul class="visibility">
9
13
  <li class="form-check">
10
14
  <label class="form-check-label">
@@ -1,5 +1,19 @@
1
- <%= f.full_error(:visibility) %>
2
- <%= f.full_error(:embargo_release_date) %>
3
- <%= f.full_error(:visibility_after_embargo) %>
4
- <%= f.full_error(:lease_expiration_date) %>
5
- <%= f.full_error(:visibility_after_lease) %>
1
+ <% unless visibility_errors_for(form: f.object).empty? %>
2
+ <%= f.full_error(:visibility) %>
3
+ <% end %>
4
+
5
+ <% unless embargo_release_date_errors_for(form: f.object).empty? %>
6
+ <%= f.full_error(:embargo_release_date) %>
7
+ <% end %>
8
+
9
+ <% unless visibility_after_embargo_errors_for(form: f.object).empty? %>
10
+ <%= f.full_error(:visibility_after_embargo) %>
11
+ <% end %>
12
+
13
+ <% unless lease_expiration_date_errors_for(form: f.object).empty? %>
14
+ <%= f.full_error(:lease_expiration_date) %>
15
+ <% end %>
16
+
17
+ <% unless visibility_after_lease_errors_for(form: f.object).empty? %>
18
+ <%= f.full_error(:visibility_after_lease) %>
19
+ <% end %>
@@ -13,7 +13,7 @@
13
13
  <fieldset class="set-access-controls">
14
14
  <section class="form-text">
15
15
  <p>
16
- <% if curation_concern.embargo_release_date %>
16
+ <% if embargo_enforced?(curation_concern) %>
17
17
  <%= t('.embargo_true_html', cc: cc_type) %>
18
18
  <% else %>
19
19
  <%= t('.embargo_false_html', cc: cc_type) %>
@@ -29,7 +29,7 @@
29
29
 
30
30
  <div class="row">
31
31
  <div class="col-md-12 form-actions">
32
- <% if curation_concern.embargo_release_date %>
32
+ <% if embargo_enforced?(curation_concern) %>
33
33
  <%= f.submit t('.embargo_update'), class: 'btn btn-primary' %>
34
34
  <%= link_to t('.embargo_deactivate'), embargo_path(curation_concern), method: :delete, class: 'btn btn-danger' %>
35
35
  <% else %>
@@ -48,10 +48,10 @@
48
48
  <h2 class="card-title"><%= t('.header.past') %></h2>
49
49
  </div>
50
50
  <div class="card-body">
51
- <% if curation_concern.embargo_history.empty? %>
51
+ <% if embargo_history(curation_concern).empty? %>
52
52
  <%= t('.history_empty', cc: cc_type) %>
53
53
  <% else %>
54
- <%= render partial: "embargo_history", object: curation_concern.embargo_history %>
54
+ <%= render partial: "embargo_history", object: embargo_history(curation_concern) %>
55
55
  <% end %>
56
56
  </div>
57
57
  </div>
@@ -1,8 +1,3 @@
1
- <% depositor = f.object.depositor %>
2
- <% public_perm = f.object.permissions.map { |perm| perm.access if perm.agent_name == "public"}.compact.first %>
3
- <% public_perm = true if params[:controller] == 'batch' %>
4
- <% registered_perm = f.object.permissions.map { |perm| perm.access if perm.agent_name == "registered"}.compact.first %>
5
-
6
1
  <h2 id="permissions_display"><% if params[:controller] == 'batch' %><%= t('.bulk') %> <% end %><%= t('.header') %> <% if params[:controller] == 'batch' %>
7
2
  <small><%= t('.applied_to') %></small><% end %>
8
3
  </h2>
@@ -13,7 +8,7 @@
13
8
  <span id="permissions_error_text"></span>
14
9
  </div>
15
10
 
16
- <%= render 'hyrax/base/form_permission', f: f %>
11
+ <%= render 'hyrax/base/form_visibility_component', f: f %>
17
12
 
18
13
  <!-- Share With -->
19
14
  <div class="row">
@@ -6,7 +6,7 @@
6
6
 
7
7
  <div class="row">
8
8
  <div class="col-12 col-sm-4">
9
- <%= render media_display_partial(curation_concern.to_presenter), file_set: curation_concern.to_presenter %>
9
+ <%= render media_display_partial(@presenter.solr_document), file_set: @presenter.solr_document %>
10
10
  </div>
11
11
  <div class="col-12 col-sm-8">
12
12
  <div class="card tabs">
@@ -13,7 +13,7 @@
13
13
  <fieldset class="set-access-controls">
14
14
  <section class="form-text">
15
15
  <p>
16
- <% if curation_concern.lease_expiration_date %>
16
+ <% if lease_enforced?(curation_concern) %>
17
17
  <%= t('.lease_true_html', cc: cc_type) %>
18
18
  <% else %>
19
19
  <%= t('.lease_false_html', cc: cc_type) %>
@@ -29,7 +29,7 @@
29
29
 
30
30
  <div class="row">
31
31
  <div class="col-md-12 form-actions">
32
- <% if curation_concern.lease_expiration_date %>
32
+ <% if lease_enforced?(curation_concern) %>
33
33
  <%= f.submit t('.lease_update'), class: 'btn btn-primary' %>
34
34
  <%= link_to t('.lease_deactivate'), lease_path(curation_concern), method: :delete, class: 'btn btn-danger' %>
35
35
  <% else %>
@@ -48,7 +48,7 @@
48
48
  <h2 class="card-title"><%= t('.header.past') %></h2>
49
49
  </div>
50
50
  <div class="card-body">
51
- <% if curation_concern.lease_history.empty? %>
51
+ <% if lease_history(curation_concern).empty? %>
52
52
  <%= t('.history_empty', cc: cc_type) %>
53
53
  <% else %>
54
54
  <%= render partial: 'lease_history', object: curation_concern.lease_history %>
@@ -1,7 +1,9 @@
1
1
  <% # main container for facets/limits menu -%>
2
- <% if has_facet_values?(facet_field_names, @response) %>
3
- <div class="list-filters" role="group">
4
- <span class="list-filters-label"><%= t("hyrax.dashboard.my.facet_label.collections") %></span>
5
- <%= render_facet_partials(facet_field_names, response: @response) %>
6
- </div>
2
+ <% facets = capture do %>
3
+ <%= render Blacklight::FacetComponent.with_collection(blacklight_config.facet_fields_in_group(nil), response: @response, component: Hyrax::DropdownFacetFieldComponent)%>
7
4
  <% end %>
5
+
6
+ <div class="list-filters" role="group">
7
+ <span class="list-filters-label"><%= t("hyrax.dashboard.my.facet_label.collections") %></span>
8
+ <%= facets %>
9
+ </div>
@@ -1,7 +1,11 @@
1
1
  <% # main container for facets/limits menu -%>
2
- <% if has_facet_values?(facet_field_names, @response) %>
2
+ <% facets = capture do %>
3
+ <%= render Blacklight::FacetComponent.with_collection(blacklight_config.facet_fields_in_group(nil), response: @response, component: Hyrax::DropdownFacetFieldComponent)%>
4
+ <% end %>
5
+
6
+ <% if facets.present? %>
3
7
  <div class="list-filters" role="group">
4
8
  <span class="list-filters-label"><%= t("hyrax.dashboard.my.facet_label.works") %></span>
5
- <%= render_facet_partials(facet_field_names, response: @response) %>
9
+ <%= facets %>
6
10
  </div>
7
11
  <% end %>
@@ -49,7 +49,7 @@
49
49
  <td><%= req.sender_comment %></td>
50
50
  </tr>
51
51
  <% else %>
52
- <% Rails.logger.error "A proxy request has no sender: #{req.inspect}" %>
52
+ <% Hyrax.logger.error "A proxy request has no sender: #{req.inspect}" %>
53
53
  <% end %>
54
54
  <% end %>
55
55
  </tbody>
@@ -32,7 +32,7 @@
32
32
  <td><%= req.sender_comment %></td>
33
33
  </tr>
34
34
  <% else %>
35
- <% Rails.logger.error "A proxy request has no receiver: #{req.inspect}" %>
35
+ <% Hyrax.logger.error "A proxy request has no receiver: #{req.inspect}" %>
36
36
  <% end %>
37
37
  <% end %>
38
38
  </tbody>
@@ -5,7 +5,7 @@
5
5
  <span class="sr-only"><%= t(:'.sr_only_description', work_title: @proxy_deposit_request.to_s) %></span>
6
6
 
7
7
  <%= simple_form_for @proxy_deposit_request,
8
- url: hyrax.work_transfers_path(@work) do |f| %>
8
+ url: hyrax.work_transfers_path(params[:id]) do |f| %>
9
9
  <%= f.input :transfer_to,
10
10
  placeholder: t(:'.placeholder') %>
11
11
  <%= f.input :sender_comment %>
@@ -2,7 +2,7 @@ apiVersion: v2
2
2
  name: hyrax
3
3
  description: An open-source, Samvera-powered digital repository system
4
4
  type: application
5
- version: 1.5.1
5
+ version: 1.6.0
6
6
  appVersion: 3.3.0
7
7
  dependencies:
8
8
  - name: fcrepo
@@ -163,8 +163,12 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
163
163
  {{- end }}
164
164
  {{- end -}}
165
165
 
166
+ {{- define "hyrax.solr.port" -}}
167
+ {{- .Values.externalSolrPort | default "8983" }}
168
+ {{- end -}}
169
+
166
170
  {{- define "hyrax.solr.url" -}}
167
- {{- printf "http://%s:%s@%s:%s/solr/%s" (include "hyrax.solr.username" .) (include "hyrax.solr.password" .) (include "hyrax.solr.host" .) "8983" (include "hyrax.solr.collectionName" .) -}}
171
+ {{- printf "http://%s:%s@%s:%s/solr/%s" (include "hyrax.solr.username" .) (include "hyrax.solr.password" .) (include "hyrax.solr.host" .) (include "hyrax.solr.port" .) (include "hyrax.solr.collectionName" .) -}}
168
172
  {{- end -}}
169
173
 
170
174
  {{- define "hyrax.zk.fullname" -}}
@@ -38,5 +38,5 @@ data:
38
38
  SOLR_COLLECTION_NAME: {{ template "hyrax.solr.collectionName" . }}
39
39
  SOLR_CONFIGSET_NAME: {{ template "hyrax.fullname" . }}
40
40
  SOLR_HOST: {{ template "hyrax.solr.host" . }}
41
- SOLR_PORT: "8983"
41
+ SOLR_PORT: {{ (include "hyrax.solr.port" .) | quote }}
42
42
  SOLR_URL: {{ template "hyrax.solr.url" . }}
@@ -22,6 +22,7 @@ loadSolrConfigSet: true
22
22
  # ignored if `solr.enabled` is true
23
23
  solrExistingSecret: ""
24
24
  externalSolrHost: ""
25
+ externalSolrPort: ""
25
26
  externalSolrUser: ""
26
27
  externalSolrPassword: ""
27
28
  externalSolrCollection: "hyrax"
data/config/features.rb CHANGED
@@ -47,5 +47,5 @@ Flipflop.configure do
47
47
  default: false,
48
48
  description: "Put the system into read-only mode. Deposits, edits, approvals and anything that makes a change to the data will be disabled."
49
49
  rescue Flipflop::StrategyError, Flipflop::FeatureError => err
50
- Rails.logger.warn "Ignoring #{err}: #{err.message}"
50
+ Hyrax.logger.warn "Ignoring #{err}: #{err.message}"
51
51
  end
@@ -0,0 +1,27 @@
1
+ # frozen_string_literal: true
2
+
3
+ # Taken from https://github.com/trailblazer/reform-rails/issues/86#issuecomment-763120151
4
+ # rubocop:disable Metrics/CyclomaticComplexity
5
+ # rubocop:disable Lint/UselessAssignment
6
+ module Reform
7
+ class Contract < Disposable::Twin
8
+ class Result
9
+ private
10
+
11
+ # this doesn't do nested errors (e.g. )
12
+ def filter_for(method, *args)
13
+ @results.collect { |r| r.public_send(method, *args).to_h }
14
+ .inject({}) { |hah, err| hah.merge(err) { |_key, old_v, new_v| (new_v.is_a?(Array) ? (old_v |= new_v) : old_v.merge(new_v)) } }
15
+ .find_all do |_k, v| # filter :nested=>{:something=>["too nested!"]} #DISCUSS: do we want that here?
16
+ if v.is_a?(Hash)
17
+ nested_errors = v.select { |attr_key, val| attr_key.is_a?(Integer) && val.is_a?(Array) && val.any? }
18
+ v = nested_errors.to_a if nested_errors.any?
19
+ end
20
+ v.is_a?(ActiveModel::DeprecationHandlingMessageArray)
21
+ end.to_h
22
+ end
23
+ end
24
+ end
25
+ end
26
+ # rubocop:enable Metrics/CyclomaticComplexity
27
+ # rubocop:disable Lint/UselessAssignment
@@ -557,7 +557,7 @@ de:
557
557
  actions: Aktion
558
558
  title: Sammlungstitel
559
559
  form_permission:
560
- visibility: Sichtbarkeit <small> Wer sollte diesen Inhalt anzeigen oder herunterladen können? </ Small>
560
+ visibility: Sichtbarkeit <small> Wer sollte diesen Inhalt anzeigen oder herunterladen können? </small>
561
561
  form_permission_under_embargo:
562
562
  help_html: "<strong>Diese Arbeit ist unter Embargo.</strong> Hier können Sie die Einstellungen des Embargos ändern, oder Sie können den %{edit_link} besuchen, um ihn zu deaktivieren."
563
563
  legend_html: Sichtbarkeit <small>Wer sollte in der Lage sein, diesen Inhalt anzusehen oder herunterzuladen?</small>
@@ -596,6 +596,7 @@ de:
596
596
  legend_html: Miniaturansicht
597
597
  form_visibility_component:
598
598
  visibility: Sichtbarkeit
599
+ subtitle_html: <small>Wer sollte diesen Inhalt anzeigen oder herunterladen können?</small>
599
600
  inspect_work:
600
601
  back_to: Zurück zu
601
602
  entity_id: Mandanten-ID
@@ -588,6 +588,7 @@ en:
588
588
  legend_html: Thumbnail
589
589
  form_visibility_component:
590
590
  visibility: Visibility
591
+ subtitle_html: <small>Who should be able to view or download this content?</small>
591
592
  inspect_work:
592
593
  back_to: Back to
593
594
  entity_id: Entity ID
@@ -1687,6 +1688,8 @@ en:
1687
1688
  note_html: Keep to myself with option to share.
1688
1689
  text: Private
1689
1690
  restricted_title_attr: Change the visibility of this resource
1691
+ unknown:
1692
+ text: Unknown
1690
1693
  work_button_row:
1691
1694
  attach_child: Attach Child
1692
1695
  workflow:
@@ -601,6 +601,7 @@ es:
601
601
  legend_html: Miniatura
602
602
  form_visibility_component:
603
603
  visibility: La visibilidad
604
+ subtitle_html: <small>¿Quién debería poder ver o descargar este contenido?</small>
604
605
  inspect_work:
605
606
  back_to: De regreso
606
607
  entity_id: ID de entidad
@@ -563,7 +563,7 @@ fr:
563
563
  actions: action
564
564
  title: Titre de la collection
565
565
  form_permission:
566
- visibility: Visibilité <small> Qui devrait être en mesure d’afficher ou de télécharger ce contenu? </ Small>
566
+ visibility: Visibilité <small> Qui devrait être en mesure d’afficher ou de télécharger ce contenu? </small>
567
567
  form_permission_under_embargo:
568
568
  help_html: "<strong>Ce travail est sous embargo.</strong> Vous pouvez modifier les paramètres de l'embargo ici, ou vous pouvez visiter le %{edit_link} pour le désactiver."
569
569
  legend_html: Visibilité <small>Qui devrait pouvoir afficher ou télécharger ce contenu?</small>
@@ -602,6 +602,7 @@ fr:
602
602
  legend_html: La vignette
603
603
  form_visibility_component:
604
604
  visibility: Visibilité
605
+ subtitle_html: <small>Qui devrait être en mesure d’afficher ou de télécharger ce contenu?</small>
605
606
  inspect_work:
606
607
  back_to: Retour à
607
608
  entity_id: ID d'entité
@@ -601,6 +601,7 @@ it:
601
601
  legend_html: Thumbnail
602
602
  form_visibility_component:
603
603
  visibility: Visibilità
604
+ subtitle_html: <small>Chi dovrebbe essere in grado di visualizzare o scaricare questo contenuto?</small>
604
605
  inspect_work:
605
606
  back_to: Torna a
606
607
  entity_id: ID entità
@@ -596,6 +596,7 @@ pt-BR:
596
596
  legend_html: Miniatura
597
597
  form_visibility_component:
598
598
  visibility: Visibilidade
599
+ subtitle_html: <small>Quem deve conseguir visualizar ou baixar este conteúdo?</small>
599
600
  inspect_work:
600
601
  back_to: De volta a
601
602
  entity_id: ID da entidade
@@ -599,6 +599,7 @@ zh:
599
599
  legend_html: 缩略图
600
600
  form_visibility_component:
601
601
  visibility: 可见性
602
+ subtitle_html: <small>谁应该能够查看或下载此内容?</ small>
602
603
  inspect_work:
603
604
  back_to: 回到
604
605
  entity_id: 实体ID