From e580c9cbd9795af947563c62668a3acfe560004a Mon Sep 17 00:00:00 2001 From: mertmit Date: Tue, 21 May 2024 23:03:18 +0300 Subject: [PATCH] refactor: merge core modules into single noco module --- packages/nocodb/src/app.module.ts | 12 +- .../data-alias-export.controller.ts | 2 +- .../old-datas/old-datas.service.ts | 2 +- .../public-datas-export.controller.ts | 2 +- .../helpers.ts => helpers/dataHelpers.ts} | 0 .../nocodb/src/modules/auth/auth.module.ts | 16 --- .../nocodb/src/modules/datas/datas.module.ts | 71 ---------- .../src/modules/global/global.module.ts | 67 ---------- .../nocodb/src/modules/jobs/jobs.module.ts | 8 +- .../jobs/jobs/export-import/export.service.ts | 2 +- .../{metas/metas.module.ts => noco.module.ts} | 121 ++++++++++++++++-- .../nocodb/src/modules/users/users.module.ts | 15 --- .../init-meta-service.provider.ts | 0 .../src/providers/jwt-strategy.provider.ts | 27 ++++ .../services/base-users/base-users.service.ts | 4 +- .../src/services/bulk-data-alias.service.ts | 4 +- .../src/services/data-alias-nested.service.ts | 4 +- packages/nocodb/src/services/datas.service.ts | 4 +- .../src/services/public-datas.service.ts | 2 +- 19 files changed, 159 insertions(+), 204 deletions(-) rename packages/nocodb/src/{modules/datas/helpers.ts => helpers/dataHelpers.ts} (100%) delete mode 100644 packages/nocodb/src/modules/auth/auth.module.ts delete mode 100644 packages/nocodb/src/modules/datas/datas.module.ts delete mode 100644 packages/nocodb/src/modules/global/global.module.ts rename packages/nocodb/src/modules/{metas/metas.module.ts => noco.module.ts} (68%) delete mode 100644 packages/nocodb/src/modules/users/users.module.ts rename packages/nocodb/src/{modules/global => providers}/init-meta-service.provider.ts (100%) create mode 100644 packages/nocodb/src/providers/jwt-strategy.provider.ts diff --git a/packages/nocodb/src/app.module.ts b/packages/nocodb/src/app.module.ts index 55e46d5742..1e287ace11 100644 --- a/packages/nocodb/src/app.module.ts +++ b/packages/nocodb/src/app.module.ts @@ -5,34 +5,26 @@ import { ConfigModule } from '@nestjs/config'; import { EventEmitterModule as NestJsEventEmitter } from '@nestjs/event-emitter'; import { SentryModule } from '@ntegral/nestjs-sentry'; import type { MiddlewareConsumer } from '@nestjs/common'; +import { NocoModule } from '~/modules/noco.module'; import { GlobalExceptionFilter } from '~/filters/global-exception/global-exception.filter'; import { GlobalMiddleware } from '~/middlewares/global/global.middleware'; import { GuiMiddleware } from '~/middlewares/gui/gui.middleware'; -import { DatasModule } from '~/modules/datas/datas.module'; import { EventEmitterModule } from '~/modules/event-emitter/event-emitter.module'; import { AuthService } from '~/services/auth.service'; -import { GlobalModule } from '~/modules/global/global.module'; import { LocalStrategy } from '~/strategies/local.strategy'; import { AuthTokenStrategy } from '~/strategies/authtoken.strategy/authtoken.strategy'; import { BaseViewStrategy } from '~/strategies/base-view.strategy/base-view.strategy'; -import { MetasModule } from '~/modules/metas/metas.module'; import { JobsModule } from '~/modules/jobs/jobs.module'; import appConfig from '~/app.config'; import { ExtractIdsMiddleware } from '~/middlewares/extract-ids/extract-ids.middleware'; import { BasicStrategy } from '~/strategies/basic.strategy/basic.strategy'; -import { UsersModule } from '~/modules/users/users.module'; -import { AuthModule } from '~/modules/auth/auth.module'; import { packageInfo } from '~/utils/packageVersion'; export const ceModuleConfig = { imports: [ - GlobalModule, - UsersModule, - AuthModule, - MetasModule, - DatasModule, + NocoModule, EventEmitterModule, JobsModule, NestJsEventEmitter.forRoot(), diff --git a/packages/nocodb/src/controllers/data-alias-export.controller.ts b/packages/nocodb/src/controllers/data-alias-export.controller.ts index 4d94ada8ae..2f63ec986b 100644 --- a/packages/nocodb/src/controllers/data-alias-export.controller.ts +++ b/packages/nocodb/src/controllers/data-alias-export.controller.ts @@ -3,7 +3,7 @@ import { Request, Response } from 'express'; import * as XLSX from 'xlsx'; import { GlobalGuard } from '~/guards/global/global.guard'; import { DatasService } from '~/services/datas.service'; -import { extractCsvData, extractXlsxData } from '~/modules/datas/helpers'; +import { extractCsvData, extractXlsxData } from '~/helpers/dataHelpers'; import { View } from '~/models'; import { Acl } from '~/middlewares/extract-ids/extract-ids.middleware'; import { DataApiLimiterGuard } from '~/guards/data-api-limiter.guard'; diff --git a/packages/nocodb/src/controllers/old-datas/old-datas.service.ts b/packages/nocodb/src/controllers/old-datas/old-datas.service.ts index 7cf7710aba..2e1c9c56a7 100644 --- a/packages/nocodb/src/controllers/old-datas/old-datas.service.ts +++ b/packages/nocodb/src/controllers/old-datas/old-datas.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { nocoExecute } from 'nc-help'; -import type { OldPathParams } from '~/modules/datas/helpers'; +import type { OldPathParams } from '~/helpers/dataHelpers'; import getAst from '~/helpers/getAst'; import { NcError } from '~/helpers/catchError'; import { Base, Model, Source, View } from '~/models'; diff --git a/packages/nocodb/src/controllers/public-datas-export.controller.ts b/packages/nocodb/src/controllers/public-datas-export.controller.ts index 9f7b8ebe9e..1359ef2ed6 100644 --- a/packages/nocodb/src/controllers/public-datas-export.controller.ts +++ b/packages/nocodb/src/controllers/public-datas-export.controller.ts @@ -12,7 +12,7 @@ import { nocoExecute } from 'nc-help'; import papaparse from 'papaparse'; import { NcError } from '~/helpers/catchError'; import getAst from '~/helpers/getAst'; -import { serializeCellValue } from '~/modules/datas/helpers'; +import { serializeCellValue } from '~/helpers/dataHelpers'; import { PublicDatasExportService } from '~/services/public-datas-export.service'; import NcConnectionMgrv2 from '~/utils/common/NcConnectionMgrv2'; import { Column, Model, Source, View } from '~/models'; diff --git a/packages/nocodb/src/modules/datas/helpers.ts b/packages/nocodb/src/helpers/dataHelpers.ts similarity index 100% rename from packages/nocodb/src/modules/datas/helpers.ts rename to packages/nocodb/src/helpers/dataHelpers.ts diff --git a/packages/nocodb/src/modules/auth/auth.module.ts b/packages/nocodb/src/modules/auth/auth.module.ts deleted file mode 100644 index df6d07283a..0000000000 --- a/packages/nocodb/src/modules/auth/auth.module.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { forwardRef, Module } from '@nestjs/common'; -import { PassportModule } from '@nestjs/passport'; -import { GoogleStrategyProvider } from '~/strategies/google.strategy/google.strategy'; -import { UsersService } from '~/services/users/users.service'; -import { AuthController } from '~/controllers/auth/auth.controller'; -import { MetasModule } from '~/modules/metas/metas.module'; - -@Module({ - imports: [PassportModule, forwardRef(() => MetasModule)], - controllers: [ - ...(process.env.NC_WORKER_CONTAINER !== 'true' ? [AuthController] : []), - ], - providers: [UsersService, GoogleStrategyProvider], - exports: [UsersService], -}) -export class AuthModule {} diff --git a/packages/nocodb/src/modules/datas/datas.module.ts b/packages/nocodb/src/modules/datas/datas.module.ts deleted file mode 100644 index bb6eb86161..0000000000 --- a/packages/nocodb/src/modules/datas/datas.module.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { Module } from '@nestjs/common'; -import { MulterModule } from '@nestjs/platform-express'; -import multer from 'multer'; -import { NC_ATTACHMENT_FIELD_SIZE } from '~/constants'; -import { DataTableController } from '~/controllers/data-table.controller'; -import { DataTableService } from '~/services/data-table.service'; -import { DataAliasController } from '~/controllers/data-alias.controller'; -import { PublicDatasExportController } from '~/controllers/public-datas-export.controller'; -import { PublicDatasController } from '~/controllers/public-datas.controller'; -import { DatasService } from '~/services/datas.service'; -import { DatasController } from '~/controllers/datas.controller'; -import { BulkDataAliasController } from '~/controllers/bulk-data-alias.controller'; -import { DataAliasExportController } from '~/controllers/data-alias-export.controller'; -import { DataAliasNestedController } from '~/controllers/data-alias-nested.controller'; -import { OldDatasController } from '~/controllers/old-datas/old-datas.controller'; -import { BulkDataAliasService } from '~/services/bulk-data-alias.service'; -import { DataAliasNestedService } from '~/services/data-alias-nested.service'; -import { OldDatasService } from '~/controllers/old-datas/old-datas.service'; -import { PublicDatasExportService } from '~/services/public-datas-export.service'; -import { PublicDatasService } from '~/services/public-datas.service'; -import { CalendarDatasController } from '~/controllers/calendars-datas.controller'; -import { CalendarDatasService } from '~/services/calendar-datas.service'; - -export const dataModuleMetadata = { - imports: [ - MulterModule.register({ - storage: multer.diskStorage({}), - limits: { - fieldSize: NC_ATTACHMENT_FIELD_SIZE, - }, - }), - ], - controllers: [ - ...(process.env.NC_WORKER_CONTAINER !== 'true' - ? [ - DataTableController, - DatasController, - CalendarDatasController, - BulkDataAliasController, - DataAliasController, - DataAliasNestedController, - DataAliasExportController, - OldDatasController, - PublicDatasController, - PublicDatasExportController, - ] - : []), - ], - providers: [ - DataTableService, - DatasService, - BulkDataAliasService, - DataAliasNestedService, - CalendarDatasService, - OldDatasService, - PublicDatasService, - PublicDatasExportService, - ], - exports: [ - DatasService, - BulkDataAliasService, - CalendarDatasService, - DataAliasNestedService, - OldDatasService, - PublicDatasService, - PublicDatasExportService, - ], -}; - -@Module(dataModuleMetadata) -export class DatasModule {} diff --git a/packages/nocodb/src/modules/global/global.module.ts b/packages/nocodb/src/modules/global/global.module.ts deleted file mode 100644 index 4d1412bf1b..0000000000 --- a/packages/nocodb/src/modules/global/global.module.ts +++ /dev/null @@ -1,67 +0,0 @@ -import { forwardRef, Global, Module } from '@nestjs/common'; -import { ExtractJwt } from 'passport-jwt'; -import type { Provider } from '@nestjs/common'; -import { InitMetaServiceProvider } from '~/modules/global/init-meta-service.provider'; -import { EventEmitterModule } from '~/modules/event-emitter/event-emitter.module'; -import { SocketGateway } from '~/gateways/socket.gateway'; -import { GlobalGuard } from '~/guards/global/global.guard'; -import { MetaService } from '~/meta/meta.service'; -import Noco from '~/Noco'; -import { AppHooksService } from '~/services/app-hooks/app-hooks.service'; -import { JwtStrategy } from '~/strategies/jwt.strategy'; -import { UsersService } from '~/services/users/users.service'; -import { TelemetryService } from '~/services/telemetry.service'; -import { AppHooksListenerService } from '~/services/app-hooks-listener.service'; -import { HookHandlerService } from '~/services/hook-handler.service'; -import { UsersModule } from '~/modules/users/users.module'; -import { JobsModule } from '~/modules/jobs/jobs.module'; - -export const JwtStrategyProvider: Provider = { - provide: JwtStrategy, - useFactory: async (usersService: UsersService, metaService: MetaService) => { - const config = metaService.config; - - await Noco.initJwt(); - - const options = { - // ignoreExpiration: false, - jwtFromRequest: ExtractJwt.fromHeader('xc-auth'), - // expiresIn: '10h', - passReqToCallback: true, - secretOrKey: config.auth.jwt.secret, - ...config.auth.jwt.options, - }; - - return new JwtStrategy(options, usersService); - }, - inject: [UsersService, MetaService], -}; - -export const globalModuleMetadata = { - imports: [EventEmitterModule, forwardRef(() => UsersModule), JobsModule], - providers: [ - InitMetaServiceProvider, - AppHooksService, - JwtStrategyProvider, - GlobalGuard, - SocketGateway, - AppHooksService, - AppHooksListenerService, - TelemetryService, - HookHandlerService, - ], - exports: [ - MetaService, - JwtStrategyProvider, - GlobalGuard, - AppHooksService, - AppHooksListenerService, - TelemetryService, - HookHandlerService, - ...(process.env.NC_WORKER_CONTAINER !== 'true' ? [SocketGateway] : []), - ], -}; - -@Global() -@Module(globalModuleMetadata) -export class GlobalModule {} diff --git a/packages/nocodb/src/modules/jobs/jobs.module.ts b/packages/nocodb/src/modules/jobs/jobs.module.ts index c29620aca4..0d53ce224d 100644 --- a/packages/nocodb/src/modules/jobs/jobs.module.ts +++ b/packages/nocodb/src/modules/jobs/jobs.module.ts @@ -1,5 +1,6 @@ -import { Module } from '@nestjs/common'; +import { forwardRef, Module } from '@nestjs/common'; import { BullModule } from '@nestjs/bull'; +import { NocoModule } from '~/modules/noco.module'; // Jobs import { ExportService } from '~/modules/jobs/jobs/export-import/export.service'; @@ -29,13 +30,10 @@ import { JobsService as FallbackJobsService } from '~/modules/jobs/fallback/jobs import { QueueService as FallbackQueueService } from '~/modules/jobs/fallback/fallback-queue.service'; import { JobsEventService as FallbackJobsEventService } from '~/modules/jobs/fallback/jobs-event.service'; import { JOBS_QUEUE } from '~/interface/Jobs'; -import { MetasModule } from '~/modules/metas/metas.module'; -import { DatasModule } from '~/modules/datas/datas.module'; export const JobsModuleMetadata = { imports: [ - DatasModule, - MetasModule, + forwardRef(() => NocoModule), ...(process.env.NC_REDIS_JOB_URL ? [ BullModule.forRoot({ diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts index e3028278d6..7b09653b7c 100644 --- a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts +++ b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts @@ -8,7 +8,7 @@ import type { BaseModelSqlv2 } from '~/db/BaseModelSqlv2'; import type { View } from '~/models'; import { Base, Hook, Model, Source } from '~/models'; import NcConnectionMgrv2 from '~/utils/common/NcConnectionMgrv2'; -import { getViewAndModelByAliasOrId } from '~/modules/datas/helpers'; +import { getViewAndModelByAliasOrId } from '~/helpers/dataHelpers'; import { clearPrefix, generateBaseIdMap } from '~/helpers/exportImportHelpers'; import NcPluginMgrv2 from '~/helpers/NcPluginMgrv2'; import { NcError } from '~/helpers/catchError'; diff --git a/packages/nocodb/src/modules/metas/metas.module.ts b/packages/nocodb/src/modules/noco.module.ts similarity index 68% rename from packages/nocodb/src/modules/metas/metas.module.ts rename to packages/nocodb/src/modules/noco.module.ts index 05f0fe52cc..59b0ef2578 100644 --- a/packages/nocodb/src/modules/metas/metas.module.ts +++ b/packages/nocodb/src/modules/noco.module.ts @@ -1,6 +1,28 @@ +import multer from 'multer'; import { Module } from '@nestjs/common'; +import { PassportModule } from '@nestjs/passport'; import { MulterModule } from '@nestjs/platform-express'; -import multer from 'multer'; + +/* Modules */ +import { EventEmitterModule } from '~/modules/event-emitter/event-emitter.module'; +import { JobsModule } from '~/modules/jobs/jobs.module'; + +/* Generic */ +import { InitMetaServiceProvider } from '~/providers/init-meta-service.provider'; +import { JwtStrategyProvider } from '~/providers/jwt-strategy.provider'; +import { JwtStrategy } from '~/strategies/jwt.strategy'; +import { SocketGateway } from '~/gateways/socket.gateway'; +import { GlobalGuard } from '~/guards/global/global.guard'; +import { AppHooksService } from '~/services/app-hooks/app-hooks.service'; +import { TelemetryService } from '~/services/telemetry.service'; +import { AppHooksListenerService } from '~/services/app-hooks-listener.service'; +import { HookHandlerService } from '~/services/hook-handler.service'; + +/* User */ +import { UsersController } from '~/controllers/users/users.controller'; +import { UsersService } from '~/services/users/users.service'; + +/* Metas */ import { NC_ATTACHMENT_FIELD_SIZE } from '~/constants'; import { ApiDocsController } from '~/controllers/api-docs/api-docs.controller'; import { ApiTokensController } from '~/controllers/api-tokens.controller'; @@ -39,7 +61,6 @@ import { ApiTokensService } from '~/services/api-tokens.service'; import { AttachmentsService } from '~/services/attachments.service'; import { AuditsService } from '~/services/audits.service'; import { SourcesService } from '~/services/sources.service'; -import { BulkDataAliasService } from '~/services/bulk-data-alias.service'; import { CachesService } from '~/services/caches.service'; import { CalendarsService } from '~/services/calendars.service'; import { ColumnsService } from '~/services/columns.service'; @@ -79,8 +100,35 @@ import { CommandPaletteController } from '~/controllers/command-palette.controll import { ExtensionsService } from '~/services/extensions.service'; import { ExtensionsController } from '~/controllers/extensions.controller'; -export const metaModuleMetadata = { +/* Datas */ +import { DataTableController } from '~/controllers/data-table.controller'; +import { DataTableService } from '~/services/data-table.service'; +import { DataAliasController } from '~/controllers/data-alias.controller'; +import { PublicDatasExportController } from '~/controllers/public-datas-export.controller'; +import { PublicDatasController } from '~/controllers/public-datas.controller'; +import { DatasService } from '~/services/datas.service'; +import { DatasController } from '~/controllers/datas.controller'; +import { BulkDataAliasController } from '~/controllers/bulk-data-alias.controller'; +import { DataAliasExportController } from '~/controllers/data-alias-export.controller'; +import { DataAliasNestedController } from '~/controllers/data-alias-nested.controller'; +import { OldDatasController } from '~/controllers/old-datas/old-datas.controller'; +import { BulkDataAliasService } from '~/services/bulk-data-alias.service'; +import { DataAliasNestedService } from '~/services/data-alias-nested.service'; +import { OldDatasService } from '~/controllers/old-datas/old-datas.service'; +import { PublicDatasExportService } from '~/services/public-datas-export.service'; +import { PublicDatasService } from '~/services/public-datas.service'; +import { CalendarDatasController } from '~/controllers/calendars-datas.controller'; +import { CalendarDatasService } from '~/services/calendar-datas.service'; + +/* Auth */ +import { GoogleStrategyProvider } from '~/strategies/google.strategy/google.strategy'; +import { AuthController } from '~/controllers/auth/auth.controller'; + +export const nocoModuleMetadata = { imports: [ + EventEmitterModule, + JobsModule, + PassportModule, MulterModule.register({ storage: multer.diskStorage({}), limits: { @@ -91,6 +139,10 @@ export const metaModuleMetadata = { controllers: [ ...(process.env.NC_WORKER_CONTAINER !== 'true' ? [ + /* Users */ + UsersController, + + /* Metas */ ApiDocsController, ApiTokensController, ...(process.env.NC_SECURE_ATTACHMENTS === 'true' @@ -129,11 +181,40 @@ export const metaModuleMetadata = { NotificationsController, CommandPaletteController, ExtensionsController, + + /* Datas */ + DataTableController, + DatasController, + CalendarDatasController, + BulkDataAliasController, + DataAliasController, + DataAliasNestedController, + DataAliasExportController, + OldDatasController, + PublicDatasController, + PublicDatasExportController, + + /* Auth */ + AuthController, ] : []), ], providers: [ - /** Services */ + /* Generic */ + InitMetaServiceProvider, + AppHooksService, + JwtStrategyProvider, + GlobalGuard, + SocketGateway, + AppHooksService, + AppHooksListenerService, + TelemetryService, + HookHandlerService, + + /* Users */ + UsersService, + + /* Metas */ ApiDocsService, ApiTokensService, AttachmentsService, @@ -168,13 +249,34 @@ export const metaModuleMetadata = { SyncService, SortsService, SharedBasesService, - BulkDataAliasService, NotificationsService, NotificationsGateway, CommandPaletteService, ExtensionsService, + + /* Datas */ + DataTableService, + DatasService, + BulkDataAliasService, + DataAliasNestedService, + CalendarDatasService, + OldDatasService, + PublicDatasService, + PublicDatasExportService, + + /* Auth */ + GoogleStrategyProvider, ], exports: [ + /* Generic */ + TelemetryService, + HookHandlerService, + JwtStrategy, + + /* Users */ + UsersService, + + /* Metas */ TablesService, ColumnsService, FiltersService, @@ -193,11 +295,14 @@ export const metaModuleMetadata = { BaseUsersService, HooksService, MetaDiffsService, - BasesService, SourcesService, UtilsService, + + /* Datas */ + DatasService, + BulkDataAliasService, ], }; -@Module(metaModuleMetadata) -export class MetasModule {} +@Module(nocoModuleMetadata) +export class NocoModule {} diff --git a/packages/nocodb/src/modules/users/users.module.ts b/packages/nocodb/src/modules/users/users.module.ts deleted file mode 100644 index 1ee14b3f2d..0000000000 --- a/packages/nocodb/src/modules/users/users.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { forwardRef, Module } from '@nestjs/common'; -import { PassportModule } from '@nestjs/passport'; -import { UsersService } from '~/services/users/users.service'; -import { UsersController } from '~/controllers/users/users.controller'; -import { MetasModule } from '~/modules/metas/metas.module'; - -@Module({ - imports: [PassportModule, forwardRef(() => MetasModule)], - controllers: [ - ...(process.env.NC_WORKER_CONTAINER !== 'true' ? [UsersController] : []), - ], - providers: [UsersService], - exports: [UsersService], -}) -export class UsersModule {} diff --git a/packages/nocodb/src/modules/global/init-meta-service.provider.ts b/packages/nocodb/src/providers/init-meta-service.provider.ts similarity index 100% rename from packages/nocodb/src/modules/global/init-meta-service.provider.ts rename to packages/nocodb/src/providers/init-meta-service.provider.ts diff --git a/packages/nocodb/src/providers/jwt-strategy.provider.ts b/packages/nocodb/src/providers/jwt-strategy.provider.ts new file mode 100644 index 0000000000..8ea89b9007 --- /dev/null +++ b/packages/nocodb/src/providers/jwt-strategy.provider.ts @@ -0,0 +1,27 @@ +import { ExtractJwt } from 'passport-jwt'; +import type { Provider } from '@nestjs/common'; +import { MetaService } from '~/meta/meta.service'; +import { UsersService } from '~/services/users/users.service'; +import { JwtStrategy } from '~/strategies/jwt.strategy'; +import Noco from '~/Noco'; + +export const JwtStrategyProvider: Provider = { + provide: JwtStrategy, + useFactory: async (usersService: UsersService, metaService: MetaService) => { + const config = metaService.config; + + await Noco.initJwt(); + + const options = { + // ignoreExpiration: false, + jwtFromRequest: ExtractJwt.fromHeader('xc-auth'), + // expiresIn: '10h', + passReqToCallback: true, + secretOrKey: config.auth.jwt.secret, + ...config.auth.jwt.options, + }; + + return new JwtStrategy(options, usersService); + }, + inject: [UsersService, MetaService], +}; diff --git a/packages/nocodb/src/services/base-users/base-users.service.ts b/packages/nocodb/src/services/base-users/base-users.service.ts index a15baef5f4..5a96fb007a 100644 --- a/packages/nocodb/src/services/base-users/base-users.service.ts +++ b/packages/nocodb/src/services/base-users/base-users.service.ts @@ -350,7 +350,9 @@ export class BaseUsersService { // todo: refactor the whole function async sendInviteEmail(email: string, token: string, req: any): Promise { try { - const template = (await import('./ui/emailTemplates/invite')).default; + const template = ( + await import('~/services/base-users/ui/emailTemplates/invite') + ).default; const emailAdapter = await NcPluginMgrv2.emailAdapter(); diff --git a/packages/nocodb/src/services/bulk-data-alias.service.ts b/packages/nocodb/src/services/bulk-data-alias.service.ts index b53b6890a3..0f0216d17a 100644 --- a/packages/nocodb/src/services/bulk-data-alias.service.ts +++ b/packages/nocodb/src/services/bulk-data-alias.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; -import type { PathParams } from '~/modules/datas/helpers'; +import type { PathParams } from '~/helpers/dataHelpers'; import type { BaseModelSqlv2 } from '~/db/BaseModelSqlv2'; -import { getViewAndModelByAliasOrId } from '~/modules/datas/helpers'; +import { getViewAndModelByAliasOrId } from '~/helpers/dataHelpers'; import NcConnectionMgrv2 from '~/utils/common/NcConnectionMgrv2'; import { Model, Source } from '~/models'; diff --git a/packages/nocodb/src/services/data-alias-nested.service.ts b/packages/nocodb/src/services/data-alias-nested.service.ts index 7f87ecf876..91ebd75b79 100644 --- a/packages/nocodb/src/services/data-alias-nested.service.ts +++ b/packages/nocodb/src/services/data-alias-nested.service.ts @@ -1,12 +1,12 @@ import { Injectable } from '@nestjs/common'; import { UITypes } from 'nocodb-sdk'; -import type { PathParams } from '~/modules/datas/helpers'; +import type { PathParams } from '~/helpers/dataHelpers'; import { NcError } from '~/helpers/catchError'; import { PagedResponseImpl } from '~/helpers/PagedResponse'; import { getColumnByIdOrName, getViewAndModelByAliasOrId, -} from '~/modules/datas/helpers'; +} from '~/helpers/dataHelpers'; import { Model, Source } from '~/models'; import NcConnectionMgrv2 from '~/utils/common/NcConnectionMgrv2'; diff --git a/packages/nocodb/src/services/datas.service.ts b/packages/nocodb/src/services/datas.service.ts index 9d97ee8d55..510f23f21d 100644 --- a/packages/nocodb/src/services/datas.service.ts +++ b/packages/nocodb/src/services/datas.service.ts @@ -4,8 +4,8 @@ import * as XLSX from 'xlsx'; import papaparse from 'papaparse'; import { nocoExecute } from 'nc-help'; import type { BaseModelSqlv2 } from '~/db/BaseModelSqlv2'; -import type { PathParams } from '~/modules/datas/helpers'; -import { getDbRows, getViewAndModelByAliasOrId } from '~/modules/datas/helpers'; +import type { PathParams } from '~/helpers/dataHelpers'; +import { getDbRows, getViewAndModelByAliasOrId } from '~/helpers/dataHelpers'; import { Base, Column, Model, Source, View } from '~/models'; import { NcBaseError, NcError } from '~/helpers/catchError'; import getAst from '~/helpers/getAst'; diff --git a/packages/nocodb/src/services/public-datas.service.ts b/packages/nocodb/src/services/public-datas.service.ts index 06a7366343..264ba29e7e 100644 --- a/packages/nocodb/src/services/public-datas.service.ts +++ b/packages/nocodb/src/services/public-datas.service.ts @@ -11,7 +11,7 @@ import { NcError } from '~/helpers/catchError'; import getAst from '~/helpers/getAst'; import NcPluginMgrv2 from '~/helpers/NcPluginMgrv2'; import { PagedResponseImpl } from '~/helpers/PagedResponse'; -import { getColumnByIdOrName } from '~/modules/datas/helpers'; +import { getColumnByIdOrName } from '~/helpers/dataHelpers'; import NcConnectionMgrv2 from '~/utils/common/NcConnectionMgrv2'; import { mimeIcons } from '~/utils/mimeTypes'; import { utf8ify } from '~/helpers/stringHelpers';