hyrax 3.4.2 → 4.0.0.beta2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (798) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +41 -61
  3. data/.dassie/.env +29 -0
  4. data/.dassie/Gemfile +4 -4
  5. data/.dassie/app/assets/javascripts/application.js +8 -4
  6. data/.dassie/app/assets/stylesheets/application.css +1 -1
  7. data/.dassie/app/assets/stylesheets/hyrax.scss +1 -2
  8. data/.dassie/app/controllers/application_controller.rb +1 -3
  9. data/.dassie/app/controllers/catalog_controller.rb +23 -19
  10. data/.dassie/app/models/user.rb +0 -3
  11. data/.dassie/config/application.rb +1 -1
  12. data/.dassie/config/initializers/riiif.rb +1 -1
  13. data/.dassie/db/schema.rb +5 -5
  14. data/.dassie/package.json +7 -7
  15. data/.engine_cart.yml +2 -39
  16. data/.github/workflows/build.yml +79 -0
  17. data/{.env → .koppie/.env} +21 -10
  18. data/.koppie/.gitignore +48 -0
  19. data/.koppie/.rspec +2 -0
  20. data/.koppie/CODE_OF_CONDUCT.md +36 -0
  21. data/.koppie/CONTRIBUTING.md +192 -0
  22. data/.koppie/Gemfile +54 -0
  23. data/.koppie/LICENSE +205 -0
  24. data/.koppie/README.md +55 -0
  25. data/.koppie/Rakefile +8 -0
  26. data/.koppie/app/assets/config/manifest.js +5 -0
  27. data/.koppie/app/assets/images/.keep +0 -0
  28. data/.koppie/app/assets/images/unauthorized.png +0 -0
  29. data/.koppie/app/assets/images/us_404.svg +91 -0
  30. data/.koppie/app/assets/javascripts/application.js +30 -0
  31. data/.koppie/app/assets/javascripts/blacklight_gallery.js +1 -0
  32. data/.koppie/app/assets/javascripts/cable.js +13 -0
  33. data/.koppie/app/assets/javascripts/channels/.keep +0 -0
  34. data/.koppie/app/assets/javascripts/openseadragon.js +2 -0
  35. data/.koppie/app/assets/stylesheets/application.css +48 -0
  36. data/.koppie/app/assets/stylesheets/hyrax.scss +17 -0
  37. data/.koppie/app/assets/stylesheets/openseadragon.css +3 -0
  38. data/.koppie/app/channels/application_cable/channel.rb +4 -0
  39. data/.koppie/app/channels/application_cable/connection.rb +4 -0
  40. data/.koppie/app/controllers/application_controller.rb +13 -0
  41. data/.koppie/app/controllers/catalog_controller.rb +314 -0
  42. data/.koppie/app/controllers/concerns/.keep +0 -0
  43. data/.koppie/app/controllers/hyrax/generic_works_controller.rb +17 -0
  44. data/.koppie/app/controllers/hyrax/monographs_controller.rb +17 -0
  45. data/.koppie/app/forms/collection_resource_form.rb +7 -0
  46. data/.koppie/app/forms/generic_work_form.rb +20 -0
  47. data/.koppie/app/forms/monograph_form.rb +20 -0
  48. data/.koppie/app/helpers/application_helper.rb +2 -0
  49. data/.koppie/app/helpers/hyrax_helper.rb +6 -0
  50. data/.koppie/app/indexers/collection_resource_indexer.rb +7 -0
  51. data/.koppie/app/indexers/generic_work_indexer.rb +16 -0
  52. data/.koppie/app/indexers/monograph_indexer.rb +16 -0
  53. data/.koppie/app/jobs/application_job.rb +2 -0
  54. data/.koppie/app/mailers/application_mailer.rb +4 -0
  55. data/.koppie/app/models/ability.rb +25 -0
  56. data/.koppie/app/models/application_record.rb +3 -0
  57. data/.koppie/app/models/collection.rb +1 -0
  58. data/.koppie/app/models/collection_resource.rb +31 -0
  59. data/.koppie/app/models/concerns/.keep +0 -0
  60. data/.koppie/app/models/file_set.rb +4 -0
  61. data/.koppie/app/models/generic_work.rb +8 -0
  62. data/.koppie/app/models/monograph.rb +8 -0
  63. data/.koppie/app/models/qa/local_authority.rb +2 -0
  64. data/.koppie/app/models/qa/local_authority_entry.rb +3 -0
  65. data/.koppie/app/models/qa.rb +5 -0
  66. data/.koppie/app/models/search_builder.rb +16 -0
  67. data/.koppie/app/models/solr_document.rb +28 -0
  68. data/.koppie/app/models/user.rb +24 -0
  69. data/.koppie/app/views/hyrax/generic_works/_generic_work.html.erb +2 -0
  70. data/.koppie/app/views/hyrax/monographs/_monograph.html.erb +2 -0
  71. data/.koppie/app/views/layouts/application.html.erb +15 -0
  72. data/.koppie/app/views/layouts/mailer.html.erb +13 -0
  73. data/.koppie/app/views/layouts/mailer.text.erb +1 -0
  74. data/.koppie/bin/bundle +3 -0
  75. data/.koppie/bin/rails +9 -0
  76. data/.koppie/bin/rake +9 -0
  77. data/.koppie/bin/setup +36 -0
  78. data/.koppie/bin/spring +17 -0
  79. data/.koppie/bin/update +31 -0
  80. data/.koppie/bin/yarn +11 -0
  81. data/.koppie/config/analytics.yml +12 -0
  82. data/.koppie/config/application.rb +33 -0
  83. data/.koppie/config/authorities/licenses.yml +46 -0
  84. data/.koppie/config/authorities/resource_types.yml +41 -0
  85. data/.koppie/config/authorities/rights_statements.yml +37 -0
  86. data/.koppie/config/blacklight.yml +9 -0
  87. data/.koppie/config/boot.rb +4 -0
  88. data/.koppie/config/browse_everything_providers.yml +25 -0
  89. data/.koppie/config/cable.yml +12 -0
  90. data/.koppie/config/credentials.yml.enc +1 -0
  91. data/.koppie/config/database.yml +25 -0
  92. data/.koppie/config/environment.rb +5 -0
  93. data/.koppie/config/environments/development.rb +71 -0
  94. data/.koppie/config/environments/production.rb +97 -0
  95. data/.koppie/config/environments/test.rb +46 -0
  96. data/.koppie/config/initializers/1_valkyrie.rb +56 -0
  97. data/.koppie/config/initializers/application_controller_renderer.rb +8 -0
  98. data/.koppie/config/initializers/assets.rb +14 -0
  99. data/.koppie/config/initializers/backtrace_silencers.rb +7 -0
  100. data/.koppie/config/initializers/clamav.rb +2 -0
  101. data/.koppie/config/initializers/content_security_policy.rb +25 -0
  102. data/.koppie/config/initializers/cookies_serializer.rb +5 -0
  103. data/.koppie/config/initializers/devise.rb +311 -0
  104. data/.koppie/config/initializers/filter_parameter_logging.rb +4 -0
  105. data/.koppie/config/initializers/hydra_config.rb +24 -0
  106. data/.koppie/config/initializers/hyrax.rb +333 -0
  107. data/.koppie/config/initializers/inflections.rb +16 -0
  108. data/.koppie/config/initializers/mailboxer.rb +22 -0
  109. data/.koppie/config/initializers/mime_types.rb +8 -0
  110. data/.koppie/config/initializers/mini_magick.rb +6 -0
  111. data/.koppie/config/initializers/redis_config.rb +4 -0
  112. data/.koppie/config/initializers/riiif.rb +29 -0
  113. data/.koppie/config/initializers/simple_form.rb +171 -0
  114. data/.koppie/config/initializers/simple_form_bootstrap.rb +151 -0
  115. data/.koppie/config/initializers/wrap_parameters.rb +14 -0
  116. data/.koppie/config/locales/blacklight.en.yml +3 -0
  117. data/.koppie/config/locales/devise.en.yml +65 -0
  118. data/.koppie/config/locales/en.yml +33 -0
  119. data/.koppie/config/locales/hyrax.de.yml +58 -0
  120. data/.koppie/config/locales/hyrax.en.yml +58 -0
  121. data/.koppie/config/locales/hyrax.es.yml +58 -0
  122. data/.koppie/config/locales/hyrax.fr.yml +58 -0
  123. data/.koppie/config/locales/hyrax.it.yml +58 -0
  124. data/.koppie/config/locales/hyrax.pt-BR.yml +58 -0
  125. data/.koppie/config/locales/hyrax.zh.yml +58 -0
  126. data/.koppie/config/metadata/collection_resource.yaml +149 -0
  127. data/.koppie/config/metadata/generic_work.yaml +22 -0
  128. data/.koppie/config/metadata/monograph.yaml +55 -0
  129. data/.koppie/config/puma.rb +37 -0
  130. data/.koppie/config/redis.yml +12 -0
  131. data/.koppie/config/role_map.yml +48 -0
  132. data/.koppie/config/routes.rb +36 -0
  133. data/.koppie/config/sidekiq.yml +15 -0
  134. data/.koppie/config/solr.yml +7 -0
  135. data/.koppie/config/spring.rb +6 -0
  136. data/.koppie/config/storage.yml +34 -0
  137. data/.koppie/config/tinymce.yml +13 -0
  138. data/.koppie/config/uv/uv-config.json +3 -0
  139. data/.koppie/config/uv/uv.html +87 -0
  140. data/.koppie/config/valkyrie_index.yml +12 -0
  141. data/.koppie/config/workflows/default_workflow.json +21 -0
  142. data/.koppie/config/workflows/mediated_deposit_workflow.json +76 -0
  143. data/.koppie/config.ru +5 -0
  144. data/.koppie/db/migrate/20210911143430_create_searches.blacklight.rb +17 -0
  145. data/.koppie/db/migrate/20210911143431_create_bookmarks.blacklight.rb +19 -0
  146. data/.koppie/db/migrate/20210911143432_add_polymorphic_type_to_bookmarks.blacklight.rb +9 -0
  147. data/.koppie/db/migrate/20210911143452_devise_create_users.rb +44 -0
  148. data/.koppie/db/migrate/20210911143456_add_devise_guests_to_users.rb +15 -0
  149. data/.koppie/db/migrate/20210911143532_create_version_committers.hyrax.rb +15 -0
  150. data/.koppie/db/migrate/20210911143533_create_checksum_audit_logs.hyrax.rb +19 -0
  151. data/.koppie/db/migrate/20210911143534_create_single_use_links.hyrax.rb +12 -0
  152. data/.koppie/db/migrate/20210911143535_add_social_to_users.hyrax.rb +13 -0
  153. data/.koppie/db/migrate/20210911143536_add_ldap_attrs_to_user.hyrax.rb +27 -0
  154. data/.koppie/db/migrate/20210911143537_add_avatars_to_users.hyrax.rb +15 -0
  155. data/.koppie/db/migrate/20210911143538_create_trophies.hyrax.rb +10 -0
  156. data/.koppie/db/migrate/20210911143539_add_linkedin_to_users.hyrax.rb +5 -0
  157. data/.koppie/db/migrate/20210911143540_create_tinymce_assets.hyrax.rb +8 -0
  158. data/.koppie/db/migrate/20210911143541_create_content_blocks.hyrax.rb +10 -0
  159. data/.koppie/db/migrate/20210911143542_create_featured_works.hyrax.rb +12 -0
  160. data/.koppie/db/migrate/20210911143543_add_external_key_to_content_blocks.hyrax.rb +6 -0
  161. data/.koppie/db/migrate/20210911143544_create_proxy_deposit_rights.hyrax.rb +10 -0
  162. data/.koppie/db/migrate/20210911143545_create_proxy_deposit_requests.hyrax.rb +15 -0
  163. data/.koppie/db/migrate/20210911143546_create_file_view_stats.hyrax.rb +12 -0
  164. data/.koppie/db/migrate/20210911143547_create_file_download_stats.hyrax.rb +12 -0
  165. data/.koppie/db/migrate/20210911143548_add_orcid_to_users.hyrax.rb +5 -0
  166. data/.koppie/db/migrate/20210911143549_create_user_stats.hyrax.rb +19 -0
  167. data/.koppie/db/migrate/20210911143550_create_work_view_stats.hyrax.rb +12 -0
  168. data/.koppie/db/migrate/20210911143551_add_works_to_user_stats.hyrax.rb +13 -0
  169. data/.koppie/db/migrate/20210911143552_change_trophy_generic_file_id_to_work_id.hyrax.rb +5 -0
  170. data/.koppie/db/migrate/20210911143553_change_proxy_deposit_generic_file_id_to_work_id.hyrax.rb +5 -0
  171. data/.koppie/db/migrate/20210911143554_change_audit_log_generic_file_id_to_file_set_id.hyrax.rb +5 -0
  172. data/.koppie/db/migrate/20210911143555_change_proxy_deposit_request_generic_file_id_to_work_id.hyrax.rb +5 -0
  173. data/.koppie/db/migrate/20210911143556_create_uploaded_files.hyrax.rb +10 -0
  174. data/.koppie/db/migrate/20210911143557_create_features.hyrax.rb +10 -0
  175. data/.koppie/db/migrate/20210911143558_create_operations.hyrax.rb +23 -0
  176. data/.koppie/db/migrate/20210911143559_change_featured_work_generic_file_id_to_work_id.hyrax.rb +6 -0
  177. data/.koppie/db/migrate/20210911143560_add_arkivo_to_users.hyrax.rb +8 -0
  178. data/.koppie/db/migrate/20210911143561_create_sipity.hyrax.rb +163 -0
  179. data/.koppie/db/migrate/20210911143562_create_sipity_workflow_methods.hyrax.rb +10 -0
  180. data/.koppie/db/migrate/20210911143563_create_permission_template.hyrax.rb +11 -0
  181. data/.koppie/db/migrate/20210911143564_create_permission_template_access.hyrax.rb +11 -0
  182. data/.koppie/db/migrate/20210911143565_add_release_to_permission_templates.hyrax.rb +6 -0
  183. data/.koppie/db/migrate/20210911143566_add_permission_template_to_sipity_workflow.hyrax.rb +26 -0
  184. data/.koppie/db/migrate/20210911143567_tidy_up_because_of_bad_exception.hyrax.rb +13 -0
  185. data/.koppie/db/migrate/20210911143568_add_allows_access_grant_to_workflow.hyrax.rb +5 -0
  186. data/.koppie/db/migrate/20210911143569_change_checksum_audit_log.hyrax.rb +18 -0
  187. data/.koppie/db/migrate/20210911143570_create_job_io_wrappers.hyrax.rb +15 -0
  188. data/.koppie/db/migrate/20210911143571_create_collection_types.hyrax.rb +17 -0
  189. data/.koppie/db/migrate/20210911143572_update_collection_type_column_names.hyrax.rb +9 -0
  190. data/.koppie/db/migrate/20210911143573_update_collection_type_column_options.hyrax.rb +17 -0
  191. data/.koppie/db/migrate/20210911143574_create_collection_branding_infos.hyrax.rb +15 -0
  192. data/.koppie/db/migrate/20210911143575_create_collection_type_participants.hyrax.rb +11 -0
  193. data/.koppie/db/migrate/20210911143576_rename_admin_set_id_to_source_id.hyrax.rb +5 -0
  194. data/.koppie/db/migrate/20210911143577_add_preferred_locale_to_users.hyrax.rb +5 -0
  195. data/.koppie/db/migrate/20210911143578_add_collection_type_sharing_options.hyrax.rb +5 -0
  196. data/.koppie/db/migrate/20210911143579_add_unique_constraint_to_permission_template_accesses.hyrax.rb +8 -0
  197. data/.koppie/db/migrate/20210911143580_add_branding_to_collection_type.hyrax.rb +5 -0
  198. data/.koppie/db/migrate/20210911143581_add_badge_color_to_collection_types.hyrax.rb +5 -0
  199. data/.koppie/db/migrate/20210911143582_update_single_use_links_column_names.hyrax.rb +6 -0
  200. data/.koppie/db/migrate/20210911143583_change_sipity_entity_specific_responsibility.hyrax.rb +9 -0
  201. data/.koppie/db/migrate/20210911143584_create_mailboxer.mailboxer_engine.rb +65 -0
  202. data/.koppie/db/migrate/20210911143585_add_conversation_optout.mailboxer_engine.rb +15 -0
  203. data/.koppie/db/migrate/20210911143586_add_missing_indices.mailboxer_engine.rb +20 -0
  204. data/.koppie/db/migrate/20210911143587_add_delivery_tracking_info_to_mailboxer_receipts.mailboxer_engine.rb +8 -0
  205. data/.koppie/db/migrate/20210911143588_create_qa_local_authorities.rb +10 -0
  206. data/.koppie/db/migrate/20210911143602_create_qa_local_authority_entries.rb +12 -0
  207. data/.koppie/db/migrate/20210911143623_create_minter_states.noid_rails_engine.rb +17 -0
  208. data/.koppie/db/migrate/20210911143624_rename_minter_state_random_to_rand.noid_rails_engine.rb +8 -0
  209. data/.koppie/db/migrate/20210921150120_enable_uuid_extension.valkyrie_engine.rb +7 -0
  210. data/.koppie/db/migrate/20210921150121_create_orm_resources.valkyrie_engine.rb +19 -0
  211. data/.koppie/db/migrate/20210921150122_add_model_type_to_orm_resources.valkyrie_engine.rb +7 -0
  212. data/.koppie/db/migrate/20210921150123_change_model_type_to_internal_model.valkyrie_engine.rb +7 -0
  213. data/.koppie/db/migrate/20210921150124_create_path_gin_index.valkyrie_engine.rb +7 -0
  214. data/.koppie/db/migrate/20210921150125_create_internal_resource_index.valkyrie_engine.rb +7 -0
  215. data/.koppie/db/migrate/20210921150126_create_updated_at_index.valkyrie_engine.rb +7 -0
  216. data/.koppie/db/migrate/20210921150127_add_optimistic_locking_to_orm_resources.valkyrie_engine.rb +7 -0
  217. data/.koppie/db/migrate/20211021161136_user_roles.rb +20 -0
  218. data/.koppie/db/migrate/20211207172259_create_default_administrative_set.hyrax.rb +8 -0
  219. data/.koppie/db/schema.rb +595 -0
  220. data/.koppie/db/seeds.rb +79 -0
  221. data/.koppie/lib/assets/.keep +0 -0
  222. data/.koppie/lib/tasks/.keep +0 -0
  223. data/.koppie/log/.keep +0 -0
  224. data/.koppie/package.json +15 -0
  225. data/.koppie/public/404.html +67 -0
  226. data/.koppie/public/422.html +67 -0
  227. data/.koppie/public/500.html +66 -0
  228. data/.koppie/public/apple-touch-icon-precomposed.png +0 -0
  229. data/.koppie/public/apple-touch-icon.png +0 -0
  230. data/.koppie/public/branding/.keep +0 -0
  231. data/.koppie/public/favicon.ico +0 -0
  232. data/.koppie/public/robots.txt +1 -0
  233. data/.koppie/scripts/db-migrate-seed.sh +9 -0
  234. data/.koppie/scripts/entrypoint.sh +10 -0
  235. data/.koppie/solr/conf/_rest_managed.json +3 -0
  236. data/.koppie/solr/conf/admin-extra.html +31 -0
  237. data/.koppie/solr/conf/elevate.xml +36 -0
  238. data/.koppie/solr/conf/mapping-ISOLatin1Accent.txt +246 -0
  239. data/.koppie/solr/conf/protwords.txt +21 -0
  240. data/.koppie/solr/conf/schema.xml +367 -0
  241. data/.koppie/solr/conf/scripts.conf +24 -0
  242. data/.koppie/solr/conf/solrconfig.xml +325 -0
  243. data/.koppie/solr/conf/spellings.txt +2 -0
  244. data/.koppie/solr/conf/stopwords.txt +58 -0
  245. data/.koppie/solr/conf/stopwords_en.txt +58 -0
  246. data/.koppie/solr/conf/synonyms.txt +31 -0
  247. data/.koppie/solr/conf/xslt/example.xsl +132 -0
  248. data/.koppie/solr/conf/xslt/example_atom.xsl +67 -0
  249. data/.koppie/solr/conf/xslt/example_rss.xsl +66 -0
  250. data/.koppie/solr/conf/xslt/luke.xsl +337 -0
  251. data/.koppie/solr/sample_solr_documents.yml +2692 -0
  252. data/.koppie/spec/forms/collection_resource_form_spec.rb +13 -0
  253. data/.koppie/spec/indexers/collection_resource_indexer_spec.rb +14 -0
  254. data/.koppie/spec/indexers/generic_work_indexer_spec.rb +13 -0
  255. data/.koppie/spec/indexers/monograph_indexer_spec.rb +13 -0
  256. data/.koppie/spec/models/collection_resource_spec.rb +13 -0
  257. data/.koppie/spec/models/collection_spec.rb +17 -0
  258. data/.koppie/spec/models/file_set_spec.rb +15 -0
  259. data/.koppie/spec/models/generic_work_spec.rb +13 -0
  260. data/.koppie/spec/models/monograph_spec.rb +13 -0
  261. data/.koppie/spec/models/qa/local_authority_entry_spec.rb +5 -0
  262. data/.koppie/spec/models/qa/local_authority_spec.rb +5 -0
  263. data/.koppie/spec/rails_helper.rb +47 -0
  264. data/.koppie/spec/spec_helper.rb +19 -0
  265. data/.koppie/spec/views/generic_works/_generic_work.html.erb_spec.rb +7 -0
  266. data/.koppie/spec/views/monographs/_monograph.html.erb_spec.rb +7 -0
  267. data/.koppie/storage/.keep +0 -0
  268. data/.koppie/vendor/.keep +0 -0
  269. data/.koppie/yarn.lock +1497 -0
  270. data/.regen +2 -1
  271. data/.rubocop.yml +1 -1
  272. data/CONTAINERS.md +54 -10
  273. data/CONTRIBUTING.md +22 -24
  274. data/Dockerfile +10 -6
  275. data/Rakefile +0 -4
  276. data/app/actors/hyrax/actors/base_actor.rb +1 -1
  277. data/app/actors/hyrax/actors/collections_membership_actor.rb +1 -2
  278. data/app/actors/hyrax/actors/create_with_files_actor.rb +1 -1
  279. data/app/actors/hyrax/actors/create_with_remote_files_actor.rb +7 -13
  280. data/app/actors/hyrax/actors/embargo_actor.rb +11 -4
  281. data/app/actors/hyrax/actors/file_actor.rb +9 -37
  282. data/app/actors/hyrax/actors/file_set_actor.rb +13 -62
  283. data/app/actors/hyrax/actors/lease_actor.rb +11 -4
  284. data/app/assets/javascripts/hyrax/app.js.erb +2 -2
  285. data/app/assets/javascripts/hyrax/batch.js +2 -2
  286. data/app/assets/javascripts/hyrax/batch_edit.js +4 -4
  287. data/app/assets/javascripts/hyrax/batch_select_all.js +13 -13
  288. data/app/assets/javascripts/hyrax/browse_everything.js +4 -2
  289. data/app/assets/javascripts/hyrax/collection_types.es6 +1 -1
  290. data/app/assets/javascripts/hyrax/collections/editor.es6 +5 -1
  291. data/app/assets/javascripts/hyrax/dashboard_actions.js +5 -5
  292. data/app/assets/javascripts/hyrax/editor/controlled_vocabulary.es6 +3 -3
  293. data/app/assets/javascripts/hyrax/editor.es6 +3 -3
  294. data/app/assets/javascripts/hyrax/facets.js +6 -4
  295. data/app/assets/javascripts/hyrax/file_manager/member.es6 +1 -1
  296. data/app/assets/javascripts/hyrax/file_manager/save_manager.es6 +2 -2
  297. data/app/assets/javascripts/hyrax/file_manager/sorting.es6 +2 -2
  298. data/app/assets/javascripts/hyrax/file_manager.es6 +2 -17
  299. data/app/assets/javascripts/hyrax/notification.es6 +1 -1
  300. data/app/assets/javascripts/hyrax/permissions/control.es6 +8 -1
  301. data/app/assets/javascripts/hyrax/permissions/registry.es6 +4 -4
  302. data/app/assets/javascripts/hyrax/permissions/user_controls.es6 +3 -1
  303. data/app/assets/javascripts/hyrax/relationships/confirm_remove_dialog.es6 +1 -1
  304. data/app/assets/javascripts/hyrax/relationships/control.es6 +2 -2
  305. data/app/assets/javascripts/hyrax/relationships/registry_entry.es6 +1 -1
  306. data/app/assets/javascripts/hyrax/reports-buttons.js +9 -9
  307. data/app/assets/javascripts/hyrax/save_work/required_fields.es6 +1 -1
  308. data/app/assets/javascripts/hyrax/save_work/save_work_control.es6 +6 -6
  309. data/app/assets/javascripts/hyrax/save_work/uploaded_files.es6 +2 -2
  310. data/app/assets/javascripts/hyrax/single_use_links_manager.js +1 -1
  311. data/app/assets/javascripts/hyrax/skip_to_content.js +1 -1
  312. data/app/assets/javascripts/hyrax/sorting.js +1 -1
  313. data/app/assets/javascripts/hyrax/trophy.js +1 -1
  314. data/app/assets/javascripts/hyrax/uploader.js +3 -3
  315. data/app/assets/javascripts/hyrax.js +1 -19
  316. data/app/assets/stylesheets/_bootstrap-default-overrides.scss +4 -4
  317. data/app/assets/stylesheets/hyrax/_accessibility.scss +1 -1
  318. data/app/assets/stylesheets/hyrax/_badge.scss +7 -0
  319. data/app/assets/stylesheets/hyrax/_batch-edit.scss +8 -8
  320. data/app/assets/stylesheets/hyrax/_browse_everything_overrides.scss +1 -1
  321. data/app/assets/stylesheets/hyrax/_buttons.scss +31 -1
  322. data/app/assets/stylesheets/hyrax/_card.scss +10 -0
  323. data/app/assets/stylesheets/hyrax/_catalog.scss +22 -48
  324. data/app/assets/stylesheets/hyrax/_collection_types.scss +1 -1
  325. data/app/assets/stylesheets/hyrax/_collections.scss +13 -13
  326. data/app/assets/stylesheets/hyrax/_facets.scss +46 -0
  327. data/app/assets/stylesheets/hyrax/_featured.scss +1 -1
  328. data/app/assets/stylesheets/hyrax/_file-listing.scss +3 -3
  329. data/app/assets/stylesheets/hyrax/_file_manager.scss +17 -17
  330. data/app/assets/stylesheets/hyrax/_file_sets.scss +1 -1
  331. data/app/assets/stylesheets/hyrax/_file_upload.scss +4 -4
  332. data/app/assets/stylesheets/hyrax/_fixedsticky.scss +1 -1
  333. data/app/assets/stylesheets/hyrax/_footer.scss +3 -3
  334. data/app/assets/stylesheets/hyrax/_form-progress.scss +9 -9
  335. data/app/assets/stylesheets/hyrax/_form.scss +3 -4
  336. data/app/assets/stylesheets/hyrax/_forms.scss +62 -29
  337. data/app/assets/stylesheets/hyrax/_header.scss +0 -17
  338. data/app/assets/stylesheets/hyrax/_home-page.scss +13 -51
  339. data/app/assets/stylesheets/hyrax/_html.scss +11 -0
  340. data/app/assets/stylesheets/hyrax/_hyrax.scss +16 -14
  341. data/app/assets/stylesheets/hyrax/_nestable.scss +1 -1
  342. data/app/assets/stylesheets/hyrax/_select_work_type.scss +2 -2
  343. data/app/assets/stylesheets/hyrax/_styles.scss +9 -14
  344. data/app/assets/stylesheets/hyrax/_users.scss +2 -2
  345. data/app/assets/stylesheets/hyrax/_variables.scss +20 -1
  346. data/app/assets/stylesheets/hyrax/_work-show.scss +21 -13
  347. data/app/assets/stylesheets/hyrax/blacklight_gallery.scss +75 -2
  348. data/app/assets/stylesheets/hyrax/dashboard.scss +40 -122
  349. data/app/assets/stylesheets/hyrax/sidebar.scss +39 -19
  350. data/app/components/hyrax/dropdown_facet_field_component.html.erb +21 -0
  351. data/app/components/hyrax/dropdown_facet_field_component.rb +30 -0
  352. data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +15 -9
  353. data/app/controllers/concerns/hyrax/embargoes_controller_behavior.rb +11 -2
  354. data/app/controllers/concerns/hyrax/leases_controller_behavior.rb +11 -2
  355. data/app/controllers/concerns/hyrax/manages_embargoes.rb +13 -1
  356. data/app/controllers/concerns/hyrax/works_controller_behavior.rb +8 -11
  357. data/app/controllers/hyrax/batch_edits_controller.rb +1 -1
  358. data/app/controllers/hyrax/dashboard/collection_members_controller.rb +0 -1
  359. data/app/controllers/hyrax/dashboard/collections_controller.rb +4 -7
  360. data/app/controllers/hyrax/dashboard/nest_collections_controller.rb +0 -32
  361. data/app/controllers/hyrax/file_sets_controller.rb +4 -0
  362. data/app/controllers/hyrax/homepage_controller.rb +0 -1
  363. data/app/controllers/hyrax/my/collections_controller.rb +1 -0
  364. data/app/controllers/hyrax/my/works_controller.rb +1 -1
  365. data/app/controllers/hyrax/my_controller.rb +0 -6
  366. data/app/controllers/hyrax/permissions_controller.rb +1 -1
  367. data/app/controllers/hyrax/single_use_links_controller.rb +1 -2
  368. data/app/controllers/hyrax/transfers_controller.rb +0 -2
  369. data/app/forms/hyrax/forms/batch_upload_form.rb +1 -1
  370. data/app/forms/hyrax/forms/collection_form.rb +1 -1
  371. data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb +4 -18
  372. data/app/forms/hyrax/forms/embargo.rb +13 -0
  373. data/app/forms/hyrax/forms/lease.rb +13 -0
  374. data/app/forms/hyrax/forms/resource_form.rb +30 -1
  375. data/app/forms/hyrax/forms/work_embargo_form.rb +35 -0
  376. data/app/forms/hyrax/forms/work_form.rb +2 -2
  377. data/app/forms/hyrax/forms/work_lease_form.rb +35 -0
  378. data/app/helpers/hyrax/collections_helper.rb +4 -32
  379. data/app/helpers/hyrax/embargo_helper.rb +11 -0
  380. data/app/helpers/hyrax/facets_helper.rb +10 -0
  381. data/app/helpers/hyrax/hyrax_helper_behavior.rb +20 -5
  382. data/app/helpers/hyrax/lease_helper.rb +11 -0
  383. data/app/helpers/hyrax/work_form_helper.rb +107 -0
  384. data/app/indexers/hyrax/basic_metadata_indexer.rb +3 -9
  385. data/app/indexers/hyrax/deep_indexing_service.rb +2 -2
  386. data/app/indexers/hyrax/pcdm_collection_indexer.rb +1 -0
  387. data/app/indexers/hyrax/valkyrie_file_set_indexer.rb +1 -7
  388. data/app/indexers/hyrax/valkyrie_work_indexer.rb +21 -0
  389. data/app/jobs/characterize_job.rb +4 -3
  390. data/app/jobs/create_derivatives_job.rb +4 -2
  391. data/app/jobs/import_url_job.rb +2 -2
  392. data/app/jobs/ingest_local_file_job.rb +5 -13
  393. data/app/jobs/inherit_permissions_job.rb +1 -5
  394. data/app/models/concerns/hyrax/ability.rb +2 -2
  395. data/app/models/concerns/hyrax/collection_behavior.rb +4 -2
  396. data/app/models/concerns/hyrax/file_set_behavior.rb +2 -1
  397. data/app/models/concerns/hyrax/in_admin_set.rb +0 -7
  398. data/app/models/concerns/hyrax/naming.rb +1 -1
  399. data/app/models/concerns/hyrax/user.rb +3 -3
  400. data/app/models/concerns/hyrax/work_behavior.rb +0 -2
  401. data/app/models/content_block.rb +0 -6
  402. data/app/models/file_download_stat.rb +1 -1
  403. data/app/models/hyrax/collection_type.rb +9 -1
  404. data/app/models/hyrax/embargo.rb +1 -1
  405. data/app/models/hyrax/file_metadata.rb +1 -1
  406. data/app/models/hyrax/file_set.rb +2 -2
  407. data/app/models/hyrax/lease.rb +1 -1
  408. data/app/models/hyrax/permission_template.rb +0 -35
  409. data/app/models/hyrax/statistic.rb +1 -1
  410. data/app/models/hyrax/work.rb +2 -2
  411. data/app/models/proxy_deposit_request.rb +1 -1
  412. data/app/models/sipity.rb +8 -8
  413. data/app/presenters/hyrax/admin/repository_object_presenter.rb +0 -2
  414. data/app/presenters/hyrax/admin_set_presenter.rb +5 -0
  415. data/app/presenters/hyrax/collapsable_section_presenter.rb +2 -2
  416. data/app/presenters/hyrax/collection_presenter.rb +1 -1
  417. data/app/presenters/hyrax/displays_image.rb +1 -1
  418. data/app/presenters/hyrax/fixity_status_presenter.rb +2 -2
  419. data/app/presenters/hyrax/menu_presenter.rb +1 -1
  420. data/app/presenters/hyrax/pcdm_member_presenter_factory.rb +1 -1
  421. data/app/presenters/hyrax/permission_badge.rb +9 -8
  422. data/app/presenters/hyrax/presenter_renderer.rb +1 -1
  423. data/app/presenters/hyrax/presents_attributes.rb +1 -1
  424. data/app/presenters/hyrax/version_list_presenter.rb +6 -1
  425. data/app/presenters/hyrax/work_show_presenter.rb +3 -0
  426. data/app/presenters/hyrax/workflow_presenter.rb +1 -1
  427. data/app/renderers/hyrax/renderers/external_link_attribute_renderer.rb +1 -1
  428. data/app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb +7 -67
  429. data/app/search_builders/hyrax/deposit_search_builder.rb +1 -1
  430. data/app/search_builders/hyrax/nested_collections_parent_search_builder.rb +10 -1
  431. data/app/search_builders/hyrax/single_result.rb +1 -1
  432. data/app/search_builders/hyrax/stats/work_status_search_builder.rb +1 -1
  433. data/app/services/hyrax/admin_set_create_service.rb +2 -2
  434. data/app/services/hyrax/analytics/google.rb +1 -1
  435. data/app/services/hyrax/analytics/matomo.rb +1 -1
  436. data/app/services/hyrax/collection_member_service.rb +3 -2
  437. data/app/services/hyrax/collection_types/create_service.rb +1 -1
  438. data/app/services/hyrax/collections/migration_service.rb +8 -8
  439. data/app/services/hyrax/collections/nested_collection_query_service.rb +3 -113
  440. data/app/services/hyrax/collections/search_service.rb +0 -1
  441. data/app/services/hyrax/custom_queries.rb +25 -0
  442. data/app/services/hyrax/derivative_service.rb +37 -4
  443. data/app/services/hyrax/edit_permissions_service.rb +1 -14
  444. data/app/services/hyrax/embargo_manager.rb +9 -0
  445. data/app/services/hyrax/embargo_service.rb +4 -0
  446. data/app/services/hyrax/file_set_csv_service.rb +1 -1
  447. data/app/services/hyrax/file_set_file_service.rb +55 -0
  448. data/app/services/hyrax/graph_exporter.rb +3 -8
  449. data/app/services/hyrax/iiif_authorization_service.rb +1 -1
  450. data/app/services/hyrax/lease_manager.rb +9 -0
  451. data/app/services/hyrax/lease_service.rb +4 -0
  452. data/app/services/hyrax/listeners/workflow_listener.rb +2 -2
  453. data/app/services/hyrax/local_file_service.rb +3 -1
  454. data/app/services/hyrax/search_service.rb +1 -81
  455. data/app/services/hyrax/solr_service.rb +1 -1
  456. data/app/services/hyrax/statistics/depositors/summary.rb +2 -4
  457. data/app/services/hyrax/statistics/term_query.rb +1 -1
  458. data/app/services/hyrax/thumbnail_path_service.rb +1 -1
  459. data/app/services/hyrax/user_stat_importer.rb +4 -2
  460. data/app/services/hyrax/valkyrie_persist_derivatives.rb +1 -1
  461. data/app/services/hyrax/valkyrie_upload.rb +14 -2
  462. data/app/services/hyrax/versioning_service.rb +78 -10
  463. data/app/services/hyrax/visibility_map.rb +10 -2
  464. data/app/services/hyrax/work_query_service.rb +1 -1
  465. data/app/services/hyrax/work_resource_query_service.rb +45 -0
  466. data/app/services/hyrax/workflow/action_taken_service.rb +4 -4
  467. data/app/services/hyrax/workflow/notification_service.rb +2 -2
  468. data/app/services/hyrax/workflow/workflow_importer.rb +2 -2
  469. data/app/services/hyrax/working_directory.rb +5 -3
  470. data/app/services/hyrax/works/migration_service.rb +3 -3
  471. data/app/utils/hyrax/test_data_seeders/user_seeder.rb +3 -2
  472. data/app/validators/hyrax/collection_membership_validator.rb +2 -2
  473. data/app/views/_controls.html.erb +14 -18
  474. data/app/views/_logo.html.erb +0 -1
  475. data/app/views/_masthead.html.erb +8 -18
  476. data/app/views/_user_util_links.html.erb +16 -18
  477. data/app/views/catalog/_document.html.erb +2 -2
  478. data/app/views/catalog/_document_list.html.erb +1 -1
  479. data/app/views/catalog/_facet_limit.html.erb +1 -1
  480. data/app/views/catalog/_index_gallery_collection_wrapper.html.erb +1 -1
  481. data/app/views/catalog/_index_header_list_collection.html.erb +2 -2
  482. data/app/views/catalog/_index_header_list_default.html.erb +1 -1
  483. data/app/views/catalog/_index_list_default.html.erb +7 -5
  484. data/app/views/catalog/_search_form.html.erb +13 -15
  485. data/app/views/catalog/_thumbnail_list_collection.html.erb +2 -2
  486. data/app/views/catalog/_thumbnail_list_default.html.erb +3 -3
  487. data/app/views/catalog/facet.html.erb +21 -0
  488. data/app/views/catalog/index.html.erb +6 -4
  489. data/app/views/hyrax/admin/admin_sets/_form.html.erb +16 -16
  490. data/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb +35 -33
  491. data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb +9 -8
  492. data/app/views/hyrax/admin/admin_sets/_form_visibility.html.erb +24 -24
  493. data/app/views/hyrax/admin/admin_sets/_form_workflow.erb +5 -5
  494. data/app/views/hyrax/admin/admin_sets/_show_actions.html.erb +3 -3
  495. data/app/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb +9 -9
  496. data/app/views/hyrax/admin/admin_sets/index.html.erb +3 -3
  497. data/app/views/hyrax/admin/admin_sets/show.html.erb +4 -4
  498. data/app/views/hyrax/admin/analytics/_date_range_form.html.erb +3 -3
  499. data/app/views/hyrax/admin/analytics/collection_reports/_custom_range.html.erb +3 -3
  500. data/app/views/hyrax/admin/analytics/collection_reports/_monthly_summary.html.erb +3 -3
  501. data/app/views/hyrax/admin/analytics/collection_reports/_summary.html.erb +3 -3
  502. data/app/views/hyrax/admin/analytics/collection_reports/_top_collections.html.erb +7 -7
  503. data/app/views/hyrax/admin/analytics/collection_reports/index.html.erb +6 -6
  504. data/app/views/hyrax/admin/analytics/collection_reports/show.html.erb +10 -10
  505. data/app/views/hyrax/admin/analytics/work_reports/_custom_range.html.erb +3 -3
  506. data/app/views/hyrax/admin/analytics/work_reports/_monthly_summary.html.erb +3 -3
  507. data/app/views/hyrax/admin/analytics/work_reports/_summary.html.erb +3 -3
  508. data/app/views/hyrax/admin/analytics/work_reports/_top_file_set_downloads.html.erb +5 -5
  509. data/app/views/hyrax/admin/analytics/work_reports/_top_works.html.erb +7 -7
  510. data/app/views/hyrax/admin/analytics/work_reports/_work_counts.html.erb +4 -4
  511. data/app/views/hyrax/admin/analytics/work_reports/_work_files.html.erb +5 -5
  512. data/app/views/hyrax/admin/analytics/work_reports/index.html.erb +7 -7
  513. data/app/views/hyrax/admin/analytics/work_reports/show.html.erb +16 -16
  514. data/app/views/hyrax/admin/appearances/show.html.erb +2 -2
  515. data/app/views/hyrax/admin/collection_types/_form.html.erb +24 -23
  516. data/app/views/hyrax/admin/collection_types/_form_appearance.html.erb +2 -2
  517. data/app/views/hyrax/admin/collection_types/_form_participants.html.erb +4 -4
  518. data/app/views/hyrax/admin/collection_types/_form_settings.html.erb +9 -9
  519. data/app/views/hyrax/admin/collection_types/index.html.erb +6 -6
  520. data/app/views/hyrax/admin/features/index.html.erb +3 -3
  521. data/app/views/hyrax/admin/stats/_new_users.html.erb +1 -1
  522. data/app/views/hyrax/admin/stats/show.html.erb +4 -6
  523. data/app/views/hyrax/admin/users/index.html.erb +3 -3
  524. data/app/views/hyrax/admin/workflow_roles/index.html.erb +8 -8
  525. data/app/views/hyrax/admin/workflows/index.html.erb +13 -13
  526. data/app/views/hyrax/base/_citations.html.erb +6 -6
  527. data/app/views/hyrax/base/_currently_shared.html.erb +3 -3
  528. data/app/views/hyrax/base/_file_manager_actions.html.erb +5 -3
  529. data/app/views/hyrax/base/_file_manager_member.html.erb +5 -5
  530. data/app/views/hyrax/base/_file_manager_member_resource_options.html.erb +6 -6
  531. data/app/views/hyrax/base/_file_manager_members.html.erb +1 -1
  532. data/app/views/hyrax/base/_file_manager_thumbnail.html.erb +1 -1
  533. data/app/views/hyrax/base/_form_child_work_relationships.html.erb +3 -3
  534. data/app/views/hyrax/base/_form_collections_error.html.erb +1 -1
  535. data/app/views/hyrax/base/_form_files.html.erb +9 -9
  536. data/app/views/hyrax/base/_form_in_works_error.html.erb +1 -1
  537. data/app/views/hyrax/base/_form_member_of_collections.html.erb +3 -3
  538. data/app/views/hyrax/base/_form_metadata.html.erb +1 -1
  539. data/app/views/hyrax/base/_form_ordered_members_error.html.erb +1 -1
  540. data/app/views/hyrax/base/_form_permission.html.erb +30 -20
  541. data/app/views/hyrax/base/_form_permission_under_embargo.html.erb +1 -1
  542. data/app/views/hyrax/base/_form_permission_under_lease.html.erb +1 -1
  543. data/app/views/hyrax/base/_form_progress.html.erb +7 -7
  544. data/app/views/hyrax/base/_form_relationships.html.erb +1 -1
  545. data/app/views/hyrax/base/_form_rendering.html.erb +1 -1
  546. data/app/views/hyrax/base/_form_representative.html.erb +1 -1
  547. data/app/views/hyrax/base/_form_share.html.erb +6 -6
  548. data/app/views/hyrax/base/_form_thumbnail.html.erb +1 -1
  549. data/app/views/hyrax/base/_form_visibility_component.html.erb +20 -16
  550. data/app/views/hyrax/base/_form_visibility_error.html.erb +19 -5
  551. data/app/views/hyrax/base/_guts4form.html.erb +12 -20
  552. data/app/views/hyrax/base/_member.html.erb +1 -1
  553. data/app/views/hyrax/base/_metadata.html.erb +1 -1
  554. data/app/views/hyrax/base/_show_actions.html.erb +9 -9
  555. data/app/views/hyrax/base/_work_button_row.html.erb +16 -15
  556. data/app/views/hyrax/base/_workflow_actions.html.erb +10 -10
  557. data/app/views/hyrax/base/_workflow_actions_widget.erb +1 -1
  558. data/app/views/hyrax/base/file_manager.html.erb +4 -5
  559. data/app/views/hyrax/base/inspect_work.html.erb +1 -1
  560. data/app/views/hyrax/base/show.html.erb +12 -12
  561. data/app/views/hyrax/base/unavailable.html.erb +2 -2
  562. data/app/views/hyrax/batch_edits/_check_all.html.erb +0 -1
  563. data/app/views/hyrax/batch_edits/_delete_selected.html.erb +1 -1
  564. data/app/views/hyrax/batch_edits/edit.html.erb +26 -18
  565. data/app/views/hyrax/collections/_bookmark_control.html.erb +2 -2
  566. data/app/views/hyrax/collections/_list_collections.html.erb +6 -6
  567. data/app/views/hyrax/collections/_list_works.html.erb +3 -1
  568. data/app/views/hyrax/collections/_search_form.html.erb +4 -4
  569. data/app/views/hyrax/collections/_show_document_list_row.html.erb +5 -2
  570. data/app/views/hyrax/collections/_sort_and_per_page.html.erb +3 -3
  571. data/app/views/hyrax/collections/_view_type_group.html.erb +2 -2
  572. data/app/views/hyrax/contact_form/new.html.erb +12 -13
  573. data/app/views/hyrax/content_blocks/_form.html.erb +29 -23
  574. data/app/views/hyrax/content_blocks/templates/agreement.html.erb +3 -3
  575. data/app/views/hyrax/dashboard/_admin_sets.html.erb +22 -28
  576. data/app/views/hyrax/dashboard/_index_partials/_current_proxy_rights.html.erb +2 -2
  577. data/app/views/hyrax/dashboard/_index_partials/_proxy_rights.html.erb +4 -4
  578. data/app/views/hyrax/dashboard/_index_partials/_transfers.html.erb +2 -2
  579. data/app/views/hyrax/dashboard/_repository_growth.html.erb +28 -28
  580. data/app/views/hyrax/dashboard/_resource_type_graph.html.erb +4 -4
  581. data/app/views/hyrax/dashboard/_sidebar.html.erb +3 -3
  582. data/app/views/hyrax/dashboard/_tabs.html.erb +6 -2
  583. data/app/views/hyrax/dashboard/_user_activity.html.erb +22 -19
  584. data/app/views/hyrax/dashboard/_visibility_graph.html.erb +4 -4
  585. data/app/views/hyrax/dashboard/_work_type_graph.html.erb +4 -4
  586. data/app/views/hyrax/dashboard/collections/_batch_edits_actions.html.erb +1 -1
  587. data/app/views/hyrax/dashboard/collections/_bookmark_control.html.erb +2 -2
  588. data/app/views/hyrax/dashboard/collections/_edit_actions.html.erb +1 -1
  589. data/app/views/hyrax/dashboard/collections/_form.html.erb +30 -22
  590. data/app/views/hyrax/dashboard/collections/_form_branding.html.erb +19 -19
  591. data/app/views/hyrax/dashboard/collections/_form_discovery.html.erb +8 -4
  592. data/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb +7 -7
  593. data/app/views/hyrax/dashboard/collections/_form_share.html.erb +11 -9
  594. data/app/views/hyrax/dashboard/collections/_form_share_table.html.erb +34 -31
  595. data/app/views/hyrax/dashboard/collections/_list_collections.html.erb +1 -1
  596. data/app/views/hyrax/dashboard/collections/_list_works.html.erb +3 -1
  597. data/app/views/hyrax/dashboard/collections/_modal_remove_from_collection.html.erb +1 -1
  598. data/app/views/hyrax/dashboard/collections/_modal_remove_sub_collection.html.erb +1 -1
  599. data/app/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb +1 -1
  600. data/app/views/hyrax/dashboard/collections/_show_descriptions.html.erb +5 -3
  601. data/app/views/hyrax/dashboard/collections/_show_document_list_menu.html.erb +4 -4
  602. data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb +12 -10
  603. data/app/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb +2 -2
  604. data/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb +4 -4
  605. data/app/views/hyrax/dashboard/collections/_subcollection_list.html.erb +1 -1
  606. data/app/views/hyrax/dashboard/collections/_work_action_menu.html.erb +10 -10
  607. data/app/views/hyrax/dashboard/collections/show.html.erb +4 -4
  608. data/app/views/hyrax/dashboard/profiles/_edit_primary.html.erb +21 -21
  609. data/app/views/hyrax/dashboard/profiles/_trophy_edit.html.erb +5 -5
  610. data/app/views/hyrax/dashboard/profiles/_zotero.html.erb +2 -2
  611. data/app/views/hyrax/dashboard/profiles/edit.html.erb +2 -2
  612. data/app/views/hyrax/dashboard/profiles/show.html.erb +3 -3
  613. data/app/views/hyrax/dashboard/show_admin.html.erb +36 -34
  614. data/app/views/hyrax/dashboard/show_user.html.erb +16 -16
  615. data/app/views/hyrax/dashboard/sidebar/_activity.html.erb +10 -10
  616. data/app/views/hyrax/dashboard/sidebar/_configuration.html.erb +8 -8
  617. data/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb +3 -1
  618. data/app/views/hyrax/dashboard/sidebar/_tasks.html.erb +5 -1
  619. data/app/views/hyrax/dashboard/works/_list_works.html.erb +4 -1
  620. data/app/views/hyrax/depositors/index.html.erb +2 -2
  621. data/app/views/hyrax/embargoes/edit.html.erb +15 -15
  622. data/app/views/hyrax/embargoes/index.html.erb +18 -6
  623. data/app/views/hyrax/file_sets/_actions.html.erb +5 -6
  624. data/app/views/hyrax/file_sets/_descriptions.html.erb +1 -1
  625. data/app/views/hyrax/file_sets/_extra_fields_modal.html.erb +1 -1
  626. data/app/views/hyrax/file_sets/_form.html.erb +1 -1
  627. data/app/views/hyrax/file_sets/_permission_form.html.erb +34 -35
  628. data/app/views/hyrax/file_sets/_show_actions.html.erb +2 -2
  629. data/app/views/hyrax/file_sets/_show_details.html.erb +27 -17
  630. data/app/views/hyrax/file_sets/_single_use_link_rows.html.erb +2 -2
  631. data/app/views/hyrax/file_sets/_single_use_links.html.erb +2 -2
  632. data/app/views/hyrax/file_sets/_versioning.html.erb +9 -9
  633. data/app/views/hyrax/file_sets/edit.html.erb +18 -12
  634. data/app/views/hyrax/file_sets/media_display/_image.html.erb +4 -4
  635. data/app/views/hyrax/file_sets/show.html.erb +2 -2
  636. data/app/views/hyrax/homepage/_announcement.html.erb +2 -2
  637. data/app/views/hyrax/homepage/_explore_collections.html.erb +6 -4
  638. data/app/views/hyrax/homepage/_featured_fields.html.erb +1 -1
  639. data/app/views/hyrax/homepage/_featured_works.html.erb +1 -1
  640. data/app/views/hyrax/homepage/_home_content.html.erb +24 -10
  641. data/app/views/hyrax/homepage/_marketing.html.erb +1 -1
  642. data/app/views/hyrax/homepage/_recent_document.html.erb +4 -1
  643. data/app/views/hyrax/homepage/_sortable_featured.html.erb +3 -3
  644. data/app/views/hyrax/homepage/index.html.erb +4 -4
  645. data/app/views/hyrax/leases/edit.html.erb +14 -14
  646. data/app/views/hyrax/leases/index.html.erb +18 -6
  647. data/app/views/hyrax/my/_admin_set_action_menu.html.erb +5 -5
  648. data/app/views/hyrax/my/_collection_action_menu.html.erb +6 -6
  649. data/app/views/hyrax/my/_constraints.html.erb +2 -2
  650. data/app/views/hyrax/my/_document_list.html.erb +1 -1
  651. data/app/views/hyrax/my/_facet_pagination.html.erb +1 -25
  652. data/app/views/hyrax/my/_facet_selected.html.erb +1 -1
  653. data/app/views/hyrax/my/_search_form.html.erb +7 -8
  654. data/app/views/hyrax/my/_sort_and_per_page.html.erb +10 -12
  655. data/app/views/hyrax/my/_work_action_menu.html.erb +4 -5
  656. data/app/views/hyrax/my/collections/_facets.html.erb +7 -5
  657. data/app/views/hyrax/my/collections/_list_collections.html.erb +1 -1
  658. data/app/views/hyrax/my/collections/_modal_add_subcollection.html.erb +2 -2
  659. data/app/views/hyrax/my/collections/_modal_add_to_collection.html.erb +2 -2
  660. data/app/views/hyrax/my/collections/_modal_collection_types_to_create.html.erb +5 -5
  661. data/app/views/hyrax/my/collections/_modal_delete_collection.html.erb +1 -1
  662. data/app/views/hyrax/my/collections/_modal_delete_empty_collection.html.erb +1 -1
  663. data/app/views/hyrax/my/collections/_modal_delete_selected_collections.html.erb +1 -1
  664. data/app/views/hyrax/my/collections/_tabs.html.erb +11 -4
  665. data/app/views/hyrax/my/collections/index.html.erb +3 -3
  666. data/app/views/hyrax/my/facet.html.erb +17 -16
  667. data/app/views/hyrax/my/index.html.erb +2 -2
  668. data/app/views/hyrax/my/works/_batch_actions.html.erb +1 -1
  669. data/app/views/hyrax/my/works/_facets.html.erb +6 -2
  670. data/app/views/hyrax/my/works/_list_works.html.erb +6 -7
  671. data/app/views/hyrax/my/works/_tabs.html.erb +6 -6
  672. data/app/views/hyrax/my/works/index.html.erb +20 -18
  673. data/app/views/hyrax/notifications/_notifications.html.erb +1 -1
  674. data/app/views/hyrax/notifications/index.html.erb +4 -4
  675. data/app/views/hyrax/operations/index.html.erb +1 -1
  676. data/app/views/hyrax/operations/show.html.erb +2 -2
  677. data/app/views/hyrax/pages/_form.html.erb +76 -64
  678. data/app/views/hyrax/permissions/confirm.html.erb +4 -4
  679. data/app/views/hyrax/permissions/confirm_access.html.erb +4 -4
  680. data/app/views/hyrax/stats/file.html.erb +1 -1
  681. data/app/views/hyrax/stats/work.html.erb +1 -1
  682. data/app/views/hyrax/transfers/_received.html.erb +5 -5
  683. data/app/views/hyrax/transfers/_sent.html.erb +1 -1
  684. data/app/views/hyrax/transfers/index.html.erb +8 -8
  685. data/app/views/hyrax/transfers/new.html.erb +1 -1
  686. data/app/views/hyrax/uploads/_js_templates.html.erb +14 -14
  687. data/app/views/hyrax/uploads/_js_templates_branding.html.erb +5 -5
  688. data/app/views/hyrax/uploads/_js_templates_versioning.html.erb +15 -15
  689. data/app/views/hyrax/users/_activity.html.erb +3 -3
  690. data/app/views/hyrax/users/_contributions.html.erb +3 -3
  691. data/app/views/hyrax/users/_left_sidebar.html.erb +1 -1
  692. data/app/views/hyrax/users/_profile_tabs.html.erb +16 -8
  693. data/app/views/hyrax/users/_search_form.html.erb +2 -2
  694. data/app/views/hyrax/users/_user.html.erb +5 -5
  695. data/app/views/hyrax/users/_user_info.html.erb +4 -4
  696. data/app/views/hyrax/users/_vitals.html.erb +3 -3
  697. data/app/views/hyrax/users/show.html.erb +2 -2
  698. data/app/views/layouts/hyrax/dashboard.html.erb +4 -4
  699. data/app/views/layouts/hyrax.html.erb +4 -3
  700. data/app/views/shared/_appearance_styles.html.erb +8 -8
  701. data/app/views/shared/_footer.html.erb +1 -1
  702. data/app/views/shared/_locale_picker.html.erb +5 -8
  703. data/app/views/shared/_nav_safety_modal.html.erb +2 -2
  704. data/app/views/shared/_select_work_type_modal.html.erb +2 -2
  705. data/chart/hyrax/Chart.yaml +1 -1
  706. data/chart/hyrax/templates/_helpers.tpl +5 -1
  707. data/chart/hyrax/templates/configmap-env.yaml +1 -1
  708. data/chart/hyrax/values.yaml +1 -0
  709. data/config/features.rb +1 -1
  710. data/config/initializers/reform_rails_6_1_monkey_patch.rb +27 -0
  711. data/config/locales/hyrax.de.yml +6 -5
  712. data/config/locales/hyrax.en.yml +7 -4
  713. data/config/locales/hyrax.es.yml +7 -6
  714. data/config/locales/hyrax.fr.yml +9 -8
  715. data/config/locales/hyrax.it.yml +7 -6
  716. data/config/locales/hyrax.pt-BR.yml +7 -6
  717. data/config/locales/hyrax.zh.yml +7 -6
  718. data/config/metadata/basic_metadata.yaml +2 -0
  719. data/docker-compose-koppie.yml +163 -0
  720. data/docker-compose.yml +2 -4
  721. data/documentation/developing-your-hyrax-based-app.md +1 -1
  722. data/documentation/legacyREADME.md +2 -2
  723. data/hyrax.gemspec +15 -23
  724. data/karma.conf.js +104 -0
  725. data/lib/generators/hyrax/assets_generator.rb +2 -5
  726. data/lib/generators/hyrax/install_generator.rb +13 -37
  727. data/lib/generators/hyrax/templates/catalog_controller.rb +20 -15
  728. data/lib/generators/hyrax/templates/config/initializers/hyrax.rb +8 -1
  729. data/lib/generators/hyrax/templates/config/initializers/riiif.rb +2 -2
  730. data/lib/generators/hyrax/templates/config/locales/hyrax.de.yml +1 -1
  731. data/lib/generators/hyrax/templates/config/locales/hyrax.en.yml +1 -1
  732. data/lib/generators/hyrax/templates/config/locales/hyrax.es.yml +1 -1
  733. data/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml +1 -1
  734. data/lib/generators/hyrax/templates/config/locales/hyrax.it.yml +1 -1
  735. data/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml +1 -1
  736. data/lib/generators/hyrax/templates/config/locales/hyrax.zh.yml +1 -1
  737. data/lib/generators/hyrax/templates/hyrax.scss +1 -2
  738. data/lib/generators/hyrax/templates/package.json +7 -8
  739. data/lib/hyrax/active_fedora_dummy_model.rb +13 -0
  740. data/lib/hyrax/configuration.rb +25 -55
  741. data/lib/hyrax/controlled_vocabulary/importer/language.rb +1 -1
  742. data/lib/hyrax/engine.rb +7 -4
  743. data/lib/hyrax/errors.rb +2 -0
  744. data/lib/hyrax/search_state.rb +9 -0
  745. data/lib/hyrax/specs/capybara.rb +7 -5
  746. data/lib/hyrax/specs/shared_specs/factories/strategies/json_strategy.rb +4 -0
  747. data/lib/hyrax/specs/shared_specs/factories/strategies/valkyrie_resource.rb +10 -0
  748. data/lib/hyrax/specs/shared_specs/indexers.rb +5 -0
  749. data/lib/hyrax/transactions/container.rb +0 -54
  750. data/lib/hyrax/transactions/steps/remove_file_set_from_work.rb +29 -3
  751. data/lib/hyrax/transactions/steps/save_access_control.rb +17 -1
  752. data/lib/hyrax/version.rb +1 -1
  753. data/lib/hyrax.rb +1 -1
  754. data/lib/tasks/migrate.rake +5 -1
  755. data/lib/valkyrie/indexing/solr/indexing_adapter.rb +1 -1
  756. data/lib/wings/valkyrie/persister.rb +2 -1
  757. data/lib/wings/valkyrie/storage.rb +6 -2
  758. data/package.json +11 -0
  759. data/tasks/benchmark.rake +1 -1
  760. data/template.rb +1 -1
  761. data/vendor/assets/javascripts/dataTables.bootstrap4.js +184 -0
  762. data/vendor/assets/javascripts/fileupload/jquery.fileupload-ui.js +1 -1
  763. data/vendor/assets/javascripts/fileupload/jquery.fileupload.js +2 -2
  764. data/vendor/assets/javascripts/fileupload/jquery.iframe-transport.js +1 -1
  765. data/vendor/assets/javascripts/handlebars.js +5214 -0
  766. data/vendor/assets/javascripts/jquery-ui.js +19057 -0
  767. data/vendor/assets/javascripts/jquery.dataTables.js +15336 -0
  768. data/vendor/assets/javascripts/morris/morris.min.js +9 -1
  769. data/vendor/assets/javascripts/morris/raphael-min.js +4 -6
  770. data/vendor/assets/javascripts/nestable.js +1 -1
  771. data/vendor/assets/stylesheets/dataTables.bootstrap4.css +307 -0
  772. data/vendor/assets/stylesheets/jquery-ui.css +1315 -0
  773. data/vendor/assets/stylesheets/morris.css +3 -0
  774. metadata +375 -185
  775. data/app/actors/hyrax/actors/initialize_workflow_actor.rb +0 -35
  776. data/app/helpers/hyrax/url_helper.rb +0 -13
  777. data/app/indexers/hyrax/repository_reindexer.rb +0 -19
  778. data/app/jobs/content_depositor_change_event_job.rb +0 -48
  779. data/app/models/concerns/hyrax/collection_nesting.rb +0 -73
  780. data/app/models/concerns/hyrax/with_file_sets.rb +0 -17
  781. data/app/services/hyrax/adapters/nesting_index_adapter.rb +0 -193
  782. data/app/views/hyrax/my/_facet_layout.html.erb +0 -8
  783. data/app/views/hyrax/my/_facet_limit.html.erb +0 -15
  784. data/app/views/hyrax/my/_facet_pivot.html.erb +0 -26
  785. data/config/initializers/nesting_indexer_initializer.rb +0 -16
  786. data/lib/hyrax/transactions/create_work.rb +0 -65
  787. data/lib/hyrax/transactions/destroy_work.rb +0 -28
  788. data/lib/hyrax/transactions/steps/apply_collection_permission_template.rb +0 -34
  789. data/lib/hyrax/transactions/steps/apply_permission_template.rb +0 -32
  790. data/lib/hyrax/transactions/steps/apply_visibility.rb +0 -41
  791. data/lib/hyrax/transactions/steps/destroy_work.rb +0 -27
  792. data/lib/hyrax/transactions/steps/ensure_permission_template.rb +0 -29
  793. data/lib/hyrax/transactions/steps/save_work.rb +0 -38
  794. data/lib/hyrax/transactions/update_work.rb +0 -19
  795. data/lib/wings/services/file_converter_service.rb +0 -19
  796. data/lib/wings/services/file_metadata_builder.rb +0 -94
  797. data/vendor/assets/javascripts/handlebars-v4.0.5.js +0 -4612
  798. data/vendor/assets/stylesheets/morris.js/0.5.1/morris.css +0 -2
@@ -1,5 +1,5 @@
1
1
  <!-- The template to display files available for upload -->
2
- <% fade_class_if_not_test = Rails.env.test? ? '' : 'fade' %>
2
+ <% fade_class_if_not_test = Rails.env.test? ? 'show' : 'fade show' %>
3
3
  <script id="versioning-template-upload" type="text/x-tmpl">
4
4
  {% for (var i=0, file; file=o.files[i]; i++) { %}
5
5
  <tr class="template-upload <%= fade_class_if_not_test %>">
@@ -12,24 +12,24 @@
12
12
  </td>
13
13
  <td>
14
14
  <p class="size">Processing...</p>
15
- <div class="progress progress-striped active"
15
+ <div class="progress"
16
16
  role="progressbar"
17
17
  aria-valuemin="0"
18
18
  aria-valuemax="100"
19
19
  aria-valuenow="0">
20
- <div class="progress-bar progress-bar-success" style="width:0%;"></div>
20
+ <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div>
21
21
  </div>
22
22
  </td>
23
23
  <td class="text-right">
24
24
  {% if (!i && !o.options.autoUpload) { %}
25
25
  <button class="btn btn-primary start" disabled>
26
- <span class="glyphicon glyphicon-upload"></span>
26
+ <span class="fa fa-upload"></span>
27
27
  <span><%= t('.start') %></span>
28
28
  </button>
29
29
  {% } %}
30
30
  {% if (!i) { %}
31
31
  <button class="btn btn-sm btn-warning cancel">
32
- <span class="glyphicon glyphicon-ban-circle"></span>
32
+ <span class="fa fa-ban"></span>
33
33
  <span><%= t('helpers.action.cancel') %></span>
34
34
  </button>
35
35
  {% } %}
@@ -69,26 +69,26 @@
69
69
  </div>
70
70
  <div class="col-sm-6">
71
71
  {% if (file.error) { %}
72
- <div><span class="label label-danger">Error</span> {%=file.error%}</div>
72
+ <div><span class="badge badge-danger">Error</span> {%=file.error%}</div>
73
73
  {% } %}
74
74
  <span class="size">{%=o.formatFileSize(file.size)%}</span>
75
- <button class="btn btn-sm btn-danger delete pull-right"
75
+ <button class="btn btn-sm btn-danger delete float-right"
76
76
  data-type="{%=file.deleteType%}"
77
77
  data-url="{%=file.deleteUrl%}"
78
78
  {% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
79
- <span class="glyphicon glyphicon-trash"></span>
79
+ <span class="fa fa-trash"></span>
80
80
  <span><%= t('helpers.action.delete') %></span>
81
81
  </button>
82
82
  </div>
83
83
  </div>
84
84
  <div class="row">
85
- <div class="col-sm-12 form-horizontal">
86
- <div class="form-group">
87
- <label for="title_{%=file.id%}" class="col-sm-5 control-label"><%= t('.display_label') %></label>
85
+ <div class="col-sm-12">
86
+ <div class="form-group row">
87
+ <label for="title_{%=file.id%}" class="col-sm-5 col-form-label"><%= t('.display_label') %></label>
88
88
  <div class="col-sm-7 padding-bottom">
89
89
  <input type="text" class="form-control" name="title[{%=file.id%}]" id="title_{%=file.id%}" value="{%=file.name%}">
90
90
  </div>
91
- <label for="resource_type_{%=file.id%}" class="col-sm-5 control-label">Resource Type</label>
91
+ <label for="resource_type_{%=file.id%}" class="col-sm-5 col-form-label">Resource Type</label>
92
92
  <div class="col-sm-7 padding-bottom">
93
93
  <select class="form-control resource_type_dropdown"
94
94
  multiple="multiple"
@@ -98,7 +98,7 @@
98
98
  value="{%=file.name%}">
99
99
  <%= options_for_select(Hyrax::ResourceTypesService.select_options) %>
100
100
  </select>
101
- <button class="btn btn-default pull-right resource_type_button"
101
+ <button class="btn btn-secondary float-right resource_type_button"
102
102
  onClick="setAllResourceTypesVersioning({%= file.id %}); return false;">
103
103
  <%= t('.set_all_to_this_resource_type') %>
104
104
  </button>
@@ -125,7 +125,7 @@
125
125
  <input type="hidden" name="files_files[]" value="{%=file.id%}">
126
126
  </span>
127
127
  {% if (file.error) { %}
128
- <span><span class="label label-danger"><%= t('.error') %></span> {%=file.error%}</span>
128
+ <span><span class="badge badge-danger"><%= t('.error') %></span> {%=file.error%}</span>
129
129
  {% } %}
130
130
  </div>
131
131
 
@@ -134,7 +134,7 @@
134
134
  data-type="{%=file.deleteType%}"
135
135
  data-url="{%=file.deleteUrl%}"
136
136
  onclick=$("#files").remove(); {% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
137
- <span class="glyphicon glyphicon-remove"></span>
137
+ <span class="fa fa-times"></span>
138
138
  <span class="controls-remove-text"><%= t('.remove') %></span>
139
139
  <span class="sr-only">
140
140
  <%= t('.previous') %>
@@ -1,3 +1,3 @@
1
- <div class="tab-pane" id="activity_log">
2
- <%= render 'hyrax/users/activity_log', events: presenter.events %>
3
- </div>
1
+ <div class="tab-pane" id="activity_log">
2
+ <%= render 'hyrax/users/activity_log', events: presenter.events %>
3
+ </div>
@@ -1,4 +1,4 @@
1
- <div class="tab-pane active" id="contributions">
1
+ <div class="tab-pane show active" id="contributions">
2
2
  <% if presenter.trophies.count > 0 %>
3
3
  <table>
4
4
  <% presenter.trophies.each do |t| %>
@@ -11,8 +11,8 @@
11
11
  <td>
12
12
  <%= link_to t.to_s, [main_app, t] %>
13
13
  <% if presenter.current_user? %>
14
- <%= display_trophy_link current_user, t.id, class: 'glyphicon glyphicon-star', data: { removerow: true } do %>
15
- <span class='trophy-on glyphicon glyphicon-remove'></span>
14
+ <%= display_trophy_link current_user, t.id, class: 'fa fa-star', data: { removerow: true } do %>
15
+ <span class='trophy-on fa fa-times'></span>
16
16
  <% end %>
17
17
  <% end %>
18
18
  </td>
@@ -1,4 +1,4 @@
1
1
  <%= render 'hyrax/users/user', user: @user %>
2
2
 
3
3
  <br />
4
- <a class="btn btn-primary" href="<%= hyrax.users_path %>"><i class="glyphicon glyphicon-globe" aria-hidden="true"></i><%= t('.view_users') %></a>
4
+ <a class="btn btn-primary" href="<%= hyrax.users_path %>"><i class="fa fa-globe" aria-hidden="true"></i><%= t('.view_users') %></a>
@@ -1,9 +1,17 @@
1
- <ul class="nav nav-tabs" id="myTab">
2
- <li class="active"><a href="#contributions"><span class="glyphicon glyphicon-star"></span> <%= I18n.t('hyrax.user_profile.tab_highlighted') %></a></li>
3
- <li><a href="#activity_log"><span class="glyphicon glyphicon-calendar"></span> <%= I18n.t('hyrax.user_profile.tab_activity') %></a></li>
4
- </ul>
1
+ <ul class="nav nav-tabs" id="myTab">
2
+ <li class="nav-item">
3
+ <a class="nav-link active" href="#contributions">
4
+ <span class="fa fa-star"></span> <%= I18n.t('hyrax.user_profile.tab_highlighted') %>
5
+ </a>
6
+ </li>
7
+ <li class="nav-item">
8
+ <a class="nav-link" href="#activity_log">
9
+ <span class="fa fa-calendar"></span> <%= I18n.t('hyrax.user_profile.tab_activity') %>
10
+ </a>
11
+ </li>
12
+ </ul>
5
13
 
6
- <div class="tab-content panel-body">
7
- <%= render 'contributions', presenter: presenter %>
8
- <%= render 'activity', presenter: presenter %>
9
- </div> <!-- /tab-content -->
14
+ <div class="tab-content card-body">
15
+ <%= render 'contributions', presenter: presenter %>
16
+ <%= render 'activity', presenter: presenter %>
17
+ </div> <!-- /tab-content -->
@@ -4,9 +4,9 @@
4
4
  <label class="sr-only" for="user_search"><%= t('.search_users') %></label>
5
5
  <%= text_field_tag :uq, params[:uq], class: "q", placeholder: t('.search_users'), size: '30', type: "search", id: "user_search" %>
6
6
  <%= hidden_field_tag :sort, params[:sort], id: 'user_sort' %>
7
- <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:uq, :sort, :qt, :page, :utf8)) %>
7
+ <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:uq, :sort, :qt, :page, :utf8)) %>
8
8
  <button type="submit" class="btn btn-primary" id="user_submit">
9
- <span class="glyphicon glyphicon-search"></span><%= t('.go') %>
9
+ <span class="fa fa-search"></span><%= t('.go') %>
10
10
  </button>
11
11
  <% end %>
12
12
  </div>
@@ -1,5 +1,5 @@
1
- <div class="panel panel-default panel-user">
2
- <div class="panel-heading">
1
+ <div class="card panel-user">
2
+ <div class="card-header">
3
3
  <%= image_tag user.avatar.url(:thumb), width: 100 if user.avatar.present? %>
4
4
  <h3>
5
5
  <%= user.name %>
@@ -14,10 +14,10 @@
14
14
  </div>
15
15
  </div>
16
16
 
17
- <div class="panel-footer clearfix">
17
+ <div class="card-footer clearfix">
18
18
  <% if can? :edit, user %>
19
- <%= link_to hyrax.edit_dashboard_profile_path(user), class: "btn btn-default pull-right" do %>
20
- <span class="glyphicon glyphicon-edit"></span> <%= t("hyrax.edit_profile") %>
19
+ <%= link_to hyrax.edit_dashboard_profile_path(user), class: "btn btn-secondary float-right" do %>
20
+ <span class="fa fa-edit"></span> <%= t("hyrax.edit_profile") %>
21
21
  <% end %>
22
22
  <% end %>
23
23
  </div>
@@ -34,12 +34,12 @@
34
34
  <dd><%= mail_to user.email %></dd>
35
35
 
36
36
  <% if user.chat_id %>
37
- <dt><span class="glyphicon glyphicon-bullhorn" aria-hidden="true"></span> Chat ID</dt>
37
+ <dt><span class="fa fa-bullhorn" aria-hidden="true"></span> Chat ID</dt>
38
38
  <dd><%= user.chat_id %></dd>
39
39
  <% end %>
40
40
 
41
41
  <% if user.website %>
42
- <dt><span class="glyphicon glyphicon-globe" aria-hidden="true"></span> Website(s)</dt>
42
+ <dt><span class="fa fa-globe" aria-hidden="true"></span> Website(s)</dt>
43
43
  <dd><%= iconify_auto_link(user.website) %></dd>
44
44
  <% end %>
45
45
 
@@ -64,7 +64,7 @@
64
64
  <% end %>
65
65
 
66
66
  <% if user.address %>
67
- <dt><span class="glyphicon glyphicon-map-marker" aria-hidden="true"></span> Address</dt>
67
+ <dt><span class="fa fa-map-marker" aria-hidden="true"></span> Address</dt>
68
68
  <dd><%= user.address %></dd>
69
69
  <% end %>
70
70
 
@@ -74,7 +74,7 @@
74
74
  <% end %>
75
75
 
76
76
  <% if user.telephone %>
77
- <dt><span class="glyphicon glyphicon-earphone" aria-hidden="true"></span> Telephone</dt>
77
+ <dt><span class="fa fa-phone" aria-hidden="true"></span> Telephone</dt>
78
78
  <dd><%= link_to_telephone(user) %></dd>
79
79
  <% end %>
80
80
 
@@ -1,15 +1,15 @@
1
1
  <div class="list-group-item">
2
- <span class="glyphicon glyphicon-time" aria-hidden="true"></span> <%= t("hyrax.dashboard.stats.joined_on") %> <%= user.created_at.to_date.strftime("%b %d, %Y") %>
2
+ <span class="fa fa-clock-o" aria-hidden="true"></span> <%= t("hyrax.dashboard.stats.joined_on") %> <%= user.created_at.to_date.strftime("%b %d, %Y") %>
3
3
  </div>
4
4
 
5
5
  <div class="list-group-item">
6
6
  <span class="badge"><%= number_of_collections(user) %></span>
7
- <span class="glyphicon glyphicon-folder-open" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.collections"), {generic_type: "Collection", depositor: user.to_s}) %>
7
+ <span class="fa fa-folder-open" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.collections"), {generic_type: "Collection", depositor: user.to_s}) %>
8
8
  </div>
9
9
 
10
10
  <div class="list-group-item">
11
11
  <span class="badge"><%= number_of_works(user) %></span>
12
- <span class="glyphicon glyphicon-upload" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.works"), {generic_type: "Work", depositor: user.to_s}) %>
12
+ <span class="fa fa-upload" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.works"), {generic_type: "Work", depositor: user.to_s}) %>
13
13
 
14
14
  <ul class="views-downloads-dashboard list-unstyled">
15
15
  <li><span class="badge badge-optional"><%= user.total_file_views %></span> <%= t("hyrax.dashboard.stats.file_views").pluralize(user.total_file_views) %></li>
@@ -1,9 +1,9 @@
1
1
  <div class="row profile">
2
- <div class="col-xs-3">
2
+ <div class="col-3">
3
3
  <%= render 'left_sidebar' %>
4
4
  </div>
5
5
  <!-- right col -->
6
- <div class="col-xs-9">
6
+ <div class="col-9">
7
7
  <%= render 'profile_tabs', presenter: @presenter %>
8
8
  </div>
9
9
  </div>
@@ -9,18 +9,18 @@
9
9
  <div class="skip-to-content">
10
10
  <%= link_to "Skip to Content", "#skip-to-content" %>
11
11
  </div>
12
- <%= render '/masthead' %>
12
+ <%= render '/masthead', placement_class: 'fixed-top' %>
13
13
  <%= content_for(:navbar) %>
14
14
  <div id="content-wrapper" role="main">
15
15
  <div class="sidebar maximized">
16
16
  <%= render 'hyrax/dashboard/sidebar' %>
17
17
  </div>
18
- <div class="main-content maximized">
18
+ <div class="main-content maximized<%= " admin-stats" if request.fullpath.include? '/admin/stats' %>">
19
19
  <%= render_breadcrumbs builder: Hyrax::BootstrapBreadcrumbsBuilder %>
20
20
  <%= render '/flash_msg' %>
21
21
  <% if content_for?(:page_header) %>
22
22
  <div class="row">
23
- <div class="col-xs-12 main-header">
23
+ <div class="col-12 main-header">
24
24
  <%= yield(:page_header) %>
25
25
  </div>
26
26
  </div>
@@ -33,6 +33,6 @@
33
33
  </div>
34
34
 
35
35
  </div><!-- /#content-wrapper -->
36
- <%= render 'shared/ajax_modal' %>
36
+ <%= render 'shared/modal' %>
37
37
  </body>
38
38
  </html>
@@ -9,15 +9,16 @@
9
9
  <div class="skip-to-content">
10
10
  <%= link_to "Skip to Content", "#skip-to-content" %>
11
11
  </div>
12
- <%= render '/masthead' %>
12
+ <%= render '/masthead', placement_class: nil %>
13
13
  <%= content_for(:navbar) %>
14
14
  <%= content_for(:precontainer_content) %>
15
15
  <div id="content-wrapper" class="container" role="main">
16
+ <%= content_for(:container_header) %>
16
17
  <%= render '/flash_msg' %>
17
18
  <%= render_breadcrumbs builder: Hyrax::BootstrapBreadcrumbsBuilder %>
18
19
  <% if content_for?(:page_header) %>
19
20
  <div class="row">
20
- <div class="col-xs-12 main-header">
21
+ <div class="col-12 main-header">
21
22
  <%= yield(:page_header) %>
22
23
  </div>
23
24
  </div>
@@ -28,6 +29,6 @@
28
29
  <%= content_for?(:content) ? yield(:content) : yield %>
29
30
  </div><!-- /#content-wrapper -->
30
31
  <%= render 'shared/footer' %>
31
- <%= render 'shared/ajax_modal' %>
32
+ <%= render 'shared/modal' %>
32
33
  </body>
33
34
  </html>
@@ -2,17 +2,17 @@
2
2
  <style>
3
3
  <% appearance = Hyrax::Forms::Admin::Appearance.new %>
4
4
  a { color: <%= appearance.link_color %>; }
5
- .navbar-inverse .navbar-link { color: <%= appearance.footer_link_color %>; }
5
+ .navbar-dark.bg-dark .navbar-link { color: <%= appearance.footer_link_color %>; }
6
6
 
7
- .navbar-inverse { background-color: <%= appearance.header_background_color %>; }
7
+ .navbar-dark.bg-dark { background-color: <%= appearance.header_background_color %> !important; }
8
8
 
9
- .navbar-inverse .navbar-nav > .open > a,
10
- .navbar-inverse .navbar-nav > .open > a:hover,
11
- .navbar-inverse .navbar-nav > .open > a:focus { background-color: <%= appearance.header_background_color %>; }
9
+ .navbar-dark.bg-dark .navbar-nav > .open > a,
10
+ .navbar-dark.bg-dark .navbar-nav > .open > a:hover,
11
+ .navbar-dark.bg-dark .navbar-nav > .open > a:focus { background-color: <%= appearance.header_background_color %>; }
12
12
 
13
- .navbar-inverse .navbar-nav > li > a,
14
- .navbar-inverse .navbar-text,
15
- .navbar-inverse .navbar-brand { color: <%= appearance.header_text_color %>; }
13
+ .navbar-dark.bg-dark .navbar-nav > li > a,
14
+ .navbar-dark.bg-dark .navbar-text,
15
+ .navbar-dark.bg-dark .navbar-brand { color: <%= appearance.header_text_color %>; }
16
16
 
17
17
  .btn-primary {
18
18
  background-color: <%= appearance.primary_button_background_color %>;
@@ -1,4 +1,4 @@
1
- <footer class="navbar navbar-inverse site-footer">
1
+ <footer class="navbar navbar-dark bg-dark site-footer">
2
2
  <div class="container-fluid">
3
3
  <div class="navbar-text text-left">
4
4
  <p><%= t('hyrax.footer.service_html') %></p>
@@ -2,15 +2,12 @@
2
2
  <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false" aria-controls="language-dropdown-menu">
3
3
  <span class="sr-only"><%= t('hyrax.toolbar.language_switch') %></span>
4
4
  <span title="<%= t('hyrax.toolbar.language_switch') %>"><%= available_translations[I18n.locale.to_s] %></span>
5
- <b class="caret"></b>
6
5
  </a>
7
- <ul id="language-dropdown-menu" class="dropdown-menu" role="menu">
8
- <li role="presentation" class="dropdown-header"><%= t('hyrax.toolbar.language_switch') %></li>
9
- <li role="presentation" class="divider"></li>
6
+ <div id="language-dropdown-menu" class="dropdown-menu" role="menu">
7
+ <div role="presentation" class="dropdown-header"><%= t('hyrax.toolbar.language_switch') %></div>
8
+ <div role="presentation" class="dropdown-divider"></div>
10
9
  <% available_translations.each do |language, label| %>
11
- <li role="presentation" lang="<%= language %>">
12
- <%= link_to label, "?locale=#{language}", class: 'dropdown-item', role: 'menuitem', tabindex: '-1', data: { locale: language } %>
13
- </li>
10
+ <%= link_to label, "?locale=#{language}", class: 'dropdown-item', role: 'menuitem', lang: language, tabindex: '-1', data: { locale: language } %>
14
11
  <% end %>
15
- </ul>
12
+ </div>
16
13
  </li>
@@ -5,8 +5,8 @@
5
5
  <%= t(:'hyrax.nav_safety.change_tab_message') %>
6
6
  </div>
7
7
  <div class="modal-footer">
8
- <button type="button" class="btn btn-default" id="nav-safety-acknowledge" data-dismiss="modal">Cancel</button>
9
- <button type="button" class="btn btn-default" id="nav-safety-dismiss" data-dismiss="modal">OK</button>
8
+ <button type="button" class="btn btn-secondary" id="nav-safety-acknowledge" data-dismiss="modal">Cancel</button>
9
+ <button type="button" class="btn btn-secondary" id="nav-safety-dismiss" data-dismiss="modal">OK</button>
10
10
  </div>
11
11
  </div>
12
12
  </div>
@@ -3,8 +3,8 @@
3
3
  <div class="modal-dialog" role="document">
4
4
  <form class="modal-content new-work-select">
5
5
  <div class="modal-header">
6
- <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.heading_actions.close') %>"><span aria-hidden="true">&times;</span></button>
7
6
  <h2 class="modal-title" id="select-worktype-label"><%= t('hyrax.dashboard.heading_actions.select_type_of_work') %></h2>
7
+ <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.heading_actions.close') %>"><span aria-hidden="true">&times;</span></button>
8
8
  </div>
9
9
  <div class="modal-body">
10
10
  <% create_work_presenter.each do |row_presenter| %>
@@ -25,7 +25,7 @@
25
25
  <% end %>
26
26
  </div>
27
27
  <div class="modal-footer">
28
- <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('hyrax.dashboard.heading_actions.close') %></button>
28
+ <button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('hyrax.dashboard.heading_actions.close') %></button>
29
29
  <input type="submit" class="btn btn-primary" value="<%= t('hyrax.dashboard.heading_actions.create_work') %>" />
30
30
  </div>
31
31
  </form>
@@ -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
@@ -1086,14 +1087,14 @@ de:
1086
1087
  no_transfers: Sie haben keine Arbeit übertragen
1087
1088
  profiles:
1088
1089
  edit_primary:
1089
- change_picture: <i class = "glyphicon glyphicon-camera"> </ i> Bild ändern
1090
+ change_picture: <i class = "fa fa-camera"> </ i> Bild ändern
1090
1091
  delete_picture: Bild löschen
1091
1092
  delete_picture_data_content: Wenn Sie Ihr Bild vollständig entfernen möchten, aktivieren Sie das Kontrollkästchen und speichern Sie Ihr Profil.
1092
1093
  delete_picture_data_original_title: Bild löschen
1093
1094
  facebook_handle: <i class = "fa fa-facebook" aria-hidden = "true"> </ i> Facebook-Handle
1094
1095
  google_handle: <i class = "fa-fa-google-plus"> </ i> Google+ Handle
1095
1096
  help_change_picture_type: JPG, GIF oder PNG (weniger als 2 MB)
1096
- save_profile: <i class = "glyphicon glyphicon-save"> </ i> Profil speichern
1097
+ save_profile: <i class = "fa fa-floppy-o"> </ i> Profil speichern
1097
1098
  twitter_handle: <i class = "fa fa-twitter" aria-hidden = "true"> </ i> Twitter-Handle
1098
1099
  proxy_activity: Vertreter-Aktivität
1099
1100
  proxy_add_deny: Sie können sich nicht selbst zum Stellvertreter machen
@@ -1483,7 +1484,7 @@ de:
1483
1484
  read: Lesen/Download
1484
1485
  search:
1485
1486
  button:
1486
- html: <span class="glyphicon glyphicon-search"></span> Suchen
1487
+ html: <span class="fa fa-search"></span> Suchen
1487
1488
  text: Suche
1488
1489
  form:
1489
1490
  option:
@@ -1829,7 +1830,7 @@ de:
1829
1830
  find_child_work: Suche nach einer Arbeit ...
1830
1831
  member_of_collection_ids: Wählen Sie eine Sammlung ...
1831
1832
  required:
1832
- html: <span class="label label-info required-tag">erforderlich</span>
1833
+ html: <span class="badge badge-info required-tag">erforderlich</span>
1833
1834
  total_view:
1834
1835
  one: Diese Arbeit hat 1 Gesamtansicht
1835
1836
  other: Dieses Werk hat insgesamt %{count} Aufrufe
@@ -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
@@ -1077,14 +1078,14 @@ en:
1077
1078
  no_transfers: You haven't transferred any work
1078
1079
  profiles:
1079
1080
  edit_primary:
1080
- change_picture: <i class="glyphicon glyphicon-camera"></i> Change picture
1081
+ change_picture: <i class="fa fa-camera"></i> Change picture
1081
1082
  delete_picture: Delete picture
1082
1083
  delete_picture_data_content: If you would like to remove your picture entirely, check the box and save your profile.
1083
1084
  delete_picture_data_original_title: Delete Picture
1084
1085
  facebook_handle: <i class="fa fa-facebook" aria-hidden="true"></i> Facebook Handle
1085
1086
  google_handle: <i class="fa fa-google-plus"></i> Google+ Handle
1086
1087
  help_change_picture_type: JPG, GIF, or PNG (less than 2MB)
1087
- save_profile: <i class="glyphicon glyphicon-save"></i> Save Profile
1088
+ save_profile: <i class="fa fa-floppy-o"></i> Save Profile
1088
1089
  twitter_handle: <i class="fa fa-twitter" aria-hidden="true"></i> Twitter Handle
1089
1090
  proxy_activity: Proxy Activity
1090
1091
  proxy_add_deny: You cannot make yourself a proxy
@@ -1473,7 +1474,7 @@ en:
1473
1474
  read_only: The repository is in read-only mode for maintenance. No submissions or edits can be made at this time.
1474
1475
  search:
1475
1476
  button:
1476
- html: <span class="glyphicon glyphicon-search" aria-hidden="true"></span> Go
1477
+ html: <span class="fa fa-search" aria-hidden="true"></span> Go
1477
1478
  text: Search
1478
1479
  form:
1479
1480
  option:
@@ -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:
@@ -1818,7 +1821,7 @@ en:
1818
1821
  find_child_work: Search for a work…
1819
1822
  member_of_collection_ids: Select a collection…
1820
1823
  required:
1821
- html: <span class="label label-info required-tag">required</span>
1824
+ html: <span class="badge badge-info required-tag">required</span>
1822
1825
  total_view:
1823
1826
  one: This work has 1 total view
1824
1827
  other: This work has %{count} total views