Merge pull request #4480 from pulibrary/i4187_previous_next_to_view_c…

…omponent Use ServerItemPaginationComponent
pulibrary · Oct 29, 2024 · 7012c04 · 7012c04
2 parents 97e4a21 + 0f508f1
commit 7012c04
Show file tree

Hide file tree

Showing 10 changed files with 97 additions and 63 deletions.
diff --git a/app/assets/stylesheets/components/buttons.scss b/app/assets/stylesheets/components/buttons.scss
@@ -71,8 +71,8 @@ a.clear-bookmarks, a.clear-search-history {
 .pagination-search-widgets .btn-default,
 .search-widgets button,
 .browse-header button,
-#sortAndPerPage .page_links .prev a,
-#sortAndPerPage .page_links .next a,
+#sortAndPerPage .page-links .prev a,
+#sortAndPerPage .page-links .next a,
 .prev.is-disabled,
 .next.is-disabled,
 .pagination-search-widgets .previous,

diff --git a/app/assets/stylesheets/components/pagination.scss b/app/assets/stylesheets/components/pagination.scss
@@ -26,7 +26,7 @@ ul.pagination {
   padding: 0;
 }
 
-.pagination-search-widgets .page_links {
+.pagination-search-widgets .page-links {
   padding: 0;
   border: 0;
   display: inline-block;
@@ -52,7 +52,7 @@ ul.pagination {
     }
   }
 
-  .page_links {
+  .page-links {
     padding: 10px 0;
     border: 0;
 

diff --git a/app/components/blacklight/search_context/server_item_pagination_component.html.erb b/app/components/blacklight/search_context/server_item_pagination_component.html.erb
@@ -0,0 +1,11 @@
+<%# This can be removed after migrating to Blacklight 8 %>
+<div class='pagination-search-widgets'>
+
+  <div class="page-links">
+    <%= link_to_previous_document %> |
+
+    <%= item_page_entry_info %> |
+
+    <%= link_to_next_document %>
+  </div>
+</div>
diff --git a/app/components/blacklight/search_context/server_item_pagination_component.rb b/app/components/blacklight/search_context/server_item_pagination_component.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# This can be removed after migrating to Blacklight 8
+module Blacklight
+  module SearchContext
+    # This class makes the ServerItemPaginationComponent that is present in Blacklight 8
+    # available while we are still on Blacklight 7
+    class ServerItemPaginationComponent < Blacklight::SearchContextComponent
+      with_collection_parameter :search_context
+
+      def initialize(search_context:, search_session:, current_document:)
+        @search_context = search_context
+        @search_session = search_session
+        @current_document_id = current_document.id
+      end
+    end
+  end
+end
diff --git a/app/components/orangelight/search_context/server_item_pagination_component.html.erb b/app/components/orangelight/search_context/server_item_pagination_component.html.erb
@@ -0,0 +1,5 @@
+<div class="page-links">
+  <%= link_to_previous_document %>
+  <%= link_to_next_document %>
+  <%= item_page_entry_info %>
+</div>
diff --git a/app/components/orangelight/search_context/server_item_pagination_component.rb b/app/components/orangelight/search_context/server_item_pagination_component.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Orangelight::SearchContext::ServerItemPaginationComponent < Blacklight::SearchContext::ServerItemPaginationComponent
+end
diff --git a/app/views/catalog/_previous_next_doc.html.erb b/app/views/catalog/_previous_next_doc.html.erb
@@ -1,57 +1 @@
-<% #Using the Bootstrap Pagination class  -%>
-<div class='pagination-search-widgets col'>
-  <div class="row">
-    <div class="col-xs-12 px-4">
-      <div class="button--start-over">
-        <%= render_start_over_link(root_path) %>
-      </div>
-      <% if @search_context %>
-        <% if @search_context[:prev] || @search_context[:next] %>
-          <%= link_back_to_catalog_safe class: 'btn btn-default button--back-to-search', label:  t('blacklight.back_to_search').html_safe %>
-          <div class="page_links">
-            <%= link_to_previous_document @search_context[:prev] %>
-            <%= link_to_next_document @search_context[:next] %>
-            <%= item_page_entry_info %>
-          </div>
-        <% end %>
-      <% end %>
-    </div>
-    <div class="search-widgets col pr-4">
-      <ul class="navbar navbar-nav pull-right">
-        <% if @document.alma_record? || @document.scsb_record? %>
-          <li>
-            <%= render_cite_link(citation_solr_document_path(id: @document)) %>
-          </li>
-        <% end %>
-        <li class="dropdown">
-          <button class="btn btn-outline-primary dropdown-toggle" data-toggle="dropdown"><span class="icon-share" aria-hidden="true"></span> Send <span class="d-none d-lg-inline">to <span class="caret"></span></span></button>
-          <ul class="dropdown-menu position-absolute">
-            <li class="sms">
-              <%= link_to "SMS", sms_solr_document_path(:id => @document), {:id => 'smsLink', :data => {:blacklight_modal => "trigger"}, class: "icon-mobile dropdown-item", rel: 'nofollow'} %>
-            </li>
-            <li class="email">
-              <%= link_to "Email", email_solr_document_path(:id => @document), {:id => 'emailLink', :data => {:blacklight_modal => "trigger"}, class: "icon-email dropdown-item", rel: 'nofollow'} %>
-            </li>
-            <% if @document.alma_record? %>
-              <li class="endnote">
-                <%= link_to "EndNote", solr_document_path(@document, :format => 'endnote'), rel: 'nofollow', class: "icon-external dropdown-item" %>
-              </li>
-              <li class="refworks">
-                <%= link_to "RefWorks", refworks_export_url({url: polymorphic_url(search_state.url_for_document(@document), format: :refworks_marc_txt, only_path: false)}), rel: 'nofollow', class: "icon-external dropdown-item", :target => "_blank"  %>
-              </li>
-              <li class="ris">
-              <%= link_to 'RIS', solr_document_path(@document, :format => 'ris'), rel: 'nofollow', class: "icon-external dropdown-item" %>
-              </li>
-            <% end %>
-            <li class="print">
-              <a href="javascript:if(window.print)window.print()" class="dropdown-item"><span class="icon-print" aria-hidden="true"></span>Printer</a>
-            </li>
-          </ul>
-        </li>
-        <li>
-          <%= render BookmarkButtonComponent.new(document: @document) if current_or_guest_user %>
-        </li>
-      </ul>
-    </div>
-  </div>
-</div>
+<%= render(Orangelight::SearchContext::ServerItemPaginationComponent.new(search_context: @search_context, search_session: search_session, current_document: @document)) %>
diff --git a/app/views/catalog/_show_tools.html.erb b/app/views/catalog/_show_tools.html.erb
@@ -0,0 +1,37 @@
+<div class="search-widgets col pr-4">
+  <ul class="navbar navbar-nav pull-right">
+    <% if @document.alma_record? || @document.scsb_record? %>
+      <li>
+        <%= render_cite_link(citation_solr_document_path(id: @document)) %>
+      </li>
+    <% end %>
+    <li class="dropdown">
+      <button class="btn btn-outline-primary dropdown-toggle" data-toggle="dropdown"><span class="icon-share" aria-hidden="true"></span> Send <span class="d-none d-lg-inline">to <span class="caret"></span></span></button>
+      <ul class="dropdown-menu position-absolute">
+        <li class="sms">
+          <%= link_to "SMS", sms_solr_document_path(:id => @document), {:id => 'smsLink', :data => {:blacklight_modal => "trigger"}, class: "icon-mobile dropdown-item", rel: 'nofollow'} %>
+        </li>
+        <li class="email">
+          <%= link_to "Email", email_solr_document_path(:id => @document), {:id => 'emailLink', :data => {:blacklight_modal => "trigger"}, class: "icon-email dropdown-item", rel: 'nofollow'} %>
+        </li>
+        <% if @document.alma_record? %>
+          <li class="endnote">
+            <%= link_to "EndNote", solr_document_path(@document, :format => 'endnote'), rel: 'nofollow', class: "icon-external dropdown-item" %>
+          </li>
+          <li class="refworks">
+            <%= link_to "RefWorks", refworks_export_url({url: polymorphic_url(search_state.url_for_document(@document), format: :refworks_marc_txt, only_path: false)}), rel: 'nofollow', class: "icon-external dropdown-item", :target => "_blank"  %>
+          </li>
+          <li class="ris">
+          <%= link_to 'RIS', solr_document_path(@document, :format => 'ris'), rel: 'nofollow', class: "icon-external dropdown-item" %>
+          </li>
+        <% end %>
+        <li class="print">
+          <a href="javascript:if(window.print)window.print()" class="dropdown-item"><span class="icon-print" aria-hidden="true"></span>Printer</a>
+        </li>
+      </ul>
+    </li>
+    <li>
+      <%= render BookmarkButtonComponent.new(document: @document) if current_or_guest_user %>
+    </li>
+  </ul>
+</div>
diff --git a/app/views/catalog/_sort_and_per_page.html.erb b/app/views/catalog/_sort_and_per_page.html.erb
@@ -1,6 +1,6 @@
 <div id="sortAndPerPage" class="clearfix">
   <div class="pagination-rss pull-left">
-    <div class="page_links">
+    <div class="page-links">
     <%= render :partial => "paginate_compact", :object => @response if show_pagination? %>
     <%= link_to(" ", search_catalog_path(params.permit!.merge(format: 'atom',
                 sort: 'cataloged_tdt desc, pub_date_start_sort desc, title_sort asc').except(:controller, :action)),

diff --git a/app/views/catalog/show.html.erb b/app/views/catalog/show.html.erb
@@ -1,4 +1,19 @@
-<%= render 'previous_next_doc' %>
+<% #Using the Bootstrap Pagination class  -%>
+<div class='pagination-search-widgets col'>
+  <div class="row">
+    <div class="col-xs-12 px-4">
+      <div class="button--start-over">
+        <%= render_start_over_link(root_path) %>
+      </div>
+      <% if @search_context %>
+          <%= link_back_to_catalog_safe class: 'btn btn-default button--back-to-search', label:  t('blacklight.back_to_search').html_safe %>
+          <%= render 'previous_next_doc' %>
+      <% end %>
+    </div>
+    <%= render 'show_tools' %>
+  </div>
+</div>
+
 <div id="main-content" class="col-12 main-content" data-host-id="<%= @document.host_id %>">
   <div id="sidebar" class="<%= render_document_class %>">
     <%= render_document_sidebar_partial(@document) %>