diff --git a/packages/nc-gui/plugins/ncApis/gqlApi.js b/packages/nc-gui/plugins/ncApis/gqlApi.js index 3fa0fe28f5..66ebafeb06 100644 --- a/packages/nc-gui/plugins/ncApis/gqlApi.js +++ b/packages/nc-gui/plugins/ncApis/gqlApi.js @@ -184,7 +184,7 @@ export default class GqlApi { variables: { id, data }, - _cellSaved: cellSaved + _ignoreWebhook: !cellSaved }) const colName = Object.keys(data)[0] diff --git a/packages/nc-gui/plugins/ncApis/restApi.js b/packages/nc-gui/plugins/ncApis/restApi.js index 92efb64579..0d6dc09981 100644 --- a/packages/nc-gui/plugins/ncApis/restApi.js +++ b/packages/nc-gui/plugins/ncApis/restApi.js @@ -65,7 +65,7 @@ export default class RestApi { } async update(id, data, oldData, cellSaved = false) { - data._cellSaved = cellSaved + data._ignoreWebhook = !cellSaved const res = await this.$axios({ method: 'put', url: `/nc/${this.$ctx.projectId}/api/v1/${this.table}/${encodeURIComponent(id)}`, diff --git a/packages/nocodb/src/lib/noco/common/BaseModel.ts b/packages/nocodb/src/lib/noco/common/BaseModel.ts index d093843e6a..7ce7e5736a 100644 --- a/packages/nocodb/src/lib/noco/common/BaseModel.ts +++ b/packages/nocodb/src/lib/noco/common/BaseModel.ts @@ -49,7 +49,7 @@ class BaseModel> extends BaseModelSql { public async beforeUpdate(data: any, _trx: any, req): Promise { req = req || {}; req['oldData'] = await this.readByPk(req['params'].id); - if(req.body?._cellSaved) await this.handleHooks('before.update', data, req); + if(!req.body?._ignoreWebhook) await this.handleHooks('before.update', data, req); } public async afterUpdate(data: any, _trx: any, req): Promise { @@ -74,7 +74,7 @@ class BaseModel> extends BaseModelSql { user: req.user?.email } ) - if(req.body?._cellSaved) await this.handleHooks('after.update', data, req); + if(!req.body?._ignoreWebhook) await this.handleHooks('after.update', data, req); } private _updateAuditDescription(id, oldData: any, data: any) {