diff --git a/packages/nocodb-nest/src/app.module.ts b/packages/nocodb-nest/src/app.module.ts index 3ea658ba7a..4576881602 100644 --- a/packages/nocodb-nest/src/app.module.ts +++ b/packages/nocodb-nest/src/app.module.ts @@ -7,7 +7,7 @@ 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 { AuthService } from './modules/auth/auth.service'; +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'; diff --git a/packages/nocodb-nest/src/modules/api-docs/api-docs.controller.spec.ts b/packages/nocodb-nest/src/controllers/api-docs/api-docs.controller.spec.ts similarity index 89% rename from packages/nocodb-nest/src/modules/api-docs/api-docs.controller.spec.ts rename to packages/nocodb-nest/src/controllers/api-docs/api-docs.controller.spec.ts index bc0f864432..2beb85f814 100644 --- a/packages/nocodb-nest/src/modules/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 './api-docs.service'; +import { ApiDocsService } from '../../modules/api-docs.service'; import type { TestingModule } from '@nestjs/testing'; describe('ApiDocsController', () => { diff --git a/packages/nocodb-nest/src/modules/api-docs/api-docs.controller.ts b/packages/nocodb-nest/src/controllers/api-docs/api-docs.controller.ts similarity index 95% rename from packages/nocodb-nest/src/modules/api-docs/api-docs.controller.ts rename to packages/nocodb-nest/src/controllers/api-docs/api-docs.controller.ts index f796fd7839..919710f8e0 100644 --- a/packages/nocodb-nest/src/modules/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 './api-docs.service'; +import { ApiDocsService } from '../../modules/api-docs.service'; import getSwaggerHtml from './template/swaggerHtml'; import getRedocHtml from './template/redocHtml'; diff --git a/packages/nocodb-nest/src/modules/api-docs/template/redocHtml.ts b/packages/nocodb-nest/src/controllers/api-docs/template/redocHtml.ts similarity index 100% rename from packages/nocodb-nest/src/modules/api-docs/template/redocHtml.ts rename to packages/nocodb-nest/src/controllers/api-docs/template/redocHtml.ts diff --git a/packages/nocodb-nest/src/modules/api-docs/template/swaggerHtml.ts b/packages/nocodb-nest/src/controllers/api-docs/template/swaggerHtml.ts similarity index 100% rename from packages/nocodb-nest/src/modules/api-docs/template/swaggerHtml.ts rename to packages/nocodb-nest/src/controllers/api-docs/template/swaggerHtml.ts diff --git a/packages/nocodb-nest/src/modules/api-tokens/api-tokens.controller.spec.ts b/packages/nocodb-nest/src/controllers/api-tokens.controller.spec.ts similarity index 89% rename from packages/nocodb-nest/src/modules/api-tokens/api-tokens.controller.spec.ts rename to packages/nocodb-nest/src/controllers/api-tokens.controller.spec.ts index 71d49c4687..c169823e93 100644 --- a/packages/nocodb-nest/src/modules/api-tokens/api-tokens.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/api-tokens.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { ApiTokensController } from './api-tokens.controller'; -import { ApiTokensService } from './api-tokens.service'; +import { ApiTokensService } from '../services/api-tokens.service'; import type { TestingModule } from '@nestjs/testing'; describe('ApiTokensController', () => { diff --git a/packages/nocodb-nest/src/modules/api-tokens/api-tokens.controller.ts b/packages/nocodb-nest/src/controllers/api-tokens.controller.ts similarity index 81% rename from packages/nocodb-nest/src/modules/api-tokens/api-tokens.controller.ts rename to packages/nocodb-nest/src/controllers/api-tokens.controller.ts index 9a3fb8a320..78335e809a 100644 --- a/packages/nocodb-nest/src/modules/api-tokens/api-tokens.controller.ts +++ b/packages/nocodb-nest/src/controllers/api-tokens.controller.ts @@ -10,13 +10,13 @@ import { UseGuards, } from '@nestjs/common'; import { AuthGuard } from '@nestjs/passport'; -import { GlobalGuard } from '../../guards/global/global.guard'; -import { PagedResponseImpl } from '../../helpers/PagedResponse'; +import { GlobalGuard } from '../guards/global/global.guard'; +import { PagedResponseImpl } from '../helpers/PagedResponse'; import { Acl, ExtractProjectIdMiddleware, -} from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { ApiTokensService } from './api-tokens.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { ApiTokensService } from '../services/api-tokens.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/audits/audits.controller.spec.ts b/packages/nocodb-nest/src/controllers/audits.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/audits/audits.controller.spec.ts rename to packages/nocodb-nest/src/controllers/audits.controller.spec.ts index 1c94c9c3f3..241deb8043 100644 --- a/packages/nocodb-nest/src/modules/audits/audits.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/audits.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { AuditsController } from './audits.controller'; -import { AuditsService } from './audits.service'; +import { AuditsService } from '../services/audits.service'; import type { TestingModule } from '@nestjs/testing'; describe('AuditsController', () => { diff --git a/packages/nocodb-nest/src/modules/audits/audits.controller.ts b/packages/nocodb-nest/src/controllers/audits.controller.ts similarity index 88% rename from packages/nocodb-nest/src/modules/audits/audits.controller.ts rename to packages/nocodb-nest/src/controllers/audits.controller.ts index abd1f635c8..1ad770dfd3 100644 --- a/packages/nocodb-nest/src/modules/audits/audits.controller.ts +++ b/packages/nocodb-nest/src/controllers/audits.controller.ts @@ -11,14 +11,14 @@ import { UseGuards, } from '@nestjs/common'; import { AuthGuard } from '@nestjs/passport'; -import { GlobalGuard } from '../../guards/global/global.guard'; -import { PagedResponseImpl } from '../../helpers/PagedResponse'; +import { GlobalGuard } from '../guards/global/global.guard'; +import { PagedResponseImpl } from '../helpers/PagedResponse'; import { Acl, ExtractProjectIdMiddleware, -} from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { Audit } from '../../models'; -import { AuditsService } from './audits.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { Audit } from '../models'; +import { AuditsService } from '../services/audits.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/auth/auth.controller.spec.ts b/packages/nocodb-nest/src/controllers/auth.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/auth/auth.controller.spec.ts rename to packages/nocodb-nest/src/controllers/auth.controller.spec.ts index a8d5737fd5..9c626d3e60 100644 --- a/packages/nocodb-nest/src/modules/auth/auth.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/auth.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { AuthController } from './auth.controller'; -import { AuthService } from './auth.service'; +import { AuthService } from '../services/auth.service'; import type { TestingModule } from '@nestjs/testing'; describe('AuthController', () => { diff --git a/packages/nocodb-nest/src/modules/auth/auth.controller.ts b/packages/nocodb-nest/src/controllers/auth.controller.ts similarity index 76% rename from packages/nocodb-nest/src/modules/auth/auth.controller.ts rename to packages/nocodb-nest/src/controllers/auth.controller.ts index d2f9a7616d..93827de513 100644 --- a/packages/nocodb-nest/src/modules/auth/auth.controller.ts +++ b/packages/nocodb-nest/src/controllers/auth.controller.ts @@ -8,10 +8,10 @@ import { UseGuards, } from '@nestjs/common'; import { AuthGuard } from '@nestjs/passport'; -import { GlobalGuard } from '../../guards/global/global.guard'; -import { ExtractProjectIdMiddleware } from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import extractRolesObj from '../../utils/extractRolesObj'; -import { AuthService } from './auth.service'; +import { GlobalGuard } from '../guards/global/global.guard'; +import { ExtractProjectIdMiddleware } from '../middlewares/extract-project-id/extract-project-id.middleware'; +import extractRolesObj from '../utils/extractRolesObj'; +import { AuthService } from '../services/auth.service'; export class CreateUserDto { readonly username: string; diff --git a/packages/nocodb-nest/src/modules/bases/bases.controller.spec.ts b/packages/nocodb-nest/src/controllers/bases.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/bases/bases.controller.spec.ts rename to packages/nocodb-nest/src/controllers/bases.controller.spec.ts index fd07fe639d..282c0f839f 100644 --- a/packages/nocodb-nest/src/modules/bases/bases.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/bases.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { BasesController } from './bases.controller'; -import { BasesService } from './bases.service'; +import { BasesService } from '../services/bases.service'; import type { TestingModule } from '@nestjs/testing'; describe('BasesController', () => { diff --git a/packages/nocodb-nest/src/modules/bases/bases.controller.ts b/packages/nocodb-nest/src/controllers/bases.controller.ts similarity index 88% rename from packages/nocodb-nest/src/modules/bases/bases.controller.ts rename to packages/nocodb-nest/src/controllers/bases.controller.ts index bd87681710..28b45367a7 100644 --- a/packages/nocodb-nest/src/modules/bases/bases.controller.ts +++ b/packages/nocodb-nest/src/controllers/bases.controller.ts @@ -11,13 +11,13 @@ import { } from '@nestjs/common'; import { BaseReqType } from 'nocodb-sdk'; import { AuthGuard } from '@nestjs/passport'; -import { GlobalGuard } from '../../guards/global/global.guard'; -import { PagedResponseImpl } from '../../helpers/PagedResponse'; +import { GlobalGuard } from '../guards/global/global.guard'; +import { PagedResponseImpl } from '../helpers/PagedResponse'; import { Acl, ExtractProjectIdMiddleware, -} from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { BasesService } from './bases.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { BasesService } from '../services/bases.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/datas/bulk-data-alias/bulk-data-alias.controller.spec.ts b/packages/nocodb-nest/src/controllers/bulk-data-alias.controller.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/datas/bulk-data-alias/bulk-data-alias.controller.spec.ts rename to packages/nocodb-nest/src/controllers/bulk-data-alias.controller.spec.ts diff --git a/packages/nocodb-nest/src/modules/datas/bulk-data-alias/bulk-data-alias.controller.ts b/packages/nocodb-nest/src/controllers/bulk-data-alias.controller.ts similarity index 92% rename from packages/nocodb-nest/src/modules/datas/bulk-data-alias/bulk-data-alias.controller.ts rename to packages/nocodb-nest/src/controllers/bulk-data-alias.controller.ts index c88504330b..e1202929c3 100644 --- a/packages/nocodb-nest/src/modules/datas/bulk-data-alias/bulk-data-alias.controller.ts +++ b/packages/nocodb-nest/src/controllers/bulk-data-alias.controller.ts @@ -11,12 +11,12 @@ import { UseGuards, } from '@nestjs/common'; 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 { BulkDataAliasService } from './bulk-data-alias.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { BulkDataAliasService } from '../services/bulk-data-alias.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/caches/caches.controller.spec.ts b/packages/nocodb-nest/src/controllers/caches.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/caches/caches.controller.spec.ts rename to packages/nocodb-nest/src/controllers/caches.controller.spec.ts index ed86caac26..39d0cd7243 100644 --- a/packages/nocodb-nest/src/modules/caches/caches.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/caches.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { CachesController } from './caches.controller'; -import { CachesService } from './caches.service'; +import { CachesService } from '../services/caches.service'; import type { TestingModule } from '@nestjs/testing'; describe('CachesController', () => { diff --git a/packages/nocodb-nest/src/modules/caches/caches.controller.ts b/packages/nocodb-nest/src/controllers/caches.controller.ts similarity index 80% rename from packages/nocodb-nest/src/modules/caches/caches.controller.ts rename to packages/nocodb-nest/src/controllers/caches.controller.ts index 70635677be..5f20616eb7 100644 --- a/packages/nocodb-nest/src/modules/caches/caches.controller.ts +++ b/packages/nocodb-nest/src/controllers/caches.controller.ts @@ -1,6 +1,6 @@ import { Controller, Delete, Get } from '@nestjs/common'; -import { Acl } from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { CachesService } from './caches.service'; +import { Acl } from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { CachesService } from '../services/caches.service'; @Controller() export class CachesController { diff --git a/packages/nocodb-nest/src/modules/columns/columns.controller.spec.ts b/packages/nocodb-nest/src/controllers/columns.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/columns/columns.controller.spec.ts rename to packages/nocodb-nest/src/controllers/columns.controller.spec.ts index c7fda0c40e..57446abeae 100644 --- a/packages/nocodb-nest/src/modules/columns/columns.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/columns.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { ColumnsController } from './columns.controller'; -import { ColumnsService } from './columns.service'; +import { ColumnsService } from '../services/columns.service'; import type { TestingModule } from '@nestjs/testing'; describe('ColumnsController', () => { diff --git a/packages/nocodb-nest/src/modules/columns/columns.controller.ts b/packages/nocodb-nest/src/controllers/columns.controller.ts similarity index 89% rename from packages/nocodb-nest/src/modules/columns/columns.controller.ts rename to packages/nocodb-nest/src/controllers/columns.controller.ts index 2dcb772405..764be4c4d1 100644 --- a/packages/nocodb-nest/src/modules/columns/columns.controller.ts +++ b/packages/nocodb-nest/src/controllers/columns.controller.ts @@ -12,12 +12,12 @@ import { } from '@nestjs/common'; import { ColumnReqType } 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 { ColumnsService } from './columns.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { ColumnsService } from '../services/columns.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/datas/data-alias-export/data-alias-export.controller.spec.ts b/packages/nocodb-nest/src/controllers/data-alias-export.controller.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/datas/data-alias-export/data-alias-export.controller.spec.ts rename to packages/nocodb-nest/src/controllers/data-alias-export.controller.spec.ts diff --git a/packages/nocodb-nest/src/modules/datas/data-alias-export/data-alias-export.controller.ts b/packages/nocodb-nest/src/controllers/data-alias-export.controller.ts similarity index 87% rename from packages/nocodb-nest/src/modules/datas/data-alias-export/data-alias-export.controller.ts rename to packages/nocodb-nest/src/controllers/data-alias-export.controller.ts index da1f2239b8..42da30027d 100644 --- a/packages/nocodb-nest/src/modules/datas/data-alias-export/data-alias-export.controller.ts +++ b/packages/nocodb-nest/src/controllers/data-alias-export.controller.ts @@ -1,14 +1,14 @@ import { Controller, Get, Request, Response, UseGuards } from '@nestjs/common'; import * as XLSX from 'xlsx'; 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 { View } from '../../../models'; -import { DatasService } from '../datas.service'; -import { extractCsvData, extractXlsxData } from '../helpers'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { View } from '../models'; +import { DatasService } from '../services/datas.service'; +import { extractCsvData, extractXlsxData } from '../modules/datas/helpers'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/datas/data-alias-nested/data-alias-nested.controller.spec.ts b/packages/nocodb-nest/src/controllers/data-alias-nested.controller.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/datas/data-alias-nested/data-alias-nested.controller.spec.ts rename to packages/nocodb-nest/src/controllers/data-alias-nested.controller.spec.ts diff --git a/packages/nocodb-nest/src/modules/datas/data-alias-nested/data-alias-nested.controller.ts b/packages/nocodb-nest/src/controllers/data-alias-nested.controller.ts similarity index 95% rename from packages/nocodb-nest/src/modules/datas/data-alias-nested/data-alias-nested.controller.ts rename to packages/nocodb-nest/src/controllers/data-alias-nested.controller.ts index 54b628133f..53c11f5f42 100644 --- a/packages/nocodb-nest/src/modules/datas/data-alias-nested/data-alias-nested.controller.ts +++ b/packages/nocodb-nest/src/controllers/data-alias-nested.controller.ts @@ -9,12 +9,12 @@ import { UseGuards, } from '@nestjs/common'; 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 { DataAliasNestedService } from './data-alias-nested.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { DataAliasNestedService } from '../services/data-alias-nested.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/datas/data-alias-nested/data-alias-nested.service.spec.ts b/packages/nocodb-nest/src/controllers/data-alias-nested.service.spec.ts similarity index 86% rename from packages/nocodb-nest/src/modules/datas/data-alias-nested/data-alias-nested.service.spec.ts rename to packages/nocodb-nest/src/controllers/data-alias-nested.service.spec.ts index 3f8343452b..9b4a7d8835 100644 --- a/packages/nocodb-nest/src/modules/datas/data-alias-nested/data-alias-nested.service.spec.ts +++ b/packages/nocodb-nest/src/controllers/data-alias-nested.service.spec.ts @@ -1,5 +1,5 @@ import { Test } from '@nestjs/testing'; -import { DataAliasNestedService } from './data-alias-nested.service'; +import { DataAliasNestedService } from '../services/data-alias-nested.service'; import type { TestingModule } from '@nestjs/testing'; describe('DataAliasNestedService', () => { diff --git a/packages/nocodb-nest/src/modules/form-columns/form-columns.controller.spec.ts b/packages/nocodb-nest/src/controllers/form-columns.controller.spec.ts similarity index 89% rename from packages/nocodb-nest/src/modules/form-columns/form-columns.controller.spec.ts rename to packages/nocodb-nest/src/controllers/form-columns.controller.spec.ts index bb057930fa..e99dd8c9ab 100644 --- a/packages/nocodb-nest/src/modules/form-columns/form-columns.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/form-columns.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { FormColumnsController } from './form-columns.controller'; -import { FormColumnsService } from './form-columns.service'; +import { FormColumnsService } from '../services/form-columns.service'; import type { TestingModule } from '@nestjs/testing'; describe('FormColumnsController', () => { diff --git a/packages/nocodb-nest/src/modules/form-columns/form-columns.controller.ts b/packages/nocodb-nest/src/controllers/form-columns.controller.ts similarity index 78% rename from packages/nocodb-nest/src/modules/form-columns/form-columns.controller.ts rename to packages/nocodb-nest/src/controllers/form-columns.controller.ts index 4868b512fc..fbb77e3cfa 100644 --- a/packages/nocodb-nest/src/modules/form-columns/form-columns.controller.ts +++ b/packages/nocodb-nest/src/controllers/form-columns.controller.ts @@ -1,11 +1,11 @@ import { Body, Controller, Param, Patch, UseGuards } from '@nestjs/common'; 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 { FormColumnsService } from './form-columns.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { FormColumnsService } from '../services/form-columns.service'; class FormColumnUpdateReqType {} diff --git a/packages/nocodb-nest/src/modules/forms/forms.controller.spec.ts b/packages/nocodb-nest/src/controllers/forms.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/forms/forms.controller.spec.ts rename to packages/nocodb-nest/src/controllers/forms.controller.spec.ts index fe26e57419..7cf55f511d 100644 --- a/packages/nocodb-nest/src/modules/forms/forms.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/forms.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { FormsController } from './forms.controller'; -import { FormsService } from './forms.service'; +import { FormsService } from '../services/forms.service'; import type { TestingModule } from '@nestjs/testing'; describe('FormsController', () => { diff --git a/packages/nocodb-nest/src/modules/forms/forms.controller.ts b/packages/nocodb-nest/src/controllers/forms.controller.ts similarity index 85% rename from packages/nocodb-nest/src/modules/forms/forms.controller.ts rename to packages/nocodb-nest/src/controllers/forms.controller.ts index 1e03e65745..bfc3b945b3 100644 --- a/packages/nocodb-nest/src/modules/forms/forms.controller.ts +++ b/packages/nocodb-nest/src/controllers/forms.controller.ts @@ -9,12 +9,12 @@ import { UseGuards, } from '@nestjs/common'; import { ViewCreateReqType } from 'nocodb-sdk'; -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 { FormsService } from './forms.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { FormsService } from '../services/forms.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/galleries/galleries.controller.spec.ts b/packages/nocodb-nest/src/controllers/galleries.controller.spec.ts similarity index 89% rename from packages/nocodb-nest/src/modules/galleries/galleries.controller.spec.ts rename to packages/nocodb-nest/src/controllers/galleries.controller.spec.ts index ca053d47f6..ee740f4639 100644 --- a/packages/nocodb-nest/src/modules/galleries/galleries.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/galleries.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { GalleriesController } from './galleries.controller'; -import { GalleriesService } from './galleries.service'; +import { GalleriesService } from '../services/galleries.service'; import type { TestingModule } from '@nestjs/testing'; describe('GalleriesController', () => { diff --git a/packages/nocodb-nest/src/modules/galleries/galleries.controller.ts b/packages/nocodb-nest/src/controllers/galleries.controller.ts similarity index 87% rename from packages/nocodb-nest/src/modules/galleries/galleries.controller.ts rename to packages/nocodb-nest/src/controllers/galleries.controller.ts index a82d707864..bc95f07070 100644 --- a/packages/nocodb-nest/src/modules/galleries/galleries.controller.ts +++ b/packages/nocodb-nest/src/controllers/galleries.controller.ts @@ -10,12 +10,12 @@ import { } from '@nestjs/common'; import { GalleryUpdateReqType, ViewCreateReqType } 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 { GalleriesService } from './galleries.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { GalleriesService } from '../services/galleries.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/grid-columns/grid-columns.controller.spec.ts b/packages/nocodb-nest/src/controllers/grid-columns.controller.spec.ts similarity index 89% rename from packages/nocodb-nest/src/modules/grid-columns/grid-columns.controller.spec.ts rename to packages/nocodb-nest/src/controllers/grid-columns.controller.spec.ts index 942a2c5085..b094c97e4a 100644 --- a/packages/nocodb-nest/src/modules/grid-columns/grid-columns.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/grid-columns.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { GridColumnsController } from './grid-columns.controller'; -import { GridColumnsService } from './grid-columns.service'; +import { GridColumnsService } from '../services/grid-columns.service'; import type { TestingModule } from '@nestjs/testing'; describe('GridColumnsController', () => { diff --git a/packages/nocodb-nest/src/modules/grid-columns/grid-columns.controller.ts b/packages/nocodb-nest/src/controllers/grid-columns.controller.ts similarity index 82% rename from packages/nocodb-nest/src/modules/grid-columns/grid-columns.controller.ts rename to packages/nocodb-nest/src/controllers/grid-columns.controller.ts index 786a361fc1..b799f24308 100644 --- a/packages/nocodb-nest/src/modules/grid-columns/grid-columns.controller.ts +++ b/packages/nocodb-nest/src/controllers/grid-columns.controller.ts @@ -1,12 +1,12 @@ import { Body, Controller, Get, Param, Patch, UseGuards } from '@nestjs/common'; import { GridColumnReqType } 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 { GridColumnsService } from './grid-columns.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { GridColumnsService } from '../services/grid-columns.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/grids/grids.controller.spec.ts b/packages/nocodb-nest/src/controllers/grids.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/grids/grids.controller.spec.ts rename to packages/nocodb-nest/src/controllers/grids.controller.spec.ts index 3555c5892e..92cf92afb7 100644 --- a/packages/nocodb-nest/src/modules/grids/grids.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/grids.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { GridsController } from './grids.controller'; -import { GridsService } from './grids.service'; +import { GridsService } from '../services/grids.service'; import type { TestingModule } from '@nestjs/testing'; describe('GridsController', () => { diff --git a/packages/nocodb-nest/src/modules/grids/grids.controller.ts b/packages/nocodb-nest/src/controllers/grids.controller.ts similarity index 84% rename from packages/nocodb-nest/src/modules/grids/grids.controller.ts rename to packages/nocodb-nest/src/controllers/grids.controller.ts index 00bfc46fa2..9026764fec 100644 --- a/packages/nocodb-nest/src/modules/grids/grids.controller.ts +++ b/packages/nocodb-nest/src/controllers/grids.controller.ts @@ -9,12 +9,12 @@ import { } from '@nestjs/common'; import { ViewCreateReqType } 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 { GridsService } from './grids.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { GridsService } from '../services/grids.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/hook-filters/hook-filters.controller.spec.ts b/packages/nocodb-nest/src/controllers/hook-filters.controller.spec.ts similarity index 89% rename from packages/nocodb-nest/src/modules/hook-filters/hook-filters.controller.spec.ts rename to packages/nocodb-nest/src/controllers/hook-filters.controller.spec.ts index 9b9d4840f4..b7a985e8b5 100644 --- a/packages/nocodb-nest/src/modules/hook-filters/hook-filters.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/hook-filters.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { HookFiltersController } from './hook-filters.controller'; -import { HookFiltersService } from './hook-filters.service'; +import { HookFiltersService } from '../services/hook-filters.service'; import type { TestingModule } from '@nestjs/testing'; describe('HookFiltersController', () => { diff --git a/packages/nocodb-nest/src/modules/hook-filters/hook-filters.controller.ts b/packages/nocodb-nest/src/controllers/hook-filters.controller.ts similarity index 70% rename from packages/nocodb-nest/src/modules/hook-filters/hook-filters.controller.ts rename to packages/nocodb-nest/src/controllers/hook-filters.controller.ts index 2b5a00ca45..28e2727a72 100644 --- a/packages/nocodb-nest/src/modules/hook-filters/hook-filters.controller.ts +++ b/packages/nocodb-nest/src/controllers/hook-filters.controller.ts @@ -1,5 +1,5 @@ import { Controller } from '@nestjs/common'; -import { HookFiltersService } from './hook-filters.service'; +import { HookFiltersService } from '../services/hook-filters.service'; @Controller() export class HookFiltersController { diff --git a/packages/nocodb-nest/src/modules/hooks/hooks.controller.spec.ts b/packages/nocodb-nest/src/controllers/hooks.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/hooks/hooks.controller.spec.ts rename to packages/nocodb-nest/src/controllers/hooks.controller.spec.ts index f7bb18ec75..225e14d9af 100644 --- a/packages/nocodb-nest/src/modules/hooks/hooks.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/hooks.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { HooksController } from './hooks.controller'; -import { HooksService } from './hooks.service'; +import { HooksService } from '../services/hooks.service'; import type { TestingModule } from '@nestjs/testing'; describe('HooksController', () => { diff --git a/packages/nocodb-nest/src/modules/hooks/hooks.controller.ts b/packages/nocodb-nest/src/controllers/hooks.controller.ts similarity index 91% rename from packages/nocodb-nest/src/modules/hooks/hooks.controller.ts rename to packages/nocodb-nest/src/controllers/hooks.controller.ts index ceb5bd9457..7d3d5d3b02 100644 --- a/packages/nocodb-nest/src/modules/hooks/hooks.controller.ts +++ b/packages/nocodb-nest/src/controllers/hooks.controller.ts @@ -11,13 +11,13 @@ import { UseGuards, } from '@nestjs/common'; import { HookReqType, HookTestReqType } from 'nocodb-sdk'; -import { GlobalGuard } from '../../guards/global/global.guard'; -import { PagedResponseImpl } from '../../helpers/PagedResponse'; +import { GlobalGuard } from '../guards/global/global.guard'; +import { PagedResponseImpl } from '../helpers/PagedResponse'; import { Acl, ExtractProjectIdMiddleware, -} from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { HooksService } from './hooks.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { HooksService } from '../services/hooks.service'; import type { HookType } from 'nocodb-sdk'; @Controller() diff --git a/packages/nocodb-nest/src/modules/import/import.controller.spec.ts b/packages/nocodb-nest/src/controllers/import.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/import/import.controller.spec.ts rename to packages/nocodb-nest/src/controllers/import.controller.spec.ts index 7c7f1d48db..11b4e9b786 100644 --- a/packages/nocodb-nest/src/modules/import/import.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/import.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { ImportController } from './import.controller'; -import { ImportService } from './import.service'; +import { ImportService } from '../services/import.service'; import type { TestingModule } from '@nestjs/testing'; describe('ImportController', () => { diff --git a/packages/nocodb-nest/src/modules/import/import.controller.ts b/packages/nocodb-nest/src/controllers/import.controller.ts similarity index 87% rename from packages/nocodb-nest/src/modules/import/import.controller.ts rename to packages/nocodb-nest/src/controllers/import.controller.ts index 0413f139f3..0589c8ec65 100644 --- a/packages/nocodb-nest/src/modules/import/import.controller.ts +++ b/packages/nocodb-nest/src/controllers/import.controller.ts @@ -1,15 +1,15 @@ 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/client/socket.service'; -import airtableSyncJob from '../sync/helpers/job'; -import { ImportService } from './import.service'; -import type { AirtableSyncConfig } from '../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 '../modules/sync/helpers/job'; +import { ImportService } from '../services/import.service'; +import type { AirtableSyncConfig } from '../modules/sync/helpers/job'; import type { Server } from 'socket.io'; diff --git a/packages/nocodb-nest/src/modules/kanbans/kanbans.controller.spec.ts b/packages/nocodb-nest/src/controllers/kanbans.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/kanbans/kanbans.controller.spec.ts rename to packages/nocodb-nest/src/controllers/kanbans.controller.spec.ts index 1aa9f8a8d0..3689baa8d5 100644 --- a/packages/nocodb-nest/src/modules/kanbans/kanbans.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/kanbans.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { KanbansController } from './kanbans.controller'; -import { KanbansService } from './kanbans.service'; +import { KanbansService } from '../services/kanbans.service'; import type { TestingModule } from '@nestjs/testing'; describe('KanbansController', () => { diff --git a/packages/nocodb-nest/src/modules/kanbans/kanbans.controller.ts b/packages/nocodb-nest/src/controllers/kanbans.controller.ts similarity index 85% rename from packages/nocodb-nest/src/modules/kanbans/kanbans.controller.ts rename to packages/nocodb-nest/src/controllers/kanbans.controller.ts index df6111ea37..cae059ac3b 100644 --- a/packages/nocodb-nest/src/modules/kanbans/kanbans.controller.ts +++ b/packages/nocodb-nest/src/controllers/kanbans.controller.ts @@ -9,12 +9,12 @@ import { UseGuards, } from '@nestjs/common'; import { ViewCreateReqType } from 'nocodb-sdk'; -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 { KanbansService } from './kanbans.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { KanbansService } from '../services/kanbans.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/maps/maps.controller.spec.ts b/packages/nocodb-nest/src/controllers/maps.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/maps/maps.controller.spec.ts rename to packages/nocodb-nest/src/controllers/maps.controller.spec.ts index d1464e8a95..62616382cf 100644 --- a/packages/nocodb-nest/src/modules/maps/maps.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/maps.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { MapsController } from './maps.controller'; -import { MapsService } from './maps.service'; +import { MapsService } from '../services/maps.service'; import type { TestingModule } from '@nestjs/testing'; describe('MapsController', () => { diff --git a/packages/nocodb-nest/src/modules/maps/maps.controller.ts b/packages/nocodb-nest/src/controllers/maps.controller.ts similarity index 86% rename from packages/nocodb-nest/src/modules/maps/maps.controller.ts rename to packages/nocodb-nest/src/controllers/maps.controller.ts index 9f47b252d0..422118aee1 100644 --- a/packages/nocodb-nest/src/modules/maps/maps.controller.ts +++ b/packages/nocodb-nest/src/controllers/maps.controller.ts @@ -10,12 +10,12 @@ import { } from '@nestjs/common'; import { MapUpdateReqType, ViewCreateReqType } 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 { MapsService } from './maps.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { MapsService } from '../services/maps.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/meta-diffs/meta-diffs.controller.spec.ts b/packages/nocodb-nest/src/controllers/meta-diffs.controller.spec.ts similarity index 89% rename from packages/nocodb-nest/src/modules/meta-diffs/meta-diffs.controller.spec.ts rename to packages/nocodb-nest/src/controllers/meta-diffs.controller.spec.ts index 3071ad3742..0e1285618f 100644 --- a/packages/nocodb-nest/src/modules/meta-diffs/meta-diffs.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/meta-diffs.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { MetaDiffsController } from './meta-diffs.controller'; -import { MetaDiffsService } from './meta-diffs.service'; +import { MetaDiffsService } from '../services/meta-diffs.service'; import type { TestingModule } from '@nestjs/testing'; describe('MetaDiffsController', () => { diff --git a/packages/nocodb-nest/src/modules/meta-diffs/meta-diffs.controller.ts b/packages/nocodb-nest/src/controllers/meta-diffs.controller.ts similarity index 88% rename from packages/nocodb-nest/src/modules/meta-diffs/meta-diffs.controller.ts rename to packages/nocodb-nest/src/controllers/meta-diffs.controller.ts index 535cafe034..6e281d7bf7 100644 --- a/packages/nocodb-nest/src/modules/meta-diffs/meta-diffs.controller.ts +++ b/packages/nocodb-nest/src/controllers/meta-diffs.controller.ts @@ -7,12 +7,12 @@ import { UseGuards, } from '@nestjs/common'; 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 { MetaDiffsService } from './meta-diffs.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { MetaDiffsService } from '../services/meta-diffs.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/model-visibilities/model-visibilities.controller.spec.ts b/packages/nocodb-nest/src/controllers/model-visibilities.controller.spec.ts similarity index 88% rename from packages/nocodb-nest/src/modules/model-visibilities/model-visibilities.controller.spec.ts rename to packages/nocodb-nest/src/controllers/model-visibilities.controller.spec.ts index 23178d354f..fabbe96505 100644 --- a/packages/nocodb-nest/src/modules/model-visibilities/model-visibilities.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/model-visibilities.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { ModelVisibilitiesController } from './model-visibilities.controller'; -import { ModelVisibilitiesService } from './model-visibilities.service'; +import { ModelVisibilitiesService } from '../services/model-visibilities.service'; import type { TestingModule } from '@nestjs/testing'; describe('ModelVisibilitiesController', () => { diff --git a/packages/nocodb-nest/src/modules/model-visibilities/model-visibilities.controller.ts b/packages/nocodb-nest/src/controllers/model-visibilities.controller.ts similarity index 84% rename from packages/nocodb-nest/src/modules/model-visibilities/model-visibilities.controller.ts rename to packages/nocodb-nest/src/controllers/model-visibilities.controller.ts index a831b4044f..dec2e45424 100644 --- a/packages/nocodb-nest/src/modules/model-visibilities/model-visibilities.controller.ts +++ b/packages/nocodb-nest/src/controllers/model-visibilities.controller.ts @@ -9,12 +9,12 @@ import { UseGuards, } from '@nestjs/common'; 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 { ModelVisibilitiesService } from './model-visibilities.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { ModelVisibilitiesService } from '../services/model-visibilities.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/datas/old-datas/old-datas.controller.spec.ts b/packages/nocodb-nest/src/controllers/old-datas/old-datas.controller.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/datas/old-datas/old-datas.controller.spec.ts rename to packages/nocodb-nest/src/controllers/old-datas/old-datas.controller.spec.ts diff --git a/packages/nocodb-nest/src/modules/datas/old-datas/old-datas.controller.ts b/packages/nocodb-nest/src/controllers/old-datas/old-datas.controller.ts similarity index 95% rename from packages/nocodb-nest/src/modules/datas/old-datas/old-datas.controller.ts rename to packages/nocodb-nest/src/controllers/old-datas/old-datas.controller.ts index d6b296fc9a..91ef73f480 100644 --- a/packages/nocodb-nest/src/modules/datas/old-datas/old-datas.controller.ts +++ b/packages/nocodb-nest/src/controllers/old-datas/old-datas.controller.ts @@ -12,11 +12,11 @@ import { UseGuards, } from '@nestjs/common'; 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'; +} from '../../middlewares/extract-project-id/extract-project-id.middleware'; import { OldDatasService } from './old-datas.service'; @Controller() diff --git a/packages/nocodb-nest/src/modules/datas/old-datas/old-datas.service.spec.ts b/packages/nocodb-nest/src/controllers/old-datas/old-datas.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/datas/old-datas/old-datas.service.spec.ts rename to packages/nocodb-nest/src/controllers/old-datas/old-datas.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/datas/old-datas/old-datas.service.ts b/packages/nocodb-nest/src/controllers/old-datas/old-datas.service.ts similarity index 92% rename from packages/nocodb-nest/src/modules/datas/old-datas/old-datas.service.ts rename to packages/nocodb-nest/src/controllers/old-datas/old-datas.service.ts index 3eaba59f38..36dacf4ff4 100644 --- a/packages/nocodb-nest/src/modules/datas/old-datas/old-datas.service.ts +++ b/packages/nocodb-nest/src/controllers/old-datas/old-datas.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@nestjs/common'; import { nocoExecute } from 'nc-help'; -import getAst from '../../../helpers/getAst'; -import { NcError } from '../../../helpers/catchError'; -import { Base, Model, Project, View } from '../../../models'; -import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2'; -import type { OldPathParams } from '../helpers'; +import getAst from '../../helpers/getAst'; +import { NcError } from '../../helpers/catchError'; +import { Base, Model, Project, View } from '../../models'; +import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; +import type { OldPathParams } from '../../modules/datas/helpers'; @Injectable() export class OldDatasService { diff --git a/packages/nocodb-nest/src/modules/org-lcense/org-lcense.controller.spec.ts b/packages/nocodb-nest/src/controllers/org-lcense.controller.spec.ts similarity index 89% rename from packages/nocodb-nest/src/modules/org-lcense/org-lcense.controller.spec.ts rename to packages/nocodb-nest/src/controllers/org-lcense.controller.spec.ts index 6364a1b30c..d22c5c5c81 100644 --- a/packages/nocodb-nest/src/modules/org-lcense/org-lcense.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/org-lcense.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { OrgLcenseController } from './org-lcense.controller'; -import { OrgLcenseService } from './org-lcense.service'; +import { OrgLcenseService } from '../services/org-lcense.service'; import type { TestingModule } from '@nestjs/testing'; describe('OrgLcenseController', () => { diff --git a/packages/nocodb-nest/src/modules/org-lcense/org-lcense.controller.ts b/packages/nocodb-nest/src/controllers/org-lcense.controller.ts similarity index 78% rename from packages/nocodb-nest/src/modules/org-lcense/org-lcense.controller.ts rename to packages/nocodb-nest/src/controllers/org-lcense.controller.ts index 7937090ecb..85dcd7214d 100644 --- a/packages/nocodb-nest/src/modules/org-lcense/org-lcense.controller.ts +++ b/packages/nocodb-nest/src/controllers/org-lcense.controller.ts @@ -7,9 +7,9 @@ import { UseGuards, } from '@nestjs/common'; import { OrgUserRoles } from 'nocodb-sdk'; -import { GlobalGuard } from '../../guards/global/global.guard'; -import { Acl } from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { OrgLcenseService } from './org-lcense.service'; +import { GlobalGuard } from '../guards/global/global.guard'; +import { Acl } from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { OrgLcenseService } from '../services/org-lcense.service'; @Controller() @UseGuards(GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/org-tokens/org-tokens.controller.spec.ts b/packages/nocodb-nest/src/controllers/org-tokens.controller.spec.ts similarity index 89% rename from packages/nocodb-nest/src/modules/org-tokens/org-tokens.controller.spec.ts rename to packages/nocodb-nest/src/controllers/org-tokens.controller.spec.ts index cb3590fb07..dbd1c1fc46 100644 --- a/packages/nocodb-nest/src/modules/org-tokens/org-tokens.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/org-tokens.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { OrgTokensController } from './org-tokens.controller'; -import { OrgTokensService } from './org-tokens.service'; +import { OrgTokensService } from '../services/org-tokens.service'; import type { TestingModule } from '@nestjs/testing'; describe('OrgTokensController', () => { diff --git a/packages/nocodb-nest/src/modules/org-tokens/org-tokens.controller.ts b/packages/nocodb-nest/src/controllers/org-tokens.controller.ts similarity index 84% rename from packages/nocodb-nest/src/modules/org-tokens/org-tokens.controller.ts rename to packages/nocodb-nest/src/controllers/org-tokens.controller.ts index 67f09a2929..81df25ddcb 100644 --- a/packages/nocodb-nest/src/modules/org-tokens/org-tokens.controller.ts +++ b/packages/nocodb-nest/src/controllers/org-tokens.controller.ts @@ -11,13 +11,13 @@ import { } from '@nestjs/common'; import { ApiTokenReqType } from 'nocodb-sdk'; import { AuthGuard } from '@nestjs/passport'; -import { getConditionalHandler } from '../../helpers/getHandler'; +import { getConditionalHandler } from '../helpers/getHandler'; import { Acl, ExtractProjectIdMiddleware, -} from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { OrgTokensEeService } from './ee/org-tokens/org-tokens-ee.service'; -import { OrgTokensService } from './org-tokens.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { OrgTokensEeService } from '../services/org-tokens-ee.service'; +import { OrgTokensService } from '../services/org-tokens.service'; @UseGuards(ExtractProjectIdMiddleware, AuthGuard('jwt')) @Controller() diff --git a/packages/nocodb-nest/src/modules/org-users/org-users.controller.spec.ts b/packages/nocodb-nest/src/controllers/org-users.controller.spec.ts similarity index 89% rename from packages/nocodb-nest/src/modules/org-users/org-users.controller.spec.ts rename to packages/nocodb-nest/src/controllers/org-users.controller.spec.ts index 73fbda7633..8330497346 100644 --- a/packages/nocodb-nest/src/modules/org-users/org-users.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/org-users.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { OrgUsersController } from './org-users.controller'; -import { OrgUsersService } from './org-users.service'; +import { OrgUsersService } from '../services/org-users.service'; import type { TestingModule } from '@nestjs/testing'; describe('OrgUsersController', () => { diff --git a/packages/nocodb-nest/src/modules/org-users/org-users.controller.ts b/packages/nocodb-nest/src/controllers/org-users.controller.ts similarity index 92% rename from packages/nocodb-nest/src/modules/org-users/org-users.controller.ts rename to packages/nocodb-nest/src/controllers/org-users.controller.ts index 1ccc71e003..7ea86c037e 100644 --- a/packages/nocodb-nest/src/modules/org-users/org-users.controller.ts +++ b/packages/nocodb-nest/src/controllers/org-users.controller.ts @@ -12,14 +12,14 @@ import { } from '@nestjs/common'; import { AuthGuard } from '@nestjs/passport'; import { OrgUserRoles } from 'nocodb-sdk'; -import { GlobalGuard } from '../../guards/global/global.guard'; -import { PagedResponseImpl } from '../../helpers/PagedResponse'; +import { GlobalGuard } from '../guards/global/global.guard'; +import { PagedResponseImpl } from '../helpers/PagedResponse'; import { Acl, ExtractProjectIdMiddleware, -} from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { User } from '../../models'; -import { OrgUsersService } from './org-users.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { User } from '../models'; +import { OrgUsersService } from '../services/org-users.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/plugins/plugins.controller.spec.ts b/packages/nocodb-nest/src/controllers/plugins.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/plugins/plugins.controller.spec.ts rename to packages/nocodb-nest/src/controllers/plugins.controller.spec.ts index b9c5a62b46..2889f1722b 100644 --- a/packages/nocodb-nest/src/modules/plugins/plugins.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/plugins.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { PluginsController } from './plugins.controller'; -import { PluginsService } from './plugins.service'; +import { PluginsService } from '../services/plugins.service'; import type { TestingModule } from '@nestjs/testing'; describe('PluginsController', () => { diff --git a/packages/nocodb-nest/src/modules/plugins/plugins.controller.ts b/packages/nocodb-nest/src/controllers/plugins.controller.ts similarity index 84% rename from packages/nocodb-nest/src/modules/plugins/plugins.controller.ts rename to packages/nocodb-nest/src/controllers/plugins.controller.ts index 571ccd8ff4..59b5256cc1 100644 --- a/packages/nocodb-nest/src/modules/plugins/plugins.controller.ts +++ b/packages/nocodb-nest/src/controllers/plugins.controller.ts @@ -8,10 +8,10 @@ import { Post, UseGuards, } from '@nestjs/common'; -import { GlobalGuard } from '../../guards/global/global.guard'; -import { PagedResponseImpl } from '../../helpers/PagedResponse'; -import { Acl } from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { PluginsService } from './plugins.service'; +import { GlobalGuard } from '../guards/global/global.guard'; +import { PagedResponseImpl } from '../helpers/PagedResponse'; +import { Acl } from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { PluginsService } from '../services/plugins.service'; // todo: move to a interceptor const blockInCloudMw = (_req, res, next) => { diff --git a/packages/nocodb-nest/src/modules/projects/projects.controller.spec.ts b/packages/nocodb-nest/src/controllers/projects.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/projects/projects.controller.spec.ts rename to packages/nocodb-nest/src/controllers/projects.controller.spec.ts index 3e34344a95..cd209e715b 100644 --- a/packages/nocodb-nest/src/modules/projects/projects.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/projects.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { ProjectsController } from './projects.controller'; -import { ProjectsService } from './projects.service'; +import { ProjectsService } from '../services/projects.service'; import type { TestingModule } from '@nestjs/testing'; describe('ProjectsController', () => { diff --git a/packages/nocodb-nest/src/modules/projects/projects.controller.ts b/packages/nocodb-nest/src/controllers/projects.controller.ts similarity index 91% rename from packages/nocodb-nest/src/modules/projects/projects.controller.ts rename to packages/nocodb-nest/src/controllers/projects.controller.ts index 94bbd04d6c..7b905cba2e 100644 --- a/packages/nocodb-nest/src/modules/projects/projects.controller.ts +++ b/packages/nocodb-nest/src/controllers/projects.controller.ts @@ -14,16 +14,16 @@ import { import { AuthGuard } from '@nestjs/passport'; import isDocker from 'is-docker'; import { ProjectReqType } from 'nocodb-sdk'; -import { GlobalGuard } from '../../guards/global/global.guard'; -import { PagedResponseImpl } from '../../helpers/PagedResponse'; +import { GlobalGuard } from '../guards/global/global.guard'; +import { PagedResponseImpl } from '../helpers/PagedResponse'; import { ExtractProjectIdMiddleware, UseAclMiddleware, UseProjectIdMiddleware, -} from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import Noco from '../../Noco'; -import { packageVersion } from '../../utils/packageVersion'; -import { ProjectsService } from './projects.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import Noco from '../Noco'; +import { packageVersion } from '../utils/packageVersion'; +import { ProjectsService } from '../services/projects.service'; import type { ProjectType } from 'nocodb-sdk'; @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/public-datas-export/public-datas-export.controller.spec.ts b/packages/nocodb-nest/src/controllers/public-datas-export.controller.spec.ts similarity index 88% rename from packages/nocodb-nest/src/modules/public-datas-export/public-datas-export.controller.spec.ts rename to packages/nocodb-nest/src/controllers/public-datas-export.controller.spec.ts index 14afb5bf12..7fafb7e8ca 100644 --- a/packages/nocodb-nest/src/modules/public-datas-export/public-datas-export.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/public-datas-export.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { PublicDatasExportController } from './public-datas-export.controller'; -import { PublicDatasExportService } from './public-datas-export.service'; +import { PublicDatasExportService } from '../services/public-datas-export.service'; import type { TestingModule } from '@nestjs/testing'; describe('PublicDatasExportController', () => { diff --git a/packages/nocodb-nest/src/modules/public-datas-export/public-datas-export.controller.ts b/packages/nocodb-nest/src/controllers/public-datas-export.controller.ts similarity index 95% rename from packages/nocodb-nest/src/modules/public-datas-export/public-datas-export.controller.ts rename to packages/nocodb-nest/src/controllers/public-datas-export.controller.ts index 70be95d8d0..885f98e141 100644 --- a/packages/nocodb-nest/src/modules/public-datas-export/public-datas-export.controller.ts +++ b/packages/nocodb-nest/src/controllers/public-datas-export.controller.ts @@ -3,13 +3,13 @@ import { ErrorMessages, isSystemColumn, UITypes, ViewTypes } from 'nocodb-sdk'; import * as XLSX from 'xlsx'; import { nocoExecute } from 'nc-help'; import papaparse from 'papaparse'; -import { NcError } from '../../helpers/catchError'; -import getAst from '../../helpers/getAst'; -import { Base, Column, Model, View } from '../../models'; -import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; -import { serializeCellValue } from '../datas/helpers'; -import { PublicDatasExportService } from './public-datas-export.service'; -import type { LinkToAnotherRecordColumn, LookupColumn } from '../../models'; +import { NcError } from '../helpers/catchError'; +import getAst from '../helpers/getAst'; +import { Base, Column, Model, View } from '../models'; +import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; +import { serializeCellValue } from '../modules/datas/helpers'; +import { PublicDatasExportService } from '../services/public-datas-export.service'; +import type { LinkToAnotherRecordColumn, LookupColumn } from '../models'; @Controller() export class PublicDatasExportController { diff --git a/packages/nocodb-nest/src/modules/public-datas/public-datas.controller.spec.ts b/packages/nocodb-nest/src/controllers/public-datas.controller.spec.ts similarity index 89% rename from packages/nocodb-nest/src/modules/public-datas/public-datas.controller.spec.ts rename to packages/nocodb-nest/src/controllers/public-datas.controller.spec.ts index 052926a7c3..a981905d4f 100644 --- a/packages/nocodb-nest/src/modules/public-datas/public-datas.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/public-datas.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { PublicDatasController } from './public-datas.controller'; -import { PublicDatasService } from './public-datas.service'; +import { PublicDatasService } from '../services/public-datas.service'; import type { TestingModule } from '@nestjs/testing'; describe('PublicDatasController', () => { diff --git a/packages/nocodb-nest/src/modules/public-datas/public-datas.controller.ts b/packages/nocodb-nest/src/controllers/public-datas.controller.ts similarity index 96% rename from packages/nocodb-nest/src/modules/public-datas/public-datas.controller.ts rename to packages/nocodb-nest/src/controllers/public-datas.controller.ts index acc5c53680..5213050752 100644 --- a/packages/nocodb-nest/src/modules/public-datas/public-datas.controller.ts +++ b/packages/nocodb-nest/src/controllers/public-datas.controller.ts @@ -9,8 +9,8 @@ import { } from '@nestjs/common'; import { AnyFilesInterceptor } from '@nestjs/platform-express'; import multer from 'multer'; -import { NC_ATTACHMENT_FIELD_SIZE } from '../../constants'; -import { PublicDatasService } from './public-datas.service'; +import { NC_ATTACHMENT_FIELD_SIZE } from '../constants'; +import { PublicDatasService } from '../services/public-datas.service'; @Controller() export class PublicDatasController { diff --git a/packages/nocodb-nest/src/modules/public-metas/public-metas.controller.spec.ts b/packages/nocodb-nest/src/controllers/public-metas.controller.spec.ts similarity index 89% rename from packages/nocodb-nest/src/modules/public-metas/public-metas.controller.spec.ts rename to packages/nocodb-nest/src/controllers/public-metas.controller.spec.ts index 4da851a1ec..ab9bb3c2ac 100644 --- a/packages/nocodb-nest/src/modules/public-metas/public-metas.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/public-metas.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { PublicMetasController } from './public-metas.controller'; -import { PublicMetasService } from './public-metas.service'; +import { PublicMetasService } from '../services/public-metas.service'; import type { TestingModule } from '@nestjs/testing'; describe('PublicMetasController', () => { diff --git a/packages/nocodb-nest/src/modules/public-metas/public-metas.controller.ts b/packages/nocodb-nest/src/controllers/public-metas.controller.ts similarity index 91% rename from packages/nocodb-nest/src/modules/public-metas/public-metas.controller.ts rename to packages/nocodb-nest/src/controllers/public-metas.controller.ts index 9ba19f40bd..59d31f2aa8 100644 --- a/packages/nocodb-nest/src/modules/public-metas/public-metas.controller.ts +++ b/packages/nocodb-nest/src/controllers/public-metas.controller.ts @@ -1,5 +1,5 @@ import { Controller, Get, Param, Request } from '@nestjs/common'; -import { PublicMetasService } from './public-metas.service'; +import { PublicMetasService } from '../services/public-metas.service'; @Controller() export class PublicMetasController { diff --git a/packages/nocodb-nest/src/modules/shared-bases/shared-bases.controller.spec.ts b/packages/nocodb-nest/src/controllers/shared-bases.controller.spec.ts similarity index 89% rename from packages/nocodb-nest/src/modules/shared-bases/shared-bases.controller.spec.ts rename to packages/nocodb-nest/src/controllers/shared-bases.controller.spec.ts index 06b42801c6..30b0b28ed2 100644 --- a/packages/nocodb-nest/src/modules/shared-bases/shared-bases.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/shared-bases.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { SharedBasesController } from './shared-bases.controller'; -import { SharedBasesService } from './shared-bases.service'; +import { SharedBasesService } from '../services/shared-bases.service'; import type { TestingModule } from '@nestjs/testing'; describe('SharedBasesController', () => { diff --git a/packages/nocodb-nest/src/modules/shared-bases/shared-bases.controller.ts b/packages/nocodb-nest/src/controllers/shared-bases.controller.ts similarity index 90% rename from packages/nocodb-nest/src/modules/shared-bases/shared-bases.controller.ts rename to packages/nocodb-nest/src/controllers/shared-bases.controller.ts index 8dfc7c1356..02d55bf444 100644 --- a/packages/nocodb-nest/src/modules/shared-bases/shared-bases.controller.ts +++ b/packages/nocodb-nest/src/controllers/shared-bases.controller.ts @@ -11,12 +11,12 @@ import { UseGuards, } from '@nestjs/common'; 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 { SharedBasesService } from './shared-bases.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { SharedBasesService } from '../services/shared-bases.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/sorts/sorts.controller.spec.ts b/packages/nocodb-nest/src/controllers/sorts.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/sorts/sorts.controller.spec.ts rename to packages/nocodb-nest/src/controllers/sorts.controller.spec.ts index ab4d4771e0..afc6e28eca 100644 --- a/packages/nocodb-nest/src/modules/sorts/sorts.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/sorts.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { SortsController } from './sorts.controller'; -import { SortsService } from './sorts.service'; +import { SortsService } from '../services/sorts.service'; import type { TestingModule } from '@nestjs/testing'; describe('SortsController', () => { diff --git a/packages/nocodb-nest/src/modules/sorts/sorts.controller.ts b/packages/nocodb-nest/src/controllers/sorts.controller.ts similarity index 87% rename from packages/nocodb-nest/src/modules/sorts/sorts.controller.ts rename to packages/nocodb-nest/src/controllers/sorts.controller.ts index 655e99159c..974d9b426c 100644 --- a/packages/nocodb-nest/src/modules/sorts/sorts.controller.ts +++ b/packages/nocodb-nest/src/controllers/sorts.controller.ts @@ -11,13 +11,13 @@ import { } from '@nestjs/common'; import { AuthGuard } from '@nestjs/passport'; import { SortReqType } from 'nocodb-sdk'; -import { GlobalGuard } from '../../guards/global/global.guard'; -import { PagedResponseImpl } from '../../helpers/PagedResponse'; +import { GlobalGuard } from '../guards/global/global.guard'; +import { PagedResponseImpl } from '../helpers/PagedResponse'; import { ExtractProjectIdMiddleware, UseAclMiddleware, -} from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { SortsService } from './sorts.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { SortsService } from '../services/sorts.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/sync/sync.controller.spec.ts b/packages/nocodb-nest/src/controllers/sync.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/sync/sync.controller.spec.ts rename to packages/nocodb-nest/src/controllers/sync.controller.spec.ts index 21b88416fd..6d28ff50b3 100644 --- a/packages/nocodb-nest/src/modules/sync/sync.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/sync.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { SyncController } from './sync.controller'; -import { SyncService } from './sync.service'; +import { SyncService } from '../services/sync.service'; import type { TestingModule } from '@nestjs/testing'; describe('SyncController', () => { diff --git a/packages/nocodb-nest/src/modules/sync/sync.controller.ts b/packages/nocodb-nest/src/controllers/sync.controller.ts similarity index 89% rename from packages/nocodb-nest/src/modules/sync/sync.controller.ts rename to packages/nocodb-nest/src/controllers/sync.controller.ts index c04eeade71..9cd6708efb 100644 --- a/packages/nocodb-nest/src/modules/sync/sync.controller.ts +++ b/packages/nocodb-nest/src/controllers/sync.controller.ts @@ -10,12 +10,12 @@ import { Req, 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 { SyncService } from './sync.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { SyncService } from '../services/sync.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/tables/tables.controller.spec.ts b/packages/nocodb-nest/src/controllers/tables.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/tables/tables.controller.spec.ts rename to packages/nocodb-nest/src/controllers/tables.controller.spec.ts index 39b0fbb6c3..82099bffbc 100644 --- a/packages/nocodb-nest/src/modules/tables/tables.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/tables.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { TablesController } from './tables.controller'; -import { TablesService } from './tables.service'; +import { TablesService } from '../services/tables.service'; import type { TestingModule } from '@nestjs/testing'; describe('TablesController', () => { diff --git a/packages/nocodb-nest/src/modules/tables/tables.controller.ts b/packages/nocodb-nest/src/controllers/tables.controller.ts similarity index 90% rename from packages/nocodb-nest/src/modules/tables/tables.controller.ts rename to packages/nocodb-nest/src/controllers/tables.controller.ts index 71efb012ac..9889af8b49 100644 --- a/packages/nocodb-nest/src/modules/tables/tables.controller.ts +++ b/packages/nocodb-nest/src/controllers/tables.controller.ts @@ -13,14 +13,14 @@ import { } from '@nestjs/common'; import { AuthGuard } from '@nestjs/passport'; import { TableReqType } from 'nocodb-sdk'; -import { GlobalGuard } from '../../guards/global/global.guard'; -import extractRolesObj from '../../utils/extractRolesObj'; -import { PagedResponseImpl } from '../../helpers/PagedResponse'; +import { GlobalGuard } from '../guards/global/global.guard'; +import extractRolesObj from '../utils/extractRolesObj'; +import { PagedResponseImpl } from '../helpers/PagedResponse'; import { ExtractProjectIdMiddleware, UseAclMiddleware, -} from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { TablesService } from './tables.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { TablesService } from '../services/tables.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/utils/utils.controller.spec.ts b/packages/nocodb-nest/src/controllers/utils.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/utils/utils.controller.spec.ts rename to packages/nocodb-nest/src/controllers/utils.controller.spec.ts index 979c5407a0..f136a6f1bf 100644 --- a/packages/nocodb-nest/src/modules/utils/utils.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/utils.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { UtilsController } from './utils.controller'; -import { UtilsService } from './utils.service'; +import { UtilsService } from '../services/utils.service'; import type { TestingModule } from '@nestjs/testing'; describe('UtilsController', () => { diff --git a/packages/nocodb-nest/src/modules/utils/utils.controller.ts b/packages/nocodb-nest/src/controllers/utils.controller.ts similarity index 87% rename from packages/nocodb-nest/src/modules/utils/utils.controller.ts rename to packages/nocodb-nest/src/controllers/utils.controller.ts index 7ce62df6fd..13c0685625 100644 --- a/packages/nocodb-nest/src/modules/utils/utils.controller.ts +++ b/packages/nocodb-nest/src/controllers/utils.controller.ts @@ -7,12 +7,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 { UtilsService } from './utils.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { UtilsService } from '../services/utils.service'; @Controller() export class UtilsController { diff --git a/packages/nocodb-nest/src/modules/view-columns/view-columns.controller.spec.ts b/packages/nocodb-nest/src/controllers/view-columns.controller.spec.ts similarity index 89% rename from packages/nocodb-nest/src/modules/view-columns/view-columns.controller.spec.ts rename to packages/nocodb-nest/src/controllers/view-columns.controller.spec.ts index 02c22ed586..e3d5480cea 100644 --- a/packages/nocodb-nest/src/modules/view-columns/view-columns.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/view-columns.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { ViewColumnsController } from './view-columns.controller'; -import { ViewColumnsService } from './view-columns.service'; +import { ViewColumnsService } from '../services/view-columns.service'; import type { TestingModule } from '@nestjs/testing'; describe('ViewColumnsController', () => { diff --git a/packages/nocodb-nest/src/modules/view-columns/view-columns.controller.ts b/packages/nocodb-nest/src/controllers/view-columns.controller.ts similarity index 83% rename from packages/nocodb-nest/src/modules/view-columns/view-columns.controller.ts rename to packages/nocodb-nest/src/controllers/view-columns.controller.ts index 6baaf3fc7f..a8b272ce40 100644 --- a/packages/nocodb-nest/src/modules/view-columns/view-columns.controller.ts +++ b/packages/nocodb-nest/src/controllers/view-columns.controller.ts @@ -10,13 +10,13 @@ import { } from '@nestjs/common'; import { ColumnReqType, ViewColumnReqType } from 'nocodb-sdk'; import { AuthGuard } from '@nestjs/passport'; -import { GlobalGuard } from '../../guards/global/global.guard'; -import { PagedResponseImpl } from '../../helpers/PagedResponse'; +import { GlobalGuard } from '../guards/global/global.guard'; +import { PagedResponseImpl } from '../helpers/PagedResponse'; import { Acl, ExtractProjectIdMiddleware, -} from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { ViewColumnsService } from './view-columns.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { ViewColumnsService } from '../services/view-columns.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/views/views.controller.spec.ts b/packages/nocodb-nest/src/controllers/views.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/views/views.controller.spec.ts rename to packages/nocodb-nest/src/controllers/views.controller.spec.ts index 2f034c1ea4..552a40d912 100644 --- a/packages/nocodb-nest/src/modules/views/views.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/views.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { ViewsController } from './views.controller'; -import { ViewsService } from './views.service'; +import { ViewsService } from '../services/views.service'; import type { TestingModule } from '@nestjs/testing'; describe('ViewsController', () => { diff --git a/packages/nocodb-nest/src/modules/views/views.controller.ts b/packages/nocodb-nest/src/controllers/views.controller.ts similarity index 92% rename from packages/nocodb-nest/src/modules/views/views.controller.ts rename to packages/nocodb-nest/src/controllers/views.controller.ts index f08ce969ce..4d3c285f7e 100644 --- a/packages/nocodb-nest/src/modules/views/views.controller.ts +++ b/packages/nocodb-nest/src/controllers/views.controller.ts @@ -12,13 +12,13 @@ import { UseGuards, } from '@nestjs/common'; import { ViewUpdateReqType } from 'nocodb-sdk'; -import { PagedResponseImpl } from '../../helpers/PagedResponse'; +import { PagedResponseImpl } from '../helpers/PagedResponse'; import { ExtractProjectIdMiddleware, UseAclMiddleware, -} from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { GlobalGuard } from '../../guards/global/global.guard'; -import { ViewsService } from './views.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { GlobalGuard } from '../guards/global/global.guard'; +import { ViewsService } from '../services/views.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/api-docs/api-docs.service.spec.ts b/packages/nocodb-nest/src/modules/api-docs.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/api-docs/api-docs.service.spec.ts rename to packages/nocodb-nest/src/modules/api-docs.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/api-docs/api-docs.service.ts b/packages/nocodb-nest/src/modules/api-docs.service.ts similarity index 88% rename from packages/nocodb-nest/src/modules/api-docs/api-docs.service.ts rename to packages/nocodb-nest/src/modules/api-docs.service.ts index 5da0d489ff..8fc51a3ff9 100644 --- a/packages/nocodb-nest/src/modules/api-docs/api-docs.service.ts +++ b/packages/nocodb-nest/src/modules/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/api-docs/api-docs.module.ts b/packages/nocodb-nest/src/modules/api-docs/api-docs.module.ts index 6049cbd62b..d5a88ab320 100644 --- a/packages/nocodb-nest/src/modules/api-docs/api-docs.module.ts +++ b/packages/nocodb-nest/src/modules/api-docs/api-docs.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { ApiDocsService } from './api-docs.service'; -import { ApiDocsController } from './api-docs.controller'; +import { ApiDocsService } from '../api-docs.service'; +import { ApiDocsController } from '../../controllers/api-docs/api-docs.controller'; @Module({ controllers: [ApiDocsController], 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 index 1bf69a8c0a..3abd1e7224 100644 --- a/packages/nocodb-nest/src/modules/api-tokens/api-tokens.module.ts +++ b/packages/nocodb-nest/src/modules/api-tokens/api-tokens.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { ApiTokensService } from './api-tokens.service'; -import { ApiTokensController } from './api-tokens.controller'; +import { ApiTokensService } from '../../services/api-tokens.service'; +import { ApiTokensController } from '../../controllers/api-tokens.controller'; @Module({ controllers: [ApiTokensController], diff --git a/packages/nocodb-nest/src/modules/audits/audits.module.ts b/packages/nocodb-nest/src/modules/audits/audits.module.ts index 131479e882..3b0094d554 100644 --- a/packages/nocodb-nest/src/modules/audits/audits.module.ts +++ b/packages/nocodb-nest/src/modules/audits/audits.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { AuditsService } from './audits.service'; -import { AuditsController } from './audits.controller'; +import { AuditsService } from '../../services/audits.service'; +import { AuditsController } from '../../controllers/audits.controller'; @Module({ controllers: [AuditsController], diff --git a/packages/nocodb-nest/src/modules/auth/auth.module.ts b/packages/nocodb-nest/src/modules/auth/auth.module.ts index f8ab8dbcca..a7bbc69033 100644 --- a/packages/nocodb-nest/src/modules/auth/auth.module.ts +++ b/packages/nocodb-nest/src/modules/auth/auth.module.ts @@ -3,8 +3,8 @@ 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 './auth.service'; -import { AuthController } from './auth.controller'; +import { AuthService } from '../../services/auth.service'; +import { AuthController } from '../../controllers/auth.controller'; @Module({ controllers: [AuthController], diff --git a/packages/nocodb-nest/src/modules/bases/bases.module.ts b/packages/nocodb-nest/src/modules/bases/bases.module.ts index 9a537e40cc..b9692f918a 100644 --- a/packages/nocodb-nest/src/modules/bases/bases.module.ts +++ b/packages/nocodb-nest/src/modules/bases/bases.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { BasesService } from './bases.service'; -import { BasesController } from './bases.controller'; +import { BasesService } from '../../services/bases.service'; +import { BasesController } from '../../controllers/bases.controller'; @Module({ controllers: [BasesController], diff --git a/packages/nocodb-nest/src/modules/caches/caches.module.ts b/packages/nocodb-nest/src/modules/caches/caches.module.ts index 1ace80d669..05a252b940 100644 --- a/packages/nocodb-nest/src/modules/caches/caches.module.ts +++ b/packages/nocodb-nest/src/modules/caches/caches.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { CachesService } from './caches.service'; -import { CachesController } from './caches.controller'; +import { CachesService } from '../../services/caches.service'; +import { CachesController } from '../../controllers/caches.controller'; @Module({ controllers: [CachesController], diff --git a/packages/nocodb-nest/src/modules/columns/columns.module.ts b/packages/nocodb-nest/src/modules/columns/columns.module.ts index 728b3abae4..134a22c2b2 100644 --- a/packages/nocodb-nest/src/modules/columns/columns.module.ts +++ b/packages/nocodb-nest/src/modules/columns/columns.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { ColumnsService } from './columns.service'; -import { ColumnsController } from './columns.controller'; +import { ColumnsService } from '../../services/columns.service'; +import { ColumnsController } from '../../controllers/columns.controller'; @Module({ controllers: [ColumnsController], diff --git a/packages/nocodb-nest/src/modules/datas/data-alias.controller.spec.ts b/packages/nocodb-nest/src/modules/datas/data-alias.controller.spec.ts index 68e70183de..5cec37b678 100644 --- a/packages/nocodb-nest/src/modules/datas/data-alias.controller.spec.ts +++ b/packages/nocodb-nest/src/modules/datas/data-alias.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { DataAliasController } from './data-alias.controller'; -import { DatasService } from './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/modules/datas/data-alias.controller.ts index 4bf01f610d..4184133425 100644 --- a/packages/nocodb-nest/src/modules/datas/data-alias.controller.ts +++ b/packages/nocodb-nest/src/modules/datas/data-alias.controller.ts @@ -18,7 +18,7 @@ import { Acl, ExtractProjectIdMiddleware, } from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { DatasService } from './datas.service'; +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/modules/datas/datas.controller.spec.ts index a9917662bc..9275551296 100644 --- a/packages/nocodb-nest/src/modules/datas/datas.controller.spec.ts +++ b/packages/nocodb-nest/src/modules/datas/datas.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { DatasController } from './datas.controller'; -import { DatasService } from './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/modules/datas/datas.controller.ts index 50489a0372..8a92cbc996 100644 --- a/packages/nocodb-nest/src/modules/datas/datas.controller.ts +++ b/packages/nocodb-nest/src/modules/datas/datas.controller.ts @@ -15,7 +15,7 @@ import { Acl, ExtractProjectIdMiddleware, } from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { DatasService } from './datas.service'; +import { DatasService } from '../../services/datas.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/datas/datas.module.ts b/packages/nocodb-nest/src/modules/datas/datas.module.ts index 2573801a3f..6043e4e9bd 100644 --- a/packages/nocodb-nest/src/modules/datas/datas.module.ts +++ b/packages/nocodb-nest/src/modules/datas/datas.module.ts @@ -1,14 +1,14 @@ import { Module } from '@nestjs/common'; import { DataAliasController } from './data-alias.controller'; -import { DatasService } from './datas.service'; +import { DatasService } from '../../services/datas.service'; import { DatasController } from './datas.controller'; -import { BulkDataAliasController } from './bulk-data-alias/bulk-data-alias.controller'; -import { DataAliasExportController } from './data-alias-export/data-alias-export.controller'; -import { DataAliasNestedController } from './data-alias-nested/data-alias-nested.controller'; -import { OldDatasController } from './old-datas/old-datas.controller'; -import { BulkDataAliasService } from './bulk-data-alias/bulk-data-alias.service'; -import { DataAliasNestedService } from './data-alias-nested/data-alias-nested.service'; -import { OldDatasService } from './old-datas/old-datas.service'; +import { BulkDataAliasController } from '../../controllers/bulk-data-alias.controller'; +import { DataAliasExportController } from '../../controllers/data-alias-export.controller'; +import { DataAliasNestedController } from '../../controllers/data-alias-nested.controller'; +import { OldDatasController } from '../../controllers/old-datas/old-datas.controller'; +import { BulkDataAliasService } from '../../services/bulk-data-alias.service'; +import { DataAliasNestedService } from '../../services/data-alias-nested.service'; +import { OldDatasService } from '../../controllers/old-datas/old-datas.service'; @Module({ controllers: [ 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 index 1bc91b60c5..b455559d41 100644 --- a/packages/nocodb-nest/src/modules/form-columns/form-columns.module.ts +++ b/packages/nocodb-nest/src/modules/form-columns/form-columns.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { FormColumnsService } from './form-columns.service'; -import { FormColumnsController } from './form-columns.controller'; +import { FormColumnsService } from '../../services/form-columns.service'; +import { FormColumnsController } from '../../controllers/form-columns.controller'; @Module({ controllers: [FormColumnsController], diff --git a/packages/nocodb-nest/src/modules/forms/forms.module.ts b/packages/nocodb-nest/src/modules/forms/forms.module.ts index 75be39bccc..21e0e110cf 100644 --- a/packages/nocodb-nest/src/modules/forms/forms.module.ts +++ b/packages/nocodb-nest/src/modules/forms/forms.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { FormsService } from './forms.service'; -import { FormsController } from './forms.controller'; +import { FormsService } from '../../services/forms.service'; +import { FormsController } from '../../controllers/forms.controller'; @Module({ controllers: [FormsController], diff --git a/packages/nocodb-nest/src/modules/galleries/galleries.module.ts b/packages/nocodb-nest/src/modules/galleries/galleries.module.ts index b617c6c965..89aa3148de 100644 --- a/packages/nocodb-nest/src/modules/galleries/galleries.module.ts +++ b/packages/nocodb-nest/src/modules/galleries/galleries.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { GalleriesService } from './galleries.service'; -import { GalleriesController } from './galleries.controller'; +import { GalleriesService } from '../../services/galleries.service'; +import { GalleriesController } from '../../controllers/galleries.controller'; @Module({ controllers: [GalleriesController], 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 index 4479398c11..5a2ff19388 100644 --- a/packages/nocodb-nest/src/modules/grid-columns/grid-columns.module.ts +++ b/packages/nocodb-nest/src/modules/grid-columns/grid-columns.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { GridColumnsService } from './grid-columns.service'; -import { GridColumnsController } from './grid-columns.controller'; +import { GridColumnsService } from '../../services/grid-columns.service'; +import { GridColumnsController } from '../../controllers/grid-columns.controller'; @Module({ controllers: [GridColumnsController], diff --git a/packages/nocodb-nest/src/modules/grids/grids.module.ts b/packages/nocodb-nest/src/modules/grids/grids.module.ts index 31152bf33e..7e3293d740 100644 --- a/packages/nocodb-nest/src/modules/grids/grids.module.ts +++ b/packages/nocodb-nest/src/modules/grids/grids.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { GridsService } from './grids.service'; -import { GridsController } from './grids.controller'; +import { GridsService } from '../../services/grids.service'; +import { GridsController } from '../../controllers/grids.controller'; @Module({ controllers: [GridsController], 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 index c0027c0d59..c44b8d3778 100644 --- a/packages/nocodb-nest/src/modules/hook-filters/hook-filters.module.ts +++ b/packages/nocodb-nest/src/modules/hook-filters/hook-filters.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { HookFiltersService } from './hook-filters.service'; -import { HookFiltersController } from './hook-filters.controller'; +import { HookFiltersService } from '../../services/hook-filters.service'; +import { HookFiltersController } from '../../controllers/hook-filters.controller'; @Module({ controllers: [HookFiltersController], diff --git a/packages/nocodb-nest/src/modules/hooks/hooks.module.ts b/packages/nocodb-nest/src/modules/hooks/hooks.module.ts index 89604762b9..3d2b3953d3 100644 --- a/packages/nocodb-nest/src/modules/hooks/hooks.module.ts +++ b/packages/nocodb-nest/src/modules/hooks/hooks.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { HooksService } from './hooks.service'; -import { HooksController } from './hooks.controller'; +import { HooksService } from '../../services/hooks.service'; +import { HooksController } from '../../controllers/hooks.controller'; @Module({ controllers: [HooksController], diff --git a/packages/nocodb-nest/src/modules/kanbans/kanbans.module.ts b/packages/nocodb-nest/src/modules/kanbans/kanbans.module.ts index 378833e732..f4702177e1 100644 --- a/packages/nocodb-nest/src/modules/kanbans/kanbans.module.ts +++ b/packages/nocodb-nest/src/modules/kanbans/kanbans.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { KanbansService } from './kanbans.service'; -import { KanbansController } from './kanbans.controller'; +import { KanbansService } from '../../services/kanbans.service'; +import { KanbansController } from '../../controllers/kanbans.controller'; @Module({ controllers: [KanbansController], diff --git a/packages/nocodb-nest/src/modules/maps/maps.module.ts b/packages/nocodb-nest/src/modules/maps/maps.module.ts index 0f52e7beaf..3a3f81b099 100644 --- a/packages/nocodb-nest/src/modules/maps/maps.module.ts +++ b/packages/nocodb-nest/src/modules/maps/maps.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { MapsService } from './maps.service'; -import { MapsController } from './maps.controller'; +import { MapsService } from '../../services/maps.service'; +import { MapsController } from '../../controllers/maps.controller'; @Module({ controllers: [MapsController], 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 index 1f9958bffa..aced5eaf7a 100644 --- a/packages/nocodb-nest/src/modules/meta-diffs/meta-diffs.module.ts +++ b/packages/nocodb-nest/src/modules/meta-diffs/meta-diffs.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { MetaDiffsService } from './meta-diffs.service'; -import { MetaDiffsController } from './meta-diffs.controller'; +import { MetaDiffsService } from '../../services/meta-diffs.service'; +import { MetaDiffsController } from '../../controllers/meta-diffs.controller'; @Module({ controllers: [MetaDiffsController], 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 index 84c3c3628b..2573a961f8 100644 --- a/packages/nocodb-nest/src/modules/model-visibilities/model-visibilities.module.ts +++ b/packages/nocodb-nest/src/modules/model-visibilities/model-visibilities.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { ModelVisibilitiesService } from './model-visibilities.service'; -import { ModelVisibilitiesController } from './model-visibilities.controller'; +import { ModelVisibilitiesService } from '../../services/model-visibilities.service'; +import { ModelVisibilitiesController } from '../../controllers/model-visibilities.controller'; @Module({ controllers: [ModelVisibilitiesController], 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 index a25180390c..8180cd25f7 100644 --- a/packages/nocodb-nest/src/modules/org-lcense/org-lcense.module.ts +++ b/packages/nocodb-nest/src/modules/org-lcense/org-lcense.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { OrgLcenseService } from './org-lcense.service'; -import { OrgLcenseController } from './org-lcense.controller'; +import { OrgLcenseService } from '../../services/org-lcense.service'; +import { OrgLcenseController } from '../../controllers/org-lcense.controller'; @Module({ controllers: [OrgLcenseController], 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 index a54848ac0a..ed97849767 100644 --- a/packages/nocodb-nest/src/modules/org-tokens/org-tokens.module.ts +++ b/packages/nocodb-nest/src/modules/org-tokens/org-tokens.module.ts @@ -1,7 +1,7 @@ import { Module } from '@nestjs/common'; -import { OrgTokensEeService } from './ee/org-tokens/org-tokens-ee.service'; -import { OrgTokensService } from './org-tokens.service'; -import { OrgTokensController } from './org-tokens.controller'; +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], 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 index b5bcc70955..68099b02f3 100644 --- a/packages/nocodb-nest/src/modules/org-users/org-users.module.ts +++ b/packages/nocodb-nest/src/modules/org-users/org-users.module.ts @@ -1,7 +1,7 @@ import { Module } from '@nestjs/common'; import { ProjectUsersService } from '../project-users/project-users.service'; -import { OrgUsersService } from './org-users.service'; -import { OrgUsersController } from './org-users.controller'; +import { OrgUsersService } from '../../services/org-users.service'; +import { OrgUsersController } from '../../controllers/org-users.controller'; @Module({ controllers: [OrgUsersController], diff --git a/packages/nocodb-nest/src/modules/plugins/plugins.module.ts b/packages/nocodb-nest/src/modules/plugins/plugins.module.ts index f3cabdc825..60b6d767b6 100644 --- a/packages/nocodb-nest/src/modules/plugins/plugins.module.ts +++ b/packages/nocodb-nest/src/modules/plugins/plugins.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { PluginsService } from './plugins.service'; -import { PluginsController } from './plugins.controller'; +import { PluginsService } from '../../services/plugins.service'; +import { PluginsController } from '../../controllers/plugins.controller'; @Module({ controllers: [PluginsController], diff --git a/packages/nocodb-nest/src/modules/projects/projects.module.ts b/packages/nocodb-nest/src/modules/projects/projects.module.ts index ff3c6eb377..05cbc5dc95 100644 --- a/packages/nocodb-nest/src/modules/projects/projects.module.ts +++ b/packages/nocodb-nest/src/modules/projects/projects.module.ts @@ -1,7 +1,7 @@ import { Module } from '@nestjs/common'; import { ExtractProjectIdMiddleware } from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { ProjectsService } from './projects.service'; -import { ProjectsController } from './projects.controller'; +import { ProjectsService } from '../../services/projects.service'; +import { ProjectsController } from '../../controllers/projects.controller'; @Module({ controllers: [ProjectsController], 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 index ce0f618572..8e93ea556a 100644 --- 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 @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { PublicDatasExportService } from './public-datas-export.service'; -import { PublicDatasExportController } from './public-datas-export.controller'; +import { PublicDatasExportService } from '../../services/public-datas-export.service'; +import { PublicDatasExportController } from '../../controllers/public-datas-export.controller'; @Module({ controllers: [PublicDatasExportController], 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 index 9de97e3c3c..a7f5f78f47 100644 --- a/packages/nocodb-nest/src/modules/public-datas/public-datas.module.ts +++ b/packages/nocodb-nest/src/modules/public-datas/public-datas.module.ts @@ -2,8 +2,8 @@ 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 './public-datas.service'; -import { PublicDatasController } from './public-datas.controller'; +import { PublicDatasService } from '../../services/public-datas.service'; +import { PublicDatasController } from '../../controllers/public-datas.controller'; @Module({ imports: [ 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 index 3f7c1531a5..9ae805e870 100644 --- a/packages/nocodb-nest/src/modules/public-metas/public-metas.module.ts +++ b/packages/nocodb-nest/src/modules/public-metas/public-metas.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { PublicMetasService } from './public-metas.service'; -import { PublicMetasController } from './public-metas.controller'; +import { PublicMetasService } from '../../services/public-metas.service'; +import { PublicMetasController } from '../../controllers/public-metas.controller'; @Module({ controllers: [PublicMetasController], 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 index b3357b0b65..a1c925bdc0 100644 --- a/packages/nocodb-nest/src/modules/shared-bases/shared-bases.module.ts +++ b/packages/nocodb-nest/src/modules/shared-bases/shared-bases.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { SharedBasesService } from './shared-bases.service'; -import { SharedBasesController } from './shared-bases.controller'; +import { SharedBasesService } from '../../services/shared-bases.service'; +import { SharedBasesController } from '../../controllers/shared-bases.controller'; @Module({ controllers: [SharedBasesController], diff --git a/packages/nocodb-nest/src/modules/sorts/sorts.module.ts b/packages/nocodb-nest/src/modules/sorts/sorts.module.ts index 9ef83485ff..ecaf9138fe 100644 --- a/packages/nocodb-nest/src/modules/sorts/sorts.module.ts +++ b/packages/nocodb-nest/src/modules/sorts/sorts.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { SortsService } from './sorts.service'; -import { SortsController } from './sorts.controller'; +import { SortsService } from '../../services/sorts.service'; +import { SortsController } from '../../controllers/sorts.controller'; @Module({ controllers: [SortsController], diff --git a/packages/nocodb-nest/src/modules/api-docs/swagger/getPaths.ts b/packages/nocodb-nest/src/modules/swagger/getPaths.ts similarity index 92% rename from packages/nocodb-nest/src/modules/api-docs/swagger/getPaths.ts rename to packages/nocodb-nest/src/modules/swagger/getPaths.ts index dffe195c6c..99d4701db5 100644 --- a/packages/nocodb-nest/src/modules/api-docs/swagger/getPaths.ts +++ b/packages/nocodb-nest/src/modules/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/api-docs/swagger/getSchemas.ts b/packages/nocodb-nest/src/modules/swagger/getSchemas.ts similarity index 91% rename from packages/nocodb-nest/src/modules/api-docs/swagger/getSchemas.ts rename to packages/nocodb-nest/src/modules/swagger/getSchemas.ts index 1dfa999e14..a05f0ebc6a 100644 --- a/packages/nocodb-nest/src/modules/api-docs/swagger/getSchemas.ts +++ b/packages/nocodb-nest/src/modules/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/api-docs/swagger/getSwaggerColumnMetas.ts b/packages/nocodb-nest/src/modules/swagger/getSwaggerColumnMetas.ts similarity index 92% rename from packages/nocodb-nest/src/modules/api-docs/swagger/getSwaggerColumnMetas.ts rename to packages/nocodb-nest/src/modules/swagger/getSwaggerColumnMetas.ts index 9a45b53ada..106d2ed391 100644 --- a/packages/nocodb-nest/src/modules/api-docs/swagger/getSwaggerColumnMetas.ts +++ b/packages/nocodb-nest/src/modules/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/api-docs/swagger/getSwaggerJSON.ts b/packages/nocodb-nest/src/modules/swagger/getSwaggerJSON.ts similarity index 96% rename from packages/nocodb-nest/src/modules/api-docs/swagger/getSwaggerJSON.ts rename to packages/nocodb-nest/src/modules/swagger/getSwaggerJSON.ts index 6b717992ea..2917357145 100644 --- a/packages/nocodb-nest/src/modules/api-docs/swagger/getSwaggerJSON.ts +++ b/packages/nocodb-nest/src/modules/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/api-docs/swagger/swagger-base.json b/packages/nocodb-nest/src/modules/swagger/swagger-base.json similarity index 100% rename from packages/nocodb-nest/src/modules/api-docs/swagger/swagger-base.json rename to packages/nocodb-nest/src/modules/swagger/swagger-base.json diff --git a/packages/nocodb-nest/src/modules/api-docs/swagger/templates/headers.ts b/packages/nocodb-nest/src/modules/swagger/templates/headers.ts similarity index 100% rename from packages/nocodb-nest/src/modules/api-docs/swagger/templates/headers.ts rename to packages/nocodb-nest/src/modules/swagger/templates/headers.ts diff --git a/packages/nocodb-nest/src/modules/api-docs/swagger/templates/params.ts b/packages/nocodb-nest/src/modules/swagger/templates/params.ts similarity index 98% rename from packages/nocodb-nest/src/modules/api-docs/swagger/templates/params.ts rename to packages/nocodb-nest/src/modules/swagger/templates/params.ts index 1f83df02d9..55c5e76273 100644 --- a/packages/nocodb-nest/src/modules/api-docs/swagger/templates/params.ts +++ b/packages/nocodb-nest/src/modules/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/api-docs/swagger/templates/paths.ts b/packages/nocodb-nest/src/modules/swagger/templates/paths.ts similarity index 100% rename from packages/nocodb-nest/src/modules/api-docs/swagger/templates/paths.ts rename to packages/nocodb-nest/src/modules/swagger/templates/paths.ts diff --git a/packages/nocodb-nest/src/modules/api-docs/swagger/templates/schemas.ts b/packages/nocodb-nest/src/modules/swagger/templates/schemas.ts similarity index 100% rename from packages/nocodb-nest/src/modules/api-docs/swagger/templates/schemas.ts rename to packages/nocodb-nest/src/modules/swagger/templates/schemas.ts diff --git a/packages/nocodb-nest/src/modules/sync/helpers/readAndProcessData.ts b/packages/nocodb-nest/src/modules/sync/helpers/readAndProcessData.ts index 619c4d7e00..45cbc3bd2e 100644 --- a/packages/nocodb-nest/src/modules/sync/helpers/readAndProcessData.ts +++ b/packages/nocodb-nest/src/modules/sync/helpers/readAndProcessData.ts @@ -1,7 +1,7 @@ import { RelationTypes, UITypes } from 'nocodb-sdk'; import EntityMap from './EntityMap'; -import type { BulkDataAliasService } from '../../datas/bulk-data-alias/bulk-data-alias.service'; -import type { TablesService } from '../../tables/tables.service'; +import type { BulkDataAliasService } from '../../../services/bulk-data-alias.service'; +import type { TablesService } from '../../../services/tables.service'; // @ts-ignore import type { AirtableBase } from 'airtable/lib/airtable_base'; import type { TableType } from 'nocodb-sdk'; diff --git a/packages/nocodb-nest/src/modules/sync/sync.module.ts b/packages/nocodb-nest/src/modules/sync/sync.module.ts index 07c16f9dbd..66efe0acdc 100644 --- a/packages/nocodb-nest/src/modules/sync/sync.module.ts +++ b/packages/nocodb-nest/src/modules/sync/sync.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { SyncService } from './sync.service'; -import { SyncController } from './sync.controller'; +import { SyncService } from '../../services/sync.service'; +import { SyncController } from '../../controllers/sync.controller'; @Module({ controllers: [SyncController], diff --git a/packages/nocodb-nest/src/modules/tables/tables.module.ts b/packages/nocodb-nest/src/modules/tables/tables.module.ts index d5ae6d3e57..e8132c8619 100644 --- a/packages/nocodb-nest/src/modules/tables/tables.module.ts +++ b/packages/nocodb-nest/src/modules/tables/tables.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { TablesService } from './tables.service'; -import { TablesController } from './tables.controller'; +import { TablesService } from '../../services/tables.service'; +import { TablesController } from '../../controllers/tables.controller'; @Module({ controllers: [TablesController], diff --git a/packages/nocodb-nest/src/modules/utils/utils.module.ts b/packages/nocodb-nest/src/modules/utils/utils.module.ts index b022208aaf..9af79558e1 100644 --- a/packages/nocodb-nest/src/modules/utils/utils.module.ts +++ b/packages/nocodb-nest/src/modules/utils/utils.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { UtilsService } from './utils.service'; -import { UtilsController } from './utils.controller'; +import { UtilsService } from '../../services/utils.service'; +import { UtilsController } from '../../controllers/utils.controller'; @Module({ controllers: [UtilsController], 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 index 80c5a9ef01..80c726155d 100644 --- a/packages/nocodb-nest/src/modules/view-columns/view-columns.module.ts +++ b/packages/nocodb-nest/src/modules/view-columns/view-columns.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { ViewColumnsService } from './view-columns.service'; -import { ViewColumnsController } from './view-columns.controller'; +import { ViewColumnsService } from '../../services/view-columns.service'; +import { ViewColumnsController } from '../../controllers/view-columns.controller'; @Module({ controllers: [ViewColumnsController], diff --git a/packages/nocodb-nest/src/modules/views/views.module.ts b/packages/nocodb-nest/src/modules/views/views.module.ts index 90605ffa28..b8c37c60c2 100644 --- a/packages/nocodb-nest/src/modules/views/views.module.ts +++ b/packages/nocodb-nest/src/modules/views/views.module.ts @@ -1,7 +1,7 @@ import { Module } from '@nestjs/common'; import { TablesModule } from '../tables/tables.module'; -import { ViewsService } from './views.service'; -import { ViewsController } from './views.controller'; +import { ViewsService } from '../../services/views.service'; +import { ViewsController } from '../../controllers/views.controller'; @Module({ controllers: [ViewsController], diff --git a/packages/nocodb-nest/src/modules/api-tokens/api-tokens.service.spec.ts b/packages/nocodb-nest/src/services/api-tokens.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/api-tokens/api-tokens.service.spec.ts rename to packages/nocodb-nest/src/services/api-tokens.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/api-tokens/api-tokens.service.ts b/packages/nocodb-nest/src/services/api-tokens.service.ts similarity index 82% rename from packages/nocodb-nest/src/modules/api-tokens/api-tokens.service.ts rename to packages/nocodb-nest/src/services/api-tokens.service.ts index 1a2caa5535..f151ddab61 100644 --- a/packages/nocodb-nest/src/modules/api-tokens/api-tokens.service.ts +++ b/packages/nocodb-nest/src/services/api-tokens.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@nestjs/common'; import { T } from 'nc-help'; import { OrgUserRoles } from 'nocodb-sdk'; -import { validatePayload } from '../../helpers'; -import { NcError } from '../../helpers/catchError'; -import { ApiToken } from '../../models'; -import extractRolesObj from '../../utils/extractRolesObj'; -import type { User } from '../../models'; +import { validatePayload } from '../helpers'; +import { NcError } from '../helpers/catchError'; +import { ApiToken } from '../models'; +import extractRolesObj from '../utils/extractRolesObj'; +import type { User } from '../models'; import type { ApiTokenReqType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/audits/audits.service.spec.ts b/packages/nocodb-nest/src/services/audits.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/audits/audits.service.spec.ts rename to packages/nocodb-nest/src/services/audits.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/audits/audits.service.ts b/packages/nocodb-nest/src/services/audits.service.ts similarity index 94% rename from packages/nocodb-nest/src/modules/audits/audits.service.ts rename to packages/nocodb-nest/src/services/audits.service.ts index da30782880..ab195072ad 100644 --- a/packages/nocodb-nest/src/modules/audits/audits.service.ts +++ b/packages/nocodb-nest/src/services/audits.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@nestjs/common'; import DOMPurify from 'isomorphic-dompurify'; import { AuditOperationSubTypes, AuditOperationTypes } from 'nocodb-sdk'; -import { validatePayload } from '../../helpers'; -import { NcError } from '../../helpers/catchError'; -import { Audit, Model } from '../../models'; +import { validatePayload } from '../helpers'; +import { NcError } from '../helpers/catchError'; +import { Audit, Model } from '../models'; import type { AuditRowUpdateReqType, CommentUpdateReqType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/auth/auth.service.spec.ts b/packages/nocodb-nest/src/services/auth.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/auth/auth.service.spec.ts rename to packages/nocodb-nest/src/services/auth.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/auth/auth.service.ts b/packages/nocodb-nest/src/services/auth.service.ts similarity index 95% rename from packages/nocodb-nest/src/modules/auth/auth.service.ts rename to packages/nocodb-nest/src/services/auth.service.ts index 6ee59dcf27..8f297e8f88 100644 --- a/packages/nocodb-nest/src/modules/auth/auth.service.ts +++ b/packages/nocodb-nest/src/services/auth.service.ts @@ -4,11 +4,11 @@ import { Injectable } from '@nestjs/common'; import * as bcrypt from 'bcryptjs'; import { v4 as uuidv4 } from 'uuid'; -import Noco from '../../Noco'; -import { genJwt } from '../users/helpers'; -import { UsersService } from '../users/users.service'; -import { Connection } from '../../connection/connection'; -import type { CreateUserDto } from './auth.controller'; +import Noco from '../Noco'; +import { genJwt } from '../modules/users/helpers'; +import { UsersService } from '../modules/users/users.service'; +import { Connection } from '../connection/connection'; +import type { CreateUserDto } from '../controllers/auth.controller'; @Injectable() export class AuthService { diff --git a/packages/nocodb-nest/src/modules/bases/bases.service.spec.ts b/packages/nocodb-nest/src/services/bases.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/bases/bases.service.spec.ts rename to packages/nocodb-nest/src/services/bases.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/bases/bases.service.ts b/packages/nocodb-nest/src/services/bases.service.ts similarity index 91% rename from packages/nocodb-nest/src/modules/bases/bases.service.ts rename to packages/nocodb-nest/src/services/bases.service.ts index 2634bae444..48bd9e6130 100644 --- a/packages/nocodb-nest/src/modules/bases/bases.service.ts +++ b/packages/nocodb-nest/src/services/bases.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { T } from 'nc-help'; -import { populateMeta, validatePayload } from '../../helpers'; -import { syncBaseMigration } from '../../helpers/syncMigration'; -import { Base, Project } from '../../models'; +import { populateMeta, validatePayload } from '../helpers'; +import { syncBaseMigration } from '../helpers/syncMigration'; +import { Base, Project } from '../models'; import type { BaseReqType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/datas/bulk-data-alias/bulk-data-alias.service.spec.ts b/packages/nocodb-nest/src/services/bulk-data-alias.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/datas/bulk-data-alias/bulk-data-alias.service.spec.ts rename to packages/nocodb-nest/src/services/bulk-data-alias.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/datas/bulk-data-alias/bulk-data-alias.service.ts b/packages/nocodb-nest/src/services/bulk-data-alias.service.ts similarity index 87% rename from packages/nocodb-nest/src/modules/datas/bulk-data-alias/bulk-data-alias.service.ts rename to packages/nocodb-nest/src/services/bulk-data-alias.service.ts index c875519a33..21201b879b 100644 --- a/packages/nocodb-nest/src/modules/datas/bulk-data-alias/bulk-data-alias.service.ts +++ b/packages/nocodb-nest/src/services/bulk-data-alias.service.ts @@ -1,12 +1,12 @@ import { Injectable } from '@nestjs/common'; import { isSystemColumn, UITypes } from 'nocodb-sdk'; import * as XLSX from 'xlsx'; -import { NcError } from '../../../helpers/catchError'; -import { Base, Column, Model, Project, View } from '../../../models'; -import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2'; -import { getViewAndModelByAliasOrId } from '../helpers'; -import type { PathParams } from '../helpers'; -import type { BaseModelSqlv2 } from '../../../db/BaseModelSqlv2'; +import { NcError } from '../helpers/catchError'; +import { Base, Column, Model, Project, View } from '../models'; +import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; +import { getViewAndModelByAliasOrId } from '../modules/datas/helpers'; +import type { PathParams } from '../modules/datas/helpers'; +import type { BaseModelSqlv2 } from '../db/BaseModelSqlv2'; type BulkOperation = | 'bulkInsert' diff --git a/packages/nocodb-nest/src/modules/caches/caches.service.spec.ts b/packages/nocodb-nest/src/services/caches.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/caches/caches.service.spec.ts rename to packages/nocodb-nest/src/services/caches.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/caches/caches.service.ts b/packages/nocodb-nest/src/services/caches.service.ts similarity index 83% rename from packages/nocodb-nest/src/modules/caches/caches.service.ts rename to packages/nocodb-nest/src/services/caches.service.ts index 3dc22ea84f..ded5347407 100644 --- a/packages/nocodb-nest/src/modules/caches/caches.service.ts +++ b/packages/nocodb-nest/src/services/caches.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import NocoCache from '../../cache/NocoCache'; +import NocoCache from '../cache/NocoCache'; @Injectable() export class CachesService { diff --git a/packages/nocodb-nest/src/modules/columns/columns.service.spec.ts b/packages/nocodb-nest/src/services/columns.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/columns/columns.service.spec.ts rename to packages/nocodb-nest/src/services/columns.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/columns/columns.service.ts b/packages/nocodb-nest/src/services/columns.service.ts similarity index 98% rename from packages/nocodb-nest/src/modules/columns/columns.service.ts rename to packages/nocodb-nest/src/services/columns.service.ts index 8fb5f17963..b2ad08d121 100644 --- a/packages/nocodb-nest/src/modules/columns/columns.service.ts +++ b/packages/nocodb-nest/src/services/columns.service.ts @@ -8,8 +8,8 @@ import { UITypes, } from 'nocodb-sdk'; import { T } from 'nc-help'; -import formulaQueryBuilderv2 from '../../db/formulav2/formulaQueryBuilderv2'; -import ProjectMgrv2 from '../../db/sql-mgr/v2/ProjectMgrv2'; +import formulaQueryBuilderv2 from '../db/formulav2/formulaQueryBuilderv2'; +import ProjectMgrv2 from '../db/sql-mgr/v2/ProjectMgrv2'; import { createHmAndBtColumn, generateFkName, @@ -18,15 +18,15 @@ import { validatePayload, validateRequiredField, validateRollupPayload, -} from '../../helpers'; -import { NcError } from '../../helpers/catchError'; -import getColumnPropsFromUIDT from '../../helpers/getColumnPropsFromUIDT'; +} from '../helpers'; +import { NcError } from '../helpers/catchError'; +import getColumnPropsFromUIDT from '../helpers/getColumnPropsFromUIDT'; import { getUniqueColumnAliasName, getUniqueColumnName, -} from '../../helpers/getUniqueName'; -import mapDefaultDisplayValue from '../../helpers/mapDefaultDisplayValue'; -import validateParams from '../../helpers/validateParams'; +} from '../helpers/getUniqueName'; +import mapDefaultDisplayValue from '../helpers/mapDefaultDisplayValue'; +import validateParams from '../helpers/validateParams'; import { Audit, Base, @@ -34,13 +34,13 @@ import { FormulaColumn, KanbanView, Model, -} from '../../models'; -import Noco from '../../Noco'; -import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; -import { MetaTable } from '../../utils/globals'; -import type { LinkToAnotherRecordColumn, Project } from '../../models'; -import type { MetaService } from '../../meta/meta.service'; -import type SqlMgrv2 from '../../db/sql-mgr/v2/SqlMgrv2'; +} from '../models'; +import Noco from '../Noco'; +import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; +import { MetaTable } from '../utils/globals'; +import type { LinkToAnotherRecordColumn, Project } from '../models'; +import type { MetaService } from '../meta/meta.service'; +import type SqlMgrv2 from '../db/sql-mgr/v2/SqlMgrv2'; import type { ColumnReqType, LinkToAnotherColumnReqType, diff --git a/packages/nocodb-nest/src/modules/datas/data-alias-nested/data-alias-nested.service.ts b/packages/nocodb-nest/src/services/data-alias-nested.service.ts similarity index 95% rename from packages/nocodb-nest/src/modules/datas/data-alias-nested/data-alias-nested.service.ts rename to packages/nocodb-nest/src/services/data-alias-nested.service.ts index 4502ad3427..898148af9f 100644 --- a/packages/nocodb-nest/src/modules/datas/data-alias-nested/data-alias-nested.service.ts +++ b/packages/nocodb-nest/src/services/data-alias-nested.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@nestjs/common'; import { UITypes } from 'nocodb-sdk'; -import { NcError } from '../../../helpers/catchError'; -import { PagedResponseImpl } from '../../../helpers/PagedResponse'; -import { Base, Model } from '../../../models'; -import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2'; -import { getColumnByIdOrName, getViewAndModelByAliasOrId } from '../helpers'; -import type { PathParams } from '../helpers'; +import { NcError } from '../helpers/catchError'; +import { PagedResponseImpl } from '../helpers/PagedResponse'; +import { Base, Model } from '../models'; +import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; +import { getColumnByIdOrName, getViewAndModelByAliasOrId } from '../modules/datas/helpers'; +import type { PathParams } from '../modules/datas/helpers'; @Injectable() export class DataAliasNestedService { diff --git a/packages/nocodb-nest/src/modules/datas/datas.service.spec.ts b/packages/nocodb-nest/src/services/datas.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/datas/datas.service.spec.ts rename to packages/nocodb-nest/src/services/datas.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/datas/datas.service.ts b/packages/nocodb-nest/src/services/datas.service.ts similarity index 98% rename from packages/nocodb-nest/src/modules/datas/datas.service.ts rename to packages/nocodb-nest/src/services/datas.service.ts index 47e3a21bc0..fa95aacf8e 100644 --- a/packages/nocodb-nest/src/modules/datas/datas.service.ts +++ b/packages/nocodb-nest/src/services/datas.service.ts @@ -3,18 +3,18 @@ import { isSystemColumn, UITypes } from 'nocodb-sdk'; import * as XLSX from 'xlsx'; import papaparse from 'papaparse'; import { nocoExecute } from 'nc-help'; -import { NcError } from '../../helpers/catchError'; -import getAst from '../../helpers/getAst'; -import { PagedResponseImpl } from '../../helpers/PagedResponse'; -import { Base, Column, Model, Project, View } from '../../models'; -import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; +import { NcError } from '../helpers/catchError'; +import getAst from '../helpers/getAst'; +import { PagedResponseImpl } from '../helpers/PagedResponse'; +import { Base, Column, Model, Project, View } from '../models'; +import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; import { getDbRows, getViewAndModelByAliasOrId, serializeCellValue, -} from './helpers'; -import type { PathParams } from './helpers'; -import type { LinkToAnotherRecordColumn, LookupColumn } from '../../models'; +} from '../modules/datas/helpers'; +import type { PathParams } from '../modules/datas/helpers'; +import type { LinkToAnotherRecordColumn, LookupColumn } from '../models'; @Injectable() export class DatasService { diff --git a/packages/nocodb-nest/src/modules/form-columns/form-columns.service.spec.ts b/packages/nocodb-nest/src/services/form-columns.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/form-columns/form-columns.service.spec.ts rename to packages/nocodb-nest/src/services/form-columns.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/form-columns/form-columns.service.ts b/packages/nocodb-nest/src/services/form-columns.service.ts similarity index 85% rename from packages/nocodb-nest/src/modules/form-columns/form-columns.service.ts rename to packages/nocodb-nest/src/services/form-columns.service.ts index 6749b811c4..dd96c2fde1 100644 --- a/packages/nocodb-nest/src/modules/form-columns/form-columns.service.ts +++ b/packages/nocodb-nest/src/services/form-columns.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import { T } from 'nc-help'; -import { validatePayload } from '../../helpers'; -import { FormViewColumn } from '../../models'; +import { validatePayload } from '../helpers'; +import { FormViewColumn } from '../models'; @Injectable() export class FormColumnsService { diff --git a/packages/nocodb-nest/src/modules/forms/forms.service.spec.ts b/packages/nocodb-nest/src/services/forms.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/forms/forms.service.spec.ts rename to packages/nocodb-nest/src/services/forms.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/forms/forms.service.ts b/packages/nocodb-nest/src/services/forms.service.ts similarity index 92% rename from packages/nocodb-nest/src/modules/forms/forms.service.ts rename to packages/nocodb-nest/src/services/forms.service.ts index 5bbb6b17d8..30d70a5719 100644 --- a/packages/nocodb-nest/src/modules/forms/forms.service.ts +++ b/packages/nocodb-nest/src/services/forms.service.ts @@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common'; import { T } from 'nc-help'; import { ViewTypes } from 'nocodb-sdk'; -import { validatePayload } from '../../helpers'; -import { FormView, View } from '../../models'; +import { validatePayload } from '../helpers'; +import { FormView, View } from '../models'; import type { FormUpdateReqType, ViewCreateReqType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/galleries/galleries.service.spec.ts b/packages/nocodb-nest/src/services/galleries.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/galleries/galleries.service.spec.ts rename to packages/nocodb-nest/src/services/galleries.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/galleries/galleries.service.ts b/packages/nocodb-nest/src/services/galleries.service.ts similarity index 92% rename from packages/nocodb-nest/src/modules/galleries/galleries.service.ts rename to packages/nocodb-nest/src/services/galleries.service.ts index 85a3dd5ac8..00f8f0d4ea 100644 --- a/packages/nocodb-nest/src/modules/galleries/galleries.service.ts +++ b/packages/nocodb-nest/src/services/galleries.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { ViewTypes } from 'nocodb-sdk'; import { T } from 'nc-help'; -import { validatePayload } from '../../helpers'; -import { GalleryView, View } from '../../models'; +import { validatePayload } from '../helpers'; +import { GalleryView, View } from '../models'; import type { GalleryUpdateReqType, ViewCreateReqType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/grid-columns/grid-columns.service.spec.ts b/packages/nocodb-nest/src/services/grid-columns.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/grid-columns/grid-columns.service.spec.ts rename to packages/nocodb-nest/src/services/grid-columns.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/grid-columns/grid-columns.service.ts b/packages/nocodb-nest/src/services/grid-columns.service.ts similarity index 86% rename from packages/nocodb-nest/src/modules/grid-columns/grid-columns.service.ts rename to packages/nocodb-nest/src/services/grid-columns.service.ts index ca7098a9a1..5d4aa1398e 100644 --- a/packages/nocodb-nest/src/modules/grid-columns/grid-columns.service.ts +++ b/packages/nocodb-nest/src/services/grid-columns.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import { T } from 'nc-help'; -import { validatePayload } from '../../helpers'; -import { GridViewColumn } from '../../models'; +import { validatePayload } from '../helpers'; +import { GridViewColumn } from '../models'; import type { GridColumnReqType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/grids/grids.service.spec.ts b/packages/nocodb-nest/src/services/grids.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/grids/grids.service.spec.ts rename to packages/nocodb-nest/src/services/grids.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/grids/grids.service.ts b/packages/nocodb-nest/src/services/grids.service.ts similarity index 90% rename from packages/nocodb-nest/src/modules/grids/grids.service.ts rename to packages/nocodb-nest/src/services/grids.service.ts index 25bcda842c..590dab8ee2 100644 --- a/packages/nocodb-nest/src/modules/grids/grids.service.ts +++ b/packages/nocodb-nest/src/services/grids.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { ViewTypes } from 'nocodb-sdk'; import { T } from 'nc-help'; -import { validatePayload } from '../../helpers'; -import { GridView, View } from '../../models'; +import { validatePayload } from '../helpers'; +import { GridView, View } from '../models'; import type { GridUpdateReqType, ViewCreateReqType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/hook-filters/hook-filters.service.spec.ts b/packages/nocodb-nest/src/services/hook-filters.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/hook-filters/hook-filters.service.spec.ts rename to packages/nocodb-nest/src/services/hook-filters.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/hook-filters/hook-filters.service.ts b/packages/nocodb-nest/src/services/hook-filters.service.ts similarity index 100% rename from packages/nocodb-nest/src/modules/hook-filters/hook-filters.service.ts rename to packages/nocodb-nest/src/services/hook-filters.service.ts diff --git a/packages/nocodb-nest/src/modules/hooks/hooks.service.spec.ts b/packages/nocodb-nest/src/services/hooks.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/hooks/hooks.service.spec.ts rename to packages/nocodb-nest/src/services/hooks.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/hooks/hooks.service.ts b/packages/nocodb-nest/src/services/hooks.service.ts similarity index 92% rename from packages/nocodb-nest/src/modules/hooks/hooks.service.ts rename to packages/nocodb-nest/src/services/hooks.service.ts index 0ca308d29a..a13d534149 100644 --- a/packages/nocodb-nest/src/modules/hooks/hooks.service.ts +++ b/packages/nocodb-nest/src/services/hooks.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@nestjs/common'; import { T } from 'nc-help'; -import { validatePayload } from '../../helpers'; -import { NcError } from '../../helpers/catchError'; +import { validatePayload } from '../helpers'; +import { NcError } from '../helpers/catchError'; import { populateSamplePayload, populateSamplePayloadV2, -} from '../../helpers/populateSamplePayload'; -import { invokeWebhook } from '../../helpers/webhookHelpers'; -import { Hook, HookLog, Model } from '../../models'; +} from '../helpers/populateSamplePayload'; +import { invokeWebhook } from '../helpers/webhookHelpers'; +import { Hook, HookLog, Model } from '../models'; import type { HookReqType, HookTestReqType, HookType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/import/import.service.spec.ts b/packages/nocodb-nest/src/services/import.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/import/import.service.spec.ts rename to packages/nocodb-nest/src/services/import.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/import/import.service.ts b/packages/nocodb-nest/src/services/import.service.ts similarity index 100% rename from packages/nocodb-nest/src/modules/import/import.service.ts rename to packages/nocodb-nest/src/services/import.service.ts diff --git a/packages/nocodb-nest/src/modules/kanbans/kanbans.service.spec.ts b/packages/nocodb-nest/src/services/kanbans.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/kanbans/kanbans.service.spec.ts rename to packages/nocodb-nest/src/services/kanbans.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/kanbans/kanbans.service.ts b/packages/nocodb-nest/src/services/kanbans.service.ts similarity index 92% rename from packages/nocodb-nest/src/modules/kanbans/kanbans.service.ts rename to packages/nocodb-nest/src/services/kanbans.service.ts index eee39898ae..adfffd7e8e 100644 --- a/packages/nocodb-nest/src/modules/kanbans/kanbans.service.ts +++ b/packages/nocodb-nest/src/services/kanbans.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { ViewTypes } from 'nocodb-sdk'; import { T } from 'nc-help'; -import { validatePayload } from '../../helpers'; -import { KanbanView, View } from '../../models'; +import { validatePayload } from '../helpers'; +import { KanbanView, View } from '../models'; import type { KanbanUpdateReqType, ViewCreateReqType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/maps/maps.service.spec.ts b/packages/nocodb-nest/src/services/maps.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/maps/maps.service.spec.ts rename to packages/nocodb-nest/src/services/maps.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/maps/maps.service.ts b/packages/nocodb-nest/src/services/maps.service.ts similarity index 91% rename from packages/nocodb-nest/src/modules/maps/maps.service.ts rename to packages/nocodb-nest/src/services/maps.service.ts index 962651cfcc..dd8c9d703b 100644 --- a/packages/nocodb-nest/src/modules/maps/maps.service.ts +++ b/packages/nocodb-nest/src/services/maps.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { T } from 'nc-help'; import { ViewTypes } from 'nocodb-sdk'; -import { validatePayload } from '../../helpers'; -import { MapView, View } from '../../models'; +import { validatePayload } from '../helpers'; +import { MapView, View } from '../models'; import type { MapUpdateReqType, ViewCreateReqType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/meta-diffs/meta-diffs.service.spec.ts b/packages/nocodb-nest/src/services/meta-diffs.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/meta-diffs/meta-diffs.service.spec.ts rename to packages/nocodb-nest/src/services/meta-diffs.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/meta-diffs/meta-diffs.service.ts b/packages/nocodb-nest/src/services/meta-diffs.service.ts similarity index 98% rename from packages/nocodb-nest/src/modules/meta-diffs/meta-diffs.service.ts rename to packages/nocodb-nest/src/services/meta-diffs.service.ts index d3d7d5e85e..a6fd37ff03 100644 --- a/packages/nocodb-nest/src/modules/meta-diffs/meta-diffs.service.ts +++ b/packages/nocodb-nest/src/services/meta-diffs.service.ts @@ -1,17 +1,17 @@ import { Injectable } from '@nestjs/common'; import { isVirtualCol, ModelTypes, RelationTypes, UITypes } from 'nocodb-sdk'; import { T } from 'nc-help'; -import { Base, Column, Model, Project } from '../../models'; -import ModelXcMetaFactory from '../../db/sql-mgr/code/models/xc/ModelXcMetaFactory'; -import getColumnUiType from '../../helpers/getColumnUiType'; +import { Base, Column, Model, Project } from '../models'; +import ModelXcMetaFactory from '../db/sql-mgr/code/models/xc/ModelXcMetaFactory'; +import getColumnUiType from '../helpers/getColumnUiType'; import getTableNameAlias, { getColumnNameAlias, -} from '../../helpers/getTableName'; -import { getUniqueColumnAliasName } from '../../helpers/getUniqueName'; -import mapDefaultDisplayValue from '../../helpers/mapDefaultDisplayValue'; -import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; -import NcHelp from '../../utils/NcHelp'; -import type { LinkToAnotherRecordColumn } from '../../models'; +} from '../helpers/getTableName'; +import { getUniqueColumnAliasName } from '../helpers/getUniqueName'; +import mapDefaultDisplayValue from '../helpers/mapDefaultDisplayValue'; +import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; +import NcHelp from '../utils/NcHelp'; +import type { LinkToAnotherRecordColumn } from '../models'; // todo:move enum and types export enum MetaDiffType { diff --git a/packages/nocodb-nest/src/modules/model-visibilities/model-visibilities.service.spec.ts b/packages/nocodb-nest/src/services/model-visibilities.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/model-visibilities/model-visibilities.service.spec.ts rename to packages/nocodb-nest/src/services/model-visibilities.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/model-visibilities/model-visibilities.service.ts b/packages/nocodb-nest/src/services/model-visibilities.service.ts similarity index 94% rename from packages/nocodb-nest/src/modules/model-visibilities/model-visibilities.service.ts rename to packages/nocodb-nest/src/services/model-visibilities.service.ts index 1753514884..e6e8a4195c 100644 --- a/packages/nocodb-nest/src/modules/model-visibilities/model-visibilities.service.ts +++ b/packages/nocodb-nest/src/services/model-visibilities.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { T } from 'nc-help'; -import { validatePayload } from '../../helpers'; -import { NcError } from '../../helpers/catchError'; -import { Model, ModelRoleVisibility, View } from '../../models'; +import { validatePayload } from '../helpers'; +import { NcError } from '../helpers/catchError'; +import { Model, ModelRoleVisibility, View } from '../models'; import type { VisibilityRuleReqType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/org-lcense/org-lcense.service.spec.ts b/packages/nocodb-nest/src/services/org-lcense.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/org-lcense/org-lcense.service.spec.ts rename to packages/nocodb-nest/src/services/org-lcense.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/org-lcense/org-lcense.service.ts b/packages/nocodb-nest/src/services/org-lcense.service.ts similarity index 73% rename from packages/nocodb-nest/src/modules/org-lcense/org-lcense.service.ts rename to packages/nocodb-nest/src/services/org-lcense.service.ts index 4139ec7439..43ead23a16 100644 --- a/packages/nocodb-nest/src/modules/org-lcense/org-lcense.service.ts +++ b/packages/nocodb-nest/src/services/org-lcense.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; -import { NC_LICENSE_KEY } from '../../constants'; -import { validatePayload } from '../../helpers'; -import { Store } from '../../models'; -import Noco from '../../Noco'; +import { NC_LICENSE_KEY } from '../constants'; +import { validatePayload } from '../helpers'; +import { Store } from '../models'; +import Noco from '../Noco'; @Injectable() export class OrgLcenseService { diff --git a/packages/nocodb-nest/src/modules/org-tokens/ee/org-tokens/org-tokens-ee.service.spec.ts b/packages/nocodb-nest/src/services/org-tokens-ee.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/org-tokens/ee/org-tokens/org-tokens-ee.service.spec.ts rename to packages/nocodb-nest/src/services/org-tokens-ee.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/org-tokens/ee/org-tokens/org-tokens-ee.service.ts b/packages/nocodb-nest/src/services/org-tokens-ee.service.ts similarity index 77% rename from packages/nocodb-nest/src/modules/org-tokens/ee/org-tokens/org-tokens-ee.service.ts rename to packages/nocodb-nest/src/services/org-tokens-ee.service.ts index a482b32faa..5fcc4d30bf 100644 --- a/packages/nocodb-nest/src/modules/org-tokens/ee/org-tokens/org-tokens-ee.service.ts +++ b/packages/nocodb-nest/src/services/org-tokens-ee.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { OrgUserRoles } from 'nocodb-sdk'; -import { PagedResponseImpl } from '../../../../helpers/PagedResponse'; -import { ApiToken } from '../../../../models'; -import extractRolesObj from '../../../../utils/extractRolesObj'; +import { PagedResponseImpl } from '../helpers/PagedResponse'; +import { ApiToken } from '../models'; +import extractRolesObj from '../utils/extractRolesObj'; import type { UserType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/org-tokens/org-tokens.service.spec.ts b/packages/nocodb-nest/src/services/org-tokens.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/org-tokens/org-tokens.service.spec.ts rename to packages/nocodb-nest/src/services/org-tokens.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/org-tokens/org-tokens.service.ts b/packages/nocodb-nest/src/services/org-tokens.service.ts similarity index 83% rename from packages/nocodb-nest/src/modules/org-tokens/org-tokens.service.ts rename to packages/nocodb-nest/src/services/org-tokens.service.ts index 8e7a0f2417..9d76111377 100644 --- a/packages/nocodb-nest/src/modules/org-tokens/org-tokens.service.ts +++ b/packages/nocodb-nest/src/services/org-tokens.service.ts @@ -1,12 +1,12 @@ import { Injectable } from '@nestjs/common'; import { OrgUserRoles } from 'nocodb-sdk'; import { T } from 'nc-help'; -import { validatePayload } from '../../helpers'; -import { NcError } from '../../helpers/catchError'; -import { PagedResponseImpl } from '../../helpers/PagedResponse'; -import { ApiToken } from '../../models'; -import extractRolesObj from '../../utils/extractRolesObj'; -import type { User } from '../../models'; +import { validatePayload } from '../helpers'; +import { NcError } from '../helpers/catchError'; +import { PagedResponseImpl } from '../helpers/PagedResponse'; +import { ApiToken } from '../models'; +import extractRolesObj from '../utils/extractRolesObj'; +import type { User } from '../models'; import type { ApiTokenReqType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/org-users/org-users.service.spec.ts b/packages/nocodb-nest/src/services/org-users.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/org-users/org-users.service.spec.ts rename to packages/nocodb-nest/src/services/org-users.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/org-users/org-users.service.ts b/packages/nocodb-nest/src/services/org-users.service.ts similarity index 93% rename from packages/nocodb-nest/src/modules/org-users/org-users.service.ts rename to packages/nocodb-nest/src/services/org-users.service.ts index 2765c1a965..abc554c2ae 100644 --- a/packages/nocodb-nest/src/modules/org-users/org-users.service.ts +++ b/packages/nocodb-nest/src/services/org-users.service.ts @@ -8,17 +8,17 @@ import { import validator from 'validator'; import { v4 as uuidv4 } from 'uuid'; import { T } from 'nc-help'; -import { NC_APP_SETTINGS } from '../../constants'; -import { validatePayload } from '../../helpers'; -import { NcError } from '../../helpers/catchError'; -import { extractProps } from '../../helpers/extractProps'; -import { randomTokenString } from '../../helpers/stringHelpers'; -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 '../project-users/project-users.service'; +import { NC_APP_SETTINGS } from '../constants'; +import { validatePayload } from '../helpers'; +import { NcError } from '../helpers/catchError'; +import { extractProps } from '../helpers/extractProps'; +import { randomTokenString } from '../helpers/stringHelpers'; +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 type { UserType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/plugins/plugins.service.spec.ts b/packages/nocodb-nest/src/services/plugins.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/plugins/plugins.service.spec.ts rename to packages/nocodb-nest/src/services/plugins.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/plugins/plugins.service.ts b/packages/nocodb-nest/src/services/plugins.service.ts similarity index 88% rename from packages/nocodb-nest/src/modules/plugins/plugins.service.ts rename to packages/nocodb-nest/src/services/plugins.service.ts index 5d49ab8347..071a30b003 100644 --- a/packages/nocodb-nest/src/modules/plugins/plugins.service.ts +++ b/packages/nocodb-nest/src/services/plugins.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { T } from 'nc-help'; -import { validatePayload } from '../../helpers'; -import NcPluginMgrv2 from '../../helpers/NcPluginMgrv2'; -import { Plugin } from '../../models'; +import { validatePayload } from '../helpers'; +import NcPluginMgrv2 from '../helpers/NcPluginMgrv2'; +import { Plugin } from '../models'; import type { PluginTestReqType, PluginType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/projects/projects.service.spec.ts b/packages/nocodb-nest/src/services/projects.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/projects/projects.service.spec.ts rename to packages/nocodb-nest/src/services/projects.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/projects/projects.service.ts b/packages/nocodb-nest/src/services/projects.service.ts similarity index 92% rename from packages/nocodb-nest/src/modules/projects/projects.service.ts rename to packages/nocodb-nest/src/services/projects.service.ts index 5c57307a9a..258dc67313 100644 --- a/packages/nocodb-nest/src/modules/projects/projects.service.ts +++ b/packages/nocodb-nest/src/services/projects.service.ts @@ -4,14 +4,14 @@ import * as DOMPurify from 'isomorphic-dompurify'; import { customAlphabet } from 'nanoid'; import { T } from 'nc-help'; import { OrgUserRoles } from 'nocodb-sdk'; -import { populateMeta, validatePayload } from '../../helpers'; -import { NcError } from '../../helpers/catchError'; -import { extractPropsAndSanitize } from '../../helpers/extractProps'; -import syncMigration from '../../helpers/syncMigration'; -import { Project, ProjectUser } from '../../models'; -import Noco from '../../Noco'; -import extractRolesObj from '../../utils/extractRolesObj'; -import NcConfigFactory from '../../utils/NcConfigFactory'; +import { populateMeta, validatePayload } from '../helpers'; +import { NcError } from '../helpers/catchError'; +import { extractPropsAndSanitize } from '../helpers/extractProps'; +import syncMigration from '../helpers/syncMigration'; +import { Project, ProjectUser } from '../models'; +import Noco from '../Noco'; +import extractRolesObj from '../utils/extractRolesObj'; +import NcConfigFactory from '../utils/NcConfigFactory'; import type { ProjectUpdateReqType } from 'nocodb-sdk'; import type { ProjectReqType } from 'nocodb-sdk'; diff --git a/packages/nocodb-nest/src/modules/public-datas-export/public-datas-export.service.spec.ts b/packages/nocodb-nest/src/services/public-datas-export.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/public-datas-export/public-datas-export.service.spec.ts rename to packages/nocodb-nest/src/services/public-datas-export.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/public-datas-export/public-datas-export.service.ts b/packages/nocodb-nest/src/services/public-datas-export.service.ts similarity index 100% rename from packages/nocodb-nest/src/modules/public-datas-export/public-datas-export.service.ts rename to packages/nocodb-nest/src/services/public-datas-export.service.ts diff --git a/packages/nocodb-nest/src/modules/public-datas/public-datas.service.spec.ts b/packages/nocodb-nest/src/services/public-datas.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/public-datas/public-datas.service.spec.ts rename to packages/nocodb-nest/src/services/public-datas.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/public-datas/public-datas.service.ts b/packages/nocodb-nest/src/services/public-datas.service.ts similarity index 95% rename from packages/nocodb-nest/src/modules/public-datas/public-datas.service.ts rename to packages/nocodb-nest/src/services/public-datas.service.ts index 4f195888a5..cafab03088 100644 --- a/packages/nocodb-nest/src/modules/public-datas/public-datas.service.ts +++ b/packages/nocodb-nest/src/services/public-datas.service.ts @@ -4,16 +4,16 @@ import { nanoid } from 'nanoid'; import { ErrorMessages, UITypes, ViewTypes } from 'nocodb-sdk'; import slash from 'slash'; import { nocoExecute } from 'nc-help'; -import { Base, Column, Model, View } from '../../models'; - -import { NcError } from '../../helpers/catchError'; -import getAst from '../../helpers/getAst'; -import NcPluginMgrv2 from '../../helpers/NcPluginMgrv2'; -import { PagedResponseImpl } from '../../helpers/PagedResponse'; -import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; -import { mimeIcons } from '../../utils/mimeTypes'; -import { getColumnByIdOrName } from '../datas/helpers'; -import type { LinkToAnotherRecordColumn } from '../../models'; +import { Base, Column, Model, View } from '../models'; + +import { NcError } from '../helpers/catchError'; +import getAst from '../helpers/getAst'; +import NcPluginMgrv2 from '../helpers/NcPluginMgrv2'; +import { PagedResponseImpl } from '../helpers/PagedResponse'; +import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; +import { mimeIcons } from '../utils/mimeTypes'; +import { getColumnByIdOrName } from '../modules/datas/helpers'; +import type { LinkToAnotherRecordColumn } from '../models'; // todo: move to utils export function sanitizeUrlPath(paths) { diff --git a/packages/nocodb-nest/src/modules/public-metas/public-metas.service.spec.ts b/packages/nocodb-nest/src/services/public-metas.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/public-metas/public-metas.service.spec.ts rename to packages/nocodb-nest/src/services/public-metas.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/public-metas/public-metas.service.ts b/packages/nocodb-nest/src/services/public-metas.service.ts similarity index 93% rename from packages/nocodb-nest/src/modules/public-metas/public-metas.service.ts rename to packages/nocodb-nest/src/services/public-metas.service.ts index b9ca5088e7..1ce6605e73 100644 --- a/packages/nocodb-nest/src/modules/public-metas/public-metas.service.ts +++ b/packages/nocodb-nest/src/services/public-metas.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { ErrorMessages, RelationTypes, UITypes } from 'nocodb-sdk'; -import { NcError } from '../../helpers/catchError'; -import { Base, Column, Model, Project, View } from '../../models'; -import type { LinkToAnotherRecordColumn } from '../../models'; +import { NcError } from '../helpers/catchError'; +import { Base, Column, Model, Project, View } from '../models'; +import type { LinkToAnotherRecordColumn } from '../models'; import type { LinkToAnotherRecordType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/shared-bases/shared-bases.service.spec.ts b/packages/nocodb-nest/src/services/shared-bases.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/shared-bases/shared-bases.service.spec.ts rename to packages/nocodb-nest/src/services/shared-bases.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/shared-bases/shared-bases.service.ts b/packages/nocodb-nest/src/services/shared-bases.service.ts similarity index 95% rename from packages/nocodb-nest/src/modules/shared-bases/shared-bases.service.ts rename to packages/nocodb-nest/src/services/shared-bases.service.ts index 21c5a10245..6d6fad2bb6 100644 --- a/packages/nocodb-nest/src/modules/shared-bases/shared-bases.service.ts +++ b/packages/nocodb-nest/src/services/shared-bases.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@nestjs/common'; import { T } from 'nc-help'; import { v4 as uuidv4 } from 'uuid'; -import { validatePayload } from '../../helpers'; -import { NcError } from '../../helpers/catchError'; -import { Project } from '../../models'; +import { validatePayload } from '../helpers'; +import { NcError } from '../helpers/catchError'; +import { Project } from '../models'; // todo: load from config const config = { diff --git a/packages/nocodb-nest/src/modules/sorts/sorts.service.spec.ts b/packages/nocodb-nest/src/services/sorts.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/sorts/sorts.service.spec.ts rename to packages/nocodb-nest/src/services/sorts.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/sorts/sorts.service.ts b/packages/nocodb-nest/src/services/sorts.service.ts similarity index 92% rename from packages/nocodb-nest/src/modules/sorts/sorts.service.ts rename to packages/nocodb-nest/src/services/sorts.service.ts index e738dff95f..ee45166ac7 100644 --- a/packages/nocodb-nest/src/modules/sorts/sorts.service.ts +++ b/packages/nocodb-nest/src/services/sorts.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import { T } from 'nc-help'; -import { validatePayload } from '../../helpers'; -import { Sort } from '../../models'; +import { validatePayload } from '../helpers'; +import { Sort } from '../models'; import type { SortReqType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/sync/sync.service.spec.ts b/packages/nocodb-nest/src/services/sync.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/sync/sync.service.spec.ts rename to packages/nocodb-nest/src/services/sync.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/sync/sync.service.ts b/packages/nocodb-nest/src/services/sync.service.ts similarity index 90% rename from packages/nocodb-nest/src/modules/sync/sync.service.ts rename to packages/nocodb-nest/src/services/sync.service.ts index b591803625..480cd2b318 100644 --- a/packages/nocodb-nest/src/modules/sync/sync.service.ts +++ b/packages/nocodb-nest/src/services/sync.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import { T } from 'nc-help'; -import { PagedResponseImpl } from '../../helpers/PagedResponse'; -import { Project, SyncSource } from '../../models'; +import { PagedResponseImpl } from '../helpers/PagedResponse'; +import { Project, SyncSource } from '../models'; @Injectable() export class SyncService { diff --git a/packages/nocodb-nest/src/modules/tables/tables.service.spec.ts b/packages/nocodb-nest/src/services/tables.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/tables/tables.service.spec.ts rename to packages/nocodb-nest/src/services/tables.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/tables/tables.service.ts b/packages/nocodb-nest/src/services/tables.service.ts similarity index 95% rename from packages/nocodb-nest/src/modules/tables/tables.service.ts rename to packages/nocodb-nest/src/services/tables.service.ts index ee1977f6c4..f1bda01bf2 100644 --- a/packages/nocodb-nest/src/modules/tables/tables.service.ts +++ b/packages/nocodb-nest/src/services/tables.service.ts @@ -8,24 +8,24 @@ import { UITypes, } from 'nocodb-sdk'; import { T } from 'nc-help'; -import ProjectMgrv2 from '../../db/sql-mgr/v2/ProjectMgrv2'; -import { NcError } from '../../helpers/catchError'; -import getColumnPropsFromUIDT from '../../helpers/getColumnPropsFromUIDT'; -import getColumnUiType from '../../helpers/getColumnUiType'; +import ProjectMgrv2 from '../db/sql-mgr/v2/ProjectMgrv2'; +import { NcError } from '../helpers/catchError'; +import getColumnPropsFromUIDT from '../helpers/getColumnPropsFromUIDT'; +import getColumnUiType from '../helpers/getColumnUiType'; import getTableNameAlias, { getColumnNameAlias, -} from '../../helpers/getTableName'; -import mapDefaultDisplayValue from '../../helpers/mapDefaultDisplayValue'; +} from '../helpers/getTableName'; +import mapDefaultDisplayValue from '../helpers/mapDefaultDisplayValue'; import { Audit, Column, Model, ModelRoleVisibility, Project, -} from '../../models'; -import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; -import { validatePayload } from '../../helpers'; -import type { LinkToAnotherRecordColumn, User, View } from '../../models'; +} from '../models'; +import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; +import { validatePayload } from '../helpers'; +import type { LinkToAnotherRecordColumn, User, View } from '../models'; import type { ColumnType, NormalColumnRequestType, diff --git a/packages/nocodb-nest/src/modules/utils/utils.service.spec.ts b/packages/nocodb-nest/src/services/utils.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/utils/utils.service.spec.ts rename to packages/nocodb-nest/src/services/utils.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/utils/utils.service.ts b/packages/nocodb-nest/src/services/utils.service.ts similarity index 95% rename from packages/nocodb-nest/src/modules/utils/utils.service.ts rename to packages/nocodb-nest/src/services/utils.service.ts index 7dd89e2a4c..f793b9fe21 100644 --- a/packages/nocodb-nest/src/modules/utils/utils.service.ts +++ b/packages/nocodb-nest/src/services/utils.service.ts @@ -2,15 +2,15 @@ import { Injectable } from '@nestjs/common'; import axios from 'axios'; import { compareVersions, validate } from 'compare-versions'; import { ViewTypes } from 'nocodb-sdk'; -import { NC_ATTACHMENT_FIELD_SIZE } from '../../constants'; -import SqlMgrv2 from '../../db/sql-mgr/v2/SqlMgrv2'; -import { NcError } from '../../helpers/catchError'; -import { Project, User } from '../../models'; -import Noco from '../../Noco'; -import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; -import { MetaTable } from '../../utils/globals'; -import NcConfigFactory from '../../utils/NcConfigFactory'; -import { packageVersion } from '../../utils/packageVersion'; +import { NC_ATTACHMENT_FIELD_SIZE } from '../constants'; +import SqlMgrv2 from '../db/sql-mgr/v2/SqlMgrv2'; +import { NcError } from '../helpers/catchError'; +import { Project, User } from '../models'; +import Noco from '../Noco'; +import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; +import { MetaTable } from '../utils/globals'; +import NcConfigFactory from '../utils/NcConfigFactory'; +import { packageVersion } from '../utils/packageVersion'; const versionCache = { releaseVersion: null, diff --git a/packages/nocodb-nest/src/modules/view-columns/view-columns.service.spec.ts b/packages/nocodb-nest/src/services/view-columns.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/view-columns/view-columns.service.spec.ts rename to packages/nocodb-nest/src/services/view-columns.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/view-columns/view-columns.service.ts b/packages/nocodb-nest/src/services/view-columns.service.ts similarity index 93% rename from packages/nocodb-nest/src/modules/view-columns/view-columns.service.ts rename to packages/nocodb-nest/src/services/view-columns.service.ts index c36fd281f2..7b48e94ed2 100644 --- a/packages/nocodb-nest/src/modules/view-columns/view-columns.service.ts +++ b/packages/nocodb-nest/src/services/view-columns.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import { T } from 'nc-help'; -import { validatePayload } from '../../helpers'; -import { View } from '../../models'; +import { validatePayload } from '../helpers'; +import { View } from '../models'; import type { ViewColumnReqType, ViewColumnUpdateReqType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/modules/views/views.service.spec.ts b/packages/nocodb-nest/src/services/views.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/views/views.service.spec.ts rename to packages/nocodb-nest/src/services/views.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/views/views.service.ts b/packages/nocodb-nest/src/services/views.service.ts similarity index 95% rename from packages/nocodb-nest/src/modules/views/views.service.ts rename to packages/nocodb-nest/src/services/views.service.ts index bba179d1f2..4380e6f9be 100644 --- a/packages/nocodb-nest/src/modules/views/views.service.ts +++ b/packages/nocodb-nest/src/services/views.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { T } from 'nc-help'; -import { validatePayload } from '../../helpers'; -import { Model, ModelRoleVisibility, View } from '../../models'; -import { TablesService } from '../tables/tables.service'; +import { validatePayload } from '../helpers'; +import { Model, ModelRoleVisibility, View } from '../models'; +import { TablesService } from './tables.service'; import type { SharedViewReqType, ViewUpdateReqType } from 'nocodb-sdk'; // todo: move diff --git a/packages/nocodb-nest/src/strategies/local.strategy.ts b/packages/nocodb-nest/src/strategies/local.strategy.ts index 5410d28ffd..c9d5208207 100644 --- a/packages/nocodb-nest/src/strategies/local.strategy.ts +++ b/packages/nocodb-nest/src/strategies/local.strategy.ts @@ -1,7 +1,7 @@ import { Strategy } from 'passport-local'; import { PassportStrategy } from '@nestjs/passport'; import { Injectable } from '@nestjs/common'; -import { AuthService } from '../modules/auth/auth.service'; +import { AuthService } from '../services/auth.service'; import extractRolesObj from '../utils/extractRolesObj'; import { NcError } from '../helpers/catchError';