hyrax 3.0.1 → 3.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (388) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +49 -19
  3. data/.dassie/.env +1 -2
  4. data/.dassie/Gemfile +18 -9
  5. data/.dassie/app/controllers/catalog_controller.rb +6 -0
  6. data/.dassie/app/models/user.rb +0 -2
  7. data/.dassie/config/analytics.yml +12 -5
  8. data/.dassie/config/environments/development.rb +2 -0
  9. data/.dassie/config/initializers/hyrax.rb +7 -0
  10. data/.dassie/config/role_map.yml +2 -0
  11. data/.dassie/db/migrate/20210921150120_enable_uuid_extension.valkyrie_engine.rb +7 -0
  12. data/.dassie/db/migrate/20210921150121_create_orm_resources.valkyrie_engine.rb +19 -0
  13. data/.dassie/db/migrate/20210921150122_add_model_type_to_orm_resources.valkyrie_engine.rb +7 -0
  14. data/.dassie/db/migrate/20210921150123_change_model_type_to_internal_model.valkyrie_engine.rb +7 -0
  15. data/.dassie/db/migrate/20210921150124_create_path_gin_index.valkyrie_engine.rb +7 -0
  16. data/.dassie/db/migrate/20210921150125_create_internal_resource_index.valkyrie_engine.rb +7 -0
  17. data/.dassie/db/migrate/20210921150126_create_updated_at_index.valkyrie_engine.rb +7 -0
  18. data/.dassie/db/migrate/20210921150127_add_optimistic_locking_to_orm_resources.valkyrie_engine.rb +7 -0
  19. data/.dassie/db/migrate/20211130181150_create_default_administrative_set.rb +8 -0
  20. data/.dassie/db/schema.rb +20 -1
  21. data/.dassie/db/seeds.rb +1 -1
  22. data/.dockerignore +3 -0
  23. data/.env +8 -6
  24. data/.github/workflows/main.yml +17 -0
  25. data/.github/workflows/release.yml +17 -0
  26. data/.gitignore +1 -0
  27. data/.regen +1 -1
  28. data/.rubocop.yml +4 -0
  29. data/CONTAINERS.md +33 -10
  30. data/Dockerfile +14 -9
  31. data/Gemfile +21 -27
  32. data/README.md +37 -0
  33. data/app/actors/hyrax/actors/base_actor.rb +2 -2
  34. data/app/actors/hyrax/actors/collections_membership_actor.rb +3 -3
  35. data/app/actors/hyrax/actors/create_with_remote_files_actor.rb +85 -63
  36. data/app/actors/hyrax/actors/create_with_remote_files_ordered_members_actor.rb +7 -42
  37. data/app/actors/hyrax/actors/file_set_actor.rb +12 -5
  38. data/app/assets/javascripts/hyrax/admin/graphs.es6 +34 -37
  39. data/app/assets/javascripts/hyrax/analytics_events.js +69 -0
  40. data/app/assets/javascripts/hyrax/collapse.js +24 -0
  41. data/app/assets/javascripts/hyrax/collections.js +1 -2
  42. data/app/assets/javascripts/hyrax/ga_events.js +2 -8
  43. data/app/assets/javascripts/hyrax/reports-buttons.js +33 -0
  44. data/app/assets/javascripts/hyrax.js +2 -1
  45. data/app/assets/stylesheets/_bootstrap-default-overrides.scss +9 -0
  46. data/app/assets/stylesheets/hyrax/_styles.scss +5 -0
  47. data/app/authorities/qa/authorities/collections.rb +4 -5
  48. data/app/authorities/qa/authorities/find_works.rb +1 -1
  49. data/app/controllers/concerns/hyrax/breadcrumbs_for_collection_analytics.rb +26 -0
  50. data/app/controllers/concerns/hyrax/breadcrumbs_for_works_analytics.rb +26 -0
  51. data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +30 -10
  52. data/app/controllers/concerns/hyrax/controller.rb +35 -2
  53. data/app/controllers/concerns/hyrax/embargoes_controller_behavior.rb +21 -9
  54. data/app/controllers/concerns/hyrax/leases_controller_behavior.rb +14 -5
  55. data/app/controllers/concerns/hyrax/works_controller_behavior.rb +22 -3
  56. data/app/controllers/hyrax/admin/admin_sets_controller.rb +2 -19
  57. data/app/controllers/hyrax/admin/analytics/analytics_controller.rb +40 -0
  58. data/app/controllers/hyrax/admin/analytics/collection_reports_controller.rb +61 -0
  59. data/app/controllers/hyrax/admin/analytics/work_reports_controller.rb +122 -0
  60. data/app/controllers/hyrax/admin/permission_template_accesses_controller.rb +5 -6
  61. data/app/controllers/hyrax/admin/workflows_controller.rb +8 -2
  62. data/app/controllers/hyrax/collections_controller.rb +6 -1
  63. data/app/controllers/hyrax/dashboard/collection_members_controller.rb +24 -17
  64. data/app/controllers/hyrax/dashboard/collections_controller.rb +112 -37
  65. data/app/controllers/hyrax/dashboard/nest_collections_controller.rb +75 -39
  66. data/app/controllers/hyrax/dashboard_controller.rb +8 -0
  67. data/app/controllers/hyrax/file_sets_controller.rb +49 -13
  68. data/app/controllers/hyrax/my_controller.rb +4 -4
  69. data/app/controllers/hyrax/permissions_controller.rb +3 -4
  70. data/app/controllers/hyrax/stats_controller.rb +3 -1
  71. data/app/controllers/hyrax/workflow_actions_controller.rb +11 -6
  72. data/app/forms/hyrax/forms/administrative_set_form.rb +62 -0
  73. data/app/forms/hyrax/forms/collection_form.rb +9 -5
  74. data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb +38 -6
  75. data/app/forms/hyrax/forms/file_set_form.rb +46 -0
  76. data/app/forms/hyrax/forms/pcdm_collection_form.rb +67 -0
  77. data/app/forms/hyrax/forms/permission.rb +23 -0
  78. data/app/forms/hyrax/forms/permission_template_form.rb +8 -2
  79. data/app/forms/hyrax/forms/resource_form.rb +34 -26
  80. data/app/forms/hyrax/forms/work_form.rb +5 -2
  81. data/app/forms/hyrax/forms/workflow_action_form.rb +4 -0
  82. data/app/helpers/hyrax/batch_edits_helper.rb +3 -1
  83. data/app/helpers/hyrax/collections_helper.rb +88 -2
  84. data/app/helpers/hyrax/dashboard_helper_behavior.rb +16 -5
  85. data/app/helpers/hyrax/embargo_helper.rb +4 -0
  86. data/app/helpers/hyrax/file_set_helper.rb +25 -6
  87. data/app/helpers/hyrax/hyrax_helper_behavior.rb +9 -0
  88. data/app/helpers/hyrax/lease_helper.rb +4 -0
  89. data/app/helpers/hyrax/url_helper.rb +4 -1
  90. data/app/helpers/hyrax/work_form_helper.rb +53 -0
  91. data/app/indexers/hyrax/administrative_set_indexer.rb +18 -0
  92. data/app/indexers/hyrax/pcdm_collection_indexer.rb +2 -0
  93. data/app/indexers/hyrax/valkyrie_file_set_indexer.rb +3 -1
  94. data/app/indexers/hyrax/valkyrie_indexer.rb +3 -3
  95. data/app/indexers/hyrax/valkyrie_work_indexer.rb +1 -1
  96. data/app/inputs/controlled_vocabulary_input.rb +2 -5
  97. data/app/jobs/attach_files_to_work_job.rb +19 -10
  98. data/app/jobs/attach_files_to_work_with_ordered_members_job.rb +6 -5
  99. data/app/jobs/characterize_job.rb +28 -1
  100. data/app/jobs/ingest_local_file_job.rb +18 -2
  101. data/app/jobs/inherit_permissions_job.rb +9 -5
  102. data/app/jobs/valkyrie_ingest_job.rb +56 -0
  103. data/app/models/admin_set.rb +22 -30
  104. data/app/models/collection_branding_info.rb +25 -9
  105. data/app/models/concerns/hyrax/ability/admin_set_ability.rb +31 -7
  106. data/app/models/concerns/hyrax/ability/collection_ability.rb +35 -20
  107. data/app/models/concerns/hyrax/ability/collection_type_ability.rb +1 -1
  108. data/app/models/concerns/hyrax/ability.rb +31 -8
  109. data/app/models/concerns/hyrax/collection_behavior.rb +17 -44
  110. data/app/models/concerns/hyrax/embargoable.rb +24 -0
  111. data/app/models/concerns/hyrax/file_set/characterization.rb +18 -12
  112. data/app/models/concerns/hyrax/solr_document/metadata.rb +1 -0
  113. data/app/models/concerns/hyrax/solr_document_behavior.rb +11 -54
  114. data/app/models/concerns/hyrax/suppressible.rb +5 -0
  115. data/app/models/concerns/hyrax/user.rb +9 -3
  116. data/app/models/concerns/hyrax/work_behavior.rb +1 -1
  117. data/app/models/file_download_stat.rb +4 -4
  118. data/app/models/hyrax/administrative_set.rb +7 -1
  119. data/app/models/hyrax/default_administrative_set.rb +42 -0
  120. data/app/models/hyrax/file_set.rb +6 -0
  121. data/app/models/hyrax/pcdm_collection.rb +1 -0
  122. data/app/models/hyrax/permission.rb +1 -1
  123. data/app/models/hyrax/permission_template.rb +112 -12
  124. data/app/models/hyrax/statistic.rb +31 -4
  125. data/app/models/hyrax/virus_scanner.rb +27 -18
  126. data/app/models/hyrax/work.rb +1 -0
  127. data/app/models/hyrax/workflow_action_info.rb +16 -0
  128. data/app/models/sipity/agent.rb +1 -0
  129. data/app/models/sipity/comment.rb +17 -0
  130. data/app/models/sipity/entity.rb +30 -8
  131. data/app/models/sipity/workflow.rb +1 -0
  132. data/app/models/sipity.rb +53 -2
  133. data/app/presenters/hyrax/admin/dashboard_presenter.rb +8 -6
  134. data/app/presenters/hyrax/admin/repository_growth_presenter.rb +10 -5
  135. data/app/presenters/hyrax/admin/user_activity_presenter.rb +8 -12
  136. data/app/presenters/hyrax/admin_set_options_presenter.rb +12 -8
  137. data/app/presenters/hyrax/admin_set_presenter.rb +13 -4
  138. data/app/presenters/hyrax/admin_set_selection_presenter.rb +116 -0
  139. data/app/presenters/hyrax/collection_presenter.rb +34 -9
  140. data/app/presenters/hyrax/file_set_presenter.rb +8 -1
  141. data/app/presenters/hyrax/file_usage.rb +3 -2
  142. data/app/presenters/hyrax/menu_presenter.rb +4 -0
  143. data/app/presenters/hyrax/pcdm_member_presenter_factory.rb +119 -0
  144. data/app/presenters/hyrax/stats_usage_presenter.rb +2 -1
  145. data/app/presenters/hyrax/trophy_presenter.rb +33 -4
  146. data/app/presenters/hyrax/user_profile_presenter.rb +11 -1
  147. data/app/presenters/hyrax/version_list_presenter.rb +19 -0
  148. data/app/presenters/hyrax/version_presenter.rb +3 -2
  149. data/app/presenters/hyrax/work_show_presenter.rb +37 -8
  150. data/app/presenters/hyrax/work_usage.rb +6 -3
  151. data/app/renderers/hyrax/renderers/attribute_renderer.rb +10 -2
  152. data/app/search_builders/hyrax/README.md +1 -1
  153. data/app/search_builders/hyrax/abstract_type_relation.rb +4 -2
  154. data/app/search_builders/hyrax/admin_set_search_builder.rb +1 -1
  155. data/app/search_builders/hyrax/collection_member_search_builder.rb +6 -1
  156. data/app/search_builders/hyrax/dashboard/collections_search_builder.rb +1 -1
  157. data/app/search_builders/hyrax/exposed_models_relation.rb +1 -1
  158. data/app/search_builders/hyrax/filter_by_type.rb +1 -2
  159. data/app/search_builders/hyrax/my/collections_search_builder.rb +2 -2
  160. data/app/search_builders/hyrax/nested_collections_parent_search_builder.rb +1 -1
  161. data/app/search_builders/hyrax/single_collection_search_builder.rb +1 -1
  162. data/app/services/hyrax/admin_set_create_service.rb +199 -53
  163. data/app/services/hyrax/analytics/google/events.rb +37 -0
  164. data/app/services/hyrax/analytics/google/events_daily.rb +72 -0
  165. data/app/services/hyrax/analytics/google/visits.rb +44 -0
  166. data/app/services/hyrax/analytics/google/visits_daily.rb +49 -0
  167. data/app/services/hyrax/analytics/google.rb +204 -0
  168. data/app/services/hyrax/analytics/matomo.rb +193 -0
  169. data/app/services/hyrax/analytics/results.rb +79 -0
  170. data/app/services/hyrax/analytics.rb +12 -82
  171. data/app/services/hyrax/characterization/valkyrie_characterization_service.rb +134 -0
  172. data/app/services/hyrax/collection_types/permissions_service.rb +1 -1
  173. data/app/services/hyrax/collections/collection_member_search_service.rb +72 -0
  174. data/app/services/hyrax/collections/collection_member_service.rb +122 -27
  175. data/app/services/hyrax/collections/migration_service.rb +4 -2
  176. data/app/services/hyrax/collections/nested_collection_persistence_service.rb +12 -13
  177. data/app/services/hyrax/collections/nested_collection_query_service.rb +10 -3
  178. data/app/services/hyrax/collections/permissions_create_service.rb +82 -78
  179. data/app/services/hyrax/collections/permissions_service.rb +1 -1
  180. data/app/services/hyrax/contextual_path.rb +24 -1
  181. data/app/services/hyrax/curation_concern.rb +24 -2
  182. data/app/services/hyrax/custom_queries/find_file_metadata.rb +7 -5
  183. data/app/services/hyrax/custom_queries/navigators/parent_collections_navigator.rb +46 -0
  184. data/app/services/hyrax/default_middleware_stack.rb +11 -0
  185. data/app/services/hyrax/edit_permissions_service.rb +74 -41
  186. data/app/services/hyrax/ensure_well_formed_admin_set_service.rb +3 -3
  187. data/app/services/hyrax/find_objects_via_solr_service.rb +31 -0
  188. data/app/services/hyrax/listeners/acl_index_listener.rb +3 -1
  189. data/app/services/hyrax/listeners/active_fedora_acl_index_listener.rb +4 -1
  190. data/app/services/hyrax/listeners/batch_notification_listener.rb +3 -1
  191. data/app/services/hyrax/listeners/file_metadata_listener.rb +19 -0
  192. data/app/services/hyrax/listeners/file_set_lifecycle_listener.rb +6 -2
  193. data/app/services/hyrax/listeners/file_set_lifecycle_notification_listener.rb +6 -2
  194. data/app/services/hyrax/listeners/member_cleanup_listener.rb +3 -0
  195. data/app/services/hyrax/listeners/metadata_index_listener.rb +33 -11
  196. data/app/services/hyrax/listeners/object_lifecycle_listener.rb +9 -3
  197. data/app/services/hyrax/listeners/proxy_deposit_listener.rb +3 -1
  198. data/app/services/hyrax/listeners/trophy_cleanup_listener.rb +3 -0
  199. data/app/services/hyrax/listeners/workflow_listener.rb +3 -1
  200. data/app/services/hyrax/listeners.rb +8 -0
  201. data/app/services/hyrax/multiple_membership_checker.rb +53 -29
  202. data/app/services/hyrax/permission_manager.rb +4 -4
  203. data/app/services/hyrax/resource_status.rb +7 -0
  204. data/app/services/hyrax/restriction_service.rb +4 -0
  205. data/app/services/hyrax/search_service.rb +4 -2
  206. data/app/services/hyrax/solr_query_builder_service.rb +45 -8
  207. data/app/services/hyrax/solr_query_service.rb +224 -0
  208. data/app/services/hyrax/solr_service.rb +9 -2
  209. data/app/services/hyrax/statistics/collections/over_time.rb +2 -1
  210. data/app/services/hyrax/statistics/depositors/summary.rb +2 -1
  211. data/app/services/hyrax/statistics/users/over_time.rb +8 -5
  212. data/app/services/hyrax/statistics/works/over_time.rb +10 -0
  213. data/app/services/hyrax/visibility_intention.rb +20 -2
  214. data/app/services/hyrax/work_uploads_handler.rb +21 -3
  215. data/app/services/hyrax/workflow/abstract_notification.rb +2 -2
  216. data/app/services/hyrax/workflow/action_taken_service.rb +16 -4
  217. data/app/services/hyrax/workflow/actionable_objects.rb +70 -0
  218. data/app/services/hyrax/workflow/activate_object.rb +5 -4
  219. data/app/services/hyrax/workflow/changes_required_notification.rb +5 -4
  220. data/app/services/hyrax/workflow/deactivate_object.rb +7 -5
  221. data/app/services/hyrax/workflow/deposited_notification.rb +8 -4
  222. data/app/services/hyrax/workflow/grant_edit_to_depositor.rb +7 -3
  223. data/app/services/hyrax/workflow/grant_read_to_depositor.rb +10 -3
  224. data/app/services/hyrax/workflow/object_in_workflow_decorator.rb +31 -0
  225. data/app/services/hyrax/workflow/revoke_edit_from_depositor.rb +8 -2
  226. data/app/services/hyrax/workflow/status_list_service.rb +43 -13
  227. data/app/services/hyrax/workflow/workflow_action_service.rb +4 -1
  228. data/app/views/hyrax/admin/admin_sets/_form.html.erb +1 -1
  229. data/app/views/hyrax/admin/analytics/_date_range_form.html.erb +11 -0
  230. data/app/views/hyrax/admin/analytics/collection_reports/_custom_range.html.erb +39 -0
  231. data/app/views/hyrax/admin/analytics/collection_reports/_monthly_summary.html.erb +48 -0
  232. data/app/views/hyrax/admin/analytics/collection_reports/_summary.html.erb +55 -0
  233. data/app/views/hyrax/admin/analytics/collection_reports/_top_collections.html.erb +55 -0
  234. data/app/views/hyrax/admin/analytics/collection_reports/index.html.erb +70 -0
  235. data/app/views/hyrax/admin/analytics/collection_reports/show.html.erb +94 -0
  236. data/app/views/hyrax/admin/analytics/work_reports/_custom_range.html.erb +43 -0
  237. data/app/views/hyrax/admin/analytics/work_reports/_monthly_summary.html.erb +35 -0
  238. data/app/views/hyrax/admin/analytics/work_reports/_summary.html.erb +60 -0
  239. data/app/views/hyrax/admin/analytics/work_reports/_top_file_set_downloads.html.erb +33 -0
  240. data/app/views/hyrax/admin/analytics/work_reports/_top_works.html.erb +40 -0
  241. data/app/views/hyrax/admin/analytics/work_reports/_work_counts.html.erb +18 -0
  242. data/app/views/hyrax/admin/analytics/work_reports/_work_files.html.erb +41 -0
  243. data/app/views/hyrax/admin/analytics/work_reports/index.html.erb +77 -0
  244. data/app/views/hyrax/admin/analytics/work_reports/show.html.erb +90 -0
  245. data/app/views/hyrax/admin/stats/show.html.erb +1 -1
  246. data/app/views/hyrax/base/_form_child_work_relationships.html.erb +1 -1
  247. data/app/views/hyrax/base/_form_relationships.html.erb +1 -2
  248. data/app/views/hyrax/base/_form_rendering.html.erb +1 -1
  249. data/app/views/hyrax/base/_form_representative.html.erb +1 -1
  250. data/app/views/hyrax/base/_form_thumbnail.html.erb +1 -1
  251. data/app/views/hyrax/base/_form_visibility_error.html.erb +2 -0
  252. data/app/views/hyrax/base/_guts4form.html.erb +3 -3
  253. data/app/views/hyrax/base/_relationships_parent_row.html.erb +0 -1
  254. data/app/views/hyrax/base/_representative_media.html.erb +1 -1
  255. data/app/views/hyrax/base/_show_actions.html.erb +2 -2
  256. data/app/views/hyrax/base/_work_button_row.html.erb +1 -1
  257. data/app/views/hyrax/base/show.html.erb +6 -0
  258. data/app/views/hyrax/batch_uploads/_form.html.erb +1 -1
  259. data/app/views/hyrax/collections/show.html.erb +4 -0
  260. data/app/views/hyrax/dashboard/_repository_growth.html.erb +5 -5
  261. data/app/views/hyrax/dashboard/_resource_type_graph.html.erb +41 -0
  262. data/app/views/hyrax/dashboard/_sidebar.html.erb +4 -1
  263. data/app/views/hyrax/dashboard/_tabs.html.erb +11 -0
  264. data/app/views/hyrax/dashboard/_user_activity.html.erb +17 -23
  265. data/app/views/hyrax/dashboard/_user_activity_graph.html.erb +55 -0
  266. data/app/views/hyrax/dashboard/_visibility_graph.html.erb +31 -0
  267. data/app/views/hyrax/dashboard/_work_type_graph.html.erb +41 -0
  268. data/app/views/hyrax/dashboard/collections/_collection_title.html.erb +1 -1
  269. data/app/views/hyrax/dashboard/collections/_form.html.erb +6 -5
  270. data/app/views/hyrax/dashboard/collections/_list_collections.html.erb +1 -1
  271. data/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb +1 -1
  272. data/app/views/hyrax/dashboard/collections/edit.html.erb +4 -2
  273. data/app/views/hyrax/dashboard/collections/new.html.erb +4 -2
  274. data/app/views/hyrax/dashboard/collections/show.html.erb +1 -1
  275. data/app/views/hyrax/dashboard/show_admin.html.erb +24 -45
  276. data/app/views/hyrax/dashboard/sidebar/_activity.html.erb +22 -0
  277. data/app/views/hyrax/file_sets/_actions.html.erb +4 -3
  278. data/app/views/hyrax/file_sets/edit.html.erb +1 -1
  279. data/app/views/hyrax/file_sets/media_display/_audio.html.erb +1 -1
  280. data/app/views/hyrax/file_sets/media_display/_default.html.erb +1 -1
  281. data/app/views/hyrax/file_sets/media_display/_image.html.erb +1 -1
  282. data/app/views/hyrax/file_sets/media_display/_office_document.html.erb +1 -1
  283. data/app/views/hyrax/file_sets/media_display/_pdf.html.erb +1 -1
  284. data/app/views/hyrax/file_sets/media_display/_video.html.erb +1 -1
  285. data/app/views/hyrax/file_sets/show.html.erb +7 -1
  286. data/app/views/hyrax/homepage/index.html.erb +1 -1
  287. data/app/views/hyrax/my/_admin_set_action_menu.html.erb +0 -11
  288. data/app/views/hyrax/my/_collection_action_menu.html.erb +1 -2
  289. data/app/views/hyrax/my/collections/_list_collections.html.erb +1 -1
  290. data/app/views/hyrax/my/collections/_modal_add_subcollection.html.erb +3 -5
  291. data/app/views/hyrax/my/collections/_modal_collection_types_to_create.html.erb +1 -1
  292. data/app/views/hyrax/my/collections/index.html.erb +1 -1
  293. data/app/views/hyrax/stats/_downloads.html.erb +18 -0
  294. data/app/views/hyrax/stats/_pageviews.html.erb +18 -0
  295. data/app/views/hyrax/stats/work.html.erb +17 -9
  296. data/app/views/layouts/_head_tag_content.html.erb +7 -2
  297. data/app/views/layouts/hyrax/dashboard.html.erb +1 -0
  298. data/app/views/layouts/hyrax.html.erb +1 -0
  299. data/app/views/{_ga.html.erb → shared/_ga.html.erb} +3 -7
  300. data/app/views/shared/_matomo.html.erb +15 -0
  301. data/app/views/shared/_read_only.html.erb +5 -0
  302. data/bin/db-migrate-seed.sh +3 -1
  303. data/bin/hyrax-entrypoint.sh +0 -14
  304. data/bin/solrcloud-assign-configset.sh +11 -3
  305. data/bin/solrcloud-upload-configset.sh +17 -6
  306. data/chart/hyrax/Chart.yaml +9 -5
  307. data/chart/hyrax/README.md +52 -5
  308. data/chart/hyrax/templates/_helpers.tpl +15 -1
  309. data/chart/hyrax/templates/branding-pvc.yaml +2 -2
  310. data/chart/hyrax/templates/configmap-env.yaml +6 -2
  311. data/chart/hyrax/templates/deployment-worker.yaml +42 -5
  312. data/chart/hyrax/templates/deployment.yaml +53 -0
  313. data/chart/hyrax/templates/derivatives-pvc.yaml +2 -2
  314. data/chart/hyrax/templates/ingress.yaml +13 -4
  315. data/chart/hyrax/templates/secrets.yaml +8 -0
  316. data/chart/hyrax/templates/uploads-pvc.yaml +2 -2
  317. data/chart/hyrax/values.yaml +84 -2
  318. data/config/brakeman.ignore +2 -2
  319. data/config/features.rb +3 -0
  320. data/config/i18n-tasks.yml +2 -2
  321. data/config/initializers/1_healthz.rb +1 -0
  322. data/config/initializers/listeners.rb +5 -4
  323. data/config/initializers/valkryrie_storage.rb +7 -0
  324. data/config/locales/hyrax.de.yml +195 -1
  325. data/config/locales/hyrax.en.yml +192 -13
  326. data/config/locales/hyrax.es.yml +195 -1
  327. data/config/locales/hyrax.fr.yml +195 -1
  328. data/config/locales/hyrax.it.yml +195 -1
  329. data/config/locales/hyrax.pt-BR.yml +195 -1
  330. data/config/locales/hyrax.zh.yml +195 -1
  331. data/config/routes.rb +4 -0
  332. data/db/seeds.rb +1 -1
  333. data/docker-compose.yml +42 -9
  334. data/documentation/developing-your-hyrax-based-app.md +4 -4
  335. data/documentation/legacyREADME.md +4 -4
  336. data/hyrax.gemspec +4 -2
  337. data/lib/generators/hyrax/templates/catalog_controller.rb +3 -1
  338. data/lib/generators/hyrax/templates/config/analytics.yml +13 -7
  339. data/lib/generators/hyrax/templates/config/initializers/hyrax.rb +15 -13
  340. data/lib/generators/hyrax/templates/db/migrate/20211130181150_create_default_administrative_set.rb.erb +8 -0
  341. data/lib/generators/hyrax/work/templates/feature_spec.rb.erb +4 -2
  342. data/lib/generators/hyrax/work_resource/templates/indexer_spec.rb.erb +1 -0
  343. data/lib/hyrax/active_fedora_dummy_model.rb +62 -0
  344. data/lib/hyrax/collection_name.rb +6 -2
  345. data/lib/hyrax/configuration.rb +114 -4
  346. data/lib/hyrax/engine.rb +9 -6
  347. data/lib/hyrax/errors.rb +2 -0
  348. data/lib/hyrax/form_fields.rb +1 -0
  349. data/lib/hyrax/publisher.rb +16 -0
  350. data/lib/hyrax/resource_name.rb +1 -0
  351. data/lib/hyrax/resource_sync/change_list_writer.rb +2 -2
  352. data/lib/hyrax/resource_sync/resource_list_writer.rb +2 -2
  353. data/lib/hyrax/specs/capybara.rb +5 -3
  354. data/lib/hyrax/specs/shared_specs/hydra_works.rb +2 -0
  355. data/lib/hyrax/specs/shared_specs/indexers.rb +6 -0
  356. data/lib/hyrax/specs/shared_specs/valkyrie_storage_versions.rb +9 -0
  357. data/lib/hyrax/transactions/admin_set_create.rb +22 -0
  358. data/lib/hyrax/transactions/collection_create.rb +25 -0
  359. data/lib/hyrax/transactions/collection_update.rb +20 -0
  360. data/lib/hyrax/transactions/container.rb +58 -0
  361. data/lib/hyrax/transactions/file_set_destroy.rb +21 -0
  362. data/lib/hyrax/transactions/steps/add_file_sets.rb +3 -2
  363. data/lib/hyrax/transactions/steps/add_to_collections.rb +13 -1
  364. data/lib/hyrax/transactions/steps/add_to_parent.rb +36 -0
  365. data/lib/hyrax/transactions/steps/apply_collection_type_permissions.rb +29 -0
  366. data/lib/hyrax/transactions/steps/remove_file_set_from_work.rb +47 -0
  367. data/lib/hyrax/transactions/steps/save.rb +18 -6
  368. data/lib/hyrax/transactions/steps/set_collection_type_gid.rb +35 -0
  369. data/lib/hyrax/transactions/work_create.rb +2 -1
  370. data/lib/hyrax/valkyrie_can_can_adapter.rb +1 -0
  371. data/lib/hyrax/valkyrie_simple_path_generator.rb +20 -0
  372. data/lib/hyrax/version.rb +1 -1
  373. data/lib/hyrax.rb +9 -0
  374. data/lib/tasks/collection_type_global_id.rake +1 -1
  375. data/lib/tasks/default_admin_set.rake +12 -11
  376. data/lib/tasks/regenerate_derivatives.rake +12 -0
  377. data/lib/wings/active_fedora_converter/default_work.rb +15 -0
  378. data/lib/wings/model_transformer.rb +17 -1
  379. data/lib/wings/orm_converter.rb +18 -2
  380. data/lib/wings/setup.rb +17 -0
  381. data/lib/wings/valkyrie/persister.rb +16 -0
  382. data/lib/wings/valkyrie/storage.rb +56 -1
  383. data/lib/wings.rb +0 -21
  384. data/template.rb +1 -1
  385. data/vendor/assets/javascripts/morris/morris.min.js +1 -7
  386. data/vendor/assets/stylesheets/morris.js/0.5.1/morris.css +1 -1
  387. metadata +120 -17
  388. data/app/views/hyrax/dashboard/_repository_objects.html.erb +0 -28
@@ -0,0 +1,35 @@
1
+ <div class="panel panel-default">
2
+ <div class="panel-heading">
3
+ <h4><%= t('.monthly_subtitle') %> <%= Time.zone.today.strftime("%B %Y") %></h4>
4
+ </div>
5
+ <div class="panel-body">
6
+ <table class="table table-striped">
7
+ <thead>
8
+ <tr>
9
+ <th>&nbsp;</th>
10
+ <% @month_names.each do |name| %>
11
+ <th><%= name %></th>
12
+ <% end %>
13
+ </tr>
14
+ </thead>
15
+ <tbody>
16
+ <% if @pageviews %>
17
+ <tr>
18
+ <td><b><%= t('.page_views') %></b></td>
19
+ <% @month_names.each do |name| %>
20
+ <td><%= @pageviews.month(name.to_date) %></td>
21
+ <% end %>
22
+ </tr>
23
+ <% end %>
24
+ <% if @downloads %>
25
+ <tr>
26
+ <td><b><%= t('.file_downloads') %></b></td>
27
+ <% @month_names.each do |name| %>
28
+ <td><%= @downloads.month(name.to_date) %></td>
29
+ <% end %>
30
+ </tr>
31
+ <% end %>
32
+ </tbody>
33
+ </table>
34
+ </div>
35
+ </div>
@@ -0,0 +1,60 @@
1
+ <div class="panel panel-default">
2
+ <div class="panel-heading">
3
+ <h4><%= t('.subtitle') %></h4>
4
+ </div>
5
+ <div class="panel-body">
6
+ <table class="table table-striped">
7
+ <thead>
8
+ <tr>
9
+ <th>&nbsp;</th>
10
+ <th><%= t('.today') %></th>
11
+ <th><%= t('.this_week') %></th>
12
+ <th><%= t('.this_month') %></th>
13
+ <th><%= t('.this_year') %></th>
14
+ <th><%= t('.all_time') %></th>
15
+ </tr>
16
+ </thead>
17
+ <tbody>
18
+ <% if @pageviews %>
19
+ <tr>
20
+ <td><b><%= t('.page_views') %></b></td>
21
+ <td><%= @pageviews.day %></td>
22
+ <td><%= @pageviews.week %></td>
23
+ <td><%= @pageviews.month %></td>
24
+ <td><%= @pageviews.year %></td>
25
+ <td><%= @pageviews.all %></td>
26
+ </tr>
27
+ <% end %>
28
+ <% if @downloads %>
29
+ <tr>
30
+ <td><b><%= t('.file_downloads') %></b></td>
31
+ <td><%= @downloads.day %></td>
32
+ <td><%= @downloads.week %></td>
33
+ <td><%= @downloads.month %></td>
34
+ <td><%= @downloads.year %></td>
35
+ <td><%= @downloads.all %></td>
36
+ </tr>
37
+ <% end %>
38
+ <% if @uniques %>
39
+ <tr>
40
+ <td><b><%= t('.unique_visitors') %></b></td>
41
+ <td><%= @uniques.day %></td>
42
+ <td><%= @uniques.week %></td>
43
+ <td><%= @uniques.month %></td>
44
+ <td><%= @uniques.year %></td>
45
+ <td><%= @uniques.all %></td>
46
+ </tr>
47
+ <% end %>
48
+ </tbody>
49
+ </table>
50
+ </div>
51
+ </div>
52
+
53
+ <% if @top_works %>
54
+ <div><%= render 'top_works' %></div>
55
+ <% end %>
56
+
57
+ <% if @top_file_set_downloads %>
58
+ <div><%= render 'top_file_set_downloads' %></div>
59
+ <% end %>
60
+
@@ -0,0 +1,33 @@
1
+ <div class="panel panel-default">
2
+ <div class="panel-heading">
3
+ <h4><%= t('.top_downloads')%></h4>
4
+ </div>
5
+ <div class="panel-body">
6
+ <table class="table table-striped">
7
+ <thead>
8
+ <tr>
9
+ <th><%= t('.file_name')%></th>
10
+ <th><%= t('.file') %> ID</th>
11
+ <th><%= t('.file_downloads')%></th>
12
+ </tr>
13
+ </thead>
14
+ <tbody>
15
+ <% @top_file_set_downloads.each do |download| %>
16
+ <tr>
17
+ <td><%= download[1] %></td>
18
+ <td><%= download[0] %></td>
19
+ <td><%= download[2] %></td>
20
+ </tr>
21
+ <% end %>
22
+ </tbody>
23
+ </table>
24
+ </div>
25
+ <div class="panel-footer">
26
+ <div class="pull-right">
27
+ <%= paginate @top_file_set_downloads %>
28
+ </div>
29
+ </div>
30
+ </div>
31
+
32
+
33
+
@@ -0,0 +1,40 @@
1
+ <div class="panel panel-default">
2
+ <div class="panel-heading">
3
+ <h4><%= t('.top_works') %>
4
+ <div class="btn-group pull-right">
5
+ <%= link_to "#{t('.export')}", admin_analytics_work_reports_path(start_date: @start_date, end_date: @end_date, format: :csv, disposition: "attachment"), class: "btn btn-default" %>
6
+ </div>
7
+ </h4>
8
+ </div>
9
+
10
+ <div class="panel-body">
11
+ <table class="table table-striped">
12
+ <thead>
13
+ <tr>
14
+ <th><%= t('.work_title')%></th>
15
+ <th>ID</th>
16
+ <th><%= t('.work_views')%></th>
17
+ <th><%= t('.file_downloads')%></th>
18
+ </tr>
19
+ </thead>
20
+ <tbody>
21
+ <% @top_works.each do |work| %>
22
+ <tr>
23
+ <td><%= link_to work[1], admin_analytics_work_report_path(work[0]) %></td>
24
+ <td><%= work[0] %></td>
25
+ <td><%= work[2] %></td>
26
+ <td><%= work[3] %></td>
27
+ </tr>
28
+ <% end %>
29
+ </tbody>
30
+ </table>
31
+ </div>
32
+
33
+
34
+ <div class="panel-footer">
35
+ <div class="pull-right">
36
+ <%= paginate @top_works %>
37
+ </div>
38
+ </div>
39
+
40
+ </div>
@@ -0,0 +1,18 @@
1
+ <div class="row">
2
+ <div class="col-xs-12 work-counts">
3
+ <div class="work-count-border col-sm-2 col-sm-offset-3 pull-left text-center">
4
+ <% @file_sizes_total_bytes = @file_sizes.inject(0, :+) %>
5
+ <% @file_size_total = (@file_sizes_total_bytes / 1.0.megabyte).round(2) %>
6
+ <h4 class="work-count-title"><%= @file_size_total %>MB</p>
7
+ <p><%= t('.total_size') %></p>
8
+ </div>
9
+ <div class="work-count-border col-sm-2 pull-left text-center">
10
+ <h4 class="work-count-title"></p>
11
+ <p><%= t('.child_works') %></p>
12
+ </div>
13
+ <div class="work-count-border col-sm-2 pull-left text-center">
14
+ <h4 class="work-count-title"><%= @files.count %></p>
15
+ <p><%= t('.files') %></p>
16
+ </div>
17
+ </div>
18
+ </div>
@@ -0,0 +1,41 @@
1
+ <div class="panel panel-default">
2
+ <div class="panel-heading">
3
+ <h4><%= t('.title') %></h4>
4
+ </div>
5
+ <div class="panel-body">
6
+ <table class="table table-striped">
7
+ <thead>
8
+ <tr>
9
+ <th>&nbsp;</th>
10
+ <th></th>
11
+ <th><%= t('.total_downloads') %> (YTD)</th>
12
+ </tr>
13
+ </thead>
14
+ <tbody>
15
+
16
+ <% @files.each do |file| %>
17
+ <% @file_sizes = [] %>
18
+ <% f = SolrDocument.find(file) %>
19
+ <% if f %>
20
+ <% @file_sizes.push(f.file_size) %>
21
+ <tr>
22
+ <td><%= f %></td>
23
+ <td><%= f.id %></td>
24
+ <td><%= Hyrax::Analytics.daily_events_for_id(@document.id, 'file_set_in_work_download').all %></td>
25
+ </tr>
26
+ <% end %>
27
+ <% end %>
28
+ </tbody>
29
+ </table>
30
+ </div>
31
+ <div class="panel-footer">
32
+ <div class="pull-right">
33
+ <%= paginate @files %>
34
+ </div>
35
+ </div>
36
+ </div>
37
+
38
+
39
+
40
+
41
+
@@ -0,0 +1,77 @@
1
+ <% provide :page_title, "#{t('.title')}" %>
2
+
3
+ <% provide :page_header do %>
4
+ <h1><span class="fa fa-bar-chart" aria-hidden="true"></span><%= t('.title') %></h1>
5
+ <% end %>
6
+
7
+ <div class="row">
8
+ <div class="col-sm-12">
9
+ <div class="work-reports">
10
+
11
+ <div class="panel panel-default">
12
+ <% if Hyrax.config.analytics? %>
13
+ <% if current_user.ability.admin? %>
14
+ <div class="panel-heading"><b><%= @works_count %> <%= t('.works') %></b> <%= t('.repo_summary') %> <b><%= @pageviews.all if @pageviews %> <%= t('.views') %></b> <%= t('.and') %> <b><%= @downloads.all if @downloads %> <%= t('.downloads') %></b>.</div>
15
+ <% else %>
16
+ <div class="panel-heading"><%= t('.access_to') %> <b><%= @works_count %> <%= t('.works') %></b>.</div>
17
+ <% end %>
18
+ <div class="panel-body">
19
+ <% if current_user.ability.admin? %>
20
+ <div class="row text-center">
21
+ <div class="nav nav-pills btn-group" role="group">
22
+ <% if params[:start_date] %>
23
+ <a button id='summary-btn' class="btn btn-default nav-link" type="button" href="#summary" data-toggle="pill">
24
+ <% else %>
25
+ <a button id='summary-btn' class="btn btn-primary nav-link" type="button" href="#summary" data-toggle="pill">
26
+ <% end %>
27
+ <%= t('.summary') %>
28
+ </a>
29
+ <a button id='monthly-btn' class="btn btn-default nav-link" type="button" href="#monthly" data-toggle="pill">
30
+ <%= t('.monthly') %>
31
+ </a>
32
+ <% if params[:start_date] %>
33
+ <a button id='range-btn' class="btn btn-primary nav-link" type="button" href="#custom-range" data-toggle="pill">
34
+ <% else %>
35
+ <a button id='range-btn' class="btn btn-default nav-link" type="button" href="#custom-range" data-toggle="pill">
36
+ <% end %>
37
+ <%= t('.custom_range') %>
38
+ </a>
39
+ </div>
40
+ </div>
41
+ <br>
42
+ <div class="tab-content">
43
+ <% if params[:start_date] %>
44
+ <div class="tab-pane" id="summary">
45
+ <% else %>
46
+ <div class="tab-pane active" id="summary">
47
+ <% end %>
48
+ <%= render "summary" %>
49
+ </div>
50
+ <div class="tab-pane" id="monthly">
51
+ <%= render "monthly_summary" %>
52
+ </div>
53
+ <% if params[:start_date] %>
54
+ <div class="tab-pane active" id="custom-range">
55
+ <% else %>
56
+ <div class="tab-pane" id="custom-range">
57
+ <% end %>
58
+ <%= render "hyrax/admin/analytics/date_range_form", redirect_path: hyrax.admin_analytics_work_reports_path %>
59
+ <%= render "custom_range" %>
60
+ </div>
61
+ </div>
62
+ <% end %>
63
+ </div>
64
+ </div>
65
+ <p class="text-center"><%= t('.report_generated_on') %> <b><%= Time.zone.today.strftime("%B %d, %Y") %></b></p>
66
+
67
+ </div>
68
+
69
+ </div>
70
+ <% else %>
71
+ <div class="alert alert-warning" role="alert">
72
+ <%= t('.enable_analytics') %>
73
+ </div>
74
+ <% end %>
75
+ </div>
76
+ </div>
77
+ </div>
@@ -0,0 +1,90 @@
1
+ <% provide :page_title, "#{t('.title')}" %>
2
+
3
+ <% provide :page_header do %>
4
+ <h1><span class="fa fa-bar-chart" aria-hidden="true"></span> <%= t('.title') %>
5
+ <%= link_to "#{t('.return_to_btn')}", admin_analytics_work_reports_path, class: "btn btn-primary pull-right" %>
6
+ </h1>
7
+ <br>
8
+ <% end %>
9
+
10
+ <div class="row">
11
+ <div class="col-sm-12">
12
+ <div class="work-reports">
13
+
14
+ <div class="panel panel-default">
15
+ <div class="panel-heading">
16
+ <div class="col-sm-10">
17
+ <h3><%= @document %></h3>
18
+ </div>
19
+ <div class="col-sm-2">
20
+ <%= link_to "#{t('.view_work_btn')}", [main_app, @document], class: "btn btn-default pull-right" %>
21
+ </div>
22
+ </div>
23
+ <div class="panel-body">
24
+ <div class="row">
25
+ <div class="col-xs-12 col-md-5">
26
+ <p><%= t('.deposited_by') %> <b><%= @document.depositor %></b> on <b><%= @document.date_uploaded.strftime("%Y-%m-%d") %></b></p>
27
+ <p><%= t('.work_type') %> <b><%= @document.human_readable_type %></b></p>
28
+ <p><%= t('.resource_type') %> <b><%= @document.resource_type.join(", ") %></b></p>
29
+ </div>
30
+ <div class="col-xs-12 col-md-5">
31
+ <p><%= t('.status') %> <b><%= @document.workflow_state %></b></p>
32
+ <p><%= t('.visibility') %> <b><%= @document.visibility %></b></p>
33
+ </div>
34
+ </div>
35
+ </div>
36
+ </div>
37
+
38
+ <div class="row text-center">
39
+ <div class="nav nav-pills btn-group" role="group">
40
+ <% if params[:start_date] %>
41
+ <a button id='summary-btn' class="btn btn-default nav-link" type="button" href="#summary" data-toggle="pill">
42
+ <% else %>
43
+ <a button id='summary-btn' class="btn btn-primary nav-link" type="button" href="#summary" data-toggle="pill">
44
+ <% end %>
45
+ <%= t('.summary') %>
46
+ </a>
47
+ <a button id='monthly-btn' class="btn btn-default nav-link" type="button" href="#monthly" data-toggle="pill">
48
+ <%= t('.monthly') %>
49
+ </a>
50
+ <% if params[:start_date] %>
51
+ <a button id='range-btn' class="btn btn-primary nav-link" type="button" href="#custom-range" data-toggle="pill">
52
+ <% else %>
53
+ <a button id='range-btn' class="btn btn-default nav-link" type="button" href="#custom-range" data-toggle="pill">
54
+ <% end %>
55
+ <%= t('.custom_range') %>
56
+ </a>
57
+ </div>
58
+ </div>
59
+ <br>
60
+ <div class="tab-content">
61
+ <% if params[:start_date] %>
62
+ <div class="tab-pane" id="summary">
63
+ <% else %>
64
+ <div class="tab-pane active" id="summary">
65
+ <% end %>
66
+ <%= render "summary" %>
67
+ </div>
68
+
69
+ <div class="tab-pane" id="monthly">
70
+ <%= render "monthly_summary" %>
71
+ </div>
72
+
73
+ <% if params[:start_date] %>
74
+ <div class="tab-pane active" id="custom-range">
75
+ <% else %>
76
+ <div class="tab-pane" id="custom-range">
77
+ <% end %>
78
+ <%= render "hyrax/admin/analytics/date_range_form", redirect_path: hyrax.admin_analytics_work_report_path(@document) %>
79
+ <%= render "custom_range" %>
80
+ </div>
81
+ </div>
82
+
83
+ <% unless @files.nil? %>
84
+ <%= render "work_files" %>
85
+ <%= render "work_counts" %>
86
+ <% end %>
87
+
88
+ </div>
89
+ </div>
90
+ </div>
@@ -4,4 +4,4 @@
4
4
  <hr />
5
5
  <%= render "top_data" %>
6
6
  </div>
7
- </div>
7
+ </div>
@@ -24,7 +24,7 @@ HTML Properties:
24
24
  </div>
25
25
  <div class="message has-warning hidden"></div>
26
26
  <div style="margin-top: 10px">
27
- <%= link_to t('.attach_new_work'), polymorphic_path([main_app, :new, :hyrax, :parent, curation_concern.model_name.singular], parent_id: curation_concern.id), target: "_blank", class: 'btn btn-primary' %>
27
+ <%= link_to t('.attach_new_work'), polymorphic_path([main_app, :new, :hyrax, :parent, curation_concern.model_name.singular.to_sym], parent_id: curation_concern.id), target: "_blank", class: 'btn btn-primary' %>
28
28
  </div>
29
29
  <table class="table table-striped">
30
30
  <caption><%= t('.caption') %></caption>
@@ -1,8 +1,7 @@
1
1
  <% if Flipflop.assign_admin_set? %>
2
- <%# TODO: avoid direct dependency on AdminSetService and AdminSetOptionsPresenter in the view!! make the controller provide the options! %>
3
2
  <%= f.input :admin_set_id, as: :select,
4
3
  include_blank: false,
5
- collection: Hyrax::AdminSetOptionsPresenter.new(Hyrax::AdminSetService.new(controller)).select_options,
4
+ collection: admin_set_options,
6
5
  input_html: { class: 'form-control' } %>
7
6
  <% end %>
8
7
 
@@ -7,7 +7,7 @@
7
7
  <div class="form-group">
8
8
  <span class="help-block"><%= t("hyrax.base.form_rendering.help_html") %></span>
9
9
  <%= f.select :rendering_ids,
10
- f.object.select_files,
10
+ form_file_set_select_for(parent: f.object),
11
11
  { include_blank: true },
12
12
  { class: 'form-control', multiple: true } %>
13
13
  </div>
@@ -6,7 +6,7 @@
6
6
  </legend>
7
7
  <div class="form-group">
8
8
  <span class="help-block"><%= t("hyrax.base.form_representative.help_html") %></span>
9
- <%= f.select :representative_id, @form.select_files, {}, { class: 'form-control' } %>
9
+ <%= f.select :representative_id, form_file_set_select_for(parent: @form), {}, { class: 'form-control' } %>
10
10
  </div>
11
11
  </fieldset>
12
12
  </div>
@@ -6,7 +6,7 @@
6
6
  </legend>
7
7
  <div class="form-group">
8
8
  <span class="help-block"><%= t("hyrax.base.form_thumbnail.help_html") %></span>
9
- <%= f.select :thumbnail_id, @form.select_files, {}, { class: 'form-control' } %>
9
+ <%= f.select :thumbnail_id, form_file_set_select_for(parent: @form), {}, { class: 'form-control' } %>
10
10
  </div>
11
11
  </fieldset>
12
12
  </div>
@@ -1,3 +1,5 @@
1
1
  <%= f.full_error(:visibility) %>
2
2
  <%= f.full_error(:embargo_release_date) %>
3
3
  <%= f.full_error(:visibility_after_embargo) %>
4
+ <%= f.full_error(:lease_expiration_date) %>
5
+ <%= f.full_error(:visibility_after_lease) %>
@@ -4,21 +4,21 @@
4
4
  <div class="panel panel-default tabs" role="main">
5
5
  <!-- Nav tabs -->
6
6
  <ul class="nav nav-tabs" role="tablist">
7
- <% tabs.each_with_index do | tab, i | %>
7
+ <% (tabs - ['share']).each_with_index do | tab, i | %>
8
8
  <% if i == 0 %>
9
9
  <li role="presentation" class="active">
10
10
  <% else %>
11
11
  <li role="presentation">
12
12
  <% end %>
13
13
  <a href="#<%= tab %>" aria-controls="<%= tab %>" role="tab" data-toggle="tab">
14
- <%= t("hyrax.works.form.tab.#{tab}") %>
14
+ <%= form_tab_label_for(form: f.object, tab: tab) %>
15
15
  </a>
16
16
  </li>
17
17
  <% end %>
18
18
 
19
19
  <li role="presentation" id="tab-share" class="hidden">
20
20
  <a href="#share" aria-controls="share" role="tab" data-toggle="tab">
21
- <%= t("hyrax.works.form.tab.share") %>
21
+ <%= form_tab_label_for(form: f.object, tab: 'share') %>
22
22
  </a>
23
23
  </li>
24
24
  </ul>
@@ -12,4 +12,3 @@
12
12
  </ul>
13
13
  <% end %>
14
14
  </dd>
15
-
@@ -2,7 +2,7 @@
2
2
  <% if defined?(viewer) && viewer %>
3
3
  <%= iiif_viewer_display presenter %>
4
4
  <% else %>
5
- <%= media_display presenter.representative_presenter %>
5
+ <%= render media_display_partial(presenter.representative_presenter), file_set: presenter.representative_presenter %>
6
6
  <% end %>
7
7
  <% else %>
8
8
  <%= image_tag 'default.png', class: "canonical-image", alt: 'default representative image' %>
@@ -27,7 +27,7 @@
27
27
  <div class="col-sm-6 text-right">
28
28
  <% if presenter.editor? && !workflow_restriction?(presenter) %>
29
29
  <%= link_to t('.edit'), edit_polymorphic_path([main_app, presenter]), class: 'btn btn-default' %>
30
- <% if presenter.member_presenters.size > 1 %>
30
+ <% if presenter.member_count > 1 %>
31
31
  <%= link_to t("hyrax.file_manager.link_text"), polymorphic_path([main_app, :file_manager, presenter]), class: 'btn btn-default' %>
32
32
  <% end %>
33
33
  <% if presenter.valid_child_concerns.length > 0 %>
@@ -37,7 +37,7 @@
37
37
  <ul class="dropdown-menu">
38
38
  <% presenter.valid_child_concerns.each do |concern| %>
39
39
  <li>
40
- <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular], parent_id: presenter.id) %>
40
+ <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular.to_sym], parent_id: presenter.id) %>
41
41
  </li>
42
42
  <% end %>
43
43
  </ul>
@@ -12,7 +12,7 @@
12
12
  <ul class="dropdown-menu">
13
13
  <% presenter.valid_child_concerns.each do |concern| %>
14
14
  <li>
15
- <%= link_to t(".attach", type: concern.human_readable_type), polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular], parent_id: presenter.id) %>
15
+ <%= link_to t(".attach", type: concern.human_readable_type), polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular.to_sym], parent_id: presenter.id) %>
16
16
  </li>
17
17
  <% end %>
18
18
  </ul>
@@ -53,5 +53,11 @@
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 %>" >
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 %>" >
59
+ <% end %>
60
+
56
61
  </div>
57
62
  </div>
63
+
@@ -7,7 +7,7 @@
7
7
  <% provide :files_tab do %>
8
8
  <p class="instructions"><%= t("hyrax.batch_uploads.files.instructions") %></p>
9
9
  <p class="switch-upload-type"><%= t("hyrax.batch_uploads.files.upload_type_instructions") %>
10
- <%= link_to t("hyrax.batch_uploads.files.button_label"), [main_app, :new, Hyrax.primary_work_type.model_name.singular_route_key] %>
10
+ <%= link_to t("hyrax.batch_uploads.files.button_label"), [main_app, :new, Hyrax.primary_work_type.model_name.singular_route_key.to_sym] %>
11
11
  </p>
12
12
  <% end %>
13
13
  <%= render 'hyrax/base/guts4form', f: f, tabs: form_tabs_for(form: f.object) %>
@@ -124,3 +124,7 @@
124
124
  </div>
125
125
  <% end # if @members_count > 0 %>
126
126
  </div>
127
+
128
+
129
+ <span class='hide analytics-event' data-category="collection" data-action="collection-page-view" data-name="<%= @presenter.id %>" >
130
+
@@ -1,19 +1,19 @@
1
1
  <div class="panel-heading">
2
2
  <h3 class="panel-title"><%= t('.title') %></h3>
3
- <div><%= t('.subtitle') %></div>
4
3
  </div>
5
4
  <div class="panel-body text-center">
6
- <% repository_growth = @presenter.repository_growth.to_json %>
7
- <div id="dashboard-growth" aria-hidden="true" style="height: 200px"><script>
5
+ <div id="dashboard-growth" aria-hidden="true" style="height: 200px">
6
+ <% repository_growth = @presenter.repository_growth(@start_date.to_datetime, @end_date.to_datetime).to_json %>
7
+ <script>
8
8
  //<![CDATA[
9
9
  Hyrax.statistics.repositoryGrowth = <%== repository_growth %>
10
10
  //]]>
11
11
  </script></div>
12
- <table aria-label="<%= t('.title') %>, <%= t('.subtitle') %>" class="table table-striped sr-only text-left">
12
+ <table aria-label="<%= t('.title') %>" class="table table-striped sr-only text-left">
13
13
  <thead>
14
14
  <tr>
15
15
  <th><%= t('.date') %></th>
16
- <th><%= t('.objects') %></th>
16
+ <th><%= t('.works') %></th>
17
17
  <th><%= t('.collections') %></th>
18
18
  </tr>
19
19
  </thead>
@@ -0,0 +1,41 @@
1
+ <div class="panel panel-default">
2
+ <div class="panel-heading">
3
+ <h3 class="panel-title"><%= t('.title') %></h3>
4
+ </div>
5
+ <div class="panel-body">
6
+ <div id="dashboard-resource-types" aria-hidden="true" style="height: 200px">
7
+ <% @resource_types = Hyrax::Statistic.resource_types %>
8
+ <script>
9
+ Morris.Donut({
10
+ element: 'dashboard-resource-types',
11
+ data: [
12
+ <% @resource_types.each do |row| %>
13
+ { label: "<%= row[0] %>", value: <%= row[1].to_i %> },
14
+ <% end %>
15
+ ],
16
+ colors: ['#001219','#005f73','#0a9396','#94d2bd','#e9d8a6','#ee9b00','#ca6702','#bb3e03','#ae2012','#9b2226'],
17
+ gridTextSize: '12px',
18
+ resize: true
19
+ });
20
+ </script>
21
+ </div>
22
+
23
+ <table aria-label="<%= t('.title') %>" class="table table-striped sr-only text-left">
24
+ <thead>
25
+ <tr>
26
+ <th><%= t('.resource_type') %></th>
27
+ <th><%= t('.count') %></th>
28
+ </tr>
29
+ </thead>
30
+ <tbody>
31
+ <% @resource_types.each do |row| %>
32
+ <tr>
33
+ <td><%= row[0] %></td>
34
+ <td><%= row[1] %></td>
35
+ </tr>
36
+ <% end %>
37
+ </tbody>
38
+ </table>
39
+ </div>
40
+ </div>
41
+