diff --git a/packages/nc-gui/composables/useSharedView.ts b/packages/nc-gui/composables/useSharedView.ts index d7595e704e..4d0b3bfdfd 100644 --- a/packages/nc-gui/composables/useSharedView.ts +++ b/packages/nc-gui/composables/useSharedView.ts @@ -1,7 +1,6 @@ import type { ExportTypes, FilterType, PaginatedType, SortType, TableType, ViewType } from 'nocodb-sdk' import { UITypes } from 'nocodb-sdk' -import { useNuxtApp } from '#app' -import { useGlobal } from '#imports' +import { useGlobal, useNuxtApp } from '#imports' export function useSharedView() { const nestedFilters = useState<(FilterType & { status?: 'update' | 'delete' | 'create'; parentId?: string })[]>( @@ -9,7 +8,7 @@ export function useSharedView() { () => [], ) const { appInfo } = $(useGlobal()) - const appInfoDefaultLimit = appInfo?.defaultLimit || 25 + const appInfoDefaultLimit = appInfo.defaultLimit || 25 const paginationData = useState('paginationData', () => ({ page: 1, pageSize: appInfoDefaultLimit })) const sharedView = useState('sharedView') const sorts = useState('sorts', () => []) diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts index 32be409e6e..13c1bc0816 100644 --- a/packages/nc-gui/composables/useViewData.ts +++ b/packages/nc-gui/composables/useViewData.ts @@ -45,7 +45,7 @@ export function useViewData( const { t } = useI18n() const { api, isLoading, error } = useApi() const { appInfo } = $(useGlobal()) - const appInfoDefaultLimit = appInfo?.defaultLimit || 25 + const appInfoDefaultLimit = appInfo.defaultLimit || 25 const _paginationData = ref({ page: 1, pageSize: appInfoDefaultLimit }) const aggCommentCount = ref<{ row_id: string; count: number }[]>([]) const galleryData = ref() @@ -82,7 +82,7 @@ export function useViewData( }) const queryParams = computed(() => ({ - offset: ((paginationData.value?.page ?? 0) - 1) * (paginationData.value?.pageSize ?? appInfoDefaultLimit), + offset: ((paginationData.value.page ?? 0) - 1) * (paginationData.value.pageSize ?? appInfoDefaultLimit), limit: paginationData.value?.pageSize ?? appInfoDefaultLimit, where: where?.value ?? '', }))