fix bug where next param was missing when sortby was specified (#686)

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.5.0] - 2024-01-19
+
+### Fixed
+
+- When using sortby, next links were incorrect.
+
 ## [3.4.0] - 2023-12-15
 
 ### Changed
@@ -422,6 +428,7 @@ Initial release, forked from [sat-api](https://github.com/sat-utils/sat-api/tree
 Compliant with STAC 0.9.0
 
 <!-- [Unreleased]: https://github.com/stac-utils/stac-api/compare/v3.3.0...main -->
+[3.5.0]: https://github.com/stac-utils/stac-api/compare/v3.4.0...v3.5.0
 [3.4.0]: https://github.com/stac-utils/stac-api/compare/v3.3.0...v3.4.0
 [3.3.0]: https://github.com/stac-utils/stac-api/compare/v3.2.0...v3.3.0
 [3.2.0]: https://github.com/stac-utils/stac-api/compare/v3.1.0...v3.2.0

package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "stac-server",
   "description": "A STAC API running on stac-server",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "repository": "https://github.com/stac-utils/stac-server",
   "author": "Alireza Jazayeri, Matthew Hanson, Sean Harkins, Phil Varner",
   "license": "MIT",

src/lib/api.js

@@ -549,27 +549,29 @@ const buildPaginationLinks = function (limit, parameters, bbox, intersects, endp
 
     const lastItem = items[items.length - 1]
 
-    const nextKeys = sortby ? Object.keys(sortby) : ['properties.datetime', 'id', 'collection']
+    const nextKeys = sortby ? sortby.map((x) => x.field)
+      : ['properties.datetime', 'id', 'collection']
 
     const next = nextKeys.map((k) => getNested(lastItem, k)).join(',')
 
-    const nextParams = pickBy(assign(parameters, { bbox, intersects, limit, next }))
-
-    const link = {
-      rel: 'next',
-      title: 'Next page of Items',
-      method: httpMethod,
-      type: 'application/geo+json'
-    }
-    if (httpMethod === 'GET') {
-      const nextQueryParameters = dictToURI(nextParams)
-      link.href = `${endpoint}?${nextQueryParameters}`
-    } else if (httpMethod === 'POST') {
-      link.href = endpoint
-      link.merge = false
-      link.body = nextParams
+    if (next) {
+      const link = {
+        rel: 'next',
+        title: 'Next page of Items',
+        method: httpMethod,
+        type: 'application/geo+json'
+      }
+      const nextParams = pickBy(assign(parameters, { bbox, intersects, limit, next }))
+      if (httpMethod === 'GET') {
+        const nextQueryParameters = dictToURI(nextParams)
+        link.href = `${endpoint}?${nextQueryParameters}`
+      } else if (httpMethod === 'POST') {
+        link.href = endpoint
+        link.merge = false
+        link.body = nextParams
+      }
+      return [link]
     }
-    return [link]
   }
   return []
 }