From 3310e52cb2596dfab6d8472e0edb2cb101bc3d5c Mon Sep 17 00:00:00 2001 From: DarkPhoenix2704 Date: Mon, 18 Nov 2024 12:52:39 +0530 Subject: [PATCH] fix: rspack sync --- packages/nocodb/src/controllers/integrations.controller.ts | 4 +++- packages/nocodb/src/controllers/org-users.controller.ts | 4 +++- packages/nocodb/src/services/command-palette.service.ts | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/nocodb/src/controllers/integrations.controller.ts b/packages/nocodb/src/controllers/integrations.controller.ts index d688079780..d284afb894 100644 --- a/packages/nocodb/src/controllers/integrations.controller.ts +++ b/packages/nocodb/src/controllers/integrations.controller.ts @@ -11,9 +11,11 @@ import { UseGuards, } from '@nestjs/common'; import { IntegrationReqType, IntegrationsType } from 'nocodb-sdk'; +// This service is overwritten entirely in the cloud and does not extend there. +// As a result, it refers to services from OSS to avoid type mismatches. +import { IntegrationsService } from 'src/services/integrations.service'; import { GlobalGuard } from '~/guards/global/global.guard'; import { Acl } from '~/middlewares/extract-ids/extract-ids.middleware'; -import { IntegrationsService } from '~/services/integrations.service'; import { MetaApiLimiterGuard } from '~/guards/meta-api-limiter.guard'; import { TenantContext } from '~/decorators/tenant-context.decorator'; import { NcContext, NcRequest } from '~/interface/config'; diff --git a/packages/nocodb/src/controllers/org-users.controller.ts b/packages/nocodb/src/controllers/org-users.controller.ts index aa72026360..9f3d0c4c18 100644 --- a/packages/nocodb/src/controllers/org-users.controller.ts +++ b/packages/nocodb/src/controllers/org-users.controller.ts @@ -11,9 +11,11 @@ import { UseGuards, } from '@nestjs/common'; import { OrgUserRoles } from 'nocodb-sdk'; +// This service is overwritten entirely in the cloud and does not extend there. +// As a result, it refers to services from OSS to avoid type mismatches. +import { OrgUsersService } from 'src/services/org-users.service'; import { GlobalGuard } from '~/guards/global/global.guard'; import { PagedResponseImpl } from '~/helpers/PagedResponse'; -import { OrgUsersService } from '~/services/org-users.service'; import { User } from '~/models'; import { Acl } from '~/middlewares/extract-ids/extract-ids.middleware'; import { MetaApiLimiterGuard } from '~/guards/meta-api-limiter.guard'; diff --git a/packages/nocodb/src/services/command-palette.service.ts b/packages/nocodb/src/services/command-palette.service.ts index fdcc4be004..423df78da4 100644 --- a/packages/nocodb/src/services/command-palette.service.ts +++ b/packages/nocodb/src/services/command-palette.service.ts @@ -1,7 +1,9 @@ import { Injectable, Logger } from '@nestjs/common'; import { type UserType, viewTypeAlias } from 'nocodb-sdk'; +// This service is overwritten entirely in the cloud and does not extend there. +// As a result, it refers to services from OSS to avoid type mismatches. +import { getCommandPaletteForUserWorkspace } from 'src/helpers/commandPaletteHelpers'; import { deserializeJSON } from '~/utils/serialize'; -import { getCommandPaletteForUserWorkspace } from '~/helpers/commandPaletteHelpers'; @Injectable() export class CommandPaletteService {