chore: Sync OSS to EE (#5017)

* chore: sync missing changes

* fix: wrong imports

* fix: multiple definitions & non-dynamic imports

* fix: reduce duration for pw

* chore(nix/package/pnpmDeps): bump hash

---------

Co-authored-by: mertmit <mertmit99@gmail.com>
Co-authored-by: auto walle <auto@sinanmohd.com>

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 = {

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)),
   })
 })

packages/nocodb/src/db/BaseModelSqlv2.ts

@@ -9400,4 +9400,4 @@ class BaseModelSqlv2 implements IBaseModelSqlV2 {
   }
 }
 
-export { BaseModelSqlv2, getAs };
+export { BaseModelSqlv2 };

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, getColumnName } from '~/helpers/dbHelpers';
-import {
+import { ncIsStringHasValue } from '~/db/field-handler/utils/handlerUtils';
-  getAs,
-  ncIsStringHasValue,
-} from '~/db/field-handler/utils/handlerUtils';
 import { sanitize } from '~/helpers/sqlSanitize';
 
 export class GenericFieldHandler implements FieldHandlerInterface {

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 {

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';
 

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);
 }

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 = '___';
 

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';