Skip to content

fix(pagination): allow a zero indexed page (improved) #1383

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

Open
mnoorenberghe wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix(pagination): allow a zero indexed page (improved) #1383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
963716e
fix(pagination): allow a zero indexed page
darrenvechain Nov 18, 2025
021d2f6
Allow initial page number to be 0
mnoorenberghe Nov 28, 2025
219b999
Allow 0 for pagination_param_page_value in the UI
mnoorenberghe Nov 28, 2025
fa919a6
Merge branch 'main' into pagination_zero-indexed-page
yesoreyeram Dec 4, 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
5 changes: 5 additions & 0 deletions .changeset/cold-comics-rest.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'grafana-infinity-datasource': patch
---

Allow zero indexed page number when using pagination
3 changes: 0 additions & 3 deletions pkg/infinity/remote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ func GetPaginatedResults(ctx context.Context, pCtx *backend.PluginContext, query
}
case models.PaginationModePage:
initialPageNumber := query.PageParamPageFieldVal
if initialPageNumber == 0 {
initialPageNumber = 1
}
for pageNumber := 0; pageNumber < query.PageMaxPages; pageNumber++ {
currentQuery := query
currentQuery = ApplyPaginationItemToQuery(currentQuery, query.PageParamSizeFieldType, query.PageParamSizeFieldName, fmt.Sprintf("%d", query.PageParamSizeFieldVal))
Expand Down
3 changes: 0 additions & 3 deletions pkg/models/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,6 @@ func ApplyDefaultsToQuery(ctx context.Context, pCtx *backend.PluginContext, quer
if query.PageParamPageFieldType == "" {
query.PageParamPageFieldType = PaginationParamTypeQuery
}
if query.PageParamPageFieldVal == 0 {
query.PageParamPageFieldVal = 1
}
}
if query.PageMode == PaginationModeCursor {
if query.PageParamCursorFieldName == "" {
Expand Down
8 changes: 5 additions & 3 deletions src/editors/query/query.pagination.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export const PaginationEditor = (props: PaginationEditorProps) => {
min={0}
width={30}
value={query.pagination_max_pages}
onChange={(e) => onChange({ ...query, pagination_max_pages: e.currentTarget.valueAsNumber || 1 })}
onChange={(e) => onChange({ ...query, pagination_max_pages: Number.isNaN(e.currentTarget.valueAsNumber) ? 1 : e.currentTarget.valueAsNumber })}
placeholder="1"
/>
</EditorField>
Expand Down Expand Up @@ -105,7 +105,8 @@ export const PaginationEditor = (props: PaginationEditorProps) => {
value={query.pagination_param_offset_value}
min={0}
max={2000}
onChange={(e) => onChange({ ...query, pagination_param_offset_value: e.currentTarget.valueAsNumber || 0 })}
onChange={(e) => onChange({ ...query, pagination_param_offset_value: Number.isNaN(e.currentTarget.valueAsNumber) ? 0 : e.currentTarget.valueAsNumber })}
placeholder="0"
></Input>
</Stack>
</EditorField>
Expand Down Expand Up @@ -135,7 +136,8 @@ export const PaginationEditor = (props: PaginationEditorProps) => {
type="number"
value={query.pagination_param_page_value}
min={0}
onChange={(e) => onChange({ ...query, pagination_param_page_value: e.currentTarget.valueAsNumber || 1 })}
onChange={(e) => onChange({ ...query, pagination_param_page_value: Number.isNaN(e.currentTarget.valueAsNumber) ? 1 : e.currentTarget.valueAsNumber })}
placeholder="1"
></Input>
</Stack>
</EditorField>
Expand Down
Loading