diff --git a/packages/backend/src/controllers/api/v1/admin/users/get-users.ee.js b/packages/backend/src/controllers/api/v1/admin/users/get-users.ee.js index 1115404e..64588151 100644 --- a/packages/backend/src/controllers/api/v1/admin/users/get-users.ee.js +++ b/packages/backend/src/controllers/api/v1/admin/users/get-users.ee.js @@ -1,6 +1,6 @@ import { renderObject } from '../../../../../helpers/renderer.js'; import User from '../../../../../models/user.js'; -import paginateRest from '../../../../../helpers/pagination-rest.js'; +import paginateRest from '../../../../../helpers/pagination.js'; export default async (request, response) => { const usersQuery = User.query() diff --git a/packages/backend/src/controllers/api/v1/apps/get-flows.js b/packages/backend/src/controllers/api/v1/apps/get-flows.js index 3fa79a7c..21f58295 100644 --- a/packages/backend/src/controllers/api/v1/apps/get-flows.js +++ b/packages/backend/src/controllers/api/v1/apps/get-flows.js @@ -1,6 +1,6 @@ import { renderObject } from '../../../../helpers/renderer.js'; import App from '../../../../models/app.js'; -import paginateRest from '../../../../helpers/pagination-rest.js'; +import paginateRest from '../../../../helpers/pagination.js'; export default async (request, response) => { const app = await App.findOneByKey(request.params.appKey); diff --git a/packages/backend/src/controllers/api/v1/connections/get-flows.js b/packages/backend/src/controllers/api/v1/connections/get-flows.js index b48a80af..c2b1069a 100644 --- a/packages/backend/src/controllers/api/v1/connections/get-flows.js +++ b/packages/backend/src/controllers/api/v1/connections/get-flows.js @@ -1,5 +1,5 @@ import { renderObject } from '../../../../helpers/renderer.js'; -import paginateRest from '../../../../helpers/pagination-rest.js'; +import paginateRest from '../../../../helpers/pagination.js'; export default async (request, response) => { const flowsQuery = request.currentUser.authorizedFlows diff --git a/packages/backend/src/controllers/api/v1/executions/get-execution-steps.js b/packages/backend/src/controllers/api/v1/executions/get-execution-steps.js index f90d243b..e4fdb25c 100644 --- a/packages/backend/src/controllers/api/v1/executions/get-execution-steps.js +++ b/packages/backend/src/controllers/api/v1/executions/get-execution-steps.js @@ -1,5 +1,5 @@ import { renderObject } from '../../../../helpers/renderer.js'; -import paginateRest from '../../../../helpers/pagination-rest.js'; +import paginateRest from '../../../../helpers/pagination.js'; export default async (request, response) => { const execution = await request.currentUser.authorizedExecutions diff --git a/packages/backend/src/controllers/api/v1/executions/get-executions.js b/packages/backend/src/controllers/api/v1/executions/get-executions.js index 7d86c789..474b0c87 100644 --- a/packages/backend/src/controllers/api/v1/executions/get-executions.js +++ b/packages/backend/src/controllers/api/v1/executions/get-executions.js @@ -1,5 +1,5 @@ import { renderObject } from '../../../../helpers/renderer.js'; -import paginateRest from '../../../../helpers/pagination-rest.js'; +import paginateRest from '../../../../helpers/pagination.js'; export default async (request, response) => { const executionsQuery = request.currentUser.authorizedExecutions diff --git a/packages/backend/src/controllers/api/v1/flows/get-flows.js b/packages/backend/src/controllers/api/v1/flows/get-flows.js index 4cac62e0..db2e8e23 100644 --- a/packages/backend/src/controllers/api/v1/flows/get-flows.js +++ b/packages/backend/src/controllers/api/v1/flows/get-flows.js @@ -1,5 +1,5 @@ import { renderObject } from '../../../../helpers/renderer.js'; -import paginateRest from '../../../../helpers/pagination-rest.js'; +import paginateRest from '../../../../helpers/pagination.js'; export default async (request, response) => { await request.currentUser.hasFolderAccess(request.body.folderId); diff --git a/packages/backend/src/helpers/pagination-rest.js b/packages/backend/src/helpers/pagination-rest.js deleted file mode 100644 index 89239d85..00000000 --- a/packages/backend/src/helpers/pagination-rest.js +++ /dev/null @@ -1,25 +0,0 @@ -const paginateRest = async (query, page) => { - const pageSize = 10; - - page = parseInt(page, 10); - - if (isNaN(page) || page < 1) { - page = 1; - } - - const [records, count] = await Promise.all([ - query.limit(pageSize).offset((page - 1) * pageSize), - query.resultSize(), - ]); - - return { - pageInfo: { - currentPage: page, - totalPages: Math.ceil(count / pageSize), - }, - totalCount: count, - records, - }; -}; - -export default paginateRest; diff --git a/packages/backend/src/helpers/pagination.js b/packages/backend/src/helpers/pagination.js index 419df03f..89239d85 100644 --- a/packages/backend/src/helpers/pagination.js +++ b/packages/backend/src/helpers/pagination.js @@ -1,23 +1,25 @@ -const paginate = async (query, limit, offset) => { - if (limit < 1 || limit > 100) { - throw new Error('Limit must be between 1 and 100'); +const paginateRest = async (query, page) => { + const pageSize = 10; + + page = parseInt(page, 10); + + if (isNaN(page) || page < 1) { + page = 1; } const [records, count] = await Promise.all([ - query.limit(limit).offset(offset), + query.limit(pageSize).offset((page - 1) * pageSize), query.resultSize(), ]); return { pageInfo: { - currentPage: Math.ceil(offset / limit + 1), - totalPages: Math.ceil(count / limit), + currentPage: page, + totalPages: Math.ceil(count / pageSize), }, totalCount: count, - edges: records.map((record) => ({ - node: record, - })), + records, }; }; -export default paginate; +export default paginateRest;