From d85e01f3364c39a8459f02f9492b92f2fb3c6e24 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Mon, 3 Apr 2023 19:51:23 +0800 Subject: [PATCH 01/27] refactor(nc-gui): remove audit calls from frontend side --- .../composables/useExpandedFormStore.ts | 19 ++----------------- .../nc-gui/composables/useKanbanViewStore.ts | 9 --------- packages/nc-gui/composables/useViewData.ts | 9 --------- 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/packages/nc-gui/composables/useExpandedFormStore.ts b/packages/nc-gui/composables/useExpandedFormStore.ts index 98e5769445..8555e8868f 100644 --- a/packages/nc-gui/composables/useExpandedFormStore.ts +++ b/packages/nc-gui/composables/useExpandedFormStore.ts @@ -7,7 +7,6 @@ import { computed, extractPkFromRow, extractSdkResponseErrorMsg, - getHTMLEncodedText, message, populateInsertObject, ref, @@ -253,22 +252,8 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m }) } - for (const key of Object.keys(updateOrInsertObj)) { - // audit - $api.utils - .auditRowUpdate(id, { - fk_model_id: meta.value.id, - column_name: key, - row_id: id, - value: getHTMLEncodedText(updateOrInsertObj[key]), - prev_value: getHTMLEncodedText(row.value.oldRow[key]), - }) - .then(async () => { - /** load latest comments/audit if right drawer is open */ - if (commentsDrawer.value) { - await loadCommentsAndLogs() - } - }) + if (commentsDrawer.value) { + await loadCommentsAndLogs() } } else { // No columns to update diff --git a/packages/nc-gui/composables/useKanbanViewStore.ts b/packages/nc-gui/composables/useKanbanViewStore.ts index 048663706f..e6241545a7 100644 --- a/packages/nc-gui/composables/useKanbanViewStore.ts +++ b/packages/nc-gui/composables/useKanbanViewStore.ts @@ -8,7 +8,6 @@ import { enumColor, extractPkFromRow, extractSdkResponseErrorMsg, - getHTMLEncodedText, inject, message, parseProp, @@ -401,14 +400,6 @@ const [useProvideKanbanViewStore, useKanbanViewStore] = useInjectionState( // query: { ignoreWebhook: !saved } // } ) - // audit - $api.utils.auditRowUpdate(id, { - fk_model_id: meta.value?.id as string, - column_name: property, - row_id: id, - value: getHTMLEncodedText(toUpdate.row[property]), - prev_value: getHTMLEncodedText(toUpdate.oldRow[property]), - }) if (!undo) { const oldRowIndex = moveHistory.value.find((ele) => ele.op === 'removed' && ele.pk === id) diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts index e3841dc7ee..9ca27c7b14 100644 --- a/packages/nc-gui/composables/useViewData.ts +++ b/packages/nc-gui/composables/useViewData.ts @@ -8,7 +8,6 @@ import { computed, extractPkFromRow, extractSdkResponseErrorMsg, - getHTMLEncodedText, message, populateInsertObject, ref, @@ -350,14 +349,6 @@ export function useViewData( // query: { ignoreWebhook: !saved } // } ) - // audit - $api.utils.auditRowUpdate(encodeURIComponent(id), { - fk_model_id: metaValue?.id as string, - column_name: property, - row_id: id, - value: getHTMLEncodedText(toUpdate.row[property]), - prev_value: getHTMLEncodedText(toUpdate.oldRow[property]), - }) if (!undo) { addUndo({ From 670d9052f75c6d0e56f7c5aad62392dbfc12bd66 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Tue, 4 Apr 2023 16:30:24 +0800 Subject: [PATCH 02/27] refactor(nocodb): keep present tense form for AuditOperationSubTypes --- packages/nocodb/src/lib/models/Audit.ts | 6 ++---- packages/nocodb/src/lib/services/column.svc.ts | 6 +++--- packages/nocodb/src/lib/services/table.svc.ts | 4 ++-- packages/nocodb/src/schema/swagger.json | 6 ++---- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/packages/nocodb/src/lib/models/Audit.ts b/packages/nocodb/src/lib/models/Audit.ts index f8e2e84bb9..0f01e1b1ef 100644 --- a/packages/nocodb/src/lib/models/Audit.ts +++ b/packages/nocodb/src/lib/models/Audit.ts @@ -30,13 +30,11 @@ const opSubTypes = [ 'LINK_RECORD', 'UNLINK_RECORD', 'DELETE', - 'CREATED', - 'DELETED', - 'RENAMED', + 'CREATE', + 'RENAME', 'IMPORT_FROM_ZIP', 'EXPORT_TO_FS', 'EXPORT_TO_ZIP', - 'UPDATED', 'SIGNIN', 'SIGNUP', 'PASSWORD_RESET', diff --git a/packages/nocodb/src/lib/services/column.svc.ts b/packages/nocodb/src/lib/services/column.svc.ts index 4ff0a6ea10..320d1c5c72 100644 --- a/packages/nocodb/src/lib/services/column.svc.ts +++ b/packages/nocodb/src/lib/services/column.svc.ts @@ -822,7 +822,7 @@ export async function columnUpdate(param: { await Audit.insert({ project_id: base.project_id, op_type: AuditOperationTypes.TABLE_COLUMN, - op_sub_type: AuditOperationSubTypes.UPDATED, + op_sub_type: AuditOperationSubTypes.UPDATE, user: param.req?.user?.email, description: `updated column ${column.column_name} with alias ${column.title} from table ${table.table_name}`, ip: param.req?.clientIp, @@ -1127,7 +1127,7 @@ export async function columnAdd(param: { await Audit.insert({ project_id: base.project_id, op_type: AuditOperationTypes.TABLE_COLUMN, - op_sub_type: AuditOperationSubTypes.CREATED, + op_sub_type: AuditOperationSubTypes.CREATE, user: param?.req.user?.email, description: `created column ${colBody.column_name} with alias ${colBody.title} from table ${table.table_name}`, ip: param?.req.clientIp, @@ -1339,7 +1339,7 @@ export async function columnDelete(param: { req?: any; columnId: string }) { await Audit.insert({ project_id: base.project_id, op_type: AuditOperationTypes.TABLE_COLUMN, - op_sub_type: AuditOperationSubTypes.DELETED, + op_sub_type: AuditOperationSubTypes.DELETE, user: param?.req?.user?.email, description: `deleted column ${column.column_name} with alias ${column.title} from table ${table.table_name}`, ip: param?.req.clientIp, diff --git a/packages/nocodb/src/lib/services/table.svc.ts b/packages/nocodb/src/lib/services/table.svc.ts index 94e782a593..e8b21935f2 100644 --- a/packages/nocodb/src/lib/services/table.svc.ts +++ b/packages/nocodb/src/lib/services/table.svc.ts @@ -185,7 +185,7 @@ export async function tableDelete(param: { project_id: project.id, base_id: base.id, op_type: AuditOperationTypes.TABLE, - op_sub_type: AuditOperationSubTypes.DELETED, + op_sub_type: AuditOperationSubTypes.DELETE, user: param.user?.email, description: `Deleted ${table.type} ${table.table_name} with alias ${table.title} `, ip: param.req?.clientIp, @@ -433,7 +433,7 @@ export async function tableCreate(param: { project_id: project.id, base_id: base.id, op_type: AuditOperationTypes.TABLE, - op_sub_type: AuditOperationSubTypes.CREATED, + op_sub_type: AuditOperationSubTypes.CREATE, user: param.user?.email, description: `created table ${tableCreatePayLoad.table_name} with alias ${tableCreatePayLoad.title} `, ip: param.req?.clientIp, diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json index caa9c9002c..1fcfc3e4eb 100644 --- a/packages/nocodb/src/schema/swagger.json +++ b/packages/nocodb/src/schema/swagger.json @@ -14020,13 +14020,11 @@ "LINK_RECORD", "UNLINK_RECORD", "DELETE", - "CREATED", - "DELETED", - "RENAMED", + "CREATE", + "RENAME", "IMPORT_FROM_ZIP", "EXPORT_TO_FS", "EXPORT_TO_ZIP", - "UPDATED", "SIGNIN", "SIGNUP", "PASSWORD_RESET", From 3966665c76ed7c4affc628f6e587eec134fc9017 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Tue, 4 Apr 2023 16:31:15 +0800 Subject: [PATCH 03/27] chore(sdk): regenerate Api.ts --- packages/nocodb-sdk/src/lib/Api.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts index b3b12a773e..2407419a29 100644 --- a/packages/nocodb-sdk/src/lib/Api.ts +++ b/packages/nocodb-sdk/src/lib/Api.ts @@ -154,13 +154,11 @@ export interface AuditType { | 'LINK_RECORD' | 'UNLINK_RECORD' | 'DELETE' - | 'CREATED' - | 'DELETED' - | 'RENAMED' + | 'CREATE' + | 'RENAME' | 'IMPORT_FROM_ZIP' | 'EXPORT_TO_FS' | 'EXPORT_TO_ZIP' - | 'UPDATED' | 'SIGNIN' | 'SIGNUP' | 'PASSWORD_RESET' From 5da7b0d261e6d2af7e6b97cc1c84daa4a09aeef6 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Tue, 4 Apr 2023 17:31:30 +0800 Subject: [PATCH 04/27] refactor(nocodb): use values from AuditOperationTypes & AuditOperationSubTypes --- .../src/lib/controllers/user/user.ctl.ts | 5 ++-- .../src/lib/services/projectUser.svc.ts | 24 +++++++++------- .../nocodb/src/lib/services/user/index.ts | 28 +++++++++++-------- 3 files changed, 33 insertions(+), 24 deletions(-) diff --git a/packages/nocodb/src/lib/controllers/user/user.ctl.ts b/packages/nocodb/src/lib/controllers/user/user.ctl.ts index b411db0e39..ce37f3c0c9 100644 --- a/packages/nocodb/src/lib/controllers/user/user.ctl.ts +++ b/packages/nocodb/src/lib/controllers/user/user.ctl.ts @@ -1,4 +1,5 @@ import { promisify } from 'util'; +import { AuditOperationSubTypes, AuditOperationTypes } from 'nocodb-sdk'; import * as ejs from 'ejs'; import passport from 'passport'; import catchError, { NcError } from '../../meta/helpers/catchError'; @@ -65,8 +66,8 @@ async function successfulSignIn({ setTokenCookie(res, refreshToken); await Audit.insert({ - op_type: 'AUTHENTICATION', - op_sub_type: 'SIGNIN', + op_type: AuditOperationTypes.AUTHENTICATION, + op_sub_type: AuditOperationSubTypes.SIGNIN, user: user.email, ip: req.clientIp, description: auditDescription, diff --git a/packages/nocodb/src/lib/services/projectUser.svc.ts b/packages/nocodb/src/lib/services/projectUser.svc.ts index bc60f7a844..56ecea6948 100644 --- a/packages/nocodb/src/lib/services/projectUser.svc.ts +++ b/packages/nocodb/src/lib/services/projectUser.svc.ts @@ -1,9 +1,13 @@ -import { OrgUserRoles } from 'nocodb-sdk'; +import { + AuditOperationSubTypes, + AuditOperationTypes, + OrgUserRoles, + PluginCategory, +} 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'; @@ -91,8 +95,8 @@ export async function userInvite(param: { await Audit.insert({ project_id: param.projectId, - op_type: 'AUTHENTICATION', - op_sub_type: 'INVITE', + op_type: AuditOperationTypes.AUTHENTICATION, + op_sub_type: AuditOperationSubTypes.INVITE, user: param.req.user.email, description: `invited ${email} to ${param.projectId} project `, ip: param.req.clientIp, @@ -120,8 +124,8 @@ export async function userInvite(param: { await Audit.insert({ project_id: param.projectId, - op_type: 'AUTHENTICATION', - op_sub_type: 'INVITE', + op_type: AuditOperationTypes.AUTHENTICATION, + op_sub_type: AuditOperationSubTypes.INVITE, user: param.req.user.email, description: `invited ${email} to ${param.projectId} project `, ip: param.req.clientIp, @@ -202,8 +206,8 @@ export async function projectUserUpdate(param: { ); await Audit.insert({ - op_type: 'AUTHENTICATION', - op_sub_type: 'ROLES_MANAGEMENT', + op_type: AuditOperationTypes.AUTHENTICATION, + op_sub_type: AuditOperationSubTypes.ROLES_MANAGEMENT, user: param.req.user.email, description: `updated roles for ${user.email} with ${param.projectUser.roles} `, ip: param.req.clientIp, @@ -274,8 +278,8 @@ export async function projectUserInviteResend(param: { await sendInviteEmail(user.email, invite_token, param.req); await Audit.insert({ - op_type: 'AUTHENTICATION', - op_sub_type: 'RESEND_INVITE', + op_type: AuditOperationTypes.AUTHENTICATION, + op_sub_type: AuditOperationSubTypes.RESEND_INVITE, user: user.email, description: `resent a invite to ${user.email} `, ip: param.req.clientIp, diff --git a/packages/nocodb/src/lib/services/user/index.ts b/packages/nocodb/src/lib/services/user/index.ts index a082ff9070..796365a017 100644 --- a/packages/nocodb/src/lib/services/user/index.ts +++ b/packages/nocodb/src/lib/services/user/index.ts @@ -1,6 +1,10 @@ import { promisify } from 'util'; -import { validatePassword } from 'nocodb-sdk'; -import { OrgUserRoles } from 'nocodb-sdk'; +import { + AuditOperationSubTypes, + AuditOperationTypes, + OrgUserRoles, + validatePassword, +} from 'nocodb-sdk'; import { T } from 'nc-help'; import * as ejs from 'ejs'; import bcrypt from 'bcryptjs'; @@ -120,8 +124,8 @@ export async function passwordChange(param: { }); await Audit.insert({ - op_type: 'AUTHENTICATION', - op_sub_type: 'PASSWORD_CHANGE', + op_type: AuditOperationTypes.AUTHENTICATION, + op_sub_type: AuditOperationSubTypes.PASSWORD_CHANGE, user: user.email, description: `changed password `, ip: param.req?.clientIp, @@ -178,8 +182,8 @@ export async function passwordForgot(param: { } await Audit.insert({ - op_type: 'AUTHENTICATION', - op_sub_type: 'PASSWORD_FORGOT', + op_type: AuditOperationTypes.AUTHENTICATION, + op_sub_type: AuditOperationSubTypes.PASSWORD_FORGOT, user: user.email, description: `requested for password reset `, ip: param.req?.clientIp, @@ -254,8 +258,8 @@ export async function passwordReset(param: { }); await Audit.insert({ - op_type: 'AUTHENTICATION', - op_sub_type: 'PASSWORD_RESET', + op_type: AuditOperationTypes.AUTHENTICATION, + op_sub_type: AuditOperationSubTypes.PASSWORD_RESET, user: user.email, description: `did reset password `, ip: req.clientIp, @@ -286,8 +290,8 @@ export async function emailVerification(param: { }); await Audit.insert({ - op_type: 'AUTHENTICATION', - op_sub_type: 'EMAIL_VERIFICATION', + op_type: AuditOperationTypes.AUTHENTICATION, + op_sub_type: AuditOperationSubTypes.EMAIL_VERIFICATION, user: user.email, description: `verified email `, ip: req.clientIp, @@ -442,8 +446,8 @@ export async function signup(param: { user = (param.req as any).user; await Audit.insert({ - op_type: 'AUTHENTICATION', - op_sub_type: 'SIGNUP', + op_type: AuditOperationTypes.AUTHENTICATION, + op_sub_type: AuditOperationSubTypes.SIGNUP, user: user.email, description: `signed up `, ip: (param.req as any).clientIp, From bbb4b3097f4dde049ecfd25a21726b4e4449167a Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Tue, 4 Apr 2023 18:46:15 +0800 Subject: [PATCH 05/27] refactor(sdk): remove audit types with duplicate meaning --- packages/nocodb-sdk/src/lib/globals.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/nocodb-sdk/src/lib/globals.ts b/packages/nocodb-sdk/src/lib/globals.ts index fd64f2d2a8..4a53cb2c00 100644 --- a/packages/nocodb-sdk/src/lib/globals.ts +++ b/packages/nocodb-sdk/src/lib/globals.ts @@ -47,13 +47,11 @@ export enum AuditOperationSubTypes { LINK_RECORD = 'LINK_RECORD', UNLINK_RECORD = 'UNLINK_RECORD', DELETE = 'DELETE', - CREATED = 'CREATED', - DELETED = 'DELETED', - RENAMED = 'RENAMED', + CREATE = 'CREATE', + RENAME = 'RENAME', IMPORT_FROM_ZIP = 'IMPORT_FROM_ZIP', EXPORT_TO_FS = 'EXPORT_TO_FS', EXPORT_TO_ZIP = 'EXPORT_TO_ZIP', - UPDATED = 'UPDATED', SIGNIN = 'SIGNIN', SIGNUP = 'SIGNUP', PASSWORD_RESET = 'PASSWORD_RESET', From 55f9281c25397b5617f1b255b9920fe86d8db78f Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Tue, 4 Apr 2023 20:06:18 +0800 Subject: [PATCH 06/27] refactor(nc-gui): revise audit description --- packages/nc-gui/composables/useExpandedFormStore.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nc-gui/composables/useExpandedFormStore.ts b/packages/nc-gui/composables/useExpandedFormStore.ts index 8555e8868f..43a60991cc 100644 --- a/packages/nc-gui/composables/useExpandedFormStore.ts +++ b/packages/nc-gui/composables/useExpandedFormStore.ts @@ -126,7 +126,7 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m await api.utils.commentRow({ fk_model_id: meta.value?.id as string, row_id: rowId, - description: comment.value, + description: `The following comment has been created: ${comment.value}`, }) comment.value = '' From 82b73b140d75672b6ec676f2090cc77f95e0d157 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Tue, 4 Apr 2023 20:06:30 +0800 Subject: [PATCH 07/27] refactor(nocodb): revise audit description --- .../src/lib/controllers/user/user.ctl.ts | 4 +-- .../sql-data-mapper/lib/sql/BaseModelSqlv2.ts | 26 +++++++++++++------ packages/nocodb/src/lib/services/audit.svc.ts | 2 +- .../nocodb/src/lib/services/column.svc.ts | 6 ++--- .../nocodb/src/lib/services/orgUser.svc.ts | 4 +-- .../src/lib/services/projectUser.svc.ts | 6 ++--- packages/nocodb/src/lib/services/table.svc.ts | 2 +- .../nocodb/src/lib/services/user/index.ts | 10 +++---- 8 files changed, 35 insertions(+), 25 deletions(-) diff --git a/packages/nocodb/src/lib/controllers/user/user.ctl.ts b/packages/nocodb/src/lib/controllers/user/user.ctl.ts index ce37f3c0c9..c68ada72f7 100644 --- a/packages/nocodb/src/lib/controllers/user/user.ctl.ts +++ b/packages/nocodb/src/lib/controllers/user/user.ctl.ts @@ -93,7 +93,7 @@ async function signin(req, res, next) { info, req, res, - auditDescription: 'signed in', + auditDescription: 'User has signed in successfully', }) )(req, res, next); } @@ -112,7 +112,7 @@ async function googleSignin(req, res, next) { info, req, res, - auditDescription: 'signed in using Google Auth', + auditDescription: 'User has signed in successfully using Google Auth ', }) )(req, res, next); } 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 14dd6bbe0d..aa698dcb67 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 @@ -2296,7 +2296,7 @@ class BaseModelSqlv2 { op_type: AuditOperationTypes.DATA, op_sub_type: AuditOperationSubTypes.INSERT, description: DOMPurify.sanitize( - `${id} inserted into ${this.model.title}` + `Record with ID ${id} has been inserted into Table ${this.model.title}` ), // details: JSON.stringify(data), ip: req?.clientIp, @@ -2322,7 +2322,9 @@ class BaseModelSqlv2 { op_type: AuditOperationTypes.DATA, op_sub_type: AuditOperationSubTypes.BULK_UPDATE, description: DOMPurify.sanitize( - `${noOfUpdatedRecords} records bulk updated in ${this.model.title}` + `${noOfUpdatedRecords} ${ + noOfUpdatedRecords > 1 ? 'records have' : 'record has' + } been bulk updated in ${this.model.title}` ), // details: JSON.stringify(data), ip: req?.clientIp, @@ -2347,7 +2349,9 @@ class BaseModelSqlv2 { op_type: AuditOperationTypes.DATA, op_sub_type: AuditOperationSubTypes.BULK_DELETE, description: DOMPurify.sanitize( - `${noOfDeletedRecords} records bulk deleted in ${this.model.title}` + `${noOfDeletedRecords} ${ + noOfDeletedRecords > 1 ? 'records have' : 'record has' + } been bulk deleted in ${this.model.title}` ), // details: JSON.stringify(data), ip: req?.clientIp, @@ -2363,7 +2367,9 @@ class BaseModelSqlv2 { op_type: AuditOperationTypes.DATA, op_sub_type: AuditOperationSubTypes.BULK_INSERT, description: DOMPurify.sanitize( - `${data.length} records bulk inserted into ${this.model.title}` + `${data.length} ${ + data.length > 1 ? 'records have' : 'record has' + } been bulk inserted in ${this.model.title}` ), // details: JSON.stringify(data), ip: req?.clientIp, @@ -2396,7 +2402,9 @@ class BaseModelSqlv2 { row_id: id, op_type: AuditOperationTypes.DATA, op_sub_type: AuditOperationSubTypes.UPDATE, - description: DOMPurify.sanitize(`${id} updated in ${this.model.title}`), + description: DOMPurify.sanitize( + `Record with ID ${id} has been updated in Table ${this.model.title}` + ), // details: JSON.stringify(data), ip: req?.clientIp, user: req?.user?.email, @@ -2424,7 +2432,9 @@ class BaseModelSqlv2 { row_id: id, op_type: AuditOperationTypes.DATA, op_sub_type: AuditOperationSubTypes.DELETE, - description: DOMPurify.sanitize(`${id} deleted from ${this.model.title}`), + description: DOMPurify.sanitize( + `Record with ID ${id} has been deleted in Table ${this.model.title}` + ), // details: JSON.stringify(data), ip: req?.clientIp, user: req?.user?.email, @@ -2695,7 +2705,7 @@ class BaseModelSqlv2 { op_sub_type: AuditOperationSubTypes.LINK_RECORD, row_id: rowId, description: DOMPurify.sanitize( - `Record [id:${childId}] record linked with record [id:${rowId}] record in ${this.model.title}` + `Record [id:${childId}] has been linked with record [id:${rowId}] in ${this.model.title}` ), // details: JSON.stringify(data), ip: req?.clientIp, @@ -2797,7 +2807,7 @@ class BaseModelSqlv2 { op_sub_type: AuditOperationSubTypes.UNLINK_RECORD, row_id: rowId, description: DOMPurify.sanitize( - `Record [id:${childId}] record unlinked with record [id:${rowId}] record in ${this.model.title}` + `Record [id:${childId}] has been unlinked with record [id:${rowId}] in ${this.model.title}` ), // details: JSON.stringify(data), ip: req?.clientIp, diff --git a/packages/nocodb/src/lib/services/audit.svc.ts b/packages/nocodb/src/lib/services/audit.svc.ts index d88fdf5e26..c941800827 100644 --- a/packages/nocodb/src/lib/services/audit.svc.ts +++ b/packages/nocodb/src/lib/services/audit.svc.ts @@ -36,7 +36,7 @@ export async function auditRowUpdate(param: { op_type: AuditOperationTypes.DATA, op_sub_type: AuditOperationSubTypes.UPDATE, description: DOMPurify.sanitize( - `Table ${model.table_name} : field ${param.body.column_name} got changed from ${param.body.prev_value} to ${param.body.value}` + `The column ${param.body.column_name} in Table ${model.table_name} has been changed from ${param.body.prev_value} to ${param.body.value}` ), details: DOMPurify.sanitize(`${param.body.column_name} : ${param.body.prev_value} diff --git a/packages/nocodb/src/lib/services/column.svc.ts b/packages/nocodb/src/lib/services/column.svc.ts index 320d1c5c72..4fa6a6c5ef 100644 --- a/packages/nocodb/src/lib/services/column.svc.ts +++ b/packages/nocodb/src/lib/services/column.svc.ts @@ -824,7 +824,7 @@ export async function columnUpdate(param: { op_type: AuditOperationTypes.TABLE_COLUMN, op_sub_type: AuditOperationSubTypes.UPDATE, user: param.req?.user?.email, - description: `updated column ${column.column_name} with alias ${column.title} from table ${table.table_name}`, + description: `The column ${column.column_name} with alias ${column.title} from table ${table.table_name} has been updated`, ip: param.req?.clientIp, }).then(() => {}); @@ -1129,7 +1129,7 @@ export async function columnAdd(param: { op_type: AuditOperationTypes.TABLE_COLUMN, op_sub_type: AuditOperationSubTypes.CREATE, user: param?.req.user?.email, - description: `created column ${colBody.column_name} with alias ${colBody.title} from table ${table.table_name}`, + description: `The column ${colBody.column_name} with alias ${colBody.title} from table ${table.table_name} has been created`, ip: param?.req.clientIp, }).then(() => {}); @@ -1341,7 +1341,7 @@ export async function columnDelete(param: { req?: any; columnId: string }) { op_type: AuditOperationTypes.TABLE_COLUMN, op_sub_type: AuditOperationSubTypes.DELETE, user: param?.req?.user?.email, - description: `deleted column ${column.column_name} with alias ${column.title} from table ${table.table_name}`, + description: `The column ${column.column_name} with alias ${column.title} from table ${table.table_name} has been deleted`, ip: param?.req.clientIp, }).then(() => {}); diff --git a/packages/nocodb/src/lib/services/orgUser.svc.ts b/packages/nocodb/src/lib/services/orgUser.svc.ts index a3f79d0d2a..38c19bf9a1 100644 --- a/packages/nocodb/src/lib/services/orgUser.svc.ts +++ b/packages/nocodb/src/lib/services/orgUser.svc.ts @@ -147,7 +147,7 @@ export async function userAdd(param: { op_type: AuditOperationTypes.ORG_USER, op_sub_type: AuditOperationSubTypes.INVITE, user: param.req.user.email, - description: `invited ${email} to ${param.projectId} project `, + description: `${email} has been invited to ${param.projectId} project`, ip: param.req.clientIp, }); // in case of single user check for smtp failure @@ -218,7 +218,7 @@ export async function userInviteResend(param: { op_type: AuditOperationTypes.ORG_USER, op_sub_type: AuditOperationSubTypes.RESEND_INVITE, user: user.email, - description: `resent a invite to ${user.email} `, + description: `${user.email} has been re-invited`, ip: param.req.clientIp, }); diff --git a/packages/nocodb/src/lib/services/projectUser.svc.ts b/packages/nocodb/src/lib/services/projectUser.svc.ts index 56ecea6948..bd3d7a2b4c 100644 --- a/packages/nocodb/src/lib/services/projectUser.svc.ts +++ b/packages/nocodb/src/lib/services/projectUser.svc.ts @@ -98,7 +98,7 @@ export async function userInvite(param: { op_type: AuditOperationTypes.AUTHENTICATION, op_sub_type: AuditOperationSubTypes.INVITE, user: param.req.user.email, - description: `invited ${email} to ${param.projectId} project `, + description: `${email} has been invited to ${param.projectId} project`, ip: param.req.clientIp, }); } else { @@ -209,7 +209,7 @@ export async function projectUserUpdate(param: { op_type: AuditOperationTypes.AUTHENTICATION, op_sub_type: AuditOperationSubTypes.ROLES_MANAGEMENT, user: param.req.user.email, - description: `updated roles for ${user.email} with ${param.projectUser.roles} `, + description: `Roles for ${user.email} with has been updated to ${param.projectUser.roles}`, ip: param.req.clientIp, }); @@ -281,7 +281,7 @@ export async function projectUserInviteResend(param: { op_type: AuditOperationTypes.AUTHENTICATION, op_sub_type: AuditOperationSubTypes.RESEND_INVITE, user: user.email, - description: `resent a invite to ${user.email} `, + description: `${user.email} has been re-invited`, ip: param.req.clientIp, project_id: param.projectId, }); diff --git a/packages/nocodb/src/lib/services/table.svc.ts b/packages/nocodb/src/lib/services/table.svc.ts index e8b21935f2..fa36f647a3 100644 --- a/packages/nocodb/src/lib/services/table.svc.ts +++ b/packages/nocodb/src/lib/services/table.svc.ts @@ -435,7 +435,7 @@ export async function tableCreate(param: { op_type: AuditOperationTypes.TABLE, op_sub_type: AuditOperationSubTypes.CREATE, user: param.user?.email, - description: `created table ${tableCreatePayLoad.table_name} with alias ${tableCreatePayLoad.title} `, + description: `Table ${tableCreatePayLoad.table_name} with alias ${tableCreatePayLoad.title} has been created`, ip: param.req?.clientIp, }).then(() => {}); diff --git a/packages/nocodb/src/lib/services/user/index.ts b/packages/nocodb/src/lib/services/user/index.ts index 796365a017..1afa86648e 100644 --- a/packages/nocodb/src/lib/services/user/index.ts +++ b/packages/nocodb/src/lib/services/user/index.ts @@ -127,7 +127,7 @@ export async function passwordChange(param: { op_type: AuditOperationTypes.AUTHENTICATION, op_sub_type: AuditOperationSubTypes.PASSWORD_CHANGE, user: user.email, - description: `changed password `, + description: `Password has been changed`, ip: param.req?.clientIp, }); @@ -185,7 +185,7 @@ export async function passwordForgot(param: { op_type: AuditOperationTypes.AUTHENTICATION, op_sub_type: AuditOperationSubTypes.PASSWORD_FORGOT, user: user.email, - description: `requested for password reset `, + description: `Password Reset has been requested`, ip: param.req?.clientIp, }); } else { @@ -261,7 +261,7 @@ export async function passwordReset(param: { op_type: AuditOperationTypes.AUTHENTICATION, op_sub_type: AuditOperationSubTypes.PASSWORD_RESET, user: user.email, - description: `did reset password `, + description: `Password has been reset`, ip: req.clientIp, }); @@ -293,7 +293,7 @@ export async function emailVerification(param: { op_type: AuditOperationTypes.AUTHENTICATION, op_sub_type: AuditOperationSubTypes.EMAIL_VERIFICATION, user: user.email, - description: `verified email `, + description: `Email has been verified`, ip: req.clientIp, }); @@ -449,7 +449,7 @@ export async function signup(param: { op_type: AuditOperationTypes.AUTHENTICATION, op_sub_type: AuditOperationSubTypes.SIGNUP, user: user.email, - description: `signed up `, + description: `User has signed up`, ip: (param.req as any).clientIp, }); From 58600502a31a21d8cbbe239b3a35f31f5f06f1f5 Mon Sep 17 00:00:00 2001 From: mertmit Date: Wed, 5 Apr 2023 00:43:11 +0300 Subject: [PATCH 08/27] fix: formula LTAR column references Signed-off-by: mertmit --- .../sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1aa1dd12c4..f6a93ea247 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 @@ -656,7 +656,7 @@ async function _formulaQueryBuilder( } else if (pt.type === 'Identifier') { const { builder } = await aliasToColumn?.[pt.name]?.(); if (typeof builder === 'function') { - return { builder: knex.raw(`??${colAlias}`, await builder(pt.fnName)) }; + return { builder: knex.raw(`??${colAlias}`, builder(pt.fnName)) }; } return { builder: knex.raw(`??${colAlias}`, [builder || pt.name]) }; } else if (pt.type === 'BinaryExpression') { From 2d85528df37c0158d9eea1525b662406cafdf3d3 Mon Sep 17 00:00:00 2001 From: navi Date: Wed, 5 Apr 2023 04:00:13 +0100 Subject: [PATCH 09/27] New translations en.json (Portuguese, Brazilian) --- packages/nc-gui/lang/pt_BR.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/nc-gui/lang/pt_BR.json b/packages/nc-gui/lang/pt_BR.json index fa649565d8..5e9ee29b93 100644 --- a/packages/nc-gui/lang/pt_BR.json +++ b/packages/nc-gui/lang/pt_BR.json @@ -101,7 +101,7 @@ "form": "Formulário", "kanban": "Kanban", "calendar": "Calendário", - "map": "Map" + "map": "Mapa" }, "user": "Do utilizador", "users": "Comercial", @@ -210,7 +210,7 @@ "advancedSettings": "Configurações avançadas", "codeSnippet": "Código Snippet", "keyboardShortcut": "Atalhos de teclado", - "generateRandomName": "Generate Random Name", + "generateRandomName": "Gerar um código aleatório", "findRowByScanningCode": "Find row by scanning a QR or Barcode" }, "labels": { @@ -472,7 +472,7 @@ "map": { "mappedBy": "Mapped By", "chooseMappingField": "Choose a Mapping Field", - "openInGoogleMaps": "Google Maps", + "openInGoogleMaps": "Google Mapas", "openInOpenStreetMap": "OSM" }, "toggleMobileMode": "Toggle Mobile Mode" From 4cd2928f63d791056eded920a8b2d280c2885ee3 Mon Sep 17 00:00:00 2001 From: navi Date: Wed, 5 Apr 2023 16:05:16 +0100 Subject: [PATCH 10/27] New translations en.json (Chinese Simplified) --- packages/nc-gui/lang/zh-Hans.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/nc-gui/lang/zh-Hans.json b/packages/nc-gui/lang/zh-Hans.json index 93c45580b2..c8aec7fc76 100644 --- a/packages/nc-gui/lang/zh-Hans.json +++ b/packages/nc-gui/lang/zh-Hans.json @@ -238,7 +238,7 @@ "action": "操作", "actions": "操作", "operation": "操作", - "operationSub": "Sub Operation", + "operationSub": "子操作", "operationType": "操作类型", "operationSubType": "子操作类型", "description": "描述", @@ -471,11 +471,11 @@ }, "map": { "mappedBy": "Mapped By", - "chooseMappingField": "Choose a Mapping Field", + "chooseMappingField": "选择映射字段", "openInGoogleMaps": "谷歌地图", "openInOpenStreetMap": "OSM" }, - "toggleMobileMode": "Toggle Mobile Mode" + "toggleMobileMode": "切换移动模式" }, "tooltip": { "saveChanges": "保存更改", @@ -779,7 +779,7 @@ "userDeletedFromProject": "踢出用户成功", "inviteEmailSent": "邀请邮件发送成功", "inviteURLCopied": "邀请URL已复制到剪贴板", - "commentCopied": "Comment copied to clipboard", + "commentCopied": "已复制评论到剪贴板", "passwordResetURLCopied": "密码重置网址已复制到剪贴板", "shareableURLCopied": "已将可共享的基础URL复制到剪贴板！", "embeddableHTMLCodeCopied": "已复制可嵌入的 HTML 代码！", From dc9059c88fbb5095fd7817f0e35108ba0a08cb85 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Wed, 5 Apr 2023 23:52:04 +0800 Subject: [PATCH 11/27] fix(nocodb): revise audit messages in tests --- .../unit/model/tests/baseModelSql.test.ts | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/nocodb/tests/unit/model/tests/baseModelSql.test.ts b/packages/nocodb/tests/unit/model/tests/baseModelSql.test.ts index 16054c7f3e..f8afe40e60 100644 --- a/packages/nocodb/tests/unit/model/tests/baseModelSql.test.ts +++ b/packages/nocodb/tests/unit/model/tests/baseModelSql.test.ts @@ -78,7 +78,7 @@ function baseModelSqlTests() { row_id: '1', op_type: 'DATA', op_sub_type: 'INSERT', - description: '1 inserted into Table1_Title', + description: 'Record with ID 1 has been inserted into Table Table1_Title', }); }); @@ -123,7 +123,7 @@ function baseModelSqlTests() { op_type: 'DATA', op_sub_type: 'BULK_INSERT', status: null, - description: '10 records bulk inserted into Table1_Title', + description: '10 records have been bulk inserted in Table1_Title', details: null, }); }); @@ -156,7 +156,7 @@ function baseModelSqlTests() { row_id: '1', op_type: 'DATA', op_sub_type: 'UPDATE', - description: '1 updated in Table1_Title', + description: 'Record with ID 1 has been updated in Table Table1_Title', }); }); @@ -199,7 +199,7 @@ function baseModelSqlTests() { op_type: 'DATA', op_sub_type: 'BULK_UPDATE', status: null, - description: '10 records bulk updated in Table1_Title', + description: '10 records have been bulk updated in Table1_Title', details: null, }); }); @@ -250,7 +250,7 @@ function baseModelSqlTests() { op_type: 'DATA', op_sub_type: 'BULK_UPDATE', status: null, - description: '4 records bulk updated in Table1_Title', + description: '4 records have been bulk updated in Table1_Title', details: null, }); }); @@ -288,7 +288,7 @@ function baseModelSqlTests() { row_id: '1', op_type: 'DATA', op_sub_type: 'DELETE', - description: '1 deleted from Table1_Title', + description: 'Record with ID 1 has been deleted in Table Table1_Title', }); }); @@ -330,7 +330,7 @@ function baseModelSqlTests() { op_type: 'DATA', op_sub_type: 'BULK_DELETE', status: null, - description: '4 records bulk deleted in Table1_Title', + description: '4 records have been bulk deleted in Table1_Title', details: null, }); }); @@ -378,7 +378,7 @@ function baseModelSqlTests() { op_type: 'DATA', op_sub_type: 'BULK_DELETE', status: null, - description: '4 records bulk deleted in Table1_Title', + description: '4 records have been bulk deleted in Table1_Title', details: null, }); }); @@ -438,7 +438,7 @@ function baseModelSqlTests() { row_id: '1', op_type: 'DATA', op_sub_type: 'INSERT', - description: '1 inserted into Table1_Title', + description: 'Record with ID 1 has been inserted into Table Table1_Title', }); }); @@ -506,7 +506,7 @@ function baseModelSqlTests() { op_type: 'DATA', op_sub_type: 'LINK_RECORD', description: - 'Record [id:1] record linked with record [id:1] record in Table1_Title', + 'Record [id:1] has been linked with record [id:1] in Table1_Title', }); }); @@ -581,7 +581,7 @@ function baseModelSqlTests() { op_type: 'DATA', op_sub_type: 'UNLINK_RECORD', description: - 'Record [id:1] record unlinked with record [id:1] record in Table1_Title', + 'Record [id:1] has been unlinked with record [id:1] in Table1_Title', }); }); } From 173c6ca4d0c854cd4bee414c9ea8596a9f4d615a Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Wed, 5 Apr 2023 23:52:16 +0800 Subject: [PATCH 12/27] fix(playwright): revise opSubtype --- tests/playwright/tests/tableOperations.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/playwright/tests/tableOperations.spec.ts b/tests/playwright/tests/tableOperations.spec.ts index e31821f9c0..9a2d56ebea 100644 --- a/tests/playwright/tests/tableOperations.spec.ts +++ b/tests/playwright/tests/tableOperations.spec.ts @@ -25,13 +25,13 @@ test.describe('Table Operations', () => { await settings.audit.verifyRow({ index: 0, opType: 'TABLE', - opSubtype: 'DELETED', + opSubtype: 'DELETE', user: 'user@nocodb.com', }); await settings.audit.verifyRow({ index: 1, opType: 'TABLE', - opSubtype: 'CREATED', + opSubtype: 'CREATE', user: 'user@nocodb.com', }); await settings.close(); From a91da6825149bbae490b9772e57fd8b3d72362b1 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Thu, 6 Apr 2023 13:24:58 +0800 Subject: [PATCH 13/27] feat(nocodb): add mapColumnToAlias --- packages/nocodb/src/lib/models/Model.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/packages/nocodb/src/lib/models/Model.ts b/packages/nocodb/src/lib/models/Model.ts index 1128aceb73..bd69c4df9b 100644 --- a/packages/nocodb/src/lib/models/Model.ts +++ b/packages/nocodb/src/lib/models/Model.ts @@ -456,6 +456,24 @@ export default class Model implements TableType { return insertObj; } + async mapColumnToAlias(data) { + const res = {}; + for (const col of await this.getColumns()) { + if (isVirtualCol(col)) continue; + let val = + data?.[col.title] !== undefined + ? data?.[col.title] + : data?.[col.column_name]; + if (val !== undefined) { + if (col.uidt === UITypes.Attachment && typeof val !== 'string') { + val = JSON.stringify(val); + } + res[sanitize(col.title)] = val; + } + } + return res; + } + static async updateAliasAndTableName( tableId, title: string, From 03540b2fbb375e872606341335398d7b37365a99 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Thu, 6 Apr 2023 13:25:23 +0800 Subject: [PATCH 14/27] feat(nocodb): include data change set in audit desc --- .../sql-data-mapper/lib/sql/BaseModelSqlv2.ts | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) 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 aa698dcb67..2890fd3508 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 @@ -1864,7 +1864,7 @@ class BaseModelSqlv2 { await this.execAndParse(query); const newData = await this.readByPk(id); - await this.afterUpdate(prevData, newData, trx, cookie); + await this.afterUpdate(prevData, newData, trx, cookie, updateObj); return newData; } catch (e) { console.log(e); @@ -2393,18 +2393,32 @@ class BaseModelSqlv2 { prevData: any, newData: any, _trx: any, - req + req, + updateObj?: Record ): Promise { const id = this._extractPksValues(newData); - + let desc = `Record with ID ${id} has been updated in Table ${this.model.title}.`; + if (updateObj) { + updateObj = await this.model.mapColumnToAlias(updateObj); + for (const k of Object.keys(updateObj)) { + const prevValue = + typeof prevData[k] === 'object' + ? JSON.stringify(prevData[k]) + : prevData[k]; + const newValue = + typeof newData[k] === 'object' + ? JSON.stringify(newData[k]) + : newData[k]; + desc += `\n`; + desc += `Column "${k}" got changed from "${prevValue}" to "${newValue}"`; + } + } await Audit.insert({ fk_model_id: this.model.id, row_id: id, op_type: AuditOperationTypes.DATA, op_sub_type: AuditOperationSubTypes.UPDATE, - description: DOMPurify.sanitize( - `Record with ID ${id} has been updated in Table ${this.model.title}` - ), + description: DOMPurify.sanitize(desc), // details: JSON.stringify(data), ip: req?.clientIp, user: req?.user?.email, From aeeadbd7c10a23d4e56460ed91d621687114c17e Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Thu, 6 Apr 2023 13:25:37 +0800 Subject: [PATCH 15/27] refactor(nc-gui): show audit desc better --- .../components/dashboard/settings/AuditTab.vue | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/packages/nc-gui/components/dashboard/settings/AuditTab.vue b/packages/nc-gui/components/dashboard/settings/AuditTab.vue index c747be082c..8c7f1c17b4 100644 --- a/packages/nc-gui/components/dashboard/settings/AuditTab.vue +++ b/packages/nc-gui/components/dashboard/settings/AuditTab.vue @@ -67,6 +67,7 @@ const columns = [ title: tableHeaderRenderer(t('labels.description')), dataIndex: 'description', key: 'description', + customRender: (value: { text: string }) => h('pre', {}, value.text), }, { // User @@ -83,6 +84,7 @@ const columns = [ sort: 'desc', customRender: (value: { text: string }) => h(ATooltip, { placement: 'bottom', title: h('span', {}, value.text) }, () => timeAgo(value.text)), + width: '10%', }, ] @@ -110,7 +112,7 @@ const columns = [ + + From 600e214bd2e95e21db4d8077d31686ad7076efd4 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Thu, 6 Apr 2023 13:41:00 +0800 Subject: [PATCH 16/27] fix(nc-gui): page-size in pagination --- packages/nc-gui/components/dashboard/settings/AuditTab.vue | 2 +- packages/nc-gui/components/smartsheet/Pagination.vue | 2 +- packages/nc-gui/components/tabs/auth/UserManagement.vue | 2 +- packages/nc-gui/components/webhook/CallLog.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/nc-gui/components/dashboard/settings/AuditTab.vue b/packages/nc-gui/components/dashboard/settings/AuditTab.vue index c747be082c..d90fbc5931 100644 --- a/packages/nc-gui/components/dashboard/settings/AuditTab.vue +++ b/packages/nc-gui/components/dashboard/settings/AuditTab.vue @@ -102,7 +102,7 @@ const columns = [ diff --git a/packages/nc-gui/components/tabs/auth/UserManagement.vue b/packages/nc-gui/components/tabs/auth/UserManagement.vue index 1dd5b4c037..005469c0a7 100644 --- a/packages/nc-gui/components/tabs/auth/UserManagement.vue +++ b/packages/nc-gui/components/tabs/auth/UserManagement.vue @@ -369,9 +369,9 @@ const isSuperAdmin = (user: { main_roles?: string }) => { { Date: Thu, 6 Apr 2023 14:00:06 +0800 Subject: [PATCH 17/27] fix(nocodb): revise audit desc --- packages/nocodb/tests/unit/model/tests/baseModelSql.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nocodb/tests/unit/model/tests/baseModelSql.test.ts b/packages/nocodb/tests/unit/model/tests/baseModelSql.test.ts index f8afe40e60..cf7c52fbd6 100644 --- a/packages/nocodb/tests/unit/model/tests/baseModelSql.test.ts +++ b/packages/nocodb/tests/unit/model/tests/baseModelSql.test.ts @@ -156,7 +156,7 @@ function baseModelSqlTests() { row_id: '1', op_type: 'DATA', op_sub_type: 'UPDATE', - description: 'Record with ID 1 has been updated in Table Table1_Title', + description: 'Record with ID 1 has been updated in Table Table1_Title.\nColumn "Title" got changed from "test-0" to "test"', }); }); From 16f499628574c4c3d220731089a99c82e32209b3 Mon Sep 17 00:00:00 2001 From: Raju Udava <86527202+dstala@users.noreply.github.com> Date: Thu, 6 Apr 2023 11:52:15 +0530 Subject: [PATCH 18/27] docs: screenshot updated for webhook docs --- .../noco-docs/content/en/developer-resources/webhooks.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/noco-docs/content/en/developer-resources/webhooks.md b/packages/noco-docs/content/en/developer-resources/webhooks.md index eba7f7e86c..39ebb726b6 100644 --- a/packages/noco-docs/content/en/developer-resources/webhooks.md +++ b/packages/noco-docs/content/en/developer-resources/webhooks.md @@ -28,7 +28,8 @@ Some types of notifications can be triggered by a webhook after a particular eve - Webhook Conditional Trigger - Only records meeting the criteria will trigger webhook -![Screenshot 2022-09-14 at 10 35 39 AM](https://user-images.githubusercontent.com/86527202/190064668-37245025-81f6-491c-b639-83c8fd131bc3.png) + +![Screenshot 2023-04-06 at 11 39 49 AM](https://user-images.githubusercontent.com/86527202/230288581-c613e591-1c32-4151-a2d1-df2bbf1367fd.png) @@ -222,4 +223,4 @@ Webhook v2 is available after v0.106.0. Here's the differences. - Support the following bulk operations: - AFTER BULK INSERT - AFTER BULK UPDATE - - AFTER BULK DELETE \ No newline at end of file + - AFTER BULK DELETE From 4d2ed1d499070e07e6105c01e58775992a514d0d Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Thu, 6 Apr 2023 15:46:12 +0800 Subject: [PATCH 19/27] chore(nc-gui): lint --- packages/nc-gui/components/cell/MultiSelect.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/nc-gui/components/cell/MultiSelect.vue b/packages/nc-gui/components/cell/MultiSelect.vue index 97076b89a7..f9a1bc59e2 100644 --- a/packages/nc-gui/components/cell/MultiSelect.vue +++ b/packages/nc-gui/components/cell/MultiSelect.vue @@ -122,13 +122,13 @@ const selectedTitles = computed(() => ? typeof modelValue === 'string' ? isMysql(column.value.base_id) ? modelValue.split(',').sort((a, b) => { - const opa = options.value.find((el) => el.title === a) - const opb = options.value.find((el) => el.title === b) - if (opa && opb) { - return opa.order! - opb.order! - } - return 0 - }) + const opa = options.value.find((el) => el.title === a) + const opb = options.value.find((el) => el.title === b) + if (opa && opb) { + return opa.order! - opb.order! + } + return 0 + }) : modelValue.split(',') : modelValue : [], @@ -243,7 +243,7 @@ async function addIfMissingAndSave() { // Mysql escapes single quotes with backslash so we keep quotes but others have to unescaped if (!isMysql(column.value.base_id)) { - updatedColMeta.cdf = updatedColMeta.cdf.replace(/''/g, '\'') + updatedColMeta.cdf = updatedColMeta.cdf.replace(/''/g, "'") } } From 15a703f24ac8d84aca3914023558bc21eeb9674b Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Thu, 6 Apr 2023 15:46:30 +0800 Subject: [PATCH 20/27] chore(nocodb): lint --- packages/nocodb/src/lib/db/sql-client/lib/pg/PgClient.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 eb05e4800f..19de9865a5 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 @@ -484,7 +484,7 @@ class PGClient extends KnexClient { ) ).rows?.[0]; - if(!schemaExists) { + if (!schemaExists) { await this.sqlClient.raw( `CREATE SCHEMA IF NOT EXISTS ?? AUTHORIZATION ?? `, [schemaName, this.connectionConfig.connection.user] From 60a636ce6ec795e399a2ae572a0bf6d8fbaf47f5 Mon Sep 17 00:00:00 2001 From: wingkwong Date: Thu, 6 Apr 2023 08:56:53 +0000 Subject: [PATCH 21/27] [create-pull-request] automated change Signed-off-by: GitHub --- packages/nc-gui/components.d.ts | 7 ---- 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 ++--- 7 files changed, 63 insertions(+), 62 deletions(-) diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts index e0307521df..87b0b534c0 100644 --- a/packages/nc-gui/components.d.ts +++ b/packages/nc-gui/components.d.ts @@ -126,13 +126,6 @@ declare module '@vue/runtime-core' { MdiGestureDoubleTap: typeof import('~icons/mdi/gesture-double-tap')['default'] MdiHeart: typeof import('~icons/mdi/heart')['default'] MdiHistory: typeof import('~icons/mdi/history')['default'] - MdiHook: typeof import('~icons/mdi/hook')['default'] - MdiInformation: typeof import('~icons/mdi/information')['default'] - MdiJson: typeof import('~icons/mdi/json')['default'] - MdiKey: typeof import('~icons/mdi/key')['default'] - MdiKeyboard: typeof import('~icons/mdi/keyboard')['default'] - MdiKeyboardReturn: typeof import('~icons/mdi/keyboard-return')['default'] - MdiKeyChange: typeof import('~icons/mdi/key-change')['default'] MdiKeyStar: typeof import('~icons/mdi/key-star')['default'] MdiMenuDown: typeof import('~icons/mdi/menu-down')['default'] MdiMicrosoftTeams: typeof import('~icons/mdi/microsoft-teams')['default'] diff --git a/packages/nc-gui/package-lock.json b/packages/nc-gui/package-lock.json index 1014db0a01..52bf677d15 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.106.0-beta.1", "papaparse": "^5.3.2", "pinia": "^2.0.33", "qrcode": "^1.5.1", @@ -110,7 +110,8 @@ } }, "../nocodb-sdk": { - "version": "0.106.0-beta.0", + "version": "0.106.0-beta.1", + "extraneous": true, "license": "AGPL-3.0-or-later", "dependencies": { "axios": "^0.21.1", @@ -8775,7 +8776,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", @@ -12294,8 +12294,21 @@ } }, "node_modules/nocodb-sdk": { - "resolved": "../nocodb-sdk", - "link": true + "version": "0.106.0-beta.1", + "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.106.0-beta.1.tgz", + "integrity": "sha512-ht/cNTHOLyQwqp8RF7YRixBVvyjv75CnqK3+roGJLIpKj1pE5UAewMNnSfR1gJj/vsHYLMP1TqxPNZXCL0VO3g==", + "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", @@ -24797,8 +24810,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", @@ -27348,22 +27360,22 @@ } }, "nocodb-sdk": { - "version": "file:../nocodb-sdk", + "version": "0.106.0-beta.1", + "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.106.0-beta.1.tgz", + "integrity": "sha512-ht/cNTHOLyQwqp8RF7YRixBVvyjv75CnqK3+roGJLIpKj1pE5UAewMNnSfR1gJj/vsHYLMP1TqxPNZXCL0VO3g==", "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 847017b499..0e208de87a 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.106.0-beta.1", "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 a56b7836d4..8271dd57aa 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.106.0-beta.0", + "version": "0.106.0-beta.1", "description": "NocoDB GUI", "author": { "name": "NocoDB", diff --git a/packages/nocodb-sdk/package.json b/packages/nocodb-sdk/package.json index 2f180a0355..3bffeb19d7 100644 --- a/packages/nocodb-sdk/package.json +++ b/packages/nocodb-sdk/package.json @@ -1,6 +1,6 @@ { "name": "nocodb-sdk", - "version": "0.106.0-beta.0", + "version": "0.106.0-beta.1", "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 6403f31d8c..6e12de2bcc 100644 --- a/packages/nocodb/package-lock.json +++ b/packages/nocodb/package-lock.json @@ -1,12 +1,12 @@ { "name": "nocodb", - "version": "0.106.0-beta.0", + "version": "0.106.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "nocodb", - "version": "0.106.0-beta.0", + "version": "0.106.0-beta.1", "license": "AGPL-3.0-or-later", "dependencies": { "@google-cloud/storage": "^5.7.2", @@ -67,10 +67,10 @@ "mysql2": "^2.2.5", "nanoid": "^3.1.20", "nc-help": "0.2.87", - "nc-lib-gui": "0.106.0-beta.0", + "nc-lib-gui": "0.106.0-beta.1", "nc-plugin": "0.1.2", "ncp": "^2.0.0", - "nocodb-sdk": "file:../nocodb-sdk", + "nocodb-sdk": "0.106.0-beta.1", "nodemailer": "^6.4.10", "object-hash": "^3.0.0", "os-locale": "^5.0.0", @@ -156,7 +156,8 @@ } }, "../nocodb-sdk": { - "version": "0.106.0-beta.0", + "version": "0.106.0-beta.1", + "extraneous": true, "license": "AGPL-3.0-or-later", "dependencies": { "axios": "^0.21.1", @@ -11330,9 +11331,9 @@ } }, "node_modules/nc-lib-gui": { - "version": "0.106.0-beta.0", - "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.106.0-beta.0.tgz", - "integrity": "sha512-DN6H5lvGHhOF6/X3yCd/IMm5DIiFwllcEfOncCer5/46jXNO1e84VpCnxFkD4lfZBi6Di05ioa5lsV/ydFn5Xw==", + "version": "0.106.0-beta.1", + "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.106.0-beta.1.tgz", + "integrity": "sha512-dewDGvwPjDsOlsAusXaoWJ92eNy8BF4YS8nYd3SJiEJKIv27vllDGMe4TN1SdBkKHbg0kvMffSrldPHcFQtRvQ==", "dependencies": { "express": "^4.17.1" } @@ -11391,8 +11392,13 @@ "dev": true }, "node_modules/nocodb-sdk": { - "resolved": "../nocodb-sdk", - "link": true + "version": "0.106.0-beta.1", + "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.106.0-beta.1.tgz", + "integrity": "sha512-ht/cNTHOLyQwqp8RF7YRixBVvyjv75CnqK3+roGJLIpKj1pE5UAewMNnSfR1gJj/vsHYLMP1TqxPNZXCL0VO3g==", + "dependencies": { + "axios": "^0.21.1", + "jsep": "^1.3.6" + } }, "node_modules/node-abort-controller": { "version": "3.0.1", @@ -28042,9 +28048,9 @@ } }, "nc-lib-gui": { - "version": "0.106.0-beta.0", - "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.106.0-beta.0.tgz", - "integrity": "sha512-DN6H5lvGHhOF6/X3yCd/IMm5DIiFwllcEfOncCer5/46jXNO1e84VpCnxFkD4lfZBi6Di05ioa5lsV/ydFn5Xw==", + "version": "0.106.0-beta.1", + "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.106.0-beta.1.tgz", + "integrity": "sha512-dewDGvwPjDsOlsAusXaoWJ92eNy8BF4YS8nYd3SJiEJKIv27vllDGMe4TN1SdBkKHbg0kvMffSrldPHcFQtRvQ==", "requires": { "express": "^4.17.1" } @@ -28091,22 +28097,12 @@ "dev": true }, "nocodb-sdk": { - "version": "file:../nocodb-sdk", + "version": "0.106.0-beta.1", + "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.106.0-beta.1.tgz", + "integrity": "sha512-ht/cNTHOLyQwqp8RF7YRixBVvyjv75CnqK3+roGJLIpKj1pE5UAewMNnSfR1gJj/vsHYLMP1TqxPNZXCL0VO3g==", "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 a548e478f6..d8e9526461 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -1,6 +1,6 @@ { "name": "nocodb", - "version": "0.106.0-beta.0", + "version": "0.106.0-beta.1", "description": "NocoDB Backend", "main": "dist/bundle.js", "author": { @@ -109,10 +109,10 @@ "mysql2": "^2.2.5", "nanoid": "^3.1.20", "nc-help": "0.2.87", - "nc-lib-gui": "0.106.0-beta.0", + "nc-lib-gui": "0.106.0-beta.1", "nc-plugin": "0.1.2", "ncp": "^2.0.0", - "nocodb-sdk": "file:../nocodb-sdk", + "nocodb-sdk": "0.106.0-beta.1", "nodemailer": "^6.4.10", "object-hash": "^3.0.0", "os-locale": "^5.0.0", @@ -188,4 +188,4 @@ "prettier": { "singleQuote": true } -} +} \ No newline at end of file From 06b998cdff0223b2455eaab8550ceef794c9ac87 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Thu, 6 Apr 2023 17:56:15 +0800 Subject: [PATCH 22/27] chore: update sdk path --- 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 52bf677d15..4670e0d396 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.106.0-beta.1", + "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.106.0-beta.1", - "extraneous": true, "license": "AGPL-3.0-or-later", "dependencies": { "axios": "^0.21.1", @@ -8776,6 +8775,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", @@ -12294,21 +12294,8 @@ } }, "node_modules/nocodb-sdk": { - "version": "0.106.0-beta.1", - "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.106.0-beta.1.tgz", - "integrity": "sha512-ht/cNTHOLyQwqp8RF7YRixBVvyjv75CnqK3+roGJLIpKj1pE5UAewMNnSfR1gJj/vsHYLMP1TqxPNZXCL0VO3g==", - "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", @@ -24810,7 +24797,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", @@ -27360,22 +27348,22 @@ } }, "nocodb-sdk": { - "version": "0.106.0-beta.1", - "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.106.0-beta.1.tgz", - "integrity": "sha512-ht/cNTHOLyQwqp8RF7YRixBVvyjv75CnqK3+roGJLIpKj1pE5UAewMNnSfR1gJj/vsHYLMP1TqxPNZXCL0VO3g==", + "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 0e208de87a..847017b499 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.106.0-beta.1", + "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 56193280e4..49ccd0bb54 100644 --- a/packages/nocodb-sdk/package-lock.json +++ b/packages/nocodb-sdk/package-lock.json @@ -1,12 +1,12 @@ { "name": "nocodb-sdk", - "version": "0.106.0-beta.0", + "version": "0.106.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "nocodb-sdk", - "version": "0.106.0-beta.0", + "version": "0.106.0-beta.1", "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 6e12de2bcc..4df22008da 100644 --- a/packages/nocodb/package-lock.json +++ b/packages/nocodb/package-lock.json @@ -70,7 +70,7 @@ "nc-lib-gui": "0.106.0-beta.1", "nc-plugin": "0.1.2", "ncp": "^2.0.0", - "nocodb-sdk": "0.106.0-beta.1", + "nocodb-sdk": "file:../nocodb-sdk", "nodemailer": "^6.4.10", "object-hash": "^3.0.0", "os-locale": "^5.0.0", @@ -157,7 +157,6 @@ }, "../nocodb-sdk": { "version": "0.106.0-beta.1", - "extraneous": true, "license": "AGPL-3.0-or-later", "dependencies": { "axios": "^0.21.1", @@ -11392,13 +11391,8 @@ "dev": true }, "node_modules/nocodb-sdk": { - "version": "0.106.0-beta.1", - "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.106.0-beta.1.tgz", - "integrity": "sha512-ht/cNTHOLyQwqp8RF7YRixBVvyjv75CnqK3+roGJLIpKj1pE5UAewMNnSfR1gJj/vsHYLMP1TqxPNZXCL0VO3g==", - "dependencies": { - "axios": "^0.21.1", - "jsep": "^1.3.6" - } + "resolved": "../nocodb-sdk", + "link": true }, "node_modules/node-abort-controller": { "version": "3.0.1", @@ -28097,12 +28091,22 @@ "dev": true }, "nocodb-sdk": { - "version": "0.106.0-beta.1", - "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.106.0-beta.1.tgz", - "integrity": "sha512-ht/cNTHOLyQwqp8RF7YRixBVvyjv75CnqK3+roGJLIpKj1pE5UAewMNnSfR1gJj/vsHYLMP1TqxPNZXCL0VO3g==", + "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 d8e9526461..4411bf9395 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -112,7 +112,7 @@ "nc-lib-gui": "0.106.0-beta.1", "nc-plugin": "0.1.2", "ncp": "^2.0.0", - "nocodb-sdk": "0.106.0-beta.1", + "nocodb-sdk": "file:../nocodb-sdk", "nodemailer": "^6.4.10", "object-hash": "^3.0.0", "os-locale": "^5.0.0", @@ -188,4 +188,4 @@ "prettier": { "singleQuote": true } -} \ No newline at end of file +} From 6195f27d3956b788bbfa4d975220c2b062d37578 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Apr 2023 20:49:16 +0000 Subject: [PATCH 23/27] chore(deps): bump vm2 from 3.9.13 to 3.9.15 in /packages/nocodb Bumps [vm2](https://github.com/patriksimek/vm2) from 3.9.13 to 3.9.15. - [Release notes](https://github.com/patriksimek/vm2/releases) - [Changelog](https://github.com/patriksimek/vm2/blob/master/CHANGELOG.md) - [Commits](https://github.com/patriksimek/vm2/compare/3.9.13...3.9.15) --- updated-dependencies: - dependency-name: vm2 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- packages/nocodb/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json index 4df22008da..d3451937fe 100644 --- a/packages/nocodb/package-lock.json +++ b/packages/nocodb/package-lock.json @@ -17364,9 +17364,9 @@ "dev": true }, "node_modules/vm2": { - "version": "3.9.13", - "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.13.tgz", - "integrity": "sha512-0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q==", + "version": "3.9.15", + "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.15.tgz", + "integrity": "sha512-XqNqknHGw2avJo13gbIwLNZUumvrSHc9mLqoadFZTpo3KaNEJoe1I0lqTFhRXmXD7WkLyG01aaraXdXT0pa4ag==", "dependencies": { "acorn": "^8.7.0", "acorn-walk": "^8.2.0" @@ -32786,9 +32786,9 @@ "dev": true }, "vm2": { - "version": "3.9.13", - "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.13.tgz", - "integrity": "sha512-0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q==", + "version": "3.9.15", + "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.15.tgz", + "integrity": "sha512-XqNqknHGw2avJo13gbIwLNZUumvrSHc9mLqoadFZTpo3KaNEJoe1I0lqTFhRXmXD7WkLyG01aaraXdXT0pa4ag==", "requires": { "acorn": "^8.7.0", "acorn-walk": "^8.2.0" From 3f4a86d9cf5656e45251270e11fd8e3283f601dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 01:45:58 +0000 Subject: [PATCH 24/27] chore(deps): bump xml2js and @azure/ms-rest-js in /packages/nc-cli Bumps [xml2js](https://github.com/Leonidas-from-XIV/node-xml2js) and [@azure/ms-rest-js](https://github.com/Azure/ms-rest-js). These dependencies needed to be updated together. Updates `xml2js` from 0.4.23 to 0.5.0 - [Release notes](https://github.com/Leonidas-from-XIV/node-xml2js/releases) - [Commits](https://github.com/Leonidas-from-XIV/node-xml2js/commits/0.5.0) Updates `@azure/ms-rest-js` from 2.6.0 to 2.6.6 - [Release notes](https://github.com/Azure/ms-rest-js/releases) - [Changelog](https://github.com/Azure/ms-rest-js/blob/master/Changelog.md) - [Commits](https://github.com/Azure/ms-rest-js/commits) --- updated-dependencies: - dependency-name: xml2js dependency-type: indirect - dependency-name: "@azure/ms-rest-js" dependency-type: indirect ... Signed-off-by: dependabot[bot] --- packages/nc-cli/package-lock.json | 52 ++++++++++++++++++------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/packages/nc-cli/package-lock.json b/packages/nc-cli/package-lock.json index a8336438a0..8aea25408c 100644 --- a/packages/nc-cli/package-lock.json +++ b/packages/nc-cli/package-lock.json @@ -135,19 +135,19 @@ "integrity": "sha512-dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw==" }, "node_modules/@azure/ms-rest-js": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.0.tgz", - "integrity": "sha512-4C5FCtvEzWudblB+h92/TYYPiq7tuElX8icVYToxOdggnYqeec4Se14mjse5miInKtZahiFHdl8lZA/jziEc5g==", + "version": "2.6.6", + "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.6.tgz", + "integrity": "sha512-WYIda8VvrkZE68xHgOxUXvjThxNf1nnGPPe0rAljqK5HJHIZ12Pi3YhEDOn3Ge7UnwaaM3eFO0VtAy4nGVI27Q==", "dependencies": { "@azure/core-auth": "^1.1.4", "abort-controller": "^3.0.0", "form-data": "^2.5.0", - "node-fetch": "^2.6.0", + "node-fetch": "^2.6.7", "tough-cookie": "^3.0.1", "tslib": "^1.10.0", "tunnel": "0.0.6", "uuid": "^8.3.2", - "xml2js": "^0.4.19" + "xml2js": "^0.5.0" } }, "node_modules/@azure/ms-rest-js/node_modules/tslib": { @@ -9692,14 +9692,22 @@ "dev": true }, "node_modules/node-fetch": { - "version": "2.6.6", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz", - "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==", + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz", + "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==", "dependencies": { "whatwg-url": "^5.0.0" }, "engines": { "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } } }, "node_modules/node-releases": { @@ -15416,9 +15424,9 @@ } }, "node_modules/xml2js": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz", - "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz", + "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==", "dependencies": { "sax": ">=0.6.0", "xmlbuilder": "~11.0.0" @@ -15576,19 +15584,19 @@ "integrity": "sha512-dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw==" }, "@azure/ms-rest-js": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.0.tgz", - "integrity": "sha512-4C5FCtvEzWudblB+h92/TYYPiq7tuElX8icVYToxOdggnYqeec4Se14mjse5miInKtZahiFHdl8lZA/jziEc5g==", + "version": "2.6.6", + "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.6.tgz", + "integrity": "sha512-WYIda8VvrkZE68xHgOxUXvjThxNf1nnGPPe0rAljqK5HJHIZ12Pi3YhEDOn3Ge7UnwaaM3eFO0VtAy4nGVI27Q==", "requires": { "@azure/core-auth": "^1.1.4", "abort-controller": "^3.0.0", "form-data": "^2.5.0", - "node-fetch": "^2.6.0", + "node-fetch": "^2.6.7", "tough-cookie": "^3.0.1", "tslib": "^1.10.0", "tunnel": "0.0.6", "uuid": "^8.3.2", - "xml2js": "^0.4.19" + "xml2js": "^0.5.0" }, "dependencies": { "tslib": { @@ -22944,9 +22952,9 @@ "dev": true }, "node-fetch": { - "version": "2.6.6", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz", - "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==", + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz", + "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==", "requires": { "whatwg-url": "^5.0.0" } @@ -27284,9 +27292,9 @@ } }, "xml2js": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz", - "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz", + "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==", "requires": { "sax": ">=0.6.0", "xmlbuilder": "~11.0.0" From 1fc630de9154cceb7f3f6a4ebfdf3f49c02f4853 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Tue, 11 Apr 2023 12:19:12 +0800 Subject: [PATCH 25/27] docs: remove unused travis build badge --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 70341b9a19..54cc834d69 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,6 @@ Turns any MySQL, PostgreSQL, SQL Server, SQLite & MariaDB into a smart spreadshe
-[![Build Status](https://travis-ci.org/dwyl/esta.svg?branch=master)](https://travis-ci.com/github/NocoDB/NocoDB) [![Node version](https://img.shields.io/badge/node-%3E%3D%2016.14.0-brightgreen)](http://nodejs.org/download/) [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-green.svg)](https://conventionalcommits.org) From 0f8d3bb63c312fc0311af0423d4d3b67bc66c51b Mon Sep 17 00:00:00 2001 From: wingkwong Date: Tue, 11 Apr 2023 08:58:03 +0000 Subject: [PATCH 26/27] [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 4670e0d396..af400226bb 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.106.0", "papaparse": "^5.3.2", "pinia": "^2.0.33", "qrcode": "^1.5.1", @@ -110,7 +110,8 @@ } }, "../nocodb-sdk": { - "version": "0.106.0-beta.1", + "version": "0.106.0", + "extraneous": true, "license": "AGPL-3.0-or-later", "dependencies": { "axios": "^0.21.1", @@ -8775,7 +8776,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", @@ -12294,8 +12294,21 @@ } }, "node_modules/nocodb-sdk": { - "resolved": "../nocodb-sdk", - "link": true + "version": "0.106.0", + "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.106.0.tgz", + "integrity": "sha512-1LkBv+qX1P8PxEDvqvgfM70lqjEgD6k0VX7wWLYcllBeMSI7I276FaV+yF/al5C4vONQhs7LqrAIhaqav9EZgg==", + "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", @@ -24797,8 +24810,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", @@ -27348,22 +27360,22 @@ } }, "nocodb-sdk": { - "version": "file:../nocodb-sdk", + "version": "0.106.0", + "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.106.0.tgz", + "integrity": "sha512-1LkBv+qX1P8PxEDvqvgfM70lqjEgD6k0VX7wWLYcllBeMSI7I276FaV+yF/al5C4vONQhs7LqrAIhaqav9EZgg==", "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 847017b499..c10f767911 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.106.0", "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 8271dd57aa..77f00b9a2b 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.106.0-beta.1", + "version": "0.106.0", "description": "NocoDB GUI", "author": { "name": "NocoDB", diff --git a/packages/nocodb-sdk/package.json b/packages/nocodb-sdk/package.json index 3bffeb19d7..bbbc59a37d 100644 --- a/packages/nocodb-sdk/package.json +++ b/packages/nocodb-sdk/package.json @@ -1,6 +1,6 @@ { "name": "nocodb-sdk", - "version": "0.106.0-beta.1", + "version": "0.106.0", "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 d3451937fe..507794399f 100644 --- a/packages/nocodb/package-lock.json +++ b/packages/nocodb/package-lock.json @@ -1,12 +1,12 @@ { "name": "nocodb", - "version": "0.106.0-beta.1", + "version": "0.106.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "nocodb", - "version": "0.106.0-beta.1", + "version": "0.106.0", "license": "AGPL-3.0-or-later", "dependencies": { "@google-cloud/storage": "^5.7.2", @@ -67,10 +67,10 @@ "mysql2": "^2.2.5", "nanoid": "^3.1.20", "nc-help": "0.2.87", - "nc-lib-gui": "0.106.0-beta.1", + "nc-lib-gui": "0.106.0", "nc-plugin": "0.1.2", "ncp": "^2.0.0", - "nocodb-sdk": "file:../nocodb-sdk", + "nocodb-sdk": "0.106.0", "nodemailer": "^6.4.10", "object-hash": "^3.0.0", "os-locale": "^5.0.0", @@ -156,7 +156,8 @@ } }, "../nocodb-sdk": { - "version": "0.106.0-beta.1", + "version": "0.106.0", + "extraneous": true, "license": "AGPL-3.0-or-later", "dependencies": { "axios": "^0.21.1", @@ -11330,9 +11331,9 @@ } }, "node_modules/nc-lib-gui": { - "version": "0.106.0-beta.1", - "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.106.0-beta.1.tgz", - "integrity": "sha512-dewDGvwPjDsOlsAusXaoWJ92eNy8BF4YS8nYd3SJiEJKIv27vllDGMe4TN1SdBkKHbg0kvMffSrldPHcFQtRvQ==", + "version": "0.106.0", + "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.106.0.tgz", + "integrity": "sha512-BZDheNWKi+iKo5MfOKaxmYT6piNQ3K6SgrH3lH5PhTGzjN9dM+xs0Y+Wgo8r8rjNQj6pNEB17IuMZK3amCntxQ==", "dependencies": { "express": "^4.17.1" } @@ -11391,8 +11392,13 @@ "dev": true }, "node_modules/nocodb-sdk": { - "resolved": "../nocodb-sdk", - "link": true + "version": "0.106.0", + "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.106.0.tgz", + "integrity": "sha512-1LkBv+qX1P8PxEDvqvgfM70lqjEgD6k0VX7wWLYcllBeMSI7I276FaV+yF/al5C4vONQhs7LqrAIhaqav9EZgg==", + "dependencies": { + "axios": "^0.21.1", + "jsep": "^1.3.6" + } }, "node_modules/node-abort-controller": { "version": "3.0.1", @@ -28042,9 +28048,9 @@ } }, "nc-lib-gui": { - "version": "0.106.0-beta.1", - "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.106.0-beta.1.tgz", - "integrity": "sha512-dewDGvwPjDsOlsAusXaoWJ92eNy8BF4YS8nYd3SJiEJKIv27vllDGMe4TN1SdBkKHbg0kvMffSrldPHcFQtRvQ==", + "version": "0.106.0", + "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.106.0.tgz", + "integrity": "sha512-BZDheNWKi+iKo5MfOKaxmYT6piNQ3K6SgrH3lH5PhTGzjN9dM+xs0Y+Wgo8r8rjNQj6pNEB17IuMZK3amCntxQ==", "requires": { "express": "^4.17.1" } @@ -28091,22 +28097,12 @@ "dev": true }, "nocodb-sdk": { - "version": "file:../nocodb-sdk", + "version": "0.106.0", + "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.106.0.tgz", + "integrity": "sha512-1LkBv+qX1P8PxEDvqvgfM70lqjEgD6k0VX7wWLYcllBeMSI7I276FaV+yF/al5C4vONQhs7LqrAIhaqav9EZgg==", "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 4411bf9395..ebd9b591cb 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -1,6 +1,6 @@ { "name": "nocodb", - "version": "0.106.0-beta.1", + "version": "0.106.0", "description": "NocoDB Backend", "main": "dist/bundle.js", "author": { @@ -109,10 +109,10 @@ "mysql2": "^2.2.5", "nanoid": "^3.1.20", "nc-help": "0.2.87", - "nc-lib-gui": "0.106.0-beta.1", + "nc-lib-gui": "0.106.0", "nc-plugin": "0.1.2", "ncp": "^2.0.0", - "nocodb-sdk": "file:../nocodb-sdk", + "nocodb-sdk": "0.106.0", "nodemailer": "^6.4.10", "object-hash": "^3.0.0", "os-locale": "^5.0.0", @@ -188,4 +188,4 @@ "prettier": { "singleQuote": true } -} +} \ No newline at end of file From cda6ed22642b18dcf02f87949506ce899b10a832 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Tue, 11 Apr 2023 17:32:37 +0800 Subject: [PATCH 27/27] chore: update sdk path --- 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 af400226bb..5e1f791771 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.106.0", + "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.106.0", - "extraneous": true, "license": "AGPL-3.0-or-later", "dependencies": { "axios": "^0.21.1", @@ -8776,6 +8775,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", @@ -12294,21 +12294,8 @@ } }, "node_modules/nocodb-sdk": { - "version": "0.106.0", - "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.106.0.tgz", - "integrity": "sha512-1LkBv+qX1P8PxEDvqvgfM70lqjEgD6k0VX7wWLYcllBeMSI7I276FaV+yF/al5C4vONQhs7LqrAIhaqav9EZgg==", - "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", @@ -24810,7 +24797,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", @@ -27360,22 +27348,22 @@ } }, "nocodb-sdk": { - "version": "0.106.0", - "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.106.0.tgz", - "integrity": "sha512-1LkBv+qX1P8PxEDvqvgfM70lqjEgD6k0VX7wWLYcllBeMSI7I276FaV+yF/al5C4vONQhs7LqrAIhaqav9EZgg==", + "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 c10f767911..847017b499 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.106.0", + "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 49ccd0bb54..fd8dd25b31 100644 --- a/packages/nocodb-sdk/package-lock.json +++ b/packages/nocodb-sdk/package-lock.json @@ -1,12 +1,12 @@ { "name": "nocodb-sdk", - "version": "0.106.0-beta.1", + "version": "0.106.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "nocodb-sdk", - "version": "0.106.0-beta.1", + "version": "0.106.0", "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 507794399f..03e968567c 100644 --- a/packages/nocodb/package-lock.json +++ b/packages/nocodb/package-lock.json @@ -70,7 +70,7 @@ "nc-lib-gui": "0.106.0", "nc-plugin": "0.1.2", "ncp": "^2.0.0", - "nocodb-sdk": "0.106.0", + "nocodb-sdk": "file:../nocodb-sdk", "nodemailer": "^6.4.10", "object-hash": "^3.0.0", "os-locale": "^5.0.0", @@ -157,7 +157,6 @@ }, "../nocodb-sdk": { "version": "0.106.0", - "extraneous": true, "license": "AGPL-3.0-or-later", "dependencies": { "axios": "^0.21.1", @@ -11392,13 +11391,8 @@ "dev": true }, "node_modules/nocodb-sdk": { - "version": "0.106.0", - "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.106.0.tgz", - "integrity": "sha512-1LkBv+qX1P8PxEDvqvgfM70lqjEgD6k0VX7wWLYcllBeMSI7I276FaV+yF/al5C4vONQhs7LqrAIhaqav9EZgg==", - "dependencies": { - "axios": "^0.21.1", - "jsep": "^1.3.6" - } + "resolved": "../nocodb-sdk", + "link": true }, "node_modules/node-abort-controller": { "version": "3.0.1", @@ -28097,12 +28091,22 @@ "dev": true }, "nocodb-sdk": { - "version": "0.106.0", - "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.106.0.tgz", - "integrity": "sha512-1LkBv+qX1P8PxEDvqvgfM70lqjEgD6k0VX7wWLYcllBeMSI7I276FaV+yF/al5C4vONQhs7LqrAIhaqav9EZgg==", + "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 ebd9b591cb..b9e5dee05b 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -112,7 +112,7 @@ "nc-lib-gui": "0.106.0", "nc-plugin": "0.1.2", "ncp": "^2.0.0", - "nocodb-sdk": "0.106.0", + "nocodb-sdk": "file:../nocodb-sdk", "nodemailer": "^6.4.10", "object-hash": "^3.0.0", "os-locale": "^5.0.0", @@ -188,4 +188,4 @@ "prettier": { "singleQuote": true } -} \ No newline at end of file +}