From 3d232572b6eeb8cc58b3cf4d614a7a0f55a24893 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 31 Mar 2022 13:19:24 +0300
Subject: [PATCH] fix: hotfix reverting breaking changes -changed variable name
 to _ignoreWebhook -if _ignoreWebhook not present fire the webhook as intended

---
 packages/nc-gui/plugins/ncApis/gqlApi.js         | 2 +-
 packages/nc-gui/plugins/ncApis/restApi.js        | 2 +-
 packages/nocodb/src/lib/noco/common/BaseModel.ts | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

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<T extends BaseApiBuilder<any>> extends BaseModelSql {
   public async beforeUpdate(data: any, _trx: any, req): Promise<void> {
     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<void> {
@@ -74,7 +74,7 @@ class BaseModel<T extends BaseApiBuilder<any>> 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) {