From 349648c6dadf9b32be166bec742e89e8238d5cc2 Mon Sep 17 00:00:00 2001 From: Naveen MR Date: Sun, 5 Mar 2023 00:39:59 +0000 Subject: [PATCH] refactor : code --- .../nocodb/src/lib/controllers/viewColumn.ctl.ts | 2 +- .../lib/controllers/{ => views}/formView.ctl.ts | 6 +++--- .../controllers/{ => views}/formViewColumn.ctl.ts | 6 +++--- .../lib/controllers/{ => views}/galleryView.ctl.ts | 6 +++--- .../lib/controllers/{ => views}/gridView.ctl.ts | 6 +++--- .../controllers/{ => views}/gridViewColumn.ctl.ts | 6 +++--- .../lib/controllers/{ => views}/kanbanView.ctl.ts | 8 ++++---- .../src/lib/controllers/{ => views}/mapView.ctl.ts | 6 +++--- packages/nocodb/src/lib/meta/api/index.ts | 14 +++++++------- 9 files changed, 30 insertions(+), 30 deletions(-) rename packages/nocodb/src/lib/controllers/{ => views}/formView.ctl.ts (86%) rename packages/nocodb/src/lib/controllers/{ => views}/formViewColumn.ctl.ts (72%) rename packages/nocodb/src/lib/controllers/{ => views}/galleryView.ctl.ts (87%) rename packages/nocodb/src/lib/controllers/{ => views}/gridView.ctl.ts (80%) rename packages/nocodb/src/lib/controllers/{ => views}/gridViewColumn.ctl.ts (81%) rename packages/nocodb/src/lib/controllers/{ => views}/kanbanView.ctl.ts (85%) rename packages/nocodb/src/lib/controllers/{ => views}/mapView.ctl.ts (86%) diff --git a/packages/nocodb/src/lib/controllers/viewColumn.ctl.ts b/packages/nocodb/src/lib/controllers/viewColumn.ctl.ts index aece1ca06e..7a89963b37 100644 --- a/packages/nocodb/src/lib/controllers/viewColumn.ctl.ts +++ b/packages/nocodb/src/lib/controllers/viewColumn.ctl.ts @@ -44,4 +44,4 @@ router.patch( metaApiMetrics, ncMetaAclMw(columnUpdate, 'viewColumnUpdate') ); -export default router; +export default router; \ No newline at end of file diff --git a/packages/nocodb/src/lib/controllers/formView.ctl.ts b/packages/nocodb/src/lib/controllers/views/formView.ctl.ts similarity index 86% rename from packages/nocodb/src/lib/controllers/formView.ctl.ts rename to packages/nocodb/src/lib/controllers/views/formView.ctl.ts index 2bc61fd58d..50729d4dab 100644 --- a/packages/nocodb/src/lib/controllers/formView.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/formView.ctl.ts @@ -1,8 +1,8 @@ import { Request, Response, Router } from 'express'; import { FormType } from 'nocodb-sdk'; -import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; -import { metaApiMetrics } from '../meta/helpers/apiMetrics'; -import { formViewService } from '../services'; +import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; +import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; +import { formViewService } from '../../services'; export async function formViewGet(req: Request, res: Response) { const formViewData = await formViewService.formViewGet({ diff --git a/packages/nocodb/src/lib/controllers/formViewColumn.ctl.ts b/packages/nocodb/src/lib/controllers/views/formViewColumn.ctl.ts similarity index 72% rename from packages/nocodb/src/lib/controllers/formViewColumn.ctl.ts rename to packages/nocodb/src/lib/controllers/views/formViewColumn.ctl.ts index 8b13309411..25b4c1969d 100644 --- a/packages/nocodb/src/lib/controllers/formViewColumn.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/formViewColumn.ctl.ts @@ -1,7 +1,7 @@ import { Request, Response, Router } from 'express'; -import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; -import { metaApiMetrics } from '../meta/helpers/apiMetrics'; -import { formViewColumnService } from '../services'; +import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; +import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; +import { formViewColumnService } from '../../services'; export async function columnUpdate(req: Request, res: Response) { res.json( diff --git a/packages/nocodb/src/lib/controllers/galleryView.ctl.ts b/packages/nocodb/src/lib/controllers/views/galleryView.ctl.ts similarity index 87% rename from packages/nocodb/src/lib/controllers/galleryView.ctl.ts rename to packages/nocodb/src/lib/controllers/views/galleryView.ctl.ts index f54dc901cd..69a4688f02 100644 --- a/packages/nocodb/src/lib/controllers/galleryView.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/galleryView.ctl.ts @@ -1,8 +1,8 @@ import { Request, Response, Router } from 'express'; import { GalleryType } from 'nocodb-sdk'; -import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; -import { metaApiMetrics } from '../meta/helpers/apiMetrics'; -import { galleryViewService } from '../services'; +import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; +import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; +import { galleryViewService } from '../../services'; export async function galleryViewGet(req: Request, res: Response) { res.json( diff --git a/packages/nocodb/src/lib/controllers/gridView.ctl.ts b/packages/nocodb/src/lib/controllers/views/gridView.ctl.ts similarity index 80% rename from packages/nocodb/src/lib/controllers/gridView.ctl.ts rename to packages/nocodb/src/lib/controllers/views/gridView.ctl.ts index 865ccecdb6..ca4ca98da2 100644 --- a/packages/nocodb/src/lib/controllers/gridView.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/gridView.ctl.ts @@ -1,7 +1,7 @@ import { Request, Router } from 'express'; -import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; -import { metaApiMetrics } from '../meta/helpers/apiMetrics'; -import { gridViewService } from '../services'; +import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; +import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; +import { gridViewService } from '../../services'; export async function gridViewCreate(req: Request, res) { const view = await gridViewService.gridViewCreate({ diff --git a/packages/nocodb/src/lib/controllers/gridViewColumn.ctl.ts b/packages/nocodb/src/lib/controllers/views/gridViewColumn.ctl.ts similarity index 81% rename from packages/nocodb/src/lib/controllers/gridViewColumn.ctl.ts rename to packages/nocodb/src/lib/controllers/views/gridViewColumn.ctl.ts index 1ce0a41be7..e03e7acbcb 100644 --- a/packages/nocodb/src/lib/controllers/gridViewColumn.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/gridViewColumn.ctl.ts @@ -1,7 +1,7 @@ import { Request, Response, Router } from 'express'; -import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; -import { metaApiMetrics } from '../meta/helpers/apiMetrics'; -import { gridViewColumnService } from '../services'; +import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; +import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; +import { gridViewColumnService } from '../../services'; export async function columnList(req: Request, res: Response) { res.json( diff --git a/packages/nocodb/src/lib/controllers/kanbanView.ctl.ts b/packages/nocodb/src/lib/controllers/views/kanbanView.ctl.ts similarity index 85% rename from packages/nocodb/src/lib/controllers/kanbanView.ctl.ts rename to packages/nocodb/src/lib/controllers/views/kanbanView.ctl.ts index bf36b43b90..f26da8a99d 100644 --- a/packages/nocodb/src/lib/controllers/kanbanView.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/kanbanView.ctl.ts @@ -1,10 +1,10 @@ import { Request, Response, Router } from 'express'; import { KanbanType, ViewTypes } from 'nocodb-sdk'; -import View from '../models/View'; -import KanbanView from '../models/KanbanView'; +import View from '../../models/View'; +import KanbanView from '../../models/KanbanView'; import { T } from 'nc-help'; -import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; -import { metaApiMetrics } from '../meta/helpers/apiMetrics'; +import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; +import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; // todo: map to service diff --git a/packages/nocodb/src/lib/controllers/mapView.ctl.ts b/packages/nocodb/src/lib/controllers/views/mapView.ctl.ts similarity index 86% rename from packages/nocodb/src/lib/controllers/mapView.ctl.ts rename to packages/nocodb/src/lib/controllers/views/mapView.ctl.ts index 3a982d1b03..58ea925ad7 100644 --- a/packages/nocodb/src/lib/controllers/mapView.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/mapView.ctl.ts @@ -1,8 +1,8 @@ import { Request, Response, Router } from 'express'; import { MapType } from 'nocodb-sdk'; -import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; -import { metaApiMetrics } from '../meta/helpers/apiMetrics'; -import { mapViewService } from '../services'; +import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; +import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; +import { mapViewService } from '../../services'; export async function mapViewGet(req: Request, res: Response) { res.json( diff --git a/packages/nocodb/src/lib/meta/api/index.ts b/packages/nocodb/src/lib/meta/api/index.ts index e1bba73d81..7fa6ad8c87 100644 --- a/packages/nocodb/src/lib/meta/api/index.ts +++ b/packages/nocodb/src/lib/meta/api/index.ts @@ -10,18 +10,18 @@ import { Router } from 'express'; 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 gridViewController from '../../controllers/views/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 galleryViewController from '../../controllers/views/galleryView.ctl'; +import formViewController from '../../controllers/views/formView.ctl'; +import formViewColumnController from '../../controllers/views/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 gridViewColumnController from '../../controllers/views/gridViewColumn.ctl'; +import kanbanViewController from '../../controllers/views/kanbanView.ctl'; import { userController } from '../../controllers/user'; // import extractProjectIdAndAuthenticate from './helpers/extractProjectIdAndAuthenticate'; import utilController from '../../controllers/util.ctl'; @@ -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/mapView.ctl'; +import mapViewController from '../../controllers/views/mapView.ctl'; const clients: { [id: string]: Socket } = {}; const jobs: { [id: string]: { last_message: any } } = {};