Skip to content

handle limit-offset in templates #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 25, 2025
Merged

handle limit-offset in templates #48

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
692d46a
handle limit-offset in templates
vincentsarago Mar 24, 2025
17d88c4
add back missing url
vincentsarago Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions runtimes/eoapi/stac/eoapi/stac/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"""eoapi-devseed: Custom pgstac client."""

import csv
import math
import re
from typing import (
Any,
Expand Down Expand Up @@ -363,21 +362,11 @@ async def all_collections(
)

if output_type == MimeTypes.html:
offset = int(request.query_params.get("offset") or 0)
limit = int(request.query_params.get("limit") or 10)

current_page = 1
if limit > 0:
current_page = math.ceil((offset + limit) / limit)

return create_html_response(
request,
collections,
template_name="collections",
title="Collections list",
current_page=current_page,
limit=limit,
offset=offset,
)

return collections
Expand Down Expand Up @@ -529,7 +518,6 @@ async def item_collection(
item_collection,
template_name="items",
title=f"{collection_id} items",
limit=limit,
)

elif output_type == MimeTypes.csv:
Expand Down
10 changes: 5 additions & 5 deletions runtimes/eoapi/stac/eoapi/stac/templates/collections.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h1>Collections</h1>
{% else %}
<div class="d-flex flex-row align-items-center mb-4 flex-wrap">
<div class="mr-3">
Showing {{ offset + 1 }} - {{ offset + response.numberReturned }} of {{ response.numberMatched }} collections
Showing {{ template.params.get("offset", 0)|int + 1 }} - {{ template.params.get("offset", 0)|int + response.numberReturned }} of {{ response.numberMatched }} collections
</div>

<form id="search-form" class="d-flex flex-wrap flex-grow-1" style="gap: 8px">
Expand All @@ -43,10 +43,10 @@ <h1>Collections</h1>
<div class="d-flex">
<label for="limit" class="mr-1 small">Page size:</label>
<select class="form-control form-control-sm" id="limit" aria-label="Select page size" style="width: 70px">
<option value="10" {% if limit == 10 %}selected{% endif %}>10</option>
<option value="25" {% if limit == 25 %}selected{% endif %}>25</option>
<option value="50" {% if limit == 50 %}selected{% endif %}>50</option>
<option value="100" {% if limit == 100 %}selected{% endif %}>100</option>
<option value="10" {% if template.params.get("limit", 10)|int == 10 %}selected{% endif %}>10</option>
<option value="25" {% if template.params.get("limit", 10)|int == 25 %}selected{% endif %}>25</option>
<option value="50" {% if template.params.get("limit", 10)|int == 50 %}selected{% endif %}>50</option>
<option value="100" {% if template.params.get("limit", 10)|int == 100 %}selected{% endif %}>100</option>
</select>
</div>

Expand Down
8 changes: 4 additions & 4 deletions runtimes/eoapi/stac/eoapi/stac/templates/items.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ <h1 class="my-4">
<div class="d-flex">
<label for="limit">Page size: </label>
<select class="form-control form-control-sm ml-1" id="limit" aria-label="Select page size"> <!-- TODO: dynamically populate the values based on oga_max_limit -->
<option value="10" {% if limit == 10 %}selected{% endif %}>10</option>
<option value="25" {% if limit == 25 %}selected{% endif %}>25</option>
<option value="50" {% if limit == 50 %}selected{% endif %}>50</option>
<option value="100" {% if limit == 100 %}selected{% endif %}>100</option>
<option value="10" {% if template.params.get("limit", 10)|int == 10 %}selected{% endif %}>10</option>
<option value="25" {% if template.params.get("limit", 10)|int == 25 %}selected{% endif %}>25</option>
<option value="50" {% if template.params.get("limit", 10)|int == 50 %}selected{% endif %}>50</option>
<option value="100" {% if template.params.get("limit", 10)|int == 100 %}selected{% endif %}>100</option>
</select>
</div>
{% if response.links|length > 0 %}
Expand Down