From c747a63971403f9ba6c038b9ef8070000b2e8cf7 Mon Sep 17 00:00:00 2001 From: Raju Udava <86527202+dstala@users.noreply.github.com> Date: Sun, 23 Jun 2024 17:51:10 +0530 Subject: [PATCH] Nc fix/shared view opt query (#8833) * fix: use opt-query for shared view * fix: avoid duplicate api call if page size different from default --------- Co-authored-by: Pranav C --- packages/nc-gui/composables/useSharedView.ts | 4 ++-- packages/nc-gui/composables/useViewData.ts | 4 ++-- packages/nocodb/src/services/public-datas.service.ts | 6 +----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/nc-gui/composables/useSharedView.ts b/packages/nc-gui/composables/useSharedView.ts index 7b0231f92e..0f57158bd0 100644 --- a/packages/nc-gui/composables/useSharedView.ts +++ b/packages/nc-gui/composables/useSharedView.ts @@ -15,7 +15,7 @@ import { UITypes, ViewTypes } from 'nocodb-sdk' export function useSharedView() { const nestedFilters = ref<(FilterType & { status?: 'update' | 'delete' | 'create'; parentId?: string })[]>([]) - const { appInfo } = useGlobal() + const { appInfo, gridViewPageSize } = useGlobal() const baseStore = useBase() @@ -25,7 +25,7 @@ export function useSharedView() { const { base } = storeToRefs(baseStore) - const appInfoDefaultLimit = appInfo.value.defaultLimit || 25 + const appInfoDefaultLimit = gridViewPageSize.value || appInfo.value.defaultLimit || 25 const paginationData = useState('paginationData', () => ({ page: 1, diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts index be5c5a8c0b..e500780516 100644 --- a/packages/nc-gui/composables/useViewData.ts +++ b/packages/nc-gui/composables/useViewData.ts @@ -31,9 +31,9 @@ export function useViewData( const route = router.currentRoute - const { appInfo } = useGlobal() + const { appInfo, gridViewPageSize } = useGlobal() - const appInfoDefaultLimit = appInfo.value.defaultLimit || 25 + const appInfoDefaultLimit = gridViewPageSize.value || appInfo.value.defaultLimit || 25 const _paginationData = ref({ page: 1, pageSize: appInfoDefaultLimit }) diff --git a/packages/nocodb/src/services/public-datas.service.ts b/packages/nocodb/src/services/public-datas.service.ts index 085e701e10..7c9fa5af2b 100644 --- a/packages/nocodb/src/services/public-datas.service.ts +++ b/packages/nocodb/src/services/public-datas.service.ts @@ -1,11 +1,7 @@ import path from 'path'; import { Injectable } from '@nestjs/common'; import { nanoid } from 'nanoid'; -import { - populateUniqueFileName, - UITypes, - ViewTypes, -} from 'nocodb-sdk'; +import { populateUniqueFileName, UITypes, ViewTypes } from 'nocodb-sdk'; import slash from 'slash'; import { nocoExecute } from 'nc-help';