blacklight 7.33.0 → 8.0.0.beta2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (392) hide show
  1. checksums.yaml +4 -4
  2. data/.env +3 -2
  3. data/.github/workflows/ruby.yml +38 -107
  4. data/.rubocop.yml +243 -2
  5. data/.rubocop_todo.yml +214 -270
  6. data/Gemfile +11 -6
  7. data/README.md +11 -3
  8. data/VERSION +1 -1
  9. data/app/assets/javascripts/blacklight/blacklight.esm.js +389 -0
  10. data/app/assets/javascripts/blacklight/blacklight.esm.js.map +1 -0
  11. data/app/assets/javascripts/blacklight/blacklight.js +356 -496
  12. data/app/assets/javascripts/blacklight/blacklight.js.map +1 -0
  13. data/app/assets/stylesheets/blacklight/_autocomplete.scss +25 -0
  14. data/app/assets/stylesheets/blacklight/_blacklight_base.scss +1 -1
  15. data/app/assets/stylesheets/blacklight/_bookmark.scss +16 -0
  16. data/app/assets/stylesheets/blacklight/_bootstrap_overrides.scss +8 -0
  17. data/app/assets/stylesheets/blacklight/_facets.scss +72 -44
  18. data/app/assets/stylesheets/blacklight/_header.scss +0 -15
  19. data/app/assets/stylesheets/blacklight/_icons.scss +0 -14
  20. data/app/assets/stylesheets/blacklight/_mixins.scss +20 -0
  21. data/app/assets/stylesheets/blacklight/_modal.scss +8 -2
  22. data/app/assets/stylesheets/blacklight/_search_form.scss +30 -3
  23. data/app/assets/stylesheets/blacklight/_search_history.scss +10 -1
  24. data/app/assets/stylesheets/blacklight/_search_results.scss +6 -2
  25. data/app/assets/stylesheets/blacklight/blacklight_defaults.scss +4 -1
  26. data/app/builders/blacklight/action_builder.rb +18 -9
  27. data/app/components/blacklight/advanced_search_form_component.html.erb +1 -1
  28. data/app/components/blacklight/advanced_search_form_component.rb +7 -9
  29. data/app/components/blacklight/constraints_component.rb +27 -37
  30. data/app/components/blacklight/document/action_component.html.erb +2 -9
  31. data/app/components/blacklight/document/action_component.rb +26 -8
  32. data/app/components/blacklight/document/actions_component.rb +2 -2
  33. data/app/components/blacklight/document/bookmark_component.html.erb +9 -0
  34. data/app/components/blacklight/document/bookmark_component.rb +4 -2
  35. data/app/components/blacklight/document/citation_component.rb +5 -3
  36. data/app/components/blacklight/document/group_component.rb +7 -3
  37. data/app/components/blacklight/document/sidebar_component.html.erb +2 -0
  38. data/app/components/blacklight/document/sidebar_component.rb +16 -0
  39. data/app/components/blacklight/document/thumbnail_component.html.erb +2 -7
  40. data/app/components/blacklight/document/thumbnail_component.rb +1 -9
  41. data/app/components/blacklight/document_component.html.erb +4 -0
  42. data/app/components/blacklight/document_component.rb +7 -23
  43. data/app/components/blacklight/document_metadata_component.rb +5 -6
  44. data/app/components/blacklight/document_title_component.rb +4 -1
  45. data/app/components/blacklight/facet_component.rb +1 -1
  46. data/app/components/blacklight/facet_field_checkboxes_component.html.erb +3 -3
  47. data/app/components/blacklight/facet_field_checkboxes_component.rb +1 -1
  48. data/app/components/blacklight/facet_field_component.html.erb +5 -5
  49. data/app/components/blacklight/facet_field_component.rb +9 -2
  50. data/app/components/blacklight/facet_field_list_component.html.erb +3 -3
  51. data/app/components/blacklight/facet_field_list_component.rb +37 -5
  52. data/app/components/blacklight/facet_field_no_layout_component.rb +0 -2
  53. data/app/components/blacklight/facet_item_component.rb +1 -43
  54. data/app/components/blacklight/facet_item_pivot_component.rb +21 -23
  55. data/app/components/blacklight/header_component.html.erb +2 -0
  56. data/app/components/blacklight/header_component.rb +26 -0
  57. data/app/components/blacklight/hidden_search_state_component.rb +1 -2
  58. data/app/components/blacklight/icons/legacy_icon_component.rb +30 -0
  59. data/app/components/blacklight/icons/list_component.rb +16 -0
  60. data/app/components/blacklight/icons/search_component.rb +16 -0
  61. data/app/components/blacklight/metadata_field_component.html.erb +2 -2
  62. data/app/components/blacklight/metadata_field_component.rb +24 -8
  63. data/app/components/blacklight/metadata_field_layout_component.rb +0 -18
  64. data/app/components/blacklight/response/facet_group_component.html.erb +3 -5
  65. data/app/components/blacklight/response/facet_group_component.rb +29 -8
  66. data/app/components/blacklight/response/sort_component.rb +1 -1
  67. data/app/components/blacklight/response/spellcheck_component.rb +17 -6
  68. data/app/components/blacklight/response/view_type_button_component.rb +2 -6
  69. data/app/components/blacklight/response/view_type_component.rb +3 -5
  70. data/app/components/blacklight/search/sidebar_component.html.erb +8 -0
  71. data/app/components/blacklight/search/sidebar_component.rb +17 -0
  72. data/app/components/blacklight/search_bar_component.html.erb +20 -15
  73. data/app/components/blacklight/search_bar_component.rb +2 -16
  74. data/app/components/blacklight/search_button_component.rb +3 -3
  75. data/app/components/blacklight/search_context_component.rb +43 -9
  76. data/app/components/blacklight/search_header_component.html.erb +2 -0
  77. data/app/components/blacklight/search_header_component.rb +6 -0
  78. data/app/components/blacklight/search_navbar_component.html.erb +5 -0
  79. data/app/components/blacklight/search_navbar_component.rb +34 -0
  80. data/app/components/blacklight/start_over_button_component.rb +5 -3
  81. data/app/components/blacklight/system/dropdown_component.rb +2 -2
  82. data/app/components/blacklight/system/flash_message_component.html.erb +3 -1
  83. data/app/components/blacklight/system/flash_message_component.rb +11 -2
  84. data/app/components/blacklight/system/modal_component.html.erb +1 -1
  85. data/app/components/blacklight/system/modal_component.rb +0 -2
  86. data/app/components/blacklight/top_navbar_component.html.erb +12 -0
  87. data/app/components/blacklight/top_navbar_component.rb +13 -0
  88. data/app/controllers/bookmarks_controller.rb +1 -0
  89. data/app/controllers/catalog_controller.rb +1 -0
  90. data/app/controllers/concerns/blacklight/bookmarks.rb +10 -5
  91. data/app/controllers/concerns/blacklight/catalog.rb +21 -72
  92. data/app/controllers/concerns/blacklight/controller.rb +6 -43
  93. data/app/controllers/concerns/blacklight/search_context.rb +25 -7
  94. data/app/controllers/concerns/blacklight/search_history.rb +2 -0
  95. data/app/controllers/concerns/blacklight/searchable.rb +12 -1
  96. data/app/controllers/concerns/blacklight/token_based_user.rb +1 -0
  97. data/app/controllers/search_history_controller.rb +1 -0
  98. data/app/helpers/blacklight/blacklight_helper_behavior.rb +10 -308
  99. data/app/helpers/blacklight/catalog_helper_behavior.rb +22 -137
  100. data/app/helpers/blacklight/component_helper_behavior.rb +2 -53
  101. data/app/helpers/blacklight/configuration_helper_behavior.rb +2 -117
  102. data/app/helpers/blacklight/facets_helper_behavior.rb +4 -321
  103. data/app/helpers/blacklight/icon_helper_behavior.rb +5 -4
  104. data/app/helpers/blacklight/layout_helper_behavior.rb +1 -0
  105. data/app/helpers/blacklight/render_partials_helper_behavior.rb +11 -30
  106. data/app/helpers/blacklight/url_helper_behavior.rb +13 -97
  107. data/app/helpers/blacklight_helper.rb +1 -0
  108. data/app/helpers/catalog_helper.rb +1 -0
  109. data/app/javascript/blacklight/bookmark_toggle.js +13 -19
  110. data/app/javascript/blacklight/button_focus.js +12 -10
  111. data/app/javascript/blacklight/checkbox_submit.js +68 -122
  112. data/app/javascript/blacklight/core.js +6 -5
  113. data/app/javascript/blacklight/index.js +13 -0
  114. data/app/javascript/blacklight/modal.js +104 -164
  115. data/app/javascript/blacklight/modalForm.js +60 -0
  116. data/app/javascript/blacklight/search_context.js +45 -55
  117. data/app/models/blacklight/facet_paginator.rb +3 -2
  118. data/app/models/blacklight/icon.rb +4 -2
  119. data/app/models/bookmark.rb +0 -2
  120. data/app/models/concerns/blacklight/configurable.rb +5 -4
  121. data/app/models/concerns/blacklight/document/active_model_shim.rb +1 -0
  122. data/app/models/concerns/blacklight/document/attributes.rb +50 -0
  123. data/app/models/concerns/blacklight/document/cache_key.rb +1 -0
  124. data/app/models/concerns/blacklight/document/dublin_core.rb +2 -1
  125. data/app/models/concerns/blacklight/document/email.rb +1 -0
  126. data/app/models/concerns/blacklight/document/export.rb +2 -1
  127. data/app/models/concerns/blacklight/document/extensions.rb +1 -0
  128. data/app/models/concerns/blacklight/document/schema_org.rb +1 -0
  129. data/app/models/concerns/blacklight/document/semantic_fields.rb +1 -0
  130. data/app/models/concerns/blacklight/document/sms.rb +1 -0
  131. data/app/models/concerns/blacklight/document.rb +12 -20
  132. data/app/models/concerns/blacklight/suggest/response.rb +1 -0
  133. data/app/models/concerns/blacklight/user.rb +17 -8
  134. data/app/models/record_mailer.rb +13 -12
  135. data/app/models/search.rb +0 -1
  136. data/app/models/solr_document.rb +1 -0
  137. data/app/presenters/blacklight/clause_presenter.rb +1 -1
  138. data/app/presenters/blacklight/document_presenter.rb +13 -21
  139. data/app/presenters/blacklight/facet_field_presenter.rb +39 -14
  140. data/app/presenters/blacklight/facet_grouped_item_presenter.rb +1 -5
  141. data/app/presenters/blacklight/facet_item_pivot_presenter.rb +60 -0
  142. data/app/presenters/blacklight/facet_item_presenter.rb +3 -9
  143. data/app/presenters/blacklight/field_presenter.rb +1 -0
  144. data/app/presenters/blacklight/index_presenter.rb +2 -40
  145. data/app/presenters/blacklight/json_presenter.rb +7 -5
  146. data/app/presenters/blacklight/rendering/join.rb +1 -1
  147. data/app/presenters/blacklight/rendering/link_to_facet.rb +2 -5
  148. data/app/presenters/blacklight/show_presenter.rb +1 -9
  149. data/app/presenters/blacklight/thumbnail_presenter.rb +1 -1
  150. data/app/services/blacklight/bookmarks_search_builder.rb +22 -0
  151. data/app/services/blacklight/field_retriever.rb +1 -8
  152. data/app/services/blacklight/search_service.rb +8 -7
  153. data/app/values/blacklight/types.rb +95 -11
  154. data/app/views/bookmarks/_clear_bookmarks_widget.html.erb +8 -1
  155. data/app/views/bookmarks/_tools.html.erb +7 -12
  156. data/app/views/catalog/_advanced_search_form.html.erb +0 -1
  157. data/app/views/catalog/_bookmark_control.html.erb +1 -1
  158. data/app/views/catalog/_constraints.html.erb +1 -14
  159. data/app/views/catalog/_document.atom.builder +12 -14
  160. data/app/views/catalog/_document.html.erb +5 -3
  161. data/app/views/catalog/_document.rss.builder +2 -4
  162. data/app/views/catalog/_facet_layout.html.erb +2 -2
  163. data/app/views/catalog/_facets.html.erb +5 -4
  164. data/app/views/catalog/_home_text.html.erb +2 -14
  165. data/app/views/catalog/_search_form.html.erb +3 -3
  166. data/app/views/catalog/_search_header.html.erb +1 -2
  167. data/app/views/catalog/_search_results.html.erb +2 -2
  168. data/app/views/catalog/_search_sidebar.html.erb +5 -1
  169. data/app/views/catalog/_show_main_content.html.erb +11 -16
  170. data/app/views/catalog/_show_sidebar.html.erb +2 -2
  171. data/app/views/catalog/_show_tools.html.erb +7 -12
  172. data/app/views/catalog/_view_type_group.html.erb +1 -1
  173. data/app/views/catalog/email_success.html.erb +5 -6
  174. data/app/views/catalog/facet.html.erb +7 -5
  175. data/app/views/catalog/index.atom.builder +12 -14
  176. data/app/views/catalog/index.html.erb +4 -1
  177. data/app/views/catalog/index.json.jbuilder +19 -19
  178. data/app/views/catalog/index.rss.builder +1 -1
  179. data/app/views/catalog/opensearch.xml.builder +1 -1
  180. data/app/views/catalog/sms_success.html.erb +5 -6
  181. data/app/views/catalog/suggest.html.erb +3 -0
  182. data/app/views/layouts/blacklight/base.html.erb +20 -9
  183. data/app/views/search_history/index.html.erb +6 -2
  184. data/app/views/shared/_header_navbar.html.erb +1 -22
  185. data/app/views/shared/_modal.html.erb +3 -3
  186. data/blacklight.gemspec +7 -9
  187. data/config/importmap.rb +3 -0
  188. data/config/locales/blacklight.ar.yml +0 -1
  189. data/config/locales/blacklight.ca.yml +0 -1
  190. data/config/locales/blacklight.de.yml +0 -1
  191. data/config/locales/blacklight.en.yml +0 -1
  192. data/config/locales/blacklight.es.yml +0 -1
  193. data/config/locales/blacklight.fr.yml +0 -1
  194. data/config/locales/blacklight.hu.yml +0 -1
  195. data/config/locales/blacklight.it.yml +0 -1
  196. data/config/locales/blacklight.nl.yml +0 -1
  197. data/config/locales/blacklight.pt-BR.yml +0 -1
  198. data/config/locales/blacklight.sq.yml +0 -1
  199. data/config/locales/blacklight.zh.yml +0 -1
  200. data/config/routes.rb +3 -2
  201. data/db/migrate/20140202020201_create_searches.rb +1 -0
  202. data/db/migrate/20140202020202_create_bookmarks.rb +1 -0
  203. data/db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb +1 -0
  204. data/docker-compose.yml +1 -0
  205. data/lib/blacklight/abstract_repository.rb +1 -0
  206. data/lib/blacklight/configuration/context.rb +4 -4
  207. data/lib/blacklight/configuration/display_field.rb +7 -9
  208. data/lib/blacklight/configuration/facet_field.rb +17 -11
  209. data/lib/blacklight/configuration/field.rb +1 -0
  210. data/lib/blacklight/configuration/fields.rb +12 -15
  211. data/lib/blacklight/configuration/index_field.rb +1 -0
  212. data/lib/blacklight/configuration/null_display_field.rb +17 -0
  213. data/lib/blacklight/configuration/search_field.rb +1 -0
  214. data/lib/blacklight/configuration/show_field.rb +1 -0
  215. data/lib/blacklight/configuration/sort_field.rb +1 -0
  216. data/lib/blacklight/configuration/tool_config.rb +1 -0
  217. data/lib/blacklight/configuration/view_config.rb +16 -6
  218. data/lib/blacklight/configuration.rb +318 -341
  219. data/lib/blacklight/engine.rb +10 -11
  220. data/lib/blacklight/exceptions.rb +2 -2
  221. data/lib/blacklight/nested_open_struct_with_hash_access.rb +6 -12
  222. data/lib/blacklight/open_struct_with_hash_access.rb +19 -17
  223. data/lib/blacklight/parameters.rb +7 -21
  224. data/lib/blacklight/routes/exportable.rb +1 -0
  225. data/lib/blacklight/routes/searchable.rb +2 -1
  226. data/lib/blacklight/routes.rb +1 -0
  227. data/lib/blacklight/search_builder.rb +10 -10
  228. data/lib/blacklight/search_state/filter_field.rb +8 -25
  229. data/lib/blacklight/search_state/pivot_filter_field.rb +144 -0
  230. data/lib/blacklight/search_state.rb +23 -79
  231. data/lib/blacklight/solr/document.rb +1 -0
  232. data/lib/blacklight/solr/facet_paginator.rb +1 -0
  233. data/lib/blacklight/solr/repository.rb +1 -0
  234. data/lib/blacklight/solr/request.rb +3 -0
  235. data/lib/blacklight/solr/response/facets.rb +21 -5
  236. data/lib/blacklight/solr/response/group.rb +1 -0
  237. data/lib/blacklight/solr/response/group_response.rb +1 -0
  238. data/lib/blacklight/solr/response/more_like_this.rb +1 -0
  239. data/lib/blacklight/solr/response/pagination_methods.rb +4 -3
  240. data/lib/blacklight/solr/response/params.rb +5 -4
  241. data/lib/blacklight/solr/response/response.rb +1 -0
  242. data/lib/blacklight/solr/response/spelling.rb +1 -0
  243. data/lib/blacklight/solr/response.rb +4 -3
  244. data/lib/blacklight/solr/search_builder_behavior.rb +16 -32
  245. data/lib/blacklight/solr.rb +1 -0
  246. data/lib/blacklight/version.rb +1 -0
  247. data/lib/blacklight.rb +8 -11
  248. data/lib/generators/blacklight/assets/importmap_generator.rb +55 -0
  249. data/lib/generators/blacklight/assets/propshaft_generator.rb +25 -0
  250. data/lib/generators/blacklight/assets/sprockets_generator.rb +66 -0
  251. data/lib/generators/blacklight/assets_generator.rb +13 -89
  252. data/lib/generators/blacklight/controller_generator.rb +3 -2
  253. data/lib/generators/blacklight/document_generator.rb +1 -0
  254. data/lib/generators/blacklight/install_generator.rb +5 -4
  255. data/lib/generators/blacklight/models_generator.rb +1 -0
  256. data/lib/generators/blacklight/search_builder_generator.rb +1 -0
  257. data/lib/generators/blacklight/solr_generator.rb +1 -1
  258. data/lib/generators/blacklight/templates/catalog_controller.rb +37 -7
  259. data/lib/generators/blacklight/templates/solr_document.rb +1 -1
  260. data/lib/generators/blacklight/test_support_generator.rb +4 -2
  261. data/lib/generators/blacklight/user_generator.rb +7 -9
  262. data/lib/railties/blacklight.rake +2 -3
  263. data/package.json +9 -12
  264. data/rollup.config.js +27 -0
  265. data/spec/components/blacklight/constraints_component_spec.rb +17 -13
  266. data/spec/components/blacklight/document_component_spec.rb +15 -25
  267. data/spec/components/blacklight/facet_component_spec.rb +2 -7
  268. data/spec/components/blacklight/facet_field_checkboxes_component_spec.rb +1 -2
  269. data/spec/components/blacklight/facet_field_list_component_spec.rb +7 -6
  270. data/spec/components/blacklight/facet_item_pivot_component_spec.rb +9 -7
  271. data/spec/components/blacklight/response/view_type_component_spec.rb +66 -0
  272. data/spec/components/blacklight/search_bar_component_spec.rb +1 -1
  273. data/spec/components/blacklight/search_context_component_spec.rb +40 -0
  274. data/spec/controllers/blacklight/catalog/component_configuration_spec.rb +1 -6
  275. data/spec/controllers/blacklight/{base_spec.rb → catalog_spec.rb} +2 -2
  276. data/spec/controllers/bookmarks_controller_spec.rb +2 -3
  277. data/spec/controllers/catalog_controller_spec.rb +13 -127
  278. data/spec/features/autocomplete_spec.rb +1 -1
  279. data/spec/features/axe_spec.rb +1 -1
  280. data/spec/features/bookmarks_spec.rb +1 -1
  281. data/spec/features/facets_spec.rb +1 -1
  282. data/spec/features/search_context_spec.rb +4 -10
  283. data/spec/features/search_results_spec.rb +0 -33
  284. data/spec/helpers/blacklight/configuration_helper_behavior_spec.rb +2 -138
  285. data/spec/helpers/blacklight/facets_helper_behavior_spec.rb +0 -387
  286. data/spec/helpers/blacklight/icon_helper_behavior_spec.rb +8 -0
  287. data/spec/helpers/blacklight/render_partials_helper_behavior_spec.rb +5 -7
  288. data/spec/helpers/blacklight/url_helper_behavior_spec.rb +9 -131
  289. data/spec/helpers/blacklight_helper_spec.rb +3 -242
  290. data/spec/helpers/catalog_helper_spec.rb +7 -118
  291. data/spec/i18n_spec.rb +1 -0
  292. data/spec/integration/generators/blacklight/solr_generator_spec.rb +1 -1
  293. data/spec/lib/blacklight/configuration/facet_field_spec.rb +27 -16
  294. data/spec/lib/blacklight/configuration/field_spec.rb +1 -1
  295. data/spec/lib/blacklight/configuration/view_config_spec.rb +1 -1
  296. data/spec/lib/blacklight/open_struct_with_hash_access_spec.rb +2 -2
  297. data/spec/lib/blacklight/parameters_spec.rb +1 -4
  298. data/spec/lib/blacklight/search_state/filter_field_spec.rb +4 -4
  299. data/spec/lib/blacklight/search_state/pivot_filter_field_spec.rb +117 -0
  300. data/spec/lib/blacklight/search_state_spec.rb +80 -198
  301. data/spec/lib/tasks/blacklight_task_spec.rb +1 -0
  302. data/spec/models/blacklight/configuration_spec.rb +39 -51
  303. data/spec/models/blacklight/document/active_model_shim_spec.rb +2 -2
  304. data/spec/models/blacklight/icon_spec.rb +31 -15
  305. data/spec/models/blacklight/search_builder_spec.rb +9 -9
  306. data/spec/models/blacklight/solr/document_spec.rb +3 -3
  307. data/spec/models/blacklight/solr/response/facets_spec.rb +27 -27
  308. data/spec/models/blacklight/solr/response/group_response_spec.rb +1 -0
  309. data/spec/models/blacklight/solr/response/group_spec.rb +1 -0
  310. data/spec/models/blacklight/solr/response_spec.rb +9 -2
  311. data/spec/models/blacklight/solr/search_builder_spec.rb +32 -23
  312. data/spec/models/blacklight/user_spec.rb +22 -0
  313. data/spec/models/solr_document_spec.rb +21 -3
  314. data/spec/presenters/blacklight/clause_presenter_spec.rb +1 -0
  315. data/spec/presenters/blacklight/document_presenter_spec.rb +2 -2
  316. data/spec/presenters/blacklight/facet_field_presenter_spec.rb +85 -12
  317. data/spec/presenters/blacklight/facet_grouped_item_presenter_spec.rb +1 -0
  318. data/spec/presenters/blacklight/facet_item_presenter_spec.rb +14 -13
  319. data/spec/presenters/blacklight/field_presenter_spec.rb +0 -14
  320. data/spec/presenters/blacklight/index_presenter_spec.rb +2 -4
  321. data/spec/presenters/blacklight/json_presenter_spec.rb +1 -0
  322. data/spec/presenters/blacklight/link_alternate_presenter_spec.rb +3 -2
  323. data/spec/presenters/blacklight/show_presenter_spec.rb +10 -25
  324. data/spec/presenters/thumbnail_presenter_spec.rb +1 -1
  325. data/spec/requests/load_suggestions_spec.rb +16 -0
  326. data/spec/routing/catalog_routing_spec.rb +2 -1
  327. data/spec/services/blacklight/search_service_spec.rb +31 -68
  328. data/spec/spec_helper.rb +3 -2
  329. data/spec/support/controller_level_helpers.rb +1 -2
  330. data/spec/support/features/search_helpers.rb +39 -0
  331. data/spec/support/features/session_helpers.rb +1 -0
  332. data/spec/support/features.rb +3 -0
  333. data/spec/test_app_templates/lib/generators/test_app_generator.rb +9 -2
  334. data/spec/views/catalog/_document.html.erb_spec.rb +3 -34
  335. data/spec/views/catalog/_facet_index_navigation.html.erb_spec.rb +1 -1
  336. data/spec/views/catalog/_search_header.erb_spec.rb +1 -0
  337. data/spec/views/catalog/_show_sidebar.erb_spec.rb +1 -0
  338. data/spec/views/catalog/_show_tools.html.erb_spec.rb +7 -54
  339. data/spec/views/catalog/_view_type_group.html.erb_spec.rb +17 -9
  340. data/spec/views/catalog/email_success.html.erb_spec.rb +2 -2
  341. data/spec/views/catalog/facet.html.erb_spec.rb +6 -3
  342. data/spec/views/catalog/index.atom.builder_spec.rb +18 -11
  343. data/spec/views/catalog/index.html.erb_spec.rb +5 -6
  344. data/spec/views/catalog/index.json.jbuilder_spec.rb +2 -2
  345. data/spec/views/catalog/show.html.erb_spec.rb +3 -25
  346. data/spec/views/catalog/sms_success.html.erb_spec.rb +2 -2
  347. data/tasks/blacklight.rake +6 -4
  348. metadata +73 -113
  349. data/.babelrc +0 -11
  350. data/app/assets/images/blacklight/list.svg +0 -1
  351. data/app/assets/images/blacklight/search.svg +0 -1
  352. data/app/assets/stylesheets/blacklight/_twitter_typeahead.scss +0 -37
  353. data/app/components/blacklight/content_areas_shim.rb +0 -13
  354. data/app/controllers/concerns/blacklight/base.rb +0 -7
  355. data/app/controllers/concerns/blacklight/default_component_configuration.rb +0 -64
  356. data/app/controllers/concerns/blacklight/facet.rb +0 -69
  357. data/app/controllers/concerns/blacklight/search_fields.rb +0 -46
  358. data/app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb +0 -27
  359. data/app/helpers/blacklight/render_constraints_helper_behavior.rb +0 -188
  360. data/app/helpers/blacklight/search_history_constraints_helper_behavior.rb +0 -97
  361. data/app/helpers/blacklight/suggest_helper_behavior.rb +0 -13
  362. data/app/javascript/blacklight/autocomplete.js +0 -36
  363. data/app/javascript/blacklight/facet_load.js +0 -22
  364. data/app/presenters/blacklight/search_bar_presenter.rb +0 -47
  365. data/app/views/catalog/_constraints_element.html.erb +0 -14
  366. data/app/views/catalog/_document_action.html.erb +0 -5
  367. data/app/views/catalog/_facet_group.html.erb +0 -5
  368. data/app/views/catalog/_facet_limit.html.erb +0 -3
  369. data/app/views/catalog/_index.html.erb +0 -1
  370. data/app/views/catalog/_index_header.html.erb +0 -22
  371. data/app/views/catalog/_previous_next_doc.html.erb +0 -2
  372. data/app/views/catalog/_show.html.erb +0 -6
  373. data/app/views/catalog/_show_header.html.erb +0 -2
  374. data/app/views/catalog/_thumbnail.html.erb +0 -1
  375. data/lib/blacklight/deprecations/engine_configuration.rb +0 -66
  376. data/lib/blacklight/deprecations/search_state_normalization.rb +0 -52
  377. data/spec/controllers/blacklight/facet_spec.rb +0 -33
  378. data/spec/controllers/blacklight/search_fields_spec.rb +0 -62
  379. data/spec/helpers/blacklight/hash_as_hidden_fields_behavior_spec.rb +0 -26
  380. data/spec/helpers/blacklight/render_constraints_helper_behavior_spec.rb +0 -92
  381. data/spec/helpers/blacklight/search_history_constraints_helper_behavior_spec.rb +0 -108
  382. data/spec/helpers/blacklight/suggest_helper_behavior_spec.rb +0 -48
  383. data/spec/lib/blacklight/engine_spec.rb +0 -41
  384. data/spec/presenters/blacklight/search_bar_presenter_spec.rb +0 -94
  385. data/spec/views/catalog/_constraints.html.erb_spec.rb +0 -33
  386. data/spec/views/catalog/_facet_group.html.erb_spec.rb +0 -84
  387. data/spec/views/catalog/_facets.html.erb_spec.rb +0 -15
  388. data/spec/views/catalog/_index.html.erb_spec.rb +0 -62
  389. data/spec/views/catalog/_index_header.html.erb_spec.rb +0 -35
  390. data/spec/views/catalog/_previous_next_doc.html.erb_spec.rb +0 -22
  391. data/spec/views/catalog/_show.html.erb_spec.rb +0 -62
  392. data/spec/views/catalog/_thumbnail.html.erb_spec.rb +0 -38
@@ -1,537 +1,397 @@
1
- "use strict";
2
-
3
- var Blacklight = function () {
4
- var buffer = new Array();
5
- return {
6
- onLoad: function onLoad(func) {
7
- buffer.push(func);
8
- },
9
- activate: function activate() {
10
- for (var i = 0; i < buffer.length; i++) {
11
- buffer[i].call();
12
- }
13
- },
14
- listeners: function listeners() {
15
- var listeners = [];
16
-
17
- if (typeof Turbo !== 'undefined') {
18
- listeners.push('turbo:load');
19
- } else if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
20
- // Turbolinks 5
21
- if (Turbolinks.BrowserAdapter) {
22
- listeners.push('turbolinks:load');
1
+ (function (global, factory) {
2
+ typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
3
+ typeof define === 'function' && define.amd ? define(factory) :
4
+ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.Blacklight = factory());
5
+ })(this, (function () { 'use strict';
6
+
7
+ const Blacklight = function() {
8
+ const buffer = new Array;
9
+ return {
10
+ onLoad: function(func) {
11
+ buffer.push(func);
12
+ },
13
+
14
+ activate: function() {
15
+ for(let i = 0; i < buffer.length; i++) {
16
+ buffer[i].call();
17
+ }
18
+ },
19
+
20
+ listeners: function () {
21
+ const listeners = [];
22
+ if (typeof Turbo !== 'undefined') {
23
+ listeners.push('turbo:load', 'turbo:frame-load');
24
+ } else if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
25
+ // Turbolinks 5
26
+ if (Turbolinks.BrowserAdapter) {
27
+ listeners.push('turbolinks:load');
28
+ } else {
29
+ // Turbolinks < 5
30
+ listeners.push('page:load', 'DOMContentLoaded');
31
+ }
23
32
  } else {
24
- // Turbolinks < 5
25
- listeners.push('page:load', 'DOMContentLoaded');
33
+ listeners.push('DOMContentLoaded');
26
34
  }
27
- } else {
28
- listeners.push('DOMContentLoaded');
29
- }
30
35
 
31
- return listeners;
32
- }
33
- };
34
- }(); // turbolinks triggers page:load events on page transition
35
- // If app isn't using turbolinks, this event will never be triggered, no prob.
36
-
37
-
38
- Blacklight.listeners().forEach(function (listener) {
39
- document.addEventListener(listener, function () {
40
- Blacklight.activate();
41
- });
42
- });
43
- Blacklight.onLoad(function () {
44
- var elem = document.querySelector('.no-js'); // The "no-js" class may already have been removed because this function is
45
- // run on every turbo:load event, in that case, it won't find an element.
46
-
47
- if (!elem) return;
48
- elem.classList.remove('no-js');
49
- elem.classList.add('js');
50
- });
51
- window.Blacklight = Blacklight;
52
- /*global Bloodhound */
53
-
54
- Blacklight.onLoad(function () {
55
- 'use strict';
56
-
57
- $('[data-autocomplete-enabled="true"]').each(function () {
58
- var $el = $(this);
59
-
60
- if ($el.hasClass('tt-hint')) {
61
- return;
62
- }
63
-
64
- var suggestUrl = $el.data().autocompletePath;
65
- var terms = new Bloodhound({
66
- datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'),
67
- queryTokenizer: Bloodhound.tokenizers.whitespace,
68
- remote: {
69
- url: suggestUrl + '?q=%QUERY',
70
- wildcard: '%QUERY'
36
+ return listeners;
71
37
  }
72
- });
73
- terms.initialize();
74
- $el.typeahead({
75
- hint: true,
76
- highlight: true,
77
- minLength: 2
78
- }, {
79
- name: 'terms',
80
- displayKey: 'term',
81
- source: terms.ttAdapter()
38
+ };
39
+ }();
40
+
41
+ // turbolinks triggers page:load events on page transition
42
+ // If app isn't using turbolinks, this event will never be triggered, no prob.
43
+ Blacklight.listeners().forEach(function(listener) {
44
+ document.addEventListener(listener, function() {
45
+ Blacklight.activate();
82
46
  });
83
47
  });
84
- });
85
-
86
- (function ($) {
87
- //change form submit toggle to checkbox
88
- Blacklight.doBookmarkToggleBehavior = function () {
89
- if (typeof Blacklight.do_bookmark_toggle_behavior == 'function') {
90
- console.warn("do_bookmark_toggle_behavior is deprecated. Use doBookmarkToggleBehavior instead.");
91
- return Blacklight.do_bookmark_toggle_behavior();
92
- }
93
-
94
- $(Blacklight.doBookmarkToggleBehavior.selector).blCheckboxSubmit({
95
- // cssClass is added to elements added, plus used for id base
96
- cssClass: 'toggle-bookmark',
97
- success: function success(checked, response) {
98
- if (response.bookmarks) {
99
- $('[data-role=bookmark-counter]').text(response.bookmarks.count);
100
- }
101
- }
102
- });
103
- };
104
48
 
105
- Blacklight.doBookmarkToggleBehavior.selector = 'form.bookmark-toggle';
106
49
  Blacklight.onLoad(function () {
107
- Blacklight.doBookmarkToggleBehavior();
108
- });
109
- })(jQuery);
110
-
111
- Blacklight.onLoad(function () {
112
- // Button clicks should change focus. As of 10/3/19, Firefox for Mac and
113
- // Safari both do not set focus to a button on button click.
114
- // See https://zellwk.com/blog/inconsistent-button-behavior/ for background information
115
- document.querySelectorAll('button.collapse-toggle').forEach(function (button) {
116
- button.addEventListener('click', function () {
117
- event.target.focus();
118
- });
119
- });
120
- });
121
- /* A JQuery plugin (should this be implemented as a widget instead? not sure)
122
- that will convert a "toggle" form, with single submit button to add/remove
123
- something, like used for Bookmarks, into an AJAXy checkbox instead.
124
-
125
- Apply to a form. Does require certain assumption about the form:
126
- 1) The same form 'action' href must be used for both ADD and REMOVE
127
- actions, with the different being the hidden input name="_method"
128
- being set to "put" or "delete" -- that's the Rails method to pretend
129
- to be doing a certain HTTP verb. So same URL, PUT to add, DELETE
130
- to remove. This plugin assumes that.
131
-
132
- Plus, the form this is applied to should provide a data-doc-id
133
- attribute (HTML5-style doc-*) that contains the id/primary key
134
- of the object in question -- used by plugin for a unique value for
135
- DOM id's.
136
-
137
- Uses HTML for a checkbox compatible with Bootstrap 3.
138
-
139
- Pass in options for your class name and labels:
140
- $("form.something").blCheckboxSubmit({
141
- //cssClass is added to elements added, plus used for id base
142
- cssClass: "toggle_my_kinda_form",
143
- error: function() {
144
- #optional callback
145
- },
146
- success: function(after_success_check_state) {
147
- #optional callback
148
- }
149
- });
150
- */
151
-
152
- (function ($) {
153
- $.fn.blCheckboxSubmit = function (argOpts) {
154
- this.each(function () {
155
- var options = $.extend({}, $.fn.blCheckboxSubmit.defaults, argOpts);
156
- var form = $(this);
157
- form.children().hide(); //We're going to use the existing form to actually send our add/removes
158
- //This works conveneintly because the exact same action href is used
159
- //for both bookmarks/$doc_id. But let's take out the irrelevant parts
160
- //of the form to avoid any future confusion.
161
-
162
- form.find('input[type=submit]').remove(); //View needs to set data-doc-id so we know a unique value
163
- //for making DOM id
164
-
165
- var uniqueId = form.attr('data-doc-id') || Math.random(); // if form is currently using method delete to change state,
166
- // then checkbox is currently checked
167
-
168
- var checked = form.find('input[name=_method][value=delete]').length != 0;
169
- var checkbox = $('<input type="checkbox">').addClass(options.cssClass).attr('id', options.cssClass + '_' + uniqueId);
170
- var label = $('<label>').addClass(options.cssClass).attr('for', options.cssClass + '_' + uniqueId).attr('title', form.attr('title') || '');
171
- var span = $('<span>');
172
- label.append(checkbox);
173
- label.append(' ');
174
- label.append(span);
175
- var checkboxDiv = $('<div class="checkbox" />').addClass(options.cssClass).append(label);
176
-
177
- function updateStateFor(state) {
178
- checkbox.prop('checked', state);
179
- label.toggleClass('checked', state);
180
-
181
- if (state) {
182
- //Set the Rails hidden field that fakes an HTTP verb
183
- //properly for current state action.
184
- form.find('input[name=_method]').val('delete');
185
- span.html(form.attr('data-present'));
186
- } else {
187
- form.find('input[name=_method]').val('put');
188
- span.html(form.attr('data-absent'));
189
- }
190
- }
191
-
192
- form.append(checkboxDiv);
193
- updateStateFor(checked);
194
- checkbox.click(function () {
195
- span.html(form.attr('data-inprogress'));
196
- label.attr('disabled', 'disabled');
197
- checkbox.attr('disabled', 'disabled');
198
- $.ajax({
199
- url: form.attr('action'),
200
- dataType: 'json',
201
- type: form.attr('method').toUpperCase(),
202
- data: form.serialize(),
203
- error: function error() {
204
- label.removeAttr('disabled');
205
- checkbox.removeAttr('disabled');
206
- options.error.call();
207
- },
208
- success: function success(data, status, xhr) {
209
- //if app isn't running at all, xhr annoyingly
210
- //reports success with status 0.
211
- if (xhr.status != 0) {
212
- checked = !checked;
213
- updateStateFor(checked);
214
- label.removeAttr('disabled');
215
- checkbox.removeAttr('disabled');
216
- options.success.call(form, checked, xhr.responseJSON);
217
- } else {
218
- label.removeAttr('disabled');
219
- checkbox.removeAttr('disabled');
220
- options.error.call();
221
- }
222
- }
223
- });
224
- return false;
225
- }); //checkbox.click
226
- }); //this.each
227
-
228
- return this;
229
- };
50
+ const elem = document.querySelector('.no-js');
230
51
 
231
- $.fn.blCheckboxSubmit.defaults = {
232
- //cssClass is added to elements added, plus used for id base
233
- cssClass: 'blCheckboxSubmit',
234
- error: function error() {
235
- alert("Error");
236
- },
237
- success: function success() {} //callback
238
-
239
- };
240
- })(jQuery);
241
- /*global Blacklight */
52
+ // The "no-js" class may already have been removed because this function is
53
+ // run on every turbo:load event, in that case, it won't find an element.
54
+ if (!elem) return;
242
55
 
56
+ elem.classList.remove('no-js');
57
+ elem.classList.add('js');
58
+ });
243
59
 
244
- 'use strict';
245
-
246
- Blacklight.doResizeFacetLabelsAndCounts = function () {
247
- // adjust width of facet columns to fit their contents
248
- function longer(a, b) {
249
- return b.textContent.length - a.textContent.length;
250
- }
251
-
252
- document.querySelectorAll('.facet-values, .pivot-facet').forEach(function (elem) {
253
- var nodes = elem.querySelectorAll('.facet-count'); // TODO: when we drop ie11 support, this can become the spread operator:
60
+ /* Converts a "toggle" form, with single submit button to add/remove
61
+ something, like used for Bookmarks, into an AJAXy checkbox instead.
62
+ Apply to a form. Does require certain assumption about the form:
63
+ 1) The same form 'action' href must be used for both ADD and REMOVE
64
+ actions, with the different being the hidden input name="_method"
65
+ being set to "put" or "delete" -- that's the Rails method to pretend
66
+ to be doing a certain HTTP verb. So same URL, PUT to add, DELETE
67
+ to remove. This plugin assumes that.
68
+ Plus, the form this is applied to should provide a data-doc-id
69
+ attribute (HTML5-style doc-*) that contains the id/primary key
70
+ of the object in question -- used by plugin for a unique value for
71
+ DOM id's.
72
+ Uses HTML for a checkbox compatible with Bootstrap 4.
73
+ new CheckboxSubmit(document.querySelector('form.something')).render()
74
+ */
75
+ class CheckboxSubmit {
76
+ constructor(form) {
77
+ this.form = form;
78
+ }
254
79
 
255
- var longest = Array.from(nodes).sort(longer)[0];
80
+ async clicked(evt) {
81
+ this.spanTarget.innerHTML = this.form.getAttribute('data-inprogress');
82
+ this.labelTarget.setAttribute('disabled', 'disabled');
83
+ this.checkboxTarget.setAttribute('disabled', 'disabled');
84
+ const response = await fetch(this.formTarget.getAttribute('action'), {
85
+ body: new FormData(this.formTarget),
86
+ method: this.formTarget.getAttribute('method').toUpperCase(),
87
+ headers: {
88
+ 'Accept': 'application/json',
89
+ 'X-Requested-With': 'XMLHttpRequest',
90
+ 'X-CSRF-Token': document.querySelector('meta[name=csrf-token]')?.content
91
+ }
92
+ });
93
+ this.labelTarget.removeAttribute('disabled');
94
+ this.checkboxTarget.removeAttribute('disabled');
95
+ if (response.ok) {
96
+ const json = await response.json();
97
+ this.updateStateFor(!this.checked);
98
+ document.querySelector('[data-role=bookmark-counter]').innerHTML = json.bookmarks.count;
99
+ } else {
100
+ alert('Error');
101
+ }
102
+ }
256
103
 
257
- if (longest && longest.textContent) {
258
- var width = longest.textContent.length + 1 + 'ch';
259
- elem.querySelector('.facet-count').style.width = width;
104
+ get checked() {
105
+ return (this.form.querySelectorAll('input[name=_method][value=delete]').length != 0)
260
106
  }
261
- });
262
- };
263
-
264
- Blacklight.onLoad(function () {
265
- Blacklight.doResizeFacetLabelsAndCounts();
266
- });
267
- /*
268
- The blacklight modal plugin can display some interactions inside a Bootstrap
269
- modal window, including some multi-page interactions.
270
-
271
- It supports unobtrusive Javascript, where a link or form that would have caused
272
- a new page load is changed to display it's results inside a modal dialog,
273
- by this plugin. The plugin assumes there is a Bootstrap modal div
274
- on the page with id #blacklight-modal to use as the modal -- the standard Blacklight
275
- layout provides this.
276
-
277
- To make a link or form have their results display inside a modal, add
278
- `data-blacklight-modal="trigger"` to the link or form. (Note, form itself not submit input)
279
- With Rails link_to helper, you'd do that like:
280
-
281
- link_to something, link, data: { blacklight_modal: "trigger" }
282
-
283
- The results of the link href or form submit will be displayed inside
284
- a modal -- they should include the proper HTML markup for a bootstrap modal's
285
- contents. Also, you ordinarily won't want the Rails template with wrapping
286
- navigational elements to be used. The Rails controller could suppress
287
- the layout when a JS AJAX request is detected, OR the response
288
- can include a `<div data-blacklight-modal="container">` -- only the contents
289
- of the container will be placed inside the modal, the rest of the
290
- page will be ignored.
291
-
292
- If you'd like to have a link or button that closes the modal,
293
- you can just add a `data-dismiss="modal"` to the link,
294
- standard Bootstrap convention. But you can also have
295
- an href on this link for non-JS contexts, we'll make sure
296
- inside the modal it closes the modal and the link is NOT followed.
297
-
298
- Link or forms inside the modal will ordinarily cause page loads
299
- when they are triggered. However, if you'd like their results
300
- to stay within the modal, just add `data-blacklight-modal="preserve"`
301
- to the link or form.
302
-
303
- Here's an example of what might be returned, demonstrating most of the devices available:
304
-
305
- <div data-blacklight-modal="container">
306
- <div class="modal-header">
307
- <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
308
- <h3 class="modal-title">Request Placed</h3>
309
- </div>
310
107
 
311
- <div class="modal-body">
312
- <p>Some message</p>
313
- <%= link_to "This result will still be within modal", some_link, data: { blacklight_modal: "preserve" } %>
314
- </div>
108
+ get formTarget() {
109
+ return this.form
110
+ }
315
111
 
112
+ get labelTarget() {
113
+ return this.form.querySelector('[data-checkboxsubmit-target="label"]')
114
+ }
316
115
 
317
- <div class="modal-footer">
318
- <%= link_to "Close the modal", request_done_path, class: "submit button dialog-close", data: { dismiss: "modal" } %>
319
- </div>
320
- </div>
321
-
322
-
323
- One additional feature. If the content returned from the AJAX modal load
324
- has an element with `data-blacklight-modal=close`, that will trigger the modal
325
- to be closed. And if this element includes a node with class "flash_messages",
326
- the flash-messages node will be added to the main page inside #main-flahses.
327
-
328
- == Events
329
-
330
- We'll send out an event 'loaded.blacklight.blacklight-modal' with the #blacklight-modal
331
- dialog as the target, right after content is loaded into the modal but before
332
- it is shown (if not already a shown modal). In an event handler, you can
333
- inspect loaded content by looking inside $(this). If you call event.preventDefault(),
334
- we won't 'show' the dialog (although it may already have been shown, you may want to
335
- $(this).modal("hide") if you want to ensure hidden/closed.
336
-
337
- The data-blacklight-modal=close behavior is implemented with this event, see for example.
338
- */
339
- // We keep all our data in Blacklight.modal object.
340
- // Create lazily if someone else created first.
341
-
342
- if (Blacklight.modal === undefined) {
343
- Blacklight.modal = {};
344
- } // a Bootstrap modal div that should be already on the page hidden
345
-
346
-
347
- Blacklight.modal.modalSelector = '#blacklight-modal'; // Trigger selectors identify forms or hyperlinks that should open
348
- // inside a modal dialog.
349
-
350
- Blacklight.modal.triggerLinkSelector = 'a[data-blacklight-modal~=trigger]';
351
- Blacklight.modal.triggerFormSelector = 'form[data-blacklight-modal~=trigger]'; // preserve selectors identify forms or hyperlinks that, if activated already
352
- // inside a modal dialog, should have destinations remain inside the modal -- but
353
- // won't trigger a modal if not already in one.
354
- //
355
- // No need to repeat selectors from trigger selectors, those will already
356
- // be preserved. MUST be manually prefixed with the modal selector,
357
- // so they only apply to things inside a modal.
358
-
359
- Blacklight.modal.preserveLinkSelector = Blacklight.modal.modalSelector + ' a[data-blacklight-modal~=preserve]';
360
- Blacklight.modal.containerSelector = '[data-blacklight-modal~=container]';
361
- Blacklight.modal.modalCloseSelector = '[data-blacklight-modal~=close]'; // Called on fatal failure of ajax load, function returns content
362
- // to show to user in modal. Right now called only for extreme
363
- // network errors.
364
-
365
- Blacklight.modal.onFailure = function (jqXHR, textStatus, errorThrown) {
366
- console.error('Server error:', this.url, jqXHR.status, errorThrown);
367
- var contents = '<div class="modal-header">' + '<div class="modal-title">There was a problem with your request.</div>' + '<button type="button" class="blacklight-modal-close btn-close close" data-dismiss="modal" aria-label="Close">' + ' <span aria-hidden="true">&times;</span>' + '</button></div>' + ' <div class="modal-body"><p>Expected a successful response from the server, but got an error</p>' + '<pre>' + this.type + ' ' + this.url + "\n" + jqXHR.status + ': ' + errorThrown + '</pre></div>';
368
- $(Blacklight.modal.modalSelector).find('.modal-content').html(contents);
369
- Blacklight.modal.show();
370
- };
371
-
372
- Blacklight.modal.receiveAjax = function (contents) {
373
- // does it have a data- selector for container?
374
- // important we don't execute script tags, we shouldn't.
375
- // code modelled off of JQuery ajax.load. https://github.com/jquery/jquery/blob/main/src/ajax/load.js?source=c#L62
376
- var container = $('<div>').append(jQuery.parseHTML(contents)).find(Blacklight.modal.containerSelector).first();
377
-
378
- if (container.length !== 0) {
379
- contents = container.html();
380
- }
116
+ get checkboxTarget() {
117
+ return this.form.querySelector('[data-checkboxsubmit-target="checkbox"]')
118
+ }
381
119
 
382
- $(Blacklight.modal.modalSelector).find('.modal-content').html(contents); // send custom event with the modal dialog div as the target
383
-
384
- var e = $.Event('loaded.blacklight.blacklight-modal');
385
- $(Blacklight.modal.modalSelector).trigger(e); // if they did preventDefault, don't show the dialog
386
-
387
- if (e.isDefaultPrevented()) return;
388
- Blacklight.modal.show();
389
- };
390
-
391
- Blacklight.modal.modalAjaxLinkClick = function (e) {
392
- e.preventDefault();
393
- $.ajax({
394
- url: $(this).attr('href')
395
- }).fail(Blacklight.modal.onFailure).done(Blacklight.modal.receiveAjax);
396
- };
397
-
398
- Blacklight.modal.modalAjaxFormSubmit = function (e) {
399
- e.preventDefault();
400
- $.ajax({
401
- url: $(this).attr('action'),
402
- data: $(this).serialize(),
403
- type: $(this).attr('method') // POST
404
-
405
- }).fail(Blacklight.modal.onFailure).done(Blacklight.modal.receiveAjax);
406
- };
407
-
408
- Blacklight.modal.setupModal = function () {
409
- // Event indicating blacklight is setting up a modal link,
410
- // you can catch it and call e.preventDefault() to abort
411
- // setup.
412
- var e = $.Event('setup.blacklight.blacklight-modal');
413
- $('body').trigger(e);
414
- if (e.isDefaultPrevented()) return; // Register both trigger and preserve selectors in ONE event handler, combining
415
- // into one selector with a comma, so if something matches BOTH selectors, it
416
- // still only gets the event handler called once.
417
-
418
- $('body').on('click', Blacklight.modal.triggerLinkSelector + ', ' + Blacklight.modal.preserveLinkSelector, Blacklight.modal.modalAjaxLinkClick);
419
- $('body').on('submit', Blacklight.modal.triggerFormSelector + ', ' + Blacklight.modal.preserveFormSelector, Blacklight.modal.modalAjaxFormSubmit); // Catch our own custom loaded event to implement data-blacklight-modal=closed
420
-
421
- $('body').on('loaded.blacklight.blacklight-modal', Blacklight.modal.checkCloseModal); // we support doing data-dismiss=modal on a <a> with a href for non-ajax
422
- // use, we need to suppress following the a's href that's there for
423
- // non-JS contexts.
424
-
425
- $('body').on('click', Blacklight.modal.modalSelector + ' a[data-dismiss~=modal]', function (e) {
426
- e.preventDefault();
427
- });
428
- }; // A function used as an event handler on loaded.blacklight.blacklight-modal
429
- // to catch contained data-blacklight-modal=closed directions
430
-
431
-
432
- Blacklight.modal.checkCloseModal = function (event) {
433
- if ($(event.target).find(Blacklight.modal.modalCloseSelector).length) {
434
- var modalFlashes = $(this).find('.flash_messages');
435
- Blacklight.modal.hide(event.target);
436
- event.preventDefault();
437
- var mainFlashes = $('#main-flashes');
438
- mainFlashes.append(modalFlashes);
439
- modalFlashes.fadeIn(500);
440
- }
441
- };
120
+ get spanTarget() {
121
+ return this.form.querySelector('[data-checkboxsubmit-target="span"]')
122
+ }
442
123
 
443
- Blacklight.modal.hide = function (el) {
444
- if (typeof bootstrap !== 'undefined' && typeof bootstrap.Modal !== 'undefined' && bootstrap.Modal.VERSION >= "5") {
445
- bootstrap.Modal.getOrCreateInstance(el || document.querySelector(Blacklight.modal.modalSelector)).hide();
446
- } else {
447
- $(el || Blacklight.modal.modalSelector).modal('hide');
448
- }
449
- };
124
+ updateStateFor(state) {
125
+ this.checkboxTarget.checked = state;
450
126
 
451
- Blacklight.modal.show = function (el) {
452
- if (typeof bootstrap !== 'undefined' && typeof bootstrap.Modal !== 'undefined' && bootstrap.Modal.VERSION >= "5") {
453
- bootstrap.Modal.getOrCreateInstance(el || document.querySelector(Blacklight.modal.modalSelector)).show();
454
- } else {
455
- $(el || Blacklight.modal.modalSelector).modal('show');
127
+ if (state) {
128
+ this.labelTarget.classList.add('checked');
129
+ //Set the Rails hidden field that fakes an HTTP verb
130
+ //properly for current state action.
131
+ this.formTarget.querySelector('input[name=_method]').value = 'delete';
132
+ this.spanTarget.innerHTML = this.form.getAttribute('data-present');
133
+ } else {
134
+ this.labelTarget.classList.remove('checked');
135
+ this.formTarget.querySelector('input[name=_method]').value = 'put';
136
+ this.spanTarget.innerHTML = this.form.getAttribute('data-absent');
137
+ }
138
+ }
456
139
  }
457
- };
458
140
 
459
- Blacklight.onLoad(function () {
460
- Blacklight.modal.setupModal();
461
- });
141
+ const BookmarkToggle = (() => {
142
+ // change form submit toggle to checkbox
143
+ Blacklight.doBookmarkToggleBehavior = function() {
144
+ document.addEventListener('click', (e) => {
145
+ if (e.target.matches('[data-checkboxsubmit-target="checkbox"]')) {
146
+ const form = e.target.closest('form');
147
+ if (form) new CheckboxSubmit(form).clicked(e);
148
+ }
149
+ });
150
+ };
151
+ Blacklight.doBookmarkToggleBehavior.selector = 'form.bookmark-toggle';
152
+
153
+ Blacklight.doBookmarkToggleBehavior();
154
+ })();
155
+
156
+ const ButtonFocus = (() => {
157
+ document.addEventListener('click', (e) => {
158
+ // Button clicks should change focus. As of 10/3/19, Firefox for Mac and
159
+ // Safari both do not set focus to a button on button click.
160
+ // See https://zellwk.com/blog/inconsistent-button-behavior/ for background information
161
+ if (e.target.matches('[data-toggle="collapse"]') || e.target.matches('[data-bs-toggle="collapse"]')) {
162
+ e.target.focus();
163
+ }
164
+ });
165
+ })();
166
+
167
+ /*
168
+ The blacklight modal plugin can display some interactions inside a Bootstrap
169
+ modal window, including some multi-page interactions.
170
+
171
+ It supports unobtrusive Javascript, where a link or form that would have caused
172
+ a new page load is changed to display it's results inside a modal dialog,
173
+ by this plugin. The plugin assumes there is a Bootstrap modal div
174
+ on the page with id #blacklight-modal to use as the modal -- the standard Blacklight
175
+ layout provides this.
176
+
177
+ To make a link or form have their results display inside a modal, add
178
+ `data-blacklight-modal="trigger"` to the link or form. (Note, form itself not submit input)
179
+ With Rails link_to helper, you'd do that like:
180
+
181
+ link_to something, link, data: { blacklight_modal: "trigger" }
182
+
183
+ The results of the link href or form submit will be displayed inside
184
+ a modal -- they should include the proper HTML markup for a bootstrap modal's
185
+ contents. Also, you ordinarily won't want the Rails template with wrapping
186
+ navigational elements to be used. The Rails controller could suppress
187
+ the layout when a JS AJAX request is detected, OR the response
188
+ can include a `<div data-blacklight-modal="container">` -- only the contents
189
+ of the container will be placed inside the modal, the rest of the
190
+ page will be ignored.
191
+
192
+ Link or forms inside the modal will ordinarily cause page loads
193
+ when they are triggered. However, if you'd like their results
194
+ to stay within the modal, just add `data-blacklight-modal="preserve"`
195
+ to the link or form.
196
+
197
+ Here's an example of what might be returned, demonstrating most of the devices available:
198
+
199
+ <div data-blacklight-modal="container">
200
+ <div class="modal-header">
201
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
202
+ <h3 class="modal-title">Request Placed</h3>
203
+ </div>
204
+
205
+ <div class="modal-body">
206
+ <p>Some message</p>
207
+ <%= link_to "This result will still be within modal", some_link, data: { blacklight_modal: "preserve" } %>
208
+ </div>
209
+
210
+
211
+ <div class="modal-footer">
212
+ <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
213
+ </div>
214
+ </div>
462
215
 
463
- Blacklight.doSearchContextBehavior = function () {
464
- if (typeof Blacklight.do_search_context_behavior == 'function') {
465
- console.warn("do_search_context_behavior is deprecated. Use doSearchContextBehavior instead.");
466
- return Blacklight.do_search_context_behavior();
467
- }
468
216
 
469
- var elements = document.querySelectorAll('a[data-context-href]'); // Equivalent to Array.from(), but supports ie11
217
+ One additional feature. If the content returned from the AJAX form submission
218
+ can be a turbo-stream that defines some HTML fragementsand where on the page to put them:
219
+ https://turbo.hotwired.dev/handbook/streams
220
+ */
470
221
 
471
- var nodes = Array.prototype.slice.call(elements);
472
- nodes.forEach(function (element) {
473
- element.addEventListener('click', function (e) {
474
- Blacklight.handleSearchContextMethod.call(e.currentTarget, e);
475
- });
476
- });
477
- };
222
+ const Modal = (() => {
223
+ // We keep all our data in Blacklight.modal object.
224
+ // Create lazily if someone else created first.
225
+ if (Blacklight.modal === undefined) {
226
+ Blacklight.modal = {};
227
+ }
478
228
 
479
- Blacklight.csrfToken = function () {
480
- var _document$querySelect;
229
+ const modal = Blacklight.modal;
230
+
231
+ // a Bootstrap modal div that should be already on the page hidden
232
+ modal.modalSelector = '#blacklight-modal';
233
+
234
+ // Trigger selectors identify forms or hyperlinks that should open
235
+ // inside a modal dialog.
236
+ modal.triggerLinkSelector = 'a[data-blacklight-modal~=trigger]';
237
+
238
+ // preserve selectors identify forms or hyperlinks that, if activated already
239
+ // inside a modal dialog, should have destinations remain inside the modal -- but
240
+ // won't trigger a modal if not already in one.
241
+ //
242
+ // No need to repeat selectors from trigger selectors, those will already
243
+ // be preserved. MUST be manually prefixed with the modal selector,
244
+ // so they only apply to things inside a modal.
245
+ modal.preserveLinkSelector = modal.modalSelector + ' a[data-blacklight-modal~=preserve]';
246
+
247
+ modal.containerSelector = '[data-blacklight-modal~=container]';
248
+
249
+ // Called on fatal failure of ajax load, function returns content
250
+ // to show to user in modal. Right now called only for extreme
251
+ // network errors.
252
+ modal.onFailure = function (jqXHR, textStatus, errorThrown) {
253
+ console.error('Server error:', this.url, jqXHR.status, errorThrown);
254
+
255
+ const contents = `<div class="modal-header">
256
+ <div class="modal-title">There was a problem with your request.</div>
257
+ <button type="button" class="blacklight-modal-close btn-close close" data-dismiss="modal" data-bs-dismiss="modal" aria-label="Close">
258
+ <span aria-hidden="true">&times;</span>
259
+ </button>
260
+ </div>
261
+ <div class="modal-body">
262
+ <p>Expected a successful response from the server, but got an error</p>
263
+ <pre>${this.type} ${this.url}\n${jqXHR.status}: ${errorThrown}</pre>
264
+ </div>`;
265
+
266
+ document.querySelector(`${modal.modalSelector} .modal-content`).innerHTML = contents;
267
+
268
+ modal.show();
269
+ };
270
+
271
+ // Add the passed in contents to the modal and display it.
272
+ modal.receiveAjax = function (contents) {
273
+ const domparser = new DOMParser();
274
+ const dom = domparser.parseFromString(contents, "text/html");
275
+ // If there is a containerSelector on the document, use it's children.
276
+ let elements = dom.querySelectorAll(`${modal.containerSelector} > *`);
277
+ if (element.length == 0) {
278
+ // If the containerSelector wasn't found, use the whole document
279
+ elements = dom.querySelectorAll(`*`);
280
+ }
281
+ document.querySelector(`${modal.modalSelector} .modal-content`).replaceChildren(...elements);
282
+
283
+ modal.show();
284
+ };
285
+
286
+
287
+ modal.modalAjaxLinkClick = function(e) {
288
+ e.preventDefault();
289
+ const href = e.target.getAttribute('href');
290
+ fetch(href)
291
+ .then(response => {
292
+ if (!response.ok) {
293
+ throw new TypeError("Request failed");
294
+ }
295
+ return response.text();
296
+ })
297
+ .then(data => modal.receiveAjax(data))
298
+ .catch(error => modal.onFailure(error));
299
+ };
300
+
301
+ modal.setupModal = function() {
302
+ // Register both trigger and preserve selectors in ONE event handler, combining
303
+ // into one selector with a comma, so if something matches BOTH selectors, it
304
+ // still only gets the event handler called once.
305
+ document.addEventListener('click', (e) => {
306
+ if (e.target.matches(`${modal.triggerLinkSelector}, ${modal.preserveLinkSelector}`))
307
+ modal.modalAjaxLinkClick(e);
308
+ else if (e.target.matches('[data-bl-dismiss="modal"]'))
309
+ modal.hide();
310
+ });
311
+ };
312
+
313
+ modal.hide = function (el) {
314
+ const dom = document.querySelector(Blacklight.modal.modalSelector);
315
+
316
+ if (!dom.open) return
317
+ dom.close();
318
+ };
319
+
320
+ modal.show = function(el) {
321
+ const dom = document.querySelector(Blacklight.modal.modalSelector);
322
+
323
+ if (dom.open) return
324
+ dom.showModal();
325
+ };
326
+
327
+ modal.setupModal();
328
+ })();
329
+
330
+ const SearchContext = (() => {
331
+ Blacklight.doSearchContextBehavior = function() {
332
+ document.addEventListener('click', (e) => {
333
+ if (e.target.matches('[data-context-href]')) {
334
+ Blacklight.handleSearchContextMethod.call(e.target, e);
335
+ }
336
+ });
337
+ };
481
338
 
482
- return (_document$querySelect = document.querySelector('meta[name=csrf-token]')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.content;
483
- };
339
+ Blacklight.csrfToken = () => document.querySelector('meta[name=csrf-token]')?.content;
340
+ Blacklight.csrfParam = () => document.querySelector('meta[name=csrf-param]')?.content;
484
341
 
485
- Blacklight.csrfParam = function () {
486
- var _document$querySelect2;
342
+ // this is the Rails.handleMethod with a couple adjustments, described inline:
343
+ // first, we're attaching this directly to the event handler, so we can check for meta-keys
344
+ Blacklight.handleSearchContextMethod = function(event) {
345
+ const link = this;
487
346
 
488
- return (_document$querySelect2 = document.querySelector('meta[name=csrf-param]')) === null || _document$querySelect2 === void 0 ? void 0 : _document$querySelect2.content;
489
- }; // this is the Rails.handleMethod with a couple adjustments, described inline:
490
- // first, we're attaching this directly to the event handler, so we can check for meta-keys
347
+ // instead of using the normal href, we need to use the context href instead
348
+ let href = link.getAttribute('data-context-href');
349
+ let target = link.getAttribute('target');
350
+ let csrfToken = Blacklight.csrfToken();
351
+ let csrfParam = Blacklight.csrfParam();
352
+ let form = document.createElement('form');
353
+ form.method = 'post';
354
+ form.action = href;
491
355
 
492
356
 
493
- Blacklight.handleSearchContextMethod = function (event) {
494
- if (typeof Blacklight.handle_search_context_method == 'function') {
495
- console.warn("handle_search_context_method is deprecated. Use handleSearchContextMethod instead.");
496
- return Blacklight.handle_search_context_method(event);
497
- }
357
+ let formContent = `<input name="_method" value="post" type="hidden" />
358
+ <input name="redirect" value="${link.getAttribute('href')}" type="hidden" />`;
498
359
 
499
- var link = this; // instead of using the normal href, we need to use the context href instead
360
+ // check for meta keys.. if set, we should open in a new tab
361
+ if(event.metaKey || event.ctrlKey) {
362
+ target = '_blank';
363
+ }
500
364
 
501
- var href = link.getAttribute('data-context-href');
502
- var target = link.getAttribute('target');
503
- var csrfToken = Blacklight.csrfToken();
504
- var csrfParam = Blacklight.csrfParam();
505
- var form = document.createElement('form');
506
- form.method = 'post';
507
- form.action = href;
508
- var formContent = "<input name=\"_method\" value=\"post\" type=\"hidden\" />\n <input name=\"redirect\" value=\"".concat(link.getAttribute('href'), "\" type=\"hidden\" />"); // check for meta keys.. if set, we should open in a new tab
365
+ if (csrfParam !== undefined && csrfToken !== undefined) {
366
+ formContent += `<input name="${csrfParam}" value="${csrfToken}" type="hidden" />`;
367
+ }
509
368
 
510
- if (event.metaKey || event.ctrlKey) {
511
- target = '_blank';
512
- }
369
+ // Must trigger submit by click on a button, else "submit" event handler won't work!
370
+ // https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormElement/submit
371
+ formContent += '<input type="submit" />';
513
372
 
514
- if (csrfParam !== undefined && csrfToken !== undefined) {
515
- formContent += "<input name=\"".concat(csrfParam, "\" value=\"").concat(csrfToken, "\" type=\"hidden\" />");
516
- } // Must trigger submit by click on a button, else "submit" event handler won't work!
517
- // https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormElement/submit
373
+ if (target) { form.setAttribute('target', target); }
518
374
 
375
+ form.style.display = 'none';
376
+ form.innerHTML = formContent;
377
+ document.body.appendChild(form);
378
+ form.querySelector('[type="submit"]').click();
519
379
 
520
- formContent += '<input type="submit" />';
380
+ event.preventDefault();
381
+ };
521
382
 
522
- if (target) {
523
- form.setAttribute('target', target);
524
- }
383
+ Blacklight.doSearchContextBehavior();
384
+ })();
525
385
 
526
- form.style.display = 'none';
527
- form.innerHTML = formContent;
528
- document.body.appendChild(form);
529
- form.querySelector('[type="submit"]').click();
530
- event.preventDefault();
531
- event.stopPropagation();
532
- };
386
+ const index = {
387
+ BookmarkToggle,
388
+ ButtonFocus,
389
+ Modal,
390
+ SearchContext,
391
+ onLoad: Blacklight.onLoad
392
+ };
533
393
 
534
- Blacklight.onLoad(function () {
535
- Blacklight.doSearchContextBehavior();
536
- });
394
+ return index;
537
395
 
396
+ }));
397
+ //# sourceMappingURL=blacklight.js.map