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

chore: Remove old pagination helper for GraphQL

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

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

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

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

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

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

packages/backend/src/helpers/pagination-rest.js

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

packages/backend/src/helpers/pagination.js

@@ -1,23 +1,25 @@
-const paginate = async (query, limit, offset) => {
+const paginateRest = async (query, page) => {
-  if (limit < 1 || limit > 100) {
+  const pageSize = 10;
-    throw new Error('Limit must be between 1 and 100');
+
+  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),
+      currentPage: page,
-      totalPages: Math.ceil(count / limit),
+      totalPages: Math.ceil(count / pageSize),
     },
     totalCount: count,
-    edges: records.map((record) => ({
+    records,
-      node: record,
-    })),
   };
 };
 
-export default paginate;
+export default paginateRest;