From 460a10cae69b88dbe6d9a4293161743ad4063ebc Mon Sep 17 00:00:00 2001 From: mertmit Date: Wed, 14 Aug 2024 17:00:46 +0300 Subject: [PATCH 1/2] chore: remove duplicate comment Signed-off-by: mertmit --- .../nocodb/src/modules/jobs/jobs/export-import/import.service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts index 346a407ea2..67b5f2abeb 100644 --- a/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts +++ b/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts @@ -176,7 +176,6 @@ export class ImportService { : true), ); - // create table with static columns const table = param.existingModel || (await this.tablesService.tableCreate(context, { From 758f5bfbb459ca42deeb420776edff9464dd19d8 Mon Sep 17 00:00:00 2001 From: mertmit Date: Wed, 14 Aug 2024 17:07:15 +0300 Subject: [PATCH 2/2] chore: use local nocodb-sdk Signed-off-by: mertmit --- packages/nc-gui/package.json | 2 +- packages/nocodb/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index 2c72b780f3..731976f937 100644 --- a/packages/nc-gui/package.json +++ b/packages/nc-gui/package.json @@ -79,7 +79,7 @@ "marked": "^4.3.0", "monaco-editor": "^0.50.0", "monaco-sql-languages": "^0.11.0", - "nocodb-sdk": "0.253.0", + "nocodb-sdk": "workspace:^", "papaparse": "^5.4.1", "parse-github-url": "^1.0.2", "pdfobject": "^2.3.0", diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index d64d1c5940..4a44bd2c1d 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -125,7 +125,7 @@ "nc-help": "0.3.4", "nc-lib-gui": "0.253.0", "nestjs-throttler-storage-redis": "^0.4.4", - "nocodb-sdk": "0.253.0", + "nocodb-sdk": "workspace:^", "nodemailer": "^6.9.13", "object-hash": "^3.0.0", "object-sizeof": "^2.6.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c73b6b0f0c..3bc85809bf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -167,7 +167,7 @@ importers: specifier: ^0.11.0 version: 0.11.0 nocodb-sdk: - specifier: 0.253.0 + specifier: workspace:^ version: link:../nocodb-sdk papaparse: specifier: ^5.4.1 @@ -712,7 +712,7 @@ importers: specifier: ^0.4.4 version: 0.4.4(@nestjs/common@10.3.8)(@nestjs/core@10.3.8)(@nestjs/throttler@5.1.2)(ioredis@5.4.1)(reflect-metadata@0.2.1) nocodb-sdk: - specifier: 0.253.0 + specifier: workspace:^ version: link:../nocodb-sdk nodemailer: specifier: ^6.9.13