diff --git a/nix/package.nix b/nix/package.nix index 5f84f5018e..2e179ff981 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-eozNyjEijnE1SfwF0dU0eos1/fu1hNP3Rx/GFPC/3Ts="; + hash = "sha256-utjGiL8EuNpnlG2oGIQ9rJ0qeCvSwLyl49EHK44MVKo="; }; meta = { diff --git a/packages/nc-gui/plugins/ant.ts b/packages/nc-gui/plugins/ant.ts index a3c2b54d01..46de463f43 100644 --- a/packages/nc-gui/plugins/ant.ts +++ b/packages/nc-gui/plugins/ant.ts @@ -4,6 +4,6 @@ export default defineNuxtPlugin((nuxtApp) => { nuxtApp.vueApp.component(AntMenu.name, AntMenu) nuxtApp.vueApp.component(AntModal.name, AntModal) message.config({ - duration: +(process.env.ANT_MESSAGE_DURATION ?? 8), + duration: +(process.env.ANT_MESSAGE_DURATION ?? (ncIsPlaywright() ? 1 : 8)), }) }) diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts index e8ab3710c3..f14f84e957 100644 --- a/packages/nocodb/src/db/BaseModelSqlv2.ts +++ b/packages/nocodb/src/db/BaseModelSqlv2.ts @@ -9400,4 +9400,4 @@ class BaseModelSqlv2 implements IBaseModelSqlV2 { } } -export { BaseModelSqlv2, getAs }; +export { BaseModelSqlv2 }; diff --git a/packages/nocodb/src/db/field-handler/handlers/generic.ts b/packages/nocodb/src/db/field-handler/handlers/generic.ts index 705cdb236a..a91c35fd58 100644 --- a/packages/nocodb/src/db/field-handler/handlers/generic.ts +++ b/packages/nocodb/src/db/field-handler/handlers/generic.ts @@ -6,11 +6,8 @@ import type { HandlerOptions, } from '~/db/field-handler/field-handler.interface'; import type { Column, Filter } from '~/models'; -import { getColumnName } from '~/db/BaseModelSqlv2'; -import { - getAs, - ncIsStringHasValue, -} from '~/db/field-handler/utils/handlerUtils'; +import { getAs, getColumnName } from '~/helpers/dbHelpers'; +import { ncIsStringHasValue } from '~/db/field-handler/utils/handlerUtils'; import { sanitize } from '~/helpers/sqlSanitize'; export class GenericFieldHandler implements FieldHandlerInterface { diff --git a/packages/nocodb/src/db/field-handler/handlers/lookup/lookup.general.handler.ts b/packages/nocodb/src/db/field-handler/handlers/lookup/lookup.general.handler.ts index ef201021ef..047bd6f47f 100644 --- a/packages/nocodb/src/db/field-handler/handlers/lookup/lookup.general.handler.ts +++ b/packages/nocodb/src/db/field-handler/handlers/lookup/lookup.general.handler.ts @@ -1,14 +1,14 @@ import { RelationTypes } from 'nocodb-sdk'; -import { - getAlias, - negatedMapping, - nestedConditionJoin, -} from '../../utils/handlerUtils'; import type CustomKnex from '~/db/CustomKnex'; import type { Column, LinkToAnotherRecordColumn, LookupColumn } from '~/models'; import type { HandlerOptions } from '~/db/field-handler/field-handler.interface'; import type { Knex } from '~/db/CustomKnex'; import type { Filter } from '~/models'; +import { + getAlias, + negatedMapping, + nestedConditionJoin, +} from '~/db/field-handler/utils/handlerUtils'; import { GenericFieldHandler } from '~/db/field-handler/handlers/generic'; export class LookupGeneralHandler extends GenericFieldHandler { diff --git a/packages/nocodb/src/db/field-handler/handlers/ltar/ltar.general.handler.ts b/packages/nocodb/src/db/field-handler/handlers/ltar/ltar.general.handler.ts index f380b371ca..438958af74 100644 --- a/packages/nocodb/src/db/field-handler/handlers/ltar/ltar.general.handler.ts +++ b/packages/nocodb/src/db/field-handler/handlers/ltar/ltar.general.handler.ts @@ -1,9 +1,12 @@ import { RelationTypes } from 'nocodb-sdk'; -import { getAlias, negatedMapping } from '../../utils/handlerUtils'; import type CustomKnex from '~/db/CustomKnex'; import type { Column, LinkToAnotherRecordColumn } from '~/models'; import type { HandlerOptions } from '~/db/field-handler/field-handler.interface'; import type { Knex } from '~/db/CustomKnex'; +import { + getAlias, + negatedMapping, +} from '~/db/field-handler/utils/handlerUtils'; import { Filter } from '~/models'; import { GenericFieldHandler } from '~/db/field-handler/handlers/generic'; diff --git a/packages/nocodb/src/db/field-handler/utils/handlerUtils.ts b/packages/nocodb/src/db/field-handler/utils/handlerUtils.ts index 393ae38664..f791daf851 100644 --- a/packages/nocodb/src/db/field-handler/utils/handlerUtils.ts +++ b/packages/nocodb/src/db/field-handler/utils/handlerUtils.ts @@ -4,9 +4,6 @@ import type { IBaseModelSqlV2 } from 'src/db/IBaseModelSqlV2'; import type { Column, LinkToAnotherRecordColumn, LookupColumn } from '~/models'; import { Filter } from '~/models'; -export function getAs(column: Column) { - return column.asId || column.id; -} export function ncIsStringHasValue(val: string | undefined | null) { return val !== '' && !ncIsUndefined(val) && !ncIsNull(val); } diff --git a/packages/nocodb/src/db/generateLookupSelectQuery.ts b/packages/nocodb/src/db/generateLookupSelectQuery.ts index 6ef70d1ab0..9b606ec5dc 100644 --- a/packages/nocodb/src/db/generateLookupSelectQuery.ts +++ b/packages/nocodb/src/db/generateLookupSelectQuery.ts @@ -16,7 +16,7 @@ import formulaQueryBuilderv2 from '~/db/formulav2/formulaQueryBuilderv2'; import genRollupSelectv2 from '~/db/genRollupSelectv2'; import { getAliasGenerator } from '~/utils'; import { NcError } from '~/helpers/catchError'; -import { getAs } from '~/db/BaseModelSqlv2'; +import { getAs } from '~/helpers/dbHelpers'; const LOOKUP_VAL_SEPARATOR = '___'; diff --git a/packages/nocodb/src/services/public-datas.service.ts b/packages/nocodb/src/services/public-datas.service.ts index a674be91ab..6adc7e2798 100644 --- a/packages/nocodb/src/services/public-datas.service.ts +++ b/packages/nocodb/src/services/public-datas.service.ts @@ -11,7 +11,7 @@ import getAst from '~/helpers/getAst'; import { PagedResponseImpl } from '~/helpers/PagedResponse'; import { getColumnByIdOrName } from '~/helpers/dataHelpers'; import NcConnectionMgrv2 from '~/utils/common/NcConnectionMgrv2'; -import { replaceDynamicFieldWithValue } from '~/db/BaseModelSqlv2'; +import { replaceDynamicFieldWithValue } from '~/helpers/dbHelpers'; import { Filter } from '~/models'; import { IJobsService } from '~/modules/jobs/jobs-service.interface'; import { DatasService } from '~/services/datas.service';