From 94afeb96abd430b0a3f835be071a24c7e0d6cb4f Mon Sep 17 00:00:00 2001 From: Naveen MR Date: Sat, 4 Mar 2023 23:49:57 +0000 Subject: [PATCH] refactor : dirs --- packages/nocodb/src/lib/Noco.ts | 2 +- .../{swaggerController => apiDocs}/index.ts | 0 .../{swaggerController => apiDocs}/redocHtml.ts | 0 .../{swaggerController => apiDocs}/swaggerHtml.ts | 0 .../bulkDataAliasController.ts | 0 .../dataAliasController.ts | 0 .../dataAliasExportController.ts | 2 +- .../dataAliasNestedController.ts | 0 .../{dataControllers => dbData}/dataController.ts | 0 .../{dataControllers => dbData}/helpers.ts | 0 .../controllers/{dataControllers => dbData}/index.ts | 0 .../{dataControllers => dbData}/oldDataController.ts | 0 .../nocodb/src/lib/controllers/exportController.ts | 2 +- .../{syncController => sync}/importApis.ts | 2 +- .../controllers/{syncController => sync}/index.ts | 0 .../controllers/{userController => user}/index.ts | 0 .../{userController => user}/initStrategies.ts | 0 .../{userController => user}/ui/auth/emailVerify.ts | 0 .../ui/auth/resetPassword.ts | 0 .../ui/emailTemplates/forgotPassword.ts | 0 .../ui/emailTemplates/invite.ts | 0 .../ui/emailTemplates/verify.ts | 0 .../controllers/{userController => user}/userApis.ts | 0 packages/nocodb/src/lib/meta/api/index.ts | 12 ++++++------ .../services/{swaggerService => apiDocs}/getPaths.ts | 0 .../{swaggerService => apiDocs}/getSchemas.ts | 0 .../getSwaggerColumnMetas.ts | 0 .../{swaggerService => apiDocs}/getSwaggerJSON.ts | 0 .../services/{swaggerService => apiDocs}/index.ts | 0 .../{swaggerService => apiDocs}/swagger-base.json | 0 .../{swaggerService => apiDocs}/templates/headers.ts | 0 .../{swaggerService => apiDocs}/templates/params.ts | 0 .../{swaggerService => apiDocs}/templates/paths.ts | 0 .../{swaggerService => apiDocs}/templates/schemas.ts | 0 .../lib/services/{dataService => dbData}/bulkData.ts | 0 .../dataAliasNestedService.ts | 0 .../lib/services/{dataService => dbData}/export.ts | 0 .../lib/services/{dataService => dbData}/helpers.ts | 0 .../lib/services/{dataService => dbData}/index.ts | 0 packages/nocodb/src/lib/services/index.ts | 12 ++++++------ .../nocodb/src/lib/services/projectUserService.ts | 2 +- .../src/lib/services/public/publicDataService.ts | 2 +- .../{syncService => sync}/helpers/EntityMap.ts | 0 .../helpers/NocoSyncDestAdapter.ts | 0 .../helpers/NocoSyncSourceAdapter.ts | 0 .../{syncService => sync}/helpers/fetchAT.ts | 0 .../services/{syncService => sync}/helpers/job.ts | 0 .../helpers/readAndProcessData.ts | 0 .../{syncService => sync}/helpers/syncMap.ts | 0 .../src/lib/services/{syncService => sync}/index.ts | 0 .../lib/services/{userService => user}/helpers.ts | 0 .../src/lib/services/{userService => user}/index.ts | 0 .../{userService => user}/initAdminFromEnv.ts | 0 .../{userService => user}/ui/auth/emailVerify.ts | 0 .../{userService => user}/ui/auth/resetPassword.ts | 0 .../ui/emailTemplates/forgotPassword.ts | 0 .../ui/emailTemplates/invite.ts | 0 .../ui/emailTemplates/verify.ts | 0 58 files changed, 18 insertions(+), 18 deletions(-) rename packages/nocodb/src/lib/controllers/{swaggerController => apiDocs}/index.ts (100%) rename packages/nocodb/src/lib/controllers/{swaggerController => apiDocs}/redocHtml.ts (100%) rename packages/nocodb/src/lib/controllers/{swaggerController => apiDocs}/swaggerHtml.ts (100%) rename packages/nocodb/src/lib/controllers/{dataControllers => dbData}/bulkDataAliasController.ts (100%) rename packages/nocodb/src/lib/controllers/{dataControllers => dbData}/dataAliasController.ts (100%) rename packages/nocodb/src/lib/controllers/{dataControllers => dbData}/dataAliasExportController.ts (98%) rename packages/nocodb/src/lib/controllers/{dataControllers => dbData}/dataAliasNestedController.ts (100%) rename packages/nocodb/src/lib/controllers/{dataControllers => dbData}/dataController.ts (100%) rename packages/nocodb/src/lib/controllers/{dataControllers => dbData}/helpers.ts (100%) rename packages/nocodb/src/lib/controllers/{dataControllers => dbData}/index.ts (100%) rename packages/nocodb/src/lib/controllers/{dataControllers => dbData}/oldDataController.ts (100%) rename packages/nocodb/src/lib/controllers/{syncController => sync}/importApis.ts (98%) rename packages/nocodb/src/lib/controllers/{syncController => sync}/index.ts (100%) rename packages/nocodb/src/lib/controllers/{userController => user}/index.ts (100%) rename packages/nocodb/src/lib/controllers/{userController => user}/initStrategies.ts (100%) rename packages/nocodb/src/lib/controllers/{userController => user}/ui/auth/emailVerify.ts (100%) rename packages/nocodb/src/lib/controllers/{userController => user}/ui/auth/resetPassword.ts (100%) rename packages/nocodb/src/lib/controllers/{userController => user}/ui/emailTemplates/forgotPassword.ts (100%) rename packages/nocodb/src/lib/controllers/{userController => user}/ui/emailTemplates/invite.ts (100%) rename packages/nocodb/src/lib/controllers/{userController => user}/ui/emailTemplates/verify.ts (100%) rename packages/nocodb/src/lib/controllers/{userController => user}/userApis.ts (100%) rename packages/nocodb/src/lib/services/{swaggerService => apiDocs}/getPaths.ts (100%) rename packages/nocodb/src/lib/services/{swaggerService => apiDocs}/getSchemas.ts (100%) rename packages/nocodb/src/lib/services/{swaggerService => apiDocs}/getSwaggerColumnMetas.ts (100%) rename packages/nocodb/src/lib/services/{swaggerService => apiDocs}/getSwaggerJSON.ts (100%) rename packages/nocodb/src/lib/services/{swaggerService => apiDocs}/index.ts (100%) rename packages/nocodb/src/lib/services/{swaggerService => apiDocs}/swagger-base.json (100%) rename packages/nocodb/src/lib/services/{swaggerService => apiDocs}/templates/headers.ts (100%) rename packages/nocodb/src/lib/services/{swaggerService => apiDocs}/templates/params.ts (100%) rename packages/nocodb/src/lib/services/{swaggerService => apiDocs}/templates/paths.ts (100%) rename packages/nocodb/src/lib/services/{swaggerService => apiDocs}/templates/schemas.ts (100%) rename packages/nocodb/src/lib/services/{dataService => dbData}/bulkData.ts (100%) rename packages/nocodb/src/lib/services/{dataService => dbData}/dataAliasNestedService.ts (100%) rename packages/nocodb/src/lib/services/{dataService => dbData}/export.ts (100%) rename packages/nocodb/src/lib/services/{dataService => dbData}/helpers.ts (100%) rename packages/nocodb/src/lib/services/{dataService => dbData}/index.ts (100%) rename packages/nocodb/src/lib/services/{syncService => sync}/helpers/EntityMap.ts (100%) rename packages/nocodb/src/lib/services/{syncService => sync}/helpers/NocoSyncDestAdapter.ts (100%) rename packages/nocodb/src/lib/services/{syncService => sync}/helpers/NocoSyncSourceAdapter.ts (100%) rename packages/nocodb/src/lib/services/{syncService => sync}/helpers/fetchAT.ts (100%) rename packages/nocodb/src/lib/services/{syncService => sync}/helpers/job.ts (100%) rename packages/nocodb/src/lib/services/{syncService => sync}/helpers/readAndProcessData.ts (100%) rename packages/nocodb/src/lib/services/{syncService => sync}/helpers/syncMap.ts (100%) rename packages/nocodb/src/lib/services/{syncService => sync}/index.ts (100%) rename packages/nocodb/src/lib/services/{userService => user}/helpers.ts (100%) rename packages/nocodb/src/lib/services/{userService => user}/index.ts (100%) rename packages/nocodb/src/lib/services/{userService => user}/initAdminFromEnv.ts (100%) rename packages/nocodb/src/lib/services/{userService => user}/ui/auth/emailVerify.ts (100%) rename packages/nocodb/src/lib/services/{userService => user}/ui/auth/resetPassword.ts (100%) rename packages/nocodb/src/lib/services/{userService => user}/ui/emailTemplates/forgotPassword.ts (100%) rename packages/nocodb/src/lib/services/{userService => user}/ui/emailTemplates/invite.ts (100%) rename packages/nocodb/src/lib/services/{userService => user}/ui/emailTemplates/verify.ts (100%) diff --git a/packages/nocodb/src/lib/Noco.ts b/packages/nocodb/src/lib/Noco.ts index 151f211c65..a180a85dcf 100644 --- a/packages/nocodb/src/lib/Noco.ts +++ b/packages/nocodb/src/lib/Noco.ts @@ -45,7 +45,7 @@ import User from './models/User'; import * as http from 'http'; import weAreHiring from './utils/weAreHiring'; import getInstance from './utils/getInstance'; -import initAdminFromEnv from './services/userService/initAdminFromEnv'; +import initAdminFromEnv from './services/user/initAdminFromEnv'; const log = debug('nc:app'); require('dotenv').config(); diff --git a/packages/nocodb/src/lib/controllers/swaggerController/index.ts b/packages/nocodb/src/lib/controllers/apiDocs/index.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/swaggerController/index.ts rename to packages/nocodb/src/lib/controllers/apiDocs/index.ts diff --git a/packages/nocodb/src/lib/controllers/swaggerController/redocHtml.ts b/packages/nocodb/src/lib/controllers/apiDocs/redocHtml.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/swaggerController/redocHtml.ts rename to packages/nocodb/src/lib/controllers/apiDocs/redocHtml.ts diff --git a/packages/nocodb/src/lib/controllers/swaggerController/swaggerHtml.ts b/packages/nocodb/src/lib/controllers/apiDocs/swaggerHtml.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/swaggerController/swaggerHtml.ts rename to packages/nocodb/src/lib/controllers/apiDocs/swaggerHtml.ts diff --git a/packages/nocodb/src/lib/controllers/dataControllers/bulkDataAliasController.ts b/packages/nocodb/src/lib/controllers/dbData/bulkDataAliasController.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/dataControllers/bulkDataAliasController.ts rename to packages/nocodb/src/lib/controllers/dbData/bulkDataAliasController.ts diff --git a/packages/nocodb/src/lib/controllers/dataControllers/dataAliasController.ts b/packages/nocodb/src/lib/controllers/dbData/dataAliasController.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/dataControllers/dataAliasController.ts rename to packages/nocodb/src/lib/controllers/dbData/dataAliasController.ts diff --git a/packages/nocodb/src/lib/controllers/dataControllers/dataAliasExportController.ts b/packages/nocodb/src/lib/controllers/dbData/dataAliasExportController.ts similarity index 98% rename from packages/nocodb/src/lib/controllers/dataControllers/dataAliasExportController.ts rename to packages/nocodb/src/lib/controllers/dbData/dataAliasExportController.ts index 0b85b87801..a04cc0a1d5 100644 --- a/packages/nocodb/src/lib/controllers/dataControllers/dataAliasExportController.ts +++ b/packages/nocodb/src/lib/controllers/dbData/dataAliasExportController.ts @@ -6,7 +6,7 @@ import { View } from '../../models'; import { extractCsvData, extractXlsxData, -} from '../../services/dataService/helpers'; +} from '../../services/dbData/helpers'; import { getViewAndModelFromRequestByAliasOrId } from './helpers'; async function excelDataExport(req: Request, res: Response) { diff --git a/packages/nocodb/src/lib/controllers/dataControllers/dataAliasNestedController.ts b/packages/nocodb/src/lib/controllers/dbData/dataAliasNestedController.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/dataControllers/dataAliasNestedController.ts rename to packages/nocodb/src/lib/controllers/dbData/dataAliasNestedController.ts diff --git a/packages/nocodb/src/lib/controllers/dataControllers/dataController.ts b/packages/nocodb/src/lib/controllers/dbData/dataController.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/dataControllers/dataController.ts rename to packages/nocodb/src/lib/controllers/dbData/dataController.ts diff --git a/packages/nocodb/src/lib/controllers/dataControllers/helpers.ts b/packages/nocodb/src/lib/controllers/dbData/helpers.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/dataControllers/helpers.ts rename to packages/nocodb/src/lib/controllers/dbData/helpers.ts diff --git a/packages/nocodb/src/lib/controllers/dataControllers/index.ts b/packages/nocodb/src/lib/controllers/dbData/index.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/dataControllers/index.ts rename to packages/nocodb/src/lib/controllers/dbData/index.ts diff --git a/packages/nocodb/src/lib/controllers/dataControllers/oldDataController.ts b/packages/nocodb/src/lib/controllers/dbData/oldDataController.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/dataControllers/oldDataController.ts rename to packages/nocodb/src/lib/controllers/dbData/oldDataController.ts diff --git a/packages/nocodb/src/lib/controllers/exportController.ts b/packages/nocodb/src/lib/controllers/exportController.ts index 38ae156cb9..a6c172edd5 100644 --- a/packages/nocodb/src/lib/controllers/exportController.ts +++ b/packages/nocodb/src/lib/controllers/exportController.ts @@ -1,7 +1,7 @@ import { Request, Response, Router } from 'express'; import View from '../models/View'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; -import { extractCsvData } from './dataControllers/helpers'; +import { extractCsvData } from './dbData/helpers'; async function exportCsv(req: Request, res: Response) { const view = await View.get(req.params.viewId); diff --git a/packages/nocodb/src/lib/controllers/syncController/importApis.ts b/packages/nocodb/src/lib/controllers/sync/importApis.ts similarity index 98% rename from packages/nocodb/src/lib/controllers/syncController/importApis.ts rename to packages/nocodb/src/lib/controllers/sync/importApis.ts index f161a40ada..da48633196 100644 --- a/packages/nocodb/src/lib/controllers/syncController/importApis.ts +++ b/packages/nocodb/src/lib/controllers/sync/importApis.ts @@ -7,7 +7,7 @@ import NocoJobs from '../../jobs/NocoJobs'; import { SyncSource } from '../../models'; import Noco from '../../Noco'; import { syncService, userService } from '../../services'; -import { AirtableSyncConfig } from '../../services/syncService/helpers/job'; +import { AirtableSyncConfig } from '../../services/sync/helpers/job'; const AIRTABLE_IMPORT_JOB = 'AIRTABLE_IMPORT_JOB'; const AIRTABLE_PROGRESS_JOB = 'AIRTABLE_PROGRESS_JOB'; diff --git a/packages/nocodb/src/lib/controllers/syncController/index.ts b/packages/nocodb/src/lib/controllers/sync/index.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/syncController/index.ts rename to packages/nocodb/src/lib/controllers/sync/index.ts diff --git a/packages/nocodb/src/lib/controllers/userController/index.ts b/packages/nocodb/src/lib/controllers/user/index.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/userController/index.ts rename to packages/nocodb/src/lib/controllers/user/index.ts diff --git a/packages/nocodb/src/lib/controllers/userController/initStrategies.ts b/packages/nocodb/src/lib/controllers/user/initStrategies.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/userController/initStrategies.ts rename to packages/nocodb/src/lib/controllers/user/initStrategies.ts diff --git a/packages/nocodb/src/lib/controllers/userController/ui/auth/emailVerify.ts b/packages/nocodb/src/lib/controllers/user/ui/auth/emailVerify.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/userController/ui/auth/emailVerify.ts rename to packages/nocodb/src/lib/controllers/user/ui/auth/emailVerify.ts diff --git a/packages/nocodb/src/lib/controllers/userController/ui/auth/resetPassword.ts b/packages/nocodb/src/lib/controllers/user/ui/auth/resetPassword.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/userController/ui/auth/resetPassword.ts rename to packages/nocodb/src/lib/controllers/user/ui/auth/resetPassword.ts diff --git a/packages/nocodb/src/lib/controllers/userController/ui/emailTemplates/forgotPassword.ts b/packages/nocodb/src/lib/controllers/user/ui/emailTemplates/forgotPassword.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/userController/ui/emailTemplates/forgotPassword.ts rename to packages/nocodb/src/lib/controllers/user/ui/emailTemplates/forgotPassword.ts diff --git a/packages/nocodb/src/lib/controllers/userController/ui/emailTemplates/invite.ts b/packages/nocodb/src/lib/controllers/user/ui/emailTemplates/invite.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/userController/ui/emailTemplates/invite.ts rename to packages/nocodb/src/lib/controllers/user/ui/emailTemplates/invite.ts diff --git a/packages/nocodb/src/lib/controllers/userController/ui/emailTemplates/verify.ts b/packages/nocodb/src/lib/controllers/user/ui/emailTemplates/verify.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/userController/ui/emailTemplates/verify.ts rename to packages/nocodb/src/lib/controllers/user/ui/emailTemplates/verify.ts diff --git a/packages/nocodb/src/lib/controllers/userController/userApis.ts b/packages/nocodb/src/lib/controllers/user/userApis.ts similarity index 100% rename from packages/nocodb/src/lib/controllers/userController/userApis.ts rename to packages/nocodb/src/lib/controllers/user/userApis.ts diff --git a/packages/nocodb/src/lib/meta/api/index.ts b/packages/nocodb/src/lib/meta/api/index.ts index a785e5ad77..e5aed86fe9 100644 --- a/packages/nocodb/src/lib/meta/api/index.ts +++ b/packages/nocodb/src/lib/meta/api/index.ts @@ -22,12 +22,12 @@ import hookController from '../../controllers/hookController'; import pluginController from '../../controllers/pluginController'; import gridViewColumnController from '../../controllers/gridViewColumnController'; import kanbanViewController from '../../controllers/kanbanViewController'; -import { userController } from '../../controllers/userController'; +import { userController } from '../../controllers/user'; // import extractProjectIdAndAuthenticate from './helpers/extractProjectIdAndAuthenticate'; import utilController from '../../controllers/utilController'; import projectUserController from '../../controllers/projectUserController'; import sharedBaseController from '../../controllers/sharedBaseController'; -import { initStrategies } from '../../controllers/userController/initStrategies'; +import { initStrategies } from '../../controllers/user/initStrategies'; import modelVisibilityController from '../../controllers/modelVisibilityController'; import metaDiffController from '../../controllers/metaDiffController'; import cacheController from '../../controllers/cacheController'; @@ -41,7 +41,7 @@ import { dataAliasNestedController, dataController, oldDataController, -} from '../../controllers/dataControllers'; +} from '../../controllers/dbData'; import { publicDataController, publicDataExportController, @@ -51,9 +51,9 @@ import { Server, Socket } from 'socket.io'; import passport from 'passport'; import crypto from 'crypto'; -import swaggerController from '../../controllers/swaggerController'; -import importController from '../../controllers/syncController/importApis'; -import syncSourceController from '../../controllers/syncController'; +import swaggerController from '../../controllers/apiDocs'; +import importController from '../../controllers/sync/importApis'; +import syncSourceController from '../../controllers/sync'; import mapViewController from '../../controllers/mapViewController'; const clients: { [id: string]: Socket } = {}; diff --git a/packages/nocodb/src/lib/services/swaggerService/getPaths.ts b/packages/nocodb/src/lib/services/apiDocs/getPaths.ts similarity index 100% rename from packages/nocodb/src/lib/services/swaggerService/getPaths.ts rename to packages/nocodb/src/lib/services/apiDocs/getPaths.ts diff --git a/packages/nocodb/src/lib/services/swaggerService/getSchemas.ts b/packages/nocodb/src/lib/services/apiDocs/getSchemas.ts similarity index 100% rename from packages/nocodb/src/lib/services/swaggerService/getSchemas.ts rename to packages/nocodb/src/lib/services/apiDocs/getSchemas.ts diff --git a/packages/nocodb/src/lib/services/swaggerService/getSwaggerColumnMetas.ts b/packages/nocodb/src/lib/services/apiDocs/getSwaggerColumnMetas.ts similarity index 100% rename from packages/nocodb/src/lib/services/swaggerService/getSwaggerColumnMetas.ts rename to packages/nocodb/src/lib/services/apiDocs/getSwaggerColumnMetas.ts diff --git a/packages/nocodb/src/lib/services/swaggerService/getSwaggerJSON.ts b/packages/nocodb/src/lib/services/apiDocs/getSwaggerJSON.ts similarity index 100% rename from packages/nocodb/src/lib/services/swaggerService/getSwaggerJSON.ts rename to packages/nocodb/src/lib/services/apiDocs/getSwaggerJSON.ts diff --git a/packages/nocodb/src/lib/services/swaggerService/index.ts b/packages/nocodb/src/lib/services/apiDocs/index.ts similarity index 100% rename from packages/nocodb/src/lib/services/swaggerService/index.ts rename to packages/nocodb/src/lib/services/apiDocs/index.ts diff --git a/packages/nocodb/src/lib/services/swaggerService/swagger-base.json b/packages/nocodb/src/lib/services/apiDocs/swagger-base.json similarity index 100% rename from packages/nocodb/src/lib/services/swaggerService/swagger-base.json rename to packages/nocodb/src/lib/services/apiDocs/swagger-base.json diff --git a/packages/nocodb/src/lib/services/swaggerService/templates/headers.ts b/packages/nocodb/src/lib/services/apiDocs/templates/headers.ts similarity index 100% rename from packages/nocodb/src/lib/services/swaggerService/templates/headers.ts rename to packages/nocodb/src/lib/services/apiDocs/templates/headers.ts diff --git a/packages/nocodb/src/lib/services/swaggerService/templates/params.ts b/packages/nocodb/src/lib/services/apiDocs/templates/params.ts similarity index 100% rename from packages/nocodb/src/lib/services/swaggerService/templates/params.ts rename to packages/nocodb/src/lib/services/apiDocs/templates/params.ts diff --git a/packages/nocodb/src/lib/services/swaggerService/templates/paths.ts b/packages/nocodb/src/lib/services/apiDocs/templates/paths.ts similarity index 100% rename from packages/nocodb/src/lib/services/swaggerService/templates/paths.ts rename to packages/nocodb/src/lib/services/apiDocs/templates/paths.ts diff --git a/packages/nocodb/src/lib/services/swaggerService/templates/schemas.ts b/packages/nocodb/src/lib/services/apiDocs/templates/schemas.ts similarity index 100% rename from packages/nocodb/src/lib/services/swaggerService/templates/schemas.ts rename to packages/nocodb/src/lib/services/apiDocs/templates/schemas.ts diff --git a/packages/nocodb/src/lib/services/dataService/bulkData.ts b/packages/nocodb/src/lib/services/dbData/bulkData.ts similarity index 100% rename from packages/nocodb/src/lib/services/dataService/bulkData.ts rename to packages/nocodb/src/lib/services/dbData/bulkData.ts diff --git a/packages/nocodb/src/lib/services/dataService/dataAliasNestedService.ts b/packages/nocodb/src/lib/services/dbData/dataAliasNestedService.ts similarity index 100% rename from packages/nocodb/src/lib/services/dataService/dataAliasNestedService.ts rename to packages/nocodb/src/lib/services/dbData/dataAliasNestedService.ts diff --git a/packages/nocodb/src/lib/services/dataService/export.ts b/packages/nocodb/src/lib/services/dbData/export.ts similarity index 100% rename from packages/nocodb/src/lib/services/dataService/export.ts rename to packages/nocodb/src/lib/services/dbData/export.ts diff --git a/packages/nocodb/src/lib/services/dataService/helpers.ts b/packages/nocodb/src/lib/services/dbData/helpers.ts similarity index 100% rename from packages/nocodb/src/lib/services/dataService/helpers.ts rename to packages/nocodb/src/lib/services/dbData/helpers.ts diff --git a/packages/nocodb/src/lib/services/dataService/index.ts b/packages/nocodb/src/lib/services/dbData/index.ts similarity index 100% rename from packages/nocodb/src/lib/services/dataService/index.ts rename to packages/nocodb/src/lib/services/dbData/index.ts diff --git a/packages/nocodb/src/lib/services/index.ts b/packages/nocodb/src/lib/services/index.ts index c58049aa62..905f518518 100644 --- a/packages/nocodb/src/lib/services/index.ts +++ b/packages/nocodb/src/lib/services/index.ts @@ -25,14 +25,14 @@ export * as orgLicenseService from './orgLicenseService'; export * as projectUserService from './projectUserService'; export * as attachmentService from './attachmentService'; export * as hookFilterService from './hookFilterService'; -export * as dataService from './dataService'; -export * as bulkDataService from './dataService/bulkData'; -export * as dataAliasNestedService from './dataService/dataAliasNestedService'; +export * as dataService from './dbData'; +export * as bulkDataService from './dbData/bulkData'; +export * as dataAliasNestedService from './dbData/dataAliasNestedService'; export * as cacheService from './cacheService'; export * as auditService from './auditService'; -export * as swaggerService from './swaggerService'; -export * as userService from './userService'; -export * as syncService from './syncService'; +export * as swaggerService from './apiDocs'; +export * as userService from './user'; +export * as syncService from './sync'; export * from './public'; export * as orgTokenService from './orgTokenService'; export * as orgTokenServiceEE from './ee/orgTokenService'; diff --git a/packages/nocodb/src/lib/services/projectUserService.ts b/packages/nocodb/src/lib/services/projectUserService.ts index a3ccd87012..0879553daa 100644 --- a/packages/nocodb/src/lib/services/projectUserService.ts +++ b/packages/nocodb/src/lib/services/projectUserService.ts @@ -291,7 +291,7 @@ export async function sendInviteEmail( req: any ): Promise { try { - const template = (await import('./userService/ui/emailTemplates/invite')) + const template = (await import('./user/ui/emailTemplates/invite')) .default; const emailAdapter = await NcPluginMgrv2.emailAdapter(); diff --git a/packages/nocodb/src/lib/services/public/publicDataService.ts b/packages/nocodb/src/lib/services/public/publicDataService.ts index 238f5e5825..4368d03aa8 100644 --- a/packages/nocodb/src/lib/services/public/publicDataService.ts +++ b/packages/nocodb/src/lib/services/public/publicDataService.ts @@ -17,7 +17,7 @@ import { import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; import { mimeIcons } from '../../utils/mimeTypes'; import { sanitizeUrlPath } from '../attachmentService'; -import { getColumnByIdOrName } from '../dataService/helpers'; +import { getColumnByIdOrName } from '../dbData/helpers'; export async function dataList(param: { sharedViewUuid: string; diff --git a/packages/nocodb/src/lib/services/syncService/helpers/EntityMap.ts b/packages/nocodb/src/lib/services/sync/helpers/EntityMap.ts similarity index 100% rename from packages/nocodb/src/lib/services/syncService/helpers/EntityMap.ts rename to packages/nocodb/src/lib/services/sync/helpers/EntityMap.ts diff --git a/packages/nocodb/src/lib/services/syncService/helpers/NocoSyncDestAdapter.ts b/packages/nocodb/src/lib/services/sync/helpers/NocoSyncDestAdapter.ts similarity index 100% rename from packages/nocodb/src/lib/services/syncService/helpers/NocoSyncDestAdapter.ts rename to packages/nocodb/src/lib/services/sync/helpers/NocoSyncDestAdapter.ts diff --git a/packages/nocodb/src/lib/services/syncService/helpers/NocoSyncSourceAdapter.ts b/packages/nocodb/src/lib/services/sync/helpers/NocoSyncSourceAdapter.ts similarity index 100% rename from packages/nocodb/src/lib/services/syncService/helpers/NocoSyncSourceAdapter.ts rename to packages/nocodb/src/lib/services/sync/helpers/NocoSyncSourceAdapter.ts diff --git a/packages/nocodb/src/lib/services/syncService/helpers/fetchAT.ts b/packages/nocodb/src/lib/services/sync/helpers/fetchAT.ts similarity index 100% rename from packages/nocodb/src/lib/services/syncService/helpers/fetchAT.ts rename to packages/nocodb/src/lib/services/sync/helpers/fetchAT.ts diff --git a/packages/nocodb/src/lib/services/syncService/helpers/job.ts b/packages/nocodb/src/lib/services/sync/helpers/job.ts similarity index 100% rename from packages/nocodb/src/lib/services/syncService/helpers/job.ts rename to packages/nocodb/src/lib/services/sync/helpers/job.ts diff --git a/packages/nocodb/src/lib/services/syncService/helpers/readAndProcessData.ts b/packages/nocodb/src/lib/services/sync/helpers/readAndProcessData.ts similarity index 100% rename from packages/nocodb/src/lib/services/syncService/helpers/readAndProcessData.ts rename to packages/nocodb/src/lib/services/sync/helpers/readAndProcessData.ts diff --git a/packages/nocodb/src/lib/services/syncService/helpers/syncMap.ts b/packages/nocodb/src/lib/services/sync/helpers/syncMap.ts similarity index 100% rename from packages/nocodb/src/lib/services/syncService/helpers/syncMap.ts rename to packages/nocodb/src/lib/services/sync/helpers/syncMap.ts diff --git a/packages/nocodb/src/lib/services/syncService/index.ts b/packages/nocodb/src/lib/services/sync/index.ts similarity index 100% rename from packages/nocodb/src/lib/services/syncService/index.ts rename to packages/nocodb/src/lib/services/sync/index.ts diff --git a/packages/nocodb/src/lib/services/userService/helpers.ts b/packages/nocodb/src/lib/services/user/helpers.ts similarity index 100% rename from packages/nocodb/src/lib/services/userService/helpers.ts rename to packages/nocodb/src/lib/services/user/helpers.ts diff --git a/packages/nocodb/src/lib/services/userService/index.ts b/packages/nocodb/src/lib/services/user/index.ts similarity index 100% rename from packages/nocodb/src/lib/services/userService/index.ts rename to packages/nocodb/src/lib/services/user/index.ts diff --git a/packages/nocodb/src/lib/services/userService/initAdminFromEnv.ts b/packages/nocodb/src/lib/services/user/initAdminFromEnv.ts similarity index 100% rename from packages/nocodb/src/lib/services/userService/initAdminFromEnv.ts rename to packages/nocodb/src/lib/services/user/initAdminFromEnv.ts diff --git a/packages/nocodb/src/lib/services/userService/ui/auth/emailVerify.ts b/packages/nocodb/src/lib/services/user/ui/auth/emailVerify.ts similarity index 100% rename from packages/nocodb/src/lib/services/userService/ui/auth/emailVerify.ts rename to packages/nocodb/src/lib/services/user/ui/auth/emailVerify.ts diff --git a/packages/nocodb/src/lib/services/userService/ui/auth/resetPassword.ts b/packages/nocodb/src/lib/services/user/ui/auth/resetPassword.ts similarity index 100% rename from packages/nocodb/src/lib/services/userService/ui/auth/resetPassword.ts rename to packages/nocodb/src/lib/services/user/ui/auth/resetPassword.ts diff --git a/packages/nocodb/src/lib/services/userService/ui/emailTemplates/forgotPassword.ts b/packages/nocodb/src/lib/services/user/ui/emailTemplates/forgotPassword.ts similarity index 100% rename from packages/nocodb/src/lib/services/userService/ui/emailTemplates/forgotPassword.ts rename to packages/nocodb/src/lib/services/user/ui/emailTemplates/forgotPassword.ts diff --git a/packages/nocodb/src/lib/services/userService/ui/emailTemplates/invite.ts b/packages/nocodb/src/lib/services/user/ui/emailTemplates/invite.ts similarity index 100% rename from packages/nocodb/src/lib/services/userService/ui/emailTemplates/invite.ts rename to packages/nocodb/src/lib/services/user/ui/emailTemplates/invite.ts diff --git a/packages/nocodb/src/lib/services/userService/ui/emailTemplates/verify.ts b/packages/nocodb/src/lib/services/user/ui/emailTemplates/verify.ts similarity index 100% rename from packages/nocodb/src/lib/services/userService/ui/emailTemplates/verify.ts rename to packages/nocodb/src/lib/services/user/ui/emailTemplates/verify.ts