fix cursor-based navigation

datacite · Jun 1, 2019 · 1c824a4 · 1c824a4
1 parent d776ead
commit 1c824a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/app/controllers/dois_controller.rb b/app/controllers/dois_controller.rb
@@ -161,13 +161,15 @@ def index
             subjects: subjects
           }.compact
 
+          logger.info page.inspect
+
           options[:links] = {
             self: request.original_url,
-            next: results.size < page[:size] ? nil : request.base_url + "/dois?" + {
+            next: results.size < page[:size] || page[:size] == 0 ? nil : request.base_url + "/dois?" + {
               query: params[:query],
               "provider-id" => params[:provider_id],
               "client-id" => params[:client_id],
-              "page[cursor]" => page[:cursor].present? ? Array.wrap(results.to_a.last.to_h[:sort]).first : nil,
+              "page[cursor]" => page[:cursor].present? ? Array.wrap(results.to_a.last[:sort]).first : nil,
               "page[number]" => page[:cursor].blank? && page[:number].present? ? page[:number] + 1 : nil,
               "page[size]" => page[:size] }.compact.to_query
             }.compact

diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb
@@ -71,15 +71,6 @@ def index
         page: page[:number]
       }.compact
 
-      options[:links] = {
-        self: request.original_url,
-        next: @dois.blank? ? nil : request.base_url + "/dois?" + {
-          query: params[:query],
-          "member-id" => params[:provider_id],
-          "data-center-id" => params[:client_id],
-          "page[cursor]" => page[:cursor].present? ? Array.wrap(@dois.to_a.last.to_h[:sort]).first : nil,
-          "page[size]" => page[:size] }.compact.to_query
-        }.compact
       options[:include] = @include
       options[:is_collection] = true
       options[:links] = nil