MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updating pagination method.

This commit is contained in:
mike12345567 2024-05-23 14:37:41 +01:00
parent 99536c2d0b
commit 90d646facb
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/pro

@ -1 +1 @@
Subproject commit 78b08caab8d83e03c5a4dde07e2e823dbb5d184f Subproject commit 58338686c65024eb4140bb53965b618d9d647ec0

13
packages/server/src/sdk/app/rows/search/sqs.ts
View File

@ -177,7 +177,7 @@ export async function search(
const limit = params.limit const limit = params.limit
if (paginate && params.limit) { if (paginate && params.limit) {
request.paginate = { request.paginate = {
limit: params.limit, limit: params.limit + 1,
page: bookmark, page: bookmark,
} }
} }
@ -195,6 +195,12 @@ export async function search(
} }
) )
// check for pagination final row
let nextRow: Row | undefined
if (paginate && params.limit && processed.length > params.limit) {
nextRow = processed.pop()
}
// get the rows // get the rows
let finalRows = await outputProcessing<Row[]>(table, processed, { let finalRows = await outputProcessing<Row[]>(table, processed, {
preserveLinks: true, preserveLinks: true,
@ -217,10 +223,7 @@ export async function search(
limit: 1, limit: 1,
page: bookmark * prevLimit + 1, page: bookmark * prevLimit + 1,
} }
// check if there is another row const hasNextPage = !!nextRow
const nextRow = await runSqlQuery(request, allTables)
// check if there is a row found
const hasNextPage = Array.isArray(nextRow) && nextRow.length >= 1
response.hasNextPage = hasNextPage response.hasNextPage = hasNextPage
if (hasNextPage) { if (hasNextPage) {
response.bookmark = bookmark + 1 response.bookmark = bookmark + 1