refactor : code

packages/nocodb/src/lib/controllers/dbData/index.ts

@@ -1,9 +1,9 @@
-import dataController from './dataController';
-import oldDataController from './oldDataController';
-import dataAliasController from './dataAliasController';
-import bulkDataAliasController from './bulkDataAliasController';
-import dataAliasNestedController from './dataAliasNestedController';
-import dataAliasExportController from './dataAliasExportController';
+import dataController from './data.ctl';
+import oldDataController from './oldData.ctl';
+import dataAliasController from './dataAlias.ctl';
+import bulkDataAliasController from './bulkDataAlias.ctl';
+import dataAliasNestedController from './dataAliasNested.ctl';
+import dataAliasExportController from './dataAliasExport.ctl';
 
 export {
   dataController,

packages/nocodb/src/lib/controllers/publicControllers/index.ts

@@ -1,6 +1,6 @@
-import publicDataController from './publicDataController';
-import publicDataExportController from './publicDataExportController';
-import publicMetaController from './publicMetaController';
+import publicDataController from './publicData.ctl';
+import publicDataExportController from './publicDataExport.ctl';
+import publicMetaController from './publicMeta.ctl';
 
 export {
   publicDataController,

packages/nocodb/src/lib/meta/api/helpers/populateMeta.ts

@@ -11,7 +11,7 @@ import getTableNameAlias, {
 import LinkToAnotherRecordColumn from '../../../models/LinkToAnotherRecordColumn';
 import getColumnUiType from '../../helpers/getColumnUiType';
 import mapDefaultDisplayValue from '../../helpers/mapDefaultDisplayValue';
-import { extractAndGenerateManyToManyRelations } from '../../../services/metaDiffService';
+import { extractAndGenerateManyToManyRelations } from '../../../services/metaDiff.svs';
 import { ModelTypes, UITypes, ViewTypes } from 'nocodb-sdk';
 import { IGNORE_TABLES } from '../../../utils/common/BaseApiBuilder';
 

packages/nocodb/src/lib/meta/api/index.ts

@@ -1,39 +1,39 @@
 import { T } from 'nc-help';
-import orgLicenseController from '../../controllers/orgLicenseController';
-import orgTokenController from '../../controllers/orgTokenController';
-import orgUserController from '../../controllers/orgUserController';
-import projectController from '../../controllers/projectController';
-import baseController from '../../controllers/baseController';
-import tableController from '../../controllers/tableController';
-import columnController from '../../controllers/columnController';
+import orgLicenseController from '../../controllers/orgLicense.ctl';
+import orgTokenController from '../../controllers/orgToken.ctl';
+import orgUserController from '../../controllers/orgUser.ctl';
+import projectController from '../../controllers/project.ctl';
+import baseController from '../../controllers/base.ctl';
+import tableController from '../../controllers/table.ctl';
+import columnController from '../../controllers/column.ctl';
 import { Router } from 'express';
-import sortController from '../../controllers/sortController';
-import filterController from '../../controllers/filterController';
-import viewColumnController from '../../controllers/viewColumnController';
-import gridViewController from '../../controllers/gridViewController';
-import viewController from '../../controllers/viewController';
-import galleryViewController from '../../controllers/galleryViewController';
-import formViewController from '../../controllers/formViewController';
-import formViewColumnController from '../../controllers/formViewColumnController';
-import attachmentController from '../../controllers/attachmentController';
-import exportController from '../../controllers/exportController';
-import auditController from '../../controllers/auditController';
-import hookController from '../../controllers/hookController';
-import pluginController from '../../controllers/pluginController';
-import gridViewColumnController from '../../controllers/gridViewColumnController';
-import kanbanViewController from '../../controllers/kanbanViewController';
+import sortController from '../../controllers/sort.ctl';
+import filterController from '../../controllers/filter.ctl';
+import viewColumnController from '../../controllers/viewColumn.ctl';
+import gridViewController from '../../controllers/gridView.ctl';
+import viewController from '../../controllers/view.ctl';
+import galleryViewController from '../../controllers/galleryView.ctl';
+import formViewController from '../../controllers/formView.ctl';
+import formViewColumnController from '../../controllers/formViewColumn.ctl';
+import attachmentController from '../../controllers/attachment.ctl';
+import exportController from '../../controllers/export.ctl';
+import auditController from '../../controllers/audit.ctl';
+import hookController from '../../controllers/hook.ctl';
+import pluginController from '../../controllers/plugin.ctl';
+import gridViewColumnController from '../../controllers/gridViewColumn.ctl';
+import kanbanViewController from '../../controllers/kanbanView.ctl';
 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 utilController from '../../controllers/util.ctl';
+import projectUserController from '../../controllers/projectUser.ctl';
+import sharedBaseController from '../../controllers/sharedBase.ctl';
 import { initStrategies } from '../../controllers/user/initStrategies';
-import modelVisibilityController from '../../controllers/modelVisibilityController';
-import metaDiffController from '../../controllers/metaDiffController';
-import cacheController from '../../controllers/cacheController';
-import apiTokenController from '../../controllers/apiTokenController';
-import hookFilterController from '../../controllers/hookFilterController';
-import testController from '../../controllers/testController';
+import modelVisibilityController from '../../controllers/modelVisibility.ctl';
+import metaDiffController from '../../controllers/metaDiff.ctl';
+import cacheController from '../../controllers/cache.ctl';
+import apiTokenController from '../../controllers/apiToken.ctl';
+import hookFilterController from '../../controllers/hookFilter.ctl';
+import testController from '../../controllers/test.ctl';
 import {
   bulkDataAliasController,
   dataAliasController,
@@ -54,7 +54,7 @@ import crypto from 'crypto';
 import swaggerController from '../../controllers/apiDocs';
 import importController from '../../controllers/sync/importApis';
 import syncSourceController from '../../controllers/sync';
-import mapViewController from '../../controllers/mapViewController';
+import mapViewController from '../../controllers/mapView.ctl';
 
 const clients: { [id: string]: Socket } = {};
 const jobs: { [id: string]: { last_message: any } } = {};

packages/nocodb/src/lib/services/index.ts

@@ -1,38 +1,38 @@
-export * as projectService from './projectService';
-export * as tableService from './tableService';
-export * as columnService from './columnService';
-export * as filterService from './filterService';
-export * as sortService from './sortService';
-export * as baseService from './baseService';
-export * as apiTokenService from './apiTokenService';
-export * as viewService from './viewService';
-export * as hookService from './hookService';
-export * as pluginService from './pluginService';
-export * as utilService from './utilService';
-export * as formViewService from './formViewService';
-export * as formViewColumnService from './formViewColumnService';
-export * as gridViewService from './gridViewService';
-export * as galleryViewService from './galleryViewService';
-export * as kanbanViewService from './kanbanViewService';
-export * as gridViewColumnService from './gridViewColumnService';
-export * as viewColumnService from './viewColumnService';
-export * as metaDiffService from './metaDiffService';
-export * as mapViewService from './mapViewService';
-export * as modelVisibilityService from './modelVisibilityService';
-export * as sharedBaseService from './sharedBaseService';
-export * as orgUserService from './orgUserService';
-export * as orgLicenseService from './orgLicenseService';
-export * as projectUserService from './projectUserService';
-export * as attachmentService from './attachmentService';
-export * as hookFilterService from './hookFilterService';
+export * as projectService from './project.svs';
+export * as tableService from './table.svs';
+export * as columnService from './column.svs';
+export * as filterService from './filter.svs';
+export * as sortService from './sort.svs';
+export * as baseService from './base.svs';
+export * as apiTokenService from './apiToken.svs';
+export * as viewService from './view.svs';
+export * as hookService from './hook.svs';
+export * as pluginService from './plugin.svs';
+export * as utilService from './util.svs';
+export * as formViewService from './formView.svs';
+export * as formViewColumnService from './formViewColumn.svs';
+export * as gridViewService from './gridView.svs';
+export * as galleryViewService from './galleryView.svs';
+export * as kanbanViewService from './kanbanView.svs';
+export * as gridViewColumnService from './gridViewColumn.svs';
+export * as viewColumnService from './viewColumn.svs';
+export * as metaDiffService from './metaDiff.svs';
+export * as mapViewService from './mapView.svs';
+export * as modelVisibilityService from './modelVisibility.svs';
+export * as sharedBaseService from './sharedBase.svs';
+export * as orgUserService from './orgUser.svs';
+export * as orgLicenseService from './orgLicense.svs';
+export * as projectUserService from './projectUser.svs';
+export * as attachmentService from './attachment.svs';
+export * as hookFilterService from './hookFilter.svs';
 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 dataAliasNestedService from './dbData/dataAliasNested.svs';
+export * as cacheService from './cache.svs';
+export * as auditService from './audit.svs';
 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';
+export * as orgTokenService from './orgToken.svs';
+export * as orgTokenServiceEE from './ee/orgToken.svs';

packages/nocodb/src/lib/services/orgUser.svs.ts

@@ -17,7 +17,7 @@ import { NcError } from '../meta/helpers/catchError';
 import { extractProps } from '../meta/helpers/extractProps';
 import { PagedResponseImpl } from '../meta/helpers/PagedResponse';
 import { randomTokenString } from '../meta/helpers/stringHelpers';
-import { sendInviteEmail } from './projectUserService';
+import { sendInviteEmail } from './projectUser.svs';
 
 export async function userList(param: {
   // todo: add better typing

packages/nocodb/src/lib/services/public/index.ts

@@ -1,5 +1,5 @@
-import * as publicDataService from './publicDataService';
-import * as publicDataExportApis from './publicDataExportService';
-import * as publicMetaService from './publicMetaservice';
+import * as publicDataService from './publicData.svs';
+import * as publicDataExportApis from './publicDataExport.svs';
+import * as publicMetaService from './publicMeta.svs';
 
 export { publicDataService, publicDataExportApis, publicMetaService };

packages/nocodb/src/lib/services/public/publicData.svs.ts

@@ -16,7 +16,7 @@ import {
 } from '../../models';
 import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2';
 import { mimeIcons } from '../../utils/mimeTypes';
-import { sanitizeUrlPath } from '../attachmentService';
+import { sanitizeUrlPath } from '../attachment.svs';
 import { getColumnByIdOrName } from '../dbData/helpers';
 
 export async function dataList(param: {

packages/nocodb/src/lib/services/view.svs.ts

@@ -2,7 +2,7 @@ import { SharedViewReqType, ViewReqType } from 'nocodb-sdk';
 import { validatePayload } from '../meta/api/helpers';
 import { Model, View } from '../models';
 import { T } from 'nc-help';
-import { xcVisibilityMetaGet } from './modelVisibilityService';
+import { xcVisibilityMetaGet } from './modelVisibility.svs';
 
 export async function viewList(param: {
   tableId: string;