josh/automatisch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2407 from automatisch/remove-old-pagination

Browse Source 
chore: Remove old pagination helper for GraphQL
This commit is contained in:
Ömer Faruk Aydın
2025-03-20 15:43:40 +01:00
committed by GitHub
parent 82dd79e106 d1d8cc9e4b
commit 911458ef4b
8 changed files with 18 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/src/controllers/api/v1/admin/users/get-users.ee.js
View File

@@ -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()

2
packages/backend/src/controllers/api/v1/apps/get-flows.js
View File

@@ -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);

2
packages/backend/src/controllers/api/v1/connections/get-flows.js
View File

@@ -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

2
packages/backend/src/controllers/api/v1/executions/get-execution-steps.js
View File

@@ -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

2
packages/backend/src/controllers/api/v1/executions/get-executions.js
View File

@@ -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

2
packages/backend/src/controllers/api/v1/flows/get-flows.js
View File

@@ -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);

25
packages/backend/src/helpers/pagination-rest.js
View File

@@ -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;

22
packages/backend/src/helpers/pagination.js
View File

@@ -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;