hyrax 5.0.0.rc2 → 5.0.0.rc3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (307) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +14 -0
  3. data/.dassie/app/listeners/hyrax_listener.rb +81 -0
  4. data/.dassie/config/environments/test.rb +0 -5
  5. data/.dassie/config/initializers/hyrax.rb +5 -0
  6. data/.dassie/config/initializers/publisher.rb +3 -0
  7. data/.dassie/config/initializers/riiif.rb +77 -0
  8. data/.gitignore +4 -0
  9. data/.koppie/.env +2 -2
  10. data/.koppie/app/forms/collection_resource_form.rb +1 -0
  11. data/.koppie/app/indexers/collection_resource_indexer.rb +1 -0
  12. data/.koppie/app/listeners/hyrax_listener.rb +81 -0
  13. data/.koppie/app/models/collection.rb +1 -1
  14. data/.koppie/app/models/collection_resource.rb +1 -0
  15. data/.koppie/config/analytics.yml +5 -5
  16. data/.koppie/config/initializers/publisher.rb +3 -0
  17. data/.koppie/config/initializers/riiif.rb +78 -0
  18. data/.koppie/config/metadata/collection_resource.yaml +8 -166
  19. data/.koppie/config/metadata/sample_metadata.yaml +4 -0
  20. data/CONTAINERS.md +39 -2
  21. data/Dockerfile +14 -11
  22. data/Gemfile +8 -7
  23. data/README.md +2 -0
  24. data/app/actors/hyrax/actors/base_actor.rb +6 -3
  25. data/app/actors/hyrax/actors/file_actor.rb +1 -1
  26. data/app/actors/hyrax/actors/lease_actor.rb +3 -6
  27. data/app/assets/javascripts/hyrax/save_work/uploaded_files.es6 +10 -2
  28. data/app/assets/stylesheets/hyrax/sidebar.scss +6 -1
  29. data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +1 -1
  30. data/app/controllers/concerns/hyrax/local_file_downloads_controller_behavior.rb +12 -19
  31. data/app/controllers/concerns/hyrax/stream_file_downloads_controller_behavior.rb +54 -0
  32. data/app/controllers/concerns/hyrax/valkyrie_downloads_controller_behavior.rb +38 -9
  33. data/app/controllers/concerns/hyrax/works_controller_behavior.rb +19 -14
  34. data/app/controllers/hyrax/admin/admin_sets_controller.rb +2 -2
  35. data/app/controllers/hyrax/admin/analytics/work_reports_controller.rb +5 -5
  36. data/app/controllers/hyrax/dashboard/collections_controller.rb +2 -2
  37. data/app/controllers/hyrax/downloads_controller.rb +1 -0
  38. data/app/controllers/hyrax/file_sets_controller.rb +3 -2
  39. data/app/controllers/hyrax/my/collections_controller.rb +1 -1
  40. data/app/forms/concerns/hyrax/basic_metadata_form_fields_behavior.rb +1 -0
  41. data/app/forms/concerns/hyrax/contained_in_works_behavior.rb +24 -0
  42. data/app/forms/concerns/hyrax/deposit_agreement_behavior.rb +12 -0
  43. data/app/forms/concerns/hyrax/leaseability_behavior.rb +49 -0
  44. data/app/forms/concerns/hyrax/permission_behavior.rb +20 -0
  45. data/app/forms/hyrax/forms/administrative_set_form.rb +1 -5
  46. data/app/forms/hyrax/forms/collection_form.rb +19 -0
  47. data/app/forms/hyrax/forms/file_set_form.rb +5 -0
  48. data/app/forms/hyrax/forms/pcdm_collection_form.rb +1 -5
  49. data/app/forms/hyrax/forms/pcdm_object_form.rb +13 -22
  50. data/app/forms/hyrax/forms/resource_batch_edit_form.rb +7 -2
  51. data/app/forms/hyrax/forms/resource_form.rb +30 -100
  52. data/app/forms/hyrax/forms.rb +52 -0
  53. data/app/helpers/hyrax/hyrax_helper_behavior.rb +2 -0
  54. data/app/indexers/{hyrax → concerns/hyrax}/location_indexer.rb +1 -5
  55. data/app/indexers/{hyrax → concerns/hyrax}/permission_indexer.rb +2 -2
  56. data/app/indexers/{hyrax → concerns/hyrax}/visibility_indexer.rb +1 -1
  57. data/app/indexers/hyrax/administrative_set_indexer.rb +5 -17
  58. data/app/indexers/hyrax/indexers/administrative_set_indexer.rb +25 -0
  59. data/app/indexers/hyrax/indexers/file_set_indexer.rb +144 -0
  60. data/app/indexers/hyrax/indexers/pcdm_collection_indexer.rb +27 -0
  61. data/app/indexers/hyrax/indexers/pcdm_object_indexer.rb +72 -0
  62. data/app/indexers/hyrax/indexers/resource_indexer.rb +86 -0
  63. data/app/indexers/hyrax/indexers.rb +54 -0
  64. data/app/indexers/hyrax/pcdm_collection_indexer.rb +5 -18
  65. data/app/indexers/hyrax/valkyrie_collection_indexer.rb +6 -4
  66. data/app/indexers/hyrax/valkyrie_file_set_indexer.rb +5 -136
  67. data/app/indexers/hyrax/valkyrie_indexer.rb +8 -112
  68. data/app/indexers/hyrax/valkyrie_work_indexer.rb +5 -64
  69. data/app/indexers/hyrax/work_indexer.rb +1 -0
  70. data/app/jobs/create_work_job.rb +1 -0
  71. data/app/models/admin_set.rb +20 -1
  72. data/app/models/collection.rb +5 -0
  73. data/app/models/concerns/hyrax/ability/admin_set_ability.rb +13 -28
  74. data/app/models/concerns/hyrax/ability/collection_ability.rb +26 -28
  75. data/app/models/concerns/hyrax/ability/resource_ability.rb +19 -0
  76. data/app/models/concerns/hyrax/ability.rb +11 -9
  77. data/app/models/concerns/hyrax/collection_behavior.rb +8 -0
  78. data/app/models/concerns/hyrax/solr_document_behavior.rb +15 -5
  79. data/app/models/concerns/hyrax/work_behavior.rb +4 -0
  80. data/app/models/featured_work.rb +12 -4
  81. data/app/models/file_set.rb +5 -0
  82. data/app/models/hyrax/administrative_set.rb +1 -1
  83. data/app/models/hyrax/change_set.rb +2 -2
  84. data/app/models/hyrax/file_metadata.rb +34 -7
  85. data/app/models/hyrax/file_set.rb +2 -2
  86. data/app/models/hyrax/group.rb +9 -38
  87. data/app/models/hyrax/group_behavior.rb +58 -0
  88. data/app/models/hyrax/model_registry.rb +111 -0
  89. data/app/models/hyrax/pcdm_collection.rb +1 -7
  90. data/app/models/hyrax/resource.rb +66 -8
  91. data/app/models/hyrax/statistic.rb +1 -1
  92. data/app/models/hyrax/work.rb +1 -7
  93. data/app/presenters/hyrax/collapsable_section_presenter.rb +7 -3
  94. data/app/presenters/hyrax/file_set_presenter.rb +8 -6
  95. data/app/presenters/hyrax/lease_presenter.rb +4 -0
  96. data/app/presenters/hyrax/menu_presenter.rb +14 -2
  97. data/app/presenters/hyrax/pcdm_member_presenter_factory.rb +1 -1
  98. data/app/presenters/hyrax/version_list_presenter.rb +6 -4
  99. data/app/search_builders/hyrax/admin_set_search_builder.rb +1 -1
  100. data/app/search_builders/hyrax/catalog_search_builder.rb +2 -2
  101. data/app/search_builders/hyrax/dashboard/collections_search_builder.rb +5 -3
  102. data/app/search_builders/hyrax/exposed_models_relation.rb +1 -1
  103. data/app/search_builders/hyrax/file_set_search_builder.rb +1 -1
  104. data/app/search_builders/hyrax/filter_by_type.rb +3 -2
  105. data/app/search_builders/hyrax/member_with_files_search_builder.rb +1 -1
  106. data/app/search_builders/hyrax/my/collections_search_builder.rb +2 -2
  107. data/app/search_builders/hyrax/my/find_works_search_builder.rb +8 -3
  108. data/app/services/hyrax/access_control_list.rb +21 -4
  109. data/app/services/hyrax/action/create_valkyrie_work.rb +80 -0
  110. data/app/services/hyrax/admin_set_create_service.rb +7 -3
  111. data/app/services/hyrax/admin_set_service.rb +2 -2
  112. data/app/services/hyrax/collections/collection_member_search_service.rb +2 -0
  113. data/app/services/hyrax/collections/permissions_service.rb +27 -9
  114. data/app/services/hyrax/custom_queries/find_collections_by_type.rb +1 -1
  115. data/app/services/hyrax/custom_queries/find_file_metadata.rb +1 -1
  116. data/app/services/hyrax/custom_queries/navigators/find_files.rb +1 -1
  117. data/app/services/hyrax/custom_queries/navigators/parent_work_navigator.rb +1 -1
  118. data/app/services/hyrax/edit_permissions_service.rb +1 -1
  119. data/app/services/hyrax/embargo_manager.rb +1 -1
  120. data/app/services/hyrax/file_set_file_service.rb +21 -10
  121. data/app/services/hyrax/form_factory.rb +1 -1
  122. data/app/services/hyrax/lease_manager.rb +39 -16
  123. data/app/services/hyrax/lease_service.rb +12 -6
  124. data/app/services/hyrax/listeners/acl_index_listener.rb +1 -1
  125. data/app/services/hyrax/listeners/active_fedora_acl_index_listener.rb +1 -1
  126. data/app/services/hyrax/listeners/member_cleanup_listener.rb +15 -1
  127. data/app/services/hyrax/listeners/object_lifecycle_listener.rb +5 -1
  128. data/app/services/hyrax/listeners/trophy_cleanup_listener.rb +2 -1
  129. data/app/services/hyrax/listeners/workflow_listener.rb +13 -0
  130. data/app/services/hyrax/listeners.rb +2 -1
  131. data/app/services/hyrax/location_service.rb +3 -0
  132. data/app/services/hyrax/multiple_membership_checker.rb +1 -1
  133. data/app/services/hyrax/simple_schema_loader.rb +1 -1
  134. data/app/services/hyrax/solr_service.rb +19 -5
  135. data/app/services/hyrax/statistics/collections/over_time.rb +1 -1
  136. data/app/services/hyrax/statistics/query_service.rb +6 -0
  137. data/app/services/hyrax/valkyrie_persist_derivatives.rb +11 -4
  138. data/app/services/hyrax/valkyrie_upload.rb +1 -1
  139. data/app/services/hyrax/work_uploads_handler.rb +5 -4
  140. data/app/views/_user_util_links.html.erb +1 -1
  141. data/app/views/collections/edit_fields/_based_near.html.erb +11 -7
  142. data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb +67 -67
  143. data/app/views/hyrax/admin/admin_sets/edit.html.erb +1 -1
  144. data/app/views/hyrax/admin/collection_types/_form_participants.html.erb +3 -1
  145. data/app/views/hyrax/base/_attribute_rows.html.erb +1 -0
  146. data/app/views/hyrax/base/_base_form_files_prepend.html.erb +4 -0
  147. data/app/views/hyrax/base/_form_files.html.erb +65 -64
  148. data/app/views/hyrax/base/show.html.erb +2 -3
  149. data/app/views/hyrax/collections/show.html.erb +7 -9
  150. data/app/views/hyrax/dashboard/_sidebar.html.erb +4 -3
  151. data/app/views/hyrax/dashboard/collections/_form_share_table.html.erb +2 -2
  152. data/app/views/hyrax/file_sets/media_display/_audio.html.erb +1 -1
  153. data/app/views/hyrax/file_sets/media_display/_video.html.erb +1 -1
  154. data/app/views/hyrax/my/facet.html.erb +1 -1
  155. data/app/views/layouts/_head_tag_content.html.erb +1 -0
  156. data/app/views/shared/_footer.html.erb +1 -1
  157. data/chart/hyrax/Chart.yaml +3 -3
  158. data/chart/hyrax/values.yaml +9 -1
  159. data/config/initializers/listeners.rb +1 -1
  160. data/config/locales/hyrax.de.yml +5 -0
  161. data/config/locales/hyrax.en.yml +10 -0
  162. data/config/locales/hyrax.es.yml +5 -0
  163. data/config/locales/hyrax.fr.yml +5 -0
  164. data/config/locales/hyrax.it.yml +5 -0
  165. data/config/locales/hyrax.pt-BR.yml +5 -0
  166. data/config/locales/hyrax.zh.yml +5 -0
  167. data/config/metadata/basic_metadata.yaml +1 -0
  168. data/config/metadata/core_metadata.yaml +2 -0
  169. data/config/metadata/file_set_metadata.yaml +2 -0
  170. data/docker-compose-koppie.yml +3 -3
  171. data/docker-compose-sirenia.yml +3 -3
  172. data/documentation/developing-your-hyrax-based-app.md +77 -60
  173. data/hyrax.gemspec +9 -2
  174. data/lib/generators/hyrax/collection_resource/templates/collection_indexer.rb.erb +1 -1
  175. data/lib/generators/hyrax/config_generator.rb +12 -0
  176. data/lib/generators/hyrax/install_generator.rb +37 -7
  177. data/lib/generators/hyrax/listeners_generator.rb +18 -0
  178. data/lib/generators/hyrax/models_generator.rb +1 -10
  179. data/lib/generators/hyrax/riiif_generator.rb +6 -4
  180. data/lib/generators/hyrax/templates/.env +9 -0
  181. data/lib/generators/hyrax/templates/.lando.yml +50 -0
  182. data/lib/generators/hyrax/templates/app/listeners/hyrax_listener.rb +81 -0
  183. data/lib/generators/hyrax/templates/app/models/file_set.rb +1 -2
  184. data/lib/generators/hyrax/templates/config/initializers/1_valkyrie.rb +102 -0
  185. data/lib/generators/hyrax/templates/config/initializers/file_services.rb +6 -0
  186. data/lib/generators/hyrax/templates/config/initializers/hyrax.rb +41 -5
  187. data/lib/generators/hyrax/templates/config/initializers/publisher.rb +3 -0
  188. data/lib/generators/hyrax/templates/config/initializers/riiif.rb +77 -0
  189. data/lib/generators/hyrax/templates/config/locales/hyrax.de.yml +1 -1
  190. data/lib/generators/hyrax/templates/config/locales/hyrax.en.yml +1 -1
  191. data/lib/generators/hyrax/templates/config/locales/hyrax.es.yml +1 -1
  192. data/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml +1 -1
  193. data/lib/generators/hyrax/templates/config/locales/hyrax.it.yml +1 -1
  194. data/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml +1 -1
  195. data/lib/generators/hyrax/templates/config/locales/hyrax.zh.yml +1 -1
  196. data/lib/generators/hyrax/templates/config/redis.yml +3 -6
  197. data/lib/generators/hyrax/templates/config/valkyrie_index.yml +4 -9
  198. data/lib/generators/hyrax/work_resource/templates/indexer.rb.erb +1 -1
  199. data/lib/hyrax/configuration.rb +95 -7
  200. data/lib/hyrax/indexer.rb +1 -1
  201. data/lib/hyrax/publisher.rb +5 -2
  202. data/lib/hyrax/resource_sync/change_list_writer.rb +1 -1
  203. data/lib/hyrax/resource_sync/resource_list_writer.rb +1 -1
  204. data/lib/hyrax/specs/capybara.rb +1 -0
  205. data/lib/hyrax/specs/shared_specs/hydra_works.rb +78 -20
  206. data/lib/hyrax/specs/shared_specs/indexers.rb +1 -1
  207. data/lib/hyrax/transactions/admin_set_destroy.rb +2 -1
  208. data/lib/hyrax/transactions/container.rb +5 -0
  209. data/lib/hyrax/transactions/steps/add_to_parent.rb +1 -0
  210. data/lib/hyrax/transactions/steps/check_for_default_admin_set.rb +32 -0
  211. data/lib/hyrax/transactions/steps/check_for_empty_admin_set.rb +1 -1
  212. data/lib/hyrax/transactions/steps/save.rb +2 -1
  213. data/lib/hyrax/transactions/steps/set_user_as_creator.rb +1 -1
  214. data/lib/hyrax/transactions/steps/update_work_members.rb +2 -0
  215. data/lib/hyrax/version.rb +1 -1
  216. data/lib/hyrax.rb +1 -0
  217. data/lib/tasks/embargo_lease.rake +1 -0
  218. data/lib/valkyrie/indexing/solr/indexing_adapter.rb +21 -7
  219. data/lib/wings/active_fedora_converter/default_work.rb +4 -5
  220. data/lib/wings/active_fedora_converter/file_metadata_node.rb +1 -1
  221. data/lib/wings/model_registry.rb +8 -0
  222. data/lib/wings/model_transformer.rb +19 -2
  223. data/lib/wings/orm_converter.rb +4 -0
  224. data/lib/wings/services/custom_queries/find_ids_by_model.rb +2 -2
  225. data/lib/wings/valkyrie/query_service.rb +5 -2
  226. data/lib/wings.rb +3 -0
  227. data/spec/factories/access_control.rb +12 -0
  228. data/spec/factories/admin_sets.rb +32 -0
  229. data/spec/factories/admin_sets_lw.rb +222 -0
  230. data/spec/factories/administrative_sets.rb +79 -0
  231. data/spec/factories/api_items.rb +92 -0
  232. data/spec/factories/collection_branding_infos.rb +12 -0
  233. data/spec/factories/collection_type_participants.rb +9 -0
  234. data/spec/factories/collection_types.rb +139 -0
  235. data/spec/factories/collections.rb +282 -0
  236. data/spec/factories/collections_factory.rb +107 -0
  237. data/spec/factories/content_blocks.rb +5 -0
  238. data/spec/factories/counter_metrics.rb +12 -0
  239. data/spec/factories/featured_works.rb +5 -0
  240. data/spec/factories/file_sets.rb +45 -0
  241. data/spec/factories/generic_works.rb +200 -0
  242. data/spec/factories/hyrax_collection.rb +92 -0
  243. data/spec/factories/hyrax_default_admin_set.rb +7 -0
  244. data/spec/factories/hyrax_embargo.rb +18 -0
  245. data/spec/factories/hyrax_file_metadata.rb +92 -0
  246. data/spec/factories/hyrax_file_set.rb +129 -0
  247. data/spec/factories/hyrax_lease.rb +18 -0
  248. data/spec/factories/hyrax_resource.rb +15 -0
  249. data/spec/factories/hyrax_work.rb +221 -0
  250. data/spec/factories/object_id.rb +7 -0
  251. data/spec/factories/operations.rb +22 -0
  252. data/spec/factories/permission.rb +7 -0
  253. data/spec/factories/permission_template_accesses.rb +17 -0
  254. data/spec/factories/permission_templates.rb +111 -0
  255. data/spec/factories/proxy_deposit_requests.rb +7 -0
  256. data/spec/factories/single_use_links.rb +14 -0
  257. data/spec/factories/sipity_entities.rb +17 -0
  258. data/spec/factories/uploaded_files.rb +11 -0
  259. data/spec/factories/users.rb +52 -0
  260. data/spec/factories/workflow_actions.rb +7 -0
  261. data/spec/factories/workflow_states.rb +7 -0
  262. data/spec/factories/workflows.rb +7 -0
  263. data/spec/support/book_resource.rb +36 -0
  264. data/spec/support/can_can_overrides.rb +43 -0
  265. data/spec/support/clean_solr.rb +7 -0
  266. data/spec/support/controller_level_helpers.rb +27 -0
  267. data/spec/support/factory_helpers.rb +94 -0
  268. data/spec/support/fakes/fake_actor.rb +22 -0
  269. data/spec/support/fakes/fake_authority.rb +14 -0
  270. data/spec/support/fakes/fake_search_builder_scope.rb +44 -0
  271. data/spec/support/fakes/indexing_adapter.rb +17 -0
  272. data/spec/support/fakes/test_hydra_group_service.rb +55 -0
  273. data/spec/support/features/batch_edit_actions.rb +37 -0
  274. data/spec/support/features/session_helpers.rb +15 -0
  275. data/spec/support/features/workflow.rb +10 -0
  276. data/spec/support/features.rb +11 -0
  277. data/spec/support/form_with_validations.rb +15 -0
  278. data/spec/support/input_support.rb +12 -0
  279. data/spec/support/logging_formatter.rb +67 -0
  280. data/spec/support/matchers/api_responses.rb +27 -0
  281. data/spec/support/matchers/collection_type_property_matchers.rb +30 -0
  282. data/spec/support/matchers/embargo.rb +9 -0
  283. data/spec/support/matchers/lease.rb +9 -0
  284. data/spec/support/matchers/match_valkyrie_ids_with_af_ids.rb +12 -0
  285. data/spec/support/matchers/pcdm_matchers.rb +34 -0
  286. data/spec/support/matchers/permission.rb +31 -0
  287. data/spec/support/matchers/response_matchers.rb +8 -0
  288. data/spec/support/optional_example.rb +17 -0
  289. data/spec/support/rake.rb +42 -0
  290. data/spec/support/selectors.rb +112 -0
  291. data/spec/support/shared_examples_for_collection_presenter.rb +44 -0
  292. data/spec/support/simple_work.rb +28 -0
  293. data/spec/support/spec_statistic.rb +24 -0
  294. data/spec/support/speedup.rb +7 -0
  295. data/spec/support/statistic_helper.rb +10 -0
  296. data/spec/support/valkyrie_indexing.rb +2 -0
  297. data/spec/support/wings_models.rb +9 -0
  298. data/template.rb +1 -3
  299. metadata +112 -30
  300. data/app/indexers/hyrax/resource_indexer.rb +0 -15
  301. data/app/models/concerns/hyrax/riiif_file.rb +0 -30
  302. data/app/services/hyrax/characterization/model_wrapper.rb +0 -0
  303. data/app/services/hyrax/custom_queries/find_by_collection_type.rb +0 -0
  304. data/app/services/hyrax/query_service.rb +0 -0
  305. data/app/services/hyrax/riiif_file_resolver.rb +0 -50
  306. data/lib/hyrax/specs/disable_animations_in_test_environment.rb +0 -53
  307. /data/app/indexers/{hyrax → concerns/hyrax}/thumbnail_indexer.rb +0 -0
@@ -10,7 +10,11 @@ module Hyrax
10
10
  # @param [Dry::Events::Event] event
11
11
  # @return [void]
12
12
  def on_object_deleted(event)
13
- ContentDeleteEventJob.perform_later(event[:id].to_s, event[:user])
13
+ # Accessing a non-existent key on a Dry::Events::Event will raise a KeyError; hence
14
+ # we cast the event to a hash
15
+ event = event.to_h
16
+ object_id = event[:object]&.id || event[:id]
17
+ ContentDeleteEventJob.perform_later(object_id.to_s, event[:user])
14
18
  end
15
19
 
16
20
  ##
@@ -9,7 +9,8 @@ module Hyrax
9
9
  # @param [Dry::Events::Event] event
10
10
  # @return [void]
11
11
  def on_object_deleted(event)
12
- Trophy.where(work_id: event[:id]).destroy_all
12
+ object_id = event[:object]&.id || event[:id]
13
+ Trophy.where(work_id: object_id).destroy_all
13
14
  rescue StandardError => err
14
15
  Hyrax.logger.warn "Failed to delete trophies for #{event[:id]}. " \
15
16
  'These trophies might be orphaned.' \
@@ -22,6 +22,7 @@ module Hyrax
22
22
  # @param [Dry::Events::Event] event
23
23
  # @return [void]
24
24
  def on_object_deposited(event)
25
+ event = event.to_h
25
26
  return Hyrax.logger.warn("Skipping workflow initialization for #{event[:object]}; no user is given\n\t#{event}") if
26
27
  event[:user].blank?
27
28
 
@@ -30,6 +31,18 @@ module Hyrax
30
31
  # don't error on known sipity error types; log instead
31
32
  Hyrax.logger.error(err)
32
33
  end
34
+
35
+ ##
36
+ # Called when 'object.deleted' event is published
37
+ # @param [Dry::Events::Event] event
38
+ # @return [void]
39
+ def on_object_deleted(event)
40
+ event = event.to_h
41
+ return unless event[:object]
42
+ gid = Hyrax::ValkyrieGlobalIdProxy.new(resource: event[:object]).to_global_id
43
+ return if gid.blank?
44
+ Sipity::Entity.where(proxy_for_global_id: gid.to_s).destroy_all
45
+ end
33
46
  end
34
47
  end
35
48
  end
@@ -17,7 +17,8 @@ module Hyrax
17
17
  module Listeners
18
18
  extend ActiveSupport::Autoload
19
19
 
20
- autoload :AclIndexListener
20
+ autoload :ACLIndexListener
21
+ autoload :ActiveFedoraACLIndexListener
21
22
  autoload :BatchNotificationListener
22
23
  autoload :FileMetadataListener
23
24
  autoload :FileSetLifecycleListener
@@ -10,6 +10,9 @@ module Hyrax
10
10
  Rails.cache.fetch(cache_key(id), expires_in: CACHE_EXPIRATION) do
11
11
  label.call(find(id))
12
12
  end
13
+ rescue URI::InvalidURIError
14
+ # Old data may be just a string, display it.
15
+ uri
13
16
  end
14
17
 
15
18
  private
@@ -145,7 +145,7 @@ module Hyrax
145
145
  def collection_titles_from_list(collection_list)
146
146
  collection_list.map do |collection|
147
147
  collection.title.first
148
- end.to_sentence
148
+ end.sort.to_sentence
149
149
  end
150
150
  end
151
151
  end
@@ -15,7 +15,7 @@ module Hyrax
15
15
  # types
16
16
  def attributes_for(schema:)
17
17
  definitions(schema).each_with_object({}) do |definition, hash|
18
- hash[definition.name] = definition.type
18
+ hash[definition.name] = definition.type.meta(definition.config)
19
19
  end
20
20
  end
21
21
 
@@ -9,6 +9,22 @@ module Hyrax
9
9
  class SolrService
10
10
  COMMIT_PARAMS = { softCommit: true }.freeze
11
11
 
12
+ ##
13
+ # @!group Class Attributes
14
+ #
15
+ # @!attribute additional_solr_get_and_post_params
16
+ #
17
+ # ActiveFedora::SolrService always assumed that it would pass `qt: 'standard'`. However, as
18
+ # Valkyrie arrived, we have a case where we would not pass the `qt: standard`. We're favoring
19
+ # a default value to preserve prior expectations that ActiveFedora::SolrService set and to not
20
+ # suddenly break those that switch to Valkyrie and Hyrax::SolrService.
21
+ #
22
+ # @return [Hash<Symbol, String>]
23
+ # @see https://github.com/samvera/hyrax/pull/6677
24
+ class_attribute :additional_solr_get_and_post_params, default: { qt: 'standard' }
25
+ # @!endgroup Class Attributes
26
+ ##
27
+
12
28
  ##
13
29
  # @!attribute [r] use_valkyrie
14
30
  # @private
@@ -17,7 +33,7 @@ module Hyrax
17
33
  delegate :commit, to: :connection
18
34
 
19
35
  def initialize(use_valkyrie: Hyrax.config.query_index_from_valkyrie)
20
- @old_service = ActiveFedora::SolrService
36
+ @old_service = ActiveFedora::SolrService # What hopefully will be the lone reference to ActiveFedora::SolrService
21
37
  @use_valkyrie = use_valkyrie
22
38
  end
23
39
 
@@ -46,9 +62,8 @@ module Hyrax
46
62
  def get(query = nil, **args)
47
63
  # Make Hyrax.config.solr_select_path the default SOLR path
48
64
  solr_path = args.delete(:path) || Hyrax.config.solr_select_path
49
- args = args.merge(q: query) if query.present?
65
+ args = args.merge(additional_solr_get_and_post_params.merge(q: query)) if query.present?
50
66
 
51
- args = args.merge(qt: 'standard') unless query.blank? || use_valkyrie
52
67
  connection.get(solr_path, params: args)
53
68
  end
54
69
 
@@ -66,9 +81,8 @@ module Hyrax
66
81
  def post(query = nil, **args)
67
82
  # Make Hyrax.config.solr_select_path the default SOLR path
68
83
  solr_path = args.delete(:path) || Hyrax.config.solr_select_path
69
- args = args.merge(q: query) if query.present?
84
+ args = args.merge(additional_solr_get_and_post_params.merge(q: query)) if query.present?
70
85
 
71
- args = args.merge(qt: 'standard') unless query.blank? || use_valkyrie
72
86
  connection.post(solr_path, data: args)
73
87
  end
74
88
 
@@ -7,7 +7,7 @@ module Hyrax
7
7
 
8
8
  def relation
9
9
  AbstractTypeRelation
10
- .new(allowable_types: [Hyrax.config.collection_class])
10
+ .new(allowable_types: Hyrax::ModelRegistry.collection_classes)
11
11
  end
12
12
  end
13
13
  end
@@ -1,7 +1,13 @@
1
1
  # frozen_string_literal: true
2
2
  module Hyrax
3
3
  module Statistics
4
+ ##
5
+ # @deprecated for removal in 6.0.0
4
6
  class QueryService
7
+ extend Deprecation
8
+ self.deprecation_horizon = 'hyrax version 6.0.0'
9
+ deprecation_deprecate :initialize
10
+
5
11
  # query to find works created during the time range
6
12
  # @param [DateTime] start_datetime starting date time for range query
7
13
  # @param [DateTime] end_datetime ending date time for range query
@@ -43,9 +43,16 @@ module Hyrax
43
43
  # @return [Hyrax::FileSet]
44
44
  def self.fileset_for_directives(directives)
45
45
  path = URI(directives.fetch(:url)).path
46
- id = path.sub(Hyrax.config.derivatives_path.to_s, "")
47
- .delete('/')
48
- .match(/^(.*)-\w*(\.\w+)*$/) { |m| m[1] }
46
+ # checks if it's a file path, else assuming it is already an id
47
+ # Hyrax::FileSetDerivativesService#extract_full_text passes in the raw uri
48
+ # and not a derivative_url like the other derivative formats
49
+ id = if path.include?("/")
50
+ path.sub(Hyrax.config.derivatives_path.to_s, "")
51
+ .delete('/')
52
+ .match(/^(.*)-\w*(\.\w+)*$/) { |m| m[1] }
53
+ else
54
+ path
55
+ end
49
56
  raise "Could not extract fileset id from path #{path}" unless id
50
57
 
51
58
  Hyrax.metadata_adapter.query_service.find_by(id: id)
@@ -59,7 +66,7 @@ module Hyrax
59
66
  if directives.key?(:container)
60
67
  "Hyrax::FileMetadata::Use::#{directives[:container].upcase}".constantize
61
68
  else
62
- Hyrax::FileMetadata::Use::THUMBNAIL
69
+ Hyrax::FileMetadata::Use::THUMBNAIL_IMAGE
63
70
  end
64
71
  end
65
72
  end
@@ -55,12 +55,12 @@ class Hyrax::ValkyrieUpload
55
55
 
56
56
  saved_metadata = Hyrax.persister.save(resource: file_metadata)
57
57
  saved_metadata.original_filename = filename if saved_metadata.original_filename.blank?
58
- Hyrax.publisher.publish("file.uploaded", metadata: saved_metadata)
59
58
 
60
59
  add_file_to_file_set(file_set: file_set,
61
60
  file_metadata: saved_metadata,
62
61
  user: user)
63
62
 
63
+ Hyrax.publisher.publish("file.uploaded", metadata: saved_metadata)
64
64
  Hyrax.publisher.publish('file.metadata.updated', metadata: saved_metadata, user: user)
65
65
 
66
66
  saved_metadata
@@ -93,7 +93,10 @@ module Hyrax
93
93
  event_payloads = files.each_with_object([]) { |file, arry| arry << make_file_set_and_ingest(file) }
94
94
  @persister.save(resource: work)
95
95
  Hyrax.publisher.publish('object.metadata.updated', object: work, user: files.first.user)
96
- event_payloads.each { |payload| Hyrax.publisher.publish('file.set.attached', payload) }
96
+ event_payloads.each do |payload|
97
+ payload.delete(:job).enqueue
98
+ Hyrax.publisher.publish('file.set.attached', payload)
99
+ end
97
100
  end
98
101
  end
99
102
 
@@ -114,9 +117,7 @@ module Hyrax
114
117
  file_set.permission_manager.acl.save if file_set.permission_manager.acl.pending_changes?
115
118
  append_to_work(file_set)
116
119
 
117
- ValkyrieIngestJob.perform_later(file)
118
-
119
- { file_set: file_set, user: file.user }
120
+ { file_set: file_set, user: file.user, job: ValkyrieIngestJob.new(file) }
120
121
  end
121
122
 
122
123
  ##
@@ -10,7 +10,7 @@
10
10
  <span><%= current_user.name %></span>
11
11
  <span class="sr-only"> <%= t("hyrax.toolbar.profile.sr_target") %></span>
12
12
  </a>
13
- <div class="dropdown-menu" aria-labelledby="navbarDropdown">
13
+ <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
14
14
  <%= link_to "My Profile", hyrax.dashboard_profile_path(current_user), class: 'dropdown-item' %>
15
15
  <%= link_to t("hyrax.toolbar.dashboard.menu"), hyrax.dashboard_path, class: "dropdown-item" %>
16
16
  <div class="dropdown-divider"></div>
@@ -1,8 +1,12 @@
1
1
  <%= f.input key,
2
- as: :multi_value,
3
- input_html: {
4
- class: 'form-control',
5
- data: { 'autocomplete-url' => "/authorities/search/geonames",
6
- 'autocomplete' => key }
7
- },
8
- required: f.object.required?(key) %>
2
+ as: :controlled_vocabulary,
3
+ placeholder: 'Search for a location',
4
+ input_html: {
5
+ class: 'form-control',
6
+ data: { 'autocomplete-url' => "/authorities/search/geonames",
7
+ 'autocomplete' => key }
8
+ },
9
+ ### Required for the ControlledVocabulary javascript:
10
+ wrapper_html: { data: { 'autocomplete-url' => "/authorities/search/geonames",
11
+ 'field-name' => key }},
12
+ required: f.object.required?(key) %>
@@ -1,74 +1,74 @@
1
- <div id="participants" class="tab-pane">
2
- <div class="card labels edit-sharing-tab">
3
- <div class="card-body">
4
- <section class="section-add-sharing clearfix">
5
- <h2 class="h3"><%= t('.add_participants') %></h2>
6
- <% access_options = options_for_select([['Manager', 'manage'], ['Depositor', 'deposit'], ['Viewer', 'view']]) %>
7
- <div class="sharing-row-form">
8
- <%= simple_form_for collection_permission_template_form_for(form: @form),
9
- url: [hyrax, :admin, @form, :permission_template],
10
- html: { id: 'group-participants-form', class: 'form-inline' } do |f| %>
1
+ <div id="participants" class="tab-pane">
2
+ <div class="card labels edit-sharing-tab">
3
+ <div class="card-body">
4
+ <section class="section-add-sharing clearfix">
5
+ <h2 class="h3"><%= t('.add_participants') %></h2>
6
+ <% access_options = options_for_select([['Manager', 'manage'], ['Depositor', 'deposit'], ['Viewer', 'view']]) %>
7
+ <div class="sharing-row-form">
8
+ <%= simple_form_for collection_permission_template_form_for(form: @form),
9
+ url: [hyrax, :admin, @form, :permission_template],
10
+ html: { id: 'group-participants-form', class: 'form-inline' } do |f| %>
11
11
 
12
- <%= f.fields_for 'access_grants_attributes',
13
- f.object.access_grants.build(agent_type: 'group'),
14
- index: 0 do |builder| %>
15
- <div class="form-group">
16
- <label><%= t('.add_group') %></label>
17
- <%= builder.hidden_field :agent_type %>
18
- <%= builder.text_field :agent_id,
19
- placeholder: "Search for a group...",
20
- class: 'form-control' %>
21
- </div>
22
- <div class="form-group">
23
- <label>as</label>
24
- <%= builder.select :access,
25
- access_options,
26
- { prompt: "Select a role..." },
27
- class: 'form-control' %>
28
- </div>
29
- <% end %>
30
- <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-secondary ml-2' %>
12
+ <%= f.fields_for 'access_grants_attributes',
13
+ f.object.access_grants.build(agent_type: 'group'),
14
+ index: 0 do |builder| %>
15
+ <div class="form-group">
16
+ <label><%= t('.add_group') %></label>
17
+ <%= builder.hidden_field :agent_type %>
18
+ <%= builder.text_field :agent_id,
19
+ placeholder: "Search for a group...",
20
+ class: 'form-control' %>
21
+ </div>
22
+ <div class="form-group">
23
+ <label>as</label>
24
+ <%= builder.select :access,
25
+ access_options,
26
+ { prompt: "Select a role..." },
27
+ class: 'form-control' %>
28
+ </div>
29
+ <% end %>
30
+ <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-secondary ml-2' %>
31
31
 
32
- <% end %>
33
- </div>
32
+ <% end %>
33
+ </div>
34
34
 
35
- <div class="sharing-row-form">
36
- <%= simple_form_for collection_permission_template_form_for(form: @form),
37
- url: [hyrax, :admin, @form, :permission_template],
38
- html: { id: 'user-participants-form', class: 'form-inline add-users' } do |f| %>
35
+ <div class="sharing-row-form">
36
+ <%= simple_form_for collection_permission_template_form_for(form: @form),
37
+ url: [hyrax, :admin, @form, :permission_template],
38
+ html: { id: 'user-participants-form', class: 'form-inline add-users' } do |f| %>
39
39
 
40
- <%= f.fields_for 'access_grants_attributes',
41
- f.object.access_grants.build(agent_type: 'user'),
42
- index: 0 do |builder| %>
43
- <div class="form-group">
44
- <label><%= t('.add_user') %></label>
45
- <%= builder.hidden_field :agent_type %>
46
- <%= builder.text_field :agent_id,
47
- placeholder: "Search for a user..." %>
48
- </div>
49
- <div class="form-group">
50
- <label>as</label>
51
- <%= builder.select :access,
52
- access_options,
53
- { prompt: "Select a role..." },
54
- class: 'form-control' %>
55
- </div>
56
- <% end %>
57
- <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-secondary ml-2' %>
58
- <% end %>
59
- </div>
40
+ <%= f.fields_for 'access_grants_attributes',
41
+ f.object.access_grants.build(agent_type: 'user'),
42
+ index: 0 do |builder| %>
43
+ <div class="form-group">
44
+ <label><%= t('.add_user') %></label>
45
+ <%= builder.hidden_field :agent_type %>
46
+ <%= builder.text_field :agent_id,
47
+ placeholder: "Search for a user..." %>
48
+ </div>
49
+ <div class="form-group">
50
+ <label>as</label>
51
+ <%= builder.select :access,
52
+ access_options,
53
+ { prompt: "Select a role..." },
54
+ class: 'form-control' %>
55
+ </div>
56
+ <% end %>
57
+ <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-secondary ml-2' %>
58
+ <% end %>
59
+ </div>
60
60
 
61
- <p class="form-text"><%= t('hyrax.admin.admin_sets.form.note') %></p>
62
- </section>
61
+ <p class="form-text"><%= t('hyrax.admin.admin_sets.form.note') %></p>
62
+ </section>
63
63
 
64
- <h2 class="h3"><%= t(".current_participants") %></h2>
65
- <fieldset class="admin-set-participants section-collection-sharing">
66
-
67
- <%= render 'form_participant_table', access: 'managers', filter: :manage? %>
68
- <%= render 'form_participant_table', access: 'depositors', filter: :deposit? %>
69
- <%= render 'form_participant_table', access: 'viewers', filter: :view? %>
70
- </fieldset>
64
+ <h2 class="h3"><%= t(".current_participants") %></h2>
65
+ <fieldset class="admin-set-participants section-collection-sharing">
71
66
 
72
- </div><!-- /.card-body -->
73
- </div>
74
- </div>
67
+ <%= render 'form_participant_table', access: 'managers', filter: :manage? %>
68
+ <%= render 'form_participant_table', access: 'depositors', filter: :deposit? %>
69
+ <%= render 'form_participant_table', access: 'viewers', filter: :view? %>
70
+ </fieldset>
71
+
72
+ </div><!-- /.card-body -->
73
+ </div>
74
+ </div>
@@ -1,5 +1,5 @@
1
1
  <% provide :page_header do %>
2
- <h1><span class="fa fa-edit" aria-hidden="true"></span> <%= t('.header', title: @form.title) %></h1>
2
+ <h1><span class="fa fa-edit" aria-hidden="true"></span> <%= t('.header', title: Array(@form.title).first) %></h1>
3
3
  <% end %>
4
4
 
5
5
  <div class="row">
@@ -1,6 +1,8 @@
1
1
  <h3><%= t('.add_participants') %></h3>
2
2
  <p><%= t('.instructions') %></p>
3
- <% access_options = options_for_select([['Manager', Hyrax::CollectionTypeParticipant::MANAGE_ACCESS], ['Creator', Hyrax::CollectionTypeParticipant::CREATE_ACCESS]]) %>
3
+ <% access_options = options_for_select([
4
+ [t('hyrax.dashboard.collections.form_share.access_options.manager'), Hyrax::CollectionTypeParticipant::MANAGE_ACCESS],
5
+ [t('hyrax.dashboard.collections.form_share.access_options.creator'), Hyrax::CollectionTypeParticipant::CREATE_ACCESS]]) %>
4
6
  <% unless @collection_type_participant.nil? %>
5
7
 
6
8
  <section class="section-participants">
@@ -14,6 +14,7 @@
14
14
  <%= presenter.attribute_to_html(:related_url, render_as: :external_link, html_dl: true) %>
15
15
  <%= presenter.attribute_to_html(:resource_type, render_as: :faceted, html_dl: true) %>
16
16
  <%= presenter.attribute_to_html(:source, html_dl: true) %>
17
+ <%= presenter.attribute_to_html(:extent, html_dl: true) %>
17
18
  <%= presenter.attribute_to_html(:rights_statement, render_as: :rights_statement, html_dl: true) %>
18
19
  <%= presenter.attribute_to_html(:rights_notes, html_dl: true) %>
19
20
  <%= presenter.attribute_to_html(:access_right, html_dl: true) %>
@@ -0,0 +1,4 @@
1
+ <%# This file is deliberately left blank for downstream implementors
2
+ This should accept one locals:
3
+
4
+ `f`: The form object %>
@@ -1,69 +1,70 @@
1
- <div id="fileupload">
2
- <!-- Redirect browsers with JavaScript disabled to the origin page -->
3
- <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>" /></noscript>
4
- <!-- The table listing the files available for upload/download -->
5
- <table role="presentation" class="table table-striped"><tbody class="files"></tbody></table>
6
- <% if Hyrax.config.browse_everything? %>
7
- <%= t('hyrax.base.form_files.local_upload_browse_everything_html',
8
- contact_href: link_to(t("hyrax.upload.alert.contact_href_text"), hyrax.contact_form_index_path),
9
- upload_file_limit: Hyrax.config.uploader[:maxNumberOfFiles],
10
- upload_size_limit: Hyrax.config.uploader[:maxFileSize] / 1.megabytes) %>
11
- <% else %>
12
- <%= t('hyrax.base.form_files.local_upload_html',
13
- upload_file_limit: Hyrax.config.uploader[:maxNumberOfFiles],
14
- upload_size_limit: Hyrax.config.uploader[:maxFileSize] / 1.megabytes) %>
15
- <% end %>
16
- <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
17
- <div class="fileupload-buttonbar">
18
- <div class="row">
19
- <div class="col-12">
20
- <div class="fileinput-button" id="add-files">
21
- <input id="addfiles" type="file" style="display:none;" name="files[]" multiple />
22
- <button type="button" class="btn btn-success" onclick="document.getElementById('addfiles').click();">
23
- <span class="fa fa-plus"></span>
24
- <span><%= t(".add_files") %></span>
25
- </button>
26
- </div>
27
- <div class="fileinput-button">
28
- <input id="addfolder" type="file" style="display:none;" name="files[]" multiple directory webkitdirectory />
29
- <button type="button" class="btn btn-success" onclick="document.getElementById('addfolder').click();">
30
- <span class="fa fa-plus"></span>
31
- <span><%= t(".add_folder") %></span>
32
- </button>
33
- </div>
34
- <% if Hyrax.config.browse_everything? %>
35
- <%= button_tag(type: 'button', class: 'btn btn-success', id: "browse-btn",
36
- 'data-toggle' => 'browse-everything', 'data-route' => browse_everything_engine.root_path,
37
- 'data-target' => "#{f.object.persisted? ? "#edit_#{f.object.model.model_name.param_key}_#{f.object.model.id}" : "#new_#{f.object.model.model_name.param_key}"}" ) do %>
38
- <span class="fa fa-plus"></span>
39
- <%= t('hyrax.upload.browse_everything.browse_files_button') %>
40
- <% end %>
41
- <% end %>
42
- <button type="reset" id="file-upload-cancel-btn" class="btn btn-warning cancel">
43
- <span class="fa fa-ban"></span>
44
- <span><%= t('.cancel_upload') %></span>
45
- </button>
46
- <!-- The global file processing state -->
47
- <span class="fileupload-process"></span>
48
- </div>
1
+ <%= render "base_form_files_prepend", locals: { f: f } %>
2
+ <div id="fileupload">
3
+ <!-- Redirect browsers with JavaScript disabled to the origin page -->
4
+ <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>" /></noscript>
5
+ <!-- The table listing the files available for upload/download -->
6
+ <table role="presentation" class="table table-striped"><tbody class="files"></tbody></table>
7
+ <% if Hyrax.config.browse_everything? %>
8
+ <%= t('hyrax.base.form_files.local_upload_browse_everything_html',
9
+ contact_href: link_to(t("hyrax.upload.alert.contact_href_text"), hyrax.contact_form_index_path),
10
+ upload_file_limit: Hyrax.config.uploader[:maxNumberOfFiles],
11
+ upload_size_limit: Hyrax.config.uploader[:maxFileSize] / 1.megabytes) %>
12
+ <% else %>
13
+ <%= t('hyrax.base.form_files.local_upload_html',
14
+ upload_file_limit: Hyrax.config.uploader[:maxNumberOfFiles],
15
+ upload_size_limit: Hyrax.config.uploader[:maxFileSize] / 1.megabytes) %>
16
+ <% end %>
17
+ <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
18
+ <div class="fileupload-buttonbar">
19
+ <div class="row">
20
+ <div class="col-12">
21
+ <div class="fileinput-button" id="add-files">
22
+ <input id="addfiles" type="file" style="display:none;" name="files[]" multiple />
23
+ <button type="button" class="btn btn-success" onclick="document.getElementById('addfiles').click();">
24
+ <span class="fa fa-plus"></span>
25
+ <span><%= t(".add_files") %></span>
26
+ </button>
49
27
  </div>
50
- <div class="row">
51
- <div class="col-12">
52
- <!-- The global progress state -->
53
- <div class="fileupload-progress fade">
54
- <!-- The global progress bar -->
55
- <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100">
56
- <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div>
57
- </div>
58
- <!-- The extended global progress state -->
59
- <div class="progress-extended">&nbsp;</div>
60
- </div>
61
- </div>
28
+ <div class="fileinput-button">
29
+ <input id="addfolder" type="file" style="display:none;" name="files[]" multiple directory webkitdirectory />
30
+ <button type="button" class="btn btn-success" onclick="document.getElementById('addfolder').click();">
31
+ <span class="fa fa-plus"></span>
32
+ <span><%= t(".add_folder") %></span>
33
+ </button>
62
34
  </div>
35
+ <% if Hyrax.config.browse_everything? %>
36
+ <%= button_tag(type: 'button', class: 'btn btn-success', id: "browse-btn",
37
+ 'data-toggle' => 'browse-everything', 'data-route' => browse_everything_engine.root_path,
38
+ 'data-target' => "#{f.object.persisted? ? "#edit_#{f.object.model.model_name.param_key}_#{f.object.model.id}" : "#new_#{f.object.model.model_name.param_key}"}" ) do %>
39
+ <span class="fa fa-plus"></span>
40
+ <%= t('hyrax.upload.browse_everything.browse_files_button') %>
41
+ <% end %>
42
+ <% end %>
43
+ <button type="reset" id="file-upload-cancel-btn" class="btn btn-warning cancel">
44
+ <span class="fa fa-ban"></span>
45
+ <span><%= t('.cancel_upload') %></span>
46
+ </button>
47
+ <!-- The global file processing state -->
48
+ <span class="fileupload-process"></span>
49
+ </div>
50
+ </div>
51
+ <div class="row">
52
+ <div class="col-12">
53
+ <!-- The global progress state -->
54
+ <div class="fileupload-progress fade">
55
+ <!-- The global progress bar -->
56
+ <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100">
57
+ <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div>
58
+ </div>
59
+ <!-- The extended global progress state -->
60
+ <div class="progress-extended">&nbsp;</div>
63
61
  </div>
64
- <div class="dropzone">
65
- <%= t('hyrax.base.form_files.dropzone') %>
66
- </div>
67
- </div>
62
+ </div>
63
+ </div>
64
+ </div>
65
+ <div class="dropzone">
66
+ <%= t('hyrax.base.form_files.dropzone') %>
67
+ </div>
68
+ </div>
68
69
 
69
70
  <%= render 'hyrax/uploads/js_templates' %>
@@ -53,11 +53,10 @@
53
53
  <%# = render 'sharing_with', presenter: @presenter %>
54
54
  <%# = render 'user_activity', presenter: @presenter %>
55
55
 
56
- <span class='hide analytics-event' data-category="work" data-action="work-view" data-name="<%= @presenter.id %>" >
56
+ <span class='hide analytics-event' data-category="work" data-action="work-view" data-name="<%= @presenter.id %>" ></span>
57
57
  <% @presenter.member_of_collection_ids.each do |collection_id| %>
58
- <span class='hide analytics-event' data-category="work-in-collection" data-action="work-in-collection-view" data-name="<%= collection_id %>" >
58
+ <span class='hide analytics-event' data-category="work-in-collection" data-action="work-in-collection-view" data-name="<%= collection_id %>" ></span>
59
59
  <% end %>
60
60
 
61
61
  </div>
62
62
  </div>
63
-