From 1cbb785c89a735915761ee63807c63aa0842ed49 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Wed, 8 Mar 2023 13:40:02 +0800 Subject: [PATCH 1/3] feat(nocodb): bump eslint-plugin-import --- packages/nocodb/package-lock.json | 2 +- packages/nocodb/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json index 8783f36d99..20e22da694 100644 --- a/packages/nocodb/package-lock.json +++ b/packages/nocodb/package-lock.json @@ -121,7 +121,7 @@ "eslint-config-prettier": "^6.15.0", "eslint-plugin-eslint-comments": "^3.2.0", "eslint-plugin-functional": "^3.0.2", - "eslint-plugin-import": "^2.22.0", + "eslint-plugin-import": "^2.25.2", "eslint-plugin-prettier": "^4.0.0", "mocha": "^10.1.0", "nodemon": "^2.0.7", diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index d7c5aad318..d171658307 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -162,7 +162,7 @@ "eslint-config-prettier": "^6.15.0", "eslint-plugin-eslint-comments": "^3.2.0", "eslint-plugin-functional": "^3.0.2", - "eslint-plugin-import": "^2.22.0", + "eslint-plugin-import": "^2.25.2", "eslint-plugin-prettier": "^4.0.0", "mocha": "^10.1.0", "nodemon": "^2.0.7", From 771b057bfa7be40910800a3bc2e895b98fbd0e21 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Wed, 8 Mar 2023 13:40:41 +0800 Subject: [PATCH 2/3] feat(nocodb): enable import/order and introduce order group --- packages/nocodb/.eslintrc.json | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/packages/nocodb/.eslintrc.json b/packages/nocodb/.eslintrc.json index 144c3a0f87..6570091b22 100644 --- a/packages/nocodb/.eslintrc.json +++ b/packages/nocodb/.eslintrc.json @@ -7,18 +7,8 @@ "env": { "es6": true }, - "ignorePatterns": [ - "node_modules", - "build", - "coverage", - "dist", - "nc" - ], - "plugins": [ - "import", - "eslint-comments", - "functional" - ], + "ignorePatterns": ["node_modules", "build", "coverage", "dist", "nc"], + "plugins": ["import", "eslint-comments", "functional"], "extends": [ "eslint:recommended", "plugin:eslint-comments/recommended", @@ -47,6 +37,21 @@ "ignoreCase": true } ], + "import/order": [ + "error", + { + "groups": [ + "builtin", + "external", + "internal", + "parent", + "sibling", + "index", + "object", + "type" + ] + } + ], "@typescript-eslint/no-this-alias": "off", // todo: enable @@ -57,7 +62,6 @@ "no-useless-catch": "off", "no-empty": "off", "@typescript-eslint/no-empty-function": "off", - "import/order": "off", "@typescript-eslint/consistent-type-imports": "warn" } } From 6decfa2b20c28db9946bddce0bcb1442b683ecae Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Wed, 8 Mar 2023 13:42:14 +0800 Subject: [PATCH 3/3] fix(nocodb): import order --- packages/nocodb/src/lib/Noco.ts | 22 ++++---- packages/nocodb/src/lib/cache/NocoCache.ts | 4 +- .../nocodb/src/lib/cache/RedisCacheMgr.ts | 2 +- .../nocodb/src/lib/cache/RedisMockCacheMgr.ts | 2 +- .../src/lib/controllers/apiDocs/index.ts | 2 +- .../src/lib/controllers/apiToken.ctl.ts | 2 +- .../src/lib/controllers/attachment.ctl.ts | 4 +- .../nocodb/src/lib/controllers/audit.ctl.ts | 2 +- .../nocodb/src/lib/controllers/base.ctl.ts | 6 +-- .../nocodb/src/lib/controllers/cache.ctl.ts | 2 +- .../nocodb/src/lib/controllers/column.ctl.ts | 4 +- .../controllers/dbData/bulkDataAlias.ctl.ts | 2 +- .../src/lib/controllers/dbData/data.ctl.ts | 2 +- .../lib/controllers/dbData/dataAlias.ctl.ts | 2 +- .../controllers/dbData/dataAliasExport.ctl.ts | 2 +- .../controllers/dbData/dataAliasNested.ctl.ts | 2 +- .../src/lib/controllers/dbData/helpers.ts | 10 ++-- .../src/lib/controllers/dbData/oldData.ctl.ts | 4 +- .../nocodb/src/lib/controllers/export.ctl.ts | 2 +- .../nocodb/src/lib/controllers/filter.ctl.ts | 4 +- .../nocodb/src/lib/controllers/hook.ctl.ts | 6 +-- .../src/lib/controllers/hookFilter.ctl.ts | 2 +- .../src/lib/controllers/metaDiff.ctl.ts | 2 +- .../src/lib/controllers/orgToken.ctl.ts | 2 +- .../nocodb/src/lib/controllers/plugin.ctl.ts | 4 +- .../nocodb/src/lib/controllers/project.ctl.ts | 12 ++--- .../src/lib/controllers/projectUser.ctl.ts | 2 +- .../publicControllers/publicData.ctl.ts | 2 +- .../publicControllers/publicDataExport.ctl.ts | 4 +- .../publicControllers/publicMeta.ctl.ts | 2 +- .../nocodb/src/lib/controllers/sort.ctl.ts | 4 +- .../src/lib/controllers/sync/import.ctl.ts | 4 +- .../src/lib/controllers/sync/sync.ctl.ts | 2 +- .../nocodb/src/lib/controllers/table.ctl.ts | 4 +- .../nocodb/src/lib/controllers/test.ctl.ts | 2 +- .../lib/controllers/user/initStrategies.ts | 4 +- .../src/lib/controllers/user/user.ctl.ts | 4 +- .../nocodb/src/lib/controllers/util.ctl.ts | 2 +- .../nocodb/src/lib/controllers/view.ctl.ts | 4 +- .../src/lib/controllers/viewColumn.ctl.ts | 2 +- .../src/lib/controllers/views/formView.ctl.ts | 4 +- .../controllers/views/formViewColumn.ctl.ts | 2 +- .../lib/controllers/views/galleryView.ctl.ts | 4 +- .../src/lib/controllers/views/gridView.ctl.ts | 2 +- .../controllers/views/gridViewColumn.ctl.ts | 2 +- .../lib/controllers/views/kanbanView.ctl.ts | 6 +-- .../src/lib/controllers/views/mapView.ctl.ts | 4 +- .../src/lib/db/sql-client/lib/KnexClient.ts | 14 ++--- .../lib/db/sql-client/lib/SqlClientFactory.ts | 5 +- .../sql-client/lib/ee/SqlClientFactoryEE.ts | 2 +- .../db/sql-client/lib/mssql/MssqlClient.ts | 5 +- .../db/sql-client/lib/mysql/MysqlClient.ts | 15 +++--- .../db/sql-client/lib/oracle/OracleClient.ts | 4 +- .../src/lib/db/sql-client/lib/pg/PgClient.ts | 6 +-- .../db/sql-client/lib/pg/YugabyteClient.ts | 2 +- .../lib/snowflake/SnowflakeClient.ts | 2 +- .../db/sql-client/lib/sqlite/SqliteClient.ts | 10 ++-- .../sql-data-mapper/lib/sql/BaseModelSql.ts | 4 +- .../sql-data-mapper/lib/sql/BaseModelSqlv2.ts | 54 +++++++++---------- .../db/sql-data-mapper/lib/sql/CustomKnex.ts | 6 +-- .../db/sql-data-mapper/lib/sql/conditionV2.ts | 12 ++--- .../sql/formulav2/formulaQueryBuilderv2.ts | 12 ++--- .../lib/sql/functionMappings/mssql.ts | 4 +- .../lib/sql/functionMappings/mysql.ts | 4 +- .../lib/sql/functionMappings/pg.ts | 4 +- .../lib/sql/functionMappings/sqlite.ts | 4 +- .../lib/sql/genRollupSelect.ts | 2 +- .../lib/sql/genRollupSelectv2.ts | 2 +- .../sql-data-mapper/lib/sql/helpers/getAst.ts | 2 +- .../lib/sql/mapFunctionName.ts | 2 +- .../lib/db/sql-data-mapper/lib/sql/sortV2.ts | 10 ++-- packages/nocodb/src/lib/db/sql-mgr/SqlMgr.ts | 2 +- .../sql-mgr/code/models/xc/BaseModelXcMeta.ts | 2 +- .../code/models/xc/ModelXcMetaFactory.ts | 2 +- .../code/policies/xc/ExpressXcPolicy.ts | 2 +- .../nocodb/src/lib/db/sql-mgr/v2/SqlMgrv2.ts | 2 +- .../src/lib/db/sql-mgr/v2/SqlMgrv2Trans.ts | 4 +- .../lib/db/sql-migrator/lib/KnexMigrator.ts | 2 +- .../lib/db/sql-migrator/lib/KnexMigratorv2.ts | 6 +-- .../db/sql-migrator/lib/KnexMigratorv2Tans.ts | 4 +- .../nocodb/src/lib/jobs/EmitteryJobsMgr.ts | 2 +- packages/nocodb/src/lib/jobs/NocoJobs.ts | 2 +- packages/nocodb/src/lib/meta/NcMetaIOImpl.ts | 8 +-- packages/nocodb/src/lib/meta/NcMetaMgr.ts | 34 ++++++------ packages/nocodb/src/lib/meta/NcMetaMgrv2.ts | 10 ++-- .../src/lib/meta/api/helpers/apiHelpers.ts | 4 +- .../src/lib/meta/api/helpers/columnHelpers.ts | 8 +-- .../src/lib/meta/api/helpers/populateMeta.ts | 8 +-- packages/nocodb/src/lib/meta/api/index.ts | 10 ++-- .../src/lib/meta/handlersv2/ncCreateLookup.ts | 4 +- .../src/lib/meta/handlersv2/ncGetMeta.ts | 2 +- .../src/lib/meta/helpers/NcPluginMgrv2.ts | 21 ++++---- .../helpers/addFormulaErrorIfMissingColumn.ts | 2 +- .../nocodb/src/lib/meta/helpers/apiMetrics.ts | 2 +- .../meta/helpers/getColumnPropsFromUIDT.ts | 2 +- .../src/lib/meta/helpers/getColumnUiType.ts | 2 +- .../nocodb/src/lib/meta/helpers/getHandler.ts | 2 +- .../src/lib/meta/helpers/ncMetaAclMw.ts | 2 +- .../lib/meta/helpers/populateSamplePayload.ts | 2 +- .../src/lib/meta/helpers/webhookHelpers.ts | 6 +-- .../v1/nc_011_remove_old_ses_plugin.ts | 2 +- .../v2/nc_012_alter_column_data_types.ts | 2 +- .../lib/migrations/v2/nc_013_sync_source.ts | 2 +- .../v2/nc_014_alter_column_data_types.ts | 2 +- .../v2/nc_015_add_meta_col_in_column_table.ts | 2 +- .../v2/nc_016_alter_hooklog_payload_types.ts | 2 +- .../migrations/v2/nc_018_add_meta_in_view.ts | 2 +- .../v2/nc_019_add_meta_in_meta_tables.ts | 2 +- .../lib/migrations/v2/nc_020_kanban_view.ts | 2 +- .../v2/nc_021_add_fields_in_token.ts | 2 +- .../migrations/v2/nc_023_multiple_source.ts | 2 +- .../migrations/v2/nc_025_add_row_height.ts | 2 +- .../src/lib/migrations/v2/nc_026_map_view.ts | 2 +- .../v2/nc_027_add_comparison_sub_op.ts | 2 +- packages/nocodb/src/lib/models/ApiToken.ts | 2 +- packages/nocodb/src/lib/models/Audit.ts | 4 +- packages/nocodb/src/lib/models/Base.ts | 14 ++--- packages/nocodb/src/lib/models/Column.ts | 24 ++++----- packages/nocodb/src/lib/models/Filter.ts | 12 ++--- packages/nocodb/src/lib/models/FormView.ts | 6 +-- .../nocodb/src/lib/models/FormViewColumn.ts | 8 +-- packages/nocodb/src/lib/models/GalleryView.ts | 6 +-- .../src/lib/models/GalleryViewColumn.ts | 2 +- packages/nocodb/src/lib/models/GridView.ts | 4 +- .../nocodb/src/lib/models/GridViewColumn.ts | 4 +- packages/nocodb/src/lib/models/Hook.ts | 6 +-- packages/nocodb/src/lib/models/HookFilter.ts | 10 ++-- packages/nocodb/src/lib/models/KanbanView.ts | 6 +-- .../nocodb/src/lib/models/KanbanViewColumn.ts | 2 +- .../lib/models/LinkToAnotherRecordColumn.ts | 6 +-- .../nocodb/src/lib/models/LookupColumn.ts | 2 +- packages/nocodb/src/lib/models/MapView.ts | 4 +- .../nocodb/src/lib/models/MapViewColumn.ts | 2 +- packages/nocodb/src/lib/models/Model.ts | 12 ++--- .../src/lib/models/ModelRoleVisibility.ts | 4 +- packages/nocodb/src/lib/models/Plugin.ts | 2 +- packages/nocodb/src/lib/models/Project.ts | 6 +-- packages/nocodb/src/lib/models/ProjectUser.ts | 4 +- .../nocodb/src/lib/models/RollupColumn.ts | 2 +- packages/nocodb/src/lib/models/Sort.ts | 6 +-- packages/nocodb/src/lib/models/User.ts | 2 +- packages/nocodb/src/lib/models/View.ts | 8 +-- .../src/lib/plugins/backblaze/Backblaze.ts | 2 +- .../lib/plugins/backblaze/BackblazePlugin.ts | 2 +- .../nocodb/src/lib/plugins/backblaze/index.ts | 3 +- .../src/lib/plugins/discord/DiscordPlugin.ts | 2 +- .../nocodb/src/lib/plugins/discord/index.ts | 3 +- packages/nocodb/src/lib/plugins/gcs/Gcs.ts | 4 +- .../nocodb/src/lib/plugins/gcs/GcsPlugin.ts | 2 +- packages/nocodb/src/lib/plugins/gcs/index.ts | 3 +- .../lib/plugins/linode/LinodeObjectStorage.ts | 2 +- .../linode/LinodeObjectStoragePlugin.ts | 2 +- .../nocodb/src/lib/plugins/linode/index.ts | 3 +- .../src/lib/plugins/mailerSend/MailerSend.ts | 2 +- .../plugins/mailerSend/MailerSendPlugin.ts | 2 +- .../src/lib/plugins/mailerSend/index.ts | 3 +- .../plugins/mattermost/MattermostPlugin.ts | 2 +- .../src/lib/plugins/mattermost/index.ts | 3 +- packages/nocodb/src/lib/plugins/mino/Minio.ts | 2 +- .../src/lib/plugins/mino/MinioPlugin.ts | 2 +- packages/nocodb/src/lib/plugins/mino/index.ts | 3 +- .../src/lib/plugins/ovhCloud/OvhCloud.ts | 2 +- .../lib/plugins/ovhCloud/OvhCloudPlugin.ts | 2 +- .../nocodb/src/lib/plugins/ovhCloud/index.ts | 3 +- packages/nocodb/src/lib/plugins/s3/S3.ts | 2 +- .../nocodb/src/lib/plugins/s3/S3Plugin.ts | 2 +- packages/nocodb/src/lib/plugins/s3/index.ts | 3 +- .../plugins/scaleway/ScalewayObjectStorage.ts | 2 +- .../scaleway/ScalewayObjectStoragePlugin.ts | 2 +- .../nocodb/src/lib/plugins/scaleway/index.ts | 2 +- packages/nocodb/src/lib/plugins/ses/SES.ts | 4 +- .../nocodb/src/lib/plugins/ses/SESPlugin.ts | 2 +- packages/nocodb/src/lib/plugins/ses/index.ts | 3 +- .../src/lib/plugins/slack/SlackPlugin.ts | 2 +- .../nocodb/src/lib/plugins/slack/index.ts | 3 +- packages/nocodb/src/lib/plugins/smtp/SMTP.ts | 2 +- .../nocodb/src/lib/plugins/smtp/SMTPPlugin.ts | 2 +- packages/nocodb/src/lib/plugins/smtp/index.ts | 3 +- .../nocodb/src/lib/plugins/spaces/Spaces.ts | 2 +- .../src/lib/plugins/spaces/SpacesPlugin.ts | 2 +- .../nocodb/src/lib/plugins/spaces/index.ts | 3 +- .../src/lib/plugins/teams/TeamsPlugin.ts | 2 +- .../nocodb/src/lib/plugins/teams/index.ts | 3 +- .../nocodb/src/lib/plugins/twilio/Twilio.ts | 2 +- .../src/lib/plugins/twilio/TwilioPlugin.ts | 2 +- .../nocodb/src/lib/plugins/twilio/index.ts | 3 +- .../plugins/twilioWhatsapp/TwilioWhatsapp.ts | 2 +- .../twilioWhatsapp/TwilioWhatsappPlugin.ts | 2 +- .../src/lib/plugins/twilioWhatsapp/index.ts | 3 +- .../src/lib/plugins/upcloud/UpCloudPlugin.ts | 2 +- .../src/lib/plugins/upcloud/UpoCloud.ts | 2 +- .../nocodb/src/lib/plugins/upcloud/index.ts | 3 +- .../nocodb/src/lib/plugins/vultr/Vultr.ts | 2 +- .../src/lib/plugins/vultr/VultrPlugin.ts | 2 +- .../nocodb/src/lib/plugins/vultr/index.ts | 3 +- .../src/lib/services/apiDocs/getPaths.ts | 2 +- .../src/lib/services/apiDocs/getSchemas.ts | 2 +- .../services/apiDocs/getSwaggerColumnMetas.ts | 4 +- .../lib/services/apiDocs/getSwaggerJSON.ts | 8 +-- .../lib/services/apiDocs/templates/params.ts | 2 +- .../nocodb/src/lib/services/apiToken.svc.ts | 2 +- .../nocodb/src/lib/services/attachment.svc.ts | 4 +- packages/nocodb/src/lib/services/audit.svc.ts | 7 ++- packages/nocodb/src/lib/services/base.svc.ts | 4 +- .../nocodb/src/lib/services/column.svc.ts | 22 ++++---- .../src/lib/services/dbData/bulkData.ts | 4 +- .../services/dbData/dataAliasNested.svc.ts | 4 +- .../nocodb/src/lib/services/dbData/export.ts | 4 +- .../nocodb/src/lib/services/dbData/helpers.ts | 10 ++-- .../nocodb/src/lib/services/dbData/index.ts | 2 +- .../src/lib/services/ee/orgToken.svc.ts | 2 +- .../nocodb/src/lib/services/filter.svc.ts | 4 +- packages/nocodb/src/lib/services/hook.svc.ts | 2 +- .../nocodb/src/lib/services/hookFilter.svc.ts | 2 +- .../nocodb/src/lib/services/metaDiff.svc.ts | 4 +- .../src/lib/services/modelVisibility.svc.ts | 4 +- .../nocodb/src/lib/services/orgToken.svc.ts | 8 +-- .../nocodb/src/lib/services/orgUser.svc.ts | 4 +- .../nocodb/src/lib/services/plugin.svc.ts | 2 +- .../nocodb/src/lib/services/project.svc.ts | 21 ++++---- .../src/lib/services/projectUser.svc.ts | 10 ++-- .../src/lib/services/public/publicData.svc.ts | 6 +-- .../services/public/publicDataExport.svc.ts | 4 +- .../src/lib/services/public/publicMeta.svc.ts | 4 +- packages/nocodb/src/lib/services/sort.svc.ts | 4 +- .../lib/services/sync/helpers/EntityMap.ts | 2 +- .../src/lib/services/sync/helpers/job.ts | 6 +-- .../sync/helpers/readAndProcessData.ts | 4 +- packages/nocodb/src/lib/services/table.svc.ts | 14 ++--- .../services/test/TestResetService/index.ts | 6 +-- .../resetMetaSakilaSqliteProject.ts | 3 +- .../resetMysqlSakilaProject.ts | 4 +- .../TestResetService/resetPgSakilaProject.ts | 2 +- .../nocodb/src/lib/services/user/helpers.ts | 2 +- .../nocodb/src/lib/services/user/index.ts | 16 +++--- .../src/lib/services/user/initAdminFromEnv.ts | 2 +- packages/nocodb/src/lib/services/util.svc.ts | 2 +- packages/nocodb/src/lib/services/view.svc.ts | 4 +- .../src/lib/services/views/formView.svc.ts | 2 +- .../lib/services/views/formViewColumn.svc.ts | 2 +- .../src/lib/services/views/galleryView.svc.ts | 2 +- .../src/lib/services/views/gridView.svc.ts | 2 +- .../lib/services/views/gridViewColumn.svc.ts | 4 +- .../src/lib/services/views/kanbanView.svc.ts | 4 +- .../src/lib/services/views/mapView.svc.ts | 4 +- .../nocodb/src/lib/utils/NcConfigFactory.ts | 6 +-- .../src/lib/utils/common/BaseApiBuilder.ts | 30 +++++------ .../nocodb/src/lib/utils/common/BaseModel.ts | 6 +-- .../src/lib/utils/common/NcConnectionMgr.ts | 6 +-- .../src/lib/utils/common/NcConnectionMgrv2.ts | 2 +- .../utils/common/handlers/xcMetaDiffSync.ts | 6 +-- packages/nocodb/src/lib/utils/getInstance.ts | 2 +- packages/nocodb/src/lib/utils/pluginUtils.ts | 2 +- .../src/lib/v1-legacy/NcProjectBuilder.ts | 10 ++-- .../src/lib/v1-legacy/gql/GqlApiBuilder.ts | 12 ++--- .../src/lib/v1-legacy/gql/GqlAuthResolver.ts | 3 +- .../lib/v1-legacy/gql/GqlProcedureResolver.ts | 2 +- .../src/lib/v1-legacy/gql/GqlResolver.ts | 5 +- .../src/lib/v1-legacy/plugins/NcPluginMgr.ts | 14 ++--- .../plugins/adapters/email/EmailFactory.ts | 3 +- .../plugins/adapters/storage/Local.ts | 5 +- .../nocodb/src/lib/v1-legacy/plugins/azure.ts | 2 +- .../nocodb/src/lib/v1-legacy/plugins/brand.ts | 2 +- .../nocodb/src/lib/v1-legacy/plugins/cache.ts | 2 +- .../src/lib/v1-legacy/plugins/discord.ts | 2 +- .../nocodb/src/lib/v1-legacy/plugins/ee.ts | 2 +- .../src/lib/v1-legacy/plugins/githubAuth.ts | 2 +- .../src/lib/v1-legacy/plugins/googleAuth.ts | 2 +- .../src/lib/v1-legacy/plugins/mattermost.ts | 2 +- .../nocodb/src/lib/v1-legacy/plugins/ses.ts | 2 +- .../nocodb/src/lib/v1-legacy/plugins/slack.ts | 2 +- .../nocodb/src/lib/v1-legacy/plugins/smtp.ts | 2 +- .../src/lib/v1-legacy/plugins/twilio.ts | 2 +- .../src/lib/v1-legacy/rest/RestApiBuilder.ts | 28 +++++----- .../src/lib/v1-legacy/rest/RestAuthCtrl.ts | 22 +++----- .../src/lib/v1-legacy/rest/RestBaseCtrl.ts | 2 +- .../nocodb/src/lib/v1-legacy/rest/RestCtrl.ts | 4 +- .../lib/v1-legacy/rest/RestCtrlBelongsTo.ts | 3 +- .../src/lib/v1-legacy/rest/RestCtrlCustom.ts | 5 +- .../src/lib/v1-legacy/rest/RestCtrlHasMany.ts | 3 +- .../lib/v1-legacy/rest/RestCtrlProcedure.ts | 2 +- .../v1-legacy/templates/NcTemplateParser.ts | 2 +- .../src/lib/version-upgrader/NcUpgrader.ts | 19 ++++--- .../version-upgrader/ncAttachmentUpgrader.ts | 10 ++-- .../ncAttachmentUpgrader_0104002.ts | 10 ++-- .../lib/version-upgrader/ncFilterUpgrader.ts | 2 +- .../ncFilterUpgrader_0104004.ts | 6 +-- .../ncFilterUpgrader_0105003.ts | 6 +-- .../ncProjectUpgraderV2_0090000.ts | 28 +++++----- .../ncStickyColumnUpgrader.ts | 2 +- packages/nocodb/src/run/redoc.ts | 2 +- 291 files changed, 676 insertions(+), 715 deletions(-) diff --git a/packages/nocodb/src/lib/Noco.ts b/packages/nocodb/src/lib/Noco.ts index ca1c87a9f0..4b7f9ca900 100644 --- a/packages/nocodb/src/lib/Noco.ts +++ b/packages/nocodb/src/lib/Noco.ts @@ -9,43 +9,43 @@ import clear from 'clear'; import cookieParser from 'cookie-parser'; import debug from 'debug'; import * as express from 'express'; -import type { Router } from 'express'; import importFresh from 'import-fresh'; import morgan from 'morgan'; import NcToolGui from 'nc-lib-gui'; import requestIp from 'request-ip'; import { v4 as uuidv4 } from 'uuid'; -import type { NcConfig } from '../interface/config'; +import { T } from 'nc-help'; +import mkdirp from 'mkdirp'; import { NC_LICENSE_KEY } from './constants'; import Migrator from './db/sql-migrator/lib/KnexMigrator'; import Store from './models/Store'; import NcConfigFactory from './utils/NcConfigFactory'; -import { T } from 'nc-help'; import NcProjectBuilderCE from './v1-legacy/NcProjectBuilder'; import NcProjectBuilderEE from './v1-legacy/NcProjectBuilderEE'; -import type { GqlApiBuilder } from './v1-legacy/gql/GqlApiBuilder'; -import type NcMetaIO from './meta/NcMetaIO'; import NcMetaImplCE from './meta/NcMetaIOImpl'; import NcMetaImplEE from './meta/NcMetaIOImplEE'; -import type NcMetaMgrCE from './meta/NcMetaMgr'; -import type NcMetaMgrEE from './meta/NcMetaMgrEE'; -import type { RestApiBuilder } from './v1-legacy/rest/RestApiBuilder'; import RestAuthCtrlCE from './v1-legacy/rest/RestAuthCtrl'; import RestAuthCtrlEE from './v1-legacy/rest/RestAuthCtrlEE'; -import mkdirp from 'mkdirp'; import MetaAPILogger from './meta/MetaAPILogger'; import NcUpgrader from './version-upgrader/NcUpgrader'; -import type NcMetaMgrv2 from './meta/NcMetaMgrv2'; import NocoCache from './cache/NocoCache'; import registerMetaApis from './meta/api'; import NcPluginMgrv2 from './meta/helpers/NcPluginMgrv2'; import User from './models/User'; -import type * as http from 'http'; import weAreHiring from './utils/weAreHiring'; import getInstance from './utils/getInstance'; import initAdminFromEnv from './services/user/initAdminFromEnv'; +import type * as http from 'http'; +import type NcMetaMgrv2 from './meta/NcMetaMgrv2'; +import type { RestApiBuilder } from './v1-legacy/rest/RestApiBuilder'; +import type NcMetaMgrEE from './meta/NcMetaMgrEE'; +import type NcMetaMgrCE from './meta/NcMetaMgr'; +import type NcMetaIO from './meta/NcMetaIO'; +import type { GqlApiBuilder } from './v1-legacy/gql/GqlApiBuilder'; +import type { NcConfig } from '../interface/config'; +import type { Router } from 'express'; const log = debug('nc:app'); require('dotenv').config(); diff --git a/packages/nocodb/src/lib/cache/NocoCache.ts b/packages/nocodb/src/lib/cache/NocoCache.ts index 0ea0fb1bad..381760fef0 100644 --- a/packages/nocodb/src/lib/cache/NocoCache.ts +++ b/packages/nocodb/src/lib/cache/NocoCache.ts @@ -1,7 +1,7 @@ -import type CacheMgr from './CacheMgr'; +import { CacheGetType } from '../utils/globals'; import RedisCacheMgr from './RedisCacheMgr'; import RedisMockCacheMgr from './RedisMockCacheMgr'; -import { CacheGetType } from '../utils/globals'; +import type CacheMgr from './CacheMgr'; export default class NocoCache { private static client: CacheMgr; diff --git a/packages/nocodb/src/lib/cache/RedisCacheMgr.ts b/packages/nocodb/src/lib/cache/RedisCacheMgr.ts index d970f6b716..b8deaae118 100644 --- a/packages/nocodb/src/lib/cache/RedisCacheMgr.ts +++ b/packages/nocodb/src/lib/cache/RedisCacheMgr.ts @@ -1,7 +1,7 @@ import debug from 'debug'; -import CacheMgr from './CacheMgr'; import Redis from 'ioredis'; import { CacheDelDirection, CacheGetType, CacheScope } from '../utils/globals'; +import CacheMgr from './CacheMgr'; const log = debug('nc:cache'); diff --git a/packages/nocodb/src/lib/cache/RedisMockCacheMgr.ts b/packages/nocodb/src/lib/cache/RedisMockCacheMgr.ts index 902b728bb2..a06ddd9fe5 100644 --- a/packages/nocodb/src/lib/cache/RedisMockCacheMgr.ts +++ b/packages/nocodb/src/lib/cache/RedisMockCacheMgr.ts @@ -1,7 +1,7 @@ import debug from 'debug'; -import CacheMgr from './CacheMgr'; import Redis from 'ioredis-mock'; import { CacheDelDirection, CacheGetType, CacheScope } from '../utils/globals'; +import CacheMgr from './CacheMgr'; const log = debug('nc:cache'); export default class RedisMockCacheMgr extends CacheMgr { diff --git a/packages/nocodb/src/lib/controllers/apiDocs/index.ts b/packages/nocodb/src/lib/controllers/apiDocs/index.ts index 1853e4c7ff..7f83ad686b 100644 --- a/packages/nocodb/src/lib/controllers/apiDocs/index.ts +++ b/packages/nocodb/src/lib/controllers/apiDocs/index.ts @@ -1,8 +1,8 @@ import { Router } from 'express'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; +import { swaggerService } from '../../services'; import getSwaggerHtml from './swaggerHtml'; import getRedocHtml from './redocHtml'; -import { swaggerService } from '../../services'; async function swaggerJson(req, res) { const swagger = await swaggerService.swaggerJson({ diff --git a/packages/nocodb/src/lib/controllers/apiToken.ctl.ts b/packages/nocodb/src/lib/controllers/apiToken.ctl.ts index d0e6875d52..0110afef29 100644 --- a/packages/nocodb/src/lib/controllers/apiToken.ctl.ts +++ b/packages/nocodb/src/lib/controllers/apiToken.ctl.ts @@ -1,8 +1,8 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import { apiTokenService } from '../services'; +import type { Request, Response } from 'express'; export async function apiTokenList(req: Request, res: Response) { res.json(await apiTokenService.apiTokenList({ userId: req['user'].id })); diff --git a/packages/nocodb/src/lib/controllers/attachment.ctl.ts b/packages/nocodb/src/lib/controllers/attachment.ctl.ts index 62ef843a6e..437539d7cb 100644 --- a/packages/nocodb/src/lib/controllers/attachment.ctl.ts +++ b/packages/nocodb/src/lib/controllers/attachment.ctl.ts @@ -1,8 +1,7 @@ -import type { Request, Response } from 'express'; +import path from 'path'; import { Router } from 'express'; import multer from 'multer'; import { OrgUserRoles, ProjectRoles } from 'nocodb-sdk'; -import path from 'path'; import Noco from '../Noco'; import { MetaTable } from '../utils/globals'; import extractProjectIdAndAuthenticate from '../meta/helpers/extractProjectIdAndAuthenticate'; @@ -10,6 +9,7 @@ import catchError, { NcError } from '../meta/helpers/catchError'; import { NC_ATTACHMENT_FIELD_SIZE } from '../constants'; import { getCacheMiddleware } from '../meta/api/helpers'; import { attachmentService } from '../services'; +import type { Request, Response } from 'express'; const isUploadAllowedMw = async (req: Request, _res: Response, next: any) => { if (!req['user']?.id) { diff --git a/packages/nocodb/src/lib/controllers/audit.ctl.ts b/packages/nocodb/src/lib/controllers/audit.ctl.ts index 8714f94636..35939e6d50 100644 --- a/packages/nocodb/src/lib/controllers/audit.ctl.ts +++ b/packages/nocodb/src/lib/controllers/audit.ctl.ts @@ -1,9 +1,9 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import Audit from '../models/Audit'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { auditService } from '../services'; +import type { Request, Response } from 'express'; export async function commentRow(req: Request, res) { res.json( diff --git a/packages/nocodb/src/lib/controllers/base.ctl.ts b/packages/nocodb/src/lib/controllers/base.ctl.ts index ab5ef3a9f1..ad3e459bd0 100644 --- a/packages/nocodb/src/lib/controllers/base.ctl.ts +++ b/packages/nocodb/src/lib/controllers/base.ctl.ts @@ -1,11 +1,11 @@ -import type { Request, Response } from 'express'; -import type { BaseListType } from 'nocodb-sdk'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; -import type Base from '../models/Base'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import { baseService } from '../services'; +import type Base from '../models/Base'; +import type { BaseListType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; async function baseGet(req: Request, res: Response) { const base = await baseService.baseGetWithConfig({ diff --git a/packages/nocodb/src/lib/controllers/cache.ctl.ts b/packages/nocodb/src/lib/controllers/cache.ctl.ts index 751c26178c..b34f1a5ec8 100644 --- a/packages/nocodb/src/lib/controllers/cache.ctl.ts +++ b/packages/nocodb/src/lib/controllers/cache.ctl.ts @@ -1,5 +1,5 @@ -import catchError from '../meta/helpers/catchError'; import { Router } from 'express'; +import catchError from '../meta/helpers/catchError'; import { cacheService } from '../services'; export async function cacheGet(_, res) { diff --git a/packages/nocodb/src/lib/controllers/column.ctl.ts b/packages/nocodb/src/lib/controllers/column.ctl.ts index 614787f7f0..553008fc3f 100644 --- a/packages/nocodb/src/lib/controllers/column.ctl.ts +++ b/packages/nocodb/src/lib/controllers/column.ctl.ts @@ -1,9 +1,9 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; -import type { ColumnReqType, TableType, UITypes } from 'nocodb-sdk'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { columnService } from '../services'; +import type { ColumnReqType, TableType, UITypes } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; export async function columnGet(req: Request, res: Response) { res.json(await columnService.columnGet({ columnId: req.params.columnId })); diff --git a/packages/nocodb/src/lib/controllers/dbData/bulkDataAlias.ctl.ts b/packages/nocodb/src/lib/controllers/dbData/bulkDataAlias.ctl.ts index 93d887237e..3ec7bed6a7 100644 --- a/packages/nocodb/src/lib/controllers/dbData/bulkDataAlias.ctl.ts +++ b/packages/nocodb/src/lib/controllers/dbData/bulkDataAlias.ctl.ts @@ -1,8 +1,8 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import { bulkDataService } from '../../services'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import apiMetrics from '../../meta/helpers/apiMetrics'; +import type { Request, Response } from 'express'; async function bulkDataInsert(req: Request, res: Response) { res.json( diff --git a/packages/nocodb/src/lib/controllers/dbData/data.ctl.ts b/packages/nocodb/src/lib/controllers/dbData/data.ctl.ts index fc829e2690..882e6c7bec 100644 --- a/packages/nocodb/src/lib/controllers/dbData/data.ctl.ts +++ b/packages/nocodb/src/lib/controllers/dbData/data.ctl.ts @@ -1,8 +1,8 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import { dataService } from '../../services'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import apiMetrics from '../../meta/helpers/apiMetrics'; +import type { Request, Response } from 'express'; export async function dataList(req: Request, res: Response) { res.json( diff --git a/packages/nocodb/src/lib/controllers/dbData/dataAlias.ctl.ts b/packages/nocodb/src/lib/controllers/dbData/dataAlias.ctl.ts index f5a310386d..ff18681ea8 100644 --- a/packages/nocodb/src/lib/controllers/dbData/dataAlias.ctl.ts +++ b/packages/nocodb/src/lib/controllers/dbData/dataAlias.ctl.ts @@ -1,9 +1,9 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import { dataService } from '../../services'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import apiMetrics from '../../meta/helpers/apiMetrics'; import { parseHrtimeToSeconds } from '../../meta/api/helpers'; +import type { Request, Response } from 'express'; // todo: Handle the error case where view doesnt belong to model async function dataList(req: Request, res: Response) { diff --git a/packages/nocodb/src/lib/controllers/dbData/dataAliasExport.ctl.ts b/packages/nocodb/src/lib/controllers/dbData/dataAliasExport.ctl.ts index 7ba4545c67..0b4b46e91b 100644 --- a/packages/nocodb/src/lib/controllers/dbData/dataAliasExport.ctl.ts +++ b/packages/nocodb/src/lib/controllers/dbData/dataAliasExport.ctl.ts @@ -1,4 +1,3 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import * as XLSX from 'xlsx'; import apiMetrics from '../../meta/helpers/apiMetrics'; @@ -6,6 +5,7 @@ import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import { View } from '../../models'; import { extractCsvData, extractXlsxData } from '../../services/dbData/helpers'; import { getViewAndModelFromRequestByAliasOrId } from './helpers'; +import type { Request, Response } from 'express'; async function excelDataExport(req: Request, res: Response) { const { model, view } = await getViewAndModelFromRequestByAliasOrId(req); diff --git a/packages/nocodb/src/lib/controllers/dbData/dataAliasNested.ctl.ts b/packages/nocodb/src/lib/controllers/dbData/dataAliasNested.ctl.ts index 1df4d3646a..9b4660d31d 100644 --- a/packages/nocodb/src/lib/controllers/dbData/dataAliasNested.ctl.ts +++ b/packages/nocodb/src/lib/controllers/dbData/dataAliasNested.ctl.ts @@ -1,8 +1,8 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import apiMetrics from '../../meta/helpers/apiMetrics'; import { dataAliasNestedService } from '../../services'; +import type { Request, Response } from 'express'; // todo: handle case where the given column is not ltar export async function mmList(req: Request, res: Response) { diff --git a/packages/nocodb/src/lib/controllers/dbData/helpers.ts b/packages/nocodb/src/lib/controllers/dbData/helpers.ts index 60a691280d..1004947829 100644 --- a/packages/nocodb/src/lib/controllers/dbData/helpers.ts +++ b/packages/nocodb/src/lib/controllers/dbData/helpers.ts @@ -1,19 +1,19 @@ +import { isSystemColumn, UITypes } from 'nocodb-sdk'; +import * as XLSX from 'xlsx'; +import papaparse from 'papaparse'; import { NcError } from '../../meta/helpers/catchError'; import Project from '../../models/Project'; import Model from '../../models/Model'; import View from '../../models/View'; -import type { Request } from 'express'; import Base from '../../models/Base'; import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; -import { isSystemColumn, UITypes } from 'nocodb-sdk'; -import * as XLSX from 'xlsx'; import Column from '../../models/Column'; +import { dataService } from '../../services'; import type LookupColumn from '../../models/LookupColumn'; import type LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn'; -import papaparse from 'papaparse'; -import { dataService } from '../../services'; +import type { Request } from 'express'; export async function getViewAndModelFromRequestByAliasOrId( req: | Request<{ projectName: string; tableName: string; viewName?: string }> diff --git a/packages/nocodb/src/lib/controllers/dbData/oldData.ctl.ts b/packages/nocodb/src/lib/controllers/dbData/oldData.ctl.ts index 0df513df34..d5a573b013 100644 --- a/packages/nocodb/src/lib/controllers/dbData/oldData.ctl.ts +++ b/packages/nocodb/src/lib/controllers/dbData/oldData.ctl.ts @@ -1,7 +1,6 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; -import Model from '../../models/Model'; import { nocoExecute } from 'nc-help'; +import Model from '../../models/Model'; import Base from '../../models/Base'; import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; import View from '../../models/View'; @@ -10,6 +9,7 @@ import Project from '../../models/Project'; import { NcError } from '../../meta/helpers/catchError'; import apiMetrics from '../../meta/helpers/apiMetrics'; import getAst from '../../db/sql-data-mapper/lib/sql/helpers/getAst'; +import type { Request, Response } from 'express'; export async function dataList(req: Request, res: Response) { const { model, view } = await getViewAndModelFromRequest(req); diff --git a/packages/nocodb/src/lib/controllers/export.ctl.ts b/packages/nocodb/src/lib/controllers/export.ctl.ts index a8108ffcca..f3353ef45f 100644 --- a/packages/nocodb/src/lib/controllers/export.ctl.ts +++ b/packages/nocodb/src/lib/controllers/export.ctl.ts @@ -1,8 +1,8 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import View from '../models/View'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { extractCsvData } from './dbData/helpers'; +import type { Request, Response } from 'express'; async function exportCsv(req: Request, res: Response) { const view = await View.get(req.params.viewId); diff --git a/packages/nocodb/src/lib/controllers/filter.ctl.ts b/packages/nocodb/src/lib/controllers/filter.ctl.ts index 8e8f46c847..0423904649 100644 --- a/packages/nocodb/src/lib/controllers/filter.ctl.ts +++ b/packages/nocodb/src/lib/controllers/filter.ctl.ts @@ -1,10 +1,10 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; -import type { FilterReqType } from 'nocodb-sdk'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import { filterService } from '../services'; +import type { FilterReqType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; // @ts-ignore export async function filterGet(req: Request, res: Response) { diff --git a/packages/nocodb/src/lib/controllers/hook.ctl.ts b/packages/nocodb/src/lib/controllers/hook.ctl.ts index 4528a59e7b..ddbcf0bc81 100644 --- a/packages/nocodb/src/lib/controllers/hook.ctl.ts +++ b/packages/nocodb/src/lib/controllers/hook.ctl.ts @@ -1,11 +1,11 @@ -import catchError from '../meta/helpers/catchError'; -import type { Request, Response } from 'express'; import { Router } from 'express'; -import type { HookListType, HookType } from 'nocodb-sdk'; +import catchError from '../meta/helpers/catchError'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import { hookService } from '../services'; +import type { HookListType, HookType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; export async function hookList( req: Request, diff --git a/packages/nocodb/src/lib/controllers/hookFilter.ctl.ts b/packages/nocodb/src/lib/controllers/hookFilter.ctl.ts index 3a9cba4625..d479a2b264 100644 --- a/packages/nocodb/src/lib/controllers/hookFilter.ctl.ts +++ b/packages/nocodb/src/lib/controllers/hookFilter.ctl.ts @@ -1,9 +1,9 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import { T } from 'nc-help'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import { hookFilterService } from '../services'; +import type { Request, Response } from 'express'; export async function filterGet(req: Request, res: Response) { const filter = await hookFilterService.filterGet({ diff --git a/packages/nocodb/src/lib/controllers/metaDiff.ctl.ts b/packages/nocodb/src/lib/controllers/metaDiff.ctl.ts index 45ac703a0d..144a19d3f3 100644 --- a/packages/nocodb/src/lib/controllers/metaDiff.ctl.ts +++ b/packages/nocodb/src/lib/controllers/metaDiff.ctl.ts @@ -1,5 +1,5 @@ -import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { Router } from 'express'; +import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import { metaDiffService } from '../services'; diff --git a/packages/nocodb/src/lib/controllers/orgToken.ctl.ts b/packages/nocodb/src/lib/controllers/orgToken.ctl.ts index 20da323594..4dea4dec21 100644 --- a/packages/nocodb/src/lib/controllers/orgToken.ctl.ts +++ b/packages/nocodb/src/lib/controllers/orgToken.ctl.ts @@ -1,9 +1,9 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import { getConditionalHandler } from '../meta/helpers/getHandler'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { orgTokenService, orgTokenServiceEE } from '../services'; +import type { Request, Response } from 'express'; async function apiTokenList(req, res) { res.json( diff --git a/packages/nocodb/src/lib/controllers/plugin.ctl.ts b/packages/nocodb/src/lib/controllers/plugin.ctl.ts index f52f88eb90..fb3ed46341 100644 --- a/packages/nocodb/src/lib/controllers/plugin.ctl.ts +++ b/packages/nocodb/src/lib/controllers/plugin.ctl.ts @@ -1,10 +1,10 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; -import type { PluginType } from 'nocodb-sdk'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import { pluginService } from '../services'; +import type { PluginType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; export async function pluginList(_req: Request, res: Response) { res.json(new PagedResponseImpl(await pluginService.pluginList())); diff --git a/packages/nocodb/src/lib/controllers/project.ctl.ts b/packages/nocodb/src/lib/controllers/project.ctl.ts index 31485b5bc8..da626329c3 100644 --- a/packages/nocodb/src/lib/controllers/project.ctl.ts +++ b/packages/nocodb/src/lib/controllers/project.ctl.ts @@ -1,19 +1,19 @@ -import type { Request, Response } from 'express'; -import type { ProjectType } from 'nocodb-sdk'; -import Project from '../models/Project'; -import type { ProjectListType } from 'nocodb-sdk'; -import { packageVersion } from '../utils/packageVersion'; import { T } from 'nc-help'; +import isDocker from 'is-docker'; +import { packageVersion } from '../utils/packageVersion'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import ProjectUser from '../models/ProjectUser'; import Noco from '../Noco'; -import isDocker from 'is-docker'; +import Project from '../models/Project'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import Filter from '../models/Filter'; import { projectService } from '../services'; +import type { ProjectListType } from 'nocodb-sdk'; +import type { ProjectType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; // // Project CRUD diff --git a/packages/nocodb/src/lib/controllers/projectUser.ctl.ts b/packages/nocodb/src/lib/controllers/projectUser.ctl.ts index f2bace15a4..cc3beca1f5 100644 --- a/packages/nocodb/src/lib/controllers/projectUser.ctl.ts +++ b/packages/nocodb/src/lib/controllers/projectUser.ctl.ts @@ -1,5 +1,5 @@ -import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { Router } from 'express'; +import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import { projectUserService } from '../services'; diff --git a/packages/nocodb/src/lib/controllers/publicControllers/publicData.ctl.ts b/packages/nocodb/src/lib/controllers/publicControllers/publicData.ctl.ts index 2bf6749d9c..8117760fe5 100644 --- a/packages/nocodb/src/lib/controllers/publicControllers/publicData.ctl.ts +++ b/packages/nocodb/src/lib/controllers/publicControllers/publicData.ctl.ts @@ -1,9 +1,9 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import multer from 'multer'; import { NC_ATTACHMENT_FIELD_SIZE } from '../../constants'; import catchError from '../../meta/helpers/catchError'; import { publicDataService } from '../../services'; +import type { Request, Response } from 'express'; export async function dataList(req: Request, res: Response) { const pagedResponse = await publicDataService.dataList({ diff --git a/packages/nocodb/src/lib/controllers/publicControllers/publicDataExport.ctl.ts b/packages/nocodb/src/lib/controllers/publicControllers/publicDataExport.ctl.ts index 92a78e0979..9ab36afdc7 100644 --- a/packages/nocodb/src/lib/controllers/publicControllers/publicDataExport.ctl.ts +++ b/packages/nocodb/src/lib/controllers/publicControllers/publicDataExport.ctl.ts @@ -1,4 +1,3 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import * as XLSX from 'xlsx'; import { nocoExecute } from 'nc-help'; @@ -6,9 +5,10 @@ import papaparse from 'papaparse'; import { ErrorMessages, isSystemColumn, UITypes, ViewTypes } from 'nocodb-sdk'; import getAst from '../../db/sql-data-mapper/lib/sql/helpers/getAst'; import catchError, { NcError } from '../../meta/helpers/catchError'; -import type { LinkToAnotherRecordColumn, LookupColumn } from '../../models'; import { Base, Column, Model, View } from '../../models'; import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; +import type { LinkToAnotherRecordColumn, LookupColumn } from '../../models'; +import type { Request, Response } from 'express'; async function exportExcel(req: Request, res: Response) { const view = await View.getByUUID(req.params.publicDataUuid); diff --git a/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts b/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts index 224cb909ef..3517527884 100644 --- a/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts +++ b/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts @@ -1,7 +1,7 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import catchError from '../../meta/helpers/catchError'; import { publicMetaService } from '../../services'; +import type { Request, Response } from 'express'; export async function viewMetaGet(req: Request, res: Response) { res.json( diff --git a/packages/nocodb/src/lib/controllers/sort.ctl.ts b/packages/nocodb/src/lib/controllers/sort.ctl.ts index 37a70d4906..24d071aa0d 100644 --- a/packages/nocodb/src/lib/controllers/sort.ctl.ts +++ b/packages/nocodb/src/lib/controllers/sort.ctl.ts @@ -1,11 +1,11 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; -import type { SortListType, SortReqType } from 'nocodb-sdk'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import { sortService } from '../services'; +import type { SortListType, SortReqType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; // @ts-ignore export async function sortList( diff --git a/packages/nocodb/src/lib/controllers/sync/import.ctl.ts b/packages/nocodb/src/lib/controllers/sync/import.ctl.ts index d27e9865fc..d366e65b32 100644 --- a/packages/nocodb/src/lib/controllers/sync/import.ctl.ts +++ b/packages/nocodb/src/lib/controllers/sync/import.ctl.ts @@ -1,12 +1,12 @@ -import type { Request, Router } from 'express'; // import { Queue } from 'bullmq'; // import axios from 'axios'; import catchError, { NcError } from '../../meta/helpers/catchError'; -import type { Server } from 'socket.io'; import NocoJobs from '../../jobs/NocoJobs'; import { SyncSource } from '../../models'; import Noco from '../../Noco'; import { syncService, userService } from '../../services'; +import type { Server } from 'socket.io'; +import type { Request, Router } from 'express'; import type { AirtableSyncConfig } from '../../services/sync/helpers/job'; const AIRTABLE_IMPORT_JOB = 'AIRTABLE_IMPORT_JOB'; diff --git a/packages/nocodb/src/lib/controllers/sync/sync.ctl.ts b/packages/nocodb/src/lib/controllers/sync/sync.ctl.ts index 5bf6af97d4..827389516d 100644 --- a/packages/nocodb/src/lib/controllers/sync/sync.ctl.ts +++ b/packages/nocodb/src/lib/controllers/sync/sync.ctl.ts @@ -1,7 +1,7 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import { syncService } from '../../services'; +import type { Request, Response } from 'express'; export async function syncSourceList(req: Request, res: Response) { res.json( diff --git a/packages/nocodb/src/lib/controllers/table.ctl.ts b/packages/nocodb/src/lib/controllers/table.ctl.ts index bb7ff101c7..d1e3f2746f 100644 --- a/packages/nocodb/src/lib/controllers/table.ctl.ts +++ b/packages/nocodb/src/lib/controllers/table.ctl.ts @@ -1,10 +1,10 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; -import type { TableListType, TableReqType, TableType } from 'nocodb-sdk'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; import { tableService } from '../services'; +import type { TableListType, TableReqType, TableType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; export async function tableList(req: Request, res: Response) { res.json( diff --git a/packages/nocodb/src/lib/controllers/test.ctl.ts b/packages/nocodb/src/lib/controllers/test.ctl.ts index eb919be44c..a9bdce66b6 100644 --- a/packages/nocodb/src/lib/controllers/test.ctl.ts +++ b/packages/nocodb/src/lib/controllers/test.ctl.ts @@ -1,6 +1,6 @@ -import type { Request } from 'express'; import { Router } from 'express'; import { TestResetService } from '../services/test/TestResetService'; +import type { Request } from 'express'; export async function reset(req: Request, res) { const service = new TestResetService({ diff --git a/packages/nocodb/src/lib/controllers/user/initStrategies.ts b/packages/nocodb/src/lib/controllers/user/initStrategies.ts index 3b6b99c9aa..4d9ac6466f 100644 --- a/packages/nocodb/src/lib/controllers/user/initStrategies.ts +++ b/packages/nocodb/src/lib/controllers/user/initStrategies.ts @@ -1,12 +1,11 @@ -import { OrgUserRoles } from 'nocodb-sdk'; import { promisify } from 'util'; +import { OrgUserRoles } from 'nocodb-sdk'; import { Strategy as CustomStrategy } from 'passport-custom'; import passport from 'passport'; import passportJWT from 'passport-jwt'; import { Strategy as AuthTokenStrategy } from 'passport-auth-token'; import { Strategy as GoogleStrategy } from 'passport-google-oauth20'; -const PassportLocalStrategy = require('passport-local').Strategy; const ExtractJwt = passportJWT.ExtractJwt; const JwtStrategy = passportJWT.Strategy; @@ -20,6 +19,7 @@ import { ApiToken, Plugin, Project, ProjectUser, User } from '../../models'; import Noco from '../../Noco'; import { CacheGetType, CacheScope } from '../../utils/globals'; import { userService } from '../../services'; +const PassportLocalStrategy = require('passport-local').Strategy; export function initStrategies(router): void { passport.use( diff --git a/packages/nocodb/src/lib/controllers/user/user.ctl.ts b/packages/nocodb/src/lib/controllers/user/user.ctl.ts index 729abec5cb..86b2eeeefe 100644 --- a/packages/nocodb/src/lib/controllers/user/user.ctl.ts +++ b/packages/nocodb/src/lib/controllers/user/user.ctl.ts @@ -1,6 +1,5 @@ -import type { Request } from 'express'; -import * as ejs from 'ejs'; import { promisify } from 'util'; +import * as ejs from 'ejs'; import passport from 'passport'; import catchError, { NcError } from '../../meta/helpers/catchError'; @@ -10,6 +9,7 @@ import { Audit, User } from '../../models'; import Noco from '../../Noco'; import { userService } from '../../services'; import { setTokenCookie } from '../../services/user/helpers'; +import type { Request } from 'express'; export async function signup(req: Request, res): Promise { res.json( diff --git a/packages/nocodb/src/lib/controllers/util.ctl.ts b/packages/nocodb/src/lib/controllers/util.ctl.ts index 0d44b46204..79fd64bebe 100644 --- a/packages/nocodb/src/lib/controllers/util.ctl.ts +++ b/packages/nocodb/src/lib/controllers/util.ctl.ts @@ -1,8 +1,8 @@ // // Project CRUD -import type { Request, Response } from 'express'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import catchError from '../meta/helpers/catchError'; import { utilService } from '../services'; +import type { Request, Response } from 'express'; export async function testConnection(req: Request, res: Response) { res.json(await utilService.testConnection({ body: req.body })); diff --git a/packages/nocodb/src/lib/controllers/view.ctl.ts b/packages/nocodb/src/lib/controllers/view.ctl.ts index fa9107f577..b8bdef857d 100644 --- a/packages/nocodb/src/lib/controllers/view.ctl.ts +++ b/packages/nocodb/src/lib/controllers/view.ctl.ts @@ -1,10 +1,10 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; -import type { View } from '../models'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import { viewService } from '../services'; +import type { View } from '../models'; +import type { Request, Response } from 'express'; // @ts-ignore export async function viewGet(req: Request, res: Response) {} diff --git a/packages/nocodb/src/lib/controllers/viewColumn.ctl.ts b/packages/nocodb/src/lib/controllers/viewColumn.ctl.ts index e38cfcfbf9..5141372583 100644 --- a/packages/nocodb/src/lib/controllers/viewColumn.ctl.ts +++ b/packages/nocodb/src/lib/controllers/viewColumn.ctl.ts @@ -1,8 +1,8 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import ncMetaAclMw from '../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../meta/helpers/apiMetrics'; import { viewColumnService } from '../services'; +import type { Request, Response } from 'express'; export async function columnList(req: Request, res: Response) { res.json(await viewColumnService.columnList({ viewId: req.params.viewId })); diff --git a/packages/nocodb/src/lib/controllers/views/formView.ctl.ts b/packages/nocodb/src/lib/controllers/views/formView.ctl.ts index 42e21b691a..851ab7cb16 100644 --- a/packages/nocodb/src/lib/controllers/views/formView.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/formView.ctl.ts @@ -1,9 +1,9 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; -import type { FormType } from 'nocodb-sdk'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; import { formViewService } from '../../services'; +import type { FormType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; export async function formViewGet(req: Request, res: Response) { const formViewData = await formViewService.formViewGet({ diff --git a/packages/nocodb/src/lib/controllers/views/formViewColumn.ctl.ts b/packages/nocodb/src/lib/controllers/views/formViewColumn.ctl.ts index 7c5b34515b..21596c5360 100644 --- a/packages/nocodb/src/lib/controllers/views/formViewColumn.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/formViewColumn.ctl.ts @@ -1,8 +1,8 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; import { formViewColumnService } from '../../services'; +import type { Request, Response } from 'express'; export async function columnUpdate(req: Request, res: Response) { res.json( diff --git a/packages/nocodb/src/lib/controllers/views/galleryView.ctl.ts b/packages/nocodb/src/lib/controllers/views/galleryView.ctl.ts index 4556a0b8a6..a32198903b 100644 --- a/packages/nocodb/src/lib/controllers/views/galleryView.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/galleryView.ctl.ts @@ -1,9 +1,9 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; -import type { GalleryType } from 'nocodb-sdk'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; import { galleryViewService } from '../../services'; +import type { GalleryType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; export async function galleryViewGet(req: Request, res: Response) { res.json( diff --git a/packages/nocodb/src/lib/controllers/views/gridView.ctl.ts b/packages/nocodb/src/lib/controllers/views/gridView.ctl.ts index d86c304adf..e2ab7a6ff8 100644 --- a/packages/nocodb/src/lib/controllers/views/gridView.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/gridView.ctl.ts @@ -1,8 +1,8 @@ -import type { Request } from 'express'; import { Router } from 'express'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; import { gridViewService } from '../../services'; +import type { Request } from 'express'; export async function gridViewCreate(req: Request, res) { const view = await gridViewService.gridViewCreate({ diff --git a/packages/nocodb/src/lib/controllers/views/gridViewColumn.ctl.ts b/packages/nocodb/src/lib/controllers/views/gridViewColumn.ctl.ts index 3f3f37a044..89f02f6a7f 100644 --- a/packages/nocodb/src/lib/controllers/views/gridViewColumn.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/gridViewColumn.ctl.ts @@ -1,8 +1,8 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; import { gridViewColumnService } from '../../services'; +import type { Request, Response } from 'express'; export async function columnList(req: Request, res: Response) { res.json( diff --git a/packages/nocodb/src/lib/controllers/views/kanbanView.ctl.ts b/packages/nocodb/src/lib/controllers/views/kanbanView.ctl.ts index 2b8e4eda35..fab14d3b1f 100644 --- a/packages/nocodb/src/lib/controllers/views/kanbanView.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/kanbanView.ctl.ts @@ -1,12 +1,12 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; -import type { KanbanType } from 'nocodb-sdk'; import { ViewTypes } from 'nocodb-sdk'; +import { T } from 'nc-help'; 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 type { KanbanType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; // todo: map to service diff --git a/packages/nocodb/src/lib/controllers/views/mapView.ctl.ts b/packages/nocodb/src/lib/controllers/views/mapView.ctl.ts index 38cf657ae6..e19cc3c353 100644 --- a/packages/nocodb/src/lib/controllers/views/mapView.ctl.ts +++ b/packages/nocodb/src/lib/controllers/views/mapView.ctl.ts @@ -1,9 +1,9 @@ -import type { Request, Response } from 'express'; import { Router } from 'express'; -import type { MapType } from 'nocodb-sdk'; import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; import { metaApiMetrics } from '../../meta/helpers/apiMetrics'; import { mapViewService } from '../../services'; +import type { MapType } from 'nocodb-sdk'; +import type { Request, Response } from 'express'; export async function mapViewGet(req: Request, res: Response) { res.json( diff --git a/packages/nocodb/src/lib/db/sql-client/lib/KnexClient.ts b/packages/nocodb/src/lib/db/sql-client/lib/KnexClient.ts index b70c1316fa..319885de78 100644 --- a/packages/nocodb/src/lib/db/sql-client/lib/KnexClient.ts +++ b/packages/nocodb/src/lib/db/sql-client/lib/KnexClient.ts @@ -1,20 +1,20 @@ /* eslint-disable no-constant-condition */ -import type { Knex } from 'knex'; +import fs from 'fs'; +import { promisify } from 'util'; +import path from 'path'; import { knex } from 'knex'; import { T } from 'nc-help'; -import Debug from '../../util/Debug'; -import Emit from '../../util/emit'; -import Result from '../../util/Result'; import findIndex from 'lodash/findIndex'; import find from 'lodash/find'; -import fs from 'fs'; -import { promisify } from 'util'; import jsonfile from 'jsonfile'; -import path from 'path'; import mkdirp from 'mkdirp'; +import Result from '../../util/Result'; +import Emit from '../../util/emit'; +import Debug from '../../util/Debug'; import * as dataHelp from './data.helper'; import SqlClient from './SqlClient'; +import type { Knex } from 'knex'; const evt = new Emit(); const log = new Debug('KnexClient'); diff --git a/packages/nocodb/src/lib/db/sql-client/lib/SqlClientFactory.ts b/packages/nocodb/src/lib/db/sql-client/lib/SqlClientFactory.ts index 09918843a6..3781b1976d 100644 --- a/packages/nocodb/src/lib/db/sql-client/lib/SqlClientFactory.ts +++ b/packages/nocodb/src/lib/db/sql-client/lib/SqlClientFactory.ts @@ -1,3 +1,5 @@ +import fs from 'fs'; +import { promisify } from 'util'; import Noco from '../../../Noco'; import SqlClientFactoryEE from './ee/SqlClientFactoryEE'; import MySqlClient from './mysql/MysqlClient'; @@ -9,9 +11,6 @@ import YugabyteClient from './pg/YugabyteClient'; import TidbClient from './mysql/TidbClient'; import VitessClient from './mysql/VitessClient'; -import fs from 'fs'; -import { promisify } from 'util'; - export class SqlClientFactory { static create(connectionConfig) { connectionConfig.meta = connectionConfig.meta || {}; diff --git a/packages/nocodb/src/lib/db/sql-client/lib/ee/SqlClientFactoryEE.ts b/packages/nocodb/src/lib/db/sql-client/lib/ee/SqlClientFactoryEE.ts index 63df3a1221..05bad304a1 100644 --- a/packages/nocodb/src/lib/db/sql-client/lib/ee/SqlClientFactoryEE.ts +++ b/packages/nocodb/src/lib/db/sql-client/lib/ee/SqlClientFactoryEE.ts @@ -1,6 +1,6 @@ +import { SnowflakeClient } from 'nc-help'; import { SqlClientFactory } from '../SqlClientFactory'; import SfClient from '../snowflake/SnowflakeClient'; -import { SnowflakeClient } from 'nc-help'; class SqlClientFactoryEE { static create(connectionConfig) { diff --git a/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts b/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts index 5c46792c6c..2b48207ca3 100644 --- a/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts +++ b/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts @@ -1,10 +1,9 @@ -import type { ColumnType } from 'nocodb-sdk'; - import knex from 'knex'; +import find from 'lodash/find'; import KnexClient from '../KnexClient'; import Debug from '../../../util/Debug'; import Result from '../../../util/Result'; -import find from 'lodash/find'; +import type { ColumnType } from 'nocodb-sdk'; const log = new Debug('MssqlClient'); diff --git a/packages/nocodb/src/lib/db/sql-client/lib/mysql/MysqlClient.ts b/packages/nocodb/src/lib/db/sql-client/lib/mysql/MysqlClient.ts index da09d9d47b..1b223bd0bf 100644 --- a/packages/nocodb/src/lib/db/sql-client/lib/mysql/MysqlClient.ts +++ b/packages/nocodb/src/lib/db/sql-client/lib/mysql/MysqlClient.ts @@ -1,24 +1,23 @@ +import path from 'path'; +import { promisify } from 'util'; import knex from 'knex'; import isEmpty from 'lodash/isEmpty'; import mapKeys from 'lodash/mapKeys'; import find from 'lodash/find'; +import jsonfile from 'jsonfile'; +import mkdirp from 'mkdirp'; +import { nanoid } from 'nanoid'; +import levenshtein from 'fast-levenshtein'; import Debug from '../../../util/Debug'; import Emit from '../../../util/emit'; import Result from '../../../util/Result'; -import queries from './mysql.queries'; import KnexClient from '../KnexClient'; -import jsonfile from 'jsonfile'; -import path from 'path'; -import mkdirp from 'mkdirp'; -import { promisify } from 'util'; - -import { nanoid } from 'nanoid'; +import queries from './mysql.queries'; import fakerFunctionList from './fakerFunctionList'; import * as findDataType from './findDataTypeMapping'; -import levenshtein from 'fast-levenshtein'; const log = new Debug('MysqlClient'); const evt = new Emit(); diff --git a/packages/nocodb/src/lib/db/sql-client/lib/oracle/OracleClient.ts b/packages/nocodb/src/lib/db/sql-client/lib/oracle/OracleClient.ts index 4f01353ba0..494b378080 100644 --- a/packages/nocodb/src/lib/db/sql-client/lib/oracle/OracleClient.ts +++ b/packages/nocodb/src/lib/db/sql-client/lib/oracle/OracleClient.ts @@ -1,9 +1,9 @@ import knex from 'knex'; +import mapKeys from 'lodash/mapKeys'; +import find from 'lodash/find'; import KnexClient from '../KnexClient'; import Debug from '../../../util/Debug'; import Result from '../../../util/Result'; -import mapKeys from 'lodash/mapKeys'; -import find from 'lodash/find'; const log = new Debug('OracleClient'); diff --git a/packages/nocodb/src/lib/db/sql-client/lib/pg/PgClient.ts b/packages/nocodb/src/lib/db/sql-client/lib/pg/PgClient.ts index 90e0ec9b1d..1bc509ccbc 100644 --- a/packages/nocodb/src/lib/db/sql-client/lib/pg/PgClient.ts +++ b/packages/nocodb/src/lib/db/sql-client/lib/pg/PgClient.ts @@ -1,13 +1,13 @@ import { nanoid } from 'nanoid'; import knex from 'knex'; +import isEmpty from 'lodash/isEmpty'; +import mapKeys from 'lodash/mapKeys'; +import find from 'lodash/find'; import KnexClient from '../KnexClient'; import Debug from '../../../util/Debug'; import Result from '../../../util/Result'; import queries from './pg.queries'; -import isEmpty from 'lodash/isEmpty'; -import mapKeys from 'lodash/mapKeys'; -import find from 'lodash/find'; const log = new Debug('PGClient'); class PGClient extends KnexClient { diff --git a/packages/nocodb/src/lib/db/sql-client/lib/pg/YugabyteClient.ts b/packages/nocodb/src/lib/db/sql-client/lib/pg/YugabyteClient.ts index 3dd206007e..17630e1f72 100644 --- a/packages/nocodb/src/lib/db/sql-client/lib/pg/YugabyteClient.ts +++ b/packages/nocodb/src/lib/db/sql-client/lib/pg/YugabyteClient.ts @@ -1,6 +1,6 @@ -import PGClient from './PgClient'; import Debug from '../../../util/Debug'; import Result from '../../../util/Result'; +import PGClient from './PgClient'; const log = new Debug('YBClient'); diff --git a/packages/nocodb/src/lib/db/sql-client/lib/snowflake/SnowflakeClient.ts b/packages/nocodb/src/lib/db/sql-client/lib/snowflake/SnowflakeClient.ts index 1f3b37ff12..f364e16fcd 100644 --- a/packages/nocodb/src/lib/db/sql-client/lib/snowflake/SnowflakeClient.ts +++ b/packages/nocodb/src/lib/db/sql-client/lib/snowflake/SnowflakeClient.ts @@ -1,11 +1,11 @@ import { nanoid } from 'nanoid'; import _ from 'lodash'; +import lodash from 'lodash'; import KnexClient from '../KnexClient'; import Debug from '../../../util/Debug'; import Result from '../../../util/Result'; import queries from './snowflake.queries'; -import lodash from 'lodash'; const log = new Debug('SnowflakeClient'); const rowsToLower = (arr) => { diff --git a/packages/nocodb/src/lib/db/sql-client/lib/sqlite/SqliteClient.ts b/packages/nocodb/src/lib/db/sql-client/lib/sqlite/SqliteClient.ts index 09efde5641..0a35494cce 100644 --- a/packages/nocodb/src/lib/db/sql-client/lib/sqlite/SqliteClient.ts +++ b/packages/nocodb/src/lib/db/sql-client/lib/sqlite/SqliteClient.ts @@ -1,14 +1,14 @@ import { promisify } from 'util'; -import knex from 'knex'; import fs from 'fs'; -import KnexClient from '../KnexClient'; -import Debug from '../../../util/Debug'; -import Result from '../../../util/Result'; -import queries from './sqlite.queries'; +import knex from 'knex'; import isEmpty from 'lodash/isEmpty'; import mapKeys from 'lodash/mapKeys'; import find from 'lodash/find'; import { customAlphabet } from 'nanoid'; +import KnexClient from '../KnexClient'; +import Debug from '../../../util/Debug'; +import Result from '../../../util/Result'; +import queries from './sqlite.queries'; const nanoid = customAlphabet('1234567890abcdefghijklmnopqrstuvwxyz_', 6); diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSql.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSql.ts index bacc36f34e..34a20c4c27 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSql.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSql.ts @@ -2,11 +2,11 @@ import autoBind from 'auto-bind'; import _ from 'lodash'; import Validator from 'validator'; -import type { XcFilter, XcFilterWithAlias } from '../BaseModel'; +import Papaparse from 'papaparse'; import BaseModel from '../BaseModel'; import formulaQueryBuilder from './formulaQueryBuilderFromString'; import genRollupSelect from './genRollupSelect'; -import Papaparse from 'papaparse'; +import type { XcFilter, XcFilterWithAlias } from '../BaseModel'; /** * Base class for models diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts index 726a5e1af3..e5902ab23c 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts @@ -1,29 +1,7 @@ import autoBind from 'auto-bind'; import _ from 'lodash'; -import Model from '../../../../models/Model'; -import type SelectOption from '../../../../models/SelectOption'; -import type { XKnex } from '../../index'; -import type LinkToAnotherRecordColumn from '../../../../models/LinkToAnotherRecordColumn'; -import type RollupColumn from '../../../../models/RollupColumn'; -import type LookupColumn from '../../../../models/LookupColumn'; import DataLoader from 'dataloader'; -import Column from '../../../../models/Column'; -import type { XcFilter, XcFilterWithAlias } from '../BaseModel'; -import conditionV2 from './conditionV2'; -import Filter, { - COMPARISON_OPS, - COMPARISON_SUB_OPS, - IS_WITHIN_COMPARISON_SUB_OPS, -} from '../../../../models/Filter'; -import sortV2 from './sortV2'; -import Sort from '../../../../models/Sort'; -import type FormulaColumn from '../../../../models/FormulaColumn'; -import genRollupSelectv2 from './genRollupSelectv2'; -import formulaQueryBuilderv2 from './formulav2/formulaQueryBuilderv2'; -import type { Knex } from 'knex'; -import View from '../../../../models/View'; -import type { SortType } from 'nocodb-sdk'; import { AuditOperationSubTypes, AuditOperationTypes, @@ -32,8 +10,20 @@ import { UITypes, ViewTypes, } from 'nocodb-sdk'; -import formSubmissionEmailTemplate from '../../../../utils/common/formSubmissionEmailTemplate'; import ejs from 'ejs'; +import Validator from 'validator'; +import { customAlphabet } from 'nanoid'; +import DOMPurify from 'isomorphic-dompurify'; +import Model from '../../../../models/Model'; +import Column from '../../../../models/Column'; +import Filter, { + COMPARISON_OPS, + COMPARISON_SUB_OPS, + IS_WITHIN_COMPARISON_SUB_OPS, +} from '../../../../models/Filter'; +import Sort from '../../../../models/Sort'; +import View from '../../../../models/View'; +import formSubmissionEmailTemplate from '../../../../utils/common/formSubmissionEmailTemplate'; import Audit from '../../../../models/Audit'; import FormView from '../../../../models/FormView'; import Hook from '../../../../models/Hook'; @@ -42,12 +32,22 @@ import { _transformSubmittedFormDataForEmail, invokeWebhook, } from '../../../../meta/helpers/webhookHelpers'; -import Validator from 'validator'; -import { customValidators } from './customValidators'; import { NcError } from '../../../../meta/helpers/catchError'; -import { customAlphabet } from 'nanoid'; -import DOMPurify from 'isomorphic-dompurify'; +import { customValidators } from './customValidators'; +import formulaQueryBuilderv2 from './formulav2/formulaQueryBuilderv2'; +import genRollupSelectv2 from './genRollupSelectv2'; +import sortV2 from './sortV2'; +import conditionV2 from './conditionV2'; import { sanitize, unsanitize } from './helpers/sanitize'; +import type { SortType } from 'nocodb-sdk'; +import type { Knex } from 'knex'; +import type FormulaColumn from '../../../../models/FormulaColumn'; +import type { XcFilter, XcFilterWithAlias } from '../BaseModel'; +import type LookupColumn from '../../../../models/LookupColumn'; +import type RollupColumn from '../../../../models/RollupColumn'; +import type LinkToAnotherRecordColumn from '../../../../models/LinkToAnotherRecordColumn'; +import type { XKnex } from '../../index'; +import type SelectOption from '../../../../models/SelectOption'; import type QrCodeColumn from '../../../../models/QrCodeColumn'; import type BarcodeColumn from '../../../../models/BarcodeColumn'; diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/CustomKnex.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/CustomKnex.ts index 614419656f..891e7b2675 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/CustomKnex.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/CustomKnex.ts @@ -1,14 +1,14 @@ import { Knex, knex } from 'knex'; import { SnowflakeClient } from 'nc-help'; +import Filter from '../../../../models/Filter'; import type { FilterType } from 'nocodb-sdk'; +import type { BaseModelSql } from './BaseModelSql'; + const types = require('pg').types; // override parsing date column to Date() types.setTypeParser(1082, (val) => val); -import type { BaseModelSql } from './BaseModelSql'; -import Filter from '../../../../models/Filter'; - const opMappingGen = { eq: '=', lt: '<', diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts index 38e2e76d02..d7abfa2911 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts @@ -1,17 +1,17 @@ +import { isNumericCol, RelationTypes, UITypes } from 'nocodb-sdk'; +import dayjs, { extend } from 'dayjs'; +import customParseFormat from 'dayjs/plugin/customParseFormat.js'; import Filter from '../../../../models/Filter'; +import genRollupSelectv2 from './genRollupSelectv2'; +import formulaQueryBuilderv2 from './formulav2/formulaQueryBuilderv2'; +import { sanitize } from './helpers/sanitize'; import type LinkToAnotherRecordColumn from '../../../../models/LinkToAnotherRecordColumn'; import type { Knex } from 'knex'; import type { XKnex } from '../../index'; import type Column from '../../../../models/Column'; import type LookupColumn from '../../../../models/LookupColumn'; -import genRollupSelectv2 from './genRollupSelectv2'; import type RollupColumn from '../../../../models/RollupColumn'; -import formulaQueryBuilderv2 from './formulav2/formulaQueryBuilderv2'; import type FormulaColumn from '../../../../models/FormulaColumn'; -import { isNumericCol, RelationTypes, UITypes } from 'nocodb-sdk'; -import { sanitize } from './helpers/sanitize'; -import dayjs, { extend } from 'dayjs'; -import customParseFormat from 'dayjs/plugin/customParseFormat.js'; extend(customParseFormat); diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts index 066de538c4..74400802e2 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts @@ -1,17 +1,17 @@ import jsep from 'jsep'; +import { jsepCurlyHook, UITypes } from 'nocodb-sdk'; import mapFunctionName from '../mapFunctionName'; +import genRollupSelectv2 from '../genRollupSelectv2'; +import FormulaColumn from '../../../../../models/FormulaColumn'; +import { validateDateWithUnknownFormat } from '../helpers/formulaFnHelper'; +import { CacheGetType, CacheScope } from '../../../../../utils/globals'; +import NocoCache from '../../../../../cache/NocoCache'; import type Model from '../../../../../models/Model'; import type Column from '../../../../../models/Column'; -import genRollupSelectv2 from '../genRollupSelectv2'; import type RollupColumn from '../../../../../models/RollupColumn'; -import FormulaColumn from '../../../../../models/FormulaColumn'; import type { XKnex } from '../../../index'; import type LinkToAnotherRecordColumn from '../../../../../models/LinkToAnotherRecordColumn'; import type LookupColumn from '../../../../../models/LookupColumn'; -import { jsepCurlyHook, UITypes } from 'nocodb-sdk'; -import { validateDateWithUnknownFormat } from '../helpers/formulaFnHelper'; -import { CacheGetType, CacheScope } from '../../../../../utils/globals'; -import NocoCache from '../../../../../cache/NocoCache'; // todo: switch function based on database diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mssql.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mssql.ts index cadf9ed7a3..105311cade 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mssql.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mssql.ts @@ -1,8 +1,8 @@ import dayjs from 'dayjs'; -import type { MapFnArgs } from '../mapFunctionName'; -import commonFns from './commonFns'; import { convertUnits } from '../helpers/convertUnits'; import { getWeekdayByText } from '../helpers/formulaFnHelper'; +import commonFns from './commonFns'; +import type { MapFnArgs } from '../mapFunctionName'; const mssql = { ...commonFns, diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mysql.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mysql.ts index dab07ca6cc..eae5c0f3f1 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mysql.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mysql.ts @@ -1,8 +1,8 @@ import dayjs from 'dayjs'; -import type { MapFnArgs } from '../mapFunctionName'; -import commonFns from './commonFns'; import { convertUnits } from '../helpers/convertUnits'; import { getWeekdayByText } from '../helpers/formulaFnHelper'; +import commonFns from './commonFns'; +import type { MapFnArgs } from '../mapFunctionName'; const mysql2 = { ...commonFns, diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts index d422d4f81a..0efcfc9cb3 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts @@ -1,8 +1,8 @@ import dayjs from 'dayjs'; -import type { MapFnArgs } from '../mapFunctionName'; -import commonFns from './commonFns'; import { convertUnits } from '../helpers/convertUnits'; import { getWeekdayByText } from '../helpers/formulaFnHelper'; +import commonFns from './commonFns'; +import type { MapFnArgs } from '../mapFunctionName'; const pg = { ...commonFns, diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts index 2375693b82..d4bfb56d82 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts @@ -1,12 +1,12 @@ import dayjs from 'dayjs'; -import type { MapFnArgs } from '../mapFunctionName'; -import commonFns from './commonFns'; import { convertUnits } from '../helpers/convertUnits'; import { getWeekdayByText } from '../helpers/formulaFnHelper'; import { convertToTargetFormat, getDateFormat, } from '../../../../../utils/dateTimeUtils'; +import commonFns from './commonFns'; +import type { MapFnArgs } from '../mapFunctionName'; const sqlite3 = { ...commonFns, diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelect.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelect.ts index 8483cc5ec6..2fc2d329d2 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelect.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelect.ts @@ -1,5 +1,5 @@ -import type { Knex } from 'knex'; import { RelationTypes } from 'nocodb-sdk'; +import type { Knex } from 'knex'; export default function ({ knex, diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelectv2.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelectv2.ts index 47c9fa8bda..dfdb036bda 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelectv2.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelectv2.ts @@ -1,8 +1,8 @@ +import { RelationTypes } from 'nocodb-sdk'; import type RollupColumn from '../../../../models/RollupColumn'; import type { XKnex } from '../../index'; import type LinkToAnotherRecordColumn from '../../../../models/LinkToAnotherRecordColumn'; import type { Knex } from 'knex'; -import { RelationTypes } from 'nocodb-sdk'; export default async function ({ knex, diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts index 9e361e74e4..cb00298318 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts @@ -1,5 +1,5 @@ -import View from '../../../../../models/View'; import { isSystemColumn, UITypes } from 'nocodb-sdk'; +import View from '../../../../../models/View'; import type Model from '../../../../../models/Model'; import type LinkToAnotherRecordColumn from '../../../../../models/LinkToAnotherRecordColumn'; diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/mapFunctionName.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/mapFunctionName.ts index 600457883f..49abd50ac2 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/mapFunctionName.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/mapFunctionName.ts @@ -1,8 +1,8 @@ -import type { XKnex } from '../../index'; import mssql from './functionMappings/mssql'; import mysql from './functionMappings/mysql'; import pg from './functionMappings/pg'; import sqlite from './functionMappings/sqlite'; +import type { XKnex } from '../../index'; import type { Knex } from 'knex'; export interface MapFnArgs { diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/sortV2.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/sortV2.ts index 2babee6821..1eb0f5c474 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/sortV2.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/sortV2.ts @@ -1,14 +1,14 @@ +import { RelationTypes, UITypes } from 'nocodb-sdk'; +import Sort from '../../../../models/Sort'; +import genRollupSelectv2 from './genRollupSelectv2'; +import formulaQueryBuilderv2 from './formulav2/formulaQueryBuilderv2'; +import { sanitize } from './helpers/sanitize'; import type { Knex } from 'knex'; import type { XKnex } from '../../index'; -import Sort from '../../../../models/Sort'; import type LinkToAnotherRecordColumn from '../../../../models/LinkToAnotherRecordColumn'; -import genRollupSelectv2 from './genRollupSelectv2'; import type RollupColumn from '../../../../models/RollupColumn'; import type LookupColumn from '../../../../models/LookupColumn'; -import formulaQueryBuilderv2 from './formulav2/formulaQueryBuilderv2'; import type FormulaColumn from '../../../../models/FormulaColumn'; -import { RelationTypes, UITypes } from 'nocodb-sdk'; -import { sanitize } from './helpers/sanitize'; export default async function sortV2( sortList: Sort[], diff --git a/packages/nocodb/src/lib/db/sql-mgr/SqlMgr.ts b/packages/nocodb/src/lib/db/sql-mgr/SqlMgr.ts index 55ea1559d7..02933d1297 100644 --- a/packages/nocodb/src/lib/db/sql-mgr/SqlMgr.ts +++ b/packages/nocodb/src/lib/db/sql-mgr/SqlMgr.ts @@ -8,13 +8,13 @@ import importFresh from 'import-fresh'; import inflection from 'inflection'; import slash from 'slash'; import { T } from 'nc-help'; +import { customAlphabet } from 'nanoid'; import SqlClientFactory from '../sql-client/lib/SqlClientFactory'; // import debug from 'debug'; import KnexMigrator from '../sql-migrator/lib/KnexMigrator'; // import {XKnex} from "../sql-data-mapper"; import NcConnectionMgr from '../../utils/common/NcConnectionMgr'; -import { customAlphabet } from 'nanoid'; import Debug from '../util/Debug'; import Result from '../util/Result'; diff --git a/packages/nocodb/src/lib/db/sql-mgr/code/models/xc/BaseModelXcMeta.ts b/packages/nocodb/src/lib/db/sql-mgr/code/models/xc/BaseModelXcMeta.ts index 6548fa7e0c..446f6c4af8 100644 --- a/packages/nocodb/src/lib/db/sql-mgr/code/models/xc/BaseModelXcMeta.ts +++ b/packages/nocodb/src/lib/db/sql-mgr/code/models/xc/BaseModelXcMeta.ts @@ -1,6 +1,6 @@ +import { UITypes } from 'nocodb-sdk'; import BaseRender from '../../BaseRender'; import mapDefaultDisplayValue from '../../../../../meta/helpers/mapDefaultDisplayValue'; -import { UITypes } from 'nocodb-sdk'; abstract class BaseModelXcMeta extends BaseRender { protected abstract _getAbstractType(column: any): any; diff --git a/packages/nocodb/src/lib/db/sql-mgr/code/models/xc/ModelXcMetaFactory.ts b/packages/nocodb/src/lib/db/sql-mgr/code/models/xc/ModelXcMetaFactory.ts index 8bd08d14a5..c0669dbc2a 100644 --- a/packages/nocodb/src/lib/db/sql-mgr/code/models/xc/ModelXcMetaFactory.ts +++ b/packages/nocodb/src/lib/db/sql-mgr/code/models/xc/ModelXcMetaFactory.ts @@ -1,10 +1,10 @@ -import type BaseModelXcMeta from './BaseModelXcMeta'; import ModelXcMetaMssql from './ModelXcMetaMssql'; import ModelXcMetaMysql from './ModelXcMetaMysql'; import ModelXcMetaOracle from './ModelXcMetaOracle'; import ModelXcMetaPg from './ModelXcMetaPg'; import ModelXcMetaSqlite from './ModelXcMetaSqlite'; import ModelXcMetaSnowflake from './ModelXcMetaSnowflake'; +import type BaseModelXcMeta from './BaseModelXcMeta'; class ModelXcMetaFactory { public static create(connectionConfig, args): BaseModelXcMeta { diff --git a/packages/nocodb/src/lib/db/sql-mgr/code/policies/xc/ExpressXcPolicy.ts b/packages/nocodb/src/lib/db/sql-mgr/code/policies/xc/ExpressXcPolicy.ts index ed0f1cce7b..d7f867d00a 100644 --- a/packages/nocodb/src/lib/db/sql-mgr/code/policies/xc/ExpressXcPolicy.ts +++ b/packages/nocodb/src/lib/db/sql-mgr/code/policies/xc/ExpressXcPolicy.ts @@ -1,7 +1,7 @@ import lodash from 'lodash'; -import type { Acl } from '../../../../../../interface/config'; import BaseRender from '../../BaseRender'; +import type { Acl } from '../../../../../../interface/config'; class ExpressXcMiddleware extends BaseRender { /** diff --git a/packages/nocodb/src/lib/db/sql-mgr/v2/SqlMgrv2.ts b/packages/nocodb/src/lib/db/sql-mgr/v2/SqlMgrv2.ts index 7ab8be7472..1e77c6d466 100644 --- a/packages/nocodb/src/lib/db/sql-mgr/v2/SqlMgrv2.ts +++ b/packages/nocodb/src/lib/db/sql-mgr/v2/SqlMgrv2.ts @@ -4,8 +4,8 @@ import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2'; import SqlClientFactory from '../../sql-client/lib/SqlClientFactory'; import KnexMigratorv2 from '../../sql-migrator/lib/KnexMigratorv2'; -import type Base from '../../../models/Base'; import Debug from '../../util/Debug'; +import type Base from '../../../models/Base'; const log = new Debug('SqlMgr'); diff --git a/packages/nocodb/src/lib/db/sql-mgr/v2/SqlMgrv2Trans.ts b/packages/nocodb/src/lib/db/sql-mgr/v2/SqlMgrv2Trans.ts index c515e4d73d..a4cbe0621d 100644 --- a/packages/nocodb/src/lib/db/sql-mgr/v2/SqlMgrv2Trans.ts +++ b/packages/nocodb/src/lib/db/sql-mgr/v2/SqlMgrv2Trans.ts @@ -1,10 +1,10 @@ +import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2'; +import KnexMigratorv2Tans from '../../sql-migrator/lib/KnexMigratorv2Tans'; import SqlMgrv2 from './SqlMgrv2'; import type Base from '../../../models/Base'; -import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2'; import type { Knex } from 'knex'; import type { XKnex } from '../../sql-data-mapper'; import type NcMetaIO from '../../../meta/NcMetaIO'; -import KnexMigratorv2Tans from '../../sql-migrator/lib/KnexMigratorv2Tans'; export default class SqlMgrv2Trans extends SqlMgrv2 { protected trx: Knex.Transaction; diff --git a/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigrator.ts b/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigrator.ts index 48cae09181..c1baacf17f 100644 --- a/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigrator.ts +++ b/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigrator.ts @@ -12,8 +12,8 @@ import Emit from '../../util/emit'; import Result from '../../util/Result'; import * as fileHelp from '../../util/file.help'; -import SqlMigrator from './SqlMigrator'; import NcConfigFactory from '../../../utils/NcConfigFactory'; +import SqlMigrator from './SqlMigrator'; const evt = new Emit(); const log = new Debug('KnexMigrator'); diff --git a/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigratorv2.ts b/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigratorv2.ts index c71ea172e3..758861a093 100644 --- a/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigratorv2.ts +++ b/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigratorv2.ts @@ -1,7 +1,6 @@ import fs from 'fs'; import path from 'path'; import { promisify } from 'util'; -import type { Knex } from 'knex'; import glob from 'glob'; import SqlClientFactory from '../../sql-client/lib/SqlClientFactory'; @@ -14,11 +13,12 @@ import * as fileHelp from '../../util/file.help'; // import SqlMigrator from './SqlMigrator'; // import NcConfigFactory from '../../../utils/NcConfigFactory'; import Noco from '../../../Noco'; -import type { XKnex } from '../../sql-data-mapper'; import Project from '../../../models/Project'; -import type Base from '../../../models/Base'; import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2'; import Result from '../../util/Result'; +import type Base from '../../../models/Base'; +import type { XKnex } from '../../sql-data-mapper'; +import type { Knex } from 'knex'; const evt = new Emit(); const log = new Debug('KnexMigrator'); diff --git a/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigratorv2Tans.ts b/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigratorv2Tans.ts index e459b56533..af3426ea69 100644 --- a/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigratorv2Tans.ts +++ b/packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigratorv2Tans.ts @@ -4,10 +4,10 @@ * @class KnexMigrator * @extends {SqlMigrator} */ -import KnexMigratorv2 from './KnexMigratorv2'; -import type Base from '../../../models/Base'; import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2'; import Noco from '../../../Noco'; +import KnexMigratorv2 from './KnexMigratorv2'; +import type Base from '../../../models/Base'; import type { XKnex } from '../../sql-data-mapper'; import type NcMetaIO from '../../../meta/NcMetaIO'; diff --git a/packages/nocodb/src/lib/jobs/EmitteryJobsMgr.ts b/packages/nocodb/src/lib/jobs/EmitteryJobsMgr.ts index 38951a57e2..3323ead9c2 100644 --- a/packages/nocodb/src/lib/jobs/EmitteryJobsMgr.ts +++ b/packages/nocodb/src/lib/jobs/EmitteryJobsMgr.ts @@ -1,5 +1,5 @@ -import JobsMgr from './JobsMgr'; import Emittery from 'emittery'; +import JobsMgr from './JobsMgr'; export default class EmitteryJobsMgr extends JobsMgr { emitter: Emittery; diff --git a/packages/nocodb/src/lib/jobs/NocoJobs.ts b/packages/nocodb/src/lib/jobs/NocoJobs.ts index f2ea8d1448..a10a36250f 100644 --- a/packages/nocodb/src/lib/jobs/NocoJobs.ts +++ b/packages/nocodb/src/lib/jobs/NocoJobs.ts @@ -1,6 +1,6 @@ -import type JobsMgr from './JobsMgr'; import EmitteryJobsMgr from './EmitteryJobsMgr'; import RedisJobsMgr from './RedisJobsMgr'; +import type JobsMgr from './JobsMgr'; export default class NocoJobs { private static client: JobsMgr; diff --git a/packages/nocodb/src/lib/meta/NcMetaIOImpl.ts b/packages/nocodb/src/lib/meta/NcMetaIOImpl.ts index e9b55290f7..2e4e630416 100644 --- a/packages/nocodb/src/lib/meta/NcMetaIOImpl.ts +++ b/packages/nocodb/src/lib/meta/NcMetaIOImpl.ts @@ -1,16 +1,16 @@ import CryptoJS from 'crypto-js'; import { customAlphabet } from 'nanoid'; -import type { NcConfig } from '../../interface/config'; -import type { Knex } from '../db/sql-data-mapper'; import { XKnex } from '../db/sql-data-mapper'; -import type Noco from '../Noco'; import XcMigrationSource from '../migrations/XcMigrationSource'; -import NcMetaIO, { META_TABLES } from './NcMetaIO'; import NcConnectionMgr from '../utils/common/NcConnectionMgr'; import { MetaTable } from '../utils/globals'; import XcMigrationSourcev2 from '../migrations/XcMigrationSourcev2'; +import NcMetaIO, { META_TABLES } from './NcMetaIO'; +import type Noco from '../Noco'; +import type { Knex } from '../db/sql-data-mapper'; +import type { NcConfig } from '../../interface/config'; // import { nanoid } from 'nanoid'; /*import { v4 as uuidv4 } from 'uuid';*/ diff --git a/packages/nocodb/src/lib/meta/NcMetaMgr.ts b/packages/nocodb/src/lib/meta/NcMetaMgr.ts index d936cbecb8..2a9c166585 100644 --- a/packages/nocodb/src/lib/meta/NcMetaMgr.ts +++ b/packages/nocodb/src/lib/meta/NcMetaMgr.ts @@ -1,13 +1,12 @@ -import CryptoJS from 'crypto-js'; import fs from 'fs'; -import mkdirp from 'mkdirp'; import path from 'path'; +import { promisify } from 'util'; +import CryptoJS from 'crypto-js'; +import mkdirp from 'mkdirp'; import archiver from 'archiver'; import axios from 'axios'; import bodyParser from 'body-parser'; -import type { Handler } from 'express'; -import type express from 'express'; import { Router } from 'express'; import extract from 'extract-zip'; import isDocker from 'is-docker'; @@ -16,11 +15,10 @@ import { customAlphabet, nanoid } from 'nanoid'; import slash from 'slash'; import { v4 as uuidv4 } from 'uuid'; import { ncp } from 'ncp'; - -import type IEmailAdapter from '../../interface/IEmailAdapter'; -import type IStorageAdapter from '../../interface/IStorageAdapter'; -import type { NcConfig } from '../../interface/config'; +import { UITypes } from 'nocodb-sdk'; +import { T } from 'nc-help'; import { Result } from '../../interface/config'; + import SqlClientFactory from '../db/sql-client/lib/SqlClientFactory'; import { NcConfigFactory } from '../index'; import ProjectMgr from '../db/sql-mgr/ProjectMgr'; @@ -31,21 +29,23 @@ import NcHelp from '../utils/NcHelp'; import mimetypes, { mimeIcons } from '../utils/mimeTypes'; import { packageVersion } from '../utils/packageVersion'; import projectAcl from '../utils/projectAcl'; -import type Noco from '../Noco'; -import type { GqlApiBuilder } from '../v1-legacy/gql/GqlApiBuilder'; import NcPluginMgr from '../v1-legacy/plugins/NcPluginMgr'; import XcCache from '../v1-legacy/plugins/adapters/cache/XcCache'; -import type { RestApiBuilder } from '../v1-legacy/rest/RestApiBuilder'; import RestAuthCtrl from '../v1-legacy/rest/RestAuthCtrlEE'; -import type NcMetaIO from './NcMetaIO'; -import { META_TABLES } from './NcMetaIO'; -import { promisify } from 'util'; import NcTemplateParser from '../v1-legacy/templates/NcTemplateParser'; import { defaultConnectionConfig } from '../utils/NcConfigFactory'; -import xcMetaDiff from './handlers/xcMetaDiff'; -import { UITypes } from 'nocodb-sdk'; -import { T } from 'nc-help'; import { NC_ATTACHMENT_FIELD_SIZE } from '../constants'; +import xcMetaDiff from './handlers/xcMetaDiff'; +import { META_TABLES } from './NcMetaIO'; +import type NcMetaIO from './NcMetaIO'; +import type { RestApiBuilder } from '../v1-legacy/rest/RestApiBuilder'; +import type { GqlApiBuilder } from '../v1-legacy/gql/GqlApiBuilder'; +import type Noco from '../Noco'; +import type { NcConfig } from '../../interface/config'; +import type IStorageAdapter from '../../interface/IStorageAdapter'; +import type IEmailAdapter from '../../interface/IEmailAdapter'; +import type express from 'express'; +import type { Handler } from 'express'; const randomID = customAlphabet('1234567890abcdefghijklmnopqrstuvwxyz_', 10); const XC_PLUGIN_DET = 'XC_PLUGIN_DET'; diff --git a/packages/nocodb/src/lib/meta/NcMetaMgrv2.ts b/packages/nocodb/src/lib/meta/NcMetaMgrv2.ts index bd831e8833..2d8c228ff6 100644 --- a/packages/nocodb/src/lib/meta/NcMetaMgrv2.ts +++ b/packages/nocodb/src/lib/meta/NcMetaMgrv2.ts @@ -1,18 +1,18 @@ import bodyParser from 'body-parser'; -import type { Handler } from 'express'; import { Router } from 'express'; import multer from 'multer'; -import type { NcConfig } from '../../interface/config'; import ProjectMgr from '../db/sql-mgr/ProjectMgr'; import { packageVersion } from '../utils/packageVersion'; import projectAcl from '../utils/projectAcl'; -import type Noco from '../Noco'; import NcPluginMgr from '../v1-legacy/plugins/NcPluginMgr'; -import type NcMetaIO from './NcMetaIO'; import { defaultConnectionConfig } from '../utils/NcConfigFactory'; -import ncCreateLookup from './handlersv2/ncCreateLookup'; import { NC_ATTACHMENT_FIELD_SIZE } from '../constants'; +import ncCreateLookup from './handlersv2/ncCreateLookup'; +import type NcMetaIO from './NcMetaIO'; +import type Noco from '../Noco'; +import type { NcConfig } from '../../interface/config'; +import type { Handler } from 'express'; // import ncGetMeta from './handlersv2/ncGetMeta'; export default class NcMetaMgrv2 { diff --git a/packages/nocodb/src/lib/meta/api/helpers/apiHelpers.ts b/packages/nocodb/src/lib/meta/api/helpers/apiHelpers.ts index b67bcc03f9..4319f59c82 100644 --- a/packages/nocodb/src/lib/meta/api/helpers/apiHelpers.ts +++ b/packages/nocodb/src/lib/meta/api/helpers/apiHelpers.ts @@ -1,10 +1,10 @@ -import type { NextFunction, Request, Response } from 'express'; -import type { ErrorObject } from 'ajv'; import Ajv from 'ajv'; import addFormats from 'ajv-formats'; // @ts-ignore import swagger from '../../../../schema/swagger.json'; import { NcError } from '../../helpers/catchError'; +import type { ErrorObject } from 'ajv'; +import type { NextFunction, Request, Response } from 'express'; export function parseHrtimeToSeconds(hrtime) { const seconds = (hrtime[0] + hrtime[1] / 1e6).toFixed(3); diff --git a/packages/nocodb/src/lib/meta/api/helpers/columnHelpers.ts b/packages/nocodb/src/lib/meta/api/helpers/columnHelpers.ts index 7304920a14..49dd049de1 100644 --- a/packages/nocodb/src/lib/meta/api/helpers/columnHelpers.ts +++ b/packages/nocodb/src/lib/meta/api/helpers/columnHelpers.ts @@ -1,4 +1,8 @@ import { customAlphabet } from 'nanoid'; +import { UITypes } from 'nocodb-sdk'; +import Column from '../../../models/Column'; +import { getUniqueColumnAliasName } from '../../helpers/getUniqueName'; +import validateParams from '../../helpers/validateParams'; import type { BoolType, ColumnReqType, @@ -8,13 +12,9 @@ import type { RollupColumnReqType, TableType, } from 'nocodb-sdk'; -import { UITypes } from 'nocodb-sdk'; -import Column from '../../../models/Column'; import type LinkToAnotherRecordColumn from '../../../models/LinkToAnotherRecordColumn'; import type LookupColumn from '../../../models/LookupColumn'; import type Model from '../../../models/Model'; -import { getUniqueColumnAliasName } from '../../helpers/getUniqueName'; -import validateParams from '../../helpers/validateParams'; export const randomID = customAlphabet( '1234567890abcdefghijklmnopqrstuvwxyz_', diff --git a/packages/nocodb/src/lib/meta/api/helpers/populateMeta.ts b/packages/nocodb/src/lib/meta/api/helpers/populateMeta.ts index f601f73546..2e5b3a8aa8 100644 --- a/packages/nocodb/src/lib/meta/api/helpers/populateMeta.ts +++ b/packages/nocodb/src/lib/meta/api/helpers/populateMeta.ts @@ -1,19 +1,19 @@ -import type Project from '../../../models/Project'; +import { ModelTypes, UITypes, ViewTypes } from 'nocodb-sdk'; import Column from '../../../models/Column'; import Model from '../../../models/Model'; import NcHelp from '../../../utils/NcHelp'; -import type Base from '../../../models/Base'; import View from '../../../models/View'; import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2'; import getTableNameAlias, { getColumnNameAlias, } from '../../helpers/getTableName'; -import type LinkToAnotherRecordColumn from '../../../models/LinkToAnotherRecordColumn'; import getColumnUiType from '../../helpers/getColumnUiType'; import mapDefaultDisplayValue from '../../helpers/mapDefaultDisplayValue'; import { extractAndGenerateManyToManyRelations } from '../../../services/metaDiff.svc'; -import { ModelTypes, UITypes, ViewTypes } from 'nocodb-sdk'; import { IGNORE_TABLES } from '../../../utils/common/BaseApiBuilder'; +import type LinkToAnotherRecordColumn from '../../../models/LinkToAnotherRecordColumn'; +import type Base from '../../../models/Base'; +import type Project from '../../../models/Project'; export async function populateMeta(base: Base, project: Project): Promise { const info = { diff --git a/packages/nocodb/src/lib/meta/api/index.ts b/packages/nocodb/src/lib/meta/api/index.ts index 5982aaf0bc..9900eb9537 100644 --- a/packages/nocodb/src/lib/meta/api/index.ts +++ b/packages/nocodb/src/lib/meta/api/index.ts @@ -1,4 +1,7 @@ +import crypto from 'crypto'; import { T } from 'nc-help'; +import { Server } from 'socket.io'; +import passport from 'passport'; import orgLicenseController from '../../controllers/orgLicense.ctl'; import orgTokenController from '../../controllers/orgToken.ctl'; import orgUserController from '../../controllers/orgUser.ctl'; @@ -6,7 +9,6 @@ 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 type { Router } from 'express'; import sortController from '../../controllers/sort.ctl'; import filterController from '../../controllers/filter.ctl'; import viewColumnController from '../../controllers/viewColumn.ctl'; @@ -47,14 +49,12 @@ import { publicDataExportController, publicMetaController, } from '../../controllers/publicControllers'; -import type { Socket } from 'socket.io'; -import { Server } from 'socket.io'; -import passport from 'passport'; -import crypto from 'crypto'; import swaggerController from '../../controllers/apiDocs'; import { importController, syncSourceController } from '../../controllers/sync'; import mapViewController from '../../controllers/views/mapView.ctl'; +import type { Socket } from 'socket.io'; +import type { Router } from 'express'; const clients: { [id: string]: Socket } = {}; const jobs: { [id: string]: { last_message: any } } = {}; diff --git a/packages/nocodb/src/lib/meta/handlersv2/ncCreateLookup.ts b/packages/nocodb/src/lib/meta/handlersv2/ncCreateLookup.ts index 0b55f8fb92..1d38ba0731 100644 --- a/packages/nocodb/src/lib/meta/handlersv2/ncCreateLookup.ts +++ b/packages/nocodb/src/lib/meta/handlersv2/ncCreateLookup.ts @@ -1,6 +1,6 @@ -import type { NcContextV2 } from '../NcMetaMgrv2'; -import Column from '../../models/Column'; import { UITypes } from 'nocodb-sdk'; +import Column from '../../models/Column'; +import type { NcContextV2 } from '../NcMetaMgrv2'; export default async function (this: NcContextV2, { args }: any) { if ( diff --git a/packages/nocodb/src/lib/meta/handlersv2/ncGetMeta.ts b/packages/nocodb/src/lib/meta/handlersv2/ncGetMeta.ts index 7ac1ea4aa7..b4ace3b1e4 100644 --- a/packages/nocodb/src/lib/meta/handlersv2/ncGetMeta.ts +++ b/packages/nocodb/src/lib/meta/handlersv2/ncGetMeta.ts @@ -1,5 +1,5 @@ -import type { NcContextV2 } from '../NcMetaMgrv2'; import Model from '../../models/Model'; +import type { NcContextV2 } from '../NcMetaMgrv2'; export default async function (this: NcContextV2, { args }: any) { const meta = await Model.getByIdOrName({ diff --git a/packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts b/packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts index 5c9981cf42..49b1bc61bd 100644 --- a/packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts +++ b/packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts @@ -1,13 +1,4 @@ -import type { - IEmailAdapter, - IStorageAdapterV2, - IWebhookNotificationAdapter, - // XcEmailPlugin, - // XcPlugin, - // XcStoragePlugin, - // XcWebhookNotificationPlugin -} from 'nc-plugin'; - +import { PluginCategory } from 'nocodb-sdk'; import BackblazePluginConfig from '../../plugins/backblaze'; import DiscordPluginConfig from '../../plugins/discord'; import GcsPluginConfig from '../../plugins/gcs'; @@ -30,9 +21,17 @@ import SESPluginConfig from '../../plugins/ses'; import Noco from '../../Noco'; import Local from '../../v1-legacy/plugins/adapters/storage/Local'; import { MetaTable } from '../../utils/globals'; -import { PluginCategory } from 'nocodb-sdk'; import Plugin from '../../models/Plugin'; import { NcError } from './catchError'; +import type { + IEmailAdapter, + IStorageAdapterV2, + IWebhookNotificationAdapter, + // XcEmailPlugin, + // XcPlugin, + // XcStoragePlugin, + // XcWebhookNotificationPlugin +} from 'nc-plugin'; const defaultPlugins = [ SlackPluginConfig, diff --git a/packages/nocodb/src/lib/meta/helpers/addFormulaErrorIfMissingColumn.ts b/packages/nocodb/src/lib/meta/helpers/addFormulaErrorIfMissingColumn.ts index b3281888ec..d8ff16dd96 100644 --- a/packages/nocodb/src/lib/meta/helpers/addFormulaErrorIfMissingColumn.ts +++ b/packages/nocodb/src/lib/meta/helpers/addFormulaErrorIfMissingColumn.ts @@ -1,5 +1,5 @@ -import type FormulaColumn from '../../models/FormulaColumn'; import jsep from 'jsep'; +import type FormulaColumn from '../../models/FormulaColumn'; export default function addFormulaErrorIfMissingColumn({ formula, diff --git a/packages/nocodb/src/lib/meta/helpers/apiMetrics.ts b/packages/nocodb/src/lib/meta/helpers/apiMetrics.ts index e1929e48d9..494105cd66 100644 --- a/packages/nocodb/src/lib/meta/helpers/apiMetrics.ts +++ b/packages/nocodb/src/lib/meta/helpers/apiMetrics.ts @@ -1,5 +1,5 @@ -import type { Request } from 'express'; import { T } from 'nc-help'; +import type { Request } from 'express'; const countMap = {}; diff --git a/packages/nocodb/src/lib/meta/helpers/getColumnPropsFromUIDT.ts b/packages/nocodb/src/lib/meta/helpers/getColumnPropsFromUIDT.ts index f3e19c939f..7a8181381e 100644 --- a/packages/nocodb/src/lib/meta/helpers/getColumnPropsFromUIDT.ts +++ b/packages/nocodb/src/lib/meta/helpers/getColumnPropsFromUIDT.ts @@ -1,5 +1,5 @@ -import type { ColumnReqType, NormalColumnRequestType } from 'nocodb-sdk'; import { SqlUiFactory, UITypes } from 'nocodb-sdk'; +import type { ColumnReqType, NormalColumnRequestType } from 'nocodb-sdk'; import type Base from '../../models/Base'; import type Column from '../../models/Column'; diff --git a/packages/nocodb/src/lib/meta/helpers/getColumnUiType.ts b/packages/nocodb/src/lib/meta/helpers/getColumnUiType.ts index db6f304636..259c38d7cb 100644 --- a/packages/nocodb/src/lib/meta/helpers/getColumnUiType.ts +++ b/packages/nocodb/src/lib/meta/helpers/getColumnUiType.ts @@ -1,7 +1,7 @@ +import ModelXcMetaFactory from '../../db/sql-mgr/code/models/xc/ModelXcMetaFactory'; import type Base from '../../models/Base'; import type Column from '../../models/Column'; import type { ColumnType } from 'nocodb-sdk'; -import ModelXcMetaFactory from '../../db/sql-mgr/code/models/xc/ModelXcMetaFactory'; export default function getColumnUiType( base: Base, diff --git a/packages/nocodb/src/lib/meta/helpers/getHandler.ts b/packages/nocodb/src/lib/meta/helpers/getHandler.ts index 861d92e01b..527d692380 100644 --- a/packages/nocodb/src/lib/meta/helpers/getHandler.ts +++ b/packages/nocodb/src/lib/meta/helpers/getHandler.ts @@ -1,5 +1,5 @@ -import type express from 'express'; import Noco from '../../Noco'; +import type express from 'express'; export default function getHandler( defaultHandler: express.Handler, diff --git a/packages/nocodb/src/lib/meta/helpers/ncMetaAclMw.ts b/packages/nocodb/src/lib/meta/helpers/ncMetaAclMw.ts index 8d26137865..b0f842505e 100644 --- a/packages/nocodb/src/lib/meta/helpers/ncMetaAclMw.ts +++ b/packages/nocodb/src/lib/meta/helpers/ncMetaAclMw.ts @@ -1,8 +1,8 @@ import { OrgUserRoles } from 'nocodb-sdk'; import projectAcl from '../../utils/projectAcl'; -import type { NextFunction, Request, Response } from 'express'; import catchError, { NcError } from './catchError'; import extractProjectIdAndAuthenticate from './extractProjectIdAndAuthenticate'; +import type { NextFunction, Request, Response } from 'express'; export default function ( handlerFn, diff --git a/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts b/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts index ca326d90e7..8167134b27 100644 --- a/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts +++ b/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts @@ -1,6 +1,6 @@ +import { RelationTypes, UITypes } from 'nocodb-sdk'; import View from '../../models/View'; import Column from '../../models/Column'; -import { RelationTypes, UITypes } from 'nocodb-sdk'; import Model from '../../models/Model'; import type LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn'; import type LookupColumn from '../../models/LookupColumn'; diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts index fae4ea50b8..a80ac3efd3 100644 --- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts +++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts @@ -1,10 +1,10 @@ import Handlebars from 'handlebars'; -import type Model from '../../models/Model'; +import Filter from '../../models/Filter'; +import HookLog from '../../models/HookLog'; import NcPluginMgrv2 from './NcPluginMgrv2'; +import type Model from '../../models/Model'; import type Column from '../../models/Column'; import type Hook from '../../models/Hook'; -import Filter from '../../models/Filter'; -import HookLog from '../../models/HookLog'; import type { HookLogType } from 'nocodb-sdk'; import type FormView from '../../models/FormView'; diff --git a/packages/nocodb/src/lib/migrations/v1/nc_011_remove_old_ses_plugin.ts b/packages/nocodb/src/lib/migrations/v1/nc_011_remove_old_ses_plugin.ts index 3f7997b4c7..72c6981954 100644 --- a/packages/nocodb/src/lib/migrations/v1/nc_011_remove_old_ses_plugin.ts +++ b/packages/nocodb/src/lib/migrations/v1/nc_011_remove_old_ses_plugin.ts @@ -1,5 +1,5 @@ -import type { Knex } from 'knex'; import ses from '../../v1-legacy/plugins/ses'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex('nc_plugins').del().where({ title: 'SES' }); diff --git a/packages/nocodb/src/lib/migrations/v2/nc_012_alter_column_data_types.ts b/packages/nocodb/src/lib/migrations/v2/nc_012_alter_column_data_types.ts index cc6a3650b2..6719586d2e 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_012_alter_column_data_types.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_012_alter_column_data_types.ts @@ -1,5 +1,5 @@ -import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { if (knex.client.config.client !== 'sqlite3') { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_013_sync_source.ts b/packages/nocodb/src/lib/migrations/v2/nc_013_sync_source.ts index 5aa7bda017..46e97dc537 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_013_sync_source.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_013_sync_source.ts @@ -1,5 +1,5 @@ -import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.createTable(MetaTable.SYNC_SOURCE, (table) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_014_alter_column_data_types.ts b/packages/nocodb/src/lib/migrations/v2/nc_014_alter_column_data_types.ts index 42acbb495f..7ffe57e8ac 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_014_alter_column_data_types.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_014_alter_column_data_types.ts @@ -1,5 +1,5 @@ -import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { if (knex.client.config.client !== 'sqlite3') { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_015_add_meta_col_in_column_table.ts b/packages/nocodb/src/lib/migrations/v2/nc_015_add_meta_col_in_column_table.ts index 16a6fbc443..1957bf0b32 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_015_add_meta_col_in_column_table.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_015_add_meta_col_in_column_table.ts @@ -1,5 +1,5 @@ -import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.alterTable(MetaTable.COLUMNS, (table) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_016_alter_hooklog_payload_types.ts b/packages/nocodb/src/lib/migrations/v2/nc_016_alter_hooklog_payload_types.ts index 65dfab985f..feefcaf1a3 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_016_alter_hooklog_payload_types.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_016_alter_hooklog_payload_types.ts @@ -1,5 +1,5 @@ -import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { if (knex.client.config.client === 'mssql') { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_018_add_meta_in_view.ts b/packages/nocodb/src/lib/migrations/v2/nc_018_add_meta_in_view.ts index 56bc42cac4..e56bb578d4 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_018_add_meta_in_view.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_018_add_meta_in_view.ts @@ -1,5 +1,5 @@ -import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.alterTable(MetaTable.VIEWS, (table) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_019_add_meta_in_meta_tables.ts b/packages/nocodb/src/lib/migrations/v2/nc_019_add_meta_in_meta_tables.ts index f8f45d5abf..44e5ba7c66 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_019_add_meta_in_meta_tables.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_019_add_meta_in_meta_tables.ts @@ -1,5 +1,5 @@ -import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.alterTable(MetaTable.FORM_VIEW, (table) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_020_kanban_view.ts b/packages/nocodb/src/lib/migrations/v2/nc_020_kanban_view.ts index 168fc43488..193a388d4e 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_020_kanban_view.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_020_kanban_view.ts @@ -1,5 +1,5 @@ -import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.alterTable(MetaTable.KANBAN_VIEW, (table) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_021_add_fields_in_token.ts b/packages/nocodb/src/lib/migrations/v2/nc_021_add_fields_in_token.ts index 81b36fb110..75f10a9922 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_021_add_fields_in_token.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_021_add_fields_in_token.ts @@ -1,5 +1,5 @@ -import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.alterTable(MetaTable.API_TOKENS, (table) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_023_multiple_source.ts b/packages/nocodb/src/lib/migrations/v2/nc_023_multiple_source.ts index c99d213b70..ebf6051ff4 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_023_multiple_source.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_023_multiple_source.ts @@ -1,5 +1,5 @@ -import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.alterTable(MetaTable.SYNC_SOURCE, (table) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_025_add_row_height.ts b/packages/nocodb/src/lib/migrations/v2/nc_025_add_row_height.ts index 387a53fa03..6a5f3dbb92 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_025_add_row_height.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_025_add_row_height.ts @@ -1,5 +1,5 @@ -import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.alterTable(MetaTable.GRID_VIEW, (table) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_026_map_view.ts b/packages/nocodb/src/lib/migrations/v2/nc_026_map_view.ts index c3c65beb61..a30e041a9e 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_026_map_view.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_026_map_view.ts @@ -1,5 +1,5 @@ -import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.createTable(MetaTable.MAP_VIEW, (table) => { diff --git a/packages/nocodb/src/lib/migrations/v2/nc_027_add_comparison_sub_op.ts b/packages/nocodb/src/lib/migrations/v2/nc_027_add_comparison_sub_op.ts index 823668f15d..69b29c9489 100644 --- a/packages/nocodb/src/lib/migrations/v2/nc_027_add_comparison_sub_op.ts +++ b/packages/nocodb/src/lib/migrations/v2/nc_027_add_comparison_sub_op.ts @@ -1,5 +1,5 @@ -import type { Knex } from 'knex'; import { MetaTable } from '../../utils/globals'; +import type { Knex } from 'knex'; const up = async (knex: Knex) => { await knex.schema.alterTable(MetaTable.FILTER_EXP, (table) => { diff --git a/packages/nocodb/src/lib/models/ApiToken.ts b/packages/nocodb/src/lib/models/ApiToken.ts index 2397268b85..5323ce0c40 100644 --- a/packages/nocodb/src/lib/models/ApiToken.ts +++ b/packages/nocodb/src/lib/models/ApiToken.ts @@ -1,3 +1,4 @@ +import { nanoid } from 'nanoid'; import { CacheDelDirection, CacheGetType, @@ -5,7 +6,6 @@ import { MetaTable, } from '../utils/globals'; import Noco from '../Noco'; -import { nanoid } from 'nanoid'; import NocoCache from '../cache/NocoCache'; import type { ApiTokenType } from 'nocodb-sdk'; diff --git a/packages/nocodb/src/lib/models/Audit.ts b/packages/nocodb/src/lib/models/Audit.ts index 8f7b336ed1..a9202c5d38 100644 --- a/packages/nocodb/src/lib/models/Audit.ts +++ b/packages/nocodb/src/lib/models/Audit.ts @@ -1,9 +1,9 @@ -import type { AuditType } from 'nocodb-sdk'; import { AuditOperationTypes } from 'nocodb-sdk'; import { MetaTable } from '../utils/globals'; import Noco from '../Noco'; -import Model from './Model'; import { extractProps } from '../meta/helpers/extractProps'; +import Model from './Model'; +import type { AuditType } from 'nocodb-sdk'; const opTypes = [ 'COMMENT', diff --git a/packages/nocodb/src/lib/models/Base.ts b/packages/nocodb/src/lib/models/Base.ts index 7e9a5590a6..709f6598c0 100644 --- a/packages/nocodb/src/lib/models/Base.ts +++ b/packages/nocodb/src/lib/models/Base.ts @@ -1,19 +1,19 @@ -import Noco from '../Noco'; -import Project from './Project'; +import { UITypes } from 'nocodb-sdk'; +import CryptoJS from 'crypto-js'; +import NocoCache from '../cache/NocoCache'; import { CacheDelDirection, CacheGetType, CacheScope, MetaTable, } from '../utils/globals'; -import Model from './Model'; -import type { BaseType, BoolType } from 'nocodb-sdk'; -import { UITypes } from 'nocodb-sdk'; -import NocoCache from '../cache/NocoCache'; -import CryptoJS from 'crypto-js'; +import Noco from '../Noco'; import { extractProps } from '../meta/helpers/extractProps'; import { NcError } from '../meta/helpers/catchError'; +import Model from './Model'; +import Project from './Project'; import SyncSource from './SyncSource'; +import type { BaseType, BoolType } from 'nocodb-sdk'; export const DB_TYPES = [ 'mysql2', diff --git a/packages/nocodb/src/lib/models/Column.ts b/packages/nocodb/src/lib/models/Column.ts index a4fc559cab..30bfdc0662 100644 --- a/packages/nocodb/src/lib/models/Column.ts +++ b/packages/nocodb/src/lib/models/Column.ts @@ -1,27 +1,27 @@ -import FormulaColumn from './FormulaColumn'; -import LinkToAnotherRecordColumn from './LinkToAnotherRecordColumn'; -import LookupColumn from './LookupColumn'; -import RollupColumn from './RollupColumn'; -import SelectOption from './SelectOption'; -import Model from './Model'; -import NocoCache from '../cache/NocoCache'; -import type { ColumnReqType, ColumnType } from 'nocodb-sdk'; import { AllowedColumnTypesForQrAndBarcodes, UITypes } from 'nocodb-sdk'; +import NocoCache from '../cache/NocoCache'; import { CacheDelDirection, CacheGetType, CacheScope, MetaTable, } from '../utils/globals'; -import View from './View'; import Noco from '../Noco'; -import Sort from './Sort'; -import Filter from './Filter'; import addFormulaErrorIfMissingColumn from '../meta/helpers/addFormulaErrorIfMissingColumn'; import { NcError } from '../meta/helpers/catchError'; +import { extractProps } from '../meta/helpers/extractProps'; +import FormulaColumn from './FormulaColumn'; +import LinkToAnotherRecordColumn from './LinkToAnotherRecordColumn'; +import LookupColumn from './LookupColumn'; +import RollupColumn from './RollupColumn'; +import SelectOption from './SelectOption'; +import Model from './Model'; +import View from './View'; +import Sort from './Sort'; +import Filter from './Filter'; import QrCodeColumn from './QrCodeColumn'; import BarcodeColumn from './BarcodeColumn'; -import { extractProps } from '../meta/helpers/extractProps'; +import type { ColumnReqType, ColumnType } from 'nocodb-sdk'; export default class Column implements ColumnType { public fk_model_id: string; diff --git a/packages/nocodb/src/lib/models/Filter.ts b/packages/nocodb/src/lib/models/Filter.ts index 8fd9d73945..a270342fce 100644 --- a/packages/nocodb/src/lib/models/Filter.ts +++ b/packages/nocodb/src/lib/models/Filter.ts @@ -1,19 +1,19 @@ +import { UITypes } from 'nocodb-sdk'; import Noco from '../Noco'; -import Model from './Model'; -import Column from './Column'; -import Hook from './Hook'; import { CacheDelDirection, CacheGetType, CacheScope, MetaTable, } from '../utils/globals'; -import View from './View'; -import type { BoolType, FilterType } from 'nocodb-sdk'; -import { UITypes } from 'nocodb-sdk'; import NocoCache from '../cache/NocoCache'; import { NcError } from '../meta/helpers/catchError'; import { extractProps } from '../meta/helpers/extractProps'; +import Model from './Model'; +import Column from './Column'; +import Hook from './Hook'; +import View from './View'; +import type { BoolType, FilterType } from 'nocodb-sdk'; export const COMPARISON_OPS = [ 'eq', diff --git a/packages/nocodb/src/lib/models/FormView.ts b/packages/nocodb/src/lib/models/FormView.ts index 9b82b99149..2c4e5f0436 100644 --- a/packages/nocodb/src/lib/models/FormView.ts +++ b/packages/nocodb/src/lib/models/FormView.ts @@ -1,11 +1,11 @@ import Noco from '../Noco'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; -import type { BoolType, FormType } from 'nocodb-sdk'; import { deserializeJSON, serializeJSON } from '../utils/serialize'; -import FormViewColumn from './FormViewColumn'; -import View from './View'; import NocoCache from '../cache/NocoCache'; import { extractProps } from '../meta/helpers/extractProps'; +import FormViewColumn from './FormViewColumn'; +import View from './View'; +import type { BoolType, FormType } from 'nocodb-sdk'; export default class FormView implements FormType { show: BoolType; diff --git a/packages/nocodb/src/lib/models/FormViewColumn.ts b/packages/nocodb/src/lib/models/FormViewColumn.ts index b13841cd59..c516d6ae45 100644 --- a/packages/nocodb/src/lib/models/FormViewColumn.ts +++ b/packages/nocodb/src/lib/models/FormViewColumn.ts @@ -1,15 +1,15 @@ import Noco from '../Noco'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; +import { deserializeJSON, serializeJSON } from '../utils/serialize'; +import NocoCache from '../cache/NocoCache'; +import { extractProps } from '../meta/helpers/extractProps'; +import View from './View'; import type { BoolType, FormColumnType, MetaType, StringOrNullType, } from 'nocodb-sdk'; -import { deserializeJSON, serializeJSON } from '../utils/serialize'; -import View from './View'; -import NocoCache from '../cache/NocoCache'; -import { extractProps } from '../meta/helpers/extractProps'; export default class FormViewColumn implements FormColumnType { id?: string; diff --git a/packages/nocodb/src/lib/models/GalleryView.ts b/packages/nocodb/src/lib/models/GalleryView.ts index 8a0bfc3509..9a599ea38c 100644 --- a/packages/nocodb/src/lib/models/GalleryView.ts +++ b/packages/nocodb/src/lib/models/GalleryView.ts @@ -1,10 +1,10 @@ +import { UITypes } from 'nocodb-sdk'; import Noco from '../Noco'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; -import type { BoolType, GalleryColumnType, GalleryType } from 'nocodb-sdk'; -import { UITypes } from 'nocodb-sdk'; -import View from './View'; import NocoCache from '../cache/NocoCache'; import { extractProps } from '../meta/helpers/extractProps'; +import View from './View'; +import type { BoolType, GalleryColumnType, GalleryType } from 'nocodb-sdk'; export default class GalleryView implements GalleryType { fk_view_id?: string; diff --git a/packages/nocodb/src/lib/models/GalleryViewColumn.ts b/packages/nocodb/src/lib/models/GalleryViewColumn.ts index 1ca49780bd..6e744e0281 100644 --- a/packages/nocodb/src/lib/models/GalleryViewColumn.ts +++ b/packages/nocodb/src/lib/models/GalleryViewColumn.ts @@ -1,8 +1,8 @@ import Noco from '../Noco'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; -import View from './View'; import NocoCache from '../cache/NocoCache'; import { extractProps } from '../meta/helpers/extractProps'; +import View from './View'; import type { BoolType } from 'nocodb-sdk'; export default class GalleryViewColumn { diff --git a/packages/nocodb/src/lib/models/GridView.ts b/packages/nocodb/src/lib/models/GridView.ts index 28e4c3904c..6eaf56743c 100644 --- a/packages/nocodb/src/lib/models/GridView.ts +++ b/packages/nocodb/src/lib/models/GridView.ts @@ -1,9 +1,9 @@ import Noco from '../Noco'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; -import GridViewColumn from './GridViewColumn'; -import View from './View'; import NocoCache from '../cache/NocoCache'; import { extractProps } from '../meta/helpers/extractProps'; +import GridViewColumn from './GridViewColumn'; +import View from './View'; import type { GridType, MetaType } from 'nocodb-sdk'; export default class GridView implements GridType { diff --git a/packages/nocodb/src/lib/models/GridViewColumn.ts b/packages/nocodb/src/lib/models/GridViewColumn.ts index 7eef4a0afa..0b90395f13 100644 --- a/packages/nocodb/src/lib/models/GridViewColumn.ts +++ b/packages/nocodb/src/lib/models/GridViewColumn.ts @@ -1,9 +1,9 @@ import Noco from '../Noco'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; -import type { BoolType, GridColumnType } from 'nocodb-sdk'; import { extractProps } from '../meta/helpers/extractProps'; -import View from './View'; import NocoCache from '../cache/NocoCache'; +import View from './View'; +import type { BoolType, GridColumnType } from 'nocodb-sdk'; export default class GridViewColumn implements GridColumnType { id: string; diff --git a/packages/nocodb/src/lib/models/Hook.ts b/packages/nocodb/src/lib/models/Hook.ts index b56c10d30f..c970d0ef43 100644 --- a/packages/nocodb/src/lib/models/Hook.ts +++ b/packages/nocodb/src/lib/models/Hook.ts @@ -1,4 +1,3 @@ -import type { BoolType, HookReqType, HookType } from 'nocodb-sdk'; import { CacheDelDirection, CacheGetType, @@ -6,11 +5,12 @@ import { MetaTable, } from '../utils/globals'; import Noco from '../Noco'; -import Model from './Model'; import NocoCache from '../cache/NocoCache'; +import { extractProps } from '../meta/helpers/extractProps'; +import Model from './Model'; import Filter from './Filter'; import HookFilter from './HookFilter'; -import { extractProps } from '../meta/helpers/extractProps'; +import type { BoolType, HookReqType, HookType } from 'nocodb-sdk'; export default class Hook implements HookType { id?: string; diff --git a/packages/nocodb/src/lib/models/HookFilter.ts b/packages/nocodb/src/lib/models/HookFilter.ts index 7a6b962104..b9b66fb8f3 100644 --- a/packages/nocodb/src/lib/models/HookFilter.ts +++ b/packages/nocodb/src/lib/models/HookFilter.ts @@ -1,17 +1,17 @@ +import { UITypes } from 'nocodb-sdk'; import Noco from '../Noco'; -import Model from './Model'; -import Column from './Column'; import { CacheDelDirection, CacheGetType, CacheScope, MetaTable, } from '../utils/globals'; -import View from './View'; -import type { FilterType } from 'nocodb-sdk'; -import { UITypes } from 'nocodb-sdk'; import NocoCache from '../cache/NocoCache'; import { extractProps } from '../meta/helpers/extractProps'; +import Model from './Model'; +import Column from './Column'; +import View from './View'; +import type { FilterType } from 'nocodb-sdk'; export default class Filter { id: string; diff --git a/packages/nocodb/src/lib/models/KanbanView.ts b/packages/nocodb/src/lib/models/KanbanView.ts index 7819fedb15..64481eb7ca 100644 --- a/packages/nocodb/src/lib/models/KanbanView.ts +++ b/packages/nocodb/src/lib/models/KanbanView.ts @@ -1,10 +1,10 @@ -import Noco from '../Noco'; import { UITypes } from 'nocodb-sdk'; -import type { BoolType, KanbanType, MetaType } from 'nocodb-sdk'; +import Noco from '../Noco'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; -import View from './View'; import NocoCache from '../cache/NocoCache'; import { extractProps } from '../meta/helpers/extractProps'; +import View from './View'; +import type { BoolType, KanbanType, MetaType } from 'nocodb-sdk'; export default class KanbanView implements KanbanType { fk_view_id: string; diff --git a/packages/nocodb/src/lib/models/KanbanViewColumn.ts b/packages/nocodb/src/lib/models/KanbanViewColumn.ts index 026471e16b..71e58954dd 100644 --- a/packages/nocodb/src/lib/models/KanbanViewColumn.ts +++ b/packages/nocodb/src/lib/models/KanbanViewColumn.ts @@ -1,8 +1,8 @@ import Noco from '../Noco'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; -import View from './View'; import NocoCache from '../cache/NocoCache'; import { extractProps } from '../meta/helpers/extractProps'; +import View from './View'; import type { BoolType, KanbanColumnType } from 'nocodb-sdk'; export default class KanbanViewColumn implements KanbanColumnType { diff --git a/packages/nocodb/src/lib/models/LinkToAnotherRecordColumn.ts b/packages/nocodb/src/lib/models/LinkToAnotherRecordColumn.ts index 59ec7a85e0..a8e0413604 100644 --- a/packages/nocodb/src/lib/models/LinkToAnotherRecordColumn.ts +++ b/packages/nocodb/src/lib/models/LinkToAnotherRecordColumn.ts @@ -1,10 +1,10 @@ -import type { BoolType } from 'nocodb-sdk'; import Noco from '../Noco'; -import Column from './Column'; -import Model from './Model'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; import NocoCache from '../cache/NocoCache'; import { extractProps } from '../meta/helpers/extractProps'; +import Model from './Model'; +import Column from './Column'; +import type { BoolType } from 'nocodb-sdk'; export default class LinkToAnotherRecordColumn { fk_column_id?: string; diff --git a/packages/nocodb/src/lib/models/LookupColumn.ts b/packages/nocodb/src/lib/models/LookupColumn.ts index 2a19fe7a68..b68d0dad7e 100644 --- a/packages/nocodb/src/lib/models/LookupColumn.ts +++ b/packages/nocodb/src/lib/models/LookupColumn.ts @@ -1,8 +1,8 @@ import Noco from '../Noco'; -import Column from './Column'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; import NocoCache from '../cache/NocoCache'; import { extractProps } from '../meta/helpers/extractProps'; +import Column from './Column'; import type { LookupType } from 'nocodb-sdk'; export default class LookupColumn implements LookupType { diff --git a/packages/nocodb/src/lib/models/MapView.ts b/packages/nocodb/src/lib/models/MapView.ts index 283b68e15c..d8f1030502 100644 --- a/packages/nocodb/src/lib/models/MapView.ts +++ b/packages/nocodb/src/lib/models/MapView.ts @@ -1,9 +1,9 @@ import Noco from '../Noco'; -import type { MapType } from 'nocodb-sdk'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; -import View from './View'; import NocoCache from '../cache/NocoCache'; +import View from './View'; import MapViewColumn from './MapViewColumn'; +import type { MapType } from 'nocodb-sdk'; export default class MapView implements MapType { fk_view_id: string; diff --git a/packages/nocodb/src/lib/models/MapViewColumn.ts b/packages/nocodb/src/lib/models/MapViewColumn.ts index c075107091..a5781bf1df 100644 --- a/packages/nocodb/src/lib/models/MapViewColumn.ts +++ b/packages/nocodb/src/lib/models/MapViewColumn.ts @@ -1,7 +1,7 @@ import Noco from '../Noco'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; -import View from './View'; import NocoCache from '../cache/NocoCache'; +import View from './View'; import type { BoolType } from 'nocodb-sdk'; export default class MapViewColumn { diff --git a/packages/nocodb/src/lib/models/Model.ts b/packages/nocodb/src/lib/models/Model.ts index 4b09fa0952..1128aceb73 100644 --- a/packages/nocodb/src/lib/models/Model.ts +++ b/packages/nocodb/src/lib/models/Model.ts @@ -1,22 +1,22 @@ +import { isVirtualCol, ModelTypes, UITypes, ViewTypes } from 'nocodb-sdk'; import Noco from '../Noco'; import { parseMetaProp } from '../utils/modelUtils'; -import Column from './Column'; import NocoCache from '../cache/NocoCache'; -import type { XKnex } from '../db/sql-data-mapper'; import { BaseModelSqlv2 } from '../db/sql-data-mapper/lib/sql/BaseModelSqlv2'; -import type { BoolType, TableReqType, TableType } from 'nocodb-sdk'; -import { isVirtualCol, ModelTypes, UITypes, ViewTypes } from 'nocodb-sdk'; import { CacheDelDirection, CacheGetType, CacheScope, MetaTable, } from '../utils/globals'; -import View from './View'; import { NcError } from '../meta/helpers/catchError'; -import Audit from './Audit'; import { sanitize } from '../db/sql-data-mapper/lib/sql/helpers/sanitize'; import { extractProps } from '../meta/helpers/extractProps'; +import Audit from './Audit'; +import View from './View'; +import Column from './Column'; +import type { BoolType, TableReqType, TableType } from 'nocodb-sdk'; +import type { XKnex } from '../db/sql-data-mapper'; export default class Model implements TableType { copy_enabled: BoolType; diff --git a/packages/nocodb/src/lib/models/ModelRoleVisibility.ts b/packages/nocodb/src/lib/models/ModelRoleVisibility.ts index c3fe6baaf2..e08537189c 100644 --- a/packages/nocodb/src/lib/models/ModelRoleVisibility.ts +++ b/packages/nocodb/src/lib/models/ModelRoleVisibility.ts @@ -1,4 +1,3 @@ -import type { ModelRoleVisibilityType } from 'nocodb-sdk'; import Noco from '../Noco'; import { CacheDelDirection, @@ -7,8 +6,9 @@ import { MetaTable, } from '../utils/globals'; import NocoCache from '../cache/NocoCache'; -import View from './View'; import { extractProps } from '../meta/helpers/extractProps'; +import View from './View'; +import type { ModelRoleVisibilityType } from 'nocodb-sdk'; export default class ModelRoleVisibility implements ModelRoleVisibilityType { id?: string; diff --git a/packages/nocodb/src/lib/models/Plugin.ts b/packages/nocodb/src/lib/models/Plugin.ts index 4467a52aba..b181ccecfb 100644 --- a/packages/nocodb/src/lib/models/Plugin.ts +++ b/packages/nocodb/src/lib/models/Plugin.ts @@ -1,8 +1,8 @@ -import type { PluginType } from 'nocodb-sdk'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; import Noco from '../Noco'; import NocoCache from '../cache/NocoCache'; import { extractProps } from '../meta/helpers/extractProps'; +import type { PluginType } from 'nocodb-sdk'; export default class Plugin implements PluginType { id?: string; diff --git a/packages/nocodb/src/lib/models/Project.ts b/packages/nocodb/src/lib/models/Project.ts index 7e746a13eb..a109b8c186 100644 --- a/packages/nocodb/src/lib/models/Project.ts +++ b/packages/nocodb/src/lib/models/Project.ts @@ -1,7 +1,4 @@ -import type { DB_TYPES } from './/Base'; -import Base from './/Base'; import Noco from '../Noco'; -import type { BoolType, MetaType, ProjectType } from 'nocodb-sdk'; import { CacheDelDirection, CacheGetType, @@ -10,6 +7,9 @@ import { } from '../utils/globals'; import { extractProps } from '../meta/helpers/extractProps'; import NocoCache from '../cache/NocoCache'; +import Base from './/Base'; +import type { BoolType, MetaType, ProjectType } from 'nocodb-sdk'; +import type { DB_TYPES } from './/Base'; export default class Project implements ProjectType { public id: string; diff --git a/packages/nocodb/src/lib/models/ProjectUser.ts b/packages/nocodb/src/lib/models/ProjectUser.ts index b21803f50d..1090a10c2e 100644 --- a/packages/nocodb/src/lib/models/ProjectUser.ts +++ b/packages/nocodb/src/lib/models/ProjectUser.ts @@ -1,4 +1,3 @@ -import type { ProjectType } from 'nocodb-sdk'; import { // CacheDelDirection, CacheGetType, @@ -7,8 +6,9 @@ import { } from '../utils/globals'; import Noco from '../Noco'; import NocoCache from '../cache/NocoCache'; -import User from './User'; import { extractProps } from '../meta/helpers/extractProps'; +import User from './User'; +import type { ProjectType } from 'nocodb-sdk'; export default class ProjectUser { project_id: string; diff --git a/packages/nocodb/src/lib/models/RollupColumn.ts b/packages/nocodb/src/lib/models/RollupColumn.ts index 3781cc4a7e..c0b6c89746 100644 --- a/packages/nocodb/src/lib/models/RollupColumn.ts +++ b/packages/nocodb/src/lib/models/RollupColumn.ts @@ -1,8 +1,8 @@ import Noco from '../Noco'; -import Column from './Column'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; import NocoCache from '../cache/NocoCache'; import { extractProps } from '../meta/helpers/extractProps'; +import Column from './Column'; import type { RollupType } from 'nocodb-sdk'; export const ROLLUP_FUNCTIONS = [ diff --git a/packages/nocodb/src/lib/models/Sort.ts b/packages/nocodb/src/lib/models/Sort.ts index 112b942a8e..9c9681b567 100644 --- a/packages/nocodb/src/lib/models/Sort.ts +++ b/packages/nocodb/src/lib/models/Sort.ts @@ -1,6 +1,4 @@ import Noco from '../Noco'; -import Model from './Model'; -import Column from './Column'; import { CacheDelDirection, CacheGetType, @@ -8,8 +6,10 @@ import { MetaTable, } from '../utils/globals'; import NocoCache from '../cache/NocoCache'; -import type { SortType } from 'nocodb-sdk'; import { extractProps } from '../meta/helpers/extractProps'; +import Model from './Model'; +import Column from './Column'; +import type { SortType } from 'nocodb-sdk'; export default class Sort { id: string; diff --git a/packages/nocodb/src/lib/models/User.ts b/packages/nocodb/src/lib/models/User.ts index 86b900f61f..7df87f2d0e 100644 --- a/packages/nocodb/src/lib/models/User.ts +++ b/packages/nocodb/src/lib/models/User.ts @@ -1,9 +1,9 @@ -import type { UserType } from 'nocodb-sdk'; import { NcError } from '../meta/helpers/catchError'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; import Noco from '../Noco'; import { extractProps } from '../meta/helpers/extractProps'; import NocoCache from '../cache/NocoCache'; +import type { UserType } from 'nocodb-sdk'; export default class User implements UserType { id: string; diff --git a/packages/nocodb/src/lib/models/View.ts b/packages/nocodb/src/lib/models/View.ts index fee31c6d21..5f88d4b41d 100644 --- a/packages/nocodb/src/lib/models/View.ts +++ b/packages/nocodb/src/lib/models/View.ts @@ -1,3 +1,4 @@ +import { isSystemColumn, UITypes, ViewTypes } from 'nocodb-sdk'; import Noco from '../Noco'; import { CacheDelDirection, @@ -6,6 +7,8 @@ import { MetaTable, } from '../utils/globals'; import { parseMetaProp, stringifyMetaProp } from '../utils/modelUtils'; +import NocoCache from '../cache/NocoCache'; +import { extractProps } from '../meta/helpers/extractProps'; import Model from './Model'; import FormView from './FormView'; import GridView from './GridView'; @@ -14,16 +17,13 @@ import GalleryView from './GalleryView'; import GridViewColumn from './GridViewColumn'; import Sort from './Sort'; import Filter from './Filter'; -import type { BoolType, ColumnReqType, ViewType } from 'nocodb-sdk'; -import { isSystemColumn, UITypes, ViewTypes } from 'nocodb-sdk'; import GalleryViewColumn from './GalleryViewColumn'; import FormViewColumn from './FormViewColumn'; import KanbanViewColumn from './KanbanViewColumn'; import Column from './Column'; -import NocoCache from '../cache/NocoCache'; -import { extractProps } from '../meta/helpers/extractProps'; import MapView from './MapView'; import MapViewColumn from './MapViewColumn'; +import type { BoolType, ColumnReqType, ViewType } from 'nocodb-sdk'; const { v4: uuidv4 } = require('uuid'); export default class View implements ViewType { diff --git a/packages/nocodb/src/lib/plugins/backblaze/Backblaze.ts b/packages/nocodb/src/lib/plugins/backblaze/Backblaze.ts index 3b35019c96..4198c6b005 100644 --- a/packages/nocodb/src/lib/plugins/backblaze/Backblaze.ts +++ b/packages/nocodb/src/lib/plugins/backblaze/Backblaze.ts @@ -1,12 +1,12 @@ import fs from 'fs'; import { promisify } from 'util'; import AWS from 'aws-sdk'; -import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import request from 'request'; import { generateTempFilePath, waitForStreamClose, } from '../../utils/pluginUtils'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; export default class Backblaze implements IStorageAdapterV2 { private s3Client: AWS.S3; diff --git a/packages/nocodb/src/lib/plugins/backblaze/BackblazePlugin.ts b/packages/nocodb/src/lib/plugins/backblaze/BackblazePlugin.ts index 021cd47294..d47ab6e3a2 100644 --- a/packages/nocodb/src/lib/plugins/backblaze/BackblazePlugin.ts +++ b/packages/nocodb/src/lib/plugins/backblaze/BackblazePlugin.ts @@ -1,7 +1,7 @@ -import type { IStorageAdapterV2 } from 'nc-plugin'; import { XcStoragePlugin } from 'nc-plugin'; import Backblaze from './Backblaze'; +import type { IStorageAdapterV2 } from 'nc-plugin'; class BackblazePlugin extends XcStoragePlugin { private static storageAdapter: Backblaze; diff --git a/packages/nocodb/src/lib/plugins/backblaze/index.ts b/packages/nocodb/src/lib/plugins/backblaze/index.ts index ea68414513..1532fbfa03 100644 --- a/packages/nocodb/src/lib/plugins/backblaze/index.ts +++ b/packages/nocodb/src/lib/plugins/backblaze/index.ts @@ -1,7 +1,6 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; - import BackblazePlugin from './BackblazePlugin'; +import type { XcPluginConfig } from 'nc-plugin'; const config: XcPluginConfig = { builder: BackblazePlugin, diff --git a/packages/nocodb/src/lib/plugins/discord/DiscordPlugin.ts b/packages/nocodb/src/lib/plugins/discord/DiscordPlugin.ts index 87d7c40c78..1eee332780 100644 --- a/packages/nocodb/src/lib/plugins/discord/DiscordPlugin.ts +++ b/packages/nocodb/src/lib/plugins/discord/DiscordPlugin.ts @@ -1,7 +1,7 @@ -import type { IWebhookNotificationAdapter } from 'nc-plugin'; import { XcWebhookNotificationPlugin } from 'nc-plugin'; import Discord from './Discord'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; class DiscordPlugin extends XcWebhookNotificationPlugin { private static notificationAdapter: Discord; diff --git a/packages/nocodb/src/lib/plugins/discord/index.ts b/packages/nocodb/src/lib/plugins/discord/index.ts index 1007afbd0f..edb243935a 100644 --- a/packages/nocodb/src/lib/plugins/discord/index.ts +++ b/packages/nocodb/src/lib/plugins/discord/index.ts @@ -1,7 +1,6 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; - import DiscordPlugin from './DiscordPlugin'; +import type { XcPluginConfig } from 'nc-plugin'; const config: XcPluginConfig = { builder: DiscordPlugin, diff --git a/packages/nocodb/src/lib/plugins/gcs/Gcs.ts b/packages/nocodb/src/lib/plugins/gcs/Gcs.ts index f37d3cbf4a..cf20ba7737 100644 --- a/packages/nocodb/src/lib/plugins/gcs/Gcs.ts +++ b/packages/nocodb/src/lib/plugins/gcs/Gcs.ts @@ -1,13 +1,13 @@ import fs from 'fs'; import { promisify } from 'util'; -import type { StorageOptions } from '@google-cloud/storage'; import { Storage } from '@google-cloud/storage'; -import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import request from 'request'; import { generateTempFilePath, waitForStreamClose, } from '../../utils/pluginUtils'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; +import type { StorageOptions } from '@google-cloud/storage'; export default class Gcs implements IStorageAdapterV2 { private storageClient: Storage; diff --git a/packages/nocodb/src/lib/plugins/gcs/GcsPlugin.ts b/packages/nocodb/src/lib/plugins/gcs/GcsPlugin.ts index 5a98b2cf69..7a3dc95bbf 100644 --- a/packages/nocodb/src/lib/plugins/gcs/GcsPlugin.ts +++ b/packages/nocodb/src/lib/plugins/gcs/GcsPlugin.ts @@ -1,7 +1,7 @@ -import type { IStorageAdapterV2 } from 'nc-plugin'; import { XcStoragePlugin } from 'nc-plugin'; import Gcs from './Gcs'; +import type { IStorageAdapterV2 } from 'nc-plugin'; class GcsPlugin extends XcStoragePlugin { private static storageAdapter: Gcs; diff --git a/packages/nocodb/src/lib/plugins/gcs/index.ts b/packages/nocodb/src/lib/plugins/gcs/index.ts index 559f45b5b0..dd9bbd09b4 100644 --- a/packages/nocodb/src/lib/plugins/gcs/index.ts +++ b/packages/nocodb/src/lib/plugins/gcs/index.ts @@ -1,7 +1,6 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; - import GcsPlugin from './GcsPlugin'; +import type { XcPluginConfig } from 'nc-plugin'; const config: XcPluginConfig = { builder: GcsPlugin, diff --git a/packages/nocodb/src/lib/plugins/linode/LinodeObjectStorage.ts b/packages/nocodb/src/lib/plugins/linode/LinodeObjectStorage.ts index f1cc13eccc..fdaaa36556 100644 --- a/packages/nocodb/src/lib/plugins/linode/LinodeObjectStorage.ts +++ b/packages/nocodb/src/lib/plugins/linode/LinodeObjectStorage.ts @@ -1,12 +1,12 @@ import fs from 'fs'; import { promisify } from 'util'; import AWS from 'aws-sdk'; -import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import request from 'request'; import { generateTempFilePath, waitForStreamClose, } from '../../utils/pluginUtils'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; export default class LinodeObjectStorage implements IStorageAdapterV2 { private s3Client: AWS.S3; diff --git a/packages/nocodb/src/lib/plugins/linode/LinodeObjectStoragePlugin.ts b/packages/nocodb/src/lib/plugins/linode/LinodeObjectStoragePlugin.ts index 93e83521bf..99f56077dd 100644 --- a/packages/nocodb/src/lib/plugins/linode/LinodeObjectStoragePlugin.ts +++ b/packages/nocodb/src/lib/plugins/linode/LinodeObjectStoragePlugin.ts @@ -1,7 +1,7 @@ -import type { IStorageAdapterV2 } from 'nc-plugin'; import { XcStoragePlugin } from 'nc-plugin'; import LinodeObjectStorage from './LinodeObjectStorage'; +import type { IStorageAdapterV2 } from 'nc-plugin'; class LinodeObjectStoragePlugin extends XcStoragePlugin { private static storageAdapter: LinodeObjectStorage; diff --git a/packages/nocodb/src/lib/plugins/linode/index.ts b/packages/nocodb/src/lib/plugins/linode/index.ts index c173844715..60536e598a 100644 --- a/packages/nocodb/src/lib/plugins/linode/index.ts +++ b/packages/nocodb/src/lib/plugins/linode/index.ts @@ -1,7 +1,6 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; - import LinodeObjectStoragePlugin from './LinodeObjectStoragePlugin'; +import type { XcPluginConfig } from 'nc-plugin'; const config: XcPluginConfig = { builder: LinodeObjectStoragePlugin, diff --git a/packages/nocodb/src/lib/plugins/mailerSend/MailerSend.ts b/packages/nocodb/src/lib/plugins/mailerSend/MailerSend.ts index 3247ba7c2c..e681e47f8e 100644 --- a/packages/nocodb/src/lib/plugins/mailerSend/MailerSend.ts +++ b/packages/nocodb/src/lib/plugins/mailerSend/MailerSend.ts @@ -1,5 +1,5 @@ -import type { IEmailAdapter } from 'nc-plugin'; import MailerSend, { EmailParams, Recipient } from 'mailersend'; +import type { IEmailAdapter } from 'nc-plugin'; import type { XcEmail } from '../../../interface/IEmailAdapter'; diff --git a/packages/nocodb/src/lib/plugins/mailerSend/MailerSendPlugin.ts b/packages/nocodb/src/lib/plugins/mailerSend/MailerSendPlugin.ts index 3513dca12e..c3b898ceb0 100644 --- a/packages/nocodb/src/lib/plugins/mailerSend/MailerSendPlugin.ts +++ b/packages/nocodb/src/lib/plugins/mailerSend/MailerSendPlugin.ts @@ -1,7 +1,7 @@ -import type { IEmailAdapter } from 'nc-plugin'; import { XcEmailPlugin } from 'nc-plugin'; import MailerSend from './MailerSend'; +import type { IEmailAdapter } from 'nc-plugin'; class MailerSendPlugin extends XcEmailPlugin { private static storageAdapter: MailerSend; diff --git a/packages/nocodb/src/lib/plugins/mailerSend/index.ts b/packages/nocodb/src/lib/plugins/mailerSend/index.ts index 634697cd0b..a82ff48044 100644 --- a/packages/nocodb/src/lib/plugins/mailerSend/index.ts +++ b/packages/nocodb/src/lib/plugins/mailerSend/index.ts @@ -1,7 +1,6 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; - import MailerSendPlugin from './MailerSendPlugin'; +import type { XcPluginConfig } from 'nc-plugin'; const config: XcPluginConfig = { builder: MailerSendPlugin, diff --git a/packages/nocodb/src/lib/plugins/mattermost/MattermostPlugin.ts b/packages/nocodb/src/lib/plugins/mattermost/MattermostPlugin.ts index 2ca36cda42..dcff6d1f3a 100644 --- a/packages/nocodb/src/lib/plugins/mattermost/MattermostPlugin.ts +++ b/packages/nocodb/src/lib/plugins/mattermost/MattermostPlugin.ts @@ -1,7 +1,7 @@ -import type { IWebhookNotificationAdapter } from 'nc-plugin'; import { XcWebhookNotificationPlugin } from 'nc-plugin'; import Mattermost from './Mattermost'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; class MattermostPlugin extends XcWebhookNotificationPlugin { private static notificationAdapter: Mattermost; diff --git a/packages/nocodb/src/lib/plugins/mattermost/index.ts b/packages/nocodb/src/lib/plugins/mattermost/index.ts index fde545601d..d4b176ce11 100644 --- a/packages/nocodb/src/lib/plugins/mattermost/index.ts +++ b/packages/nocodb/src/lib/plugins/mattermost/index.ts @@ -1,7 +1,6 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; - import MattermostPlugin from './MattermostPlugin'; +import type { XcPluginConfig } from 'nc-plugin'; const config: XcPluginConfig = { builder: MattermostPlugin, diff --git a/packages/nocodb/src/lib/plugins/mino/Minio.ts b/packages/nocodb/src/lib/plugins/mino/Minio.ts index 7a704b6e49..5534ce5cfe 100644 --- a/packages/nocodb/src/lib/plugins/mino/Minio.ts +++ b/packages/nocodb/src/lib/plugins/mino/Minio.ts @@ -1,12 +1,12 @@ import fs from 'fs'; import { promisify } from 'util'; import { Client as MinioClient } from 'minio'; -import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import request from 'request'; import { generateTempFilePath, waitForStreamClose, } from '../../utils/pluginUtils'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; export default class Minio implements IStorageAdapterV2 { private minioClient: MinioClient; diff --git a/packages/nocodb/src/lib/plugins/mino/MinioPlugin.ts b/packages/nocodb/src/lib/plugins/mino/MinioPlugin.ts index 73b0fc9f38..e742305d98 100644 --- a/packages/nocodb/src/lib/plugins/mino/MinioPlugin.ts +++ b/packages/nocodb/src/lib/plugins/mino/MinioPlugin.ts @@ -1,7 +1,7 @@ -import type { IStorageAdapterV2 } from 'nc-plugin'; import { XcStoragePlugin } from 'nc-plugin'; import Minio from './Minio'; +import type { IStorageAdapterV2 } from 'nc-plugin'; class MinioPlugin extends XcStoragePlugin { private static storageAdapter: Minio; diff --git a/packages/nocodb/src/lib/plugins/mino/index.ts b/packages/nocodb/src/lib/plugins/mino/index.ts index 71a306a427..3cb319a5ce 100644 --- a/packages/nocodb/src/lib/plugins/mino/index.ts +++ b/packages/nocodb/src/lib/plugins/mino/index.ts @@ -1,7 +1,6 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; - import S3Plugin from './MinioPlugin'; +import type { XcPluginConfig } from 'nc-plugin'; const config: XcPluginConfig = { builder: S3Plugin, diff --git a/packages/nocodb/src/lib/plugins/ovhCloud/OvhCloud.ts b/packages/nocodb/src/lib/plugins/ovhCloud/OvhCloud.ts index f3a923e7d1..704f43551b 100644 --- a/packages/nocodb/src/lib/plugins/ovhCloud/OvhCloud.ts +++ b/packages/nocodb/src/lib/plugins/ovhCloud/OvhCloud.ts @@ -1,12 +1,12 @@ import fs from 'fs'; import { promisify } from 'util'; import AWS from 'aws-sdk'; -import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import request from 'request'; import { generateTempFilePath, waitForStreamClose, } from '../../utils/pluginUtils'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; export default class OvhCloud implements IStorageAdapterV2 { private s3Client: AWS.S3; diff --git a/packages/nocodb/src/lib/plugins/ovhCloud/OvhCloudPlugin.ts b/packages/nocodb/src/lib/plugins/ovhCloud/OvhCloudPlugin.ts index ce07900c35..729c4137ec 100644 --- a/packages/nocodb/src/lib/plugins/ovhCloud/OvhCloudPlugin.ts +++ b/packages/nocodb/src/lib/plugins/ovhCloud/OvhCloudPlugin.ts @@ -1,7 +1,7 @@ -import type { IStorageAdapterV2 } from 'nc-plugin'; import { XcStoragePlugin } from 'nc-plugin'; import OvhCloud from './OvhCloud'; +import type { IStorageAdapterV2 } from 'nc-plugin'; class OvhCloudPlugin extends XcStoragePlugin { private static storageAdapter: OvhCloud; diff --git a/packages/nocodb/src/lib/plugins/ovhCloud/index.ts b/packages/nocodb/src/lib/plugins/ovhCloud/index.ts index 0b0398e5d6..4429dcd556 100644 --- a/packages/nocodb/src/lib/plugins/ovhCloud/index.ts +++ b/packages/nocodb/src/lib/plugins/ovhCloud/index.ts @@ -1,7 +1,6 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; - import OvhCloud from './OvhCloudPlugin'; +import type { XcPluginConfig } from 'nc-plugin'; const config: XcPluginConfig = { builder: OvhCloud, diff --git a/packages/nocodb/src/lib/plugins/s3/S3.ts b/packages/nocodb/src/lib/plugins/s3/S3.ts index c1f0acdd68..1b5beb4ab7 100644 --- a/packages/nocodb/src/lib/plugins/s3/S3.ts +++ b/packages/nocodb/src/lib/plugins/s3/S3.ts @@ -1,12 +1,12 @@ import fs from 'fs'; import { promisify } from 'util'; import AWS from 'aws-sdk'; -import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import request from 'request'; import { generateTempFilePath, waitForStreamClose, } from '../../utils/pluginUtils'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; export default class S3 implements IStorageAdapterV2 { private s3Client: AWS.S3; diff --git a/packages/nocodb/src/lib/plugins/s3/S3Plugin.ts b/packages/nocodb/src/lib/plugins/s3/S3Plugin.ts index 00b0e165ca..9e9f3de44d 100644 --- a/packages/nocodb/src/lib/plugins/s3/S3Plugin.ts +++ b/packages/nocodb/src/lib/plugins/s3/S3Plugin.ts @@ -1,7 +1,7 @@ -import type { IStorageAdapterV2 } from 'nc-plugin'; import { XcStoragePlugin } from 'nc-plugin'; import S3 from './S3'; +import type { IStorageAdapterV2 } from 'nc-plugin'; class S3Plugin extends XcStoragePlugin { private static storageAdapter: S3; diff --git a/packages/nocodb/src/lib/plugins/s3/index.ts b/packages/nocodb/src/lib/plugins/s3/index.ts index 27d8f9bb2e..a5ca6d75a9 100644 --- a/packages/nocodb/src/lib/plugins/s3/index.ts +++ b/packages/nocodb/src/lib/plugins/s3/index.ts @@ -1,7 +1,6 @@ import { PluginCategory, XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; - import S3Plugin from './S3Plugin'; +import type { XcPluginConfig } from 'nc-plugin'; const config: XcPluginConfig = { builder: S3Plugin, diff --git a/packages/nocodb/src/lib/plugins/scaleway/ScalewayObjectStorage.ts b/packages/nocodb/src/lib/plugins/scaleway/ScalewayObjectStorage.ts index 3f61bb6a30..4eb851e0e4 100644 --- a/packages/nocodb/src/lib/plugins/scaleway/ScalewayObjectStorage.ts +++ b/packages/nocodb/src/lib/plugins/scaleway/ScalewayObjectStorage.ts @@ -1,12 +1,12 @@ import fs from 'fs'; import { promisify } from 'util'; -import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import AWS from 'aws-sdk'; import request from 'request'; import { generateTempFilePath, waitForStreamClose, } from '../../utils/pluginUtils'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; export default class ScalewayObjectStorage implements IStorageAdapterV2 { private s3Client: AWS.S3; diff --git a/packages/nocodb/src/lib/plugins/scaleway/ScalewayObjectStoragePlugin.ts b/packages/nocodb/src/lib/plugins/scaleway/ScalewayObjectStoragePlugin.ts index ea16b70846..b3f7f6eec6 100644 --- a/packages/nocodb/src/lib/plugins/scaleway/ScalewayObjectStoragePlugin.ts +++ b/packages/nocodb/src/lib/plugins/scaleway/ScalewayObjectStoragePlugin.ts @@ -1,7 +1,7 @@ -import type { IStorageAdapterV2 } from 'nc-plugin'; import { XcStoragePlugin } from 'nc-plugin'; import ScalewayObjectStorage from './ScalewayObjectStorage'; +import type { IStorageAdapterV2 } from 'nc-plugin'; class ScalewayObjectStoragePlugin extends XcStoragePlugin { private static storageAdapter: ScalewayObjectStorage; diff --git a/packages/nocodb/src/lib/plugins/scaleway/index.ts b/packages/nocodb/src/lib/plugins/scaleway/index.ts index e3f95fda62..5a248de8f8 100644 --- a/packages/nocodb/src/lib/plugins/scaleway/index.ts +++ b/packages/nocodb/src/lib/plugins/scaleway/index.ts @@ -1,6 +1,6 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; import ScalewayObjectStoragePlugin from './ScalewayObjectStoragePlugin'; +import type { XcPluginConfig } from 'nc-plugin'; const config: XcPluginConfig = { builder: ScalewayObjectStoragePlugin, diff --git a/packages/nocodb/src/lib/plugins/ses/SES.ts b/packages/nocodb/src/lib/plugins/ses/SES.ts index de0fbc284a..da065d4500 100644 --- a/packages/nocodb/src/lib/plugins/ses/SES.ts +++ b/packages/nocodb/src/lib/plugins/ses/SES.ts @@ -1,7 +1,7 @@ -import type { IEmailAdapter } from 'nc-plugin'; import nodemailer from 'nodemailer'; -import type Mail from 'nodemailer/lib/mailer'; import AWS from 'aws-sdk'; +import type { IEmailAdapter } from 'nc-plugin'; +import type Mail from 'nodemailer/lib/mailer'; import type { XcEmail } from '../../../interface/IEmailAdapter'; export default class SES implements IEmailAdapter { diff --git a/packages/nocodb/src/lib/plugins/ses/SESPlugin.ts b/packages/nocodb/src/lib/plugins/ses/SESPlugin.ts index 6868ada988..ba9ab48eb9 100644 --- a/packages/nocodb/src/lib/plugins/ses/SESPlugin.ts +++ b/packages/nocodb/src/lib/plugins/ses/SESPlugin.ts @@ -1,7 +1,7 @@ -import type { IEmailAdapter } from 'nc-plugin'; import { XcEmailPlugin } from 'nc-plugin'; import SES from './SES'; +import type { IEmailAdapter } from 'nc-plugin'; class SESPlugin extends XcEmailPlugin { private static storageAdapter: SES; diff --git a/packages/nocodb/src/lib/plugins/ses/index.ts b/packages/nocodb/src/lib/plugins/ses/index.ts index d94ecec8de..c980733b4b 100644 --- a/packages/nocodb/src/lib/plugins/ses/index.ts +++ b/packages/nocodb/src/lib/plugins/ses/index.ts @@ -1,7 +1,6 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; - import SESPlugin from './SESPlugin'; +import type { XcPluginConfig } from 'nc-plugin'; const config: XcPluginConfig = { builder: SESPlugin, diff --git a/packages/nocodb/src/lib/plugins/slack/SlackPlugin.ts b/packages/nocodb/src/lib/plugins/slack/SlackPlugin.ts index 90f087da72..65668ad6a3 100644 --- a/packages/nocodb/src/lib/plugins/slack/SlackPlugin.ts +++ b/packages/nocodb/src/lib/plugins/slack/SlackPlugin.ts @@ -1,7 +1,7 @@ -import type { IWebhookNotificationAdapter } from 'nc-plugin'; import { XcWebhookNotificationPlugin } from 'nc-plugin'; import Slack from './Slack'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; class SlackPlugin extends XcWebhookNotificationPlugin { private static notificationAdapter: Slack; diff --git a/packages/nocodb/src/lib/plugins/slack/index.ts b/packages/nocodb/src/lib/plugins/slack/index.ts index 1751e4efff..75505e9ea7 100644 --- a/packages/nocodb/src/lib/plugins/slack/index.ts +++ b/packages/nocodb/src/lib/plugins/slack/index.ts @@ -1,7 +1,6 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; - import SlackPlugin from './SlackPlugin'; +import type { XcPluginConfig } from 'nc-plugin'; const config: XcPluginConfig = { builder: SlackPlugin, diff --git a/packages/nocodb/src/lib/plugins/smtp/SMTP.ts b/packages/nocodb/src/lib/plugins/smtp/SMTP.ts index 7279b44f40..d30fc02b45 100644 --- a/packages/nocodb/src/lib/plugins/smtp/SMTP.ts +++ b/packages/nocodb/src/lib/plugins/smtp/SMTP.ts @@ -1,5 +1,5 @@ -import type { IEmailAdapter } from 'nc-plugin'; import nodemailer from 'nodemailer'; +import type { IEmailAdapter } from 'nc-plugin'; import type Mail from 'nodemailer/lib/mailer'; import type { XcEmail } from '../../../interface/IEmailAdapter'; diff --git a/packages/nocodb/src/lib/plugins/smtp/SMTPPlugin.ts b/packages/nocodb/src/lib/plugins/smtp/SMTPPlugin.ts index 7e729a4598..e4624a5259 100644 --- a/packages/nocodb/src/lib/plugins/smtp/SMTPPlugin.ts +++ b/packages/nocodb/src/lib/plugins/smtp/SMTPPlugin.ts @@ -1,7 +1,7 @@ -import type { IEmailAdapter } from 'nc-plugin'; import { XcEmailPlugin } from 'nc-plugin'; import SMTP from './SMTP'; +import type { IEmailAdapter } from 'nc-plugin'; class SMTPPlugin extends XcEmailPlugin { private static storageAdapter: SMTP; diff --git a/packages/nocodb/src/lib/plugins/smtp/index.ts b/packages/nocodb/src/lib/plugins/smtp/index.ts index d1c40ff1aa..ed51e95053 100644 --- a/packages/nocodb/src/lib/plugins/smtp/index.ts +++ b/packages/nocodb/src/lib/plugins/smtp/index.ts @@ -1,7 +1,6 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; - import SMTPPlugin from './SMTPPlugin'; +import type { XcPluginConfig } from 'nc-plugin'; // @author diff --git a/packages/nocodb/src/lib/plugins/spaces/Spaces.ts b/packages/nocodb/src/lib/plugins/spaces/Spaces.ts index 666cd94897..9c2deead66 100644 --- a/packages/nocodb/src/lib/plugins/spaces/Spaces.ts +++ b/packages/nocodb/src/lib/plugins/spaces/Spaces.ts @@ -1,12 +1,12 @@ import fs from 'fs'; import { promisify } from 'util'; import AWS from 'aws-sdk'; -import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import request from 'request'; import { generateTempFilePath, waitForStreamClose, } from '../../utils/pluginUtils'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; export default class Spaces implements IStorageAdapterV2 { private s3Client: AWS.S3; diff --git a/packages/nocodb/src/lib/plugins/spaces/SpacesPlugin.ts b/packages/nocodb/src/lib/plugins/spaces/SpacesPlugin.ts index 9f7bbf8ed4..f63357621c 100644 --- a/packages/nocodb/src/lib/plugins/spaces/SpacesPlugin.ts +++ b/packages/nocodb/src/lib/plugins/spaces/SpacesPlugin.ts @@ -1,7 +1,7 @@ -import type { IStorageAdapterV2 } from 'nc-plugin'; import { XcStoragePlugin } from 'nc-plugin'; import Spaces from './Spaces'; +import type { IStorageAdapterV2 } from 'nc-plugin'; class SpacesPlugin extends XcStoragePlugin { private static storageAdapter: Spaces; diff --git a/packages/nocodb/src/lib/plugins/spaces/index.ts b/packages/nocodb/src/lib/plugins/spaces/index.ts index b4dd977d6b..ab6d2619d6 100644 --- a/packages/nocodb/src/lib/plugins/spaces/index.ts +++ b/packages/nocodb/src/lib/plugins/spaces/index.ts @@ -1,7 +1,6 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; - import SpacesPlugin from './SpacesPlugin'; +import type { XcPluginConfig } from 'nc-plugin'; const config: XcPluginConfig = { builder: SpacesPlugin, diff --git a/packages/nocodb/src/lib/plugins/teams/TeamsPlugin.ts b/packages/nocodb/src/lib/plugins/teams/TeamsPlugin.ts index 13f1f3a29f..aba2fc9f1c 100644 --- a/packages/nocodb/src/lib/plugins/teams/TeamsPlugin.ts +++ b/packages/nocodb/src/lib/plugins/teams/TeamsPlugin.ts @@ -1,7 +1,7 @@ -import type { IWebhookNotificationAdapter } from 'nc-plugin'; import { XcWebhookNotificationPlugin } from 'nc-plugin'; import Teams from './Teams'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; class TeamsPlugin extends XcWebhookNotificationPlugin { private static notificationAdapter: Teams; diff --git a/packages/nocodb/src/lib/plugins/teams/index.ts b/packages/nocodb/src/lib/plugins/teams/index.ts index 14cce713b0..f1b24a5fd6 100644 --- a/packages/nocodb/src/lib/plugins/teams/index.ts +++ b/packages/nocodb/src/lib/plugins/teams/index.ts @@ -1,7 +1,6 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; - import TeamsPlugin from './TeamsPlugin'; +import type { XcPluginConfig } from 'nc-plugin'; const config: XcPluginConfig = { builder: TeamsPlugin, diff --git a/packages/nocodb/src/lib/plugins/twilio/Twilio.ts b/packages/nocodb/src/lib/plugins/twilio/Twilio.ts index e7a1ac4a77..7de848c872 100644 --- a/packages/nocodb/src/lib/plugins/twilio/Twilio.ts +++ b/packages/nocodb/src/lib/plugins/twilio/Twilio.ts @@ -1,5 +1,5 @@ -import type { IWebhookNotificationAdapter } from 'nc-plugin'; import twilio from 'twilio'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; export default class Twilio implements IWebhookNotificationAdapter { private input: any; diff --git a/packages/nocodb/src/lib/plugins/twilio/TwilioPlugin.ts b/packages/nocodb/src/lib/plugins/twilio/TwilioPlugin.ts index a9b5a460e8..c37b6f8dfe 100644 --- a/packages/nocodb/src/lib/plugins/twilio/TwilioPlugin.ts +++ b/packages/nocodb/src/lib/plugins/twilio/TwilioPlugin.ts @@ -1,7 +1,7 @@ -import type { IWebhookNotificationAdapter } from 'nc-plugin'; import { XcWebhookNotificationPlugin } from 'nc-plugin'; import Twilio from './Twilio'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; class TwilioPlugin extends XcWebhookNotificationPlugin { private static notificationAdapter: Twilio; diff --git a/packages/nocodb/src/lib/plugins/twilio/index.ts b/packages/nocodb/src/lib/plugins/twilio/index.ts index ebb699a62f..dc0e4be792 100644 --- a/packages/nocodb/src/lib/plugins/twilio/index.ts +++ b/packages/nocodb/src/lib/plugins/twilio/index.ts @@ -1,7 +1,6 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; - import TwilioPlugin from './TwilioPlugin'; +import type { XcPluginConfig } from 'nc-plugin'; const config: XcPluginConfig = { builder: TwilioPlugin, diff --git a/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsapp.ts b/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsapp.ts index 29dbb0d59e..1120fa1f35 100644 --- a/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsapp.ts +++ b/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsapp.ts @@ -1,5 +1,5 @@ -import type { IWebhookNotificationAdapter } from 'nc-plugin'; import twilio from 'twilio'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; export default class TwilioWhatsapp implements IWebhookNotificationAdapter { private input: any; diff --git a/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsappPlugin.ts b/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsappPlugin.ts index 495b4fe42e..6149652c6c 100644 --- a/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsappPlugin.ts +++ b/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsappPlugin.ts @@ -1,7 +1,7 @@ -import type { IWebhookNotificationAdapter } from 'nc-plugin'; import { XcWebhookNotificationPlugin } from 'nc-plugin'; import TwilioWhatsapp from './TwilioWhatsapp'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; class TwilioWhatsappPlugin extends XcWebhookNotificationPlugin { private static notificationAdapter: TwilioWhatsapp; diff --git a/packages/nocodb/src/lib/plugins/twilioWhatsapp/index.ts b/packages/nocodb/src/lib/plugins/twilioWhatsapp/index.ts index d771de41ce..4de55544eb 100644 --- a/packages/nocodb/src/lib/plugins/twilioWhatsapp/index.ts +++ b/packages/nocodb/src/lib/plugins/twilioWhatsapp/index.ts @@ -1,7 +1,6 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; - import TwilioWhatsappPlugin from './TwilioWhatsappPlugin'; +import type { XcPluginConfig } from 'nc-plugin'; const config: XcPluginConfig = { builder: TwilioWhatsappPlugin, diff --git a/packages/nocodb/src/lib/plugins/upcloud/UpCloudPlugin.ts b/packages/nocodb/src/lib/plugins/upcloud/UpCloudPlugin.ts index 5ab0fd201b..f074597262 100644 --- a/packages/nocodb/src/lib/plugins/upcloud/UpCloudPlugin.ts +++ b/packages/nocodb/src/lib/plugins/upcloud/UpCloudPlugin.ts @@ -1,7 +1,7 @@ -import type { IStorageAdapterV2 } from 'nc-plugin'; import { XcStoragePlugin } from 'nc-plugin'; import UpoCloud from './UpoCloud'; +import type { IStorageAdapterV2 } from 'nc-plugin'; class UpCloudPlugin extends XcStoragePlugin { private static storageAdapter: UpoCloud; diff --git a/packages/nocodb/src/lib/plugins/upcloud/UpoCloud.ts b/packages/nocodb/src/lib/plugins/upcloud/UpoCloud.ts index 7f21a5323f..2de79207ea 100644 --- a/packages/nocodb/src/lib/plugins/upcloud/UpoCloud.ts +++ b/packages/nocodb/src/lib/plugins/upcloud/UpoCloud.ts @@ -1,12 +1,12 @@ import fs from 'fs'; import { promisify } from 'util'; import AWS from 'aws-sdk'; -import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import request from 'request'; import { generateTempFilePath, waitForStreamClose, } from '../../utils/pluginUtils'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; export default class UpoCloud implements IStorageAdapterV2 { private s3Client: AWS.S3; diff --git a/packages/nocodb/src/lib/plugins/upcloud/index.ts b/packages/nocodb/src/lib/plugins/upcloud/index.ts index 6ba3b9074a..874088a0a2 100644 --- a/packages/nocodb/src/lib/plugins/upcloud/index.ts +++ b/packages/nocodb/src/lib/plugins/upcloud/index.ts @@ -1,7 +1,6 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; - import UpCloudPlugin from './UpCloudPlugin'; +import type { XcPluginConfig } from 'nc-plugin'; const config: XcPluginConfig = { builder: UpCloudPlugin, diff --git a/packages/nocodb/src/lib/plugins/vultr/Vultr.ts b/packages/nocodb/src/lib/plugins/vultr/Vultr.ts index 76ac4f5dfd..422512a32f 100644 --- a/packages/nocodb/src/lib/plugins/vultr/Vultr.ts +++ b/packages/nocodb/src/lib/plugins/vultr/Vultr.ts @@ -1,12 +1,12 @@ import fs from 'fs'; import { promisify } from 'util'; import AWS from 'aws-sdk'; -import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; import request from 'request'; import { generateTempFilePath, waitForStreamClose, } from '../../utils/pluginUtils'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; export default class Vultr implements IStorageAdapterV2 { private s3Client: AWS.S3; diff --git a/packages/nocodb/src/lib/plugins/vultr/VultrPlugin.ts b/packages/nocodb/src/lib/plugins/vultr/VultrPlugin.ts index 1ce9512974..114fdb64fe 100644 --- a/packages/nocodb/src/lib/plugins/vultr/VultrPlugin.ts +++ b/packages/nocodb/src/lib/plugins/vultr/VultrPlugin.ts @@ -1,7 +1,7 @@ -import type { IStorageAdapterV2 } from 'nc-plugin'; import { XcStoragePlugin } from 'nc-plugin'; import Vultr from './Vultr'; +import type { IStorageAdapterV2 } from 'nc-plugin'; class VultrPlugin extends XcStoragePlugin { private static storageAdapter: Vultr; diff --git a/packages/nocodb/src/lib/plugins/vultr/index.ts b/packages/nocodb/src/lib/plugins/vultr/index.ts index 18cf26993f..659b0263e6 100644 --- a/packages/nocodb/src/lib/plugins/vultr/index.ts +++ b/packages/nocodb/src/lib/plugins/vultr/index.ts @@ -1,7 +1,6 @@ import { XcActionType, XcType } from 'nocodb-sdk'; -import type { XcPluginConfig } from 'nc-plugin'; - import VultrPlugin from './VultrPlugin'; +import type { XcPluginConfig } from 'nc-plugin'; const config: XcPluginConfig = { builder: VultrPlugin, diff --git a/packages/nocodb/src/lib/services/apiDocs/getPaths.ts b/packages/nocodb/src/lib/services/apiDocs/getPaths.ts index c13d0ed544..01b160cc1e 100644 --- a/packages/nocodb/src/lib/services/apiDocs/getPaths.ts +++ b/packages/nocodb/src/lib/services/apiDocs/getPaths.ts @@ -1,7 +1,7 @@ import Noco from '../../Noco'; +import { getModelPaths, getViewPaths } from './templates/paths'; import type Model from '../../models/Model'; import type Project from '../../models/Project'; -import { getModelPaths, getViewPaths } from './templates/paths'; import type { SwaggerColumn } from './getSwaggerColumnMetas'; import type { SwaggerView } from './getSwaggerJSON'; diff --git a/packages/nocodb/src/lib/services/apiDocs/getSchemas.ts b/packages/nocodb/src/lib/services/apiDocs/getSchemas.ts index 620a1d91f8..ecbaea412b 100644 --- a/packages/nocodb/src/lib/services/apiDocs/getSchemas.ts +++ b/packages/nocodb/src/lib/services/apiDocs/getSchemas.ts @@ -1,7 +1,7 @@ import Noco from '../../Noco'; +import { getModelSchemas, getViewSchemas } from './templates/schemas'; import type Model from '../../models/Model'; import type Project from '../../models/Project'; -import { getModelSchemas, getViewSchemas } from './templates/schemas'; import type { SwaggerColumn } from './getSwaggerColumnMetas'; import type { SwaggerView } from './getSwaggerJSON'; diff --git a/packages/nocodb/src/lib/services/apiDocs/getSwaggerColumnMetas.ts b/packages/nocodb/src/lib/services/apiDocs/getSwaggerColumnMetas.ts index ac3e15370e..5284a98716 100644 --- a/packages/nocodb/src/lib/services/apiDocs/getSwaggerColumnMetas.ts +++ b/packages/nocodb/src/lib/services/apiDocs/getSwaggerColumnMetas.ts @@ -1,8 +1,8 @@ import { UITypes } from 'nocodb-sdk'; -import type LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn'; import SwaggerTypes from '../../db/sql-mgr/code/routers/xc-ts/SwaggerTypes'; -import type Column from '../../models/Column'; import Noco from '../../Noco'; +import type LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn'; +import type Column from '../../models/Column'; import type Project from '../../models/Project'; export default async ( diff --git a/packages/nocodb/src/lib/services/apiDocs/getSwaggerJSON.ts b/packages/nocodb/src/lib/services/apiDocs/getSwaggerJSON.ts index 28dee329b7..9af3390e58 100644 --- a/packages/nocodb/src/lib/services/apiDocs/getSwaggerJSON.ts +++ b/packages/nocodb/src/lib/services/apiDocs/getSwaggerJSON.ts @@ -1,12 +1,12 @@ -import type { Model, Project, View } from '../../models'; -import type FormViewColumn from '../../models/FormViewColumn'; -import type GalleryViewColumn from '../../models/GalleryViewColumn'; +import { ViewTypes } from 'nocodb-sdk'; import Noco from '../../Noco'; import swaggerBase from './swagger-base.json'; import getPaths from './getPaths'; import getSchemas from './getSchemas'; import getSwaggerColumnMetas from './getSwaggerColumnMetas'; -import { ViewTypes } from 'nocodb-sdk'; +import type GalleryViewColumn from '../../models/GalleryViewColumn'; +import type FormViewColumn from '../../models/FormViewColumn'; +import type { Model, Project, View } from '../../models'; import type GridViewColumn from '../../models/GridViewColumn'; export default async function getSwaggerJSON( diff --git a/packages/nocodb/src/lib/services/apiDocs/templates/params.ts b/packages/nocodb/src/lib/services/apiDocs/templates/params.ts index e00ebac63d..09e68d5e55 100644 --- a/packages/nocodb/src/lib/services/apiDocs/templates/params.ts +++ b/packages/nocodb/src/lib/services/apiDocs/templates/params.ts @@ -1,5 +1,5 @@ -import type { SwaggerColumn } from '../getSwaggerColumnMetas'; import { RelationTypes, UITypes } from 'nocodb-sdk'; +import type { SwaggerColumn } from '../getSwaggerColumnMetas'; import type LinkToAnotherRecordColumn from '../../../models/LinkToAnotherRecordColumn'; export const rowIdParam = { diff --git a/packages/nocodb/src/lib/services/apiToken.svc.ts b/packages/nocodb/src/lib/services/apiToken.svc.ts index e2dcf060fe..de1b70846b 100644 --- a/packages/nocodb/src/lib/services/apiToken.svc.ts +++ b/packages/nocodb/src/lib/services/apiToken.svc.ts @@ -1,9 +1,9 @@ -import type { ApiTokenReqType } from 'nocodb-sdk'; import { OrgUserRoles } from 'nocodb-sdk'; import { T } from 'nc-help'; import { validatePayload } from '../meta/api/helpers'; import { NcError } from '../meta/helpers/catchError'; import ApiToken from '../models/ApiToken'; +import type { ApiTokenReqType } from 'nocodb-sdk'; import type User from '../models/User'; export async function apiTokenList(param: { userId: string }) { diff --git a/packages/nocodb/src/lib/services/attachment.svc.ts b/packages/nocodb/src/lib/services/attachment.svc.ts index f43c1d847f..75e349b3bc 100644 --- a/packages/nocodb/src/lib/services/attachment.svc.ts +++ b/packages/nocodb/src/lib/services/attachment.svc.ts @@ -1,8 +1,8 @@ -import { nanoid } from 'nanoid'; import path from 'path'; +import { nanoid } from 'nanoid'; import slash from 'slash'; -import mimetypes, { mimeIcons } from '../utils/mimeTypes'; import { T } from 'nc-help'; +import mimetypes, { mimeIcons } from '../utils/mimeTypes'; import NcPluginMgrv2 from '../meta/helpers/NcPluginMgrv2'; import Local from '../v1-legacy/plugins/adapters/storage/Local'; diff --git a/packages/nocodb/src/lib/services/audit.svc.ts b/packages/nocodb/src/lib/services/audit.svc.ts index daf6cf1d04..836d669628 100644 --- a/packages/nocodb/src/lib/services/audit.svc.ts +++ b/packages/nocodb/src/lib/services/audit.svc.ts @@ -1,11 +1,10 @@ +import { AuditOperationSubTypes, AuditOperationTypes } from 'nocodb-sdk'; +import DOMPurify from 'isomorphic-dompurify'; import { validatePayload } from '../meta/api/helpers'; import Audit from '../models/Audit'; -import type { AuditRowUpdateReqType } from 'nocodb-sdk'; -import { AuditOperationSubTypes, AuditOperationTypes } from 'nocodb-sdk'; import Model from '../models/Model'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; - -import DOMPurify from 'isomorphic-dompurify'; +import type { AuditRowUpdateReqType } from 'nocodb-sdk'; export async function commentRow(param: { rowId: string; diff --git a/packages/nocodb/src/lib/services/base.svc.ts b/packages/nocodb/src/lib/services/base.svc.ts index 9b2cb70091..4ce7ab6060 100644 --- a/packages/nocodb/src/lib/services/base.svc.ts +++ b/packages/nocodb/src/lib/services/base.svc.ts @@ -1,9 +1,9 @@ +import { T } from 'nc-help'; import Project from '../models/Project'; -import type { BaseReqType } from 'nocodb-sdk'; import { syncBaseMigration } from '../meta/helpers/syncMigration'; import Base from '../models/Base'; -import { T } from 'nc-help'; import { populateMeta, validatePayload } from '../meta/api/helpers'; +import type { BaseReqType } from 'nocodb-sdk'; export async function baseGetWithConfig(param: { baseId: any }) { const base = await Base.get(param.baseId); diff --git a/packages/nocodb/src/lib/services/column.svc.ts b/packages/nocodb/src/lib/services/column.svc.ts index 63142f3ade..3da6cba5ed 100644 --- a/packages/nocodb/src/lib/services/column.svc.ts +++ b/packages/nocodb/src/lib/services/column.svc.ts @@ -1,9 +1,3 @@ -import type { - ColumnReqType, - LinkToAnotherColumnReqType, - LinkToAnotherRecordType, - RelationTypes, -} from 'nocodb-sdk'; import { AuditOperationSubTypes, AuditOperationTypes, @@ -12,9 +6,9 @@ import { substituteColumnIdWithAliasInFormula, UITypes, } from 'nocodb-sdk'; +import { T } from 'nc-help'; import formulaQueryBuilderv2 from '../db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2'; import ProjectMgrv2 from '../db/sql-mgr/v2/ProjectMgrv2'; -import type SqlMgrv2 from '../db/sql-mgr/v2/SqlMgrv2'; import { createHmAndBtColumn, generateFkName, @@ -32,20 +26,26 @@ import { } from '../meta/helpers/getUniqueName'; import mapDefaultDisplayValue from '../meta/helpers/mapDefaultDisplayValue'; import validateParams from '../meta/helpers/validateParams'; -import type NcMetaIO from '../meta/NcMetaIO'; import Audit from '../models/Audit'; import Base from '../models/Base'; import Column from '../models/Column'; import FormulaColumn from '../models/FormulaColumn'; import KanbanView from '../models/KanbanView'; -import type LinkToAnotherRecordColumn from '../models/LinkToAnotherRecordColumn'; import Model from '../models/Model'; -import type Project from '../models/Project'; import Noco from '../Noco'; import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; -import { T } from 'nc-help'; import { MetaTable } from '../utils/globals'; +import type Project from '../models/Project'; +import type LinkToAnotherRecordColumn from '../models/LinkToAnotherRecordColumn'; +import type NcMetaIO from '../meta/NcMetaIO'; +import type SqlMgrv2 from '../db/sql-mgr/v2/SqlMgrv2'; +import type { + ColumnReqType, + LinkToAnotherColumnReqType, + LinkToAnotherRecordType, + RelationTypes, +} from 'nocodb-sdk'; export enum Altered { NEW_COLUMN = 1, diff --git a/packages/nocodb/src/lib/services/dbData/bulkData.ts b/packages/nocodb/src/lib/services/dbData/bulkData.ts index 95f597f41a..ab83ee0efc 100644 --- a/packages/nocodb/src/lib/services/dbData/bulkData.ts +++ b/packages/nocodb/src/lib/services/dbData/bulkData.ts @@ -1,8 +1,8 @@ -import type { BaseModelSqlv2 } from '../../db/sql-data-mapper/lib/sql/BaseModelSqlv2'; import { Base, Model } from '../../models'; import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; -import type { PathParams } from './helpers'; import { getViewAndModelByAliasOrId } from './helpers'; +import type { PathParams } from './helpers'; +import type { BaseModelSqlv2 } from '../../db/sql-data-mapper/lib/sql/BaseModelSqlv2'; type BulkOperation = | 'bulkInsert' diff --git a/packages/nocodb/src/lib/services/dbData/dataAliasNested.svc.ts b/packages/nocodb/src/lib/services/dbData/dataAliasNested.svc.ts index e4375fdd07..34c6a4e69c 100644 --- a/packages/nocodb/src/lib/services/dbData/dataAliasNested.svc.ts +++ b/packages/nocodb/src/lib/services/dbData/dataAliasNested.svc.ts @@ -1,9 +1,9 @@ import { PagedResponseImpl } from '../../meta/helpers/PagedResponse'; import { Base, Model } from '../../models'; import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; -import type { PathParams } from './helpers'; -import { getColumnByIdOrName, getViewAndModelByAliasOrId } from './helpers'; import { NcError } from '../../meta/helpers/catchError'; +import { getColumnByIdOrName, getViewAndModelByAliasOrId } from './helpers'; +import type { PathParams } from './helpers'; // todo: handle case where the given column is not ltar export async function mmList( diff --git a/packages/nocodb/src/lib/services/dbData/export.ts b/packages/nocodb/src/lib/services/dbData/export.ts index 8cf15048d0..5ff62084b4 100644 --- a/packages/nocodb/src/lib/services/dbData/export.ts +++ b/packages/nocodb/src/lib/services/dbData/export.ts @@ -1,6 +1,6 @@ -import type { PathParams } from './helpers'; -import { getViewAndModelByAliasOrId } from './helpers'; import { View } from '../../models'; +import { getViewAndModelByAliasOrId } from './helpers'; +import type { PathParams } from './helpers'; // Todo: bring logic from controller export async function excelDataExport( diff --git a/packages/nocodb/src/lib/services/dbData/helpers.ts b/packages/nocodb/src/lib/services/dbData/helpers.ts index f1c1c830f8..6a61c14d9e 100644 --- a/packages/nocodb/src/lib/services/dbData/helpers.ts +++ b/packages/nocodb/src/lib/services/dbData/helpers.ts @@ -1,18 +1,18 @@ -import type { Request } from 'express'; import { nocoExecute } from 'nc-help'; import { isSystemColumn, UITypes } from 'nocodb-sdk'; import * as XLSX from 'xlsx'; -import type { BaseModelSqlv2 } from '../../db/sql-data-mapper/lib/sql/BaseModelSqlv2'; +import papaparse from 'papaparse'; import getAst from '../../db/sql-data-mapper/lib/sql/helpers/getAst'; import { NcError } from '../../meta/helpers/catchError'; import { Model, View } from '../../models'; import Base from '../../models/Base'; import Column from '../../models/Column'; -import type LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn'; -import type LookupColumn from '../../models/LookupColumn'; import Project from '../../models/Project'; import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; -import papaparse from 'papaparse'; +import type LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn'; +import type LookupColumn from '../../models/LookupColumn'; +import type { BaseModelSqlv2 } from '../../db/sql-data-mapper/lib/sql/BaseModelSqlv2'; +import type { Request } from 'express'; export interface PathParams { projectName: string; diff --git a/packages/nocodb/src/lib/services/dbData/index.ts b/packages/nocodb/src/lib/services/dbData/index.ts index 92a6025888..bf6fa3efc0 100644 --- a/packages/nocodb/src/lib/services/dbData/index.ts +++ b/packages/nocodb/src/lib/services/dbData/index.ts @@ -4,8 +4,8 @@ import { NcError } from '../../meta/helpers/catchError'; import { PagedResponseImpl } from '../../meta/helpers/PagedResponse'; import { Base, Model, View } from '../../models'; import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; -import type { PathParams } from './helpers'; import { getViewAndModelByAliasOrId } from './helpers'; +import type { PathParams } from './helpers'; export async function dataList(param: PathParams & { query: any }) { const { model, view } = await getViewAndModelByAliasOrId(param); diff --git a/packages/nocodb/src/lib/services/ee/orgToken.svc.ts b/packages/nocodb/src/lib/services/ee/orgToken.svc.ts index b749be2e18..3ed08099e3 100644 --- a/packages/nocodb/src/lib/services/ee/orgToken.svc.ts +++ b/packages/nocodb/src/lib/services/ee/orgToken.svc.ts @@ -1,7 +1,7 @@ -import type { UserType } from 'nocodb-sdk'; import { OrgUserRoles } from 'nocodb-sdk'; import { PagedResponseImpl } from '../../meta/helpers/PagedResponse'; import { ApiToken } from '../../models'; +import type { UserType } from 'nocodb-sdk'; export async function apiTokenListEE(param: { user: UserType; query: any }) { let fk_user_id = param.user.id; diff --git a/packages/nocodb/src/lib/services/filter.svc.ts b/packages/nocodb/src/lib/services/filter.svc.ts index 9935e0477a..4dff3ce08c 100644 --- a/packages/nocodb/src/lib/services/filter.svc.ts +++ b/packages/nocodb/src/lib/services/filter.svc.ts @@ -1,7 +1,7 @@ -import type { FilterReqType } from 'nocodb-sdk'; +import { T } from 'nc-help'; import { validatePayload } from '../meta/api/helpers'; import Filter from '../models/Filter'; -import { T } from 'nc-help'; +import type { FilterReqType } from 'nocodb-sdk'; export async function hookFilterCreate(param: { filter: FilterReqType; diff --git a/packages/nocodb/src/lib/services/hook.svc.ts b/packages/nocodb/src/lib/services/hook.svc.ts index f2e1d58780..89e94ef38d 100644 --- a/packages/nocodb/src/lib/services/hook.svc.ts +++ b/packages/nocodb/src/lib/services/hook.svc.ts @@ -1,10 +1,10 @@ import { T } from 'nc-help'; import { validatePayload } from '../meta/api/helpers'; import { Hook, Model } from '../models'; -import type { HookReqType, HookTestReqType } from 'nocodb-sdk'; import { invokeWebhook } from '../meta/helpers/webhookHelpers'; import populateSamplePayload from '../meta/helpers/populateSamplePayload'; +import type { HookReqType, HookTestReqType } from 'nocodb-sdk'; export async function hookList(param: { tableId: string }) { // todo: pagination diff --git a/packages/nocodb/src/lib/services/hookFilter.svc.ts b/packages/nocodb/src/lib/services/hookFilter.svc.ts index 6d064ea1bf..589afce20c 100644 --- a/packages/nocodb/src/lib/services/hookFilter.svc.ts +++ b/packages/nocodb/src/lib/services/hookFilter.svc.ts @@ -1,7 +1,7 @@ import { T } from 'nc-help'; -import type { FilterReqType } from 'nocodb-sdk'; import { validatePayload } from '../meta/api/helpers'; import Filter from '../models/Filter'; +import type { FilterReqType } from 'nocodb-sdk'; export async function filterGet(param: { hookId: string }) { const filter = await Filter.getFilterObject({ hookId: param.hookId }); diff --git a/packages/nocodb/src/lib/services/metaDiff.svc.ts b/packages/nocodb/src/lib/services/metaDiff.svc.ts index dcf4d23d46..50165d4dd7 100644 --- a/packages/nocodb/src/lib/services/metaDiff.svc.ts +++ b/packages/nocodb/src/lib/services/metaDiff.svc.ts @@ -1,9 +1,8 @@ // // Project CRUD import { T } from 'nc-help'; -import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; import { isVirtualCol, ModelTypes, RelationTypes, UITypes } from 'nocodb-sdk'; -import type { LinkToAnotherRecordColumn } from '../models'; +import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; import { Base, Column, Model, Project } from '../models'; import ModelXcMetaFactory from '../db/sql-mgr/code/models/xc/ModelXcMetaFactory'; import { getUniqueColumnAliasName } from '../meta/helpers/getUniqueName'; @@ -13,6 +12,7 @@ import getTableNameAlias, { } from '../meta/helpers/getTableName'; import mapDefaultDisplayValue from '../meta/helpers/mapDefaultDisplayValue'; import getColumnUiType from '../meta/helpers/getColumnUiType'; +import type { LinkToAnotherRecordColumn } from '../models'; export enum MetaDiffType { TABLE_NEW = 'TABLE_NEW', diff --git a/packages/nocodb/src/lib/services/modelVisibility.svc.ts b/packages/nocodb/src/lib/services/modelVisibility.svc.ts index 31e5aee91f..6c16ac4b0e 100644 --- a/packages/nocodb/src/lib/services/modelVisibility.svc.ts +++ b/packages/nocodb/src/lib/services/modelVisibility.svc.ts @@ -1,9 +1,9 @@ -import type { VisibilityRuleReqType } from 'nocodb-sdk'; +import { T } from 'nc-help'; import { validatePayload } from '../meta/api/helpers'; import { NcError } from '../meta/helpers/catchError'; import ModelRoleVisibility from '../models/ModelRoleVisibility'; -import { T } from 'nc-help'; import { Model, View } from '../models'; +import type { VisibilityRuleReqType } from 'nocodb-sdk'; export async function xcVisibilityMetaSetAll(param: { visibilityRule: VisibilityRuleReqType; diff --git a/packages/nocodb/src/lib/services/orgToken.svc.ts b/packages/nocodb/src/lib/services/orgToken.svc.ts index 291707b181..a2ad71f1e3 100644 --- a/packages/nocodb/src/lib/services/orgToken.svc.ts +++ b/packages/nocodb/src/lib/services/orgToken.svc.ts @@ -1,11 +1,11 @@ -import type { ApiTokenReqType } from 'nocodb-sdk'; import { OrgUserRoles } from 'nocodb-sdk'; -import { validatePayload } from '../meta/api/helpers'; -import type { User } from '../models'; -import ApiToken from '../models/ApiToken'; import { T } from 'nc-help'; +import ApiToken from '../models/ApiToken'; +import { validatePayload } from '../meta/api/helpers'; import { NcError } from '../meta/helpers/catchError'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; +import type { User } from '../models'; +import type { ApiTokenReqType } from 'nocodb-sdk'; export async function apiTokenList(param: { user: User; query: any }) { const fk_user_id = param.user.id; diff --git a/packages/nocodb/src/lib/services/orgUser.svc.ts b/packages/nocodb/src/lib/services/orgUser.svc.ts index c5266c4186..c7ba0de42b 100644 --- a/packages/nocodb/src/lib/services/orgUser.svc.ts +++ b/packages/nocodb/src/lib/services/orgUser.svc.ts @@ -1,4 +1,3 @@ -import type { UserType } from 'nocodb-sdk'; import { AuditOperationSubTypes, AuditOperationTypes, @@ -7,17 +6,18 @@ import { import { v4 as uuidv4 } from 'uuid'; import validator from 'validator'; import { OrgUserRoles } from 'nocodb-sdk'; +import { T } from 'nc-help'; import { NC_APP_SETTINGS } from '../constants'; import { validatePayload } from '../meta/api/helpers'; import { Audit, ProjectUser, Store, SyncSource, User } from '../models'; import Noco from '../Noco'; import { MetaTable } from '../utils/globals'; -import { T } from 'nc-help'; 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 './projectUser.svc'; +import type { UserType } from 'nocodb-sdk'; export async function userList(param: { // todo: add better typing diff --git a/packages/nocodb/src/lib/services/plugin.svc.ts b/packages/nocodb/src/lib/services/plugin.svc.ts index 76178ebb36..fcdaf17811 100644 --- a/packages/nocodb/src/lib/services/plugin.svc.ts +++ b/packages/nocodb/src/lib/services/plugin.svc.ts @@ -1,8 +1,8 @@ import { T } from 'nc-help'; import { validatePayload } from '../meta/api/helpers'; import { Plugin } from '../models'; -import type { PluginTestReqType, PluginType } from 'nocodb-sdk'; import NcPluginMgrv2 from '../meta/helpers/NcPluginMgrv2'; +import type { PluginTestReqType, PluginType } from 'nocodb-sdk'; export async function pluginList() { return await Plugin.list(); diff --git a/packages/nocodb/src/lib/services/project.svc.ts b/packages/nocodb/src/lib/services/project.svc.ts index 0b628e6d73..bfb2d7cba8 100644 --- a/packages/nocodb/src/lib/services/project.svc.ts +++ b/packages/nocodb/src/lib/services/project.svc.ts @@ -1,16 +1,17 @@ -import DOMPurify from 'isomorphic-dompurify'; -import type { ProjectReqType } from 'nocodb-sdk'; -import { OrgUserRoles } from 'nocodb-sdk'; import { promisify } from 'util'; -import { populateMeta, validatePayload } from '../meta/api/helpers'; -import { extractPropsAndSanitize } from '../meta/helpers/extractProps'; -import syncMigration from '../meta/helpers/syncMigration'; -import Project from '../models/Project'; -import ProjectUser from '../models/ProjectUser'; +import { OrgUserRoles } from 'nocodb-sdk'; +import DOMPurify from 'isomorphic-dompurify'; import { customAlphabet } from 'nanoid'; -import Noco from '../Noco'; +import { T } from 'nc-help'; import NcConfigFactory from '../utils/NcConfigFactory'; import { NcError } from '../meta/helpers/catchError'; +import Noco from '../Noco'; +import ProjectUser from '../models/ProjectUser'; +import Project from '../models/Project'; +import syncMigration from '../meta/helpers/syncMigration'; +import { populateMeta, validatePayload } from '../meta/api/helpers'; +import { extractPropsAndSanitize } from '../meta/helpers/extractProps'; +import type { ProjectReqType } from 'nocodb-sdk'; export async function projectCreate(param: { project: ProjectReqType; @@ -114,8 +115,6 @@ export async function projectCreate(param: { const nanoid = customAlphabet('1234567890abcdefghijklmnopqrstuvwxyz_', 4); -import { T } from 'nc-help'; - export async function getProjectWithInfo(param: { projectId: string }) { const project = await Project.getWithInfo(param.projectId); return project; diff --git a/packages/nocodb/src/lib/services/projectUser.svc.ts b/packages/nocodb/src/lib/services/projectUser.svc.ts index d1257452a9..9ebfbb0796 100644 --- a/packages/nocodb/src/lib/services/projectUser.svc.ts +++ b/packages/nocodb/src/lib/services/projectUser.svc.ts @@ -1,21 +1,21 @@ -import type { ProjectUserReqType } from 'nocodb-sdk'; import { OrgUserRoles } from 'nocodb-sdk'; import { T } from 'nc-help'; +import validator from 'validator'; +import { v4 as uuidv4 } from 'uuid'; +import * as ejs from 'ejs'; +import { PluginCategory } from 'nocodb-sdk'; import { validatePayload } from '../meta/api/helpers'; import { PagedResponseImpl } from '../meta/helpers/PagedResponse'; import ProjectUser from '../models/ProjectUser'; -import validator from 'validator'; import { NcError } from '../meta/helpers/catchError'; -import { v4 as uuidv4 } from 'uuid'; import User from '../models/User'; import Audit from '../models/Audit'; import NocoCache from '../cache/NocoCache'; import { CacheGetType, CacheScope, MetaTable } from '../utils/globals'; -import * as ejs from 'ejs'; import NcPluginMgrv2 from '../meta/helpers/NcPluginMgrv2'; import Noco from '../Noco'; -import { PluginCategory } from 'nocodb-sdk'; import { randomTokenString } from '../meta/helpers/stringHelpers'; +import type { ProjectUserReqType } from 'nocodb-sdk'; export async function userList(param: { projectId: string; query: any }) { return new PagedResponseImpl( diff --git a/packages/nocodb/src/lib/services/public/publicData.svc.ts b/packages/nocodb/src/lib/services/public/publicData.svc.ts index 1a14ff5519..707b6b5982 100644 --- a/packages/nocodb/src/lib/services/public/publicData.svc.ts +++ b/packages/nocodb/src/lib/services/public/publicData.svc.ts @@ -1,18 +1,18 @@ -import { nocoExecute } from 'nc-help'; -import { ErrorMessages, UITypes, ViewTypes } from 'nocodb-sdk'; import path from 'path'; +import { ErrorMessages, UITypes, ViewTypes } from 'nocodb-sdk'; +import { nocoExecute } from 'nc-help'; import { nanoid } from 'nanoid'; import slash from 'slash'; import getAst from '../../db/sql-data-mapper/lib/sql/helpers/getAst'; import { NcError } from '../../meta/helpers/catchError'; import NcPluginMgrv2 from '../../meta/helpers/NcPluginMgrv2'; import { PagedResponseImpl } from '../../meta/helpers/PagedResponse'; -import type { LinkToAnotherRecordColumn } from '../../models'; import { Base, Column, Model, View } from '../../models'; import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; import { mimeIcons } from '../../utils/mimeTypes'; import { sanitizeUrlPath } from '../attachment.svc'; import { getColumnByIdOrName } from '../dbData/helpers'; +import type { LinkToAnotherRecordColumn } from '../../models'; export async function dataList(param: { sharedViewUuid: string; diff --git a/packages/nocodb/src/lib/services/public/publicDataExport.svc.ts b/packages/nocodb/src/lib/services/public/publicDataExport.svc.ts index e9f866488a..b673f950fe 100644 --- a/packages/nocodb/src/lib/services/public/publicDataExport.svc.ts +++ b/packages/nocodb/src/lib/services/public/publicDataExport.svc.ts @@ -2,13 +2,13 @@ import { nocoExecute } from 'nc-help'; import { isSystemColumn, UITypes } from 'nocodb-sdk'; import getAst from '../../db/sql-data-mapper/lib/sql/helpers/getAst'; import { NcError } from '../../meta/helpers/catchError'; +import { Base, Column, Model } from '../../models'; +import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; import type { LinkToAnotherRecordColumn, LookupColumn, View, } from '../../models'; -import { Base, Column, Model } from '../../models'; -import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; export async function getDbRows(param: { model; diff --git a/packages/nocodb/src/lib/services/public/publicMeta.svc.ts b/packages/nocodb/src/lib/services/public/publicMeta.svc.ts index 74f56b35ec..1d694d5ec2 100644 --- a/packages/nocodb/src/lib/services/public/publicMeta.svc.ts +++ b/packages/nocodb/src/lib/services/public/publicMeta.svc.ts @@ -1,8 +1,8 @@ -import type { LinkToAnotherRecordType } from 'nocodb-sdk'; import { ErrorMessages, RelationTypes, UITypes } from 'nocodb-sdk'; import { NcError } from '../../meta/helpers/catchError'; -import type { LinkToAnotherRecordColumn } from '../../models'; import { Base, Column, Model, Project, View } from '../../models'; +import type { LinkToAnotherRecordColumn } from '../../models'; +import type { LinkToAnotherRecordType } from 'nocodb-sdk'; export async function viewMetaGet(param: { sharedViewUuid: string; diff --git a/packages/nocodb/src/lib/services/sort.svc.ts b/packages/nocodb/src/lib/services/sort.svc.ts index 967ffea81d..713c79854d 100644 --- a/packages/nocodb/src/lib/services/sort.svc.ts +++ b/packages/nocodb/src/lib/services/sort.svc.ts @@ -1,7 +1,7 @@ -import type { SortReqType } from 'nocodb-sdk'; +import { T } from 'nc-help'; import { validatePayload } from '../meta/api/helpers'; import Sort from '../models/Sort'; -import { T } from 'nc-help'; +import type { SortReqType } from 'nocodb-sdk'; export async function sortGet(param: { sortId: string }) { return Sort.get(param.sortId); diff --git a/packages/nocodb/src/lib/services/sync/helpers/EntityMap.ts b/packages/nocodb/src/lib/services/sync/helpers/EntityMap.ts index b38f25d8a6..c27331f15b 100644 --- a/packages/nocodb/src/lib/services/sync/helpers/EntityMap.ts +++ b/packages/nocodb/src/lib/services/sync/helpers/EntityMap.ts @@ -1,5 +1,5 @@ -import sqlite3 from 'sqlite3'; import { Readable } from 'stream'; +import sqlite3 from 'sqlite3'; class EntityMap { initialized: boolean; diff --git a/packages/nocodb/src/lib/services/sync/helpers/job.ts b/packages/nocodb/src/lib/services/sync/helpers/job.ts index 3f09d188ad..be6a85ce63 100644 --- a/packages/nocodb/src/lib/services/sync/helpers/job.ts +++ b/packages/nocodb/src/lib/services/sync/helpers/job.ts @@ -1,5 +1,4 @@ -import { T } from 'nc-help'; -import FetchAT from './fetchAT'; +import { promisify } from 'util'; import { UITypes } from 'nocodb-sdk'; // import * as sMap from './syncMap'; @@ -8,11 +7,12 @@ import { Api } from 'nocodb-sdk'; import Airtable from 'airtable'; import jsonfile from 'jsonfile'; import hash from 'object-hash'; -import { promisify } from 'util'; +import { T } from 'nc-help'; import dayjs from 'dayjs'; import utc from 'dayjs/plugin/utc'; import tinycolor from 'tinycolor2'; +import FetchAT from './fetchAT'; import { importData, importLTARData } from './readAndProcessData'; import EntityMap from './EntityMap'; diff --git a/packages/nocodb/src/lib/services/sync/helpers/readAndProcessData.ts b/packages/nocodb/src/lib/services/sync/helpers/readAndProcessData.ts index 3713993dc0..faf06482a0 100644 --- a/packages/nocodb/src/lib/services/sync/helpers/readAndProcessData.ts +++ b/packages/nocodb/src/lib/services/sync/helpers/readAndProcessData.ts @@ -1,7 +1,7 @@ -import type { AirtableBase } from 'airtable/lib/airtable_base'; -import type { Api, TableType } from 'nocodb-sdk'; import { RelationTypes, UITypes } from 'nocodb-sdk'; import EntityMap from './EntityMap'; +import type { AirtableBase } from 'airtable/lib/airtable_base'; +import type { Api, TableType } from 'nocodb-sdk'; const BULK_DATA_BATCH_SIZE = 500; const ASSOC_BULK_DATA_BATCH_SIZE = 1000; diff --git a/packages/nocodb/src/lib/services/table.svc.ts b/packages/nocodb/src/lib/services/table.svc.ts index 094b2ea482..94e782a593 100644 --- a/packages/nocodb/src/lib/services/table.svc.ts +++ b/packages/nocodb/src/lib/services/table.svc.ts @@ -1,9 +1,4 @@ import DOMPurify from 'isomorphic-dompurify'; -import type { - ColumnType, - NormalColumnRequestType, - TableReqType, -} from 'nocodb-sdk'; import { AuditOperationSubTypes, AuditOperationTypes, @@ -11,6 +6,7 @@ import { ModelTypes, UITypes, } from 'nocodb-sdk'; +import { T } from 'nc-help'; import ProjectMgrv2 from '../db/sql-mgr/v2/ProjectMgrv2'; import { validatePayload } from '../meta/api/helpers'; import { NcError } from '../meta/helpers/catchError'; @@ -20,10 +16,14 @@ import getTableNameAlias, { getColumnNameAlias, } from '../meta/helpers/getTableName'; import mapDefaultDisplayValue from '../meta/helpers/mapDefaultDisplayValue'; -import type { LinkToAnotherRecordColumn, User, View } from '../models'; import { Audit, Column, Model, ModelRoleVisibility, Project } from '../models'; import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; -import { T } from 'nc-help'; +import type { LinkToAnotherRecordColumn, User, View } from '../models'; +import type { + ColumnType, + NormalColumnRequestType, + TableReqType, +} from 'nocodb-sdk'; export async function tableUpdate(param: { tableId: any; diff --git a/packages/nocodb/src/lib/services/test/TestResetService/index.ts b/packages/nocodb/src/lib/services/test/TestResetService/index.ts index 29725622d0..045d09fb1a 100644 --- a/packages/nocodb/src/lib/services/test/TestResetService/index.ts +++ b/packages/nocodb/src/lib/services/test/TestResetService/index.ts @@ -2,13 +2,13 @@ import axios from 'axios'; import Project from '../../../models/Project'; import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2'; import Noco from '../../../Noco'; -import resetMetaSakilaSqliteProject from './resetMetaSakilaSqliteProject'; -import resetMysqlSakilaProject from './resetMysqlSakilaProject'; -import resetPgSakilaProject from './resetPgSakilaProject'; import User from '../../../models/User'; import NocoCache from '../../../cache/NocoCache'; import { CacheScope } from '../../../utils/globals'; import ProjectUser from '../../../models/ProjectUser'; +import resetPgSakilaProject from './resetPgSakilaProject'; +import resetMysqlSakilaProject from './resetMysqlSakilaProject'; +import resetMetaSakilaSqliteProject from './resetMetaSakilaSqliteProject'; const workerStatus = {}; diff --git a/packages/nocodb/src/lib/services/test/TestResetService/resetMetaSakilaSqliteProject.ts b/packages/nocodb/src/lib/services/test/TestResetService/resetMetaSakilaSqliteProject.ts index 3c6f025cb1..4190d0356c 100644 --- a/packages/nocodb/src/lib/services/test/TestResetService/resetMetaSakilaSqliteProject.ts +++ b/packages/nocodb/src/lib/services/test/TestResetService/resetMetaSakilaSqliteProject.ts @@ -1,6 +1,5 @@ -import axios from 'axios'; - import { promises as fs } from 'fs'; +import axios from 'axios'; const sqliteFilePath = (parallelId: string) => { const rootDir = __dirname.replace( diff --git a/packages/nocodb/src/lib/services/test/TestResetService/resetMysqlSakilaProject.ts b/packages/nocodb/src/lib/services/test/TestResetService/resetMysqlSakilaProject.ts index 62f425b62e..bda2414200 100644 --- a/packages/nocodb/src/lib/services/test/TestResetService/resetMysqlSakilaProject.ts +++ b/packages/nocodb/src/lib/services/test/TestResetService/resetMysqlSakilaProject.ts @@ -1,9 +1,9 @@ +import { promises as fs } from 'fs'; import axios from 'axios'; -import type { Knex } from 'knex'; import { knex } from 'knex'; -import { promises as fs } from 'fs'; import Audit from '../../../models/Audit'; +import type { Knex } from 'knex'; import type Project from '../../../models/Project'; const config = { diff --git a/packages/nocodb/src/lib/services/test/TestResetService/resetPgSakilaProject.ts b/packages/nocodb/src/lib/services/test/TestResetService/resetPgSakilaProject.ts index 2f035f6053..ee9fd7e39b 100644 --- a/packages/nocodb/src/lib/services/test/TestResetService/resetPgSakilaProject.ts +++ b/packages/nocodb/src/lib/services/test/TestResetService/resetPgSakilaProject.ts @@ -1,7 +1,7 @@ +import { promises as fs } from 'fs'; import axios from 'axios'; import { knex } from 'knex'; -import { promises as fs } from 'fs'; // const util = require('util'); // const exec = util.promisify(require('child_process').exec); diff --git a/packages/nocodb/src/lib/services/user/helpers.ts b/packages/nocodb/src/lib/services/user/helpers.ts index 8784e2abbc..664a3f6ffe 100644 --- a/packages/nocodb/src/lib/services/user/helpers.ts +++ b/packages/nocodb/src/lib/services/user/helpers.ts @@ -1,5 +1,5 @@ -import * as jwt from 'jsonwebtoken'; import crypto from 'crypto'; +import * as jwt from 'jsonwebtoken'; import type User from '../../models/User'; import type { NcConfig } from '../../../interface/config'; import type { Response } from 'express'; diff --git a/packages/nocodb/src/lib/services/user/index.ts b/packages/nocodb/src/lib/services/user/index.ts index 9fe8f47b58..00dcd2b09c 100644 --- a/packages/nocodb/src/lib/services/user/index.ts +++ b/packages/nocodb/src/lib/services/user/index.ts @@ -1,10 +1,4 @@ -import type { - PasswordChangeReqType, - PasswordForgotReqType, - PasswordResetReqType, - SignUpReqType, - UserType, -} from 'nocodb-sdk'; +import { promisify } from 'util'; import { validatePassword } from 'nocodb-sdk'; import { OrgUserRoles } from 'nocodb-sdk'; import { T } from 'nc-help'; @@ -12,7 +6,6 @@ import { T } from 'nc-help'; import * as ejs from 'ejs'; import bcrypt from 'bcryptjs'; -import { promisify } from 'util'; import { NC_APP_SETTINGS } from '../../constants'; import { validatePayload } from '../../meta/api/helpers'; import { NcError } from '../../meta/helpers/catchError'; @@ -21,6 +14,13 @@ import { Audit, Store, User } from '../../models'; import Noco from '../../Noco'; import { MetaTable } from '../../utils/globals'; import { genJwt, randomTokenString, setTokenCookie } from './helpers'; +import type { + PasswordChangeReqType, + PasswordForgotReqType, + PasswordResetReqType, + SignUpReqType, + UserType, +} from 'nocodb-sdk'; const { v4: uuidv4 } = require('uuid'); const { isEmail } = require('validator'); diff --git a/packages/nocodb/src/lib/services/user/initAdminFromEnv.ts b/packages/nocodb/src/lib/services/user/initAdminFromEnv.ts index 1a15b94649..c1a205cebd 100644 --- a/packages/nocodb/src/lib/services/user/initAdminFromEnv.ts +++ b/packages/nocodb/src/lib/services/user/initAdminFromEnv.ts @@ -1,5 +1,5 @@ -import { v4 as uuidv4 } from 'uuid'; import { promisify } from 'util'; +import { v4 as uuidv4 } from 'uuid'; import bcrypt from 'bcryptjs'; import { validatePassword } from 'nocodb-sdk'; diff --git a/packages/nocodb/src/lib/services/util.svc.ts b/packages/nocodb/src/lib/services/util.svc.ts index b19eca2cf5..2887fcff8a 100644 --- a/packages/nocodb/src/lib/services/util.svc.ts +++ b/packages/nocodb/src/lib/services/util.svc.ts @@ -1,6 +1,7 @@ import { compareVersions, validate } from 'compare-versions'; import { ViewTypes } from 'nocodb-sdk'; +import axios from 'axios'; import { Project } from '../models'; import { NcError } from '../meta/helpers/catchError'; import Noco from '../Noco'; @@ -12,7 +13,6 @@ import NcConfigFactory, { defaultConnectionConfig, } from '../utils/NcConfigFactory'; import { User } from '../models'; -import axios from 'axios'; import { NC_ATTACHMENT_FIELD_SIZE } from '../constants'; const versionCache = { diff --git a/packages/nocodb/src/lib/services/view.svc.ts b/packages/nocodb/src/lib/services/view.svc.ts index 086ee0f6a1..1e15bf0cb7 100644 --- a/packages/nocodb/src/lib/services/view.svc.ts +++ b/packages/nocodb/src/lib/services/view.svc.ts @@ -1,8 +1,8 @@ -import type { SharedViewReqType, ViewReqType } from 'nocodb-sdk'; +import { T } from 'nc-help'; import { validatePayload } from '../meta/api/helpers'; import { Model, View } from '../models'; -import { T } from 'nc-help'; import { xcVisibilityMetaGet } from './modelVisibility.svc'; +import type { SharedViewReqType, ViewReqType } from 'nocodb-sdk'; export async function viewList(param: { tableId: string; diff --git a/packages/nocodb/src/lib/services/views/formView.svc.ts b/packages/nocodb/src/lib/services/views/formView.svc.ts index 5f43319e21..44428be92f 100644 --- a/packages/nocodb/src/lib/services/views/formView.svc.ts +++ b/packages/nocodb/src/lib/services/views/formView.svc.ts @@ -1,8 +1,8 @@ import { T } from 'nc-help'; -import type { FormReqType } from 'nocodb-sdk'; import { ViewTypes } from 'nocodb-sdk'; import { validatePayload } from '../../meta/api/helpers'; import { FormView, View } from '../../models'; +import type { FormReqType } from 'nocodb-sdk'; export async function formViewGet(param: { formViewId: string }) { const formViewData = await FormView.getWithInfo(param.formViewId); diff --git a/packages/nocodb/src/lib/services/views/formViewColumn.svc.ts b/packages/nocodb/src/lib/services/views/formViewColumn.svc.ts index 74ede17018..02bde737b6 100644 --- a/packages/nocodb/src/lib/services/views/formViewColumn.svc.ts +++ b/packages/nocodb/src/lib/services/views/formViewColumn.svc.ts @@ -1,6 +1,6 @@ +import { T } from 'nc-help'; import { validatePayload } from '../../meta/api/helpers'; import { FormViewColumn } from '../../models'; -import { T } from 'nc-help'; export async function columnUpdate(param: { formViewColumnId: string; // todo: replace with FormColumnReq diff --git a/packages/nocodb/src/lib/services/views/galleryView.svc.ts b/packages/nocodb/src/lib/services/views/galleryView.svc.ts index ea12f44a77..03ea822391 100644 --- a/packages/nocodb/src/lib/services/views/galleryView.svc.ts +++ b/packages/nocodb/src/lib/services/views/galleryView.svc.ts @@ -1,8 +1,8 @@ -import type { GalleryReqType } from 'nocodb-sdk'; import { ViewTypes } from 'nocodb-sdk'; import { T } from 'nc-help'; import { validatePayload } from '../../meta/api/helpers'; import { GalleryView, View } from '../../models'; +import type { GalleryReqType } from 'nocodb-sdk'; export async function galleryViewGet(param: { galleryViewId: string }) { return await GalleryView.get(param.galleryViewId); diff --git a/packages/nocodb/src/lib/services/views/gridView.svc.ts b/packages/nocodb/src/lib/services/views/gridView.svc.ts index 19114cd8bd..ad9f7896a2 100644 --- a/packages/nocodb/src/lib/services/views/gridView.svc.ts +++ b/packages/nocodb/src/lib/services/views/gridView.svc.ts @@ -1,9 +1,9 @@ import { T } from 'nc-help'; -import type { GridReqType } from 'nocodb-sdk'; import { ViewTypes } from 'nocodb-sdk'; import { validatePayload } from '../../meta/api/helpers'; import { View } from '../../models'; import { GridView } from '../../models'; +import type { GridReqType } from 'nocodb-sdk'; export async function gridViewCreate(param: { tableId: string; diff --git a/packages/nocodb/src/lib/services/views/gridViewColumn.svc.ts b/packages/nocodb/src/lib/services/views/gridViewColumn.svc.ts index 21ee7fdce6..f51674668a 100644 --- a/packages/nocodb/src/lib/services/views/gridViewColumn.svc.ts +++ b/packages/nocodb/src/lib/services/views/gridViewColumn.svc.ts @@ -1,7 +1,7 @@ -import type { GridColumnReqType } from 'nocodb-sdk'; +import { T } from 'nc-help'; import { validatePayload } from '../../meta/api/helpers'; import GridViewColumn from '../../models/GridViewColumn'; -import { T } from 'nc-help'; +import type { GridColumnReqType } from 'nocodb-sdk'; export async function columnList(param: { gridViewId: string }) { return await GridViewColumn.list(param.gridViewId); diff --git a/packages/nocodb/src/lib/services/views/kanbanView.svc.ts b/packages/nocodb/src/lib/services/views/kanbanView.svc.ts index ea62177e12..7415976400 100644 --- a/packages/nocodb/src/lib/services/views/kanbanView.svc.ts +++ b/packages/nocodb/src/lib/services/views/kanbanView.svc.ts @@ -1,8 +1,8 @@ -import type { KanbanReqType } from 'nocodb-sdk'; import { ViewTypes } from 'nocodb-sdk'; +import { T } from 'nc-help'; import { validatePayload } from '../../meta/api/helpers'; import { KanbanView, View } from '../../models'; -import { T } from 'nc-help'; +import type { KanbanReqType } from 'nocodb-sdk'; export async function kanbanViewGet(param: { kanbanViewId: string }) { return await KanbanView.get(param.kanbanViewId); diff --git a/packages/nocodb/src/lib/services/views/mapView.svc.ts b/packages/nocodb/src/lib/services/views/mapView.svc.ts index a4d0063124..e4e2b6b517 100644 --- a/packages/nocodb/src/lib/services/views/mapView.svc.ts +++ b/packages/nocodb/src/lib/services/views/mapView.svc.ts @@ -1,8 +1,8 @@ -import type { MapType } from 'nocodb-sdk'; import { ViewTypes } from 'nocodb-sdk'; -import View from '../../models/View'; import { T } from 'nc-help'; +import View from '../../models/View'; import MapView from '../../models/MapView'; +import type { MapType } from 'nocodb-sdk'; export async function mapViewGet(param: { mapViewId: string }) { return await MapView.get(param.mapViewId); diff --git a/packages/nocodb/src/lib/utils/NcConfigFactory.ts b/packages/nocodb/src/lib/utils/NcConfigFactory.ts index 9f64b6ecdf..c98717659b 100644 --- a/packages/nocodb/src/lib/utils/NcConfigFactory.ts +++ b/packages/nocodb/src/lib/utils/NcConfigFactory.ts @@ -1,16 +1,16 @@ import fs from 'fs'; -import parseDbUrl from 'parse-database-url'; import { URL } from 'url'; import { promisify } from 'util'; +import * as path from 'path'; +import parseDbUrl from 'parse-database-url'; +import SqlClientFactory from '../db/sql-client/lib/SqlClientFactory'; import type { AuthConfig, DbConfig, MailerConfig, NcConfig, } from '../../interface/config'; -import * as path from 'path'; -import SqlClientFactory from '../db/sql-client/lib/SqlClientFactory'; const { uniqueNamesGenerator, diff --git a/packages/nocodb/src/lib/utils/common/BaseApiBuilder.ts b/packages/nocodb/src/lib/utils/common/BaseApiBuilder.ts index 738dccff4b..4d6192d74d 100644 --- a/packages/nocodb/src/lib/utils/common/BaseApiBuilder.ts +++ b/packages/nocodb/src/lib/utils/common/BaseApiBuilder.ts @@ -4,24 +4,13 @@ import debug from 'debug'; import { Router } from 'express'; import inflection from 'inflection'; // import Knex from "knex"; -import type { - MysqlClient, - PgClient, - SqlClient, - // SqlClientFactory, -} from 'nc-help'; - -import type XcDynamicChanges from '../../../interface/XcDynamicChanges'; -import type { Acls, DbConfig, NcConfig } from '../../../interface/config'; -import type { BaseModelSql, XKnex } from '../../db/sql-data-mapper'; +import { T } from 'nc-help'; +import { UITypes } from 'nocodb-sdk'; import ModelXcMetaFactory from '../../db/sql-mgr/code/models/xc/ModelXcMetaFactory'; + import ExpressXcPolicy from '../../db/sql-mgr/code/policies/xc/ExpressXcPolicy'; import NcHelp from '../NcHelp'; -import type NcProjectBuilder from '../../v1-legacy/NcProjectBuilder'; -import type Noco from '../../Noco'; -import type NcMetaIO from '../../meta/NcMetaIO'; import XcCache from '../../v1-legacy/plugins/adapters/cache/XcCache'; -import { T } from 'nc-help'; import BaseModel from './BaseModel'; import { XcCron } from './XcCron'; @@ -32,7 +21,18 @@ import ncModelsOrderUpgrader from './jobs/ncModelsOrderUpgrader'; import ncParentModelTitleUpgrader from './jobs/ncParentModelTitleUpgrader'; import ncRemoveDuplicatedRelationRows from './jobs/ncRemoveDuplicatedRelationRows'; import xcMetaDiffSync from './handlers/xcMetaDiffSync'; -import { UITypes } from 'nocodb-sdk'; +import type NcMetaIO from '../../meta/NcMetaIO'; +import type Noco from '../../Noco'; +import type NcProjectBuilder from '../../v1-legacy/NcProjectBuilder'; +import type { BaseModelSql, XKnex } from '../../db/sql-data-mapper'; +import type { Acls, DbConfig, NcConfig } from '../../../interface/config'; +import type XcDynamicChanges from '../../../interface/XcDynamicChanges'; +import type { + MysqlClient, + PgClient, + SqlClient, + // SqlClientFactory, +} from 'nc-help'; const log = debug('nc:api:base'); diff --git a/packages/nocodb/src/lib/utils/common/BaseModel.ts b/packages/nocodb/src/lib/utils/common/BaseModel.ts index e419818224..7ef5a6ef1a 100644 --- a/packages/nocodb/src/lib/utils/common/BaseModel.ts +++ b/packages/nocodb/src/lib/utils/common/BaseModel.ts @@ -1,12 +1,12 @@ import Handlebars from 'handlebars'; -import type { IWebhookNotificationAdapter } from 'nc-plugin'; import ejs from 'ejs'; -import type IEmailAdapter from '../../../interface/IEmailAdapter'; import { BaseModelSql } from '../../db/sql-data-mapper'; +import formSubmissionEmailTemplate from './formSubmissionEmailTemplate'; +import type { IWebhookNotificationAdapter } from 'nc-plugin'; +import type IEmailAdapter from '../../../interface/IEmailAdapter'; // import axios from "axios"; import type BaseApiBuilder from './BaseApiBuilder'; -import formSubmissionEmailTemplate from './formSubmissionEmailTemplate'; Handlebars.registerHelper('json', function (context) { return JSON.stringify(context); diff --git a/packages/nocodb/src/lib/utils/common/NcConnectionMgr.ts b/packages/nocodb/src/lib/utils/common/NcConnectionMgr.ts index ae56532e6f..b5b9fb6c98 100644 --- a/packages/nocodb/src/lib/utils/common/NcConnectionMgr.ts +++ b/packages/nocodb/src/lib/utils/common/NcConnectionMgr.ts @@ -1,12 +1,12 @@ +import fs from 'fs'; +import { promisify } from 'util'; import SqlClientFactory from '../../db/sql-client/lib/SqlClientFactory'; import { XKnex } from '../../db/sql-data-mapper'; +import { defaultConnectionConfig } from '../NcConfigFactory'; import type { NcConfig } from '../../../interface/config'; -import fs from 'fs'; -import { promisify } from 'util'; import type { Knex } from 'knex'; import type NcMetaIO from '../../meta/NcMetaIO'; -import { defaultConnectionConfig } from '../NcConfigFactory'; export default class NcConnectionMgr { private static connectionRefs: { diff --git a/packages/nocodb/src/lib/utils/common/NcConnectionMgrv2.ts b/packages/nocodb/src/lib/utils/common/NcConnectionMgrv2.ts index b8b09aa6ed..2df30aae13 100644 --- a/packages/nocodb/src/lib/utils/common/NcConnectionMgrv2.ts +++ b/packages/nocodb/src/lib/utils/common/NcConnectionMgrv2.ts @@ -4,8 +4,8 @@ import { defaultConnectionConfig, defaultConnectionOptions, } from '../NcConfigFactory'; -import type Base from '../../models/Base'; import Noco from '../../Noco'; +import type Base from '../../models/Base'; export default class NcConnectionMgrv2 { private static connectionRefs: { diff --git a/packages/nocodb/src/lib/utils/common/handlers/xcMetaDiffSync.ts b/packages/nocodb/src/lib/utils/common/handlers/xcMetaDiffSync.ts index f4bda7957a..4ddb4fd41f 100644 --- a/packages/nocodb/src/lib/utils/common/handlers/xcMetaDiffSync.ts +++ b/packages/nocodb/src/lib/utils/common/handlers/xcMetaDiffSync.ts @@ -1,9 +1,9 @@ -import type { XcTablesPopulateParams } from '../BaseApiBuilder'; -import type BaseApiBuilder from '../BaseApiBuilder'; -import type { NcMetaDiff as NcMetaDiffType } from '../../../meta/handlers/xcMetaDiff'; import xcMetaDiff, { XcMetaDiffType } from '../../../meta/handlers/xcMetaDiff'; import XcCache from '../../../v1-legacy/plugins/adapters/cache/XcCache'; import { GqlApiBuilder } from '../../../v1-legacy/gql/GqlApiBuilder'; +import type { XcTablesPopulateParams } from '../BaseApiBuilder'; +import type BaseApiBuilder from '../BaseApiBuilder'; +import type { NcMetaDiff as NcMetaDiffType } from '../../../meta/handlers/xcMetaDiff'; // @ts-ignore export default async function (this: BaseApiBuilder | any) { diff --git a/packages/nocodb/src/lib/utils/getInstance.ts b/packages/nocodb/src/lib/utils/getInstance.ts index ddb5acb9d9..aed4afe0fa 100644 --- a/packages/nocodb/src/lib/utils/getInstance.ts +++ b/packages/nocodb/src/lib/utils/getInstance.ts @@ -1,6 +1,6 @@ import Noco from '../Noco'; -import { CacheGetType, CacheScope, MetaTable } from './globals'; import NocoCache from '../cache/NocoCache'; +import { CacheGetType, CacheScope, MetaTable } from './globals'; export default async function (force = false, ncMeta = Noco.ncMeta) { try { diff --git a/packages/nocodb/src/lib/utils/pluginUtils.ts b/packages/nocodb/src/lib/utils/pluginUtils.ts index 30221ef4a9..021fd1ac64 100644 --- a/packages/nocodb/src/lib/utils/pluginUtils.ts +++ b/packages/nocodb/src/lib/utils/pluginUtils.ts @@ -1,6 +1,6 @@ -import type fs from 'fs'; import path from 'path'; import os from 'os'; +import type fs from 'fs'; export function generateTempFilePath() { return path.join(os.tmpdir(), 'temp.txt'); diff --git a/packages/nocodb/src/lib/v1-legacy/NcProjectBuilder.ts b/packages/nocodb/src/lib/v1-legacy/NcProjectBuilder.ts index 8571ab5cc5..f78b160601 100644 --- a/packages/nocodb/src/lib/v1-legacy/NcProjectBuilder.ts +++ b/packages/nocodb/src/lib/v1-legacy/NcProjectBuilder.ts @@ -5,16 +5,16 @@ import { promisify } from 'util'; import axios from 'axios'; import { Router } from 'express'; -import type { NcConfig } from '../../interface/config'; +import { T } from 'nc-help'; import SqlClientFactory from '../db/sql-client/lib/SqlClientFactory'; import Migrator from '../db/sql-migrator/lib/KnexMigrator'; -import type Noco from '../Noco'; -import { T } from 'nc-help'; -import { GqlApiBuilder } from './gql/GqlApiBuilder'; import { XCEeError } from '../meta/NcMetaMgr'; -import { RestApiBuilder } from './rest/RestApiBuilder'; import NcConnectionMgr from '../utils/common/NcConnectionMgr'; +import { GqlApiBuilder } from './gql/GqlApiBuilder'; +import { RestApiBuilder } from './rest/RestApiBuilder'; +import type Noco from '../Noco'; +import type { NcConfig } from '../../interface/config'; export default class NcProjectBuilder { public readonly id: string; diff --git a/packages/nocodb/src/lib/v1-legacy/gql/GqlApiBuilder.ts b/packages/nocodb/src/lib/v1-legacy/gql/GqlApiBuilder.ts index 7900c2bf65..a8a9779e15 100644 --- a/packages/nocodb/src/lib/v1-legacy/gql/GqlApiBuilder.ts +++ b/packages/nocodb/src/lib/v1-legacy/gql/GqlApiBuilder.ts @@ -6,23 +6,23 @@ import { GraphQLJSON } from 'graphql-type-json'; import _ from 'lodash'; import { BaseType } from 'xc-core-ts'; -import type XcMetaMgr from '../../../interface/XcMetaMgr'; -import type { DbConfig, NcConfig } from '../../../interface/config'; import ExpressXcTsPolicyGql from '../../db/sql-mgr/code/gql-policies/xc-ts/ExpressXcTsPolicyGql'; import GqlXcSchemaFactory from '../../db/sql-mgr/code/gql-schema/xc-ts/GqlXcSchemaFactory'; import ModelXcMetaFactory from '../../db/sql-mgr/code/models/xc/ModelXcMetaFactory'; import NcHelp from '../../utils/NcHelp'; -import type NcProjectBuilder from '../NcProjectBuilder'; -import type Noco from '../../Noco'; -import type { XcTablesPopulateParams } from '../../utils/common/BaseApiBuilder'; import BaseApiBuilder from '../../utils/common/BaseApiBuilder'; -import type NcMetaIO from '../../meta/NcMetaIO'; import { m2mNotChildren, m2mNotChildrenCount } from './GqlCommonResolvers'; import GqlMiddleware from './GqlMiddleware'; import { GqlProcedureResolver } from './GqlProcedureResolver'; import GqlResolver from './GqlResolver'; import commonSchema from './common.schema'; +import type NcMetaIO from '../../meta/NcMetaIO'; +import type { XcTablesPopulateParams } from '../../utils/common/BaseApiBuilder'; +import type Noco from '../../Noco'; +import type NcProjectBuilder from '../NcProjectBuilder'; +import type { DbConfig, NcConfig } from '../../../interface/config'; +import type XcMetaMgr from '../../../interface/XcMetaMgr'; const log = debug('nc:api:gql'); diff --git a/packages/nocodb/src/lib/v1-legacy/gql/GqlAuthResolver.ts b/packages/nocodb/src/lib/v1-legacy/gql/GqlAuthResolver.ts index 5c7dffad62..79d5fe8a46 100644 --- a/packages/nocodb/src/lib/v1-legacy/gql/GqlAuthResolver.ts +++ b/packages/nocodb/src/lib/v1-legacy/gql/GqlAuthResolver.ts @@ -6,13 +6,12 @@ import * as jwt from 'jsonwebtoken'; import passport from 'passport'; import { ExtractJwt, Strategy } from 'passport-jwt'; +import authSchema from './auth/schema'; import type IEmailAdapter from '../../../interface/IEmailAdapter'; import type { DbConfig, NcConfig } from '../../../interface/config'; import type { Knex, XKnex } from '../../db/sql-data-mapper'; import type Noco from '../../Noco'; -import authSchema from './auth/schema'; - const { v4: uuidv4 } = require('uuid'); const PassportLocalStrategy = require('passport-local').Strategy; const autoBind = require('auto-bind'); diff --git a/packages/nocodb/src/lib/v1-legacy/gql/GqlProcedureResolver.ts b/packages/nocodb/src/lib/v1-legacy/gql/GqlProcedureResolver.ts index 32d236db91..86b36fd1eb 100644 --- a/packages/nocodb/src/lib/v1-legacy/gql/GqlProcedureResolver.ts +++ b/packages/nocodb/src/lib/v1-legacy/gql/GqlProcedureResolver.ts @@ -3,8 +3,8 @@ import autoBind from 'auto-bind'; import BaseProcedure from '../../utils/common/BaseProcedure'; import XcProcedure from '../../utils/common/XcProcedure'; -import type { GqlApiBuilder } from './GqlApiBuilder'; import GqlBaseResolver from './GqlBaseResolver'; +import type { GqlApiBuilder } from './GqlApiBuilder'; export class GqlProcedureResolver extends BaseProcedure { private acls: { [aclName: string]: { [role: string]: boolean } }; diff --git a/packages/nocodb/src/lib/v1-legacy/gql/GqlResolver.ts b/packages/nocodb/src/lib/v1-legacy/gql/GqlResolver.ts index 5fd6580c76..2c183cb2a4 100644 --- a/packages/nocodb/src/lib/v1-legacy/gql/GqlResolver.ts +++ b/packages/nocodb/src/lib/v1-legacy/gql/GqlResolver.ts @@ -1,12 +1,11 @@ import autoBind from 'auto-bind'; +import GqlBaseResolver from './GqlBaseResolver'; +import GqlMiddleware from './GqlMiddleware'; import type { Acls } from '../../../interface/config'; import type { BaseModelSql } from '../../db/sql-data-mapper'; import type Noco from '../../Noco'; -import GqlBaseResolver from './GqlBaseResolver'; -import GqlMiddleware from './GqlMiddleware'; - function parseHrtimeToSeconds(hrtime) { const seconds = (hrtime[0] + hrtime[1] / 1e6).toFixed(3); return seconds; diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/NcPluginMgr.ts b/packages/nocodb/src/lib/v1-legacy/plugins/NcPluginMgr.ts index b60444149b..23cdcc32c2 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/NcPluginMgr.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/NcPluginMgr.ts @@ -1,9 +1,3 @@ -import type { - IEmailAdapter, - IStorageAdapter, - IWebhookNotificationAdapter, - XcPlugin, -} from 'nc-plugin'; import { XcEmailPlugin, XcStoragePlugin, @@ -29,10 +23,16 @@ import TwilioWhatsappPluginConfig from '../../plugins/twilioWhatsapp'; import UpcloudPluginConfig from '../../plugins/upcloud'; import VultrPluginConfig from '../../plugins/vultr'; import SESPluginConfig from '../../plugins/ses'; +import Local from './adapters/storage/Local'; import type Noco from '../../Noco'; import type NcMetaIO from '../../meta/NcMetaIO'; -import Local from './adapters/storage/Local'; +import type { + IEmailAdapter, + IStorageAdapter, + IWebhookNotificationAdapter, + XcPlugin, +} from 'nc-plugin'; const defaultPlugins = [ SlackPluginConfig, diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/email/EmailFactory.ts b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/email/EmailFactory.ts index 87e3969b77..e6f51fa656 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/email/EmailFactory.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/email/EmailFactory.ts @@ -1,7 +1,6 @@ -import type IEmailAdapter from '../../../../../interface/IEmailAdapter'; - import SES from './SES'; import SMTP from './SMTP'; +import type IEmailAdapter from '../../../../../interface/IEmailAdapter'; export default class EmailFactory { private static instance: IEmailAdapter; diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/storage/Local.ts b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/storage/Local.ts index f145979636..c529a51c9a 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/storage/Local.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/storage/Local.ts @@ -4,10 +4,9 @@ import { promisify } from 'util'; import mkdirp from 'mkdirp'; -import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; -import NcConfigFactory from '../../../../utils/NcConfigFactory'; - import axios from 'axios'; +import NcConfigFactory from '../../../../utils/NcConfigFactory'; +import type { IStorageAdapterV2, XcFile } from 'nc-plugin'; export default class Local implements IStorageAdapterV2 { constructor() {} diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/azure.ts b/packages/nocodb/src/lib/v1-legacy/plugins/azure.ts index 01ef941eea..5aac1dd57d 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/azure.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/azure.ts @@ -1,5 +1,5 @@ -import type { XcForm } from 'nocodb-sdk'; import { XcActionType, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Azure Storage', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/brand.ts b/packages/nocodb/src/lib/v1-legacy/plugins/brand.ts index ab35cf421f..d2a5863845 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/brand.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/brand.ts @@ -1,5 +1,5 @@ -import type { XcForm } from 'nocodb-sdk'; import { XcActionType, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; const input: XcForm = { title: 'Branding', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/cache.ts b/packages/nocodb/src/lib/v1-legacy/plugins/cache.ts index 2396d2f596..8c4225f8b2 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/cache.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/cache.ts @@ -1,5 +1,5 @@ -import type { XcForm } from 'nocodb-sdk'; import { XcActionType, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Metadata LRU Cache', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/discord.ts b/packages/nocodb/src/lib/v1-legacy/plugins/discord.ts index 74d9e9ae1f..5185dd4d97 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/discord.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/discord.ts @@ -1,5 +1,5 @@ -import type { XcForm } from 'nocodb-sdk'; import { XcActionType, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Discord', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/ee.ts b/packages/nocodb/src/lib/v1-legacy/plugins/ee.ts index dce92301c3..d33a907700 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/ee.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/ee.ts @@ -1,5 +1,5 @@ -import type { XcForm } from 'nocodb-sdk'; import { XcActionType, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Enterprise Edition', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/githubAuth.ts b/packages/nocodb/src/lib/v1-legacy/plugins/githubAuth.ts index 7047e520f3..c35a5cb661 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/githubAuth.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/githubAuth.ts @@ -1,5 +1,5 @@ -import type { XcForm } from 'nocodb-sdk'; import { XcActionType, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Github Auth', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/googleAuth.ts b/packages/nocodb/src/lib/v1-legacy/plugins/googleAuth.ts index f25bf0e8a9..ada3dd8905 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/googleAuth.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/googleAuth.ts @@ -1,5 +1,5 @@ -import type { XcForm } from 'nocodb-sdk'; import { XcActionType, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Google Auth', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/mattermost.ts b/packages/nocodb/src/lib/v1-legacy/plugins/mattermost.ts index 04c7fc8a1b..c3f1d61daf 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/mattermost.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/mattermost.ts @@ -1,5 +1,5 @@ -import type { XcForm } from 'nocodb-sdk'; import { XcActionType, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Mattermost', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/ses.ts b/packages/nocodb/src/lib/v1-legacy/plugins/ses.ts index 7f7ea7323d..4ca9b779c6 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/ses.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/ses.ts @@ -1,7 +1,7 @@ // @wingkwong: Deprecated. Moved to nocodb/packages/nocodb/src/plugins/ses instead. Keep this file for migration only. -import type { XcForm } from 'nocodb-sdk'; import { XcActionType, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Amazon Simple Email Service(SES)', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/slack.ts b/packages/nocodb/src/lib/v1-legacy/plugins/slack.ts index ac583707a1..ac67661c91 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/slack.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/slack.ts @@ -1,5 +1,5 @@ -import type { XcForm } from 'nocodb-sdk'; import { XcActionType, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Slack', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/smtp.ts b/packages/nocodb/src/lib/v1-legacy/plugins/smtp.ts index a6450cc7e1..dc7ce4e45a 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/smtp.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/smtp.ts @@ -1,5 +1,5 @@ -import type { XcForm } from 'nocodb-sdk'; import { XcActionType, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Email SMTP', diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/twilio.ts b/packages/nocodb/src/lib/v1-legacy/plugins/twilio.ts index 715613e775..f936f8b377 100644 --- a/packages/nocodb/src/lib/v1-legacy/plugins/twilio.ts +++ b/packages/nocodb/src/lib/v1-legacy/plugins/twilio.ts @@ -1,5 +1,5 @@ -import type { XcForm } from 'nocodb-sdk'; import { XcActionType, XcType } from 'nocodb-sdk'; +import type { XcForm } from 'nocodb-sdk'; const input: XcForm = { title: 'Configure Twilio', diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestApiBuilder.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestApiBuilder.ts index 8b7ce6b92e..a9632210a1 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestApiBuilder.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestApiBuilder.ts @@ -2,15 +2,14 @@ import fs from 'fs'; import path from 'path'; import { promisify } from 'util'; -import autoBind from 'auto-bind'; -import debug from 'debug'; +import { URL } from 'url'; import * as ejs from 'ejs'; import { Router } from 'express'; import { glob } from 'glob'; import mkdirp from 'mkdirp'; -import { URL } from 'url'; -import type { DbConfig, NcConfig } from '../../../interface/config'; +import debug from 'debug'; +import autoBind from 'auto-bind'; import ModelXcMetaFactory from '../../db/sql-mgr/code/models/xc/ModelXcMetaFactory'; import SwaggerXc from '../../db/sql-mgr/code/routers/xc-ts/SwaggerXc'; import SwaggerXcBt from '../../db/sql-mgr/code/routers/xc-ts/SwaggerXcBt'; @@ -19,28 +18,29 @@ import ExpressXcTsRoutes from '../../db/sql-mgr/code/routes/xc-ts/ExpressXcTsRou import ExpressXcTsRoutesBt from '../../db/sql-mgr/code/routes/xc-ts/ExpressXcTsRoutesBt'; import ExpressXcTsRoutesHm from '../../db/sql-mgr/code/routes/xc-ts/ExpressXcTsRoutesHm'; import NcHelp from '../../utils/NcHelp'; -import type NcProjectBuilder from '../NcProjectBuilder'; -import type Noco from '../../Noco'; -import type { - NcMetaData, - XcTablesPopulateParams, -} from '../../utils/common/BaseApiBuilder'; import BaseApiBuilder, { IGNORE_TABLES, } from '../../utils/common/BaseApiBuilder'; -import type NcMetaIO from '../../meta/NcMetaIO'; - +import Column from '../../models/Column'; +import { MetaTable } from '../../utils/globals'; import { RestCtrl } from './RestCtrl'; + import { RestCtrlBelongsTo } from './RestCtrlBelongsTo'; import { RestCtrlCustom } from './RestCtrlCustom'; import { RestCtrlHasMany } from './RestCtrlHasMany'; import { RestCtrlProcedure } from './RestCtrlProcedure'; -import Column from '../../models/Column'; +import type NcMetaIO from '../../meta/NcMetaIO'; +import type { + NcMetaData, + XcTablesPopulateParams, +} from '../../utils/common/BaseApiBuilder'; +import type Noco from '../../Noco'; // import NocoTypeGenerator from '../v1-legacy-resolver/NocoTypeGenerator'; // import NocoResolverGenerator from '../v1-legacy-resolver/NocoResolverGenerator'; // import { RestCtrlv2 } from './RestCtrlv2'; // import registerRestCtrl from './registerRestCtrl'; -import { MetaTable } from '../../utils/globals'; +import type { DbConfig, NcConfig } from '../../../interface/config'; +import type NcProjectBuilder from '../NcProjectBuilder'; // import { BaseModelSqlv2 } from '../../sql-data-mapper/lib/sql/BaseModelSqlv2'; const log = debug('nc:api:rest'); diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestAuthCtrl.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestAuthCtrl.ts index 520c3dd9a8..f390b125e8 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestAuthCtrl.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestAuthCtrl.ts @@ -1,5 +1,5 @@ import { promisify } from 'util'; - +import * as crypto from 'crypto'; import bcrypt from 'bcryptjs'; import * as ejs from 'ejs'; import * as jwt from 'jsonwebtoken'; @@ -10,28 +10,22 @@ import { Strategy as GoogleStrategy } from 'passport-google-oauth20'; import { ExtractJwt, Strategy } from 'passport-jwt'; import validator from 'validator'; +import { Strategy as CustomStrategy } from 'passport-custom'; +import axios from 'axios'; +import { T } from 'nc-help'; +import XcCache from '../plugins/adapters/cache/XcCache'; import type { DbConfig, NcConfig } from '../../../interface/config'; import type { Knex } from '../../db/sql-data-mapper'; import type Noco from '../../Noco'; +import type NcMetaIO from '../../meta/NcMetaIO'; +import type IEmailAdapter from '../../../interface/IEmailAdapter'; + const autoBind = require('auto-bind'); const PassportLocalStrategy = require('passport-local').Strategy; -import { Strategy as CustomStrategy } from 'passport-custom'; - const { v4: uuidv4 } = require('uuid'); - -import * as crypto from 'crypto'; - -import type NcMetaIO from '../../meta/NcMetaIO'; - const { isEmail } = require('validator'); -import axios from 'axios'; - -import type IEmailAdapter from '../../../interface/IEmailAdapter'; -import { T } from 'nc-help'; -import XcCache from '../plugins/adapters/cache/XcCache'; - passport.serializeUser(function ( { id, diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestBaseCtrl.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestBaseCtrl.ts index 7c9ded5e45..387cc43108 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestBaseCtrl.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestBaseCtrl.ts @@ -1,5 +1,5 @@ -import type { Handler, NextFunction, Request, Response, Router } from 'express'; import Handlebars from 'handlebars'; +import type { Handler, NextFunction, Request, Response, Router } from 'express'; import type { Route } from '../../../interface/config'; diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrl.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrl.ts index de04891d13..c7fe24f449 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrl.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrl.ts @@ -1,11 +1,11 @@ import autoBind from 'auto-bind'; -import type { NextFunction, Request, Response } from 'express'; import { Router } from 'express'; +import { RestBaseCtrl } from './RestBaseCtrl'; +import type { NextFunction, Request, Response } from 'express'; import type { Acl, Acls, Route } from '../../../interface/config'; import type { BaseModelSql } from '../../db/sql-data-mapper'; -import { RestBaseCtrl } from './RestBaseCtrl'; import type { BaseModelSqlv2 } from '../../db/sql-data-mapper/lib/sql/BaseModelSqlv2'; function parseHrtimeToSeconds(hrtime) { diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlBelongsTo.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlBelongsTo.ts index 0222c52cae..0edfbff046 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlBelongsTo.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlBelongsTo.ts @@ -1,11 +1,10 @@ import autoBind from 'auto-bind'; +import { RestBaseCtrl } from './RestBaseCtrl'; import type { NextFunction, Request, Response } from 'express'; import type { Acl, Acls, Route } from '../../../interface/config'; import type { BaseModelSql } from '../../db/sql-data-mapper'; -import { RestBaseCtrl } from './RestBaseCtrl'; - export class RestCtrlBelongsTo extends RestBaseCtrl { public parentTable: string; public childTable: string; diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlCustom.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlCustom.ts index 0b472a29c1..97576b03aa 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlCustom.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlCustom.ts @@ -1,12 +1,11 @@ import autoBind from 'auto-bind'; -import type { NextFunction, Request, Response } from 'express'; import { Router } from 'express'; +import { RestBaseCtrl } from './RestBaseCtrl'; +import type { NextFunction, Request, Response } from 'express'; import type { Route } from '../../../interface/config'; import type { BaseModelSql } from '../../db/sql-data-mapper'; -import { RestBaseCtrl } from './RestBaseCtrl'; - export class RestCtrlCustom extends RestBaseCtrl { public app: any; diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlHasMany.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlHasMany.ts index f12196b5fc..56fa122d0a 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlHasMany.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlHasMany.ts @@ -1,11 +1,10 @@ import autoBind from 'auto-bind'; +import { RestBaseCtrl } from './RestBaseCtrl'; import type { NextFunction, Request, Response } from 'express'; import type { Acl, Acls, Route } from '../../../interface/config'; import type { BaseModelSql } from '../../db/sql-data-mapper'; -import { RestBaseCtrl } from './RestBaseCtrl'; - export class RestCtrlHasMany extends RestBaseCtrl { public parentTable: string; public childTable: string; diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlProcedure.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlProcedure.ts index 9aa31cbbd5..e2e491fc1c 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlProcedure.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestCtrlProcedure.ts @@ -1,8 +1,8 @@ import autoBind from 'auto-bind'; -import type { Handler, NextFunction, Request, Response, Router } from 'express'; import BaseProcedure from '../../utils/common/BaseProcedure'; import XcProcedure from '../../utils/common/XcProcedure'; +import type { Handler, NextFunction, Request, Response, Router } from 'express'; import type { RestApiBuilder } from './RestApiBuilder'; diff --git a/packages/nocodb/src/lib/v1-legacy/templates/NcTemplateParser.ts b/packages/nocodb/src/lib/v1-legacy/templates/NcTemplateParser.ts index 629361581e..8a7a011d74 100644 --- a/packages/nocodb/src/lib/v1-legacy/templates/NcTemplateParser.ts +++ b/packages/nocodb/src/lib/v1-legacy/templates/NcTemplateParser.ts @@ -1,5 +1,5 @@ -import type { MssqlUi, MysqlUi, OracleUi, PgUi, SqliteUi } from 'nocodb-sdk'; import { SqlUiFactory, UITypes } from 'nocodb-sdk'; +import type { MssqlUi, MysqlUi, OracleUi, PgUi, SqliteUi } from 'nocodb-sdk'; export default class NcTemplateParser { sqlUi: diff --git a/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts index ce4b7b526b..12309f7b86 100644 --- a/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts +++ b/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts @@ -1,22 +1,21 @@ -import type { NcConfig } from '../../interface/config'; - import debug from 'debug'; -import type NcMetaIO from '../meta/NcMetaIO'; import { T } from 'nc-help'; -import ncProjectEnvUpgrader from './ncProjectEnvUpgrader'; -import ncProjectEnvUpgrader0011045 from './ncProjectEnvUpgrader0011045'; -import ncProjectUpgraderV2_0090000 from './ncProjectUpgraderV2_0090000'; -import ncDataTypesUpgrader from './ncDataTypesUpgrader'; -import ncProjectRolesUpgrader from './ncProjectRolesUpgrader'; -import ncFilterUpgrader from './ncFilterUpgrader'; +import boxen from 'boxen'; import ncAttachmentUpgrader from './ncAttachmentUpgrader'; import ncAttachmentUpgrader_0104002 from './ncAttachmentUpgrader_0104002'; import ncStickyColumnUpgrader from './ncStickyColumnUpgrader'; import ncFilterUpgrader_0104004 from './ncFilterUpgrader_0104004'; import ncFilterUpgrader_0105003 from './ncFilterUpgrader_0105003'; +import ncFilterUpgrader from './ncFilterUpgrader'; +import ncProjectRolesUpgrader from './ncProjectRolesUpgrader'; +import ncDataTypesUpgrader from './ncDataTypesUpgrader'; +import ncProjectUpgraderV2_0090000 from './ncProjectUpgraderV2_0090000'; +import ncProjectEnvUpgrader0011045 from './ncProjectEnvUpgrader0011045'; +import ncProjectEnvUpgrader from './ncProjectEnvUpgrader'; +import type { NcConfig } from '../../interface/config'; +import type NcMetaIO from '../meta/NcMetaIO'; const log = debug('nc:version-upgrader'); -import boxen from 'boxen'; export interface NcUpgraderCtx { ncMeta: NcMetaIO; diff --git a/packages/nocodb/src/lib/version-upgrader/ncAttachmentUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/ncAttachmentUpgrader.ts index 8aea109e19..10432164ed 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncAttachmentUpgrader.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncAttachmentUpgrader.ts @@ -1,13 +1,13 @@ -import type { Knex } from 'knex'; -import type { NcUpgraderCtx } from './NcUpgrader'; +import { UITypes } from 'nocodb-sdk'; import { MetaTable } from '../utils/globals'; import Base from '../models/Base'; import Model from '../models/Model'; -import type { XKnex } from '../db/sql-data-mapper/index'; import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; -import type { BaseType } from 'nocodb-sdk'; -import { UITypes } from 'nocodb-sdk'; import { throwTimeoutError } from './ncUpgradeErrors'; +import type { Knex } from 'knex'; +import type { NcUpgraderCtx } from './NcUpgrader'; +import type { XKnex } from '../db/sql-data-mapper/index'; +import type { BaseType } from 'nocodb-sdk'; // before 0.103.0, an attachment object was like // [{ diff --git a/packages/nocodb/src/lib/version-upgrader/ncAttachmentUpgrader_0104002.ts b/packages/nocodb/src/lib/version-upgrader/ncAttachmentUpgrader_0104002.ts index 62bf56fd19..60d34f3070 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncAttachmentUpgrader_0104002.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncAttachmentUpgrader_0104002.ts @@ -1,13 +1,13 @@ -import type { Knex } from 'knex'; -import type { NcUpgraderCtx } from './NcUpgrader'; +import { UITypes } from 'nocodb-sdk'; import { MetaTable } from '../utils/globals'; import Base from '../models/Base'; import Model from '../models/Model'; -import type { XKnex } from '../db/sql-data-mapper/index'; import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2'; -import type { BaseType } from 'nocodb-sdk'; -import { UITypes } from 'nocodb-sdk'; import { throwTimeoutError } from './ncUpgradeErrors'; +import type { Knex } from 'knex'; +import type { NcUpgraderCtx } from './NcUpgrader'; +import type { XKnex } from '../db/sql-data-mapper/index'; +import type { BaseType } from 'nocodb-sdk'; // after 0101002 upgrader, the attachment object would become broken when // (1) switching views after updating a singleSelect field diff --git a/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader.ts index f1490cac9d..bd5cefd60f 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader.ts @@ -1,8 +1,8 @@ -import type { NcUpgraderCtx } from './NcUpgrader'; import { MetaTable } from '../utils/globals'; import View from '../models/View'; import Hook from '../models/Hook'; import Column from '../models/Column'; +import type { NcUpgraderCtx } from './NcUpgrader'; // before 0.101.0, an incorrect project_id was inserted when // a filter is created without specifying the column diff --git a/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0104004.ts b/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0104004.ts index 6140af6ae5..4b87eac00c 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0104004.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0104004.ts @@ -1,11 +1,11 @@ -import type { NcUpgraderCtx } from './NcUpgrader'; +import { UITypes } from 'nocodb-sdk'; import { MetaTable } from '../utils/globals'; -import type NcMetaIO from '../meta/NcMetaIO'; import Column from '../models/Column'; import Filter from '../models/Filter'; import Project from '../models/Project'; +import type NcMetaIO from '../meta/NcMetaIO'; +import type { NcUpgraderCtx } from './NcUpgrader'; import type { SelectOptionsType } from 'nocodb-sdk'; -import { UITypes } from 'nocodb-sdk'; // as of 0.104.3, almost all filter operators are available to all column types // while some of them aren't supposed to be shown diff --git a/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0105003.ts b/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0105003.ts index 8b54f31857..2755ed8bf6 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0105003.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0105003.ts @@ -1,9 +1,9 @@ -import type { NcUpgraderCtx } from './NcUpgrader'; +import { UITypes } from 'nocodb-sdk'; import { MetaTable } from '../utils/globals'; -import type NcMetaIO from '../meta/NcMetaIO'; import Column from '../models/Column'; import Filter from '../models/Filter'; -import { UITypes } from 'nocodb-sdk'; +import type { NcUpgraderCtx } from './NcUpgrader'; +import type NcMetaIO from '../meta/NcMetaIO'; // as of 0.105.3, date / datetime filters include `is like` and `is not like` which are not practical // `removeLikeAndNlikeFilters` in this upgrader is simply to remove them diff --git a/packages/nocodb/src/lib/version-upgrader/ncProjectUpgraderV2_0090000.ts b/packages/nocodb/src/lib/version-upgrader/ncProjectUpgraderV2_0090000.ts index 30141afed1..5e6a0ef90c 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncProjectUpgraderV2_0090000.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncProjectUpgraderV2_0090000.ts @@ -1,26 +1,17 @@ -import type { NcUpgraderCtx } from './NcUpgrader'; -import Noco from '../Noco'; -import User from '../models/User'; -import Project from '../models/Project'; -import ProjectUser from '../models/ProjectUser'; -import Model from '../models/Model'; -import type { ViewType } from 'nocodb-sdk'; import { ModelTypes, substituteColumnAliasWithIdInFormula, UITypes, ViewTypes, } from 'nocodb-sdk'; +import Model from '../models/Model'; +import ProjectUser from '../models/ProjectUser'; +import Project from '../models/Project'; +import User from '../models/User'; +import Noco from '../Noco'; import Column from '../models/Column'; -import type LinkToAnotherRecordColumn from '../models/LinkToAnotherRecordColumn'; import NcHelp from '../utils/NcHelp'; -import type { ROLLUP_FUNCTIONS } from '../models/RollupColumn'; -import type RollupColumn from '../models/RollupColumn'; import View from '../models/View'; -import type GridView from '../models/GridView'; -import type KanbanView from '../models/KanbanView'; -import type FormView from '../models/FormView'; -import type GalleryView from '../models/GalleryView'; import Sort from '../models/Sort'; import Filter from '../models/Filter'; import ModelRoleVisibility from '../models/ModelRoleVisibility'; @@ -31,6 +22,15 @@ import GridViewColumn from '../models/GridViewColumn'; import { getUniqueColumnAliasName } from '../meta/helpers/getUniqueName'; import NcProjectBuilderEE from '../v1-legacy/NcProjectBuilderEE'; import Audit from '../models/Audit'; +import type GalleryView from '../models/GalleryView'; +import type FormView from '../models/FormView'; +import type { ViewType } from 'nocodb-sdk'; +import type KanbanView from '../models/KanbanView'; +import type GridView from '../models/GridView'; +import type RollupColumn from '../models/RollupColumn'; +import type { ROLLUP_FUNCTIONS } from '../models/RollupColumn'; +import type LinkToAnotherRecordColumn from '../models/LinkToAnotherRecordColumn'; +import type { NcUpgraderCtx } from './NcUpgrader'; export default async function (ctx: NcUpgraderCtx) { const ncMeta = ctx.ncMeta; diff --git a/packages/nocodb/src/lib/version-upgrader/ncStickyColumnUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/ncStickyColumnUpgrader.ts index c7ed7f616d..e13c07399d 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncStickyColumnUpgrader.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncStickyColumnUpgrader.ts @@ -1,5 +1,5 @@ -import type { NcUpgraderCtx } from './NcUpgrader'; import { MetaTable } from '../utils/globals'; +import type { NcUpgraderCtx } from './NcUpgrader'; // before 0.104.3, display value column can be in any position in table // with this upgrade we introduced sticky primary column feature diff --git a/packages/nocodb/src/run/redoc.ts b/packages/nocodb/src/run/redoc.ts index 797d59059b..62710b31b8 100644 --- a/packages/nocodb/src/run/redoc.ts +++ b/packages/nocodb/src/run/redoc.ts @@ -1,5 +1,5 @@ -import express from 'express'; import path from 'path'; +import express from 'express'; const pageContent = `