From 5580f4d99a08667829e99d359a11291c93432802 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Mon, 17 Apr 2023 11:05:51 +0530 Subject: [PATCH] refactor: merge modules Signed-off-by: Pranav C --- packages/nocodb-nest/src/app.module.ts | 88 +--------- .../api-docs/api-docs.controller.spec.ts | 2 +- .../api-docs/api-docs.controller.ts | 2 +- .../data-alias.controller.spec.ts | 2 +- .../data-alias.controller.ts | 8 +- .../datas.controller.spec.ts | 2 +- .../datas => controllers}/datas.controller.ts | 6 +- .../imports}/helpers/EntityMap.ts | 0 .../imports}/helpers/NocoSyncDestAdapter.ts | 0 .../imports}/helpers/NocoSyncSourceAdapter.ts | 0 .../imports}/helpers/fetchAT.ts | 0 .../imports}/helpers/job.ts | 2 +- .../imports}/helpers/readAndProcessData.ts | 0 .../imports}/helpers/syncMap.ts | 0 .../{ => imports}/import.controller.spec.ts | 2 +- .../{ => imports}/import.controller.ts | 18 +- .../project-users.controller.spec.ts | 2 +- .../project-users.controller.ts | 6 +- .../test/TestResetService/index.ts | 0 .../resetMetaSakilaSqliteProject.ts | 0 .../resetMysqlSakilaProject.ts | 0 .../TestResetService/resetPgSakilaProject.ts | 0 .../test/test.controller.spec.ts | 2 +- .../test/test.controller.ts | 3 +- .../users}/ui/auth/emailVerify.ts | 0 .../users}/ui/auth/resetPassword.ts | 0 .../ui/emailTemplates/forgotPassword.ts | 0 .../users}/ui/emailTemplates/invite.ts | 0 .../users}/ui/emailTemplates/verify.ts | 0 .../users/users.controller.spec.ts | 2 +- .../users/users.controller.ts | 4 +- .../modules/api-tokens/api-tokens.module.ts | 9 - .../modules/attachments/attachments.module.ts | 20 --- .../src/modules/audits/audits.module.ts | 9 - .../src/modules/auth/auth.module.ts | 14 -- .../nocodb-nest/src/modules/auth/constants.ts | 4 - .../src/modules/bases/bases.module.ts | 9 - .../src/modules/caches/caches.module.ts | 9 - .../src/modules/columns/columns.module.ts | 9 - .../src/modules/datas/datas.module.ts | 23 ++- .../src/modules/filters/filters.module.ts | 9 - .../form-columns/form-columns.module.ts | 9 - .../src/modules/forms/forms.module.ts | 9 - .../src/modules/galleries/galleries.module.ts | 9 - .../src/modules/global/global.module.ts | 5 +- .../grid-columns/grid-columns.module.ts | 9 - .../src/modules/grids/grids.module.ts | 9 - .../hook-filters/hook-filters.module.ts | 9 - .../src/modules/hooks/hooks.module.ts | 9 - .../src/modules/import/import.module.ts | 41 ----- .../src/modules/kanbans/kanbans.module.ts | 9 - .../src/modules/maps/maps.module.ts | 9 - .../modules/meta-diffs/meta-diffs.module.ts | 9 - .../src/modules/meta/meta.module.ts | 11 -- .../src/modules/metas/metas.module.ts | 157 ++++++++++++++++++ .../model-visibilities.module.ts | 9 - .../modules/org-lcense/org-lcense.module.ts | 9 - .../modules/org-tokens/org-tokens.module.ts | 10 -- .../src/modules/org-users/org-users.module.ts | 10 -- .../src/modules/plugins/plugins.module.ts | 9 - .../project-users/project-users.module.ts | 9 - .../src/modules/projects/projects.module.ts | 10 -- .../public-datas-export.module.ts | 9 - .../public-datas/public-datas.module.ts | 20 --- .../public-metas/public-metas.module.ts | 9 - .../shared-bases/shared-bases.module.ts | 9 - .../src/modules/sorts/sorts.module.ts | 9 - .../src/modules/sync/sync.module.ts | 9 - .../src/modules/tables/tables.module.ts | 10 -- .../src/modules/test/test.module.ts | 4 +- .../src/modules/test/test.service.spec.ts | 19 --- .../src/modules/test/test.service.ts | 4 - .../src/modules/users/user.spec.ts | 7 - .../nocodb-nest/src/modules/users/user.ts | 1 - .../src/modules/users/users.module.ts | 6 +- .../src/modules/utils/utils.module.ts | 9 - .../view-columns/view-columns.module.ts | 9 - .../src/modules/views/views.module.ts | 11 -- .../api-docs}/api-docs.service.spec.ts | 0 .../api-docs}/api-docs.service.ts | 4 +- .../api-docs}/swagger/getPaths.ts | 4 +- .../api-docs}/swagger/getSchemas.ts | 4 +- .../swagger/getSwaggerColumnMetas.ts | 6 +- .../api-docs}/swagger/getSwaggerJSON.ts | 4 +- .../api-docs}/swagger/swagger-base.json | 0 .../api-docs}/swagger/templates/headers.ts | 0 .../api-docs}/swagger/templates/params.ts | 2 +- .../api-docs}/swagger/templates/paths.ts | 0 .../api-docs}/swagger/templates/schemas.ts | 0 .../nocodb-nest/src/services/auth.service.ts | 4 +- .../src/services/import.service.spec.ts | 19 --- .../src/services/import.service.ts | 4 - .../src/services/org-users.service.ts | 2 +- .../project-users.service.spec.ts | 0 .../project-users/project-users.service.ts | 0 .../project-users}/ui/auth/emailVerify.ts | 0 .../project-users}/ui/auth/resetPassword.ts | 0 .../ui/emailTemplates/forgotPassword.ts | 0 .../ui/emailTemplates/invite.ts | 0 .../ui/emailTemplates/verify.ts | 0 .../{modules => services}/users/helpers.ts | 0 .../users/users.service.spec.ts | 0 .../users/users.service.ts | 4 +- .../src/strategies/jwt.strategy.ts | 6 +- 104 files changed, 234 insertions(+), 610 deletions(-) rename packages/nocodb-nest/src/{modules/datas => controllers}/data-alias.controller.spec.ts (90%) rename packages/nocodb-nest/src/{modules/datas => controllers}/data-alias.controller.ts (96%) rename packages/nocodb-nest/src/{modules/datas => controllers}/datas.controller.spec.ts (90%) rename packages/nocodb-nest/src/{modules/datas => controllers}/datas.controller.ts (95%) rename packages/nocodb-nest/src/{modules/sync => controllers/imports}/helpers/EntityMap.ts (100%) rename packages/nocodb-nest/src/{modules/sync => controllers/imports}/helpers/NocoSyncDestAdapter.ts (100%) rename packages/nocodb-nest/src/{modules/sync => controllers/imports}/helpers/NocoSyncSourceAdapter.ts (100%) rename packages/nocodb-nest/src/{modules/sync => controllers/imports}/helpers/fetchAT.ts (100%) rename packages/nocodb-nest/src/{modules/sync => controllers/imports}/helpers/job.ts (99%) rename packages/nocodb-nest/src/{modules/sync => controllers/imports}/helpers/readAndProcessData.ts (100%) rename packages/nocodb-nest/src/{modules/sync => controllers/imports}/helpers/syncMap.ts (100%) rename packages/nocodb-nest/src/controllers/{ => imports}/import.controller.spec.ts (89%) rename packages/nocodb-nest/src/controllers/{ => imports}/import.controller.ts (86%) rename packages/nocodb-nest/src/{modules/project-users => controllers}/project-users.controller.spec.ts (87%) rename packages/nocodb-nest/src/{modules/project-users => controllers}/project-users.controller.ts (92%) rename packages/nocodb-nest/src/{modules => controllers}/test/TestResetService/index.ts (100%) rename packages/nocodb-nest/src/{modules => controllers}/test/TestResetService/resetMetaSakilaSqliteProject.ts (100%) rename packages/nocodb-nest/src/{modules => controllers}/test/TestResetService/resetMysqlSakilaProject.ts (100%) rename packages/nocodb-nest/src/{modules => controllers}/test/TestResetService/resetPgSakilaProject.ts (100%) rename packages/nocodb-nest/src/{modules => controllers}/test/test.controller.spec.ts (89%) rename packages/nocodb-nest/src/{modules => controllers}/test/test.controller.ts (82%) rename packages/nocodb-nest/src/{modules/project-users => controllers/users}/ui/auth/emailVerify.ts (100%) rename packages/nocodb-nest/src/{modules/project-users => controllers/users}/ui/auth/resetPassword.ts (100%) rename packages/nocodb-nest/src/{modules/project-users => controllers/users}/ui/emailTemplates/forgotPassword.ts (100%) rename packages/nocodb-nest/src/{modules/project-users => controllers/users}/ui/emailTemplates/invite.ts (100%) rename packages/nocodb-nest/src/{modules/project-users => controllers/users}/ui/emailTemplates/verify.ts (100%) rename packages/nocodb-nest/src/{modules => controllers}/users/users.controller.spec.ts (89%) rename packages/nocodb-nest/src/{modules => controllers}/users/users.controller.ts (97%) delete mode 100644 packages/nocodb-nest/src/modules/api-tokens/api-tokens.module.ts delete mode 100644 packages/nocodb-nest/src/modules/attachments/attachments.module.ts delete mode 100644 packages/nocodb-nest/src/modules/audits/audits.module.ts delete mode 100644 packages/nocodb-nest/src/modules/auth/auth.module.ts delete mode 100644 packages/nocodb-nest/src/modules/auth/constants.ts delete mode 100644 packages/nocodb-nest/src/modules/bases/bases.module.ts delete mode 100644 packages/nocodb-nest/src/modules/caches/caches.module.ts delete mode 100644 packages/nocodb-nest/src/modules/columns/columns.module.ts delete mode 100644 packages/nocodb-nest/src/modules/filters/filters.module.ts delete mode 100644 packages/nocodb-nest/src/modules/form-columns/form-columns.module.ts delete mode 100644 packages/nocodb-nest/src/modules/forms/forms.module.ts delete mode 100644 packages/nocodb-nest/src/modules/galleries/galleries.module.ts delete mode 100644 packages/nocodb-nest/src/modules/grid-columns/grid-columns.module.ts delete mode 100644 packages/nocodb-nest/src/modules/grids/grids.module.ts delete mode 100644 packages/nocodb-nest/src/modules/hook-filters/hook-filters.module.ts delete mode 100644 packages/nocodb-nest/src/modules/hooks/hooks.module.ts delete mode 100644 packages/nocodb-nest/src/modules/import/import.module.ts delete mode 100644 packages/nocodb-nest/src/modules/kanbans/kanbans.module.ts delete mode 100644 packages/nocodb-nest/src/modules/maps/maps.module.ts delete mode 100644 packages/nocodb-nest/src/modules/meta-diffs/meta-diffs.module.ts delete mode 100644 packages/nocodb-nest/src/modules/meta/meta.module.ts create mode 100644 packages/nocodb-nest/src/modules/metas/metas.module.ts delete mode 100644 packages/nocodb-nest/src/modules/model-visibilities/model-visibilities.module.ts delete mode 100644 packages/nocodb-nest/src/modules/org-lcense/org-lcense.module.ts delete mode 100644 packages/nocodb-nest/src/modules/org-tokens/org-tokens.module.ts delete mode 100644 packages/nocodb-nest/src/modules/org-users/org-users.module.ts delete mode 100644 packages/nocodb-nest/src/modules/plugins/plugins.module.ts delete mode 100644 packages/nocodb-nest/src/modules/project-users/project-users.module.ts delete mode 100644 packages/nocodb-nest/src/modules/projects/projects.module.ts delete mode 100644 packages/nocodb-nest/src/modules/public-datas-export/public-datas-export.module.ts delete mode 100644 packages/nocodb-nest/src/modules/public-datas/public-datas.module.ts delete mode 100644 packages/nocodb-nest/src/modules/public-metas/public-metas.module.ts delete mode 100644 packages/nocodb-nest/src/modules/shared-bases/shared-bases.module.ts delete mode 100644 packages/nocodb-nest/src/modules/sorts/sorts.module.ts delete mode 100644 packages/nocodb-nest/src/modules/sync/sync.module.ts delete mode 100644 packages/nocodb-nest/src/modules/tables/tables.module.ts delete mode 100644 packages/nocodb-nest/src/modules/test/test.service.spec.ts delete mode 100644 packages/nocodb-nest/src/modules/test/test.service.ts delete mode 100644 packages/nocodb-nest/src/modules/users/user.spec.ts delete mode 100644 packages/nocodb-nest/src/modules/users/user.ts delete mode 100644 packages/nocodb-nest/src/modules/utils/utils.module.ts delete mode 100644 packages/nocodb-nest/src/modules/view-columns/view-columns.module.ts delete mode 100644 packages/nocodb-nest/src/modules/views/views.module.ts rename packages/nocodb-nest/src/{modules => services/api-docs}/api-docs.service.spec.ts (100%) rename packages/nocodb-nest/src/{modules => services/api-docs}/api-docs.service.ts (88%) rename packages/nocodb-nest/src/{modules => services/api-docs}/swagger/getPaths.ts (92%) rename packages/nocodb-nest/src/{modules => services/api-docs}/swagger/getSchemas.ts (91%) rename packages/nocodb-nest/src/{modules => services/api-docs}/swagger/getSwaggerColumnMetas.ts (92%) rename packages/nocodb-nest/src/{modules => services/api-docs}/swagger/getSwaggerJSON.ts (96%) rename packages/nocodb-nest/src/{modules => services/api-docs}/swagger/swagger-base.json (100%) rename packages/nocodb-nest/src/{modules => services/api-docs}/swagger/templates/headers.ts (100%) rename packages/nocodb-nest/src/{modules => services/api-docs}/swagger/templates/params.ts (98%) rename packages/nocodb-nest/src/{modules => services/api-docs}/swagger/templates/paths.ts (100%) rename packages/nocodb-nest/src/{modules => services/api-docs}/swagger/templates/schemas.ts (100%) delete mode 100644 packages/nocodb-nest/src/services/import.service.spec.ts delete mode 100644 packages/nocodb-nest/src/services/import.service.ts rename packages/nocodb-nest/src/{modules => services}/project-users/project-users.service.spec.ts (100%) rename packages/nocodb-nest/src/{modules => services}/project-users/project-users.service.ts (100%) rename packages/nocodb-nest/src/{modules/users => services/project-users}/ui/auth/emailVerify.ts (100%) rename packages/nocodb-nest/src/{modules/users => services/project-users}/ui/auth/resetPassword.ts (100%) rename packages/nocodb-nest/src/{modules/users => services/project-users}/ui/emailTemplates/forgotPassword.ts (100%) rename packages/nocodb-nest/src/{modules/users => services/project-users}/ui/emailTemplates/invite.ts (100%) rename packages/nocodb-nest/src/{modules/users => services/project-users}/ui/emailTemplates/verify.ts (100%) rename packages/nocodb-nest/src/{modules => services}/users/helpers.ts (100%) rename packages/nocodb-nest/src/{modules => services}/users/users.service.spec.ts (100%) rename packages/nocodb-nest/src/{modules => services}/users/users.service.ts (98%) diff --git a/packages/nocodb-nest/src/app.module.ts b/packages/nocodb-nest/src/app.module.ts index fdd88a8224..6e56b84d7e 100644 --- a/packages/nocodb-nest/src/app.module.ts +++ b/packages/nocodb-nest/src/app.module.ts @@ -7,59 +7,23 @@ import { GlobalExceptionFilter } from './filters/global-exception/global-excepti import NcPluginMgrv2 from './helpers/NcPluginMgrv2'; import { GlobalMiddleware } from './middlewares/global/global.middleware'; import { GuiMiddleware } from './middlewares/gui/gui.middleware'; +import { DatasModule } from './modules/datas/datas.module'; import { AuthService } from './services/auth.service'; import { UsersModule } from './modules/users/users.module'; import { MetaService } from './meta/meta.service'; -import { UtilsModule } from './modules/utils/utils.module'; -import { ProjectsModule } from './modules/projects/projects.module'; import Noco from './Noco'; -import { TablesModule } from './modules/tables/tables.module'; -import { ViewsModule } from './modules/views/views.module'; -import { FiltersModule } from './modules/filters/filters.module'; -import { SortsModule } from './modules/sorts/sorts.module'; -import { ColumnsModule } from './modules/columns/columns.module'; -import { ViewColumnsModule } from './modules/view-columns/view-columns.module'; -import { BasesModule } from './modules/bases/bases.module'; -import { HooksModule } from './modules/hooks/hooks.module'; -import { SharedBasesModule } from './modules/shared-bases/shared-bases.module'; -import { FormsModule } from './modules/forms/forms.module'; -import { GridsModule } from './modules/grids/grids.module'; -import { KanbansModule } from './modules/kanbans/kanbans.module'; -import { GalleriesModule } from './modules/galleries/galleries.module'; -import { FormColumnsModule } from './modules/form-columns/form-columns.module'; -import { GridColumnsModule } from './modules/grid-columns/grid-columns.module'; -import { MapsModule } from './modules/maps/maps.module'; -import { ProjectUsersModule } from './modules/project-users/project-users.module'; -import { ModelVisibilitiesModule } from './modules/model-visibilities/model-visibilities.module'; -import { HookFiltersModule } from './modules/hook-filters/hook-filters.module'; -import { ApiTokensModule } from './modules/api-tokens/api-tokens.module'; -import { AttachmentsModule } from './modules/attachments/attachments.module'; -import { OrgLcenseModule } from './modules/org-lcense/org-lcense.module'; -import { OrgTokensModule } from './modules/org-tokens/org-tokens.module'; -import { OrgUsersModule } from './modules/org-users/org-users.module'; -import { MetaDiffsModule } from './modules/meta-diffs/meta-diffs.module'; -import { AuditsModule } from './modules/audits/audits.module'; -import { DatasModule } from './modules/datas/datas.module'; -import { ApiDocsModule } from './modules/api-docs/api-docs.module'; -import { PublicMetasModule } from './modules/public-metas/public-metas.module'; -import { PublicDatasModule } from './modules/public-datas/public-datas.module'; -import { PublicDatasExportModule } from './modules/public-datas-export/public-datas-export.module'; -import { SyncModule } from './modules/sync/sync.module'; -import { ImportModule } from './modules/import/import.module'; -import { CachesModule } from './modules/caches/caches.module'; import { TestModule } from './modules/test/test.module'; -import { PluginsModule } from './modules/plugins/plugins.module'; 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 { GoogleStrategy } from './strategies/google.strategy/google.strategy'; import NcUpgrader from './version-upgrader/NcUpgrader'; +import { MetasModule } from './modules/metas/metas.module'; import type { MiddlewareConsumer, OnApplicationBootstrap, } from '@nestjs/common'; -import { MetaModule } from './modules/meta/meta.module'; @Module({ imports: [ @@ -67,66 +31,22 @@ import { MetaModule } from './modules/meta/meta.module'; rootPath: join(process.cwd(), 'public'), }), GlobalModule, - // AuthModule, UsersModule, - UtilsModule, - ProjectsModule, - TablesModule, - ViewsModule, - FiltersModule, - SortsModule, - ColumnsModule, - ViewColumnsModule, - BasesModule, - HooksModule, - SharedBasesModule, - FormsModule, - GridsModule, - KanbansModule, - GalleriesModule, - FormColumnsModule, - GridColumnsModule, - MapsModule, - ProjectUsersModule, - ModelVisibilitiesModule, - HookFiltersModule, - ApiTokensModule, - AttachmentsModule, - OrgLcenseModule, - OrgTokensModule, - OrgUsersModule, - MetaDiffsModule, - AuditsModule, - DatasModule, - ApiDocsModule, - PublicMetasModule, - PublicDatasModule, - PublicDatasExportModule, - SyncModule, - ImportModule, - CachesModule, ...(process.env['PLAYWRIGHT_TEST'] === 'true' ? [TestModule] : []), - PluginsModule, - MetaModule, + MetasModule, + DatasModule, ], controllers: [], providers: [ - // { - // provide: APP_GUARD, - // useClass: GlobalGuard, - // }, AuthService, { provide: APP_FILTER, useClass: GlobalExceptionFilter, }, - // JwtStrategyProvider, LocalStrategy, - // ExtractProjectIdMiddleware, AuthTokenStrategy, BaseViewStrategy, GoogleStrategy, - // GlobalGuard, ], }) export class AppModule implements OnApplicationBootstrap { diff --git a/packages/nocodb-nest/src/controllers/api-docs/api-docs.controller.spec.ts b/packages/nocodb-nest/src/controllers/api-docs/api-docs.controller.spec.ts index 2beb85f814..7850439cc2 100644 --- a/packages/nocodb-nest/src/controllers/api-docs/api-docs.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/api-docs/api-docs.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { ApiDocsController } from './api-docs.controller'; -import { ApiDocsService } from '../../modules/api-docs.service'; +import { ApiDocsService } from '../../services/api-docs/api-docs.service'; import type { TestingModule } from '@nestjs/testing'; describe('ApiDocsController', () => { diff --git a/packages/nocodb-nest/src/controllers/api-docs/api-docs.controller.ts b/packages/nocodb-nest/src/controllers/api-docs/api-docs.controller.ts index 919710f8e0..08860ba6e4 100644 --- a/packages/nocodb-nest/src/controllers/api-docs/api-docs.controller.ts +++ b/packages/nocodb-nest/src/controllers/api-docs/api-docs.controller.ts @@ -11,7 +11,7 @@ import { Acl, ExtractProjectIdMiddleware, } from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { ApiDocsService } from '../../modules/api-docs.service'; +import { ApiDocsService } from '../../services/api-docs/api-docs.service'; import getSwaggerHtml from './template/swaggerHtml'; import getRedocHtml from './template/redocHtml'; diff --git a/packages/nocodb-nest/src/modules/datas/data-alias.controller.spec.ts b/packages/nocodb-nest/src/controllers/data-alias.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/datas/data-alias.controller.spec.ts rename to packages/nocodb-nest/src/controllers/data-alias.controller.spec.ts index 5cec37b678..e2274f57f5 100644 --- a/packages/nocodb-nest/src/modules/datas/data-alias.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/data-alias.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { DataAliasController } from './data-alias.controller'; -import { DatasService } from '../../services/datas.service'; +import { DatasService } from '../services/datas.service'; import type { TestingModule } from '@nestjs/testing'; describe('DataAliasController', () => { diff --git a/packages/nocodb-nest/src/modules/datas/data-alias.controller.ts b/packages/nocodb-nest/src/controllers/data-alias.controller.ts similarity index 96% rename from packages/nocodb-nest/src/modules/datas/data-alias.controller.ts rename to packages/nocodb-nest/src/controllers/data-alias.controller.ts index 4184133425..296b0a12a8 100644 --- a/packages/nocodb-nest/src/modules/datas/data-alias.controller.ts +++ b/packages/nocodb-nest/src/controllers/data-alias.controller.ts @@ -12,13 +12,13 @@ import { UseGuards, } from '@nestjs/common'; import { AuthGuard } from '@nestjs/passport'; -import { GlobalGuard } from '../../guards/global/global.guard'; -import { parseHrtimeToSeconds } from '../../helpers'; +import { GlobalGuard } from '../guards/global/global.guard'; +import { parseHrtimeToSeconds } from '../helpers'; import { Acl, ExtractProjectIdMiddleware, -} from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { DatasService } from '../../services/datas.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { DatasService } from '../services/datas.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/datas/datas.controller.spec.ts b/packages/nocodb-nest/src/controllers/datas.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/datas/datas.controller.spec.ts rename to packages/nocodb-nest/src/controllers/datas.controller.spec.ts index 9275551296..bcc3c08ec4 100644 --- a/packages/nocodb-nest/src/modules/datas/datas.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/datas.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { DatasController } from './datas.controller'; -import { DatasService } from '../../services/datas.service'; +import { DatasService } from '../services/datas.service'; import type { TestingModule } from '@nestjs/testing'; describe('DatasController', () => { diff --git a/packages/nocodb-nest/src/modules/datas/datas.controller.ts b/packages/nocodb-nest/src/controllers/datas.controller.ts similarity index 95% rename from packages/nocodb-nest/src/modules/datas/datas.controller.ts rename to packages/nocodb-nest/src/controllers/datas.controller.ts index 8a92cbc996..46b7a4addc 100644 --- a/packages/nocodb-nest/src/modules/datas/datas.controller.ts +++ b/packages/nocodb-nest/src/controllers/datas.controller.ts @@ -10,12 +10,12 @@ import { Request, UseGuards, } from '@nestjs/common'; -import { GlobalGuard } from '../../guards/global/global.guard'; +import { GlobalGuard } from '../guards/global/global.guard'; import { Acl, ExtractProjectIdMiddleware, -} from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { DatasService } from '../../services/datas.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { DatasService } from '../services/datas.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/sync/helpers/EntityMap.ts b/packages/nocodb-nest/src/controllers/imports/helpers/EntityMap.ts similarity index 100% rename from packages/nocodb-nest/src/modules/sync/helpers/EntityMap.ts rename to packages/nocodb-nest/src/controllers/imports/helpers/EntityMap.ts diff --git a/packages/nocodb-nest/src/modules/sync/helpers/NocoSyncDestAdapter.ts b/packages/nocodb-nest/src/controllers/imports/helpers/NocoSyncDestAdapter.ts similarity index 100% rename from packages/nocodb-nest/src/modules/sync/helpers/NocoSyncDestAdapter.ts rename to packages/nocodb-nest/src/controllers/imports/helpers/NocoSyncDestAdapter.ts diff --git a/packages/nocodb-nest/src/modules/sync/helpers/NocoSyncSourceAdapter.ts b/packages/nocodb-nest/src/controllers/imports/helpers/NocoSyncSourceAdapter.ts similarity index 100% rename from packages/nocodb-nest/src/modules/sync/helpers/NocoSyncSourceAdapter.ts rename to packages/nocodb-nest/src/controllers/imports/helpers/NocoSyncSourceAdapter.ts diff --git a/packages/nocodb-nest/src/modules/sync/helpers/fetchAT.ts b/packages/nocodb-nest/src/controllers/imports/helpers/fetchAT.ts similarity index 100% rename from packages/nocodb-nest/src/modules/sync/helpers/fetchAT.ts rename to packages/nocodb-nest/src/controllers/imports/helpers/fetchAT.ts diff --git a/packages/nocodb-nest/src/modules/sync/helpers/job.ts b/packages/nocodb-nest/src/controllers/imports/helpers/job.ts similarity index 99% rename from packages/nocodb-nest/src/modules/sync/helpers/job.ts rename to packages/nocodb-nest/src/controllers/imports/helpers/job.ts index ffda0a45bb..3050685a8f 100644 --- a/packages/nocodb-nest/src/modules/sync/helpers/job.ts +++ b/packages/nocodb-nest/src/controllers/imports/helpers/job.ts @@ -15,7 +15,7 @@ import { FiltersService } from '../../../services/filters.service'; import { FormColumnsService } from '../../../services/form-columns.service'; import { GalleriesService } from '../../../services/galleries.service'; import { GridsService } from '../../../services/grids.service'; -import { ProjectUsersService } from '../../project-users/project-users.service'; +import { ProjectUsersService } from '../../../services/project-users/project-users.service'; import { ProjectsService } from '../../../services/projects.service'; import { SortsService } from '../../../services/sorts.service'; import { TablesService } from '../../../services/tables.service'; diff --git a/packages/nocodb-nest/src/modules/sync/helpers/readAndProcessData.ts b/packages/nocodb-nest/src/controllers/imports/helpers/readAndProcessData.ts similarity index 100% rename from packages/nocodb-nest/src/modules/sync/helpers/readAndProcessData.ts rename to packages/nocodb-nest/src/controllers/imports/helpers/readAndProcessData.ts diff --git a/packages/nocodb-nest/src/modules/sync/helpers/syncMap.ts b/packages/nocodb-nest/src/controllers/imports/helpers/syncMap.ts similarity index 100% rename from packages/nocodb-nest/src/modules/sync/helpers/syncMap.ts rename to packages/nocodb-nest/src/controllers/imports/helpers/syncMap.ts diff --git a/packages/nocodb-nest/src/controllers/import.controller.spec.ts b/packages/nocodb-nest/src/controllers/imports/import.controller.spec.ts similarity index 89% rename from packages/nocodb-nest/src/controllers/import.controller.spec.ts rename to packages/nocodb-nest/src/controllers/imports/import.controller.spec.ts index 11b4e9b786..159afcb206 100644 --- a/packages/nocodb-nest/src/controllers/import.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/imports/import.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { ImportController } from './import.controller'; -import { ImportService } from '../services/import.service'; +import { ImportService } from '../../services/import.service'; import type { TestingModule } from '@nestjs/testing'; describe('ImportController', () => { diff --git a/packages/nocodb-nest/src/controllers/import.controller.ts b/packages/nocodb-nest/src/controllers/imports/import.controller.ts similarity index 86% rename from packages/nocodb-nest/src/controllers/import.controller.ts rename to packages/nocodb-nest/src/controllers/imports/import.controller.ts index 0589c8ec65..d20f74408f 100644 --- a/packages/nocodb-nest/src/controllers/import.controller.ts +++ b/packages/nocodb-nest/src/controllers/imports/import.controller.ts @@ -1,15 +1,14 @@ import { Controller, HttpCode, Post, Request, UseGuards } from '@nestjs/common'; import { forwardRef, Inject } from '@nestjs/common'; import { ModuleRef } from '@nestjs/core'; -import { GlobalGuard } from '../guards/global/global.guard'; -import { NcError } from '../helpers/catchError'; -import { ExtractProjectIdMiddleware } from '../middlewares/extract-project-id/extract-project-id.middleware'; -import { SyncSource } from '../models'; -import NocoJobs from '../jobs/NocoJobs'; -import { SocketService } from '../services/socket.service'; -import airtableSyncJob from '../modules/sync/helpers/job'; -import { ImportService } from '../services/import.service'; -import type { AirtableSyncConfig } from '../modules/sync/helpers/job'; +import { GlobalGuard } from '../../guards/global/global.guard'; +import { NcError } from '../../helpers/catchError'; +import { ExtractProjectIdMiddleware } from '../../middlewares/extract-project-id/extract-project-id.middleware'; +import { SyncSource } from '../../models'; +import NocoJobs from '../../jobs/NocoJobs'; +import { SocketService } from '../../services/socket.service'; +import airtableSyncJob from './helpers/job'; +import type { AirtableSyncConfig } from './helpers/job'; import type { Server } from 'socket.io'; @@ -79,7 +78,6 @@ const initJob = (sv: Server, jobs: { [p: string]: { last_message: any } }) => { @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) export class ImportController { constructor( - private readonly importService: ImportService, private readonly socketService: SocketService, @Inject(forwardRef(() => ModuleRef)) private readonly moduleRef: ModuleRef, ) {} diff --git a/packages/nocodb-nest/src/modules/project-users/project-users.controller.spec.ts b/packages/nocodb-nest/src/controllers/project-users.controller.spec.ts similarity index 87% rename from packages/nocodb-nest/src/modules/project-users/project-users.controller.spec.ts rename to packages/nocodb-nest/src/controllers/project-users.controller.spec.ts index b7f3bc7003..435b1bf27b 100644 --- a/packages/nocodb-nest/src/modules/project-users/project-users.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/project-users.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { ProjectUsersController } from './project-users.controller'; -import { ProjectUsersService } from './project-users.service'; +import { ProjectUsersService } from '../services/project-users/project-users.service'; import type { TestingModule } from '@nestjs/testing'; describe('ProjectUsersController', () => { diff --git a/packages/nocodb-nest/src/modules/project-users/project-users.controller.ts b/packages/nocodb-nest/src/controllers/project-users.controller.ts similarity index 92% rename from packages/nocodb-nest/src/modules/project-users/project-users.controller.ts rename to packages/nocodb-nest/src/controllers/project-users.controller.ts index 9df41ff570..ca97e8b02c 100644 --- a/packages/nocodb-nest/src/modules/project-users/project-users.controller.ts +++ b/packages/nocodb-nest/src/controllers/project-users.controller.ts @@ -12,12 +12,12 @@ import { } from '@nestjs/common'; import { ProjectUserReqType } from 'nocodb-sdk'; import { AuthGuard } from '@nestjs/passport'; -import { GlobalGuard } from '../../guards/global/global.guard'; +import { GlobalGuard } from '../guards/global/global.guard'; import { Acl, ExtractProjectIdMiddleware, -} from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { ProjectUsersService } from './project-users.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { ProjectUsersService } from '../services/project-users/project-users.service'; @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) @Controller() diff --git a/packages/nocodb-nest/src/modules/test/TestResetService/index.ts b/packages/nocodb-nest/src/controllers/test/TestResetService/index.ts similarity index 100% rename from packages/nocodb-nest/src/modules/test/TestResetService/index.ts rename to packages/nocodb-nest/src/controllers/test/TestResetService/index.ts diff --git a/packages/nocodb-nest/src/modules/test/TestResetService/resetMetaSakilaSqliteProject.ts b/packages/nocodb-nest/src/controllers/test/TestResetService/resetMetaSakilaSqliteProject.ts similarity index 100% rename from packages/nocodb-nest/src/modules/test/TestResetService/resetMetaSakilaSqliteProject.ts rename to packages/nocodb-nest/src/controllers/test/TestResetService/resetMetaSakilaSqliteProject.ts diff --git a/packages/nocodb-nest/src/modules/test/TestResetService/resetMysqlSakilaProject.ts b/packages/nocodb-nest/src/controllers/test/TestResetService/resetMysqlSakilaProject.ts similarity index 100% rename from packages/nocodb-nest/src/modules/test/TestResetService/resetMysqlSakilaProject.ts rename to packages/nocodb-nest/src/controllers/test/TestResetService/resetMysqlSakilaProject.ts diff --git a/packages/nocodb-nest/src/modules/test/TestResetService/resetPgSakilaProject.ts b/packages/nocodb-nest/src/controllers/test/TestResetService/resetPgSakilaProject.ts similarity index 100% rename from packages/nocodb-nest/src/modules/test/TestResetService/resetPgSakilaProject.ts rename to packages/nocodb-nest/src/controllers/test/TestResetService/resetPgSakilaProject.ts diff --git a/packages/nocodb-nest/src/modules/test/test.controller.spec.ts b/packages/nocodb-nest/src/controllers/test/test.controller.spec.ts similarity index 89% rename from packages/nocodb-nest/src/modules/test/test.controller.spec.ts rename to packages/nocodb-nest/src/controllers/test/test.controller.spec.ts index 36ed3ecc7a..3867bdd4e9 100644 --- a/packages/nocodb-nest/src/modules/test/test.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/test/test.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { TestController } from './test.controller'; -import { TestService } from './test.service'; +import { TestService } from '../../modules/test/test.service'; import type { TestingModule } from '@nestjs/testing'; describe('TestController', () => { diff --git a/packages/nocodb-nest/src/modules/test/test.controller.ts b/packages/nocodb-nest/src/controllers/test/test.controller.ts similarity index 82% rename from packages/nocodb-nest/src/modules/test/test.controller.ts rename to packages/nocodb-nest/src/controllers/test/test.controller.ts index 868e83a220..34185ec7b7 100644 --- a/packages/nocodb-nest/src/modules/test/test.controller.ts +++ b/packages/nocodb-nest/src/controllers/test/test.controller.ts @@ -1,10 +1,9 @@ import { Controller, HttpCode, Post, Req } from '@nestjs/common'; -import { TestService } from './test.service'; import { TestResetService } from './TestResetService'; @Controller() export class TestController { - constructor(private readonly testService: TestService) {} + constructor() {} @Post('/api/v1/meta/test/reset') @HttpCode(200) diff --git a/packages/nocodb-nest/src/modules/project-users/ui/auth/emailVerify.ts b/packages/nocodb-nest/src/controllers/users/ui/auth/emailVerify.ts similarity index 100% rename from packages/nocodb-nest/src/modules/project-users/ui/auth/emailVerify.ts rename to packages/nocodb-nest/src/controllers/users/ui/auth/emailVerify.ts diff --git a/packages/nocodb-nest/src/modules/project-users/ui/auth/resetPassword.ts b/packages/nocodb-nest/src/controllers/users/ui/auth/resetPassword.ts similarity index 100% rename from packages/nocodb-nest/src/modules/project-users/ui/auth/resetPassword.ts rename to packages/nocodb-nest/src/controllers/users/ui/auth/resetPassword.ts diff --git a/packages/nocodb-nest/src/modules/project-users/ui/emailTemplates/forgotPassword.ts b/packages/nocodb-nest/src/controllers/users/ui/emailTemplates/forgotPassword.ts similarity index 100% rename from packages/nocodb-nest/src/modules/project-users/ui/emailTemplates/forgotPassword.ts rename to packages/nocodb-nest/src/controllers/users/ui/emailTemplates/forgotPassword.ts diff --git a/packages/nocodb-nest/src/modules/project-users/ui/emailTemplates/invite.ts b/packages/nocodb-nest/src/controllers/users/ui/emailTemplates/invite.ts similarity index 100% rename from packages/nocodb-nest/src/modules/project-users/ui/emailTemplates/invite.ts rename to packages/nocodb-nest/src/controllers/users/ui/emailTemplates/invite.ts diff --git a/packages/nocodb-nest/src/modules/project-users/ui/emailTemplates/verify.ts b/packages/nocodb-nest/src/controllers/users/ui/emailTemplates/verify.ts similarity index 100% rename from packages/nocodb-nest/src/modules/project-users/ui/emailTemplates/verify.ts rename to packages/nocodb-nest/src/controllers/users/ui/emailTemplates/verify.ts diff --git a/packages/nocodb-nest/src/modules/users/users.controller.spec.ts b/packages/nocodb-nest/src/controllers/users/users.controller.spec.ts similarity index 89% rename from packages/nocodb-nest/src/modules/users/users.controller.spec.ts rename to packages/nocodb-nest/src/controllers/users/users.controller.spec.ts index a61fbe1849..1e2419cd90 100644 --- a/packages/nocodb-nest/src/modules/users/users.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/users/users.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { UsersController } from './users.controller'; -import { UsersService } from './users.service'; +import { UsersService } from '../../services/users/users.service'; import type { TestingModule } from '@nestjs/testing'; describe('UsersController', () => { diff --git a/packages/nocodb-nest/src/modules/users/users.controller.ts b/packages/nocodb-nest/src/controllers/users/users.controller.ts similarity index 97% rename from packages/nocodb-nest/src/modules/users/users.controller.ts rename to packages/nocodb-nest/src/controllers/users/users.controller.ts index 3280ff8cb4..f3b8e93d93 100644 --- a/packages/nocodb-nest/src/modules/users/users.controller.ts +++ b/packages/nocodb-nest/src/controllers/users/users.controller.ts @@ -22,8 +22,8 @@ import { import Noco from '../../Noco'; import extractRolesObj from '../../utils/extractRolesObj'; import { Audit, User } from '../../models'; -import { genJwt, randomTokenString, setTokenCookie } from './helpers'; -import { UsersService } from './users.service'; +import { genJwt, randomTokenString, setTokenCookie } from '../../services/users/helpers'; +import { UsersService } from '../../services/users/users.service'; @Controller() export class UsersController { diff --git a/packages/nocodb-nest/src/modules/api-tokens/api-tokens.module.ts b/packages/nocodb-nest/src/modules/api-tokens/api-tokens.module.ts deleted file mode 100644 index 3abd1e7224..0000000000 --- a/packages/nocodb-nest/src/modules/api-tokens/api-tokens.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { ApiTokensService } from '../../services/api-tokens.service'; -import { ApiTokensController } from '../../controllers/api-tokens.controller'; - -@Module({ - controllers: [ApiTokensController], - providers: [ApiTokensService], -}) -export class ApiTokensModule {} diff --git a/packages/nocodb-nest/src/modules/attachments/attachments.module.ts b/packages/nocodb-nest/src/modules/attachments/attachments.module.ts deleted file mode 100644 index 799e843457..0000000000 --- a/packages/nocodb-nest/src/modules/attachments/attachments.module.ts +++ /dev/null @@ -1,20 +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 { AttachmentsService } from '../../services/attachments.service'; -import { AttachmentsController } from '../../controllers/attachments.controller'; - -@Module({ - imports: [ - MulterModule.register({ - storage: multer.diskStorage({}), - limits: { - fieldSize: NC_ATTACHMENT_FIELD_SIZE, - }, - }), - ], - controllers: [AttachmentsController], - providers: [AttachmentsService], -}) -export class AttachmentsModule {} diff --git a/packages/nocodb-nest/src/modules/audits/audits.module.ts b/packages/nocodb-nest/src/modules/audits/audits.module.ts deleted file mode 100644 index 3b0094d554..0000000000 --- a/packages/nocodb-nest/src/modules/audits/audits.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { AuditsService } from '../../services/audits.service'; -import { AuditsController } from '../../controllers/audits.controller'; - -@Module({ - controllers: [AuditsController], - providers: [AuditsService], -}) -export class AuditsModule {} diff --git a/packages/nocodb-nest/src/modules/auth/auth.module.ts b/packages/nocodb-nest/src/modules/auth/auth.module.ts deleted file mode 100644 index a7bbc69033..0000000000 --- a/packages/nocodb-nest/src/modules/auth/auth.module.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Module } from '@nestjs/common'; -import { JwtModule } from '@nestjs/jwt'; -import { PassportModule } from '@nestjs/passport'; -import { LocalStrategy } from '../../strategies/local.strategy'; -import { UsersModule } from '../users/users.module'; -import { AuthService } from '../../services/auth.service'; -import { AuthController } from '../../controllers/auth.controller'; - -@Module({ - controllers: [AuthController], - imports: [UsersModule, PassportModule], - providers: [AuthService, LocalStrategy], -}) -export class AuthModule {} diff --git a/packages/nocodb-nest/src/modules/auth/constants.ts b/packages/nocodb-nest/src/modules/auth/constants.ts deleted file mode 100644 index 490c84b630..0000000000 --- a/packages/nocodb-nest/src/modules/auth/constants.ts +++ /dev/null @@ -1,4 +0,0 @@ -export const jwtConstants = { - // read from .env file - secret: 'some_random_key', -}; diff --git a/packages/nocodb-nest/src/modules/bases/bases.module.ts b/packages/nocodb-nest/src/modules/bases/bases.module.ts deleted file mode 100644 index b9692f918a..0000000000 --- a/packages/nocodb-nest/src/modules/bases/bases.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { BasesService } from '../../services/bases.service'; -import { BasesController } from '../../controllers/bases.controller'; - -@Module({ - controllers: [BasesController], - providers: [BasesService], -}) -export class BasesModule {} diff --git a/packages/nocodb-nest/src/modules/caches/caches.module.ts b/packages/nocodb-nest/src/modules/caches/caches.module.ts deleted file mode 100644 index 05a252b940..0000000000 --- a/packages/nocodb-nest/src/modules/caches/caches.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { CachesService } from '../../services/caches.service'; -import { CachesController } from '../../controllers/caches.controller'; - -@Module({ - controllers: [CachesController], - providers: [CachesService], -}) -export class CachesModule {} diff --git a/packages/nocodb-nest/src/modules/columns/columns.module.ts b/packages/nocodb-nest/src/modules/columns/columns.module.ts deleted file mode 100644 index 134a22c2b2..0000000000 --- a/packages/nocodb-nest/src/modules/columns/columns.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { ColumnsService } from '../../services/columns.service'; -import { ColumnsController } from '../../controllers/columns.controller'; - -@Module({ - controllers: [ColumnsController], - providers: [ColumnsService], -}) -export class ColumnsModule {} diff --git a/packages/nocodb-nest/src/modules/datas/datas.module.ts b/packages/nocodb-nest/src/modules/datas/datas.module.ts index 6043e4e9bd..2f02193063 100644 --- a/packages/nocodb-nest/src/modules/datas/datas.module.ts +++ b/packages/nocodb-nest/src/modules/datas/datas.module.ts @@ -1,7 +1,12 @@ import { Module } from '@nestjs/common'; -import { DataAliasController } from './data-alias.controller'; +import { MulterModule } from '@nestjs/platform-express' +import multer from 'multer' +import { NC_ATTACHMENT_FIELD_SIZE } from '../../constants' +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 './datas.controller'; +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'; @@ -9,8 +14,18 @@ import { OldDatasController } from '../../controllers/old-datas/old-datas.contro 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' @Module({ + imports: [ + MulterModule.register({ + storage: multer.diskStorage({}), + limits: { + fieldSize: NC_ATTACHMENT_FIELD_SIZE, + }, + }), + ], controllers: [ DatasController, BulkDataAliasController, @@ -18,12 +33,16 @@ import { OldDatasService } from '../../controllers/old-datas/old-datas.service'; DataAliasNestedController, DataAliasExportController, OldDatasController, + PublicDatasController, + PublicDatasExportController ], providers: [ DatasService, BulkDataAliasService, DataAliasNestedService, OldDatasService, + PublicDatasService, + PublicDatasExportService ], }) export class DatasModule {} diff --git a/packages/nocodb-nest/src/modules/filters/filters.module.ts b/packages/nocodb-nest/src/modules/filters/filters.module.ts deleted file mode 100644 index c0dffa46b7..0000000000 --- a/packages/nocodb-nest/src/modules/filters/filters.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { FiltersService } from '../../services/filters.service'; -import { FiltersController } from '../../controllers/filters.controller'; - -@Module({ - controllers: [FiltersController], - providers: [FiltersService], -}) -export class FiltersModule {} diff --git a/packages/nocodb-nest/src/modules/form-columns/form-columns.module.ts b/packages/nocodb-nest/src/modules/form-columns/form-columns.module.ts deleted file mode 100644 index b455559d41..0000000000 --- a/packages/nocodb-nest/src/modules/form-columns/form-columns.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { FormColumnsService } from '../../services/form-columns.service'; -import { FormColumnsController } from '../../controllers/form-columns.controller'; - -@Module({ - controllers: [FormColumnsController], - providers: [FormColumnsService], -}) -export class FormColumnsModule {} diff --git a/packages/nocodb-nest/src/modules/forms/forms.module.ts b/packages/nocodb-nest/src/modules/forms/forms.module.ts deleted file mode 100644 index 21e0e110cf..0000000000 --- a/packages/nocodb-nest/src/modules/forms/forms.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { FormsService } from '../../services/forms.service'; -import { FormsController } from '../../controllers/forms.controller'; - -@Module({ - controllers: [FormsController], - providers: [FormsService], -}) -export class FormsModule {} diff --git a/packages/nocodb-nest/src/modules/galleries/galleries.module.ts b/packages/nocodb-nest/src/modules/galleries/galleries.module.ts deleted file mode 100644 index 89aa3148de..0000000000 --- a/packages/nocodb-nest/src/modules/galleries/galleries.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { GalleriesService } from '../../services/galleries.service'; -import { GalleriesController } from '../../controllers/galleries.controller'; - -@Module({ - controllers: [GalleriesController], - providers: [GalleriesService], -}) -export class GalleriesModule {} diff --git a/packages/nocodb-nest/src/modules/global/global.module.ts b/packages/nocodb-nest/src/modules/global/global.module.ts index 10e2f65460..cbf9d84976 100644 --- a/packages/nocodb-nest/src/modules/global/global.module.ts +++ b/packages/nocodb-nest/src/modules/global/global.module.ts @@ -7,9 +7,7 @@ import { MetaService } from '../../meta/meta.service'; import { SocketService } from '../../services/socket.service'; import { JwtStrategy } from '../../strategies/jwt.strategy'; import NcConfigFactory from '../../utils/NcConfigFactory'; -import { jwtConstants } from '../auth/constants'; -import { UsersModule } from '../users/users.module'; -import { UsersService } from '../users/users.service'; +import { UsersService } from '../../services/users/users.service'; import type { Provider } from '@nestjs/common'; export const JwtStrategyProvider: Provider = { @@ -45,7 +43,6 @@ export const JwtStrategyProvider: Provider = { exports: [ Connection, MetaService, - // JwtService, JwtStrategyProvider, UsersService, GlobalGuard, diff --git a/packages/nocodb-nest/src/modules/grid-columns/grid-columns.module.ts b/packages/nocodb-nest/src/modules/grid-columns/grid-columns.module.ts deleted file mode 100644 index 5a2ff19388..0000000000 --- a/packages/nocodb-nest/src/modules/grid-columns/grid-columns.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { GridColumnsService } from '../../services/grid-columns.service'; -import { GridColumnsController } from '../../controllers/grid-columns.controller'; - -@Module({ - controllers: [GridColumnsController], - providers: [GridColumnsService], -}) -export class GridColumnsModule {} diff --git a/packages/nocodb-nest/src/modules/grids/grids.module.ts b/packages/nocodb-nest/src/modules/grids/grids.module.ts deleted file mode 100644 index 7e3293d740..0000000000 --- a/packages/nocodb-nest/src/modules/grids/grids.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { GridsService } from '../../services/grids.service'; -import { GridsController } from '../../controllers/grids.controller'; - -@Module({ - controllers: [GridsController], - providers: [GridsService], -}) -export class GridsModule {} diff --git a/packages/nocodb-nest/src/modules/hook-filters/hook-filters.module.ts b/packages/nocodb-nest/src/modules/hook-filters/hook-filters.module.ts deleted file mode 100644 index c44b8d3778..0000000000 --- a/packages/nocodb-nest/src/modules/hook-filters/hook-filters.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { HookFiltersService } from '../../services/hook-filters.service'; -import { HookFiltersController } from '../../controllers/hook-filters.controller'; - -@Module({ - controllers: [HookFiltersController], - providers: [HookFiltersService], -}) -export class HookFiltersModule {} diff --git a/packages/nocodb-nest/src/modules/hooks/hooks.module.ts b/packages/nocodb-nest/src/modules/hooks/hooks.module.ts deleted file mode 100644 index 3d2b3953d3..0000000000 --- a/packages/nocodb-nest/src/modules/hooks/hooks.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { HooksService } from '../../services/hooks.service'; -import { HooksController } from '../../controllers/hooks.controller'; - -@Module({ - controllers: [HooksController], - providers: [HooksService], -}) -export class HooksModule {} diff --git a/packages/nocodb-nest/src/modules/import/import.module.ts b/packages/nocodb-nest/src/modules/import/import.module.ts deleted file mode 100644 index 9c4d500476..0000000000 --- a/packages/nocodb-nest/src/modules/import/import.module.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { Module } from '@nestjs/common'; -import { AttachmentsService } from '../../services/attachments.service'; -import { ColumnsService } from '../../services/columns.service'; -import { BulkDataAliasService } from '../../services/bulk-data-alias.service'; -import { FiltersService } from '../../services/filters.service'; -import { FormColumnsService } from '../../services/form-columns.service'; -import { FormsService } from '../../services/forms.service'; -import { GalleriesService } from '../../services/galleries.service'; -import { GlobalModule } from '../global/global.module'; -import { GridsService } from '../../services/grids.service'; -import { ProjectUsersService } from '../project-users/project-users.service'; -import { ProjectsService } from '../../services/projects.service'; -import { SortsService } from '../../services/sorts.service'; -import { TablesService } from '../../services/tables.service'; -import { ViewColumnsService } from '../../services/view-columns.service'; -import { ViewsService } from '../../services/views.service'; -import { ImportService } from '../../services/import.service'; -import { ImportController } from '../../controllers/import.controller'; - -@Module({ - imports: [GlobalModule], - controllers: [ImportController], - providers: [ - ImportService, - TablesService, - ViewsService, - ProjectsService, - AttachmentsService, - ColumnsService, - FiltersService, - FormColumnsService, - FormsService, - GalleriesService, - ProjectUsersService, - ViewColumnsService, - SortsService, - GridsService, - BulkDataAliasService, - ], -}) -export class ImportModule {} diff --git a/packages/nocodb-nest/src/modules/kanbans/kanbans.module.ts b/packages/nocodb-nest/src/modules/kanbans/kanbans.module.ts deleted file mode 100644 index f4702177e1..0000000000 --- a/packages/nocodb-nest/src/modules/kanbans/kanbans.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { KanbansService } from '../../services/kanbans.service'; -import { KanbansController } from '../../controllers/kanbans.controller'; - -@Module({ - controllers: [KanbansController], - providers: [KanbansService], -}) -export class KanbansModule {} diff --git a/packages/nocodb-nest/src/modules/maps/maps.module.ts b/packages/nocodb-nest/src/modules/maps/maps.module.ts deleted file mode 100644 index 3a3f81b099..0000000000 --- a/packages/nocodb-nest/src/modules/maps/maps.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { MapsService } from '../../services/maps.service'; -import { MapsController } from '../../controllers/maps.controller'; - -@Module({ - controllers: [MapsController], - providers: [MapsService], -}) -export class MapsModule {} diff --git a/packages/nocodb-nest/src/modules/meta-diffs/meta-diffs.module.ts b/packages/nocodb-nest/src/modules/meta-diffs/meta-diffs.module.ts deleted file mode 100644 index aced5eaf7a..0000000000 --- a/packages/nocodb-nest/src/modules/meta-diffs/meta-diffs.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { MetaDiffsService } from '../../services/meta-diffs.service'; -import { MetaDiffsController } from '../../controllers/meta-diffs.controller'; - -@Module({ - controllers: [MetaDiffsController], - providers: [MetaDiffsService], -}) -export class MetaDiffsModule {} diff --git a/packages/nocodb-nest/src/modules/meta/meta.module.ts b/packages/nocodb-nest/src/modules/meta/meta.module.ts deleted file mode 100644 index e9de8e72b0..0000000000 --- a/packages/nocodb-nest/src/modules/meta/meta.module.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Module } from '@nestjs/common'; -import { ApiDocsController } from '../../controllers/api-docs/api-docs.controller' -import { ApiTokensController } from '../../controllers/api-tokens.controller' -import { ApiTokensService } from '../../services/api-tokens.service' -import { ApiDocsService } from '../api-docs.service' - -@Module({}) -export class MetaModule { - controllers: [ApiDocsController, ApiTokensController], - providers: [ApiDocsService, ApiTokensService], -} diff --git a/packages/nocodb-nest/src/modules/metas/metas.module.ts b/packages/nocodb-nest/src/modules/metas/metas.module.ts new file mode 100644 index 0000000000..fa207c686d --- /dev/null +++ b/packages/nocodb-nest/src/modules/metas/metas.module.ts @@ -0,0 +1,157 @@ +import { Module } from '@nestjs/common'; +import { MulterModule } from '@nestjs/platform-express'; +import multer from 'multer'; +import { NC_ATTACHMENT_FIELD_SIZE } from '../../constants'; +import { ApiDocsController } from '../../controllers/api-docs/api-docs.controller'; +import { ApiTokensController } from '../../controllers/api-tokens.controller'; +import { AttachmentsController } from '../../controllers/attachments.controller'; +import { AuditsController } from '../../controllers/audits.controller'; +import { BasesController } from '../../controllers/bases.controller'; +import { CachesController } from '../../controllers/caches.controller'; +import { ColumnsController } from '../../controllers/columns.controller'; +import { FiltersController } from '../../controllers/filters.controller' +import { FormColumnsController } from '../../controllers/form-columns.controller' +import { FormsController } from '../../controllers/forms.controller' +import { GalleriesController } from '../../controllers/galleries.controller' +import { GridColumnsController } from '../../controllers/grid-columns.controller' +import { GridsController } from '../../controllers/grids.controller' +import { HooksController } from '../../controllers/hooks.controller' +import { ImportController } from '../../controllers/imports/import.controller' +import { KanbansController } from '../../controllers/kanbans.controller' +import { MapsController } from '../../controllers/maps.controller' +import { MetaDiffsController } from '../../controllers/meta-diffs.controller' +import { ModelVisibilitiesController } from '../../controllers/model-visibilities.controller' +import { OrgLcenseController } from '../../controllers/org-lcense.controller' +import { OrgTokensController } from '../../controllers/org-tokens.controller' +import { OrgUsersController } from '../../controllers/org-users.controller' +import { PluginsController } from '../../controllers/plugins.controller' +import { ProjectsController } from '../../controllers/projects.controller' +import { PublicMetasController } from '../../controllers/public-metas.controller' +import { SharedBasesController } from '../../controllers/shared-bases.controller' +import { SortsController } from '../../controllers/sorts.controller' +import { SyncController } from '../../controllers/sync.controller' +import { TablesController } from '../../controllers/tables.controller' +import { UtilsController } from '../../controllers/utils.controller' +import { ViewColumnsController } from '../../controllers/view-columns.controller' +import { ViewsController } from '../../controllers/views.controller' +import { ExtractProjectIdMiddleware } from '../../middlewares/extract-project-id/extract-project-id.middleware' +import { ApiTokensService } from '../../services/api-tokens.service'; +import { AttachmentsService } from '../../services/attachments.service'; +import { AuditsService } from '../../services/audits.service'; +import { BasesService } from '../../services/bases.service'; +import { CachesService } from '../../services/caches.service'; +import { ColumnsService } from '../../services/columns.service'; +import { FiltersService } from '../../services/filters.service' +import { FormColumnsService } from '../../services/form-columns.service' +import { FormsService } from '../../services/forms.service' +import { GalleriesService } from '../../services/galleries.service' +import { GridColumnsService } from '../../services/grid-columns.service' +import { GridsService } from '../../services/grids.service' +import { HooksService } from '../../services/hooks.service' +import { KanbansService } from '../../services/kanbans.service' +import { MapsService } from '../../services/maps.service' +import { MetaDiffsService } from '../../services/meta-diffs.service' +import { ModelVisibilitiesService } from '../../services/model-visibilities.service' +import { OrgLcenseService } from '../../services/org-lcense.service' +import { OrgTokensEeService } from '../../services/org-tokens-ee.service' +import { OrgTokensService } from '../../services/org-tokens.service' +import { OrgUsersService } from '../../services/org-users.service' +import { PluginsService } from '../../services/plugins.service' +import { ProjectsService } from '../../services/projects.service' +import { PublicMetasService } from '../../services/public-metas.service' +import { SharedBasesService } from '../../services/shared-bases.service' +import { SortsService } from '../../services/sorts.service' +import { SyncService } from '../../services/sync.service' +import { TablesService } from '../../services/tables.service' +import { UtilsService } from '../../services/utils.service' +import { ViewColumnsService } from '../../services/view-columns.service' +import { ViewsService } from '../../services/views.service' +import { ApiDocsService } from '../../services/api-docs/api-docs.service'; +import { GlobalModule } from '../global/global.module' +import { ProjectUsersController } from '../../controllers/project-users.controller' +import { ProjectUsersService } from '../../services/project-users/project-users.service' + +@Module({ + imports: [ + MulterModule.register({ + storage: multer.diskStorage({}), + limits: { + fieldSize: NC_ATTACHMENT_FIELD_SIZE, + }, + }), + GlobalModule, + ], + controllers: [ + ApiDocsController, + ApiTokensController, + AttachmentsController, + AuditsController, + BasesController, + CachesController, + ColumnsController, + FiltersController, + FormColumnsController, + FormsController, + GalleriesController, + GridColumnsController, + GridsController, + HooksController, + ImportController, + KanbansController, + MapsController, + MetaDiffsController, + ModelVisibilitiesController, + OrgLcenseController, + OrgTokensController, + OrgUsersController, + PluginsController, + ProjectUsersController, + ProjectsController, + PublicMetasController, + ViewsController, + ViewColumnsController, + UtilsController, + TablesController, + SyncController, + SortsController, + SharedBasesController + ], + providers: [ + ApiDocsService, + ApiTokensService, + AttachmentsService, + AuditsService, + BasesService, + CachesService, + ColumnsService, + FiltersService, + FormColumnsService, + FormsService, + GalleriesService, + GridColumnsService, + GridsService, + HooksService, + KanbansService, + MapsService, + MetaDiffsService, + ModelVisibilitiesService, + OrgLcenseService, + OrgTokensEeService, + OrgTokensService, + OrgUsersService, + ProjectUsersService, + PluginsService, + ProjectUsersService, + ProjectsService, + ExtractProjectIdMiddleware, + PublicMetasService, + ViewsService, + ViewColumnsService, + UtilsService, + TablesService, + SyncService, + SortsService, + SharedBasesService, + ], +}) +export class MetasModule {} diff --git a/packages/nocodb-nest/src/modules/model-visibilities/model-visibilities.module.ts b/packages/nocodb-nest/src/modules/model-visibilities/model-visibilities.module.ts deleted file mode 100644 index 2573a961f8..0000000000 --- a/packages/nocodb-nest/src/modules/model-visibilities/model-visibilities.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { ModelVisibilitiesService } from '../../services/model-visibilities.service'; -import { ModelVisibilitiesController } from '../../controllers/model-visibilities.controller'; - -@Module({ - controllers: [ModelVisibilitiesController], - providers: [ModelVisibilitiesService], -}) -export class ModelVisibilitiesModule {} diff --git a/packages/nocodb-nest/src/modules/org-lcense/org-lcense.module.ts b/packages/nocodb-nest/src/modules/org-lcense/org-lcense.module.ts deleted file mode 100644 index 8180cd25f7..0000000000 --- a/packages/nocodb-nest/src/modules/org-lcense/org-lcense.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { OrgLcenseService } from '../../services/org-lcense.service'; -import { OrgLcenseController } from '../../controllers/org-lcense.controller'; - -@Module({ - controllers: [OrgLcenseController], - providers: [OrgLcenseService], -}) -export class OrgLcenseModule {} diff --git a/packages/nocodb-nest/src/modules/org-tokens/org-tokens.module.ts b/packages/nocodb-nest/src/modules/org-tokens/org-tokens.module.ts deleted file mode 100644 index ed97849767..0000000000 --- a/packages/nocodb-nest/src/modules/org-tokens/org-tokens.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Module } from '@nestjs/common'; -import { OrgTokensEeService } from '../../services/org-tokens-ee.service'; -import { OrgTokensService } from '../../services/org-tokens.service'; -import { OrgTokensController } from '../../controllers/org-tokens.controller'; - -@Module({ - controllers: [OrgTokensController], - providers: [OrgTokensEeService, OrgTokensService], -}) -export class OrgTokensModule {} diff --git a/packages/nocodb-nest/src/modules/org-users/org-users.module.ts b/packages/nocodb-nest/src/modules/org-users/org-users.module.ts deleted file mode 100644 index 68099b02f3..0000000000 --- a/packages/nocodb-nest/src/modules/org-users/org-users.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Module } from '@nestjs/common'; -import { ProjectUsersService } from '../project-users/project-users.service'; -import { OrgUsersService } from '../../services/org-users.service'; -import { OrgUsersController } from '../../controllers/org-users.controller'; - -@Module({ - controllers: [OrgUsersController], - providers: [OrgUsersService, ProjectUsersService], -}) -export class OrgUsersModule {} diff --git a/packages/nocodb-nest/src/modules/plugins/plugins.module.ts b/packages/nocodb-nest/src/modules/plugins/plugins.module.ts deleted file mode 100644 index 60b6d767b6..0000000000 --- a/packages/nocodb-nest/src/modules/plugins/plugins.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { PluginsService } from '../../services/plugins.service'; -import { PluginsController } from '../../controllers/plugins.controller'; - -@Module({ - controllers: [PluginsController], - providers: [PluginsService], -}) -export class PluginsModule {} diff --git a/packages/nocodb-nest/src/modules/project-users/project-users.module.ts b/packages/nocodb-nest/src/modules/project-users/project-users.module.ts deleted file mode 100644 index 25337483be..0000000000 --- a/packages/nocodb-nest/src/modules/project-users/project-users.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { ProjectUsersService } from './project-users.service'; -import { ProjectUsersController } from './project-users.controller'; - -@Module({ - controllers: [ProjectUsersController], - providers: [ProjectUsersService], -}) -export class ProjectUsersModule {} diff --git a/packages/nocodb-nest/src/modules/projects/projects.module.ts b/packages/nocodb-nest/src/modules/projects/projects.module.ts deleted file mode 100644 index 05cbc5dc95..0000000000 --- a/packages/nocodb-nest/src/modules/projects/projects.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Module } from '@nestjs/common'; -import { ExtractProjectIdMiddleware } from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { ProjectsService } from '../../services/projects.service'; -import { ProjectsController } from '../../controllers/projects.controller'; - -@Module({ - controllers: [ProjectsController], - providers: [ProjectsService, ExtractProjectIdMiddleware], -}) -export class ProjectsModule {} diff --git a/packages/nocodb-nest/src/modules/public-datas-export/public-datas-export.module.ts b/packages/nocodb-nest/src/modules/public-datas-export/public-datas-export.module.ts deleted file mode 100644 index 8e93ea556a..0000000000 --- a/packages/nocodb-nest/src/modules/public-datas-export/public-datas-export.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { PublicDatasExportService } from '../../services/public-datas-export.service'; -import { PublicDatasExportController } from '../../controllers/public-datas-export.controller'; - -@Module({ - controllers: [PublicDatasExportController], - providers: [PublicDatasExportService], -}) -export class PublicDatasExportModule {} diff --git a/packages/nocodb-nest/src/modules/public-datas/public-datas.module.ts b/packages/nocodb-nest/src/modules/public-datas/public-datas.module.ts deleted file mode 100644 index a7f5f78f47..0000000000 --- a/packages/nocodb-nest/src/modules/public-datas/public-datas.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import multer from 'multer'; -import { Module } from '@nestjs/common'; -import { MulterModule } from '@nestjs/platform-express'; -import { NC_ATTACHMENT_FIELD_SIZE } from '../../constants'; -import { PublicDatasService } from '../../services/public-datas.service'; -import { PublicDatasController } from '../../controllers/public-datas.controller'; - -@Module({ - imports: [ - MulterModule.register({ - storage: multer.diskStorage({}), - limits: { - fieldSize: NC_ATTACHMENT_FIELD_SIZE, - }, - }), - ], - controllers: [PublicDatasController], - providers: [PublicDatasService], -}) -export class PublicDatasModule {} diff --git a/packages/nocodb-nest/src/modules/public-metas/public-metas.module.ts b/packages/nocodb-nest/src/modules/public-metas/public-metas.module.ts deleted file mode 100644 index 9ae805e870..0000000000 --- a/packages/nocodb-nest/src/modules/public-metas/public-metas.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { PublicMetasService } from '../../services/public-metas.service'; -import { PublicMetasController } from '../../controllers/public-metas.controller'; - -@Module({ - controllers: [PublicMetasController], - providers: [PublicMetasService], -}) -export class PublicMetasModule {} diff --git a/packages/nocodb-nest/src/modules/shared-bases/shared-bases.module.ts b/packages/nocodb-nest/src/modules/shared-bases/shared-bases.module.ts deleted file mode 100644 index a1c925bdc0..0000000000 --- a/packages/nocodb-nest/src/modules/shared-bases/shared-bases.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { SharedBasesService } from '../../services/shared-bases.service'; -import { SharedBasesController } from '../../controllers/shared-bases.controller'; - -@Module({ - controllers: [SharedBasesController], - providers: [SharedBasesService], -}) -export class SharedBasesModule {} diff --git a/packages/nocodb-nest/src/modules/sorts/sorts.module.ts b/packages/nocodb-nest/src/modules/sorts/sorts.module.ts deleted file mode 100644 index ecaf9138fe..0000000000 --- a/packages/nocodb-nest/src/modules/sorts/sorts.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { SortsService } from '../../services/sorts.service'; -import { SortsController } from '../../controllers/sorts.controller'; - -@Module({ - controllers: [SortsController], - providers: [SortsService], -}) -export class SortsModule {} diff --git a/packages/nocodb-nest/src/modules/sync/sync.module.ts b/packages/nocodb-nest/src/modules/sync/sync.module.ts deleted file mode 100644 index 66efe0acdc..0000000000 --- a/packages/nocodb-nest/src/modules/sync/sync.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { SyncService } from '../../services/sync.service'; -import { SyncController } from '../../controllers/sync.controller'; - -@Module({ - controllers: [SyncController], - providers: [SyncService], -}) -export class SyncModule {} diff --git a/packages/nocodb-nest/src/modules/tables/tables.module.ts b/packages/nocodb-nest/src/modules/tables/tables.module.ts deleted file mode 100644 index e8132c8619..0000000000 --- a/packages/nocodb-nest/src/modules/tables/tables.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Module } from '@nestjs/common'; -import { TablesService } from '../../services/tables.service'; -import { TablesController } from '../../controllers/tables.controller'; - -@Module({ - controllers: [TablesController], - providers: [TablesService], - exports: [TablesService], -}) -export class TablesModule {} diff --git a/packages/nocodb-nest/src/modules/test/test.module.ts b/packages/nocodb-nest/src/modules/test/test.module.ts index 428ebce58c..d86fece015 100644 --- a/packages/nocodb-nest/src/modules/test/test.module.ts +++ b/packages/nocodb-nest/src/modules/test/test.module.ts @@ -1,9 +1,7 @@ import { Module } from '@nestjs/common'; -import { TestService } from './test.service'; -import { TestController } from './test.controller'; +import { TestController } from '../../controllers/test/test.controller'; @Module({ controllers: [TestController], - providers: [TestService], }) export class TestModule {} diff --git a/packages/nocodb-nest/src/modules/test/test.service.spec.ts b/packages/nocodb-nest/src/modules/test/test.service.spec.ts deleted file mode 100644 index e389db9efe..0000000000 --- a/packages/nocodb-nest/src/modules/test/test.service.spec.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Test } from '@nestjs/testing'; -import { TestService } from './test.service'; -import type { TestingModule } from '@nestjs/testing'; - -describe('TestService', () => { - let service: TestService; - - beforeEach(async () => { - const module: TestingModule = await Test.createTestingModule({ - providers: [TestService], - }).compile(); - - service = module.get(TestService); - }); - - it('should be defined', () => { - expect(service).toBeDefined(); - }); -}); diff --git a/packages/nocodb-nest/src/modules/test/test.service.ts b/packages/nocodb-nest/src/modules/test/test.service.ts deleted file mode 100644 index 0d79b70d7f..0000000000 --- a/packages/nocodb-nest/src/modules/test/test.service.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { Injectable } from '@nestjs/common'; - -@Injectable() -export class TestService {} diff --git a/packages/nocodb-nest/src/modules/users/user.spec.ts b/packages/nocodb-nest/src/modules/users/user.spec.ts deleted file mode 100644 index c5fc4ee844..0000000000 --- a/packages/nocodb-nest/src/modules/users/user.spec.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { User } from './user'; - -describe('User', () => { - it('should be defined', () => { - expect(new User()).toBeDefined(); - }); -}); diff --git a/packages/nocodb-nest/src/modules/users/user.ts b/packages/nocodb-nest/src/modules/users/user.ts deleted file mode 100644 index 4f82c14571..0000000000 --- a/packages/nocodb-nest/src/modules/users/user.ts +++ /dev/null @@ -1 +0,0 @@ -export class User {} diff --git a/packages/nocodb-nest/src/modules/users/users.module.ts b/packages/nocodb-nest/src/modules/users/users.module.ts index 2e0f9beff9..dffd58f911 100644 --- a/packages/nocodb-nest/src/modules/users/users.module.ts +++ b/packages/nocodb-nest/src/modules/users/users.module.ts @@ -1,9 +1,7 @@ import { Module } from '@nestjs/common'; -import { JwtModule } from '@nestjs/jwt'; -import { jwtConstants } from '../auth/constants'; import { GlobalModule } from '../global/global.module'; -import { UsersService } from './users.service'; -import { UsersController } from './users.controller'; +import { UsersService } from '../../services/users/users.service'; +import { UsersController } from '../../controllers/users/users.controller'; @Module({ imports: [GlobalModule], diff --git a/packages/nocodb-nest/src/modules/utils/utils.module.ts b/packages/nocodb-nest/src/modules/utils/utils.module.ts deleted file mode 100644 index 9af79558e1..0000000000 --- a/packages/nocodb-nest/src/modules/utils/utils.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { UtilsService } from '../../services/utils.service'; -import { UtilsController } from '../../controllers/utils.controller'; - -@Module({ - controllers: [UtilsController], - providers: [UtilsService], -}) -export class UtilsModule {} diff --git a/packages/nocodb-nest/src/modules/view-columns/view-columns.module.ts b/packages/nocodb-nest/src/modules/view-columns/view-columns.module.ts deleted file mode 100644 index 80c726155d..0000000000 --- a/packages/nocodb-nest/src/modules/view-columns/view-columns.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { ViewColumnsService } from '../../services/view-columns.service'; -import { ViewColumnsController } from '../../controllers/view-columns.controller'; - -@Module({ - controllers: [ViewColumnsController], - providers: [ViewColumnsService], -}) -export class ViewColumnsModule {} diff --git a/packages/nocodb-nest/src/modules/views/views.module.ts b/packages/nocodb-nest/src/modules/views/views.module.ts deleted file mode 100644 index b8c37c60c2..0000000000 --- a/packages/nocodb-nest/src/modules/views/views.module.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Module } from '@nestjs/common'; -import { TablesModule } from '../tables/tables.module'; -import { ViewsService } from '../../services/views.service'; -import { ViewsController } from '../../controllers/views.controller'; - -@Module({ - controllers: [ViewsController], - providers: [ViewsService], - imports: [TablesModule], -}) -export class ViewsModule {} diff --git a/packages/nocodb-nest/src/modules/api-docs.service.spec.ts b/packages/nocodb-nest/src/services/api-docs/api-docs.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/api-docs.service.spec.ts rename to packages/nocodb-nest/src/services/api-docs/api-docs.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/api-docs.service.ts b/packages/nocodb-nest/src/services/api-docs/api-docs.service.ts similarity index 88% rename from packages/nocodb-nest/src/modules/api-docs.service.ts rename to packages/nocodb-nest/src/services/api-docs/api-docs.service.ts index 8fc51a3ff9..5da0d489ff 100644 --- a/packages/nocodb-nest/src/modules/api-docs.service.ts +++ b/packages/nocodb-nest/src/services/api-docs/api-docs.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; -import { NcError } from '../helpers/catchError'; -import { Model, Project } from '../models'; +import { NcError } from '../../helpers/catchError'; +import { Model, Project } from '../../models'; import getSwaggerJSON from './swagger/getSwaggerJSON'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/swagger/getPaths.ts b/packages/nocodb-nest/src/services/api-docs/swagger/getPaths.ts similarity index 92% rename from packages/nocodb-nest/src/modules/swagger/getPaths.ts rename to packages/nocodb-nest/src/services/api-docs/swagger/getPaths.ts index 99d4701db5..dffe195c6c 100644 --- a/packages/nocodb-nest/src/modules/swagger/getPaths.ts +++ b/packages/nocodb-nest/src/services/api-docs/swagger/getPaths.ts @@ -1,6 +1,6 @@ -import Noco from '../../Noco'; +import Noco from '../../../Noco'; import { getModelPaths, getViewPaths } from './templates/paths'; -import type { Model, Project } from '../../models'; +import type { Model, Project } from '../../../models'; import type { SwaggerColumn } from './getSwaggerColumnMetas'; import type { SwaggerView } from './getSwaggerJSON'; diff --git a/packages/nocodb-nest/src/modules/swagger/getSchemas.ts b/packages/nocodb-nest/src/services/api-docs/swagger/getSchemas.ts similarity index 91% rename from packages/nocodb-nest/src/modules/swagger/getSchemas.ts rename to packages/nocodb-nest/src/services/api-docs/swagger/getSchemas.ts index a05f0ebc6a..1dfa999e14 100644 --- a/packages/nocodb-nest/src/modules/swagger/getSchemas.ts +++ b/packages/nocodb-nest/src/services/api-docs/swagger/getSchemas.ts @@ -1,6 +1,6 @@ -import Noco from '../../Noco'; +import Noco from '../../../Noco'; import { getModelSchemas, getViewSchemas } from './templates/schemas'; -import type { Model, Project } from '../../models'; +import type { Model, Project } from '../../../models'; import type { SwaggerColumn } from './getSwaggerColumnMetas'; import type { SwaggerView } from './getSwaggerJSON'; diff --git a/packages/nocodb-nest/src/modules/swagger/getSwaggerColumnMetas.ts b/packages/nocodb-nest/src/services/api-docs/swagger/getSwaggerColumnMetas.ts similarity index 92% rename from packages/nocodb-nest/src/modules/swagger/getSwaggerColumnMetas.ts rename to packages/nocodb-nest/src/services/api-docs/swagger/getSwaggerColumnMetas.ts index 106d2ed391..9a45b53ada 100644 --- a/packages/nocodb-nest/src/modules/swagger/getSwaggerColumnMetas.ts +++ b/packages/nocodb-nest/src/services/api-docs/swagger/getSwaggerColumnMetas.ts @@ -1,11 +1,11 @@ import { UITypes } from 'nocodb-sdk'; -import SwaggerTypes from '../../db/sql-mgr/code/routers/xc-ts/SwaggerTypes'; -import Noco from '../../Noco'; +import SwaggerTypes from '../../../db/sql-mgr/code/routers/xc-ts/SwaggerTypes'; +import Noco from '../../../Noco'; import type { Column, LinkToAnotherRecordColumn, Project, -} from '../../models'; +} from '../../../models'; export default async ( columns: Column[], diff --git a/packages/nocodb-nest/src/modules/swagger/getSwaggerJSON.ts b/packages/nocodb-nest/src/services/api-docs/swagger/getSwaggerJSON.ts similarity index 96% rename from packages/nocodb-nest/src/modules/swagger/getSwaggerJSON.ts rename to packages/nocodb-nest/src/services/api-docs/swagger/getSwaggerJSON.ts index 2917357145..6b717992ea 100644 --- a/packages/nocodb-nest/src/modules/swagger/getSwaggerJSON.ts +++ b/packages/nocodb-nest/src/services/api-docs/swagger/getSwaggerJSON.ts @@ -1,5 +1,5 @@ import { ViewTypes } from 'nocodb-sdk'; -import Noco from '../../Noco'; +import Noco from '../../../Noco'; import swaggerBase from './swagger-base.json'; import getPaths from './getPaths'; import getSchemas from './getSchemas'; @@ -11,7 +11,7 @@ import type { Model, Project, View, -} from '../../models'; +} from '../../../models'; export default async function getSwaggerJSON( project: Project, diff --git a/packages/nocodb-nest/src/modules/swagger/swagger-base.json b/packages/nocodb-nest/src/services/api-docs/swagger/swagger-base.json similarity index 100% rename from packages/nocodb-nest/src/modules/swagger/swagger-base.json rename to packages/nocodb-nest/src/services/api-docs/swagger/swagger-base.json diff --git a/packages/nocodb-nest/src/modules/swagger/templates/headers.ts b/packages/nocodb-nest/src/services/api-docs/swagger/templates/headers.ts similarity index 100% rename from packages/nocodb-nest/src/modules/swagger/templates/headers.ts rename to packages/nocodb-nest/src/services/api-docs/swagger/templates/headers.ts diff --git a/packages/nocodb-nest/src/modules/swagger/templates/params.ts b/packages/nocodb-nest/src/services/api-docs/swagger/templates/params.ts similarity index 98% rename from packages/nocodb-nest/src/modules/swagger/templates/params.ts rename to packages/nocodb-nest/src/services/api-docs/swagger/templates/params.ts index 55c5e76273..1f83df02d9 100644 --- a/packages/nocodb-nest/src/modules/swagger/templates/params.ts +++ b/packages/nocodb-nest/src/services/api-docs/swagger/templates/params.ts @@ -1,5 +1,5 @@ import { RelationTypes, UITypes } from 'nocodb-sdk'; -import type { LinkToAnotherRecordColumn } from '../../../models'; +import type { LinkToAnotherRecordColumn } from '../../../../models'; import type { SwaggerColumn } from '../getSwaggerColumnMetas'; export const rowIdParam = { diff --git a/packages/nocodb-nest/src/modules/swagger/templates/paths.ts b/packages/nocodb-nest/src/services/api-docs/swagger/templates/paths.ts similarity index 100% rename from packages/nocodb-nest/src/modules/swagger/templates/paths.ts rename to packages/nocodb-nest/src/services/api-docs/swagger/templates/paths.ts diff --git a/packages/nocodb-nest/src/modules/swagger/templates/schemas.ts b/packages/nocodb-nest/src/services/api-docs/swagger/templates/schemas.ts similarity index 100% rename from packages/nocodb-nest/src/modules/swagger/templates/schemas.ts rename to packages/nocodb-nest/src/services/api-docs/swagger/templates/schemas.ts diff --git a/packages/nocodb-nest/src/services/auth.service.ts b/packages/nocodb-nest/src/services/auth.service.ts index 8f297e8f88..3cd5a3ed50 100644 --- a/packages/nocodb-nest/src/services/auth.service.ts +++ b/packages/nocodb-nest/src/services/auth.service.ts @@ -5,8 +5,8 @@ import * as bcrypt from 'bcryptjs'; import { v4 as uuidv4 } from 'uuid'; import Noco from '../Noco'; -import { genJwt } from '../modules/users/helpers'; -import { UsersService } from '../modules/users/users.service'; +import { genJwt } from './users/helpers'; +import { UsersService } from './users/users.service'; import { Connection } from '../connection/connection'; import type { CreateUserDto } from '../controllers/auth.controller'; diff --git a/packages/nocodb-nest/src/services/import.service.spec.ts b/packages/nocodb-nest/src/services/import.service.spec.ts deleted file mode 100644 index 21b2a54c50..0000000000 --- a/packages/nocodb-nest/src/services/import.service.spec.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Test } from '@nestjs/testing'; -import { ImportService } from './import.service'; -import type { TestingModule } from '@nestjs/testing'; - -describe('ImportService', () => { - let service: ImportService; - - beforeEach(async () => { - const module: TestingModule = await Test.createTestingModule({ - providers: [ImportService], - }).compile(); - - service = module.get(ImportService); - }); - - it('should be defined', () => { - expect(service).toBeDefined(); - }); -}); diff --git a/packages/nocodb-nest/src/services/import.service.ts b/packages/nocodb-nest/src/services/import.service.ts deleted file mode 100644 index dc6bac1141..0000000000 --- a/packages/nocodb-nest/src/services/import.service.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { Injectable } from '@nestjs/common'; - -@Injectable() -export class ImportService {} diff --git a/packages/nocodb-nest/src/services/org-users.service.ts b/packages/nocodb-nest/src/services/org-users.service.ts index abc554c2ae..f8224dc71c 100644 --- a/packages/nocodb-nest/src/services/org-users.service.ts +++ b/packages/nocodb-nest/src/services/org-users.service.ts @@ -18,7 +18,7 @@ import { Audit, ProjectUser, Store, SyncSource, User } from '../models'; import Noco from '../Noco'; import extractRolesObj from '../utils/extractRolesObj'; import { MetaTable } from '../utils/globals'; -import { ProjectUsersService } from '../modules/project-users/project-users.service'; +import { ProjectUsersService } from './project-users/project-users.service'; import type { UserType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/project-users/project-users.service.spec.ts b/packages/nocodb-nest/src/services/project-users/project-users.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/project-users/project-users.service.spec.ts rename to packages/nocodb-nest/src/services/project-users/project-users.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/project-users/project-users.service.ts b/packages/nocodb-nest/src/services/project-users/project-users.service.ts similarity index 100% rename from packages/nocodb-nest/src/modules/project-users/project-users.service.ts rename to packages/nocodb-nest/src/services/project-users/project-users.service.ts diff --git a/packages/nocodb-nest/src/modules/users/ui/auth/emailVerify.ts b/packages/nocodb-nest/src/services/project-users/ui/auth/emailVerify.ts similarity index 100% rename from packages/nocodb-nest/src/modules/users/ui/auth/emailVerify.ts rename to packages/nocodb-nest/src/services/project-users/ui/auth/emailVerify.ts diff --git a/packages/nocodb-nest/src/modules/users/ui/auth/resetPassword.ts b/packages/nocodb-nest/src/services/project-users/ui/auth/resetPassword.ts similarity index 100% rename from packages/nocodb-nest/src/modules/users/ui/auth/resetPassword.ts rename to packages/nocodb-nest/src/services/project-users/ui/auth/resetPassword.ts diff --git a/packages/nocodb-nest/src/modules/users/ui/emailTemplates/forgotPassword.ts b/packages/nocodb-nest/src/services/project-users/ui/emailTemplates/forgotPassword.ts similarity index 100% rename from packages/nocodb-nest/src/modules/users/ui/emailTemplates/forgotPassword.ts rename to packages/nocodb-nest/src/services/project-users/ui/emailTemplates/forgotPassword.ts diff --git a/packages/nocodb-nest/src/modules/users/ui/emailTemplates/invite.ts b/packages/nocodb-nest/src/services/project-users/ui/emailTemplates/invite.ts similarity index 100% rename from packages/nocodb-nest/src/modules/users/ui/emailTemplates/invite.ts rename to packages/nocodb-nest/src/services/project-users/ui/emailTemplates/invite.ts diff --git a/packages/nocodb-nest/src/modules/users/ui/emailTemplates/verify.ts b/packages/nocodb-nest/src/services/project-users/ui/emailTemplates/verify.ts similarity index 100% rename from packages/nocodb-nest/src/modules/users/ui/emailTemplates/verify.ts rename to packages/nocodb-nest/src/services/project-users/ui/emailTemplates/verify.ts diff --git a/packages/nocodb-nest/src/modules/users/helpers.ts b/packages/nocodb-nest/src/services/users/helpers.ts similarity index 100% rename from packages/nocodb-nest/src/modules/users/helpers.ts rename to packages/nocodb-nest/src/services/users/helpers.ts diff --git a/packages/nocodb-nest/src/modules/users/users.service.spec.ts b/packages/nocodb-nest/src/services/users/users.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/users/users.service.spec.ts rename to packages/nocodb-nest/src/services/users/users.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/users/users.service.ts b/packages/nocodb-nest/src/services/users/users.service.ts similarity index 98% rename from packages/nocodb-nest/src/modules/users/users.service.ts rename to packages/nocodb-nest/src/services/users/users.service.ts index 9f9f3c18af..f051aec070 100644 --- a/packages/nocodb-nest/src/modules/users/users.service.ts +++ b/packages/nocodb-nest/src/services/users/users.service.ts @@ -188,7 +188,7 @@ export class UsersService { token_version: null, }); try { - const template = (await import('./ui/emailTemplates/forgotPassword')) + const template = (await import('../../controllers/users/ui/emailTemplates/forgotPassword')) .default; await NcPluginMgrv2.emailAdapter().then((adapter) => adapter.mailSend({ @@ -443,7 +443,7 @@ export class UsersService { user = await User.getByEmail(email); try { - const template = (await import('./ui/emailTemplates/verify')).default; + const template = (await import('../../controllers/users/ui/emailTemplates/verify')).default; await ( await NcPluginMgrv2.emailAdapter() ).mailSend({ diff --git a/packages/nocodb-nest/src/strategies/jwt.strategy.ts b/packages/nocodb-nest/src/strategies/jwt.strategy.ts index 1862f806c6..0b41976933 100644 --- a/packages/nocodb-nest/src/strategies/jwt.strategy.ts +++ b/packages/nocodb-nest/src/strategies/jwt.strategy.ts @@ -4,13 +4,9 @@ import { ExtractJwt, Strategy } from 'passport-jwt'; import { OrgUserRoles } from 'nocodb-sdk'; import NocoCache from '../cache/NocoCache'; import { ProjectUser, User } from '../models'; -import { genJwt } from '../modules/users/helpers'; -import Noco from '../Noco'; import extractRolesObj from '../utils/extractRolesObj'; import { CacheGetType, CacheScope } from '../utils/globals'; -import { jwtConstants } from '../modules/auth/constants'; -import { UsersService } from '../modules/users/users.service'; -import NcConfigFactory from '../utils/NcConfigFactory'; +import { UsersService } from '../services/users/users.service'; @Injectable() export class JwtStrategy extends PassportStrategy(Strategy) {