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,69 +1,59 @@
1
- Blacklight.doSearchContextBehavior = function() {
2
- if (typeof Blacklight.do_search_context_behavior == 'function') {
3
- console.warn("do_search_context_behavior is deprecated. Use doSearchContextBehavior instead.");
4
- return Blacklight.do_search_context_behavior();
5
- }
6
-
7
- const elements = document.querySelectorAll('a[data-context-href]')
8
- // Equivalent to Array.from(), but supports ie11
9
- const nodes = Array.prototype.slice.call(elements)
10
-
11
- nodes.forEach(function(element) {
12
- element.addEventListener('click', function(e) {
13
- Blacklight.handleSearchContextMethod.call(e.currentTarget, e)
1
+ import Blacklight from './core'
2
+
3
+ const SearchContext = (() => {
4
+ Blacklight.doSearchContextBehavior = function() {
5
+ document.addEventListener('click', (e) => {
6
+ if (e.target.matches('[data-context-href]')) {
7
+ Blacklight.handleSearchContextMethod.call(e.target, e)
8
+ }
14
9
  })
15
- })
16
- };
10
+ };
17
11
 
18
- Blacklight.csrfToken = () => document.querySelector('meta[name=csrf-token]')?.content
19
- Blacklight.csrfParam = () => document.querySelector('meta[name=csrf-param]')?.content
12
+ Blacklight.csrfToken = () => document.querySelector('meta[name=csrf-token]')?.content
13
+ Blacklight.csrfParam = () => document.querySelector('meta[name=csrf-param]')?.content
20
14
 
21
- // this is the Rails.handleMethod with a couple adjustments, described inline:
22
- // first, we're attaching this directly to the event handler, so we can check for meta-keys
23
- Blacklight.handleSearchContextMethod = function(event) {
24
- if (typeof Blacklight.handle_search_context_method == 'function') {
25
- console.warn("handle_search_context_method is deprecated. Use handleSearchContextMethod instead.");
26
- return Blacklight.handle_search_context_method(event);
27
- }
28
- var link = this
15
+ // this is the Rails.handleMethod with a couple adjustments, described inline:
16
+ // first, we're attaching this directly to the event handler, so we can check for meta-keys
17
+ Blacklight.handleSearchContextMethod = function(event) {
18
+ const link = this
29
19
 
30
- // instead of using the normal href, we need to use the context href instead
31
- let href = link.getAttribute('data-context-href')
32
- let target = link.getAttribute('target')
33
- let csrfToken = Blacklight.csrfToken()
34
- let csrfParam = Blacklight.csrfParam()
35
- let form = document.createElement('form')
36
- form.method = 'post'
37
- form.action = href
20
+ // instead of using the normal href, we need to use the context href instead
21
+ let href = link.getAttribute('data-context-href')
22
+ let target = link.getAttribute('target')
23
+ let csrfToken = Blacklight.csrfToken()
24
+ let csrfParam = Blacklight.csrfParam()
25
+ let form = document.createElement('form')
26
+ form.method = 'post'
27
+ form.action = href
38
28
 
39
29
 
40
- let formContent = `<input name="_method" value="post" type="hidden" />
41
- <input name="redirect" value="${link.getAttribute('href')}" type="hidden" />`
30
+ let formContent = `<input name="_method" value="post" type="hidden" />
31
+ <input name="redirect" value="${link.getAttribute('href')}" type="hidden" />`
42
32
 
43
- // check for meta keys.. if set, we should open in a new tab
44
- if(event.metaKey || event.ctrlKey) {
45
- target = '_blank';
46
- }
33
+ // check for meta keys.. if set, we should open in a new tab
34
+ if(event.metaKey || event.ctrlKey) {
35
+ target = '_blank';
36
+ }
47
37
 
48
- if (csrfParam !== undefined && csrfToken !== undefined) {
49
- formContent += `<input name="${csrfParam}" value="${csrfToken}" type="hidden" />`
50
- }
38
+ if (csrfParam !== undefined && csrfToken !== undefined) {
39
+ formContent += `<input name="${csrfParam}" value="${csrfToken}" type="hidden" />`
40
+ }
51
41
 
52
- // Must trigger submit by click on a button, else "submit" event handler won't work!
53
- // https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormElement/submit
54
- formContent += '<input type="submit" />'
42
+ // Must trigger submit by click on a button, else "submit" event handler won't work!
43
+ // https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormElement/submit
44
+ formContent += '<input type="submit" />'
55
45
 
56
- if (target) { form.setAttribute('target', target); }
46
+ if (target) { form.setAttribute('target', target); }
57
47
 
58
- form.style.display = 'none'
59
- form.innerHTML = formContent
60
- document.body.appendChild(form)
61
- form.querySelector('[type="submit"]').click()
48
+ form.style.display = 'none'
49
+ form.innerHTML = formContent
50
+ document.body.appendChild(form)
51
+ form.querySelector('[type="submit"]').click()
62
52
 
63
- event.preventDefault()
64
- event.stopPropagation()
65
- };
53
+ event.preventDefault()
54
+ };
66
55
 
67
- Blacklight.onLoad(function() {
68
56
  Blacklight.doSearchContextBehavior();
69
- });
57
+ })()
58
+
59
+ export default SearchContext
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  module Blacklight
3
4
  # Pagination for facet values -- works by setting the limit to max
4
5
  # displayable. You have to ask Solr for limit+1, to get enough
@@ -52,10 +53,10 @@ module Blacklight
52
53
 
53
54
  def current_page
54
55
  # A nil limit is unlimited, thus only one page.
55
- if limit.nil? || limit.zero? #check for divide by zero
56
+ if limit.nil? || limit.zero? # check for divide by zero
56
57
  1
57
58
  else
58
- @offset / limit + 1
59
+ (@offset / limit) + 1
59
60
  end
60
61
  end
61
62
 
@@ -4,6 +4,8 @@ module Blacklight
4
4
  class Icon
5
5
  attr_reader :icon_name, :aria_hidden, :label, :role, :additional_options
6
6
 
7
+ delegate :present?, to: :file
8
+
7
9
  ##
8
10
  # @param [String, Symbol] icon_name
9
11
  # @param [String] classes additional classes separated by a string
@@ -32,7 +34,7 @@ module Blacklight
32
34
  end
33
35
 
34
36
  def icon_label
35
- I18n.translate("blacklight.icon.#{icon_name_context}", default: icon_name.to_s.titleize)
37
+ I18n.t("blacklight.icon.#{icon_name_context}", default: icon_name.to_s.titleize)
36
38
  end
37
39
 
38
40
  ##
@@ -40,7 +42,7 @@ module Blacklight
40
42
  def options
41
43
  {
42
44
  class: classes,
43
- "aria-hidden": (true if aria_hidden)
45
+ 'aria-hidden': (true if aria_hidden)
44
46
  }
45
47
  end
46
48
 
@@ -4,8 +4,6 @@ class Bookmark < ApplicationRecord
4
4
  belongs_to :user, polymorphic: true
5
5
  belongs_to :document, polymorphic: true
6
6
 
7
- validates :user_id, presence: true
8
-
9
7
  def document
10
8
  document_type.new document_type.unique_key => document_id
11
9
  end
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  module Blacklight::Configurable
3
4
  extend ActiveSupport::Concern
4
5
 
@@ -6,7 +7,7 @@ module Blacklight::Configurable
6
7
  helper_method :blacklight_config if respond_to? :helper_method
7
8
  end
8
9
 
9
- #instance methods for blacklight_config, so get a deep copy of the class-level config
10
+ # instance methods for blacklight_config, so get a deep copy of the class-level config
10
11
  def blacklight_config
11
12
  @blacklight_config ||= self.class.blacklight_config.deep_copy
12
13
  end
@@ -31,9 +32,9 @@ module Blacklight::Configurable
31
32
  end
32
33
  attr_writer :blacklight_config
33
34
 
34
- #simply a convenience method for blacklight_config.configure
35
- def configure_blacklight(*args, &block)
36
- blacklight_config.configure(*args, &block)
35
+ # simply a convenience method for blacklight_config.configure
36
+ def configure_blacklight(...)
37
+ blacklight_config.configure(...)
37
38
  end
38
39
 
39
40
  ##
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  require 'active_model/conversion'
3
4
 
4
5
  module Blacklight::Document
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  # This module provides the cache key which can be used by rails
3
4
  # caching to determine when to expire a particular object's cache
4
5
  # See http://apidock.com/rails/ActiveRecord/Integration/cache_key
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  require 'builder'
3
4
 
4
5
  # This module provide Dublin Core export based on the document's semantic values
@@ -26,7 +27,7 @@ module Blacklight::Document::DublinCore
26
27
  'xmlns:dc' => "http://purl.org/dc/elements/1.1/",
27
28
  'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance",
28
29
  'xsi:schemaLocation' => %(http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd)) do
29
- to_semantic_values.select { |field, _values| dublin_core_field_name? field }.each do |field, values|
30
+ to_semantic_values.select { |field, _values| dublin_core_field_name? field }.each do |field, values|
30
31
  Array.wrap(values).each do |v|
31
32
  xml.tag! "dc:#{field}", v
32
33
  end
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  # This module provides the body of an email export based on the document's semantic values
3
4
  module Blacklight::Document::Email
4
5
  # Return a text string that will be the body of the email
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  # == Transformation conventions
3
4
  # The main use case for extensions is for transforming a Document to another
4
5
  # format. Either to another type of Ruby object, or to an exportable string in
@@ -55,7 +56,7 @@ module Blacklight::Document::Export
55
56
  # register it using Mime::Type.register_alias if it's not previously
56
57
  # registered. This is a bit sketchy though.
57
58
  def will_export_as(short_name, content_type = nil)
58
- #Lookup in Rails Mime::Type, register if needed, otherwise take
59
+ # Lookup in Rails Mime::Type, register if needed, otherwise take
59
60
  # content-type from registration if needed.
60
61
  if defined?(Mime) && Mime[short_name.to_sym]
61
62
  content_type ||= Mime[short_name.to_sym]
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  # = Document Extensions
3
4
  # An Blacklight::Document extension is simply a ruby module which is mixed
4
5
  # in to individual Document instances. The intended use case is for documents
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  module Blacklight::Document::SchemaOrg
3
4
  def itemtype
4
5
  "http://schema.org/Thing"
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  module Blacklight::Document
3
4
  module SemanticFields
4
5
  extend ActiveSupport::Concern
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  # This module provides the body of an email export based on the document's semantic values
3
4
  module Blacklight::Document::Sms
4
5
  # Return a text string that will be the body of the email
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  module Blacklight
3
4
  module Suggest
4
5
  class Response
@@ -1,14 +1,14 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  module Blacklight::User
3
- # This gives us an is_blacklight_user method that can be included in
4
- # the containing applications models.
5
- # SEE ALSO: The /lib/blacklight/engine.rb class for how when this
6
- # is injected into the hosting application through ActiveRecord::Base extend
7
- def self.included(base)
8
- return unless base.respond_to? :has_many
4
+ extend ActiveSupport::Concern
5
+ # SEE ALSO: The lib/blacklight/generator/user_generator.rb class for where this
6
+ # is generated into the hosting application.
7
+ included do
8
+ class_attribute :string_display_key
9
9
 
10
- base.send :has_many, :bookmarks, dependent: :destroy, as: :user
11
- base.send :has_many, :searches, dependent: :destroy, as: :user
10
+ has_many :bookmarks, dependent: :destroy, as: :user
11
+ has_many :searches, dependent: :destroy, as: :user
12
12
  end
13
13
 
14
14
  def bookmarks_for_documents documents = []
@@ -28,4 +28,13 @@ module Blacklight::User
28
28
  def existing_bookmark_for(document)
29
29
  bookmarks_for_documents([document]).first
30
30
  end
31
+
32
+ ##
33
+ # @return [String] a user-displayable login/identifier for the user account
34
+ def to_s
35
+ string_display_key = self.class.string_display_key
36
+ return send(string_display_key) if respond_to?(string_display_key)
37
+
38
+ super
39
+ end
31
40
  end
@@ -1,17 +1,18 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  # Only works for documents with a #to_marc right now.
3
- class RecordMailer < ActionMailer::Base
4
+ class RecordMailer < ApplicationMailer
4
5
  def email_record(documents, details, url_gen_params)
5
6
  title = begin
6
- title_field = details[:config].email.title_field
7
- if title_field
8
- [documents.first[title_field]].flatten.first
9
- else
10
- documents.first.to_semantic_values[:title]
11
- end
12
- rescue
13
- I18n.t('blacklight.email.text.default_title')
14
- end
7
+ title_field = details[:config].email.title_field
8
+ if title_field
9
+ [documents.first[title_field]].flatten.first
10
+ else
11
+ documents.first.to_semantic_values[:title]
12
+ end
13
+ rescue
14
+ I18n.t('blacklight.email.text.default_title')
15
+ end
15
16
 
16
17
  subject = I18n.t('blacklight.email.text.subject',
17
18
  count: documents.length,
@@ -22,7 +23,7 @@ class RecordMailer < ActionMailer::Base
22
23
  @config = details[:config]
23
24
  @url_gen_params = url_gen_params
24
25
 
25
- mail(to: details[:to], subject: subject)
26
+ mail(to: details[:to], subject: subject)
26
27
  end
27
28
 
28
29
  def sms_record(documents, details, url_gen_params)
@@ -30,6 +31,6 @@ class RecordMailer < ActionMailer::Base
30
31
  @config = details[:config]
31
32
  @url_gen_params = url_gen_params
32
33
 
33
- mail(to: details[:to], subject: "")
34
+ mail(to: details[:to], subject: "") # rubocop:disable Rails/I18nLocaleTexts
34
35
  end
35
36
  end
data/app/models/search.rb CHANGED
@@ -3,7 +3,6 @@
3
3
  class Search < ApplicationRecord
4
4
  belongs_to :user, optional: true
5
5
 
6
- # use a backwards-compatible serializer until the Rails API stabilizes and we can evaluate for major-revision compatibility
7
6
  serialize :query_params, Blacklight::SearchParamsYamlCoder
8
7
 
9
8
  # A Search instance is considered a saved search if it has a user_id.
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  class SolrDocument
3
4
  include Blacklight::Solr::Document
4
5
  end
@@ -29,7 +29,7 @@ module Blacklight
29
29
  end
30
30
 
31
31
  def remove_href(path = search_state)
32
- view_context.search_action_path(path.reset_search(clause: path.clause_params.except(key)).to_h)
32
+ view_context.search_action_path(path.reset_search(clause: path.clause_params.except(key)))
33
33
  end
34
34
 
35
35
  private
@@ -79,10 +79,8 @@ module Blacklight
79
79
 
80
80
  fields += ['format'] if fields.empty? # backwards compatibility with the old default value for display_type_field
81
81
 
82
- display_type = fields.lazy.map { |field| field_presenter(field_config(field)) }.detect(&:any?)&.values
83
- display_type ||= Array(default) if default
84
-
85
- display_type || []
82
+ display_type = fields.lazy.map { |field| field_presenter(display_fields[field] || Configuration::NullDisplayField.new(field)) }.detect(&:any?)&.values
83
+ display_type || Array(default)
86
84
  end
87
85
 
88
86
  ##
@@ -118,7 +116,7 @@ module Blacklight
118
116
  end
119
117
 
120
118
  def view_config
121
- @view_config ||= show_view_config
119
+ show_view_config
122
120
  end
123
121
 
124
122
  def show_view_config
@@ -132,29 +130,23 @@ module Blacklight
132
130
 
133
131
  private
134
132
 
135
- def render_field?(field_config)
136
- field_presenter(field_config).render_field?
137
- end
138
- deprecation_deprecate render_field?: 'Use FieldPresenter#render_field?'
139
-
140
- def has_value?(field_config)
141
- field_presenter(field_config).any?
133
+ # @return [Hash<String,Configuration::Field>]
134
+ def fields
135
+ @fields ||= Array(display_type).inject(display_fields) do |fields, display_type|
136
+ fields.merge(display_fields(configuration.for_display_type(display_type)))
137
+ end
142
138
  end
143
- deprecation_deprecate has_value?: 'Use FieldPresenter#any?'
144
139
 
145
- def field_values(field_config, options = {})
146
- field_value(field_config, options)
140
+ def display_fields(config = configuration)
141
+ config[view_config.document_fields_key || :index_fields]
147
142
  end
148
- deprecation_deprecate field_values: 'Use #field_value'
149
143
 
150
- def retrieve_values(field_config)
151
- field_presenter(field_config).values
144
+ def field_config(field)
145
+ fields.fetch(field) { Configuration::NullDisplayField.new(field) }
152
146
  end
153
- deprecation_deprecate retrieve_values: 'Use FieldPresenter#values'
154
147
 
155
148
  def field_presenter(field_config, options = {})
156
- presenter_class = field_config.presenter || Blacklight::FieldPresenter
157
- presenter_class.new(view_context, document, field_config, options.merge(field_presenter_options))
149
+ field_config.presenter.new(view_context, document, field_config, field_presenter_options.merge(options))
158
150
  end
159
151
 
160
152
  def field_presenter_options
@@ -15,15 +15,11 @@ module Blacklight
15
15
  end
16
16
 
17
17
  def collapsed?
18
- Deprecation.silence(Blacklight::FacetsHelperBehavior) do
19
- view_context.should_collapse_facet?(facet_field)
20
- end
18
+ !active? && facet_field.collapse
21
19
  end
22
20
 
23
21
  def active?
24
- Deprecation.silence(Blacklight::FacetsHelperBehavior) do
25
- view_context.facet_field_in_params?(key)
26
- end
22
+ search_state.filter(facet_field).any?
27
23
  end
28
24
 
29
25
  def in_modal?
@@ -44,20 +40,49 @@ module Blacklight
44
40
  search_state&.filter(facet_field)&.values || []
45
41
  end
46
42
 
47
- # @private
48
- # @deprecated
49
- def html_id
50
- Deprecation.silence(Blacklight::FacetsHelperBehavior) do
51
- view_context.facet_field_id(facet_field)
52
- end
43
+ # Appease rubocop rules by implementing #each_value
44
+ def each_value(&block)
45
+ values.each(&block)
53
46
  end
54
47
 
55
48
  def paginator
56
49
  return unless display_facet
57
50
 
58
- Deprecation.silence(Blacklight::Facet) do
59
- @paginator ||= view_context.facet_paginator(facet_field, display_facet)
51
+ @paginator ||= blacklight_config.facet_paginator_class.new(
52
+ display_facet.items,
53
+ sort: display_facet.sort,
54
+ offset: display_facet.offset,
55
+ prefix: display_facet.prefix,
56
+ limit: facet_limit
57
+ )
58
+ end
59
+
60
+ DEFAULT_FACET_LIMIT = 10
61
+
62
+ # Look up facet limit for given facet_field. Will look at config, and
63
+ # if config is 'true' will look up from Solr @response if available. If
64
+ # no limit is available, returns nil. Used from #add_facetting_to_solr
65
+ # to supply f.fieldname.facet.limit values in solr request (no @response
66
+ # available), and used in display (with @response available) to create
67
+ # a facet paginator with the right limit.
68
+ def facet_limit
69
+ return unless facet_field.limit
70
+
71
+ if @display_facet
72
+ limit = @display_facet.limit
73
+
74
+ if limit.nil? # we didn't get or a set a limit, so infer one.
75
+ facet_field.limit if facet_field.limit != true
76
+ elsif limit == -1 # limit -1 is solr-speak for unlimited
77
+ nil
78
+ else
79
+ limit.to_i - 1 # we added 1 to find out if we needed to paginate
80
+ end
81
+ else
82
+ facet_field.limit == true ? DEFAULT_FACET_LIMIT : facet.limit
60
83
  end
61
84
  end
85
+
86
+ delegate :blacklight_config, to: :search_state
62
87
  end
63
88
  end
@@ -7,12 +7,8 @@ module Blacklight
7
7
  delegate :key, to: :facet_config
8
8
 
9
9
  def initialize(group, facet_item, facet_config, view_context, facet_field, search_state = view_context.search_state)
10
+ super(facet_item, facet_config, view_context, facet_field, search_state)
10
11
  @group = group
11
- @facet_item = facet_item
12
- @facet_config = facet_config
13
- @view_context = view_context
14
- @facet_field = facet_field
15
- @search_state = search_state
16
12
  end
17
13
 
18
14
  ##
@@ -0,0 +1,60 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Blacklight
4
+ class FacetItemPivotPresenter < FacetItemPresenter
5
+ ##
6
+ # Check if the query parameters have the given facet field with the
7
+ # given value.
8
+ def selected?
9
+ search_state.filter(facet_config).include?(facet_item)
10
+ end
11
+
12
+ def shown?
13
+ selected? || facet_item_presenters.any? { |x| x.try(:shown?) }
14
+ end
15
+
16
+ def field_label
17
+ facet_field_presenter.label
18
+ end
19
+
20
+ def facet_item_presenters
21
+ return to_enum(:facet_item_presenters) unless block_given?
22
+ return [] unless items
23
+
24
+ items.each { |i| yield facet_item_presenter(i) }
25
+ end
26
+
27
+ def facet_item_presenter(facet_item)
28
+ facet_config.item_presenter.new(facet_item, facet_config, view_context, facet_field, search_state)
29
+ end
30
+
31
+ ##
32
+ # Get the displayable version of a facet's value
33
+ #
34
+ # @return [String]
35
+ def label
36
+ label_source = facet_item.respond_to?(:label) ? facet_item.label : facet_item
37
+ if facet_config.helper_method
38
+ view_context.public_send(facet_config.helper_method, label_source)
39
+ else
40
+ item_fq = label_source.respond_to?(:fq) ? label_source.fq : {}
41
+ item_fq = item_fq.symbolize_keys
42
+ label_value = facet_config.pivot.map(&:to_sym).map { |k| item_fq[k] }
43
+ if label_source.respond_to?(:field)
44
+ label_value << value
45
+ else
46
+ label_value.unshift value
47
+ end
48
+ label_value.compact.join(" » ")
49
+ end
50
+ end
51
+
52
+ def value
53
+ if facet_item.respond_to? :value
54
+ facet_item.value
55
+ else
56
+ facet_item
57
+ end
58
+ end
59
+ end
60
+ end
@@ -30,9 +30,7 @@ module Blacklight
30
30
  # Check if the query parameters have the given facet field with the
31
31
  # given value.
32
32
  def selected?
33
- Deprecation.silence(Blacklight::SearchState) do
34
- search_state.has_facet? facet_config, value: value
35
- end
33
+ search_state.filter(facet_config).include?(value)
36
34
  end
37
35
 
38
36
  def field_label
@@ -44,8 +42,6 @@ module Blacklight
44
42
  #
45
43
  # @return [String]
46
44
  def label
47
- return @view_context.facet_display_value(@facet_field, @facet_item) unless @view_context.method(:facet_display_value).owner == Blacklight::FacetsHelperBehavior
48
-
49
45
  label_value = if facet_item.respond_to? :label
50
46
  facet_item.label
51
47
  else
@@ -62,7 +58,7 @@ module Blacklight
62
58
  localization_options = facet_config.date == true ? {} : facet_config.date
63
59
  I18n.l(Time.zone.parse(label_value), **localization_options)
64
60
  else
65
- label_value
61
+ label_value.to_s
66
62
  end
67
63
  end
68
64
 
@@ -92,9 +88,7 @@ module Blacklight
92
88
 
93
89
  # @private
94
90
  def remove_href(path = search_state)
95
- Deprecation.silence(Blacklight::SearchState) do
96
- view_context.search_action_path(path.remove_facet_params(facet_config.key, facet_item))
97
- end
91
+ view_context.search_action_path(path.filter(facet_config.key).remove(facet_item))
98
92
  end
99
93
 
100
94
  # @private
@@ -30,6 +30,7 @@ module Blacklight
30
30
  end
31
31
 
32
32
  attr_reader :view_context, :document, :field_config, :except_operations, :options
33
+
33
34
  delegate :key, :component, to: :field_config
34
35
 
35
36
  # @return [String]