Browse Source

refactor(nocodb): use defaultLimitConfig from extractLimitAndOffset

pull/6796/head
աɨռɢӄաօռɢ 11 months ago
parent
commit
63635cdfd2
  1. 8
      packages/nocodb/src/services/utils.service.ts

8
packages/nocodb/src/services/utils.service.ts

@ -14,6 +14,7 @@ import NcConnectionMgrv2 from '~/utils/common/NcConnectionMgrv2';
import { MetaTable } from '~/utils/globals'; import { MetaTable } from '~/utils/globals';
import { jdbcToXcConfig } from '~/utils/nc-config/helpers'; import { jdbcToXcConfig } from '~/utils/nc-config/helpers';
import { packageVersion } from '~/utils/packageVersion'; import { packageVersion } from '~/utils/packageVersion';
import { defaultLimitConfig } from '~/helpers/extractLimitAndOffset';
const versionCache = { const versionCache = {
releaseVersion: null, releaseVersion: null,
@ -391,11 +392,8 @@ export class UtilsService {
connectToExternalDB: !process.env.NC_CONNECT_TO_EXTERNAL_DB_DISABLED, connectToExternalDB: !process.env.NC_CONNECT_TO_EXTERNAL_DB_DISABLED,
version: packageVersion, version: packageVersion,
defaultLimit: Math.max( defaultLimit: Math.max(
Math.min( Math.min(defaultLimitConfig.limitDefault, defaultLimitConfig.limitMax),
+process.env.DB_QUERY_LIMIT_DEFAULT || 25, defaultLimitConfig.limitMin,
+process.env.DB_QUERY_LIMIT_MAX || 1000,
),
+process.env.DB_QUERY_LIMIT_MIN || 1,
), ),
timezone: defaultConnectionConfig.timezone, timezone: defaultConnectionConfig.timezone,
ncMin: !!process.env.NC_MIN, ncMin: !!process.env.NC_MIN,

Loading…
Cancel
Save