rusackas commented on code in PR #41346:
URL: https://github.com/apache/superset/pull/41346#discussion_r3534135902
##########
superset-frontend/plugins/plugin-chart-ag-grid-table/src/buildQuery.ts:
##########
@@ -222,11 +233,24 @@ const buildQuery: BuildQuery<TableChartFormData> = (
}
if (!isDownloadQuery && formDataCopy.server_pagination) {
- const pageSize = ownState.pageSize ?? formDataCopy.server_page_length;
- const currentPage = ownState.currentPage ?? 0;
-
- moreProps.row_limit = pageSize;
- moreProps.row_offset = currentPage * pageSize;
+ // Never page past the configured row limit. Clamping the page to the
last
+ // one that still falls within the limit keeps the request inside the cap
+ // and avoids emitting row_limit: 0, which the backend treats as
+ // "no limit" rather than "no rows" (see helpers.py get_sqla_query).
+ const lastPage =
+ configuredRowLimit > 0 && pageSize > 0
+ ? Math.max(Math.ceil(configuredRowLimit / pageSize) - 1, 0)
+ : Number(ownState.currentPage) || 0;
+ const currentPage = Math.min(Number(ownState.currentPage) || 0,
lastPage);
+ const rowOffset = currentPage * pageSize;
+ const remainingRows =
+ configuredRowLimit > 0
+ ? Math.max(configuredRowLimit - rowOffset, 0)
+ : pageSize;
+
+ moreProps.row_limit =
+ configuredRowLimit > 0 ? Math.min(pageSize, remainingRows) : pageSize;
+ moreProps.row_offset = rowOffset;
Review Comment:
Good catch, `pageSize: 0` (no pagination) hit the same math and collapsed
`row_limit` to 0 too. Fixed to fall back to the configured row limit in that
case, added tests, pushed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
