blacklight 7.34.0 → 8.0.0.beta1

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