From b36372a0378555e52acf3450694b20c3e06d7d13 Mon Sep 17 00:00:00 2001 From: Chris Beer Date: Thu, 16 Jun 2022 15:47:39 -0700 Subject: [PATCH] Refactor SearchContextComponent to include some more extension points for downstream implementations --- .../blacklight/search_context_component.html.erb | 4 ++-- app/components/blacklight/search_context_component.rb | 8 ++++---- app/helpers/blacklight/url_helper_behavior.rb | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/components/blacklight/search_context_component.html.erb b/app/components/blacklight/search_context_component.html.erb index 5757e3763b..dbe9ae9fc4 100644 --- a/app/components/blacklight/search_context_component.html.erb +++ b/app/components/blacklight/search_context_component.html.erb @@ -1,10 +1,10 @@
diff --git a/app/components/blacklight/search_context_component.rb b/app/components/blacklight/search_context_component.rb index 210b51363e..e7d8bb59a3 100644 --- a/app/components/blacklight/search_context_component.rb +++ b/app/components/blacklight/search_context_component.rb @@ -19,15 +19,15 @@ def item_page_entry_info end end - def link_to_previous_document(*args) + def link_to_previous_document(document = nil, *args, **kwargs) Deprecation.silence(Blacklight::UrlHelperBehavior) do - helpers.link_to_previous_document(*args) + helpers.link_to_previous_document(document || @search_context[:prev], *args, **kwargs) end end - def link_to_next_document(*args) + def link_to_next_document(document = nil, *args, **kwargs) Deprecation.silence(Blacklight::UrlHelperBehavior) do - helpers.link_to_next_document(*args) + helpers.link_to_next_document(document || @search_context[:next], *args, **kwargs) end end end diff --git a/app/helpers/blacklight/url_helper_behavior.rb b/app/helpers/blacklight/url_helper_behavior.rb index 6e9465bd20..2ff13a8c8d 100644 --- a/app/helpers/blacklight/url_helper_behavior.rb +++ b/app/helpers/blacklight/url_helper_behavior.rb @@ -52,8 +52,8 @@ def document_link_params(doc, opts) ## # Link to the previous document in the current search context # @deprecated - def link_to_previous_document(previous_document) - link_opts = session_tracking_params(previous_document, search_session['counter'].to_i - 1).merge(class: "previous", rel: 'prev') + def link_to_previous_document(previous_document, classes: 'previous', **addl_link_opts) + link_opts = session_tracking_params(previous_document, search_session['counter'].to_i - 1).merge(class: classes, rel: 'prev').merge(addl_link_opts) link_to_unless previous_document.nil?, raw(t('views.pagination.previous')), url_for_document(previous_document), link_opts do tag.span raw(t('views.pagination.previous')), class: 'previous' end @@ -63,8 +63,8 @@ def link_to_previous_document(previous_document) ## # Link to the next document in the current search context # @deprecated - def link_to_next_document(next_document) - link_opts = session_tracking_params(next_document, search_session['counter'].to_i + 1).merge(class: "next", rel: 'next') + def link_to_next_document(next_document, classes: 'next', **addl_link_opts) + link_opts = session_tracking_params(next_document, search_session['counter'].to_i + 1).merge(class: classes, rel: 'next').merge(addl_link_opts) link_to_unless next_document.nil?, raw(t('views.pagination.next')), url_for_document(next_document), link_opts do tag.span raw(t('views.pagination.next')), class: 'next' end