Merge pull request #152 from developmentseed/patch/fix-collections-links

fix collection prev and other links

Author: vincentsarago

CHANGES.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 Note: Minor version `0.X.0` update might break the API, It's recommended to pin `tipg` to minor version: `tipg>=0.1,<0.2`
 
+## [0.5.6] - 2023-12-19
+
+- Fix collections `prev` links and collections html templates
+
 ## [0.5.5] - 2023-12-19
 
 - Fix `prev` offset value

tipg/dependencies.py

@@ -503,5 +503,5 @@ def CollectionsParams(
         collections=collections_list,
         matched=matched,
         next=offset + returned if matched - returned > offset else None,
-        prev=max(offset - returned, 0) if offset else None,
+        prev=max(offset - limit, 0) if offset else None,
     )

tipg/factory.py

@@ -449,9 +449,8 @@ def collections(
                 qp = dict(request.query_params)
                 qp.pop("offset", None)
                 query_params = QueryParams({**qp, "offset": prev_token})
-
                 url = self.url_for(request, "collections")
-                if qp:
+                if query_params:
                     url += f"?{query_params}"
 
                 links.append(
@@ -830,7 +829,7 @@ async def items(  # noqa: C901
                 qp.pop("offset")
                 query_params = QueryParams({**qp, "offset": prev_token})
                 url = self.url_for(request, "items", collectionId=collection.id)
-                if qp:
+                if query_params:
                     url += f"?{query_params}"
 
                 links.append(

tipg/templates/collections.html

@@ -83,7 +83,7 @@ <h1>Collections</h1>
     // paging
     //
     var offset = 0; // defaults
-    var limit = 0;
+    var limit = 10;
 
     {% if "offset" in template.params %}
     offset = {{ template.params.offset }};
@@ -94,7 +94,7 @@ <h1>Collections</h1>
 
     var current_page = 1;
     if (limit > 0) {
-      current_page = (offset + limit)/limit;
+      current_page = Math.ceil((offset + limit) / limit);
     }
     $("#current_page").html(current_page);