From f0a2f4a660dd7da3289fad214d2867b75704d1bd Mon Sep 17 00:00:00 2001 From: DarkPhoenix2704 Date: Thu, 29 Feb 2024 10:15:28 +0000 Subject: [PATCH] fix(nc-gui): pagination --- packages/nc-gui/composables/useSharedView.ts | 2 +- packages/nocodb/src/services/calendar-datas.service.ts | 1 + packages/nocodb/src/services/datas.service.ts | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/nc-gui/composables/useSharedView.ts b/packages/nc-gui/composables/useSharedView.ts index d7da18fb1c..c80ceabbfb 100644 --- a/packages/nc-gui/composables/useSharedView.ts +++ b/packages/nc-gui/composables/useSharedView.ts @@ -175,7 +175,7 @@ export function useSharedView() { return await $api.dbCalendarViewRow.publicDataCalendarRowList( sharedView.value.uuid!, { - limit: sharedView.value?.type === ViewTypes.MAP ? 1000 : undefined, + limit: sharedView.value?.type === ViewTypes.CALENDAR ? 3000 : undefined, ...param, filterArrJson: JSON.stringify(param.filtersArr ?? nestedFilters.value), sortArrJson: JSON.stringify(param.sortsArr ?? sorts.value), diff --git a/packages/nocodb/src/services/calendar-datas.service.ts b/packages/nocodb/src/services/calendar-datas.service.ts index 3d39978701..310eec31bd 100644 --- a/packages/nocodb/src/services/calendar-datas.service.ts +++ b/packages/nocodb/src/services/calendar-datas.service.ts @@ -173,6 +173,7 @@ export class CalendarDatasService { model, view, query, + ignorePagination: true, }); if (!data) NcError.notFound('Data not found'); diff --git a/packages/nocodb/src/services/datas.service.ts b/packages/nocodb/src/services/datas.service.ts index 9ea930e76e..8df03f60d5 100644 --- a/packages/nocodb/src/services/datas.service.ts +++ b/packages/nocodb/src/services/datas.service.ts @@ -190,6 +190,7 @@ export class DatasService { await baseModel.list(listArgs, { ignoreViewFilterAndSort, throwErrorIfInvalidParams: param.throwErrorIfInvalidParams, + ignorePagination: param.ignorePagination, }), {}, listArgs,