From e039b51ef509a669ed444af8af85936d6a3125fa Mon Sep 17 00:00:00 2001 From: Pranav C Date: Mon, 17 Apr 2023 11:07:18 +0530 Subject: [PATCH] chore: lint Signed-off-by: Pranav C --- .../api-docs/api-docs.controller.spec.ts | 2 +- .../controllers/api-tokens.controller.spec.ts | 2 +- .../attachments.controller.spec.ts | 2 +- .../src/controllers/audits.controller.spec.ts | 2 +- .../src/controllers/auth.controller.spec.ts | 2 +- .../src/controllers/bases.controller.spec.ts | 2 +- .../src/controllers/caches.controller.spec.ts | 2 +- .../controllers/columns.controller.spec.ts | 2 +- .../controllers/data-alias.controller.spec.ts | 2 +- .../src/controllers/datas.controller.spec.ts | 2 +- .../controllers/filters.controller.spec.ts | 2 +- .../form-columns.controller.spec.ts | 2 +- .../src/controllers/forms.controller.spec.ts | 2 +- .../controllers/galleries.controller.spec.ts | 2 +- .../grid-columns.controller.spec.ts | 2 +- .../src/controllers/grids.controller.spec.ts | 2 +- .../hook-filters.controller.spec.ts | 2 +- .../src/controllers/hooks.controller.spec.ts | 2 +- .../imports/import.controller.spec.ts | 2 +- .../controllers/kanbans.controller.spec.ts | 2 +- .../src/controllers/maps.controller.spec.ts | 2 +- .../controllers/meta-diffs.controller.spec.ts | 2 +- .../model-visibilities.controller.spec.ts | 2 +- .../controllers/org-lcense.controller.spec.ts | 2 +- .../controllers/org-tokens.controller.spec.ts | 2 +- .../controllers/org-users.controller.spec.ts | 2 +- .../controllers/plugins.controller.spec.ts | 2 +- .../project-users.controller.spec.ts | 2 +- .../controllers/projects.controller.spec.ts | 2 +- .../public-datas-export.controller.spec.ts | 2 +- .../public-datas.controller.spec.ts | 2 +- .../controllers/public-datas.controller.ts | 4 +- .../public-metas.controller.spec.ts | 2 +- .../shared-bases.controller.spec.ts | 2 +- .../src/controllers/sorts.controller.spec.ts | 2 +- .../src/controllers/sync.controller.spec.ts | 2 +- .../src/controllers/tables.controller.spec.ts | 2 +- .../controllers/test/test.controller.spec.ts | 2 +- .../users/users.controller.spec.ts | 2 +- .../src/controllers/users/users.controller.ts | 6 +- .../src/controllers/utils.controller.spec.ts | 2 +- .../view-columns.controller.spec.ts | 2 +- .../src/controllers/views.controller.spec.ts | 2 +- .../src/modules/datas/datas.module.ts | 18 +-- .../src/modules/metas/metas.module.ts | 110 +++++++++--------- .../nocodb-nest/src/services/auth.service.ts | 2 +- .../src/services/data-alias-nested.service.ts | 5 +- .../src/services/meta-diffs.service.ts | 4 +- .../src/services/tables.service.ts | 12 +- .../src/services/users/users.service.ts | 11 +- 50 files changed, 127 insertions(+), 127 deletions(-) diff --git a/packages/nocodb-nest/src/controllers/api-docs/api-docs.controller.spec.ts b/packages/nocodb-nest/src/controllers/api-docs/api-docs.controller.spec.ts index 7850439cc2..ee4ea8deb5 100644 --- a/packages/nocodb-nest/src/controllers/api-docs/api-docs.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/api-docs/api-docs.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; -import { ApiDocsController } from './api-docs.controller'; import { ApiDocsService } from '../../services/api-docs/api-docs.service'; +import { ApiDocsController } from './api-docs.controller'; import type { TestingModule } from '@nestjs/testing'; describe('ApiDocsController', () => { diff --git a/packages/nocodb-nest/src/controllers/api-tokens.controller.spec.ts b/packages/nocodb-nest/src/controllers/api-tokens.controller.spec.ts index c169823e93..bd0a8644fa 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/api-tokens.service'; +import { ApiTokensController } from './api-tokens.controller'; import type { TestingModule } from '@nestjs/testing'; describe('ApiTokensController', () => { diff --git a/packages/nocodb-nest/src/controllers/attachments.controller.spec.ts b/packages/nocodb-nest/src/controllers/attachments.controller.spec.ts index 038c59aded..e4eb6d8edb 100644 --- a/packages/nocodb-nest/src/controllers/attachments.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/attachments.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; -import { AttachmentsController } from './attachments.controller'; import { AttachmentsService } from '../services/attachments.service'; +import { AttachmentsController } from './attachments.controller'; import type { TestingModule } from '@nestjs/testing'; describe('AttachmentsController', () => { diff --git a/packages/nocodb-nest/src/controllers/audits.controller.spec.ts b/packages/nocodb-nest/src/controllers/audits.controller.spec.ts index 241deb8043..2402997fc9 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/audits.service'; +import { AuditsController } from './audits.controller'; import type { TestingModule } from '@nestjs/testing'; describe('AuditsController', () => { diff --git a/packages/nocodb-nest/src/controllers/auth.controller.spec.ts b/packages/nocodb-nest/src/controllers/auth.controller.spec.ts index 9c626d3e60..cff81811a8 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/auth.service'; +import { AuthController } from './auth.controller'; import type { TestingModule } from '@nestjs/testing'; describe('AuthController', () => { diff --git a/packages/nocodb-nest/src/controllers/bases.controller.spec.ts b/packages/nocodb-nest/src/controllers/bases.controller.spec.ts index 282c0f839f..0adea811e2 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/bases.service'; +import { BasesController } from './bases.controller'; import type { TestingModule } from '@nestjs/testing'; describe('BasesController', () => { diff --git a/packages/nocodb-nest/src/controllers/caches.controller.spec.ts b/packages/nocodb-nest/src/controllers/caches.controller.spec.ts index 39d0cd7243..4042e1f6d9 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/caches.service'; +import { CachesController } from './caches.controller'; import type { TestingModule } from '@nestjs/testing'; describe('CachesController', () => { diff --git a/packages/nocodb-nest/src/controllers/columns.controller.spec.ts b/packages/nocodb-nest/src/controllers/columns.controller.spec.ts index 57446abeae..b5d6cf1236 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/columns.service'; +import { ColumnsController } from './columns.controller'; import type { TestingModule } from '@nestjs/testing'; describe('ColumnsController', () => { diff --git a/packages/nocodb-nest/src/controllers/data-alias.controller.spec.ts b/packages/nocodb-nest/src/controllers/data-alias.controller.spec.ts index e2274f57f5..e72b3813dd 100644 --- a/packages/nocodb-nest/src/controllers/data-alias.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/data-alias.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; -import { DataAliasController } from './data-alias.controller'; import { DatasService } from '../services/datas.service'; +import { DataAliasController } from './data-alias.controller'; import type { TestingModule } from '@nestjs/testing'; describe('DataAliasController', () => { diff --git a/packages/nocodb-nest/src/controllers/datas.controller.spec.ts b/packages/nocodb-nest/src/controllers/datas.controller.spec.ts index bcc3c08ec4..dcee7286fc 100644 --- a/packages/nocodb-nest/src/controllers/datas.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/datas.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; -import { DatasController } from './datas.controller'; import { DatasService } from '../services/datas.service'; +import { DatasController } from './datas.controller'; import type { TestingModule } from '@nestjs/testing'; describe('DatasController', () => { diff --git a/packages/nocodb-nest/src/controllers/filters.controller.spec.ts b/packages/nocodb-nest/src/controllers/filters.controller.spec.ts index f26a873f51..ad04ac7af0 100644 --- a/packages/nocodb-nest/src/controllers/filters.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/filters.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; -import { FiltersController } from './filters.controller'; import { FiltersService } from '../services/filters.service'; +import { FiltersController } from './filters.controller'; import type { TestingModule } from '@nestjs/testing'; describe('FiltersController', () => { diff --git a/packages/nocodb-nest/src/controllers/form-columns.controller.spec.ts b/packages/nocodb-nest/src/controllers/form-columns.controller.spec.ts index e99dd8c9ab..0912bc4078 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/form-columns.service'; +import { FormColumnsController } from './form-columns.controller'; import type { TestingModule } from '@nestjs/testing'; describe('FormColumnsController', () => { diff --git a/packages/nocodb-nest/src/controllers/forms.controller.spec.ts b/packages/nocodb-nest/src/controllers/forms.controller.spec.ts index 7cf55f511d..ac1c9d2392 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/forms.service'; +import { FormsController } from './forms.controller'; import type { TestingModule } from '@nestjs/testing'; describe('FormsController', () => { diff --git a/packages/nocodb-nest/src/controllers/galleries.controller.spec.ts b/packages/nocodb-nest/src/controllers/galleries.controller.spec.ts index ee740f4639..b9a53b1a56 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/galleries.service'; +import { GalleriesController } from './galleries.controller'; import type { TestingModule } from '@nestjs/testing'; describe('GalleriesController', () => { diff --git a/packages/nocodb-nest/src/controllers/grid-columns.controller.spec.ts b/packages/nocodb-nest/src/controllers/grid-columns.controller.spec.ts index b094c97e4a..d4ab6f9f1a 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/grid-columns.service'; +import { GridColumnsController } from './grid-columns.controller'; import type { TestingModule } from '@nestjs/testing'; describe('GridColumnsController', () => { diff --git a/packages/nocodb-nest/src/controllers/grids.controller.spec.ts b/packages/nocodb-nest/src/controllers/grids.controller.spec.ts index 92cf92afb7..39659ab19a 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/grids.service'; +import { GridsController } from './grids.controller'; import type { TestingModule } from '@nestjs/testing'; describe('GridsController', () => { diff --git a/packages/nocodb-nest/src/controllers/hook-filters.controller.spec.ts b/packages/nocodb-nest/src/controllers/hook-filters.controller.spec.ts index b7a985e8b5..a728057837 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/hook-filters.service'; +import { HookFiltersController } from './hook-filters.controller'; import type { TestingModule } from '@nestjs/testing'; describe('HookFiltersController', () => { diff --git a/packages/nocodb-nest/src/controllers/hooks.controller.spec.ts b/packages/nocodb-nest/src/controllers/hooks.controller.spec.ts index 225e14d9af..277a9a1f47 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/hooks.service'; +import { HooksController } from './hooks.controller'; import type { TestingModule } from '@nestjs/testing'; describe('HooksController', () => { diff --git a/packages/nocodb-nest/src/controllers/imports/import.controller.spec.ts b/packages/nocodb-nest/src/controllers/imports/import.controller.spec.ts index 159afcb206..f10d504818 100644 --- a/packages/nocodb-nest/src/controllers/imports/import.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/imports/import.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; -import { ImportController } from './import.controller'; import { ImportService } from '../../services/import.service'; +import { ImportController } from './import.controller'; import type { TestingModule } from '@nestjs/testing'; describe('ImportController', () => { diff --git a/packages/nocodb-nest/src/controllers/kanbans.controller.spec.ts b/packages/nocodb-nest/src/controllers/kanbans.controller.spec.ts index 3689baa8d5..85c2c86a74 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/kanbans.service'; +import { KanbansController } from './kanbans.controller'; import type { TestingModule } from '@nestjs/testing'; describe('KanbansController', () => { diff --git a/packages/nocodb-nest/src/controllers/maps.controller.spec.ts b/packages/nocodb-nest/src/controllers/maps.controller.spec.ts index 62616382cf..45869452c4 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/maps.service'; +import { MapsController } from './maps.controller'; import type { TestingModule } from '@nestjs/testing'; describe('MapsController', () => { diff --git a/packages/nocodb-nest/src/controllers/meta-diffs.controller.spec.ts b/packages/nocodb-nest/src/controllers/meta-diffs.controller.spec.ts index 0e1285618f..27e50f10e1 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/meta-diffs.service'; +import { MetaDiffsController } from './meta-diffs.controller'; import type { TestingModule } from '@nestjs/testing'; describe('MetaDiffsController', () => { diff --git a/packages/nocodb-nest/src/controllers/model-visibilities.controller.spec.ts b/packages/nocodb-nest/src/controllers/model-visibilities.controller.spec.ts index fabbe96505..dcf1ee8cc5 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/model-visibilities.service'; +import { ModelVisibilitiesController } from './model-visibilities.controller'; import type { TestingModule } from '@nestjs/testing'; describe('ModelVisibilitiesController', () => { diff --git a/packages/nocodb-nest/src/controllers/org-lcense.controller.spec.ts b/packages/nocodb-nest/src/controllers/org-lcense.controller.spec.ts index d22c5c5c81..48cd817a7a 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/org-lcense.service'; +import { OrgLcenseController } from './org-lcense.controller'; import type { TestingModule } from '@nestjs/testing'; describe('OrgLcenseController', () => { diff --git a/packages/nocodb-nest/src/controllers/org-tokens.controller.spec.ts b/packages/nocodb-nest/src/controllers/org-tokens.controller.spec.ts index dbd1c1fc46..cd20b65fc6 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/org-tokens.service'; +import { OrgTokensController } from './org-tokens.controller'; import type { TestingModule } from '@nestjs/testing'; describe('OrgTokensController', () => { diff --git a/packages/nocodb-nest/src/controllers/org-users.controller.spec.ts b/packages/nocodb-nest/src/controllers/org-users.controller.spec.ts index 8330497346..8c2e0aa750 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/org-users.service'; +import { OrgUsersController } from './org-users.controller'; import type { TestingModule } from '@nestjs/testing'; describe('OrgUsersController', () => { diff --git a/packages/nocodb-nest/src/controllers/plugins.controller.spec.ts b/packages/nocodb-nest/src/controllers/plugins.controller.spec.ts index 2889f1722b..708071622b 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/plugins.service'; +import { PluginsController } from './plugins.controller'; import type { TestingModule } from '@nestjs/testing'; describe('PluginsController', () => { diff --git a/packages/nocodb-nest/src/controllers/project-users.controller.spec.ts b/packages/nocodb-nest/src/controllers/project-users.controller.spec.ts index 435b1bf27b..95fe5a604f 100644 --- a/packages/nocodb-nest/src/controllers/project-users.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/project-users.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; -import { ProjectUsersController } from './project-users.controller'; import { ProjectUsersService } from '../services/project-users/project-users.service'; +import { ProjectUsersController } from './project-users.controller'; import type { TestingModule } from '@nestjs/testing'; describe('ProjectUsersController', () => { diff --git a/packages/nocodb-nest/src/controllers/projects.controller.spec.ts b/packages/nocodb-nest/src/controllers/projects.controller.spec.ts index cd209e715b..add9d1da7d 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/projects.service'; +import { ProjectsController } from './projects.controller'; import type { TestingModule } from '@nestjs/testing'; describe('ProjectsController', () => { diff --git a/packages/nocodb-nest/src/controllers/public-datas-export.controller.spec.ts b/packages/nocodb-nest/src/controllers/public-datas-export.controller.spec.ts index 7fafb7e8ca..ef682aac29 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/public-datas-export.service'; +import { PublicDatasExportController } from './public-datas-export.controller'; import type { TestingModule } from '@nestjs/testing'; describe('PublicDatasExportController', () => { diff --git a/packages/nocodb-nest/src/controllers/public-datas.controller.spec.ts b/packages/nocodb-nest/src/controllers/public-datas.controller.spec.ts index a981905d4f..63eba4cae3 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/public-datas.service'; +import { PublicDatasController } from './public-datas.controller'; import type { TestingModule } from '@nestjs/testing'; describe('PublicDatasController', () => { diff --git a/packages/nocodb-nest/src/controllers/public-datas.controller.ts b/packages/nocodb-nest/src/controllers/public-datas.controller.ts index 5213050752..97193ba68d 100644 --- a/packages/nocodb-nest/src/controllers/public-datas.controller.ts +++ b/packages/nocodb-nest/src/controllers/public-datas.controller.ts @@ -58,9 +58,7 @@ export class PublicDatasController { // ); @Post('/api/v1/db/public/shared-view/:sharedViewUuid/rows') @HttpCode(200) - @UseInterceptors( - AnyFilesInterceptor(), - ) + @UseInterceptors(AnyFilesInterceptor()) async dataInsert( @Request() req, @Param('sharedViewUuid') sharedViewUuid: string, diff --git a/packages/nocodb-nest/src/controllers/public-metas.controller.spec.ts b/packages/nocodb-nest/src/controllers/public-metas.controller.spec.ts index ab9bb3c2ac..ff334a40f8 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/public-metas.service'; +import { PublicMetasController } from './public-metas.controller'; import type { TestingModule } from '@nestjs/testing'; describe('PublicMetasController', () => { diff --git a/packages/nocodb-nest/src/controllers/shared-bases.controller.spec.ts b/packages/nocodb-nest/src/controllers/shared-bases.controller.spec.ts index 30b0b28ed2..e2d953bfb2 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/shared-bases.service'; +import { SharedBasesController } from './shared-bases.controller'; import type { TestingModule } from '@nestjs/testing'; describe('SharedBasesController', () => { diff --git a/packages/nocodb-nest/src/controllers/sorts.controller.spec.ts b/packages/nocodb-nest/src/controllers/sorts.controller.spec.ts index afc6e28eca..4d5d60f488 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/sorts.service'; +import { SortsController } from './sorts.controller'; import type { TestingModule } from '@nestjs/testing'; describe('SortsController', () => { diff --git a/packages/nocodb-nest/src/controllers/sync.controller.spec.ts b/packages/nocodb-nest/src/controllers/sync.controller.spec.ts index 6d28ff50b3..132e2178c9 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/sync.service'; +import { SyncController } from './sync.controller'; import type { TestingModule } from '@nestjs/testing'; describe('SyncController', () => { diff --git a/packages/nocodb-nest/src/controllers/tables.controller.spec.ts b/packages/nocodb-nest/src/controllers/tables.controller.spec.ts index 82099bffbc..aef2887fcd 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/tables.service'; +import { TablesController } from './tables.controller'; import type { TestingModule } from '@nestjs/testing'; describe('TablesController', () => { diff --git a/packages/nocodb-nest/src/controllers/test/test.controller.spec.ts b/packages/nocodb-nest/src/controllers/test/test.controller.spec.ts index 3867bdd4e9..2a4046c946 100644 --- a/packages/nocodb-nest/src/controllers/test/test.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/test/test.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; -import { TestController } from './test.controller'; import { TestService } from '../../modules/test/test.service'; +import { TestController } from './test.controller'; import type { TestingModule } from '@nestjs/testing'; describe('TestController', () => { diff --git a/packages/nocodb-nest/src/controllers/users/users.controller.spec.ts b/packages/nocodb-nest/src/controllers/users/users.controller.spec.ts index 1e2419cd90..2c99237ac0 100644 --- a/packages/nocodb-nest/src/controllers/users/users.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/users/users.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; -import { UsersController } from './users.controller'; import { UsersService } from '../../services/users/users.service'; +import { UsersController } from './users.controller'; import type { TestingModule } from '@nestjs/testing'; describe('UsersController', () => { diff --git a/packages/nocodb-nest/src/controllers/users/users.controller.ts b/packages/nocodb-nest/src/controllers/users/users.controller.ts index f3b8e93d93..c162c66079 100644 --- a/packages/nocodb-nest/src/controllers/users/users.controller.ts +++ b/packages/nocodb-nest/src/controllers/users/users.controller.ts @@ -22,7 +22,11 @@ import { import Noco from '../../Noco'; import extractRolesObj from '../../utils/extractRolesObj'; import { Audit, User } from '../../models'; -import { genJwt, randomTokenString, setTokenCookie } from '../../services/users/helpers'; +import { + genJwt, + randomTokenString, + setTokenCookie, +} from '../../services/users/helpers'; import { UsersService } from '../../services/users/users.service'; @Controller() diff --git a/packages/nocodb-nest/src/controllers/utils.controller.spec.ts b/packages/nocodb-nest/src/controllers/utils.controller.spec.ts index f136a6f1bf..fb1ca97a00 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/utils.service'; +import { UtilsController } from './utils.controller'; import type { TestingModule } from '@nestjs/testing'; describe('UtilsController', () => { diff --git a/packages/nocodb-nest/src/controllers/view-columns.controller.spec.ts b/packages/nocodb-nest/src/controllers/view-columns.controller.spec.ts index e3d5480cea..ec2eb29d39 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/view-columns.service'; +import { ViewColumnsController } from './view-columns.controller'; import type { TestingModule } from '@nestjs/testing'; describe('ViewColumnsController', () => { diff --git a/packages/nocodb-nest/src/controllers/views.controller.spec.ts b/packages/nocodb-nest/src/controllers/views.controller.spec.ts index 552a40d912..7052825a21 100644 --- a/packages/nocodb-nest/src/controllers/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 '../services/views.service'; +import { ViewsController } from './views.controller'; import type { TestingModule } from '@nestjs/testing'; describe('ViewsController', () => { diff --git a/packages/nocodb-nest/src/modules/datas/datas.module.ts b/packages/nocodb-nest/src/modules/datas/datas.module.ts index 2f02193063..293369fcea 100644 --- a/packages/nocodb-nest/src/modules/datas/datas.module.ts +++ b/packages/nocodb-nest/src/modules/datas/datas.module.ts @@ -1,10 +1,10 @@ import { Module } from '@nestjs/common'; -import { MulterModule } from '@nestjs/platform-express' -import multer from 'multer' -import { NC_ATTACHMENT_FIELD_SIZE } from '../../constants' +import { MulterModule } from '@nestjs/platform-express'; +import multer from 'multer'; +import { NC_ATTACHMENT_FIELD_SIZE } from '../../constants'; import { DataAliasController } from '../../controllers/data-alias.controller'; -import { PublicDatasExportController } from '../../controllers/public-datas-export.controller' -import { PublicDatasController } from '../../controllers/public-datas.controller' +import { PublicDatasExportController } from '../../controllers/public-datas-export.controller'; +import { PublicDatasController } from '../../controllers/public-datas.controller'; import { DatasService } from '../../services/datas.service'; import { DatasController } from '../../controllers/datas.controller'; import { BulkDataAliasController } from '../../controllers/bulk-data-alias.controller'; @@ -14,8 +14,8 @@ import { OldDatasController } from '../../controllers/old-datas/old-datas.contro import { BulkDataAliasService } from '../../services/bulk-data-alias.service'; import { DataAliasNestedService } from '../../services/data-alias-nested.service'; import { OldDatasService } from '../../controllers/old-datas/old-datas.service'; -import { PublicDatasExportService } from '../../services/public-datas-export.service' -import { PublicDatasService } from '../../services/public-datas.service' +import { PublicDatasExportService } from '../../services/public-datas-export.service'; +import { PublicDatasService } from '../../services/public-datas.service'; @Module({ imports: [ @@ -34,7 +34,7 @@ import { PublicDatasService } from '../../services/public-datas.service' DataAliasExportController, OldDatasController, PublicDatasController, - PublicDatasExportController + PublicDatasExportController, ], providers: [ DatasService, @@ -42,7 +42,7 @@ import { PublicDatasService } from '../../services/public-datas.service' DataAliasNestedService, OldDatasService, PublicDatasService, - PublicDatasExportService + PublicDatasExportService, ], }) export class DatasModule {} diff --git a/packages/nocodb-nest/src/modules/metas/metas.module.ts b/packages/nocodb-nest/src/modules/metas/metas.module.ts index fa207c686d..4aa00835fe 100644 --- a/packages/nocodb-nest/src/modules/metas/metas.module.ts +++ b/packages/nocodb-nest/src/modules/metas/metas.module.ts @@ -9,67 +9,67 @@ import { AuditsController } from '../../controllers/audits.controller'; import { BasesController } from '../../controllers/bases.controller'; import { CachesController } from '../../controllers/caches.controller'; import { ColumnsController } from '../../controllers/columns.controller'; -import { FiltersController } from '../../controllers/filters.controller' -import { FormColumnsController } from '../../controllers/form-columns.controller' -import { FormsController } from '../../controllers/forms.controller' -import { GalleriesController } from '../../controllers/galleries.controller' -import { GridColumnsController } from '../../controllers/grid-columns.controller' -import { GridsController } from '../../controllers/grids.controller' -import { HooksController } from '../../controllers/hooks.controller' -import { ImportController } from '../../controllers/imports/import.controller' -import { KanbansController } from '../../controllers/kanbans.controller' -import { MapsController } from '../../controllers/maps.controller' -import { MetaDiffsController } from '../../controllers/meta-diffs.controller' -import { ModelVisibilitiesController } from '../../controllers/model-visibilities.controller' -import { OrgLcenseController } from '../../controllers/org-lcense.controller' -import { OrgTokensController } from '../../controllers/org-tokens.controller' -import { OrgUsersController } from '../../controllers/org-users.controller' -import { PluginsController } from '../../controllers/plugins.controller' -import { ProjectsController } from '../../controllers/projects.controller' -import { PublicMetasController } from '../../controllers/public-metas.controller' -import { SharedBasesController } from '../../controllers/shared-bases.controller' -import { SortsController } from '../../controllers/sorts.controller' -import { SyncController } from '../../controllers/sync.controller' -import { TablesController } from '../../controllers/tables.controller' -import { UtilsController } from '../../controllers/utils.controller' -import { ViewColumnsController } from '../../controllers/view-columns.controller' -import { ViewsController } from '../../controllers/views.controller' -import { ExtractProjectIdMiddleware } from '../../middlewares/extract-project-id/extract-project-id.middleware' +import { FiltersController } from '../../controllers/filters.controller'; +import { FormColumnsController } from '../../controllers/form-columns.controller'; +import { FormsController } from '../../controllers/forms.controller'; +import { GalleriesController } from '../../controllers/galleries.controller'; +import { GridColumnsController } from '../../controllers/grid-columns.controller'; +import { GridsController } from '../../controllers/grids.controller'; +import { HooksController } from '../../controllers/hooks.controller'; +import { ImportController } from '../../controllers/imports/import.controller'; +import { KanbansController } from '../../controllers/kanbans.controller'; +import { MapsController } from '../../controllers/maps.controller'; +import { MetaDiffsController } from '../../controllers/meta-diffs.controller'; +import { ModelVisibilitiesController } from '../../controllers/model-visibilities.controller'; +import { OrgLcenseController } from '../../controllers/org-lcense.controller'; +import { OrgTokensController } from '../../controllers/org-tokens.controller'; +import { OrgUsersController } from '../../controllers/org-users.controller'; +import { PluginsController } from '../../controllers/plugins.controller'; +import { ProjectsController } from '../../controllers/projects.controller'; +import { PublicMetasController } from '../../controllers/public-metas.controller'; +import { SharedBasesController } from '../../controllers/shared-bases.controller'; +import { SortsController } from '../../controllers/sorts.controller'; +import { SyncController } from '../../controllers/sync.controller'; +import { TablesController } from '../../controllers/tables.controller'; +import { UtilsController } from '../../controllers/utils.controller'; +import { ViewColumnsController } from '../../controllers/view-columns.controller'; +import { ViewsController } from '../../controllers/views.controller'; +import { ExtractProjectIdMiddleware } from '../../middlewares/extract-project-id/extract-project-id.middleware'; import { ApiTokensService } from '../../services/api-tokens.service'; import { AttachmentsService } from '../../services/attachments.service'; import { AuditsService } from '../../services/audits.service'; import { BasesService } from '../../services/bases.service'; import { CachesService } from '../../services/caches.service'; import { ColumnsService } from '../../services/columns.service'; -import { FiltersService } from '../../services/filters.service' -import { FormColumnsService } from '../../services/form-columns.service' -import { FormsService } from '../../services/forms.service' -import { GalleriesService } from '../../services/galleries.service' -import { GridColumnsService } from '../../services/grid-columns.service' -import { GridsService } from '../../services/grids.service' -import { HooksService } from '../../services/hooks.service' -import { KanbansService } from '../../services/kanbans.service' -import { MapsService } from '../../services/maps.service' -import { MetaDiffsService } from '../../services/meta-diffs.service' -import { ModelVisibilitiesService } from '../../services/model-visibilities.service' -import { OrgLcenseService } from '../../services/org-lcense.service' -import { OrgTokensEeService } from '../../services/org-tokens-ee.service' -import { OrgTokensService } from '../../services/org-tokens.service' -import { OrgUsersService } from '../../services/org-users.service' -import { PluginsService } from '../../services/plugins.service' -import { ProjectsService } from '../../services/projects.service' -import { PublicMetasService } from '../../services/public-metas.service' -import { SharedBasesService } from '../../services/shared-bases.service' -import { SortsService } from '../../services/sorts.service' -import { SyncService } from '../../services/sync.service' -import { TablesService } from '../../services/tables.service' -import { UtilsService } from '../../services/utils.service' -import { ViewColumnsService } from '../../services/view-columns.service' -import { ViewsService } from '../../services/views.service' +import { FiltersService } from '../../services/filters.service'; +import { FormColumnsService } from '../../services/form-columns.service'; +import { FormsService } from '../../services/forms.service'; +import { GalleriesService } from '../../services/galleries.service'; +import { GridColumnsService } from '../../services/grid-columns.service'; +import { GridsService } from '../../services/grids.service'; +import { HooksService } from '../../services/hooks.service'; +import { KanbansService } from '../../services/kanbans.service'; +import { MapsService } from '../../services/maps.service'; +import { MetaDiffsService } from '../../services/meta-diffs.service'; +import { ModelVisibilitiesService } from '../../services/model-visibilities.service'; +import { OrgLcenseService } from '../../services/org-lcense.service'; +import { OrgTokensEeService } from '../../services/org-tokens-ee.service'; +import { OrgTokensService } from '../../services/org-tokens.service'; +import { OrgUsersService } from '../../services/org-users.service'; +import { PluginsService } from '../../services/plugins.service'; +import { ProjectsService } from '../../services/projects.service'; +import { PublicMetasService } from '../../services/public-metas.service'; +import { SharedBasesService } from '../../services/shared-bases.service'; +import { SortsService } from '../../services/sorts.service'; +import { SyncService } from '../../services/sync.service'; +import { TablesService } from '../../services/tables.service'; +import { UtilsService } from '../../services/utils.service'; +import { ViewColumnsService } from '../../services/view-columns.service'; +import { ViewsService } from '../../services/views.service'; import { ApiDocsService } from '../../services/api-docs/api-docs.service'; -import { GlobalModule } from '../global/global.module' -import { ProjectUsersController } from '../../controllers/project-users.controller' -import { ProjectUsersService } from '../../services/project-users/project-users.service' +import { GlobalModule } from '../global/global.module'; +import { ProjectUsersController } from '../../controllers/project-users.controller'; +import { ProjectUsersService } from '../../services/project-users/project-users.service'; @Module({ imports: [ @@ -114,7 +114,7 @@ import { ProjectUsersService } from '../../services/project-users/project-users. TablesController, SyncController, SortsController, - SharedBasesController + SharedBasesController, ], providers: [ ApiDocsService, diff --git a/packages/nocodb-nest/src/services/auth.service.ts b/packages/nocodb-nest/src/services/auth.service.ts index 3cd5a3ed50..3715bf1edc 100644 --- a/packages/nocodb-nest/src/services/auth.service.ts +++ b/packages/nocodb-nest/src/services/auth.service.ts @@ -5,9 +5,9 @@ import * as bcrypt from 'bcryptjs'; import { v4 as uuidv4 } from 'uuid'; import Noco from '../Noco'; +import { Connection } from '../connection/connection'; import { genJwt } from './users/helpers'; import { UsersService } from './users/users.service'; -import { Connection } from '../connection/connection'; import type { CreateUserDto } from '../controllers/auth.controller'; @Injectable() diff --git a/packages/nocodb-nest/src/services/data-alias-nested.service.ts b/packages/nocodb-nest/src/services/data-alias-nested.service.ts index 898148af9f..c027c02084 100644 --- a/packages/nocodb-nest/src/services/data-alias-nested.service.ts +++ b/packages/nocodb-nest/src/services/data-alias-nested.service.ts @@ -4,7 +4,10 @@ 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 { + getColumnByIdOrName, + getViewAndModelByAliasOrId, +} from '../modules/datas/helpers'; import type { PathParams } from '../modules/datas/helpers'; @Injectable() diff --git a/packages/nocodb-nest/src/services/meta-diffs.service.ts b/packages/nocodb-nest/src/services/meta-diffs.service.ts index a6fd37ff03..5891dc0901 100644 --- a/packages/nocodb-nest/src/services/meta-diffs.service.ts +++ b/packages/nocodb-nest/src/services/meta-diffs.service.ts @@ -4,9 +4,7 @@ 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 getTableNameAlias, { - getColumnNameAlias, -} from '../helpers/getTableName'; +import getTableNameAlias, { getColumnNameAlias } from '../helpers/getTableName'; import { getUniqueColumnAliasName } from '../helpers/getUniqueName'; import mapDefaultDisplayValue from '../helpers/mapDefaultDisplayValue'; import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; diff --git a/packages/nocodb-nest/src/services/tables.service.ts b/packages/nocodb-nest/src/services/tables.service.ts index f1bda01bf2..7d86ce4d5d 100644 --- a/packages/nocodb-nest/src/services/tables.service.ts +++ b/packages/nocodb-nest/src/services/tables.service.ts @@ -12,17 +12,9 @@ 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 getTableNameAlias, { getColumnNameAlias } from '../helpers/getTableName'; import mapDefaultDisplayValue from '../helpers/mapDefaultDisplayValue'; -import { - Audit, - Column, - Model, - ModelRoleVisibility, - Project, -} from '../models'; +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'; diff --git a/packages/nocodb-nest/src/services/users/users.service.ts b/packages/nocodb-nest/src/services/users/users.service.ts index f051aec070..6d60b76336 100644 --- a/packages/nocodb-nest/src/services/users/users.service.ts +++ b/packages/nocodb-nest/src/services/users/users.service.ts @@ -188,8 +188,11 @@ export class UsersService { token_version: null, }); try { - const template = (await import('../../controllers/users/ui/emailTemplates/forgotPassword')) - .default; + const template = ( + await import( + '../../controllers/users/ui/emailTemplates/forgotPassword' + ) + ).default; await NcPluginMgrv2.emailAdapter().then((adapter) => adapter.mailSend({ to: user.email, @@ -443,7 +446,9 @@ export class UsersService { user = await User.getByEmail(email); try { - const template = (await import('../../controllers/users/ui/emailTemplates/verify')).default; + const template = ( + await import('../../controllers/users/ui/emailTemplates/verify') + ).default; await ( await NcPluginMgrv2.emailAdapter() ).mailSend({