From 4dfe35c4c8767501650d228f4d85668b26f25e25 Mon Sep 17 00:00:00 2001 From: pranavxc Date: Thu, 14 Mar 2024 09:12:12 +0000 Subject: [PATCH 1/4] [create-pull-request] automated change Signed-off-by: GitHub --- packages/nc-gui/package.json | 2 +- packages/nc-lib-gui/package.json | 2 +- packages/nocodb-sdk/package.json | 2 +- packages/nocodb-sdk/src/lib/Api.ts | 13 +++++++++---- packages/nocodb/package.json | 8 ++++---- pnpm-lock.yaml | 21 +++++++++++---------- 6 files changed, 27 insertions(+), 21 deletions(-) diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index 79847c28999a..43aeefe078d8 100644 --- a/packages/nc-gui/package.json +++ b/packages/nc-gui/package.json @@ -75,7 +75,7 @@ "marked": "^4.3.0", "monaco-editor": "^0.45.0", "monaco-sql-languages": "^0.11.0", - "nocodb-sdk": "workspace:^", + "nocodb-sdk": "0.204.5", "papaparse": "^5.4.1", "parse-github-url": "^1.0.2", "pinia": "^2.1.7", diff --git a/packages/nc-lib-gui/package.json b/packages/nc-lib-gui/package.json index e1dcd6c312fb..2b7023e8d8ac 100644 --- a/packages/nc-lib-gui/package.json +++ b/packages/nc-lib-gui/package.json @@ -1,6 +1,6 @@ { "name": "nc-lib-gui", - "version": "0.204.4", + "version": "0.204.5", "description": "NocoDB GUI", "author": { "name": "NocoDB", diff --git a/packages/nocodb-sdk/package.json b/packages/nocodb-sdk/package.json index 0e2ea72df080..d733a6dd09b4 100644 --- a/packages/nocodb-sdk/package.json +++ b/packages/nocodb-sdk/package.json @@ -1,6 +1,6 @@ { "name": "nocodb-sdk", - "version": "0.204.4", + "version": "0.204.5", "description": "NocoDB SDK", "main": "build/main/index.js", "typings": "build/main/index.d.ts", diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts index f3effefbb312..da9c4cd1a75e 100644 --- a/packages/nocodb-sdk/src/lib/Api.ts +++ b/packages/nocodb-sdk/src/lib/Api.ts @@ -2147,6 +2147,8 @@ export interface ProjectReqType { type?: 'database' | 'documentation' | 'dashboard'; /** List of Linked Database Base IDs (only used for Dashboard Projects so far) */ linked_db_project_ids?: string[]; + /** Base Meta */ + meta?: MetaType; } /** @@ -2184,10 +2186,7 @@ export interface ProjectUpdateReqType { * Model for Base User Request */ export interface ProjectUserReqType { - /** - * Base User Email - * @format email - */ + /** Base User Email */ email: string; /** Base User Role */ roles: @@ -7723,6 +7722,8 @@ export class Api< sortArrJson?: string; /** Used for multiple filter queries */ filterArrJson?: string; + /** Comma separated list of pks */ + pks?: string; }, params: RequestParams = {} ) => @@ -9214,6 +9215,8 @@ export class Api< sortArrJson?: string; /** Used for multiple filter queries */ filterArrJson?: string; + /** Comma separated list of pks */ + pks?: string; }, params: RequestParams = {} ) => @@ -11028,6 +11031,8 @@ export class Api< sortArrJson?: string; /** Used for multiple filter queries */ filterArrJson?: string; + /** Comma separated list of pks */ + pks?: string; }, params: RequestParams = {} ) => diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index f9fcf189a748..2aace6afb2e3 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -1,6 +1,6 @@ { "name": "nocodb", - "version": "0.204.4", + "version": "0.204.5", "description": "NocoDB Backend", "main": "dist/bundle.js", "author": { @@ -132,12 +132,12 @@ "mysql2": "^3.9.2", "nanoid": "^3.3.7", "nc-help": "0.3.1", - "nc-lib-gui": "0.204.4", + "nc-lib-gui": "0.204.5", "nc-plugin": "^0.1.3", "ncp": "^2.0.0", "nestjs-kafka": "^1.0.6", "nestjs-throttler-storage-redis": "^0.4.2", - "nocodb-sdk": "workspace:^", + "nocodb-sdk": "0.204.5", "nodemailer": "^6.9.12", "object-hash": "^3.0.0", "object-sizeof": "^2.6.4", @@ -229,4 +229,4 @@ "coverageDirectory": "../coverage", "testEnvironment": "node" } -} +} \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index abf9f6299c89..1ceb8fd5fd09 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -154,7 +154,7 @@ importers: specifier: ^0.11.0 version: 0.11.0 nocodb-sdk: - specifier: workspace:^ + specifier: 0.204.5 version: link:../nocodb-sdk papaparse: specifier: ^5.4.1 @@ -686,8 +686,8 @@ importers: specifier: 0.3.1 version: 0.3.1(asn1.js@5.4.1)(debug@4.3.4)(knex@2.4.2) nc-lib-gui: - specifier: 0.204.4 - version: 0.204.4 + specifier: 0.204.5 + version: 0.204.5 nc-plugin: specifier: ^0.1.3 version: 0.1.3 @@ -701,7 +701,7 @@ importers: specifier: ^0.4.2 version: 0.4.2(@nestjs/common@10.3.3)(@nestjs/core@10.3.3)(@nestjs/throttler@5.1.2)(ioredis@5.3.2)(reflect-metadata@0.2.1) nocodb-sdk: - specifier: workspace:^ + specifier: 0.204.5 version: link:../nocodb-sdk nodemailer: specifier: ^6.9.12 @@ -901,7 +901,7 @@ importers: version: 6.3.4 ts-jest: specifier: 29.1.2 - version: 29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.3.2) + version: 29.1.2(@babel/core@7.23.7)(jest@29.7.0)(typescript@5.3.2) ts-loader: specifier: ^9.5.1 version: 9.5.1(typescript@5.3.2)(webpack@5.90.3) @@ -971,7 +971,7 @@ importers: version: 5.0.5 ts-jest: specifier: ^29.1.2 - version: 29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.3.2) + version: 29.1.2(@babel/core@7.23.7)(jest@29.7.0)(typescript@5.3.2) tsc-alias: specifier: ^1.8.8 version: 1.8.8 @@ -17311,6 +17311,7 @@ packages: /ip@2.0.1: resolution: {integrity: sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==} + requiresBuild: true /ipaddr.js@1.9.1: resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==} @@ -20256,8 +20257,8 @@ packages: - supports-color dev: false - /nc-lib-gui@0.204.4: - resolution: {integrity: sha512-zLTGOpx3s9bPOa5AxHxDflfYdo08OaiYCvgvLnT9+XZSBDw+xCt/HBcvOQQ8TjjNYbg3KISdEkNDeiIt33pLNA==} + /nc-lib-gui@0.204.5: + resolution: {integrity: sha512-n9g9VIcVPadCCdEYpyyMMKBJ/INklLujXHuXe+PhQClN3Ktxcr3ozDENVbnGvCVLaadsImA5nbNlulIgXsJVaw==} dependencies: express: 4.18.3 transitivePeerDependencies: @@ -25009,7 +25010,7 @@ packages: engines: {node: '>=14.0.0'} dev: false - /ts-jest@29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.3.2): + /ts-jest@29.1.2(@babel/core@7.23.7)(jest@29.7.0)(typescript@5.3.2): resolution: {integrity: sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==} engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0} hasBin: true @@ -25030,7 +25031,7 @@ packages: esbuild: optional: true dependencies: - '@babel/core': 7.23.9 + '@babel/core': 7.23.7 bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 jest: 29.7.0(@types/node@20.11.25)(ts-node@10.9.2) From 6426d86097b2dbff0f075f27b677ea4c67086d96 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Thu, 14 Mar 2024 15:15:37 +0530 Subject: [PATCH 2/4] chore: downgrade sqlite version for executable Signed-off-by: Pranav C --- scripts/pkg-executable/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pkg-executable/package.json b/scripts/pkg-executable/package.json index 08d223738fe3..6ba58986d651 100644 --- a/scripts/pkg-executable/package.json +++ b/scripts/pkg-executable/package.json @@ -33,7 +33,7 @@ "nocodb": "0.204.4" }, "overrides": { - "sqlite3": "5.1.7" + "sqlite3": "5.1.6" }, "devDependencies": { "@mapbox/node-pre-gyp": "^1.0.11" From 48b757c6c4ac6f0324dadf637f3364b813787478 Mon Sep 17 00:00:00 2001 From: pranavxc Date: Tue, 19 Mar 2024 13:34:32 +0000 Subject: [PATCH 3/4] [create-pull-request] automated change Signed-off-by: GitHub --- packages/nc-gui/package.json | 2 +- packages/nc-lib-gui/package.json | 2 +- packages/nocodb-sdk/package.json | 2 +- packages/nocodb/package.json | 6 +++--- pnpm-lock.yaml | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index 43aeefe078d8..1629899df337 100644 --- a/packages/nc-gui/package.json +++ b/packages/nc-gui/package.json @@ -75,7 +75,7 @@ "marked": "^4.3.0", "monaco-editor": "^0.45.0", "monaco-sql-languages": "^0.11.0", - "nocodb-sdk": "0.204.5", + "nocodb-sdk": "0.204.6", "papaparse": "^5.4.1", "parse-github-url": "^1.0.2", "pinia": "^2.1.7", diff --git a/packages/nc-lib-gui/package.json b/packages/nc-lib-gui/package.json index 2b7023e8d8ac..b84852f93b54 100644 --- a/packages/nc-lib-gui/package.json +++ b/packages/nc-lib-gui/package.json @@ -1,6 +1,6 @@ { "name": "nc-lib-gui", - "version": "0.204.5", + "version": "0.204.6", "description": "NocoDB GUI", "author": { "name": "NocoDB", diff --git a/packages/nocodb-sdk/package.json b/packages/nocodb-sdk/package.json index d733a6dd09b4..faf73bd20ae7 100644 --- a/packages/nocodb-sdk/package.json +++ b/packages/nocodb-sdk/package.json @@ -1,6 +1,6 @@ { "name": "nocodb-sdk", - "version": "0.204.5", + "version": "0.204.6", "description": "NocoDB SDK", "main": "build/main/index.js", "typings": "build/main/index.d.ts", diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index 2aace6afb2e3..56896a6a8078 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -1,6 +1,6 @@ { "name": "nocodb", - "version": "0.204.5", + "version": "0.204.6", "description": "NocoDB Backend", "main": "dist/bundle.js", "author": { @@ -132,12 +132,12 @@ "mysql2": "^3.9.2", "nanoid": "^3.3.7", "nc-help": "0.3.1", - "nc-lib-gui": "0.204.5", + "nc-lib-gui": "0.204.6", "nc-plugin": "^0.1.3", "ncp": "^2.0.0", "nestjs-kafka": "^1.0.6", "nestjs-throttler-storage-redis": "^0.4.2", - "nocodb-sdk": "0.204.5", + "nocodb-sdk": "0.204.6", "nodemailer": "^6.9.12", "object-hash": "^3.0.0", "object-sizeof": "^2.6.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1ceb8fd5fd09..feda4d0dda35 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -154,7 +154,7 @@ importers: specifier: ^0.11.0 version: 0.11.0 nocodb-sdk: - specifier: 0.204.5 + specifier: 0.204.6 version: link:../nocodb-sdk papaparse: specifier: ^5.4.1 @@ -686,8 +686,8 @@ importers: specifier: 0.3.1 version: 0.3.1(asn1.js@5.4.1)(debug@4.3.4)(knex@2.4.2) nc-lib-gui: - specifier: 0.204.5 - version: 0.204.5 + specifier: 0.204.6 + version: 0.204.6 nc-plugin: specifier: ^0.1.3 version: 0.1.3 @@ -701,7 +701,7 @@ importers: specifier: ^0.4.2 version: 0.4.2(@nestjs/common@10.3.3)(@nestjs/core@10.3.3)(@nestjs/throttler@5.1.2)(ioredis@5.3.2)(reflect-metadata@0.2.1) nocodb-sdk: - specifier: 0.204.5 + specifier: 0.204.6 version: link:../nocodb-sdk nodemailer: specifier: ^6.9.12 @@ -20257,8 +20257,8 @@ packages: - supports-color dev: false - /nc-lib-gui@0.204.5: - resolution: {integrity: sha512-n9g9VIcVPadCCdEYpyyMMKBJ/INklLujXHuXe+PhQClN3Ktxcr3ozDENVbnGvCVLaadsImA5nbNlulIgXsJVaw==} + /nc-lib-gui@0.204.6: + resolution: {integrity: sha512-QjKfHKV5ziG5rF9LNIEcP1jTHKepBR/ADgFGe2WubxOvxCI7J0eWIsKZsHu8/wrmhtd2zAD6cNhN2dyBg6tCxA==} dependencies: express: 4.18.3 transitivePeerDependencies: From f189ecd6bd1fde7047fc7450e32ce675b5ac4594 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Tue, 19 Mar 2024 20:05:38 +0530 Subject: [PATCH 4/4] chore: update sdk path Signed-off-by: Pranav C --- packages/nc-gui/package.json | 2 +- packages/nocodb/package.json | 2 +- pnpm-lock.yaml | 30 +++++++++++++++--------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index 1f10451c2292..a3722d88e3cf 100644 --- a/packages/nc-gui/package.json +++ b/packages/nc-gui/package.json @@ -75,7 +75,7 @@ "marked": "^4.3.0", "monaco-editor": "^0.45.0", "monaco-sql-languages": "^0.11.0", - "nocodb-sdk": "0.204.6", + "nocodb-sdk": "workspace:^", "papaparse": "^5.4.1", "parse-github-url": "^1.0.2", "pinia": "^2.1.7", diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index ac1ae7b77376..4efdc0bb2c33 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -137,7 +137,7 @@ "ncp": "^2.0.0", "nestjs-kafka": "^1.0.6", "nestjs-throttler-storage-redis": "^0.4.2", - "nocodb-sdk": "0.204.6", + "nocodb-sdk": "workspace:^", "nodemailer": "^6.9.12", "object-hash": "^3.0.0", "object-sizeof": "^2.6.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d4dd9ab4ee4a..977d5e30d3ae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -154,7 +154,7 @@ importers: specifier: ^0.11.0 version: 0.11.0 nocodb-sdk: - specifier: 0.204.6 + specifier: workspace:^ version: link:../nocodb-sdk papaparse: specifier: ^5.4.1 @@ -449,13 +449,13 @@ importers: specifier: ^10.0.1 version: 10.0.1(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(bull@4.12.2) '@nestjs/common': - specifier: ^10.3.4 + specifier: ^10.3.3 version: 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) '@nestjs/config': specifier: ^3.1.1 version: 3.1.1(@nestjs/common@10.3.4)(reflect-metadata@0.2.1) '@nestjs/core': - specifier: ^10.3.4 + specifier: ^10.3.3 version: 10.3.4(@nestjs/common@10.3.4)(@nestjs/platform-express@10.3.4)(@nestjs/websockets@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) '@nestjs/event-emitter': specifier: ^2.0.4 @@ -470,10 +470,10 @@ importers: specifier: ^10.0.3 version: 10.0.3(@nestjs/common@10.3.4)(passport@0.7.0) '@nestjs/platform-express': - specifier: ^10.3.4 + specifier: ^10.3.3 version: 10.3.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4) '@nestjs/platform-socket.io': - specifier: ^10.3.4 + specifier: ^10.3.3 version: 10.3.4(@nestjs/common@10.3.4)(@nestjs/websockets@10.3.4)(rxjs@7.8.1) '@nestjs/serve-static': specifier: ^4.0.1 @@ -482,7 +482,7 @@ importers: specifier: ^5.1.2 version: 5.1.2(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(reflect-metadata@0.2.1) '@nestjs/websockets': - specifier: ^10.3.4 + specifier: ^10.3.3 version: 10.3.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(@nestjs/platform-socket.io@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) '@ntegral/nestjs-sentry': specifier: ^4.0.1 @@ -494,7 +494,7 @@ importers: specifier: ^0.3.3 version: 0.3.3 '@types/chai': - specifier: ^4.3.13 + specifier: ^4.3.12 version: 4.3.13 airtable: specifier: ^0.12.2 @@ -518,7 +518,7 @@ importers: specifier: ^2.1550.0 version: 2.1555.0 axios: - specifier: ^1.6.8 + specifier: ^1.6.7 version: 1.6.8(debug@4.3.4) bcryptjs: specifier: ^2.4.3 @@ -698,10 +698,10 @@ importers: specifier: ^1.0.6 version: 1.0.6(debug@4.3.4)(kafkajs@2.2.4)(reflect-metadata@0.2.1) nestjs-throttler-storage-redis: - specifier: ^0.4.3 + specifier: ^0.4.2 version: 0.4.3(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(@nestjs/throttler@5.1.2)(ioredis@5.3.2)(reflect-metadata@0.2.1) nocodb-sdk: - specifier: 0.204.6 + specifier: workspace:^ version: link:../nocodb-sdk nodemailer: specifier: ^6.9.12 @@ -901,7 +901,7 @@ importers: version: 6.3.4 ts-jest: specifier: 29.1.2 - version: 29.1.2(@babel/core@7.23.7)(jest@29.7.0)(typescript@5.3.2) + version: 29.1.2(@babel/core@7.24.0)(jest@29.7.0)(typescript@5.3.2) ts-loader: specifier: ^9.5.1 version: 9.5.1(typescript@5.3.2)(webpack@5.90.3) @@ -971,7 +971,7 @@ importers: version: 5.0.5 ts-jest: specifier: ^29.1.2 - version: 29.1.2(@babel/core@7.23.7)(jest@29.7.0)(typescript@5.3.2) + version: 29.1.2(@babel/core@7.24.0)(jest@29.7.0)(typescript@5.3.2) tsc-alias: specifier: ^1.8.8 version: 1.8.8 @@ -14648,7 +14648,7 @@ packages: dependencies: escape-string-regexp: 1.0.5 eslint: 8.33.0 - ignore: 5.3.1 + ignore: 5.3.0 dev: true /eslint-plugin-eslint-comments@3.2.0(eslint@8.56.0): @@ -25006,7 +25006,7 @@ packages: engines: {node: '>=14.0.0'} dev: false - /ts-jest@29.1.2(@babel/core@7.23.7)(jest@29.7.0)(typescript@5.3.2): + /ts-jest@29.1.2(@babel/core@7.24.0)(jest@29.7.0)(typescript@5.3.2): resolution: {integrity: sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==} engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0} hasBin: true @@ -25027,7 +25027,7 @@ packages: esbuild: optional: true dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.24.0 bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 jest: 29.7.0(@types/node@20.11.29)(ts-node@10.9.2)