From c6209c10dd64b0245606eb61ddcd9d88519a0267 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 17 Jun 2021 15:56:41 +0100 Subject: [PATCH] Implementing pagination. --- .../src/api/controllers/row/external.js | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/packages/server/src/api/controllers/row/external.js b/packages/server/src/api/controllers/row/external.js index 58140faa7e..5f04e84d37 100644 --- a/packages/server/src/api/controllers/row/external.js +++ b/packages/server/src/api/controllers/row/external.js @@ -193,16 +193,21 @@ exports.search = async ctx => { const appId = ctx.appId const tableId = ctx.params.tableId const { paginate, query, ...params } = ctx.request.body + let { bookmark, limit } = params + if (!bookmark && paginate) { + bookmark = 1 + } let paginateObj = {} + if (paginate) { paginateObj = { - limit: params.limit, - // todo: need to handle bookmarks - page: params.bookmark, + // add one so we can track if there is another page + limit: limit, + page: bookmark, } - } else if (params && params.limit) { + } else if (params && limit) { paginateObj = { - limit: params.limit, + limit: limit, } } let sort @@ -220,8 +225,20 @@ exports.search = async ctx => { sort, paginate: paginateObj, }) + let hasNextPage = false + if (paginate && rows.length === limit) { + const nextRows = await handleRequest(appId, DataSourceOperation.READ, tableId, { + filters: query, + sort, + paginate: { + limit: 1, + page: bookmark + 1, + } + }) + hasNextPage = nextRows.length > 0 + } // need wrapper object for bookmarks etc when paginating - return { rows } + return { rows, hasNextPage, bookmark: bookmark + 1 } } exports.validate = async () => {