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,7 +1,7 @@
1
- <%= form_tag @url, method: @method, class: @classes.join(' '), role: 'search', aria: { label: scoped_t('submit') }, **@form_options do %>
2
- <%= render_hash_as_hidden_fields(@params) %>
1
+ <%= form_with url: @url, local: true, method: @method, class: @classes.join(' '), scope: @prefix, role: 'search', aria: { label: scoped_t('submit') }, **@form_options do |f| %>
2
+ <%= render Blacklight::HiddenSearchStateComponent.new(params: @params) %>
3
3
  <% if search_fields.length > 1 %>
4
- <label for="search_field" class="sr-only visually-hidden"><%= scoped_t('search_field.label') %></label>
4
+ <%= f.label :search_field, scoped_t('search_field.label'), class: 'sr-only visually-hidden' %>
5
5
  <% end %>
6
6
  <% before_input_groups.each do |input_group| %>
7
7
  <%= input_group %>
@@ -10,22 +10,27 @@
10
10
  <%= prepend %>
11
11
 
12
12
  <% if search_fields.length > 1 %>
13
- <%= select_tag(:search_field,
14
- options_for_select(search_fields, h(@search_field)),
15
- title: scoped_t('search_field.title'),
16
- id: "#{@prefix}search_field",
17
- class: "custom-select form-select search-field") %>
13
+ <%= f.select(:search_field,
14
+ options_for_select(search_fields, h(@search_field)),
15
+ {},
16
+ title: scoped_t('search_field.title'),
17
+ class: "custom-select form-select search-field") %>
18
18
  <% elsif search_fields.length == 1 %>
19
- <%= hidden_field_tag :search_field, search_fields.first.last %>
19
+ <%= f.hidden_field :search_field, value: search_fields.first.last %>
20
20
  <% end %>
21
21
 
22
- <label for="<%= @prefix %><%= @query_param %>" class="sr-only visually-hidden"><%= scoped_t('search.label') %></label>
23
- <%= text_field_tag @query_param, @q, placeholder: scoped_t('search.placeholder'), class: "search-q q form-control rounded-#{search_fields.length > 1 ? '0' : 'left'}", id: "#{@prefix}q", autocomplete: autocomplete_path.present? ? "off" : "", autofocus: @autofocus, aria: { label: scoped_t('search.label') }, data: { autocomplete_enabled: autocomplete_path.present?, autocomplete_path: autocomplete_path } %>
22
+ <%= f.label @query_param, scoped_t('search.label'), class: 'sr-only visually-hidden' %>
23
+ <% if autocomplete_path.present? %>
24
+ <auto-complete src="<%= autocomplete_path %>" for="autocomplete-popup" class="search-autocomplete-wrapper">
25
+ <%= f.search_field @query_param, value: @q, placeholder: scoped_t('search.placeholder'), class: "search-q q form-control rounded-#{search_fields.length > 1 ? '0' : 'left'}", autofocus: @autofocus, aria: { label: scoped_t('search.label'), autocomplete: 'list', controls: 'autocomplete-popup' } %>
26
+ <ul id="autocomplete-popup" role="listbox" aria-label="<%= scoped_t('search.label') %>"></ul>
27
+ </auto-complete>
28
+ <% else %>
29
+ <%= f.search_field @query_param, value: @q, placeholder: scoped_t('search.placeholder'), class: "search-q q form-control rounded-#{search_fields.length > 1 ? '0' : 'left'}", autofocus: @autofocus, aria: { label: scoped_t('search.label') } %>
30
+ <% end %>
24
31
 
25
- <span class="input-group-append">
26
- <%= append %>
27
- <%= search_button || render(Blacklight::SearchButtonComponent.new(id: "#{@prefix}search", text: scoped_t('submit'))) %>
28
- </span>
32
+ <%= append %>
33
+ <%= search_button || render(Blacklight::SearchButtonComponent.new(id: "#{@prefix}search", text: scoped_t('submit'))) %>
29
34
  </div>
30
35
  <% end %>
31
36
 
@@ -2,8 +2,6 @@
2
2
 
3
3
  module Blacklight
4
4
  class SearchBarComponent < Blacklight::Component
5
- include Blacklight::ContentAreasShim
6
-
7
5
  renders_one :append
8
6
  renders_one :prepend
9
7
  renders_one :search_button
@@ -12,10 +10,10 @@ module Blacklight
12
10
  # rubocop:disable Metrics/ParameterLists
13
11
  def initialize(
14
12
  url:, params:,
15
- advanced_search_url: nil, presenter: nil,
13
+ advanced_search_url: nil,
16
14
  classes: ['search-query-form'], prefix: nil,
17
15
  method: 'GET', q: nil, query_param: :q,
18
- search_field: nil, search_fields: nil, autocomplete_path: nil,
16
+ search_field: nil, autocomplete_path: nil,
19
17
  autofocus: nil, i18n: { scope: 'blacklight.search.form' },
20
18
  form_options: {}
21
19
  )
@@ -30,14 +28,8 @@ module Blacklight
30
28
  @method = method
31
29
  @autocomplete_path = autocomplete_path
32
30
  @autofocus = autofocus
33
- @search_fields = search_fields
34
31
  @i18n = i18n
35
32
  @form_options = form_options
36
-
37
- return if presenter.nil?
38
-
39
- Deprecation.warn(self, 'SearchBarComponent no longer uses a SearchBarPresenter, the presenter: param will be removed in 8.0. ' \
40
- 'Set advanced_search.enabled, autocomplete_enabled, and enable_search_bar_autofocus on BlacklightConfiguration')
41
33
  end
42
34
  # rubocop:enable Metrics/ParameterLists
43
35
 
@@ -74,12 +66,6 @@ module Blacklight
74
66
  helpers.blacklight_config
75
67
  end
76
68
 
77
- def render_hash_as_hidden_fields(*args)
78
- Deprecation.silence(Blacklight::HashAsHiddenFieldsHelperBehavior) do
79
- helpers.render_hash_as_hidden_fields(*args)
80
- end
81
- end
82
-
83
69
  def scoped_t(key, **args)
84
70
  t(key, default: t(key, scope: 'blacklight.search.form'), **@i18n, **args)
85
71
  end
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Blacklight
4
- class SearchButtonComponent < ::ViewComponent::Base
4
+ class SearchButtonComponent < Blacklight::Component
5
5
  def initialize(text:, id:)
6
6
  @text = text
7
7
  @id = id
@@ -9,8 +9,8 @@ module Blacklight
9
9
 
10
10
  def call
11
11
  tag.button(class: 'btn btn-primary search-btn', type: 'submit', id: @id) do
12
- tag.span(@text, class: "submit-search-text") +
13
- blacklight_icon(:search, aria_hidden: true)
12
+ tag.span(@text, class: "visually-hidden-sm me-sm-1 submit-search-text") +
13
+ render(Blacklight::Icons::SearchComponent.new)
14
14
  end
15
15
  end
16
16
  end
@@ -13,22 +13,56 @@ module Blacklight
13
13
  @search_context.present? && (@search_context[:prev] || @search_context[:next])
14
14
  end
15
15
 
16
+ ##
17
+ # Displays "showing X of Y items" message.
18
+ #
19
+ # @return [String]
16
20
  def item_page_entry_info
17
- Deprecation.silence(Blacklight::CatalogHelperBehavior) do
18
- helpers.item_page_entry_info
19
- end
21
+ t('blacklight.search.entry_pagination_info.other', current: number_with_delimiter(count),
22
+ total: number_with_delimiter(total),
23
+ count: total).html_safe
20
24
  end
21
25
 
22
- def link_to_previous_document(document = nil, *args, **kwargs)
23
- Deprecation.silence(Blacklight::UrlHelperBehavior) do
24
- helpers.link_to_previous_document(document || @search_context[:prev], *args, **kwargs)
26
+ def link_to_previous_document(previous_document = nil, classes: 'previous', **link_opts)
27
+ previous_document ||= @search_context[:prev]
28
+ link_opts = session_tracking_params(previous_document, count - 1, per_page: per_page, search_id: search_id).merge(class: classes, rel: 'prev').merge(link_opts)
29
+ link_to_unless previous_document.nil?, raw(t('views.pagination.previous')), url_for_document(previous_document), link_opts do
30
+ tag.span raw(t('views.pagination.previous')), class: 'previous'
25
31
  end
26
32
  end
27
33
 
28
- def link_to_next_document(document = nil, *args, **kwargs)
29
- Deprecation.silence(Blacklight::UrlHelperBehavior) do
30
- helpers.link_to_next_document(document || @search_context[:next], *args, **kwargs)
34
+ def link_to_next_document(next_document = nil, classes: 'next', **link_opts)
35
+ next_document ||= @search_context[:next]
36
+ link_opts = session_tracking_params(next_document, count + 1, per_page: per_page, search_id: search_id).merge(class: classes, rel: 'next').merge(link_opts)
37
+ link_to_unless next_document.nil?, raw(t('views.pagination.next')), url_for_document(next_document), link_opts do
38
+ tag.span raw(t('views.pagination.next')), class: 'next'
31
39
  end
32
40
  end
41
+
42
+ private
43
+
44
+ def count
45
+ @search_session['counter'].to_i
46
+ end
47
+
48
+ def per_page
49
+ @search_session['per_page']
50
+ end
51
+
52
+ def total
53
+ @search_session['total'].to_i
54
+ end
55
+
56
+ def search_id
57
+ controller.current_search_session&.id
58
+ end
59
+
60
+ def session_tracking_params(...)
61
+ helpers.session_tracking_params(...)
62
+ end
63
+
64
+ def url_for_document(...)
65
+ helpers.search_state.url_for_document(...)
66
+ end
33
67
  end
34
68
  end
@@ -0,0 +1,2 @@
1
+ <%= render 'did_you_mean' %>
2
+ <%= render 'sort_and_per_page' %>
@@ -0,0 +1,6 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Blacklight
4
+ class SearchHeaderComponent < Blacklight::Component
5
+ end
6
+ end
@@ -12,9 +12,11 @@ module Blacklight
12
12
  # Get the path to the search action with any parameters (e.g. view type)
13
13
  # that should be persisted across search sessions.
14
14
  def start_over_path query_params = params
15
- Deprecation.silence(Blacklight::UrlHelperBehavior) do
16
- helpers.start_over_path(query_params)
17
- end
15
+ h = {}
16
+ current_index_view_type = helpers.document_index_view_type(query_params)
17
+ h[:view] = current_index_view_type unless current_index_view_type == helpers.default_document_index_view_type
18
+
19
+ helpers.search_action_path(h)
18
20
  end
19
21
  end
20
22
  end
@@ -29,11 +29,11 @@ module Blacklight
29
29
  end
30
30
 
31
31
  def before_render
32
- with_button(classes: 'btn btn-outline-secondary dropdown-toggle', label: button_label) unless button
32
+ button(classes: 'btn btn-outline-secondary dropdown-toggle', label: button_label) unless button
33
33
 
34
34
  return if options.any?
35
35
 
36
- with_options(@choices.map do |option|
36
+ options(@choices.map do |option|
37
37
  text, value = option_text_and_value(option)
38
38
  { text: text, url: helpers.url_for(@search_state.params_for_search(@param => value)), selected: @selected == value }
39
39
  end)
@@ -1,4 +1,6 @@
1
1
  <div class="alert <%= @classes %>">
2
2
  <%= message %>
3
- <a class="btn-close close" data-dismiss="alert" data-bs-dismiss="alert" href="#">&times;</a>
3
+ <%= tag.button_tag button_contents, type: "button", class: "btn-close",
4
+ data: { dismiss: "alert", bs_dismiss: "alert" },
5
+ aria: { label: "Close" } %>
4
6
  </div>
@@ -7,13 +7,22 @@ module Blacklight
7
7
 
8
8
  with_collection_parameter :message
9
9
 
10
- def initialize(message: nil, type:)
10
+ def initialize(type:, message: nil)
11
11
  @message = message
12
12
  @classes = alert_class(type)
13
13
  end
14
14
 
15
15
  def before_render
16
- with_message { @message } if @message
16
+ message { @message } if @message
17
+ end
18
+
19
+ # Bootstrap 4 requires the span, but Bootstrap 5 should not have it.
20
+ # See https://getbootstrap.com/docs/4.6/components/alerts/#dismissing
21
+ # https://getbootstrap.com/docs/5.1/components/alerts/#dismissing
22
+ def button_contents
23
+ return if helpers.controller.blacklight_config.bootstrap_version == 5
24
+
25
+ tag.span '&times;'.html_safe, aria: { hidden: true }
17
26
  end
18
27
 
19
28
  def alert_class(type)
@@ -6,7 +6,7 @@
6
6
  <h1 class="modal-title"><%= title %></h1>
7
7
  <% end) %>
8
8
 
9
- <button type="button" class="blacklight-modal-close btn-close close" data-bs-dismiss="modal" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
9
+ <button type="button" class="blacklight-modal-close btn-close close" data-bl-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
10
10
  <span aria-hidden="true" class="visually-hidden">&times;</span>
11
11
  </button>
12
12
  </div>
@@ -3,8 +3,6 @@
3
3
  module Blacklight
4
4
  module System
5
5
  class ModalComponent < ViewComponent::Base
6
- include Blacklight::ContentAreasShim
7
-
8
6
  renders_one :prefix
9
7
  renders_one :header
10
8
  renders_one :title
@@ -1,6 +1,6 @@
1
1
  <nav class="navbar navbar-expand-md navbar-dark bg-dark topbar" role="navigation">
2
2
  <div class="<%= container_classes %>">
3
- <%= logo_link %>
3
+ <%= link_to application_name, blacklight_config.logo_link, class: 'mb-0 navbar-brand navbar-logo' %>
4
4
  <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-bs-toggle="collapse" data-target="#user-util-collapse" data-bs-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">
5
5
  <span class="navbar-toggler-icon"></span>
6
6
  </button>
@@ -9,9 +9,5 @@ module Blacklight
9
9
  attr_reader :blacklight_config
10
10
 
11
11
  delegate :application_name, :container_classes, to: :helpers
12
-
13
- def logo_link(title: application_name)
14
- link_to title, blacklight_config.logo_link, class: 'mb-0 navbar-brand navbar-logo'
15
- end
16
12
  end
17
13
  end
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  class BookmarksController < CatalogController
3
4
  include Blacklight::Bookmarks
4
5
  end
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  class CatalogController < ApplicationController
3
4
  include Blacklight::Catalog
4
5
  end
@@ -1,5 +1,6 @@
1
1
  # frozen_string_literal: true
2
- # note that while this is mostly restful routing, the #update and #destroy actions
2
+
3
+ # NOTE: that while this is mostly restful routing, the #update and #destroy actions
3
4
  # take the Solr document ID as the :id, NOT the id of the actual Bookmark action.
4
5
  module Blacklight::Bookmarks
5
6
  extend ActiveSupport::Concern
@@ -20,6 +21,7 @@ module Blacklight::Bookmarks
20
21
 
21
22
  blacklight_config.show.document_actions[:bookmark].if = false if blacklight_config.show.document_actions[:bookmark]
22
23
  blacklight_config.show.document_actions[:sms].if = false if blacklight_config.show.document_actions[:sms]
24
+ blacklight_config.search_builder_class = Blacklight::BookmarksSearchBuilder
23
25
  end
24
26
 
25
27
  def action_documents
@@ -38,11 +40,14 @@ module Blacklight::Bookmarks
38
40
  search_catalog_url(*args)
39
41
  end
40
42
 
43
+ # @return [Hash] a hash of context information to pass through to the search service
44
+ def search_service_context
45
+ { bookmarks: @bookmarks }
46
+ end
47
+
41
48
  def index
42
49
  @bookmarks = token_or_current_or_guest_user.bookmarks
43
- bookmark_ids = @bookmarks.collect { |b| b.document_id.to_s }
44
- @response, deprecated_document_list = search_service.fetch(bookmark_ids)
45
- @document_list = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(deprecated_document_list, "The @document_list instance variable is now deprecated and will be removed in Blacklight 8.0")
50
+ @response = search_service.search_results
46
51
 
47
52
  respond_to do |format|
48
53
  format.html {}
@@ -115,7 +120,7 @@ module Blacklight::Bookmarks
115
120
  redirect_back fallback_location: bookmarks_path, notice: I18n.t('blacklight.bookmarks.remove.success')
116
121
  end
117
122
  elsif request.xhr?
118
- head 500 # ajaxy request needs no redirect and should not have flash set
123
+ head :internal_server_error # ajaxy request needs no redirect and should not have flash set
119
124
  else
120
125
  redirect_back fallback_location: bookmarks_path, flash: { error: I18n.t('blacklight.bookmarks.remove.failure') }
121
126
  end
@@ -1,40 +1,29 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  module Blacklight::Catalog
3
4
  extend ActiveSupport::Concern
4
5
 
5
6
  # MimeResponds is part of ActionController::Base, but not ActionController::API
6
7
  include ActionController::MimeResponds
7
8
 
8
- Deprecation.silence(Blacklight::Base) do
9
- include Blacklight::Base
10
- end
11
-
12
- include Blacklight::Facet
9
+ include Blacklight::Configurable
10
+ include Blacklight::SearchContext
13
11
  include Blacklight::Searchable
14
12
 
15
- extend Deprecation
16
-
17
13
  # The following code is executed when someone includes blacklight::catalog in their
18
14
  # own controller.
19
15
  included do
20
16
  if respond_to? :helper_method
21
- helper_method :sms_mappings, :has_search_parameters?, :facet_limit_for
17
+ helper_method :sms_mappings, :has_search_parameters?
18
+ helper_method :search_facet_path
22
19
  end
23
20
 
24
- helper Blacklight::Facet if respond_to? :helper
25
-
26
- # The index action will more than likely throw this one.
27
- # Example: when the standard query parser is used, and a user submits a "bad" query.
28
- rescue_from Blacklight::Exceptions::InvalidRequest, with: :handle_request_error
29
-
30
21
  record_search_parameters
31
22
  end
32
23
 
33
24
  # get search results from the solr index
34
25
  def index
35
- (@response, deprecated_document_list) = search_service.search_results
36
-
37
- @document_list = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(deprecated_document_list, 'The @document_list instance variable is deprecated; use @response.documents instead.')
26
+ @response = search_service.search_results
38
27
 
39
28
  respond_to do |format|
40
29
  format.html { store_preferred_view }
@@ -52,8 +41,7 @@ module Blacklight::Catalog
52
41
  # get a single document from the index
53
42
  # to add responses for formats other than html or json see _Blacklight::Document::Export_
54
43
  def show
55
- deprecated_response, @document = search_service.fetch(params[:id])
56
- @response = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(deprecated_response, 'The @response instance variable is deprecated; use @document.response instead.')
44
+ @document = search_service.fetch(params[:id])
57
45
 
58
46
  respond_to do |format|
59
47
  format.html { @search_context = setup_next_and_previous_documents }
@@ -70,7 +58,7 @@ module Blacklight::Catalog
70
58
  def raw
71
59
  raise(ActionController::RoutingError, 'Not Found') unless blacklight_config.raw_endpoint.enabled
72
60
 
73
- _, @document = search_service.fetch(params[:id])
61
+ @document = search_service.fetch(params[:id])
74
62
  render json: @document
75
63
  end
76
64
 
@@ -98,7 +86,7 @@ module Blacklight::Catalog
98
86
  @response = search_service.facet_field_response(@facet.key)
99
87
  @display_facet = @response.aggregations[@facet.field]
100
88
 
101
- @presenter = (@facet.presenter || Blacklight::FacetFieldPresenter).new(@facet, @display_facet, view_context)
89
+ @presenter = @facet.presenter.new(@facet, @display_facet, view_context)
102
90
  @pagination = @presenter.paginator
103
91
  respond_to do |format|
104
92
  format.html do
@@ -118,21 +106,19 @@ module Blacklight::Catalog
118
106
  end
119
107
  end
120
108
 
109
+ # Returns the dropdown list for autocomplete
121
110
  def suggest
122
- respond_to do |format|
123
- format.json do
124
- render json: suggestions_service.suggestions
125
- end
126
- end
111
+ @suggestions = suggestions_service.suggestions
112
+ render 'suggest', layout: false
127
113
  end
128
114
 
129
115
  # @return [Array] first value is a Blacklight::Solr::Response and the second
130
116
  # is a list of documents
131
117
  def action_documents
132
- deprecated_response, @documents = search_service.fetch(Array(params[:id]))
118
+ @documents = search_service.fetch(Array(params[:id]))
133
119
  raise Blacklight::Exceptions::RecordNotFound if @documents.blank?
134
120
 
135
- [deprecated_response, @documents]
121
+ @documents
136
122
  end
137
123
 
138
124
  def action_success_redirect_path
@@ -146,34 +132,14 @@ module Blacklight::Catalog
146
132
  params[:search_field].present? || search_state.has_constraints?
147
133
  end
148
134
 
149
- # TODO: deprecate this constant with #facet_limit_for
150
- DEFAULT_FACET_LIMIT = 10
151
-
152
- # Look up facet limit for given facet_field. Will look at config, and
153
- # if config is 'true' will look up from Solr @response if available. If
154
- # no limit is available, returns nil. Used from #add_facetting_to_solr
155
- # to supply f.fieldname.facet.limit values in solr request (no @response
156
- # available), and used in display (with @response available) to create
157
- # a facet paginator with the right limit.
158
- def facet_limit_for(facet_field)
159
- facet = blacklight_config.facet_fields[facet_field]
160
- return if facet.blank?
161
-
162
- if facet.limit && @response && @response.aggregations[facet.field]
163
- limit = @response.aggregations[facet.field].limit
164
-
165
- if limit.nil? # we didn't get or a set a limit, so infer one.
166
- facet.limit if facet.limit != true
167
- elsif limit == -1 # limit -1 is solr-speak for unlimited
168
- nil
169
- else
170
- limit.to_i - 1 # we added 1 to find out if we needed to paginate
171
- end
172
- elsif facet.limit
173
- facet.limit == true ? DEFAULT_FACET_LIMIT : facet.limit
174
- end
135
+ def search_facet_path(options = {})
136
+ opts = search_state
137
+ .to_h
138
+ .merge(action: "facet", only_path: true)
139
+ .merge(options)
140
+ .except(:page)
141
+ url_for opts
175
142
  end
176
- deprecation_deprecate facet_limit_for: 'moving to private logic in Blacklight::FacetFieldPresenter'
177
143
 
178
144
  private
179
145
 
@@ -317,26 +283,6 @@ module Blacklight::Catalog
317
283
  action_name == 'show' ? 'catalog_result' : super
318
284
  end
319
285
 
320
- # when a method throws a Blacklight::Exceptions::InvalidRequest, this method is executed.
321
- def handle_request_error(exception)
322
- # Rails own code will catch and give usual Rails error page with stack trace
323
- raise exception if Rails.env.development? || Rails.env.test?
324
-
325
- flash_notice = I18n.t('blacklight.search.errors.request_error')
326
-
327
- # If there are errors coming from the index page, we want to trap those sensibly
328
-
329
- if flash[:notice] == flash_notice
330
- logger&.error "Cowardly aborting rsolr_request_error exception handling, because we redirected to a page that raises another exception"
331
- raise exception
332
- end
333
-
334
- logger&.error exception
335
-
336
- flash[:notice] = flash_notice
337
- redirect_to search_action_url
338
- end
339
-
340
286
  def blacklight_advanced_search_form_search_service
341
287
  form_search_state = search_state_class.new(blacklight_advanced_search_form_params, blacklight_config, self)
342
288
 
@@ -1,14 +1,11 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  # Filters added to this controller apply to all controllers in the hosting application
3
4
  # as this module is mixed-in to the application controller in the hosting app on installation.
4
5
  module Blacklight::Controller
5
6
  extend ActiveSupport::Concern
6
- extend Deprecation
7
7
 
8
8
  included do
9
- include Blacklight::SearchFields
10
- helper Blacklight::SearchFields if respond_to? :helper
11
-
12
9
  include ActiveSupport::Callbacks
13
10
 
14
11
  # now in application.rb file under config.filter_parameters
@@ -16,6 +13,7 @@ module Blacklight::Controller
16
13
 
17
14
  # handle basic authorization exception with #access_denied
18
15
  rescue_from Blacklight::Exceptions::AccessDenied, with: :access_denied
16
+ helper BlacklightHelper
19
17
 
20
18
  if respond_to? :helper_method
21
19
  helper_method :current_user_session, :current_user, :current_or_guest_user
@@ -24,7 +22,6 @@ module Blacklight::Controller
24
22
  helper_method :has_user_authentication_provider?
25
23
  helper_method :blacklight_config, :blacklight_configuration_context # move to Catalog
26
24
  helper_method :search_action_url, :search_action_path
27
- helper_method :search_facet_path # move to catalog? deprecate?
28
25
  helper_method :search_state
29
26
  end
30
27
 
@@ -33,12 +30,6 @@ module Blacklight::Controller
33
30
  # TODO: move to Searchable
34
31
  class_attribute :search_state_class
35
32
  self.search_state_class = Blacklight::SearchState
36
-
37
- # Which class to use for the search service. You can subclass SearchService if you
38
- # want to override any of the methods (e.g. SearchService#fetch)
39
- # TODO: move to Searchable
40
- class_attribute :search_service_class
41
- self.search_service_class = Blacklight::SearchService
42
33
  end
43
34
 
44
35
  # @private
@@ -76,7 +67,7 @@ module Blacklight::Controller
76
67
  # which action the search form should use
77
68
  def search_action_url options = {}
78
69
  # Rails 4.2 deprecated url helpers accepting string keys for 'controller' or 'action'
79
- search_catalog_url(options.except(:controller, :action))
70
+ search_catalog_url(options.to_h.except(:controller, :action))
80
71
  end
81
72
 
82
73
  def search_action_path *args
@@ -87,22 +78,6 @@ module Blacklight::Controller
87
78
  search_action_url(*args)
88
79
  end
89
80
 
90
- # TODO: move to catalog? deprecate?
91
- def search_facet_path(options = {})
92
- opts = search_state
93
- .to_h
94
- .merge(action: "facet", only_path: true)
95
- .merge(options)
96
- .except(:page)
97
- url_for opts
98
- end
99
-
100
- # Returns a list of Searches from the ids in the user's history.
101
- # TODO: move to catalog? SearchHistory?
102
- def searches_from_history
103
- session[:history].blank? ? ::Search.none : ::Search.where(id: session[:history]).order("updated_at desc")
104
- end
105
-
106
81
  # Should be provided by authentication provider
107
82
  # def current_user
108
83
  # end
@@ -126,21 +101,9 @@ module Blacklight::Controller
126
101
  respond_to? :current_user
127
102
  end
128
103
 
129
- def require_user_authentication_provider
130
- raise ActionController::RoutingError, 'Not Found' unless has_user_authentication_provider?
131
- end
132
- deprecation_deprecate require_user_authentication_provider: 'removed without replacement'
133
-
134
104
  ##
135
105
  # When a user logs in, transfer any saved searches or bookmarks to the current_user
136
106
  def transfer_guest_to_user
137
- Deprecation.silence(Blacklight::Controller) do
138
- transfer_guest_user_actions_to_current_user
139
- end
140
- end
141
-
142
- # @deprecated use canonical `transfer_guest_to_user` method instead
143
- def transfer_guest_user_actions_to_current_user
144
107
  return unless respond_to?(:current_user) && respond_to?(:guest_user) && current_user && guest_user
145
108
 
146
109
  current_user_searches = current_user.searches.pluck(:query_params)
@@ -159,7 +122,6 @@ module Blacklight::Controller
159
122
  # let guest_user know we've moved some bookmarks from under it
160
123
  guest_user.reload if guest_user.persisted?
161
124
  end
162
- deprecation_deprecate :transfer_guest_user_actions_to_current_user
163
125
 
164
126
  ##
165
127
  # To handle failed authorization attempts, redirect the user to the