From 74a6cbb1631b8c1a46312133ab1078e20b500071 Mon Sep 17 00:00:00 2001 From: VictorMinemu Date: Thu, 6 Jul 2023 14:03:53 +0200 Subject: [PATCH 01/10] Fixed bug when trying to open a row with a binary encoded uuid as PK --- packages/nocodb/src/db/BaseModelSqlv2.ts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts index efbdc09f4b..8e71364f97 100644 --- a/packages/nocodb/src/db/BaseModelSqlv2.ts +++ b/packages/nocodb/src/db/BaseModelSqlv2.ts @@ -3966,7 +3966,21 @@ function _wherePk(primaryKeys: Column[], id) { const ids = (id + '').split('___'); const where = {}; for (let i = 0; i < primaryKeys.length; ++i) { - where[primaryKeys[i].column_name] = ids[i]; + //Check if the id is a UUID and the column is binary(16) + const idAsUUID = + primaryKeys[i].ct === 'binary(16)' && + ((ids[i] + '').length === 36 || (ids[i] + '').length === 32) + ? (ids[i] + '').length === 32 + ? (ids[i] + '').replace( + /(.{8})(.{4})(.{4})(.{4})(.{12})/, + '$1-$2-$3-$4-$5', + ) + : ids[i] + '' + : null; + + where[primaryKeys[i].column_name] = idAsUUID + ? Buffer.from(idAsUUID.replace(/-/g, ''), 'hex') + : ids[i]; } return where; } From cb328f7b52975ca65eb49788bb7ac589642b079d Mon Sep 17 00:00:00 2001 From: VictorMinemu Date: Thu, 6 Jul 2023 19:34:21 +0200 Subject: [PATCH 02/10] Fix: Solved equal date filter with timestamp columns. --- packages/nocodb/src/db/conditionV2.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/nocodb/src/db/conditionV2.ts b/packages/nocodb/src/db/conditionV2.ts index 4234c91a08..ec0ce16d81 100644 --- a/packages/nocodb/src/db/conditionV2.ts +++ b/packages/nocodb/src/db/conditionV2.ts @@ -419,6 +419,8 @@ const parseConditionV2 = async ( ].includes(column.uidt) ) { qb = qb.where(field, val); + } else if (column.ct == 'timestamp') { + qb = qb.whereRaw('DATE(??) = DATE(?)', [field, val]); } else { // mysql is case-insensitive for strings, turn to case-sensitive qb = qb.whereRaw('BINARY ?? = ?', [field, val]); From 57e677242f843895fc75104ee7f068353024bb2d Mon Sep 17 00:00:00 2001 From: Pranav C Date: Mon, 10 Jul 2023 17:18:41 +0530 Subject: [PATCH 03/10] feat: identify removed/added pk columns Signed-off-by: Pranav C --- .../nocodb/src/services/meta-diffs.service.ts | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/packages/nocodb/src/services/meta-diffs.service.ts b/packages/nocodb/src/services/meta-diffs.service.ts index 75f21a2229..da7fdf669e 100644 --- a/packages/nocodb/src/services/meta-diffs.service.ts +++ b/packages/nocodb/src/services/meta-diffs.service.ts @@ -17,6 +17,7 @@ export enum MetaDiffType { TABLE_REMOVE = 'TABLE_REMOVE', TABLE_COLUMN_ADD = 'TABLE_COLUMN_ADD', TABLE_COLUMN_TYPE_CHANGE = 'TABLE_COLUMN_TYPE_CHANGE', + TABLE_COLUMN_PK_CHANGED = 'TABLE_COLUMN_PK_CHANGED', TABLE_COLUMN_REMOVE = 'TABLE_COLUMN_REMOVE', VIEW_NEW = 'VIEW_NEW', VIEW_REMOVE = 'VIEW_REMOVE', @@ -103,6 +104,16 @@ type MetaDiffChange = { relationType: RelationTypes; cstn?: string; } + | { + type: MetaDiffType.TABLE_COLUMN_PK_CHANGED; + tn?: string; + model?: Model; + id?: string; + cn: string; + column: Column; + colId?: string; + status: 'removed' | 'added'; + } ); @Injectable() @@ -217,6 +228,18 @@ export class MetaDiffsService { column: oldCol, }); } + if (!!oldCol.pk !== !!column.pk) { + tableProp.detectedChanges.push({ + type: MetaDiffType.TABLE_COLUMN_PK_CHANGED, + msg: column.pk + ? `Column ${column.cn} is new primary key` + : `Column ${column.cn} is no longer primary key`, + cn: oldCol.column_name, + id: oldMeta.id, + column: oldCol, + status: column.pk ? 'added' : 'removed', + }); + } } for (const column of oldMeta.columns) { if ( @@ -688,6 +711,13 @@ export class MetaDiffsService { await Column.update(change.column.id, column); } break; + case MetaDiffType.TABLE_COLUMN_PK_CHANGED: + { + const column = change.column; + column.pk = change.status === 'added'; + await Column.update(change.column.id, column); + } + break; case MetaDiffType.TABLE_COLUMN_REMOVE: case MetaDiffType.VIEW_COLUMN_REMOVE: await change.column.delete(); From 8e3f6cb6edbf36c56cc6c4ffe5744ad77aef9a92 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Mon, 10 Jul 2023 18:00:23 +0530 Subject: [PATCH 04/10] feat: compare all boolean props Signed-off-by: Pranav C --- .../nocodb/src/services/meta-diffs.service.ts | 52 ++++++++++++++----- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/packages/nocodb/src/services/meta-diffs.service.ts b/packages/nocodb/src/services/meta-diffs.service.ts index da7fdf669e..9d1818b7b9 100644 --- a/packages/nocodb/src/services/meta-diffs.service.ts +++ b/packages/nocodb/src/services/meta-diffs.service.ts @@ -17,7 +17,7 @@ export enum MetaDiffType { TABLE_REMOVE = 'TABLE_REMOVE', TABLE_COLUMN_ADD = 'TABLE_COLUMN_ADD', TABLE_COLUMN_TYPE_CHANGE = 'TABLE_COLUMN_TYPE_CHANGE', - TABLE_COLUMN_PK_CHANGED = 'TABLE_COLUMN_PK_CHANGED', + TABLE_COLUMN_PROPS_CHANGED = 'TABLE_COLUMN_PROPS_CHANGED', TABLE_COLUMN_REMOVE = 'TABLE_COLUMN_REMOVE', VIEW_NEW = 'VIEW_NEW', VIEW_REMOVE = 'VIEW_REMOVE', @@ -105,14 +105,13 @@ type MetaDiffChange = { cstn?: string; } | { - type: MetaDiffType.TABLE_COLUMN_PK_CHANGED; + type: MetaDiffType.TABLE_COLUMN_PROPS_CHANGED; tn?: string; model?: Model; id?: string; cn: string; column: Column; colId?: string; - status: 'removed' | 'added'; } ); @@ -228,16 +227,18 @@ export class MetaDiffsService { column: oldCol, }); } - if (!!oldCol.pk !== !!column.pk) { + if ( + !!oldCol.pk !== !!column.pk || + !!oldCol.rqd !== !!column.rqd || + !!oldCol.un !== !!column.un || + !!oldCol.ai !== !!column.ai + ) { tableProp.detectedChanges.push({ - type: MetaDiffType.TABLE_COLUMN_PK_CHANGED, - msg: column.pk - ? `Column ${column.cn} is new primary key` - : `Column ${column.cn} is no longer primary key`, + type: MetaDiffType.TABLE_COLUMN_PROPS_CHANGED, + msg: `Column properties changed (${column.cn})`, cn: oldCol.column_name, id: oldMeta.id, column: oldCol, - status: column.pk ? 'added' : 'removed', }); } } @@ -711,11 +712,20 @@ export class MetaDiffsService { await Column.update(change.column.id, column); } break; - case MetaDiffType.TABLE_COLUMN_PK_CHANGED: + case MetaDiffType.TABLE_COLUMN_PROPS_CHANGED: { - const column = change.column; - column.pk = change.status === 'added'; - await Column.update(change.column.id, column); + const columns = ( + await sqlClient.columnList({ tn: table_name }) + )?.data?.list?.map((c) => ({ ...c, column_name: c.cn })); + const colMeta = columns.find((c) => c.cn === change.cn); + if (!colMeta) break; + const { pk, ai, rqd, un } = colMeta; + await Column.update(change.column.id, { + pk, + ai, + rqd, + un, + }); } break; case MetaDiffType.TABLE_COLUMN_REMOVE: @@ -914,6 +924,22 @@ export class MetaDiffsService { await Column.update(change.column.id, column); } break; + case MetaDiffType.TABLE_COLUMN_PROPS_CHANGED: + { + const columns = ( + await sqlClient.columnList({ tn: table_name }) + )?.data?.list?.map((c) => ({ ...c, column_name: c.cn })); + const colMeta = columns.find((c) => c.cn === change.cn); + if (!colMeta) break; + const { pk, ai, rqd, un } = colMeta; + await Column.update(change.column.id, { + pk, + ai, + rqd, + un, + }); + } + break; case MetaDiffType.TABLE_COLUMN_REMOVE: case MetaDiffType.VIEW_COLUMN_REMOVE: await change.column.delete(); From f4e6874ac6f621c34f326964e60a5af4adedce47 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Mon, 10 Jul 2023 18:21:20 +0530 Subject: [PATCH 05/10] fix: reset column list cache after column update Signed-off-by: Pranav C --- packages/nocodb/src/models/Column.ts | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/packages/nocodb/src/models/Column.ts b/packages/nocodb/src/models/Column.ts index 1695d1b4db..bbaebabe2c 100644 --- a/packages/nocodb/src/models/Column.ts +++ b/packages/nocodb/src/models/Column.ts @@ -1075,6 +1075,30 @@ export default class Column implements ColumnType { // set cache await NocoCache.set(key, o); } + + // get model column list from cache + const columnListFromCache = await NocoCache.getList(CacheScope.COLUMN, [ + oldCol.fk_model_id, + ]); + + // update column list in cache if cache exists + if (!columnListFromCache.list?.length) { + const updatedColumnList = columnListFromCache.list.map((column: any) => { + if (column.id === colId) { + return { + ...column, + ...updateObj, + }; + } + return column; + }); + await NocoCache.setList( + CacheScope.COLUMN, + [oldCol.fk_model_id], + updatedColumnList, + ); + } + // set meta await ncMeta.metaUpdate( null, From 80fefbdcfb2f0ecff17be6b1289bfa077450e75a Mon Sep 17 00:00:00 2001 From: Pranav C Date: Wed, 5 Jul 2023 12:46:16 +0530 Subject: [PATCH 06/10] fix: rather than resetting token version to null set it with a new value to avoid unexpected behaviour --- packages/nocodb/src/services/users/users.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nocodb/src/services/users/users.service.ts b/packages/nocodb/src/services/users/users.service.ts index 6fd621d2f3..813d4e1485 100644 --- a/packages/nocodb/src/services/users/users.service.ts +++ b/packages/nocodb/src/services/users/users.service.ts @@ -503,7 +503,7 @@ export class UsersService { if (user?.id) { await User.update(user.id, { refresh_token: null, - token_version: null, + token_version: randomTokenString(), }); } return { msg: 'Signed out successfully' }; From 233debeb8d8b7b9c3b8d8edd90f1b4fa477a7d65 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Tue, 11 Jul 2023 11:13:19 +0530 Subject: [PATCH 07/10] refactor: include unique prop Signed-off-by: Pranav C --- packages/nocodb/src/services/meta-diffs.service.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/nocodb/src/services/meta-diffs.service.ts b/packages/nocodb/src/services/meta-diffs.service.ts index 9d1818b7b9..6f7991a7b8 100644 --- a/packages/nocodb/src/services/meta-diffs.service.ts +++ b/packages/nocodb/src/services/meta-diffs.service.ts @@ -231,7 +231,8 @@ export class MetaDiffsService { !!oldCol.pk !== !!column.pk || !!oldCol.rqd !== !!column.rqd || !!oldCol.un !== !!column.un || - !!oldCol.ai !== !!column.ai + !!oldCol.ai !== !!column.ai || + !!oldCol.unique !== !!column.unique ) { tableProp.detectedChanges.push({ type: MetaDiffType.TABLE_COLUMN_PROPS_CHANGED, @@ -719,12 +720,13 @@ export class MetaDiffsService { )?.data?.list?.map((c) => ({ ...c, column_name: c.cn })); const colMeta = columns.find((c) => c.cn === change.cn); if (!colMeta) break; - const { pk, ai, rqd, un } = colMeta; + const { pk, ai, rqd, un, unique } = colMeta; await Column.update(change.column.id, { pk, ai, rqd, un, + unique, }); } break; @@ -931,12 +933,13 @@ export class MetaDiffsService { )?.data?.list?.map((c) => ({ ...c, column_name: c.cn })); const colMeta = columns.find((c) => c.cn === change.cn); if (!colMeta) break; - const { pk, ai, rqd, un } = colMeta; + const { pk, ai, rqd, un, unique } = colMeta; await Column.update(change.column.id, { pk, ai, rqd, un, + unique, }); } break; From cc99ccb4fdca88426a1a81bc3ffd7b772414f5b3 Mon Sep 17 00:00:00 2001 From: VictorMinemu Date: Tue, 11 Jul 2023 11:14:26 +0200 Subject: [PATCH 08/10] Changes requested by review team. --- packages/nocodb/src/db/BaseModelSqlv2.ts | 24 ++++++++++++++---------- packages/nocodb/src/db/conditionV2.ts | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts index 8e71364f97..f39079c2fd 100644 --- a/packages/nocodb/src/db/BaseModelSqlv2.ts +++ b/packages/nocodb/src/db/BaseModelSqlv2.ts @@ -3966,17 +3966,21 @@ function _wherePk(primaryKeys: Column[], id) { const ids = (id + '').split('___'); const where = {}; for (let i = 0; i < primaryKeys.length; ++i) { - //Check if the id is a UUID and the column is binary(16) - const idAsUUID = + //Cast the id to string. + const idAsString = ids[i] + ''; + // Check if the id is a UUID and the column is binary(16) + const isUUIDBinary16 = primaryKeys[i].ct === 'binary(16)' && - ((ids[i] + '').length === 36 || (ids[i] + '').length === 32) - ? (ids[i] + '').length === 32 - ? (ids[i] + '').replace( - /(.{8})(.{4})(.{4})(.{4})(.{12})/, - '$1-$2-$3-$4-$5', - ) - : ids[i] + '' - : null; + (idAsString.length === 36 || idAsString.length === 32); + // If the id is a UUID and the column is binary(16), convert the id to a Buffer. Otherwise, return null to indicate that the id is not a UUID. + const idAsUUID = isUUIDBinary16 + ? idAsString.length === 32 + ? idAsString.replace( + /(.{8})(.{4})(.{4})(.{4})(.{12})/, + '$1-$2-$3-$4-$5', + ) + : idAsString + : null; where[primaryKeys[i].column_name] = idAsUUID ? Buffer.from(idAsUUID.replace(/-/g, ''), 'hex') diff --git a/packages/nocodb/src/db/conditionV2.ts b/packages/nocodb/src/db/conditionV2.ts index ec0ce16d81..e1ec246e7c 100644 --- a/packages/nocodb/src/db/conditionV2.ts +++ b/packages/nocodb/src/db/conditionV2.ts @@ -419,7 +419,7 @@ const parseConditionV2 = async ( ].includes(column.uidt) ) { qb = qb.where(field, val); - } else if (column.ct == 'timestamp') { + } else if (column.ct === 'timestamp') { qb = qb.whereRaw('DATE(??) = DATE(?)', [field, val]); } else { // mysql is case-insensitive for strings, turn to case-sensitive From c99f40dee239c20c82776563b82f663a79e5c7b0 Mon Sep 17 00:00:00 2001 From: pranavxc Date: Tue, 11 Jul 2023 11:08:09 +0000 Subject: [PATCH 09/10] [create-pull-request] automated change Signed-off-by: GitHub --- packages/nc-gui/package-lock.json | 54 +++++++++++++++++++------------ packages/nc-gui/package.json | 2 +- packages/nc-lib-gui/package.json | 2 +- packages/nocodb-sdk/package.json | 2 +- packages/nocodb/package-lock.json | 50 +++++++++++++--------------- packages/nocodb/package.json | 8 ++--- 6 files changed, 63 insertions(+), 55 deletions(-) diff --git a/packages/nc-gui/package-lock.json b/packages/nc-gui/package-lock.json index 5dc0d7dad2..46adfa66d7 100644 --- a/packages/nc-gui/package-lock.json +++ b/packages/nc-gui/package-lock.json @@ -30,7 +30,7 @@ "leaflet.markercluster": "^1.5.3", "locale-codes": "^1.3.1", "monaco-editor": "^0.33.0", - "nocodb-sdk": "file:../nocodb-sdk", + "nocodb-sdk": "0.109.4", "papaparse": "^5.3.2", "pinia": "^2.0.33", "qrcode": "^1.5.1", @@ -110,7 +110,8 @@ } }, "../nocodb-sdk": { - "version": "0.109.3", + "version": "0.109.4", + "extraneous": true, "license": "AGPL-3.0-or-later", "dependencies": { "axios": "^0.21.1", @@ -8719,7 +8720,6 @@ "version": "1.15.1", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", - "devOptional": true, "funding": [ { "type": "individual", @@ -12238,8 +12238,21 @@ } }, "node_modules/nocodb-sdk": { - "resolved": "../nocodb-sdk", - "link": true + "version": "0.109.4", + "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.109.4.tgz", + "integrity": "sha512-kncrV4vFdAOMSoMoCcRrWnU74p5jWn/PIMjs2poHfvxcfRscm6tZ8dEvDpY+do8hOMfZC+WO0G0/WT2wntIwEg==", + "dependencies": { + "axios": "^0.21.1", + "jsep": "^1.3.6" + } + }, + "node_modules/nocodb-sdk/node_modules/axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dependencies": { + "follow-redirects": "^1.14.0" + } }, "node_modules/node-abi": { "version": "3.23.0", @@ -24716,8 +24729,7 @@ "follow-redirects": { "version": "1.15.1", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", - "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", - "devOptional": true + "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==" }, "form-data": { "version": "4.0.0", @@ -27267,22 +27279,22 @@ } }, "nocodb-sdk": { - "version": "file:../nocodb-sdk", + "version": "0.109.4", + "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.109.4.tgz", + "integrity": "sha512-kncrV4vFdAOMSoMoCcRrWnU74p5jWn/PIMjs2poHfvxcfRscm6tZ8dEvDpY+do8hOMfZC+WO0G0/WT2wntIwEg==", "requires": { - "@typescript-eslint/eslint-plugin": "^4.0.1", - "@typescript-eslint/parser": "^4.0.1", "axios": "^0.21.1", - "cspell": "^4.1.0", - "eslint": "^7.8.0", - "eslint-config-prettier": "^6.11.0", - "eslint-plugin-eslint-comments": "^3.2.0", - "eslint-plugin-functional": "^3.0.2", - "eslint-plugin-import": "^2.22.0", - "eslint-plugin-prettier": "^4.0.0", - "jsep": "^1.3.6", - "npm-run-all": "^4.1.5", - "prettier": "^2.1.1", - "typescript": "^4.0.2" + "jsep": "^1.3.6" + }, + "dependencies": { + "axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "requires": { + "follow-redirects": "^1.14.0" + } + } } }, "node-abi": { diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index 44f0905daf..68d1c329f1 100644 --- a/packages/nc-gui/package.json +++ b/packages/nc-gui/package.json @@ -54,7 +54,7 @@ "leaflet.markercluster": "^1.5.3", "locale-codes": "^1.3.1", "monaco-editor": "^0.33.0", - "nocodb-sdk": "file:../nocodb-sdk", + "nocodb-sdk": "0.109.4", "papaparse": "^5.3.2", "pinia": "^2.0.33", "qrcode": "^1.5.1", diff --git a/packages/nc-lib-gui/package.json b/packages/nc-lib-gui/package.json index 0c29ea4b4f..88960b9d9e 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.109.3", + "version": "0.109.4", "description": "NocoDB GUI", "author": { "name": "NocoDB", diff --git a/packages/nocodb-sdk/package.json b/packages/nocodb-sdk/package.json index 612ad08839..6b8cfe0f0d 100644 --- a/packages/nocodb-sdk/package.json +++ b/packages/nocodb-sdk/package.json @@ -1,6 +1,6 @@ { "name": "nocodb-sdk", - "version": "0.109.3", + "version": "0.109.4", "description": "NocoDB SDK", "main": "build/main/index.js", "typings": "build/main/index.d.ts", diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json index 4a5539bc01..7592eb2a1c 100644 --- a/packages/nocodb/package-lock.json +++ b/packages/nocodb/package-lock.json @@ -1,12 +1,12 @@ { "name": "nocodb", - "version": "0.109.3", + "version": "0.109.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "nocodb", - "version": "0.109.3", + "version": "0.109.4", "license": "AGPL-3.0-or-later", "dependencies": { "@google-cloud/storage": "^5.7.2", @@ -80,10 +80,10 @@ "mysql2": "^3.2.0", "nanoid": "^3.1.20", "nc-help": "^0.2.87", - "nc-lib-gui": "0.109.3", + "nc-lib-gui": "0.109.4", "nc-plugin": "^0.1.3", "ncp": "^2.0.0", - "nocodb-sdk": "file:../nocodb-sdk", + "nocodb-sdk": "0.109.4", "nodemailer": "^6.4.10", "object-hash": "^3.0.0", "object-sizeof": "^2.6.1", @@ -191,7 +191,8 @@ } }, "../nocodb-sdk": { - "version": "0.109.3", + "version": "0.109.4", + "extraneous": true, "license": "AGPL-3.0-or-later", "dependencies": { "axios": "^0.21.1", @@ -13158,9 +13159,9 @@ } }, "node_modules/nc-lib-gui": { - "version": "0.109.3", - "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.109.3.tgz", - "integrity": "sha512-8a1M+yBBRXWX3qz1HfY8YyGq1fg+aviwEv6IhGouZy4PnkBmbwbjXFNLxVidQoDor92AYACZHRltE3dxeIb1Sw==", + "version": "0.109.4", + "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.109.4.tgz", + "integrity": "sha512-mvYaOAFfmw3JHzhAMVrGzOehTKpFjZXcstyt681/Ny3DLNKAycjOmJld0oA+YC7GY44Pp+zYGhhFfw/ovWaCTQ==", "dependencies": { "express": "^4.17.1" } @@ -13207,8 +13208,13 @@ } }, "node_modules/nocodb-sdk": { - "resolved": "../nocodb-sdk", - "link": true + "version": "0.109.4", + "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.109.4.tgz", + "integrity": "sha512-kncrV4vFdAOMSoMoCcRrWnU74p5jWn/PIMjs2poHfvxcfRscm6tZ8dEvDpY+do8hOMfZC+WO0G0/WT2wntIwEg==", + "dependencies": { + "axios": "^0.21.1", + "jsep": "^1.3.6" + } }, "node_modules/node-abort-controller": { "version": "3.1.1", @@ -28474,9 +28480,9 @@ } }, "nc-lib-gui": { - "version": "0.109.3", - "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.109.3.tgz", - "integrity": "sha512-8a1M+yBBRXWX3qz1HfY8YyGq1fg+aviwEv6IhGouZy4PnkBmbwbjXFNLxVidQoDor92AYACZHRltE3dxeIb1Sw==", + "version": "0.109.4", + "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.109.4.tgz", + "integrity": "sha512-mvYaOAFfmw3JHzhAMVrGzOehTKpFjZXcstyt681/Ny3DLNKAycjOmJld0oA+YC7GY44Pp+zYGhhFfw/ovWaCTQ==", "requires": { "express": "^4.17.1" } @@ -28511,22 +28517,12 @@ "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==" }, "nocodb-sdk": { - "version": "file:../nocodb-sdk", + "version": "0.109.4", + "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.109.4.tgz", + "integrity": "sha512-kncrV4vFdAOMSoMoCcRrWnU74p5jWn/PIMjs2poHfvxcfRscm6tZ8dEvDpY+do8hOMfZC+WO0G0/WT2wntIwEg==", "requires": { - "@typescript-eslint/eslint-plugin": "^4.0.1", - "@typescript-eslint/parser": "^4.0.1", "axios": "^0.21.1", - "cspell": "^4.1.0", - "eslint": "^7.8.0", - "eslint-config-prettier": "^6.11.0", - "eslint-plugin-eslint-comments": "^3.2.0", - "eslint-plugin-functional": "^3.0.2", - "eslint-plugin-import": "^2.22.0", - "eslint-plugin-prettier": "^4.0.0", - "jsep": "^1.3.6", - "npm-run-all": "^4.1.5", - "prettier": "^2.1.1", - "typescript": "^4.0.2" + "jsep": "^1.3.6" } }, "node-abort-controller": { diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index 54553509bf..fc83923380 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -1,6 +1,6 @@ { "name": "nocodb", - "version": "0.109.3", + "version": "0.109.4", "description": "NocoDB Backend", "main": "dist/bundle.js", "author": { @@ -115,10 +115,10 @@ "mysql2": "^3.2.0", "nanoid": "^3.1.20", "nc-help": "^0.2.87", - "nc-lib-gui": "0.109.3", + "nc-lib-gui": "0.109.4", "nc-plugin": "^0.1.3", "ncp": "^2.0.0", - "nocodb-sdk": "file:../nocodb-sdk", + "nocodb-sdk": "0.109.4", "nodemailer": "^6.4.10", "object-hash": "^3.0.0", "object-sizeof": "^2.6.1", @@ -206,4 +206,4 @@ "coverageDirectory": "../coverage", "testEnvironment": "node" } -} +} \ No newline at end of file From 12eb679da3b42badca00acabd9f47fb76e0e03d5 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Tue, 11 Jul 2023 17:21:15 +0530 Subject: [PATCH 10/10] chore: update sdk path Signed-off-by: Pranav C --- packages/nc-gui/package-lock.json | 52 +++++++++++---------------- packages/nc-gui/package.json | 2 +- packages/nocodb-sdk/package-lock.json | 4 +-- packages/nocodb/package-lock.json | 30 +++++++++------- packages/nocodb/package.json | 4 +-- 5 files changed, 42 insertions(+), 50 deletions(-) diff --git a/packages/nc-gui/package-lock.json b/packages/nc-gui/package-lock.json index 46adfa66d7..63288dbf59 100644 --- a/packages/nc-gui/package-lock.json +++ b/packages/nc-gui/package-lock.json @@ -30,7 +30,7 @@ "leaflet.markercluster": "^1.5.3", "locale-codes": "^1.3.1", "monaco-editor": "^0.33.0", - "nocodb-sdk": "0.109.4", + "nocodb-sdk": "file:../nocodb-sdk", "papaparse": "^5.3.2", "pinia": "^2.0.33", "qrcode": "^1.5.1", @@ -111,7 +111,6 @@ }, "../nocodb-sdk": { "version": "0.109.4", - "extraneous": true, "license": "AGPL-3.0-or-later", "dependencies": { "axios": "^0.21.1", @@ -8720,6 +8719,7 @@ "version": "1.15.1", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "devOptional": true, "funding": [ { "type": "individual", @@ -12238,21 +12238,8 @@ } }, "node_modules/nocodb-sdk": { - "version": "0.109.4", - "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.109.4.tgz", - "integrity": "sha512-kncrV4vFdAOMSoMoCcRrWnU74p5jWn/PIMjs2poHfvxcfRscm6tZ8dEvDpY+do8hOMfZC+WO0G0/WT2wntIwEg==", - "dependencies": { - "axios": "^0.21.1", - "jsep": "^1.3.6" - } - }, - "node_modules/nocodb-sdk/node_modules/axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", - "dependencies": { - "follow-redirects": "^1.14.0" - } + "resolved": "../nocodb-sdk", + "link": true }, "node_modules/node-abi": { "version": "3.23.0", @@ -24729,7 +24716,8 @@ "follow-redirects": { "version": "1.15.1", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", - "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==" + "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "devOptional": true }, "form-data": { "version": "4.0.0", @@ -27279,22 +27267,22 @@ } }, "nocodb-sdk": { - "version": "0.109.4", - "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.109.4.tgz", - "integrity": "sha512-kncrV4vFdAOMSoMoCcRrWnU74p5jWn/PIMjs2poHfvxcfRscm6tZ8dEvDpY+do8hOMfZC+WO0G0/WT2wntIwEg==", + "version": "file:../nocodb-sdk", "requires": { + "@typescript-eslint/eslint-plugin": "^4.0.1", + "@typescript-eslint/parser": "^4.0.1", "axios": "^0.21.1", - "jsep": "^1.3.6" - }, - "dependencies": { - "axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", - "requires": { - "follow-redirects": "^1.14.0" - } - } + "cspell": "^4.1.0", + "eslint": "^7.8.0", + "eslint-config-prettier": "^6.11.0", + "eslint-plugin-eslint-comments": "^3.2.0", + "eslint-plugin-functional": "^3.0.2", + "eslint-plugin-import": "^2.22.0", + "eslint-plugin-prettier": "^4.0.0", + "jsep": "^1.3.6", + "npm-run-all": "^4.1.5", + "prettier": "^2.1.1", + "typescript": "^4.0.2" } }, "node-abi": { diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index 68d1c329f1..44f0905daf 100644 --- a/packages/nc-gui/package.json +++ b/packages/nc-gui/package.json @@ -54,7 +54,7 @@ "leaflet.markercluster": "^1.5.3", "locale-codes": "^1.3.1", "monaco-editor": "^0.33.0", - "nocodb-sdk": "0.109.4", + "nocodb-sdk": "file:../nocodb-sdk", "papaparse": "^5.3.2", "pinia": "^2.0.33", "qrcode": "^1.5.1", diff --git a/packages/nocodb-sdk/package-lock.json b/packages/nocodb-sdk/package-lock.json index aafb4c217a..0aa5aabb3e 100644 --- a/packages/nocodb-sdk/package-lock.json +++ b/packages/nocodb-sdk/package-lock.json @@ -1,12 +1,12 @@ { "name": "nocodb-sdk", - "version": "0.109.3", + "version": "0.109.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "nocodb-sdk", - "version": "0.109.3", + "version": "0.109.4", "license": "AGPL-3.0-or-later", "dependencies": { "axios": "^0.21.1", diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json index 7592eb2a1c..5f589391bc 100644 --- a/packages/nocodb/package-lock.json +++ b/packages/nocodb/package-lock.json @@ -83,7 +83,7 @@ "nc-lib-gui": "0.109.4", "nc-plugin": "^0.1.3", "ncp": "^2.0.0", - "nocodb-sdk": "0.109.4", + "nocodb-sdk": "file:../nocodb-sdk", "nodemailer": "^6.4.10", "object-hash": "^3.0.0", "object-sizeof": "^2.6.1", @@ -192,7 +192,6 @@ }, "../nocodb-sdk": { "version": "0.109.4", - "extraneous": true, "license": "AGPL-3.0-or-later", "dependencies": { "axios": "^0.21.1", @@ -13208,13 +13207,8 @@ } }, "node_modules/nocodb-sdk": { - "version": "0.109.4", - "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.109.4.tgz", - "integrity": "sha512-kncrV4vFdAOMSoMoCcRrWnU74p5jWn/PIMjs2poHfvxcfRscm6tZ8dEvDpY+do8hOMfZC+WO0G0/WT2wntIwEg==", - "dependencies": { - "axios": "^0.21.1", - "jsep": "^1.3.6" - } + "resolved": "../nocodb-sdk", + "link": true }, "node_modules/node-abort-controller": { "version": "3.1.1", @@ -28517,12 +28511,22 @@ "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==" }, "nocodb-sdk": { - "version": "0.109.4", - "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.109.4.tgz", - "integrity": "sha512-kncrV4vFdAOMSoMoCcRrWnU74p5jWn/PIMjs2poHfvxcfRscm6tZ8dEvDpY+do8hOMfZC+WO0G0/WT2wntIwEg==", + "version": "file:../nocodb-sdk", "requires": { + "@typescript-eslint/eslint-plugin": "^4.0.1", + "@typescript-eslint/parser": "^4.0.1", "axios": "^0.21.1", - "jsep": "^1.3.6" + "cspell": "^4.1.0", + "eslint": "^7.8.0", + "eslint-config-prettier": "^6.11.0", + "eslint-plugin-eslint-comments": "^3.2.0", + "eslint-plugin-functional": "^3.0.2", + "eslint-plugin-import": "^2.22.0", + "eslint-plugin-prettier": "^4.0.0", + "jsep": "^1.3.6", + "npm-run-all": "^4.1.5", + "prettier": "^2.1.1", + "typescript": "^4.0.2" } }, "node-abort-controller": { diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index fc83923380..9375bf4db9 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -118,7 +118,7 @@ "nc-lib-gui": "0.109.4", "nc-plugin": "^0.1.3", "ncp": "^2.0.0", - "nocodb-sdk": "0.109.4", + "nocodb-sdk": "file:../nocodb-sdk", "nodemailer": "^6.4.10", "object-hash": "^3.0.0", "object-sizeof": "^2.6.1", @@ -206,4 +206,4 @@ "coverageDirectory": "../coverage", "testEnvironment": "node" } -} \ No newline at end of file +}