From 26f27efd75cfb07fc444b9c18ed3ca80ff95a388 Mon Sep 17 00:00:00 2001 From: Charlie Kolb Date: Fri, 12 Sep 2025 14:38:28 +0200 Subject: [PATCH] fix(core): Unify Data Table pagination (no-changelog) (#19467) --- .../src/modules/data-table/data-store-rows.repository.ts | 6 +++--- .../cli/src/modules/data-table/data-store.repository.ts | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/cli/src/modules/data-table/data-store-rows.repository.ts b/packages/cli/src/modules/data-table/data-store-rows.repository.ts index 2376893852..d262ebc143 100644 --- a/packages/cli/src/modules/data-table/data-store-rows.repository.ts +++ b/packages/cli/src/modules/data-table/data-store-rows.repository.ts @@ -1,4 +1,4 @@ -import type { ListDataStoreContentQueryDto, DataTableFilter } from '@n8n/api-types'; +import { ListDataStoreContentQueryDto, DataTableFilter } from '@n8n/api-types'; import { CreateTable, DslColumn } from '@n8n/db'; import { Service } from '@n8n/di'; import { @@ -549,7 +549,7 @@ export class DataStoreRowsRepository { } private applyPagination(query: QueryBuilder, dto: ListDataStoreContentQueryDto): void { - query.skip(dto.skip); - query.take(dto.take); + query.skip(dto.skip ?? 0); + if (dto.take) query.take(dto.take); } } diff --git a/packages/cli/src/modules/data-table/data-store.repository.ts b/packages/cli/src/modules/data-table/data-store.repository.ts index b0ee0766a0..bbf3f5525c 100644 --- a/packages/cli/src/modules/data-table/data-store.repository.ts +++ b/packages/cli/src/modules/data-table/data-store.repository.ts @@ -211,9 +211,7 @@ export class DataStoreRepository extends Repository { options: Partial, ): void { query.skip(options.skip ?? 0); - if (options?.take) { - query.skip(options.skip ?? 0).take(options.take); - } + if (query.take) query.take(options.take); } private applyDefaultSelect(query: SelectQueryBuilder): void {