From fc1e07da39d76f9950a4e053ab9f196b190933f7 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 22 Mar 2023 23:55:48 +0800
Subject: [PATCH 001/161] refactor(nc-gui): change to multiple selection

---
 packages/nc-gui/components/webhook/Editor.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 2d46cc7726..a488a8d0d3 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -41,13 +41,13 @@ const meta = inject(MetaInj, ref())
 const useForm = Form.useForm
 
 const hook = reactive<
-  Omit<HookType, 'notification'> & { notification: Record<string, any>; eventOperation: string; condition: boolean }
+  Omit<HookType, 'notification'> & { notification: Record<string, any>; eventOperation?: string; condition: boolean }
 >({
   id: '',
   title: '',
   event: undefined,
   operation: undefined,
-  eventOperation: '',
+  eventOperation: undefined,
   notification: {
     type: 'URL',
     payload: {
@@ -496,6 +496,7 @@ onMounted(async () => {
           <a-form-item v-bind="validateInfos.eventOperation">
             <a-select
               v-model:value="hook.eventOperation"
+              mode="multiple"
               size="large"
               :placeholder="$t('general.event')"
               class="nc-text-field-hook-event"

From f01f515b7e40d6734ee0c171ffbb0bc8fdf54f05 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 14:13:31 +0800
Subject: [PATCH 002/161] refactor(nc-gui): remove payload body editor for url

---
 packages/nc-gui/components/webhook/Editor.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index a488a8d0d3..212090a08f 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -572,15 +572,6 @@ onMounted(async () => {
 
         <a-col :span="24">
           <a-tabs v-model:activeKey="urlTabKey" type="card" closeable="false" class="shadow-sm">
-            <a-tab-pane key="body" tab="Body">
-              <LazyMonacoEditor
-                v-model="hook.notification.payload.body"
-                disable-deep-compare
-                :validate="false"
-                class="min-h-60 max-h-80"
-              />
-            </a-tab-pane>
-
             <a-tab-pane key="params" tab="Params" force-render>
               <LazyApiClientParams v-model="hook.notification.payload.parameters" />
             </a-tab-pane>

From 5b91a97ac09cd58c53e04261a0509290d7762891 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 14:29:17 +0800
Subject: [PATCH 003/161] refactor(nc-gui): make it single select back

---
 packages/nc-gui/components/webhook/Editor.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 212090a08f..099e4cde13 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -496,7 +496,6 @@ onMounted(async () => {
           <a-form-item v-bind="validateInfos.eventOperation">
             <a-select
               v-model:value="hook.eventOperation"
-              mode="multiple"
               size="large"
               :placeholder="$t('general.event')"
               class="nc-text-field-hook-event"

From 3d5e2a53215a156b275f69fd318bf2991e40ea0f Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 14:33:35 +0800
Subject: [PATCH 004/161] refactor(nc-gui): remove unused info

---
 packages/nc-gui/components/webhook/Editor.vue | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 099e4cde13..ff68397dca 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -686,24 +686,6 @@ onMounted(async () => {
 
       <a-row>
         <a-col :span="24">
-          <div class="text-gray-600">
-            <em>Use context variable <strong>data</strong> to refer the record under consideration</em>
-
-            <a-tooltip bottom>
-              <template #title>
-                <span> <strong>data</strong> : Row data <br /> </span>
-              </template>
-              <MdiInformation class="ml-2" />
-            </a-tooltip>
-
-            <div class="mt-3">
-              <a href="https://docs.nocodb.com/developer-resources/webhooks/" target="_blank">
-                <!-- Document Reference -->
-                {{ $t('labels.docReference') }}
-              </a>
-            </div>
-          </div>
-
           <LazyWebhookTest
             ref="webhookTestRef"
             :hook="{

From 1c1c87eb3e9aad6b8d731ca035c8ec9177893498 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 14:33:59 +0800
Subject: [PATCH 005/161] refactor(nc-gui): show params tab by default

---
 packages/nc-gui/components/webhook/Editor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index ff68397dca..9625ec9b68 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -61,7 +61,7 @@ const hook = reactive<
   active: true,
 })
 
-const urlTabKey = ref('body')
+const urlTabKey = ref('params')
 
 const apps: Record<string, any> = ref()
 

From dbc07f09b274838c23da709acc75cc12e841fa3b Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 14:34:58 +0800
Subject: [PATCH 006/161] refactor(nc-gui): add some space below add param row
 button

---
 packages/nc-gui/components/api-client/Params.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/api-client/Params.vue b/packages/nc-gui/components/api-client/Params.vue
index b05c214509..0ba9b234a4 100644
--- a/packages/nc-gui/components/api-client/Params.vue
+++ b/packages/nc-gui/components/api-client/Params.vue
@@ -66,7 +66,7 @@ const deleteParamRow = (i: number) => vModel.value.splice(i, 1)
 
         <tr>
           <td :colspan="12" class="text-center">
-            <a-button type="default" class="!bg-gray-100 rounded-md border-none mr-1" @click="addParamRow">
+            <a-button type="default" class="!bg-gray-100 rounded-md border-none mr-1 mb-3" @click="addParamRow">
               <template #icon>
                 <MdiPlus class="flex mx-auto" />
               </template>

From 52d48b1503696e4d3c6699e3cca4268e18107d2b Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 14:40:09 +0800
Subject: [PATCH 007/161] refactor(nc-gui): remove collapse block

---
 packages/nc-gui/components/webhook/Test.vue | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Test.vue b/packages/nc-gui/components/webhook/Test.vue
index 2f7ad98cd9..53ff9f41fb 100644
--- a/packages/nc-gui/components/webhook/Test.vue
+++ b/packages/nc-gui/components/webhook/Test.vue
@@ -17,7 +17,6 @@ const meta = inject(MetaInj, ref())
 const sampleData = ref({
   data: {},
 })
-const activeKey = ref(0)
 
 watch(
   () => hook?.operation,
@@ -59,9 +58,6 @@ onMounted(async () => {
 </script>
 
 <template>
-  <a-collapse v-model:activeKey="activeKey" ghost>
-    <a-collapse-panel key="1" header="Sample Payload">
-      <LazyMonacoEditor v-model="sampleData" class="min-h-60 max-h-80" />
-    </a-collapse-panel>
-  </a-collapse>
+  <div class="mb-4 font-weight-medium">Sample Payload</div>
+  <LazyMonacoEditor v-model="sampleData" class="min-h-60 max-h-80" />
 </template>

From 30e5da661d2ca18bbcdd6f7c36a473e6546ed5c3 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 16:51:31 +0800
Subject: [PATCH 008/161] refactor(nocodb): remove duplicate code

---
 .../src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts       | 3 ---
 1 file changed, 3 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 5d44e363c3..2d8e4b7d25 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
@@ -1560,9 +1560,6 @@ class BaseModelSqlv2 {
         await this.beforeInsert(insertObj, trx, cookie);
       }
 
-      // if ('beforeInsert' in this) {
-      //   await this.beforeInsert(insertObj, trx, cookie);
-      // }
       await this.model.getColumns();
       let response;
       // const driver = trx ? trx : this.dbDriver;

From 3e1feedffd79ad19a20864c343f1cf312eaf7517 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 18:05:52 +0800
Subject: [PATCH 009/161] feat(nocodb): include view as well

---
 .../nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 2d8e4b7d25..31c40cbaae 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
@@ -2325,7 +2325,7 @@ class BaseModelSqlv2 {
       });
       for (const hook of hooks) {
         if (hook.active) {
-          invokeWebhook(hook, this.model, data, req?.user);
+          invokeWebhook(hook, this.model, view, data, req?.user);
         }
       }
     } catch (e) {

From 5cbe7c5f335a61d9528fa6c676e788fedec80448 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 18:06:07 +0800
Subject: [PATCH 010/161] feat(nocodb): add constructWebHookData

---
 .../src/lib/meta/helpers/webhookHelpers.ts    | 43 +++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index a80ac3efd3..3b85830b14 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -1,10 +1,11 @@
 import Handlebars from 'handlebars';
 import Filter from '../../models/Filter';
+import Model from '../../models/Model';
+import View from '../../models/View';
+import Hook from '../../models/Hook';
 import HookLog from '../../models/HookLog';
 import NcPluginMgrv2 from './NcPluginMgrv2';
-import type Model from '../../models/Model';
 import type Column from '../../models/Column';
-import type Hook from '../../models/Hook';
 import type { HookLogType } from 'nocodb-sdk';
 import type FormView from '../../models/FormView';
 
@@ -133,13 +134,35 @@ export async function validateCondition(filters: Filter[], data: any) {
   return isValid;
 }
 
-export async function handleHttpWebHook(apiMeta, user, data) {
-  // try {
+export function constructWebHookData(hook, model, view, data) {
+  // extend in the future - currently only support records
+  const scope = 'records';
+
+  return {
+    type: `${scope}.${hook.event}.${hook.operation}`,
+    id: 'TBC',
+    data: {
+      table_id: model.id,
+      table_name: model.title,
+      view_id: view.id,
+      view_name: view.title,
+      rows: [data],
+    },
+  };
+}
+
+export async function handleHttpWebHook(
+  hook,
+  model,
+  view,
+  apiMeta,
+  user,
+  data
+) {
+  data = constructWebHookData(hook, model, view, data);
+  console.log(data);
   const req = axiosRequestMake(apiMeta, user, data);
   await require('axios')(req);
-  // } catch (e) {
-  //   console.log(e);
-  // }
 }
 
 export function axiosRequestMake(_apiMeta, _user, data) {
@@ -203,7 +226,8 @@ export function axiosRequestMake(_apiMeta, _user, data) {
 
 export async function invokeWebhook(
   hook: Hook,
-  _model: Model,
+  model: Model,
+  view: View,
   data,
   user,
   testFilters = null,
@@ -251,6 +275,9 @@ export async function invokeWebhook(
       case 'URL':
         {
           const res = await handleHttpWebHook(
+            hook,
+            model,
+            view,
             notification?.payload,
             user,
             data

From ee001d9ac9c63952985d575dfd06572e2058449d Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 18:21:07 +0800
Subject: [PATCH 011/161] feat(nocodb): pass prevData to hooks

---
 .../sql-data-mapper/lib/sql/BaseModelSqlv2.ts | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 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 31c40cbaae..65d579e676 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
@@ -1696,15 +1696,17 @@ class BaseModelSqlv2 {
 
       await this.beforeUpdate(data, trx, cookie);
 
+      const prevData = await this.readByPk(id);
+
       const query = this.dbDriver(this.tnPath)
         .update(updateObj)
         .where(await this._wherePk(id));
 
       await this.execAndParse(query);
 
-      const response = await this.readByPk(id);
-      await this.afterUpdate(response, trx, cookie);
-      return response;
+      const newData = await this.readByPk(id);
+      await this.afterUpdate(prevData, newData, trx, cookie);
+      return newData;
     } catch (e) {
       console.log(e);
       await this.errorUpdate(e, data, trx, cookie);
@@ -2122,11 +2124,11 @@ class BaseModelSqlv2 {
    * */
 
   public async beforeInsert(data: any, _trx: any, req): Promise<void> {
-    await this.handleHooks('Before.insert', data, req);
+    await this.handleHooks('Before.insert', null, data, req);
   }
 
   public async afterInsert(data: any, _trx: any, req): Promise<void> {
-    await this.handleHooks('After.insert', data, req);
+    await this.handleHooks('After.insert', null, data, req);
     // if (req?.headers?.['xc-gui']) {
     const id = this._extractPksValues(data);
     await Audit.insert({
@@ -2194,12 +2196,18 @@ class BaseModelSqlv2 {
       }
     }
     if (ignoreWebhook === undefined || ignoreWebhook === 'false') {
-      await this.handleHooks('Before.update', data, req);
+      await this.handleHooks('Before.update', null, data, req);
     }
   }
 
-  public async afterUpdate(data: any, _trx: any, req): Promise<void> {
-    const id = this._extractPksValues(data);
+  public async afterUpdate(
+    prevData: any,
+    newData: any,
+    _trx: any,
+    req
+  ): Promise<void> {
+    const id = this._extractPksValues(newData);
+
     await Audit.insert({
       fk_model_id: this.model.id,
       row_id: id,
@@ -2218,12 +2226,12 @@ class BaseModelSqlv2 {
       }
     }
     if (ignoreWebhook === undefined || ignoreWebhook === 'false') {
-      await this.handleHooks('After.update', data, req);
+      await this.handleHooks('After.update', prevData, newData, req);
     }
   }
 
   public async beforeDelete(data: any, _trx: any, req): Promise<void> {
-    await this.handleHooks('Before.delete', data, req);
+    await this.handleHooks('Before.delete', null, data, req);
   }
 
   public async afterDelete(data: any, _trx: any, req): Promise<void> {
@@ -2240,10 +2248,10 @@ class BaseModelSqlv2 {
       user: req?.user?.email,
     });
     // }
-    await this.handleHooks('After.delete', data, req);
+    await this.handleHooks('After.delete', null, data, req);
   }
 
-  private async handleHooks(hookName, data, req): Promise<void> {
+  private async handleHooks(hookName, prevData, newData, req): Promise<void> {
     const view = await View.get(this.viewId);
 
     // handle form view data submission
@@ -2297,7 +2305,7 @@ class BaseModelSqlv2 {
           .map((a) => a[0]);
         if (emails?.length) {
           const transformedData = _transformSubmittedFormDataForEmail(
-            data,
+            newData,
             formView,
             filteredColumns
           );
@@ -2325,7 +2333,7 @@ class BaseModelSqlv2 {
       });
       for (const hook of hooks) {
         if (hook.active) {
-          invokeWebhook(hook, this.model, view, data, req?.user);
+          invokeWebhook(hook, this.model, view, prevData, newData, req?.user);
         }
       }
     } catch (e) {

From 2cfe3164200308b4559906627333c7551db23dac Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 18:21:33 +0800
Subject: [PATCH 012/161] feat(nocodb): enrich previous_rows if provided

---
 .../src/lib/meta/helpers/webhookHelpers.ts    | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index 3b85830b14..316e13139c 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -1,10 +1,10 @@
 import Handlebars from 'handlebars';
 import Filter from '../../models/Filter';
-import Model from '../../models/Model';
-import View from '../../models/View';
-import Hook from '../../models/Hook';
 import HookLog from '../../models/HookLog';
 import NcPluginMgrv2 from './NcPluginMgrv2';
+import type Model from '../../models/Model';
+import type View from '../../models/View';
+import type Hook from '../../models/Hook';
 import type Column from '../../models/Column';
 import type { HookLogType } from 'nocodb-sdk';
 import type FormView from '../../models/FormView';
@@ -134,7 +134,7 @@ export async function validateCondition(filters: Filter[], data: any) {
   return isValid;
 }
 
-export function constructWebHookData(hook, model, view, data) {
+export function constructWebHookData(hook, model, view, prevData, newData) {
   // extend in the future - currently only support records
   const scope = 'records';
 
@@ -146,7 +146,8 @@ export function constructWebHookData(hook, model, view, data) {
       table_name: model.title,
       view_id: view.id,
       view_name: view.title,
-      rows: [data],
+      ...(prevData && { previous_rows: prevData }),
+      rows: [newData],
     },
   };
 }
@@ -157,11 +158,14 @@ export async function handleHttpWebHook(
   view,
   apiMeta,
   user,
-  data
+  prevData,
+  newData
 ) {
-  data = constructWebHookData(hook, model, view, data);
-  console.log(data);
-  const req = axiosRequestMake(apiMeta, user, data);
+  const req = axiosRequestMake(
+    apiMeta,
+    user,
+    constructWebHookData(hook, model, view, prevData, newData)
+  );
   await require('axios')(req);
 }
 
@@ -228,7 +232,8 @@ export async function invokeWebhook(
   hook: Hook,
   model: Model,
   view: View,
-  data,
+  prevData,
+  newData,
   user,
   testFilters = null,
   throwErrorOnFailure = false
@@ -246,7 +251,7 @@ export async function invokeWebhook(
       if (
         !(await validateCondition(
           testFilters || (await hook.getFilters()),
-          data
+          newData
         ))
       ) {
         return;
@@ -259,9 +264,9 @@ export async function invokeWebhook(
           const res = await (
             await NcPluginMgrv2.emailAdapter()
           )?.mailSend({
-            to: parseBody(notification?.payload?.to, data),
-            subject: parseBody(notification?.payload?.subject, data),
-            html: parseBody(notification?.payload?.body, data),
+            to: parseBody(notification?.payload?.to, newData),
+            subject: parseBody(notification?.payload?.subject, newData),
+            html: parseBody(notification?.payload?.body, newData),
           });
           hookLog = {
             ...hook,
@@ -280,7 +285,8 @@ export async function invokeWebhook(
             view,
             notification?.payload,
             user,
-            data
+            prevData,
+            newData
           );
 
           hookLog = {
@@ -297,9 +303,11 @@ export async function invokeWebhook(
           const res = await (
             await NcPluginMgrv2.webhookNotificationAdapters(notification.type)
           ).sendMessage(
-            parseBody(notification?.payload?.body, data),
+            parseBody(notification?.payload?.body, newData),
             JSON.parse(JSON.stringify(notification?.payload), (_key, value) => {
-              return typeof value === 'string' ? parseBody(value, data) : value;
+              return typeof value === 'string'
+                ? parseBody(value, newData)
+                : value;
             })
           );
 

From 766189302ba08ad9453f3d8dbce0fdbd5175715b Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 19:15:23 +0800
Subject: [PATCH 013/161] fix(nocodb): typo and data position in delByPk

---
 .../src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts      | 4 ++--
 1 file changed, 2 insertions(+), 2 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 65d579e676..5f22b46809 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
@@ -1631,7 +1631,7 @@ class BaseModelSqlv2 {
 
   async delByPk(id, trx?, cookie?) {
     try {
-      // retrieve data for handling paramas in hook
+      // retrieve data for handling params in hook
       const data = await this.readByPk(id);
       await this.beforeDelete(id, trx, cookie);
       const response = await this.dbDriver(this.tnPath)
@@ -2248,7 +2248,7 @@ class BaseModelSqlv2 {
       user: req?.user?.email,
     });
     // }
-    await this.handleHooks('After.delete', null, data, req);
+    await this.handleHooks('After.delete', data, null, req);
   }
 
   private async handleHooks(hookName, prevData, newData, req): Promise<void> {

From 40470703fe1abdce21dc02b8e98f3532d6293370 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 19:15:35 +0800
Subject: [PATCH 014/161] feat(nocodb): enrich deleted_rows

---
 packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index 316e13139c..adfb1739ce 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -146,8 +146,12 @@ export function constructWebHookData(hook, model, view, prevData, newData) {
       table_name: model.title,
       view_id: view.id,
       view_name: view.title,
-      ...(prevData && { previous_rows: prevData }),
-      rows: [newData],
+      ...(prevData && {
+        [hook.operation === 'delete' ? 'deleted_rows' : 'previous_rows']: [
+          prevData,
+        ],
+      }),
+      ...(newData && { rows: [newData] }),
     },
   };
 }

From 316779b81076756936bb96020e6a55791a1f9c81 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 11:13:13 +0800
Subject: [PATCH 015/161] refactor(nc-gui): revise hook sample data structure

---
 packages/nc-gui/components/webhook/Test.vue | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Test.vue b/packages/nc-gui/components/webhook/Test.vue
index 53ff9f41fb..2bff4fafa1 100644
--- a/packages/nc-gui/components/webhook/Test.vue
+++ b/packages/nc-gui/components/webhook/Test.vue
@@ -14,9 +14,7 @@ const { $api } = useNuxtApp()
 
 const meta = inject(MetaInj, ref())
 
-const sampleData = ref({
-  data: {},
-})
+const sampleData = ref()
 
 watch(
   () => hook?.operation,
@@ -26,9 +24,7 @@ watch(
 )
 
 async function loadSampleData() {
-  sampleData.value = {
-    data: await $api.dbTableWebhook.samplePayloadGet(meta?.value?.id as string, hook?.operation || 'insert'),
-  }
+  sampleData.value = await $api.dbTableWebhook.samplePayloadGet(meta?.value?.id as string, hook?.operation || 'insert')
 }
 
 async function testWebhook() {

From 88948ca15fe1eee911e196cd56fe94a430df5450 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 11:58:31 +0800
Subject: [PATCH 016/161] refactor(nocodb): revise hook sample data structure

---
 .../lib/meta/helpers/populateSamplePayload.ts | 35 +++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts b/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
index 8167134b27..c92152a584 100644
--- a/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
+++ b/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
@@ -9,9 +9,10 @@ import type SelectOption from '../../models/SelectOption';
 export default async function populateSamplePayload(
   viewOrModel: View | Model,
   includeNested = false,
-  operation = 'insert'
+  operation = 'insert',
+  scope = 'records'
 ) {
-  const out = {};
+  const rows = {};
   let columns: Column[] = [];
   let model: Model;
   if (viewOrModel instanceof View) {
@@ -26,6 +27,18 @@ export default async function populateSamplePayload(
     model = viewOrModel;
   }
 
+  await model.getViews();
+
+  const samplePayload = {
+    type: `${scope}.after.${operation}`,
+    data: {
+      table_id: model.id,
+      table_name: model.title,
+      view_id: model.views[0].id,
+      view_name: model.views[0].title,
+    },
+  };
+
   for (const column of columns) {
     if (
       !includeNested &&
@@ -33,13 +46,23 @@ export default async function populateSamplePayload(
     )
       continue;
 
-    if (operation === 'delete' && model.primaryKey?.title !== column.title)
-      continue;
+    rows[column.title] = await getSampleColumnValue(column);
+  }
 
-    out[column.title] = await getSampleColumnValue(column);
+  let prevRows;
+  if (operation !== 'insert') {
+    prevRows = rows;
   }
 
-  return out;
+  samplePayload.data = {
+    ...samplePayload.data,
+    ...(prevRows && {
+      [operation === 'delete' ? 'deleted_rows' : 'previous_rows']: [prevRows],
+    }),
+    ...(operation !== 'delete' && rows && { rows: [rows] }),
+  };
+
+  return samplePayload;
 }
 
 async function getSampleColumnValue(column: Column): Promise<any> {

From 14f7f496fb8a4a0360773e8696b50e087e8e9d47 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 13:17:42 +0800
Subject: [PATCH 017/161] feat(nocodb): url hook for bulk operations

---
 .../src/lib/meta/helpers/webhookHelpers.ts    | 40 +++++++++++++++----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index adfb1739ce..c148f7f702 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -245,20 +245,44 @@ export async function invokeWebhook(
   let hookLog: HookLogType;
   const startTime = process.hrtime();
   try {
-    // for (const hook of hooks) {
     const notification =
       typeof hook.notification === 'string'
         ? JSON.parse(hook.notification)
         : hook.notification;
 
+    const isBulkOperation = Array.isArray(newData);
+
+    if (isBulkOperation && notification?.type !== 'URL') {
+      // only URL hook is supported for bulk operations
+      return;
+    }
+
     if (hook.condition) {
-      if (
-        !(await validateCondition(
-          testFilters || (await hook.getFilters()),
-          newData
-        ))
-      ) {
-        return;
+      if (isBulkOperation) {
+        const filteredData = [];
+        for (const data of newData) {
+          if (
+            await validateCondition(
+              testFilters || (await hook.getFilters()),
+              data
+            )
+          ) {
+            filteredData.push(data);
+          }
+          if (!filteredData.length) {
+            return;
+          }
+          newData = filteredData;
+        }
+      } else {
+        if (
+          !(await validateCondition(
+            testFilters || (await hook.getFilters()),
+            newData
+          ))
+        ) {
+          return;
+        }
       }
     }
 

From 7a25fc04c074607cbdb39e88171ef987b7609cbe Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 13:18:28 +0800
Subject: [PATCH 018/161] feat(nocodb): add handleHooks to afterBulkInsert

---
 .../src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 5f22b46809..9152b1fab8 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
@@ -1954,7 +1954,7 @@ class BaseModelSqlv2 {
               chunkSize
             );
 
-      await this.afterBulkInsert(insertDatas, this.dbDriver, cookie);
+      await this.afterBulkInsert(response, this.dbDriver, cookie);
 
       return response;
     } catch (e) {
@@ -2175,6 +2175,8 @@ class BaseModelSqlv2 {
   }
 
   public async afterBulkInsert(data: any[], _trx: any, req): Promise<void> {
+    await this.handleHooks('After.insert', null, data, req);
+
     await Audit.insert({
       fk_model_id: this.model.id,
       op_type: AuditOperationTypes.DATA,

From cadddebfbbbfe99208400d96b95fc04517ee9f68 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 13:39:34 +0800
Subject: [PATCH 019/161] feat(nocodb): add handleHooks to afterBulkUpdate

---
 .../db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 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 9152b1fab8..ac9de54b4d 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
@@ -1982,13 +1982,11 @@ class BaseModelSqlv2 {
           continue;
         }
         const wherePk = await this._wherePk(pkValues);
-        const response = await transaction(this.tnPath)
-          .update(d)
-          .where(wherePk);
-        res.push(response);
+        await transaction(this.tnPath).update(d).where(wherePk);
+        res.push(wherePk);
       }
 
-      await this.afterBulkUpdate(updateDatas.length, this.dbDriver, cookie);
+      await this.afterBulkUpdate(res, this.dbDriver, cookie);
       transaction.commit();
 
       return res;
@@ -2041,7 +2039,7 @@ class BaseModelSqlv2 {
       }
 
       const count = queryResponse ?? 0;
-      await this.afterBulkUpdate(count, this.dbDriver, cookie);
+      await this.afterBulkUpdate(queryResponse, this.dbDriver, cookie);
 
       return count;
     } catch (e) {
@@ -2146,13 +2144,15 @@ class BaseModelSqlv2 {
     // }
   }
 
-  public async afterBulkUpdate(count: number, _trx: any, req): Promise<void> {
+  public async afterBulkUpdate(data: any, _trx: any, req): Promise<void> {
+    await this.handleHooks('After.update', null, data, req);
+
     await Audit.insert({
       fk_model_id: this.model.id,
       op_type: AuditOperationTypes.DATA,
       op_sub_type: AuditOperationSubTypes.BULK_UPDATE,
       description: DOMPurify.sanitize(
-        `${count} records bulk updated in ${this.model.title}`
+        `${data.length} records bulk updated in ${this.model.title}`
       ),
       // details: JSON.stringify(data),
       ip: req?.clientIp,

From a6eb67b4bef698fd5d0e7a89d383ce441daa8fbf Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 14:03:23 +0800
Subject: [PATCH 020/161] refactor(nocodb): bulkUpdateAll logic

---
 .../db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 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 ac9de54b4d..5ee052ab85 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
@@ -2003,7 +2003,7 @@ class BaseModelSqlv2 {
     data,
     { cookie }: { cookie?: any } = {}
   ) {
-    let queryResponse;
+    let res = [];
     try {
       const updateData = await this.model.mapAliasToColumn(data);
       await this.validate(updateData);
@@ -2035,13 +2035,19 @@ class BaseModelSqlv2 {
         );
 
         qb.update(updateData);
-        queryResponse = (await qb) as any;
+
+        if (this.isPg || this.isMssql) {
+          qb.returning(
+            `${this.model.primaryKey.column_name} as ${this.model.primaryKey.title}`
+          );
+        }
+
+        res = (await qb) as any;
       }
 
-      const count = queryResponse ?? 0;
-      await this.afterBulkUpdate(queryResponse, this.dbDriver, cookie);
+      await this.afterBulkUpdate(res, this.dbDriver, cookie);
 
-      return count;
+      return res.length;
     } catch (e) {
       throw e;
     }

From 7c55bf900a3d6df4e9ebfc4dd752ae3b982ea73d Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 14:39:23 +0800
Subject: [PATCH 021/161] feat(nocodb): afterBulkDelete logic

---
 .../sql-data-mapper/lib/sql/BaseModelSqlv2.ts | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 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 5ee052ab85..ab4caaf1ef 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
@@ -2066,15 +2066,15 @@ class BaseModelSqlv2 {
       const res = [];
       for (const d of deleteIds) {
         if (Object.keys(d).length) {
-          const response = await transaction(this.tnPath).del().where(d);
-          res.push(response);
+          await transaction(this.tnPath).del().where(d);
+          res.push(d);
         }
       }
       // await this.afterDeleteb(res, transaction);
 
       transaction.commit();
 
-      await this.afterBulkDelete(ids.length, this.dbDriver, cookie);
+      await this.afterBulkDelete(res, this.dbDriver, cookie);
 
       return res;
     } catch (e) {
@@ -2112,7 +2112,15 @@ class BaseModelSqlv2 {
         qb,
         this.dbDriver
       );
+
       qb.del();
+
+      if (this.isPg || this.isMssql) {
+        qb.returning(
+          `${this.model.primaryKey.column_name} as ${this.model.primaryKey.title}`
+        );
+      }
+
       const count = (await qb) as any;
 
       await this.afterBulkDelete(count, this.dbDriver, cookie);
@@ -2166,13 +2174,15 @@ class BaseModelSqlv2 {
     });
   }
 
-  public async afterBulkDelete(count: number, _trx: any, req): Promise<void> {
+  public async afterBulkDelete(data: any, _trx: any, req): Promise<void> {
+    await this.handleHooks('After.delete', data, null, req);
+
     await Audit.insert({
       fk_model_id: this.model.id,
       op_type: AuditOperationTypes.DATA,
       op_sub_type: AuditOperationSubTypes.BULK_DELETE,
       description: DOMPurify.sanitize(
-        `${count} records bulk deleted in ${this.model.title}`
+        `${data.length} records bulk deleted in ${this.model.title}`
       ),
       // details: JSON.stringify(data),
       ip: req?.clientIp,

From f1d6f22a40a777a949fb410282e6aa34495fa3e3 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 16:50:15 +0800
Subject: [PATCH 022/161] refactor(nocodb): remove unnecessary comments

---
 .../sql-data-mapper/lib/sql/BaseModelSqlv2.ts | 23 +------------------
 1 file changed, 1 insertion(+), 22 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 ab4caaf1ef..4a51d42504 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
@@ -1890,21 +1890,14 @@ class BaseModelSqlv2 {
         rowId =
           response[this.model.primaryKey.title] ||
           response[this.model.primaryKey.column_name];
-      await Promise.all(postInsertOps.map((f) => f()));
 
-      // if (!trx) {
-      //   await driver.commit();
-      // }
+      await Promise.all(postInsertOps.map((f) => f()));
 
       await this.afterInsert(response, this.dbDriver, cookie);
 
       return response;
     } catch (e) {
       console.log(e);
-      // await this.errorInsert(e, data, trx, cookie);
-      // if (!trx) {
-      //   await driver.rollback(e);
-      // }
       throw e;
     }
   }
@@ -1932,11 +1925,6 @@ class BaseModelSqlv2 {
       for (const data of datas) {
         await this.validate(data);
       }
-      // let chunkSize = 50;
-      //
-      // if (this.isSqlite && datas[0]) {
-      //   chunkSize = Math.max(1, Math.floor(999 / Object.keys(datas[0]).length));
-      // }
 
       // fallbacks to `10` if database client is sqlite
       // to avoid `too many SQL variables` error
@@ -1992,8 +1980,6 @@ class BaseModelSqlv2 {
       return res;
     } catch (e) {
       if (transaction) transaction.rollback();
-      // console.log(e);
-      // await this.errorUpdateb(e, data, null);
       throw e;
     }
   }
@@ -2061,7 +2047,6 @@ class BaseModelSqlv2 {
       );
 
       transaction = await this.dbDriver.transaction();
-      // await this.beforeDeleteb(ids, transaction);
 
       const res = [];
       for (const d of deleteIds) {
@@ -2070,7 +2055,6 @@ class BaseModelSqlv2 {
           res.push(d);
         }
       }
-      // await this.afterDeleteb(res, transaction);
 
       transaction.commit();
 
@@ -2080,7 +2064,6 @@ class BaseModelSqlv2 {
     } catch (e) {
       if (transaction) transaction.rollback();
       console.log(e);
-      // await this.errorDeleteb(e, ids);
       throw e;
     }
   }
@@ -2141,7 +2124,6 @@ class BaseModelSqlv2 {
 
   public async afterInsert(data: any, _trx: any, req): Promise<void> {
     await this.handleHooks('After.insert', null, data, req);
-    // if (req?.headers?.['xc-gui']) {
     const id = this._extractPksValues(data);
     await Audit.insert({
       fk_model_id: this.model.id,
@@ -2155,7 +2137,6 @@ class BaseModelSqlv2 {
       ip: req?.clientIp,
       user: req?.user?.email,
     });
-    // }
   }
 
   public async afterBulkUpdate(data: any, _trx: any, req): Promise<void> {
@@ -2253,7 +2234,6 @@ class BaseModelSqlv2 {
   }
 
   public async afterDelete(data: any, _trx: any, req): Promise<void> {
-    // if (req?.headers?.['xc-gui']) {
     const id = req?.params?.id;
     await Audit.insert({
       fk_model_id: this.model.id,
@@ -2265,7 +2245,6 @@ class BaseModelSqlv2 {
       ip: req?.clientIp,
       user: req?.user?.email,
     });
-    // }
     await this.handleHooks('After.delete', data, null, req);
   }
 

From 9da494ff315b0d40a064cd4bfccf25335db0685e Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 17:21:53 +0800
Subject: [PATCH 023/161] feat(nocodb): nc_029_alter_hooklog_response_types

---
 .../src/lib/migrations/XcMigrationSourcev2.ts |  4 +++
 .../v2/nc_029_alter_hooklog_response_types.ts | 27 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 packages/nocodb/src/lib/migrations/v2/nc_029_alter_hooklog_response_types.ts

diff --git a/packages/nocodb/src/lib/migrations/XcMigrationSourcev2.ts b/packages/nocodb/src/lib/migrations/XcMigrationSourcev2.ts
index 239b89529a..c5d65a7100 100644
--- a/packages/nocodb/src/lib/migrations/XcMigrationSourcev2.ts
+++ b/packages/nocodb/src/lib/migrations/XcMigrationSourcev2.ts
@@ -16,6 +16,7 @@ import * as nc_025_add_row_height from './v2/nc_025_add_row_height';
 import * as nc_026_map_view from './v2/nc_026_map_view';
 import * as nc_027_add_comparison_sub_op from './v2/nc_027_add_comparison_sub_op';
 import * as nc_028_add_enable_scanner_in_form_columns_meta_table from './v2/nc_026_add_enable_scanner_in_form_columns_meta_table';
+import * as nc_029_alter_hooklog_response_types from './v2/nc_029_alter_hooklog_response_types';
 
 // Create a custom migration source class
 export default class XcMigrationSourcev2 {
@@ -43,6 +44,7 @@ export default class XcMigrationSourcev2 {
       'nc_026_map_view',
       'nc_027_add_comparison_sub_op',
       'nc_028_add_enable_scanner_in_form_columns_meta_table',
+      'nc_029_alter_hooklog_response_types',
     ]);
   }
 
@@ -88,6 +90,8 @@ export default class XcMigrationSourcev2 {
         return nc_027_add_comparison_sub_op;
       case 'nc_028_add_enable_scanner_in_form_columns_meta_table':
         return nc_028_add_enable_scanner_in_form_columns_meta_table;
+      case 'nc_029_alter_hooklog_response_types':
+        return nc_029_alter_hooklog_response_types;
     }
   }
 }
diff --git a/packages/nocodb/src/lib/migrations/v2/nc_029_alter_hooklog_response_types.ts b/packages/nocodb/src/lib/migrations/v2/nc_029_alter_hooklog_response_types.ts
new file mode 100644
index 0000000000..3aaff5d397
--- /dev/null
+++ b/packages/nocodb/src/lib/migrations/v2/nc_029_alter_hooklog_response_types.ts
@@ -0,0 +1,27 @@
+import { MetaTable } from '../../utils/globals';
+import type { Knex } from 'knex';
+
+const up = async (knex: Knex) => {
+  if (knex.client.config.client === 'mssql') {
+    await knex.schema.alterTable(MetaTable.HOOK_LOGS, (table) => {
+      table.dropColumn('response');
+    });
+    await knex.schema.alterTable(MetaTable.HOOK_LOGS, (table) => {
+      table.text('response');
+    });
+  } else if (knex.client.config.client !== 'sqlite3') {
+    await knex.schema.alterTable(MetaTable.HOOK_LOGS, (table) => {
+      table.text('response').alter();
+    });
+  }
+};
+
+const down = async (knex) => {
+  if (knex.client.config.client !== 'sqlite3') {
+    await knex.schema.alterTable(MetaTable.HOOK_LOGS, (table) => {
+      table.boolean('response').alter();
+    });
+  }
+};
+
+export { up, down };

From 1932b01af382477cfd543632e0493282b5ebedeb Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 17:27:44 +0800
Subject: [PATCH 024/161] fix(nocodb): hook response in hook log

---
 .../nocodb/src/lib/meta/helpers/webhookHelpers.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index c148f7f702..6d41599e3c 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -170,7 +170,7 @@ export async function handleHttpWebHook(
     user,
     constructWebHookData(hook, model, view, prevData, newData)
   );
-  await require('axios')(req);
+  return require('axios')(req);
 }
 
 export function axiosRequestMake(_apiMeta, _user, data) {
@@ -321,7 +321,18 @@ export async function invokeWebhook(
             ...hook,
             type: notification.type,
             payload: JSON.stringify(notification?.payload),
-            response: JSON.stringify(res),
+            response: JSON.stringify({
+              status: res.status,
+              statusText: res.statusText,
+              headers: res.headers,
+              config: {
+                url: res.config.url,
+                method: res.config.method,
+                data: res.config.data,
+                headers: res.config.headers,
+                params: res.config.params,
+              },
+            }),
             triggered_by: user?.email,
           };
         }

From c7a300217023d6e3080a309784801cf7e6cd0c77 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 18:26:05 +0800
Subject: [PATCH 025/161] feat(nocodb): include fk_hook_id in hook log

---
 packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index 6d41599e3c..e982233841 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -319,6 +319,7 @@ export async function invokeWebhook(
 
           hookLog = {
             ...hook,
+            fk_hook_id: hook.id,
             type: notification.type,
             payload: JSON.stringify(notification?.payload),
             response: JSON.stringify({
@@ -352,6 +353,7 @@ export async function invokeWebhook(
 
           hookLog = {
             ...hook,
+            fk_hook_id: hook.id,
             type: notification.type,
             payload: JSON.stringify(notification?.payload),
             response: JSON.stringify(res),

From 4b10d700d8f89bab4e74849639d883b4265a3d7a Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 18:26:18 +0800
Subject: [PATCH 026/161] feat(nocodb): use hkl as prefix for hook_logs

---
 packages/nocodb/src/lib/meta/NcMetaIOImpl.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/nocodb/src/lib/meta/NcMetaIOImpl.ts b/packages/nocodb/src/lib/meta/NcMetaIOImpl.ts
index 31000760c6..b04157a088 100644
--- a/packages/nocodb/src/lib/meta/NcMetaIOImpl.ts
+++ b/packages/nocodb/src/lib/meta/NcMetaIOImpl.ts
@@ -855,6 +855,9 @@ export default class NcMetaIOImpl extends NcMetaIO {
       case MetaTable.HOOKS:
         prefix = 'hk_';
         break;
+      case MetaTable.HOOK_LOGS:
+        prefix = 'hkl_';
+        break;
       case MetaTable.AUDIT:
         prefix = 'adt_';
         break;

From fab502479dfa1c2abff23cf03e099e5fc630ab9e Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 18:44:51 +0800
Subject: [PATCH 027/161] feat(nc-gui): MdiHistory

---
 packages/nc-gui/components.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts
index 7c5b61f85e..409d580112 100644
--- a/packages/nc-gui/components.d.ts
+++ b/packages/nc-gui/components.d.ts
@@ -193,6 +193,7 @@ declare module '@vue/runtime-core' {
     MdiGpsFixed: typeof import('~icons/mdi/gps-fixed')['default']
     MdiGraphOutline: typeof import('~icons/mdi/graph-outline')['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']

From 1ce979f2d899c913e355af5b7dab47b12c91b0db Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 18:46:03 +0800
Subject: [PATCH 028/161] feat(nc-gui): include LazyWebhookCallLog component

---
 packages/nc-gui/components/webhook/Editor.vue | 500 +++++++++---------
 1 file changed, 261 insertions(+), 239 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 9625ec9b68..4d61f0da5a 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -38,6 +38,8 @@ const { appInfo } = $(useGlobal())
 
 const meta = inject(MetaInj, ref())
 
+const hookTabKey = ref('hook-edit')
+
 const useForm = Form.useForm
 
 const hook = reactive<
@@ -461,243 +463,263 @@ onMounted(async () => {
 
   <a-divider />
 
-  <a-form :model="hook" name="create-or-edit-webhook">
-    <a-form-item>
-      <a-row type="flex">
-        <a-col :span="24">
-          <a-card>
-            <a-checkbox
-              :checked="Boolean(hook.active)"
-              class="nc-check-box-enable-webhook"
-              @update:checked="hook.active = $event"
-            >
-              {{ $t('activity.enableWebhook') }}
-            </a-checkbox>
-          </a-card>
-        </a-col>
-      </a-row>
-    </a-form-item>
-    <a-form-item>
-      <a-row type="flex">
-        <a-col :span="24">
-          <a-form-item v-bind="validateInfos.title">
-            <a-input
-              v-model:value="hook.title"
-              size="large"
-              :placeholder="$t('general.title')"
-              class="nc-text-field-hook-title"
-            />
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-row type="flex" :gutter="[16, 16]">
-        <a-col :span="12">
-          <a-form-item v-bind="validateInfos.eventOperation">
-            <a-select
-              v-model:value="hook.eventOperation"
-              size="large"
-              :placeholder="$t('general.event')"
-              class="nc-text-field-hook-event"
-              dropdown-class-name="nc-dropdown-webhook-event"
-            >
-              <a-select-option v-for="(event, i) in eventList" :key="i" :value="event.value.join(' ')">
-                {{ event.text.join(' ') }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-
-        <a-col :span="12">
-          <a-form-item v-bind="validateInfos['notification.type']">
-            <a-select
-              v-model:value="hook.notification.type"
-              size="large"
-              class="nc-select-hook-notification-type"
-              :placeholder="$t('general.notification')"
-              dropdown-class-name="nc-dropdown-webhook-notification"
-              @change="onNotTypeChange(true)"
-            >
-              <a-select-option v-for="(notificationOption, i) in notificationList" :key="i" :value="notificationOption.type">
-                <div class="flex items-center">
-                  <MdiLink v-if="notificationOption.type === 'URL'" class="mr-2" />
-
-                  <MdiEmail v-if="notificationOption.type === 'Email'" class="mr-2" />
-
-                  <MdiSlack v-if="notificationOption.type === 'Slack'" class="mr-2" />
-
-                  <MdiMicrosoftTeams v-if="notificationOption.type === 'Microsoft Teams'" class="mr-2" />
-
-                  <MdiDiscord v-if="notificationOption.type === 'Discord'" class="mr-2" />
-
-                  <MdiChat v-if="notificationOption.type === 'Mattermost'" class="mr-2" />
-
-                  <MdiWhatsapp v-if="notificationOption.type === 'Whatsapp Twilio'" class="mr-2" />
-
-                  <MdiCellphoneMessage v-if="notificationOption.type === 'Twilio'" class="mr-2" />
-
-                  {{ notificationOption.type }}
-                </div>
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-row v-if="hook.notification.type === 'URL'" class="mb-5" type="flex" :gutter="[16, 0]">
-        <a-col :span="6">
-          <a-select
-            v-model:value="hook.notification.payload.method"
-            size="large"
-            class="nc-select-hook-url-method"
-            dropdown-class-name="nc-dropdown-hook-notification-url-method"
-          >
-            <a-select-option v-for="(method, i) in methodList" :key="i" :value="method.title">
-              {{ method.title }}
-            </a-select-option>
-          </a-select>
-        </a-col>
-
-        <a-col :span="18">
-          <a-form-item v-bind="validateInfos['notification.payload.path']">
-            <a-input
-              v-model:value="hook.notification.payload.path"
-              size="large"
-              placeholder="http://example.com"
-              class="nc-text-field-hook-url-path"
-            />
-          </a-form-item>
-        </a-col>
-
-        <a-col :span="24">
-          <a-tabs v-model:activeKey="urlTabKey" type="card" closeable="false" class="shadow-sm">
-            <a-tab-pane key="params" tab="Params" force-render>
-              <LazyApiClientParams v-model="hook.notification.payload.parameters" />
-            </a-tab-pane>
-
-            <a-tab-pane key="headers" tab="Headers" class="nc-tab-headers">
-              <LazyApiClientHeaders v-model="hook.notification.payload.headers" />
-            </a-tab-pane>
-
-            <!-- No in use at this moment -->
-            <!--            <a-tab-pane key="auth" tab="Auth"> -->
-            <!--              <LazyMonacoEditor v-model="hook.notification.payload.auth" class="min-h-60 max-h-80" /> -->
-
-            <!--              <span class="text-gray-500 prose-sm p-2"> -->
-            <!--                For more about auth option refer -->
-            <!--                <a class="prose-sm" href  ="https://github.com/axios/axios#request-config" target="_blank">axios docs</a>. -->
-            <!--              </span> -->
-            <!--            </a-tab-pane> -->
-          </a-tabs>
-        </a-col>
-      </a-row>
-
-      <a-row v-if="hook.notification.type === 'Slack'" type="flex">
-        <a-col :span="24">
-          <a-form-item v-bind="validateInfos['notification.channels']">
-            <LazyWebhookChannelMultiSelect
-              v-if="slackChannels.length > 0"
-              v-model="hook.notification.payload.channels"
-              :selected-channel-list="hook.notification.payload.channels"
-              :available-channel-list="slackChannels"
-              placeholder="Select Slack channels"
-            />
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-row v-if="hook.notification.type === 'Microsoft Teams'" type="flex">
-        <a-col :span="24">
-          <a-form-item v-bind="validateInfos['notification.channels']">
-            <LazyWebhookChannelMultiSelect
-              v-if="teamsChannels.length > 0"
-              v-model="hook.notification.payload.channels"
-              :selected-channel-list="hook.notification.payload.channels"
-              :available-channel-list="teamsChannels"
-              placeholder="Select Microsoft Teams channels"
-            />
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-row v-if="hook.notification.type === 'Discord'" type="flex">
-        <a-col :span="24">
-          <a-form-item v-bind="validateInfos['notification.channels']">
-            <LazyWebhookChannelMultiSelect
-              v-if="discordChannels.length > 0"
-              v-model="hook.notification.payload.channels"
-              :selected-channel-list="hook.notification.payload.channels"
-              :available-channel-list="discordChannels"
-              placeholder="Select Discord channels"
-            />
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-row v-if="hook.notification.type === 'Mattermost'" type="flex">
-        <a-col :span="24">
-          <a-form-item v-bind="validateInfos['notification.channels']">
-            <LazyWebhookChannelMultiSelect
-              v-if="mattermostChannels.length > 0"
-              v-model="hook.notification.payload.channels"
-              :selected-channel-list="hook.notification.payload.channels"
-              :available-channel-list="mattermostChannels"
-              placeholder="Select Mattermost channels"
-            />
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-row v-if="formInput[hook.notification.type] && hook.notification.payload" type="flex">
-        <a-col v-for="(input, i) in formInput[hook.notification.type]" :key="i" :span="24">
-          <a-form-item v-if="input.type === 'LongText'" v-bind="validateInfos[`notification.payload.${input.key}`]">
-            <a-textarea v-model:value="hook.notification.payload[input.key]" :placeholder="input.label" size="large" />
-          </a-form-item>
-
-          <a-form-item v-else v-bind="validateInfos[`notification.payload.${input.key}`]">
-            <a-input v-model:value="hook.notification.payload[input.key]" :placeholder="input.label" size="large" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-row class="mb-5" type="flex">
-        <a-col :span="24">
-          <a-card>
-            <a-checkbox
-              :checked="Boolean(hook.condition)"
-              class="nc-check-box-hook-condition"
-              @update:checked="hook.condition = $event"
-            >
-              On Condition
-            </a-checkbox>
-
-            <LazySmartsheetToolbarColumnFilter
-              v-if="hook.condition"
-              ref="filterRef"
-              class="mt-4"
-              :auto-save="false"
-              :show-loading="false"
-              :hook-id="hook.id"
-              web-hook
-            />
-          </a-card>
-        </a-col>
-      </a-row>
-
-      <a-row>
-        <a-col :span="24">
-          <LazyWebhookTest
-            ref="webhookTestRef"
-            :hook="{
-              ...hook,
-              notification: {
-                ...hook.notification,
-                payload: hook.notification.payload,
-              },
-            }"
-          />
-        </a-col>
-      </a-row>
-    </a-form-item>
-  </a-form>
+  <a-tabs v-model:activeKey="hookTabKey" type="card" closeable="false" class="shadow-sm">
+    <a-tab-pane key="hook-edit" class="nc-hook-edit" force-render>
+      <template #tab>
+        <span>
+          <MdiEditOutline />
+          Edit
+        </span>
+      </template>
+      <a-form :model="hook" name="create-or-edit-webhook">
+        <a-form-item>
+          <a-row type="flex">
+            <a-col :span="24">
+              <a-card>
+                <a-checkbox
+                  :checked="Boolean(hook.active)"
+                  class="nc-check-box-enable-webhook"
+                  @update:checked="hook.active = $event"
+                >
+                  {{ $t('activity.enableWebhook') }}
+                </a-checkbox>
+              </a-card>
+            </a-col>
+          </a-row>
+        </a-form-item>
+        <a-form-item>
+          <a-row type="flex">
+            <a-col :span="24">
+              <a-form-item v-bind="validateInfos.title">
+                <a-input
+                  v-model:value="hook.title"
+                  size="large"
+                  :placeholder="$t('general.title')"
+                  class="nc-text-field-hook-title"
+                />
+              </a-form-item>
+            </a-col>
+          </a-row>
+
+          <a-row type="flex" :gutter="[16, 16]">
+            <a-col :span="12">
+              <a-form-item v-bind="validateInfos.eventOperation">
+                <a-select
+                  v-model:value="hook.eventOperation"
+                  size="large"
+                  :placeholder="$t('general.event')"
+                  class="nc-text-field-hook-event"
+                  dropdown-class-name="nc-dropdown-webhook-event"
+                >
+                  <a-select-option v-for="(event, i) in eventList" :key="i" :value="event.value.join(' ')">
+                    {{ event.text.join(' ') }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+
+            <a-col :span="12">
+              <a-form-item v-bind="validateInfos['notification.type']">
+                <a-select
+                  v-model:value="hook.notification.type"
+                  size="large"
+                  class="nc-select-hook-notification-type"
+                  :placeholder="$t('general.notification')"
+                  dropdown-class-name="nc-dropdown-webhook-notification"
+                  @change="onNotTypeChange(true)"
+                >
+                  <a-select-option v-for="(notificationOption, i) in notificationList" :key="i" :value="notificationOption.type">
+                    <div class="flex items-center">
+                      <MdiLink v-if="notificationOption.type === 'URL'" class="mr-2" />
+
+                      <MdiEmail v-if="notificationOption.type === 'Email'" class="mr-2" />
+
+                      <MdiSlack v-if="notificationOption.type === 'Slack'" class="mr-2" />
+
+                      <MdiMicrosoftTeams v-if="notificationOption.type === 'Microsoft Teams'" class="mr-2" />
+
+                      <MdiDiscord v-if="notificationOption.type === 'Discord'" class="mr-2" />
+
+                      <MdiChat v-if="notificationOption.type === 'Mattermost'" class="mr-2" />
+
+                      <MdiWhatsapp v-if="notificationOption.type === 'Whatsapp Twilio'" class="mr-2" />
+
+                      <MdiCellphoneMessage v-if="notificationOption.type === 'Twilio'" class="mr-2" />
+
+                      {{ notificationOption.type }}
+                    </div>
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+
+          <a-row v-if="hook.notification.type === 'URL'" class="mb-5" type="flex" :gutter="[16, 0]">
+            <a-col :span="6">
+              <a-select
+                v-model:value="hook.notification.payload.method"
+                size="large"
+                class="nc-select-hook-url-method"
+                dropdown-class-name="nc-dropdown-hook-notification-url-method"
+              >
+                <a-select-option v-for="(method, i) in methodList" :key="i" :value="method.title">
+                  {{ method.title }}
+                </a-select-option>
+              </a-select>
+            </a-col>
+
+            <a-col :span="18">
+              <a-form-item v-bind="validateInfos['notification.payload.path']">
+                <a-input
+                  v-model:value="hook.notification.payload.path"
+                  size="large"
+                  placeholder="http://example.com"
+                  class="nc-text-field-hook-url-path"
+                />
+              </a-form-item>
+            </a-col>
+
+            <a-col :span="24">
+              <a-tabs v-model:activeKey="urlTabKey" type="card" closeable="false" class="shadow-sm">
+                <a-tab-pane key="params" tab="Params" force-render>
+                  <LazyApiClientParams v-model="hook.notification.payload.parameters" />
+                </a-tab-pane>
+
+                <a-tab-pane key="headers" tab="Headers" class="nc-tab-headers">
+                  <LazyApiClientHeaders v-model="hook.notification.payload.headers" />
+                </a-tab-pane>
+
+                <!-- No in use at this moment -->
+                <!--            <a-tab-pane key="auth" tab="Auth"> -->
+                <!--              <LazyMonacoEditor v-model="hook.notification.payload.auth" class="min-h-60 max-h-80" /> -->
+
+                <!--              <span class="text-gray-500 prose-sm p-2"> -->
+                <!--                For more about auth option refer -->
+                <!--                <a class="prose-sm" href  ="https://github.com/axios/axios#request-config" target="_blank">axios docs</a>. -->
+                <!--              </span> -->
+                <!--            </a-tab-pane> -->
+              </a-tabs>
+            </a-col>
+          </a-row>
+
+          <a-row v-if="hook.notification.type === 'Slack'" type="flex">
+            <a-col :span="24">
+              <a-form-item v-bind="validateInfos['notification.channels']">
+                <LazyWebhookChannelMultiSelect
+                  v-if="slackChannels.length > 0"
+                  v-model="hook.notification.payload.channels"
+                  :selected-channel-list="hook.notification.payload.channels"
+                  :available-channel-list="slackChannels"
+                  placeholder="Select Slack channels"
+                />
+              </a-form-item>
+            </a-col>
+          </a-row>
+
+          <a-row v-if="hook.notification.type === 'Microsoft Teams'" type="flex">
+            <a-col :span="24">
+              <a-form-item v-bind="validateInfos['notification.channels']">
+                <LazyWebhookChannelMultiSelect
+                  v-if="teamsChannels.length > 0"
+                  v-model="hook.notification.payload.channels"
+                  :selected-channel-list="hook.notification.payload.channels"
+                  :available-channel-list="teamsChannels"
+                  placeholder="Select Microsoft Teams channels"
+                />
+              </a-form-item>
+            </a-col>
+          </a-row>
+
+          <a-row v-if="hook.notification.type === 'Discord'" type="flex">
+            <a-col :span="24">
+              <a-form-item v-bind="validateInfos['notification.channels']">
+                <LazyWebhookChannelMultiSelect
+                  v-if="discordChannels.length > 0"
+                  v-model="hook.notification.payload.channels"
+                  :selected-channel-list="hook.notification.payload.channels"
+                  :available-channel-list="discordChannels"
+                  placeholder="Select Discord channels"
+                />
+              </a-form-item>
+            </a-col>
+          </a-row>
+
+          <a-row v-if="hook.notification.type === 'Mattermost'" type="flex">
+            <a-col :span="24">
+              <a-form-item v-bind="validateInfos['notification.channels']">
+                <LazyWebhookChannelMultiSelect
+                  v-if="mattermostChannels.length > 0"
+                  v-model="hook.notification.payload.channels"
+                  :selected-channel-list="hook.notification.payload.channels"
+                  :available-channel-list="mattermostChannels"
+                  placeholder="Select Mattermost channels"
+                />
+              </a-form-item>
+            </a-col>
+          </a-row>
+
+          <a-row v-if="formInput[hook.notification.type] && hook.notification.payload" type="flex">
+            <a-col v-for="(input, i) in formInput[hook.notification.type]" :key="i" :span="24">
+              <a-form-item v-if="input.type === 'LongText'" v-bind="validateInfos[`notification.payload.${input.key}`]">
+                <a-textarea v-model:value="hook.notification.payload[input.key]" :placeholder="input.label" size="large" />
+              </a-form-item>
+
+              <a-form-item v-else v-bind="validateInfos[`notification.payload.${input.key}`]">
+                <a-input v-model:value="hook.notification.payload[input.key]" :placeholder="input.label" size="large" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+
+          <a-row class="mb-5" type="flex">
+            <a-col :span="24">
+              <a-card>
+                <a-checkbox
+                  :checked="Boolean(hook.condition)"
+                  class="nc-check-box-hook-condition"
+                  @update:checked="hook.condition = $event"
+                >
+                  On Condition
+                </a-checkbox>
+
+                <LazySmartsheetToolbarColumnFilter
+                  v-if="hook.condition"
+                  ref="filterRef"
+                  class="mt-4"
+                  :auto-save="false"
+                  :show-loading="false"
+                  :hook-id="hook.id"
+                  web-hook
+                />
+              </a-card>
+            </a-col>
+          </a-row>
+
+          <a-row>
+            <a-col :span="24">
+              <LazyWebhookTest
+                ref="webhookTestRef"
+                :hook="{
+                  ...hook,
+                  notification: {
+                    ...hook.notification,
+                    payload: hook.notification.payload,
+                  },
+                }"
+              />
+            </a-col>
+          </a-row>
+        </a-form-item>
+      </a-form>
+    </a-tab-pane>
+
+    <a-tab-pane key="hook-log" class="nc-hook-log">
+      <template #tab>
+        <span>
+          <MdiHistory />
+          Call Log
+        </span>
+      </template>
+      <LazyWebhookCallLog />
+    </a-tab-pane>
+  </a-tabs>
 </template>

From 3eb472b34eb693c006b964c8e1d6b36fe6a40927 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 18:51:17 +0800
Subject: [PATCH 029/161] feat(nocodb): use uuid in hook

---
 packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index e982233841..1158fa467b 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -1,4 +1,5 @@
 import Handlebars from 'handlebars';
+import { v4 as uuidv4 } from 'uuid';
 import Filter from '../../models/Filter';
 import HookLog from '../../models/HookLog';
 import NcPluginMgrv2 from './NcPluginMgrv2';
@@ -140,7 +141,7 @@ export function constructWebHookData(hook, model, view, prevData, newData) {
 
   return {
     type: `${scope}.${hook.event}.${hook.operation}`,
-    id: 'TBC',
+    id: uuidv4(),
     data: {
       table_id: model.id,
       table_name: model.title,

From f4861df4b58f69496b2dddca2e4a8c73d07364c4 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 19:03:35 +0800
Subject: [PATCH 030/161] feat(nc-gui): add disabled for hook log tab and pass
 hook to LazyWebhookCallLog

---
 packages/nc-gui/components/webhook/Editor.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 4d61f0da5a..f338d5448f 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -712,14 +712,14 @@ onMounted(async () => {
       </a-form>
     </a-tab-pane>
 
-    <a-tab-pane key="hook-log" class="nc-hook-log">
+    <a-tab-pane key="hook-log" class="nc-hook-log" :disabled="!props.hook">
       <template #tab>
         <span>
           <MdiHistory />
           Call Log
         </span>
       </template>
-      <LazyWebhookCallLog />
+      <LazyWebhookCallLog :hook="hook" />
     </a-tab-pane>
   </a-tabs>
 </template>

From 4d1b99cb2d76726bde4fb83183a0018738633b8f Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 19:08:15 +0800
Subject: [PATCH 031/161] refactor(nocodb): remove unused comments

---
 packages/nocodb/src/lib/models/HookLog.ts | 24 ++---------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/packages/nocodb/src/lib/models/HookLog.ts b/packages/nocodb/src/lib/models/HookLog.ts
index 09f18063af..e88e26202b 100644
--- a/packages/nocodb/src/lib/models/HookLog.ts
+++ b/packages/nocodb/src/lib/models/HookLog.ts
@@ -24,8 +24,8 @@ export default class HookLog implements HookLogType {
   response?: string;
   triggered_by?: string;
 
-  constructor(hook: Partial<HookLog>) {
-    Object.assign(this, hook);
+  constructor(hookLog: Partial<HookLog>) {
+    Object.assign(this, hookLog);
   }
 
   static async list(
@@ -36,31 +36,11 @@ export default class HookLog implements HookLogType {
     },
     ncMeta = Noco.ncMeta
   ) {
-    // todo: redis cache ??
-    // let hooks = await NocoCache.getList(CacheScope.HOOK, [param.fk_model_id]);
-    // if (!hooks.length) {
     const hookLogs = await ncMeta.metaList(null, null, MetaTable.HOOK_LOGS, {
       condition: {
         fk_hook_id: param.fk_hook_id,
-        // ...(param.event ? { event: param.event?.toLowerCase?.() } : {}),
-        // ...(param.operation
-        //   ? { operation: param.operation?.toLowerCase?.() }
-        //   : {})
       },
     });
-    //   await NocoCache.setList(CacheScope.HOOK, [param.fk_model_id], hooks);
-    // }
-    // // filter event & operation
-    // if (param.event) {
-    //   hooks = hooks.filter(
-    //     h => h.event?.toLowerCase() === param.event?.toLowerCase()
-    //   );
-    // }
-    // if (param.operation) {
-    //   hooks = hooks.filter(
-    //     h => h.operation?.toLowerCase() === param.operation?.toLowerCase()
-    //   );
-    // }
     return hookLogs?.map((h) => new HookLog(h));
   }
 

From a11516c4a9d6c7ff2c5fc4f595fd728193edc19e Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 19:18:17 +0800
Subject: [PATCH 032/161] feat(nocodb): add hookLogList

---
 .../nocodb/src/lib/controllers/hook.ctl.ts    | 22 ++++++++++++++++++-
 packages/nocodb/src/lib/services/hook.svc.ts  |  6 ++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/lib/controllers/hook.ctl.ts b/packages/nocodb/src/lib/controllers/hook.ctl.ts
index 7e671d2ec1..7e158b878d 100644
--- a/packages/nocodb/src/lib/controllers/hook.ctl.ts
+++ b/packages/nocodb/src/lib/controllers/hook.ctl.ts
@@ -4,7 +4,7 @@ import { PagedResponseImpl } from '../meta/helpers/PagedResponse';
 import ncMetaAclMw from '../meta/helpers/ncMetaAclMw';
 import { metaApiMetrics } from '../meta/helpers/apiMetrics';
 import { hookService } from '../services';
-import type { HookListType, HookType } from 'nocodb-sdk';
+import type { HookListType, HookLogListType, HookType } from 'nocodb-sdk';
 import type { Request, Response } from 'express';
 
 export async function hookList(
@@ -63,12 +63,25 @@ export async function tableSampleData(req: Request, res: Response) {
   );
 }
 
+export async function hookLogList(
+  req: Request<any, any, any>,
+  res: Response<HookLogListType>
+) {
+  res.json(
+    new PagedResponseImpl(
+      await hookService.hookLogList({ tableId: req.params.hookId })
+    )
+  );
+}
+
 const router = Router({ mergeParams: true });
+
 router.get(
   '/api/v1/db/meta/tables/:tableId/hooks',
   metaApiMetrics,
   ncMetaAclMw(hookList, 'hookList')
 );
+
 router.post(
   '/api/v1/db/meta/tables/:tableId/hooks/test',
   metaApiMetrics,
@@ -94,4 +107,11 @@ router.get(
   metaApiMetrics,
   catchError(tableSampleData)
 );
+
+router.get(
+  '/api/v1/db/meta/hooks/:hookId/logs',
+  metaApiMetrics,
+  ncMetaAclMw(hookLogList, 'hookLogList')
+);
+
 export default router;
diff --git a/packages/nocodb/src/lib/services/hook.svc.ts b/packages/nocodb/src/lib/services/hook.svc.ts
index 04d2dc5f96..ec5d32f669 100644
--- a/packages/nocodb/src/lib/services/hook.svc.ts
+++ b/packages/nocodb/src/lib/services/hook.svc.ts
@@ -1,7 +1,7 @@
 import { T } from 'nc-help';
 import { validatePayload } from '../meta/api/helpers';
 import { NcError } from '../meta/helpers/catchError';
-import { Hook, Model } from '../models';
+import { Hook, HookLog, Model } from '../models';
 import { invokeWebhook } from '../meta/helpers/webhookHelpers';
 import populateSamplePayload from '../meta/helpers/populateSamplePayload';
 import type { HookReqType, HookTestReqType } from 'nocodb-sdk';
@@ -26,6 +26,10 @@ export async function hookList(param: { tableId: string }) {
   return await Hook.list({ fk_model_id: param.tableId });
 }
 
+export async function hookLogList(param: { hookId: string }) {
+  return await HookLog.list({ fk_hook_id: param.hookId });
+}
+
 export async function hookCreate(param: {
   tableId: string;
   hook: HookReqType;

From 41c5e83d537aba9c8178f8a96e25222eb94881a5 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 19:18:38 +0800
Subject: [PATCH 033/161] fix(nocodb): tableId -> hookId in hook.ctl.ts

---
 packages/nocodb/src/lib/controllers/hook.ctl.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/controllers/hook.ctl.ts b/packages/nocodb/src/lib/controllers/hook.ctl.ts
index 7e158b878d..4b09fb4f45 100644
--- a/packages/nocodb/src/lib/controllers/hook.ctl.ts
+++ b/packages/nocodb/src/lib/controllers/hook.ctl.ts
@@ -69,7 +69,7 @@ export async function hookLogList(
 ) {
   res.json(
     new PagedResponseImpl(
-      await hookService.hookLogList({ tableId: req.params.hookId })
+      await hookService.hookLogList({ hookId: req.params.hookId })
     )
   );
 }

From 9df8b8b23e46e92a8c52d7f9ac1bd7223c96fe10 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 19:19:27 +0800
Subject: [PATCH 034/161] refactor(nocodb): change operation type to insert or
 update in hook.ctl.ts

---
 packages/nocodb/src/lib/controllers/hook.ctl.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/nocodb/src/lib/controllers/hook.ctl.ts b/packages/nocodb/src/lib/controllers/hook.ctl.ts
index 4b09fb4f45..ae7b7ce112 100644
--- a/packages/nocodb/src/lib/controllers/hook.ctl.ts
+++ b/packages/nocodb/src/lib/controllers/hook.ctl.ts
@@ -57,8 +57,7 @@ export async function tableSampleData(req: Request, res: Response) {
   res.json(
     await hookService.tableSampleData({
       tableId: req.params.tableId,
-      // todo: replace any with type
-      operation: req.params.operation as any,
+      operation: req.params.operation as 'insert' | 'update',
     })
   );
 }

From 0b43f8c670d4777fbd3ffc6ed91645e6db5aab10 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 19:52:37 +0800
Subject: [PATCH 035/161] feat(nocodb): add hook logs api

---
 packages/nocodb/src/schema/swagger.json | 603 +++++++++++++++++++-----
 1 file changed, 474 insertions(+), 129 deletions(-)

diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json
index 60fc44bfff..c7f32b6be6 100644
--- a/packages/nocodb/src/schema/swagger.json
+++ b/packages/nocodb/src/schema/swagger.json
@@ -5934,6 +5934,76 @@
         ]
       }
     },
+    "/api/v1/db/meta/hooks/{hookId}/logs": {
+      "parameters": [
+        {
+          "schema": {
+            "$ref": "#/components/schemas/Id",
+            "example": "hk_0063k4o1frnxbr"
+          },
+          "name": "hookId",
+          "in": "path",
+          "required": true,
+          "description": "Unique Hook ID"
+        }
+      ],
+      "get": {
+        "summary": "Get Hook Logs",
+        "operationId": "db-table-webhook-logs-list",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/HookLogList"
+                },
+                "examples": {
+                  "Example 1": {
+                    "value": {
+                      "list": [
+                        {
+                          "base_id": "ds_jxuewivwbxeum2",
+                          "event": "after",
+                          "execution_time": "98",
+                          "fk_hook_id": "hk_035ijv5qdi97y5",
+                          "id": "string",
+                          "notifications": "{\"type\":\"URL\",\"payload\":{\"method\":\"POST\",\"body\":\"{{ json data }}\",\"headers\":[{}],\"parameters\":[{}],\"auth\":\"\",\"path\":\"https://webhook.site/6eb45ce5-b611-4be1-8b96-c2965755662b\"}}",
+                          "operation": "insert",
+                          "payload": "{\"method\":\"POST\",\"body\":\"{{ json data }}\",\"headers\":[{}],\"parameters\":[{}],\"auth\":\"\",\"path\":\"https://webhook.site/6eb45ce5-b611-4be1-8b96-c2965755662b\"}",
+                          "project_id": "p_tbhl1hnycvhe5l",
+                          "response": "{\"status\":200,\"statusText\":\"OK\",\"headers\":{\"server\":\"nginx\",\"content-type\":\"text/plain; charset=UTF-8\",\"transfer-encoding\":\"chunked\",\"connection\":\"close\",\"vary\":\"Accept-Encoding\",\"x-request-id\":\"53844a7d-ede8-4798-adf7-8af441908a72\",\"x-token-id\":\"6eb45ce5-b611-4be1-8b96-c2965755662b\",\"cache-control\":\"no-cache, private\",\"date\":\"Fri, 24 Mar 2023 10:50:10 GMT\"},\"config\":{\"url\":\"https://webhook.site/6eb45ce5-b611-4be1-8b96-c2965755662b\",\"method\":\"post\",\"data\":\"{\\\"type\\\":\\\"records.after.insert\\\",\\\"id\\\":\\\"a77d97dc-a3e4-4719-9b46-45f93e0cc99a\\\",\\\"data\\\":{\\\"table_id\\\":\\\"md_d8v403o74mf5lf\\\",\\\"table_name\\\":\\\"Sheet-2\\\"}}\",\"headers\":{\"Accept\":\"application/json, text/plain, */*\",\"Content-Type\":\"application/x-www-form-urlencoded\",\"User-Agent\":\"axios/0.21.4\",\"Content-Length\":138},\"params\":{}}}",
+                          "test_call": 0,
+                          "triggered_by": "w@nocodb.com",
+                          "type": "URL"
+                        }
+                      ],
+                      "pageInfo": {
+                        "isFirstPage": true,
+                        "isLastPage": true,
+                        "page": 1,
+                        "pageSize": 10,
+                        "totalRows": 1
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "$ref": "#/components/responses/BadRequest"
+          }
+        },
+        "tags": ["DB Table Webhook Logs"],
+        "description": "Get the log data in a given Hook",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/xc-auth"
+          }
+        ]
+      }
+    },
     "/api/v1/db/meta/filters/{filterId}": {
       "parameters": [
         {
@@ -13646,7 +13716,7 @@
           }
         },
         "x-stoplight": {
-          "id": "zc9ztw0ih4ttt"
+          "id": "it370mpkpd4mo"
         }
       },
       "ApiTokenReq": {
@@ -13667,13 +13737,13 @@
           }
         },
         "x-stoplight": {
-          "id": "t9dpbaw4dhpx3"
+          "id": "uwroiaim8dm2p"
         }
       },
       "ApiTokenList": {
         "description": "Model for API Token List",
         "x-stoplight": {
-          "id": "dgoo5jfkvypld"
+          "id": "wnzpsmdzrwhi2"
         },
         "examples": [
           {
@@ -13778,7 +13848,7 @@
           }
         },
         "x-stoplight": {
-          "id": "9uff8of377ouf"
+          "id": "3fmfrjdlcgmrd"
         }
       },
       "AttachmentReq": {
@@ -13816,7 +13886,7 @@
           }
         },
         "x-stoplight": {
-          "id": "7mvkmys63d0bx"
+          "id": "o5x54q347g7wk"
         }
       },
       "Audit": {
@@ -13941,7 +14011,7 @@
           }
         },
         "x-stoplight": {
-          "id": "dz9hjvx07jaje"
+          "id": "9evk17q5ozhen"
         }
       },
       "AuditRowUpdateReq": {
@@ -13981,7 +14051,7 @@
           }
         },
         "x-stoplight": {
-          "id": "t4l2bqjgukcr1"
+          "id": "gaksc2zunsxn3"
         }
       },
       "Base": {
@@ -14058,7 +14128,7 @@
           }
         },
         "x-stoplight": {
-          "id": "l5nhyvoa0dfag"
+          "id": "cjc1f3xdpuhn0"
         }
       },
       "BaseList": {
@@ -14160,7 +14230,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "pn96b18y3k0je"
+          "id": "ufkgy8ah526p9"
         }
       },
       "BaseReq": {
@@ -14216,7 +14286,7 @@
         "title": "Base Request",
         "type": "object",
         "x-stoplight": {
-          "id": "gebxq2b5pp1a3"
+          "id": "ec2gzuidrzb05"
         }
       },
       "Bool": {
@@ -14238,7 +14308,7 @@
         ],
         "title": "Bool Model",
         "x-stoplight": {
-          "id": "6qmxbfclxa8em"
+          "id": "ok0vakhbd76t7"
         }
       },
       "Column": {
@@ -14526,7 +14596,7 @@
           }
         },
         "x-stoplight": {
-          "id": "0nszsk1q6done"
+          "id": "57ep883sdtjxj"
         }
       },
       "ColumnList": {
@@ -14634,7 +14704,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "fjqsqgw1ahlon"
+          "id": "7nxvevdrdye9b"
         }
       },
       "ColumnReq": {
@@ -14726,7 +14796,7 @@
         "title": "Column Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "fw6an7vvhpqfu"
+          "id": "5fibed0jjtlr8"
         }
       },
       "CommentReq": {
@@ -14759,13 +14829,13 @@
         },
         "required": ["fk_model_id", "row_id"],
         "x-stoplight": {
-          "id": "k7vnf7oc33p6m"
+          "id": "akpy6abwus2l2"
         }
       },
       "CommentUpdateReq": {
         "description": "Model for Comment Update Request",
         "x-stoplight": {
-          "id": "wan84coiq9lyn"
+          "id": "icceq4bw1v0km"
         },
         "examples": [
           {
@@ -14938,7 +15008,7 @@
         "title": "Filter Model",
         "type": "object",
         "x-stoplight": {
-          "id": "goytqs4ua69w0"
+          "id": "bvrjq1rxu3nsp"
         }
       },
       "FilterList": {
@@ -15027,9 +15097,98 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "wzp2nwu7k19uj"
+          "id": "r6vkd94fyxozp"
         }
       },
+      "FilterLogList": {
+        "description": "Model for Filter Log List",
+        "x-stoplight": {
+          "id": "fnkro33vma0hm"
+        },
+        "examples": [
+          {
+            "list": [
+              {
+                "base_id": "ds_g4ccx6e77h1dmi",
+                "comparison_op": "eq",
+                "comparison_sub_op": null,
+                "created_at": "2023-03-02 18:18:05",
+                "fk_column_id": "cl_d7ah9n2qfupgys",
+                "fk_hook_id": null,
+                "fk_parent_id": null,
+                "fk_view_id": "vw_b739e29vqmrxnf",
+                "id": "fi_xn647tpmdq8fu8",
+                "is_group": null,
+                "logical_op": "and",
+                "order": 1,
+                "project_id": "p_xm3thidrblw4n7",
+                "updated_at": "2023-03-02 18:18:05",
+                "value": "foo"
+              }
+            ],
+            "pageInfo": {
+              "isFirstPage": true,
+              "isLastPage": true,
+              "page": 1,
+              "pageSize": 10,
+              "totalRows": 1
+            }
+          }
+        ],
+        "title": "Filter Log List Model",
+        "type": "object",
+        "x-examples": {
+          "example-1": {
+            "bases": {
+              "list": [
+                {
+                  "alias": "string",
+                  "database": "string",
+                  "host": "string",
+                  "id": "string",
+                  "params": "string",
+                  "password": "string",
+                  "port": 0,
+                  "project_id": "string",
+                  "ssl": "string",
+                  "type": "string",
+                  "url": "string",
+                  "username": "string"
+                }
+              ],
+              "pageInfo": {
+                "isFirstPage": true,
+                "isLastPage": true,
+                "pageSize": 0,
+                "sort": "string",
+                "totalRows": 0
+              }
+            }
+          }
+        },
+        "properties": {
+          "list": {
+            "type": "array",
+            "x-stoplight": {
+              "id": "22sgv37ve9kxo"
+            },
+            "description": "List of filter objects",
+            "items": {
+              "$ref": "#/components/schemas/Filter",
+              "x-stoplight": {
+                "id": "ttw5rxhy83k8p"
+              }
+            }
+          },
+          "pageInfo": {
+            "$ref": "#/components/schemas/Paginated",
+            "x-stoplight": {
+              "id": "7cyrb1770mrzz"
+            }
+          }
+        },
+        "required": ["list", "pageInfo"]
+      },
       "FilterReq": {
         "description": "Model for Filter Request",
         "examples": [
@@ -15045,7 +15204,7 @@
         "title": "Filter Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "viq9ex4d7k8k2"
+          "id": "y84fnz0i7hbvs"
         },
         "properties": {
           "comparison_op": {
@@ -15266,7 +15425,7 @@
           }
         },
         "x-stoplight": {
-          "id": "bjh5qbmqyzy1k"
+          "id": "afkypb9o3rq26"
         }
       },
       "FormUpdateReq": {
@@ -15337,7 +15496,7 @@
           }
         },
         "x-stoplight": {
-          "id": "76m5jsz93rjsc"
+          "id": "m6bhkjsewt4ca"
         }
       },
       "FormColumn": {
@@ -15431,7 +15590,7 @@
           }
         },
         "x-stoplight": {
-          "id": "liiv7vd1hgeqf"
+          "id": "257zo728yca9v"
         }
       },
       "FormColumnReq": {
@@ -15498,7 +15657,7 @@
           }
         },
         "x-stoplight": {
-          "id": "21k1kvmq14s9a"
+          "id": "fkb1v0345thvk"
         }
       },
       "Formula": {
@@ -15539,7 +15698,7 @@
           }
         },
         "x-stoplight": {
-          "id": "8ahp8va0147v1"
+          "id": "vj4rcanzq3kfi"
         }
       },
       "FormulaColumnReq": {
@@ -15576,7 +15735,7 @@
           }
         },
         "x-stoplight": {
-          "id": "s3c9yjip3dank"
+          "id": "gnaln1acb43hm"
         }
       },
       "Gallery": {
@@ -15670,7 +15829,7 @@
         "title": "Gallery Model",
         "type": "object",
         "x-stoplight": {
-          "id": "e1o8q9fieshbc"
+          "id": "a74prkhtnnyhm"
         }
       },
       "GalleryColumn": {
@@ -15705,13 +15864,13 @@
         "title": "Gallery Column Model",
         "type": "object",
         "x-stoplight": {
-          "id": "llcstnvsjdgz0"
+          "id": "jvg5iiax5wl2w"
         }
       },
       "GalleryUpdateReq": {
         "description": "Model for Gallery View Update Request",
         "x-stoplight": {
-          "id": "5cxhum5vh2nr2"
+          "id": "w9wics1pxeiut"
         },
         "examples": [
           {
@@ -15764,7 +15923,7 @@
         "title": "Geo Location Model",
         "type": "object",
         "x-stoplight": {
-          "id": "hwuzujovr9qwx"
+          "id": "hbtz74i4vhlpb"
         }
       },
       "Grid": {
@@ -15874,7 +16033,117 @@
           }
         },
         "x-stoplight": {
-          "id": "xntep33dod0ys"
+          "id": "536fsmtot3wyr"
+        }
+      },
+      "Grid - copy": {
+        "description": "Model for Grid",
+        "x-stoplight": {
+          "id": "lu6lfh8g5zjcr"
+        },
+        "examples": [
+          {
+            "project_id": "p_xm3thidrblw4n7",
+            "base_id": "ds_g4ccx6e77h1dmi",
+            "fk_view_id": "vw_p2jcatxz4mvcfw",
+            "row_height": 1,
+            "meta": null,
+            "columns": [
+              {
+                "id": "cl_phvuuwjrzcdo0g",
+                "base_id": "ds_g4ccx6e77h1dmi",
+                "project_id": "p_xm3thidrblw4n7",
+                "fk_model_id": "md_rsu68aqjsbyqtl",
+                "title": "Id",
+                "column_name": "id",
+                "uidt": "ID",
+                "dt": "int",
+                "np": "10",
+                "ns": "0",
+                "clen": null,
+                "cop": "1",
+                "pk": 1,
+                "pv": null,
+                "rqd": 1,
+                "un": 1,
+                "ct": "int unsigned",
+                "ai": 1,
+                "unique": 0,
+                "cdf": null,
+                "cc": "",
+                "csn": null,
+                "dtx": "specificType",
+                "dtxp": "",
+                "dtxs": "0",
+                "au": 0,
+                "validate": null,
+                "virtual": null,
+                "deleted": null,
+                "system": 0,
+                "order": 1,
+                "created_at": "2023-03-02 17:04:06",
+                "updated_at": "2023-03-02 17:04:06",
+                "meta": null
+              }
+            ]
+          }
+        ],
+        "title": "Grid Model",
+        "type": "object",
+        "properties": {
+          "id": {
+            "$ref": "#/components/schemas/Id",
+            "description": "Unique ID",
+            "x-stoplight": {
+              "id": "e3ti3fc0ocjyu"
+            }
+          },
+          "project_id": {
+            "$ref": "#/components/schemas/Id",
+            "description": "Project ID",
+            "x-stoplight": {
+              "id": "e3ti3fc0ocjyu"
+            }
+          },
+          "base_id": {
+            "$ref": "#/components/schemas/Id",
+            "description": "Base ID",
+            "x-stoplight": {
+              "id": "m8v3iyf1tidy9"
+            }
+          },
+          "fk_view_id": {
+            "$ref": "#/components/schemas/Id",
+            "description": "Foreign Key to View",
+            "x-stoplight": {
+              "id": "m8v3iyf1tidy9"
+            }
+          },
+          "row_height": {
+            "type": "number",
+            "example": 1,
+            "description": "Row Height"
+          },
+          "meta": {
+            "$ref": "#/components/schemas/Meta",
+            "x-stoplight": {
+              "id": "n8cud3jyqw5yv"
+            },
+            "description": "Meta info for Grid Model"
+          },
+          "columns": {
+            "type": "array",
+            "x-stoplight": {
+              "id": "22y0gipx2jdf8"
+            },
+            "description": "Grid View Columns",
+            "items": {
+              "$ref": "#/components/schemas/GridColumn",
+              "x-stoplight": {
+                "id": "nmzp6w3o6b24u"
+              }
+            }
+          }
         }
       },
       "GridColumn": {
@@ -15958,7 +16227,7 @@
           }
         },
         "x-stoplight": {
-          "id": "2go3w0igl2243"
+          "id": "f7xbsa3t5ct1x"
         }
       },
       "GridColumnReq": {
@@ -15996,13 +16265,13 @@
         "title": "Grid Column Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "2j3uyoabzmsrz"
+          "id": "ulgt2hbbj9lxr"
         }
       },
       "GridUpdateReq": {
         "description": "Model for Grid View Update",
         "x-stoplight": {
-          "id": "2q9ya4zmyr5x7"
+          "id": "yy9okqonhfj6u"
         },
         "examples": [
           {
@@ -16122,13 +16391,13 @@
           }
         },
         "x-stoplight": {
-          "id": "q8cxkpronjmyx"
+          "id": "zge9ad0ftmp1b"
         }
       },
       "HookReq": {
         "description": "Model for Hook",
         "x-stoplight": {
-          "id": "4zlzrppfjxrqb"
+          "id": "0zcc73h12ebop"
         },
         "examples": [
           {
@@ -16306,90 +16575,166 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "2tsq8h6hjctju"
+          "id": "5metgdb0snm6t"
         }
       },
       "HookLog": {
         "description": "Model for Hook Log",
         "examples": [
           {
-            "base_id": "string",
-            "conditions": "string",
-            "error": "string",
-            "error_code": "string",
-            "error_message": "string",
-            "event": "string",
-            "execution_time": "string",
-            "fk_hook_id": "string",
+            "base_id": "ds_jxuewivwbxeum2",
+            "event": "after",
+            "execution_time": "98",
+            "fk_hook_id": "hk_035ijv5qdi97y5",
             "id": "string",
-            "notifications": "string",
-            "operation": "string",
-            "payload": null,
-            "project_id": "string",
-            "response": "string",
-            "test_call": true,
-            "triggered_by": "string",
-            "type": "string"
+            "notifications": "{\"type\":\"URL\",\"payload\":{\"method\":\"POST\",\"body\":\"{{ json data }}\",\"headers\":[{}],\"parameters\":[{}],\"auth\":\"\",\"path\":\"https://webhook.site/6eb45ce5-b611-4be1-8b96-c2965755662b\"}}",
+            "operation": "insert",
+            "payload": "{\"method\":\"POST\",\"body\":\"{{ json data }}\",\"headers\":[{}],\"parameters\":[{}],\"auth\":\"\",\"path\":\"https://webhook.site/6eb45ce5-b611-4be1-8b96-c2965755662b\"}",
+            "project_id": "p_tbhl1hnycvhe5l",
+            "response": "{\"status\":200,\"statusText\":\"OK\",\"headers\":{\"server\":\"nginx\",\"content-type\":\"text/plain; charset=UTF-8\",\"transfer-encoding\":\"chunked\",\"connection\":\"close\",\"vary\":\"Accept-Encoding\",\"x-request-id\":\"53844a7d-ede8-4798-adf7-8af441908a72\",\"x-token-id\":\"6eb45ce5-b611-4be1-8b96-c2965755662b\",\"cache-control\":\"no-cache, private\",\"date\":\"Fri, 24 Mar 2023 10:50:10 GMT\"},\"config\":{\"url\":\"https://webhook.site/6eb45ce5-b611-4be1-8b96-c2965755662b\",\"method\":\"post\",\"data\":\"{\\\"type\\\":\\\"records.after.insert\\\",\\\"id\\\":\\\"a77d97dc-a3e4-4719-9b46-45f93e0cc99a\\\",\\\"data\\\":{\\\"table_id\\\":\\\"md_d8v403o74mf5lf\\\",\\\"table_name\\\":\\\"Sheet-2\\\"}}\",\"headers\":{\"Accept\":\"application/json, text/plain, */*\",\"Content-Type\":\"application/x-www-form-urlencoded\",\"User-Agent\":\"axios/0.21.4\",\"Content-Length\":138},\"params\":{}}}",
+            "test_call": 0,
+            "triggered_by": "w@nocodb.com",
+            "type": "URL"
           }
         ],
         "title": "Hook Log Model",
         "type": "object",
+        "x-stoplight": {
+          "id": "2ecbvr0ha9nha"
+        },
         "properties": {
           "base_id": {
-            "type": "string"
+            "type": "string",
+            "description": "Unique Base ID",
+            "example": "ds_jxuewivwbxeum2"
           },
           "conditions": {
-            "type": "string"
+            "type": "string",
+            "description": "Hook Conditions"
           },
           "error": {
-            "type": "string"
+            "$ref": "#/components/schemas/StringOrNull",
+            "description": "Error"
           },
           "error_code": {
-            "type": "string"
+            "$ref": "#/components/schemas/StringOrNull",
+            "description": "Error Code"
           },
           "error_message": {
-            "type": "string"
+            "$ref": "#/components/schemas/StringOrNull",
+            "description": "Error Message"
           },
           "event": {
-            "type": "string"
+            "type": "string",
+            "description": "Hook Event",
+            "example": "after",
+            "enum": ["after", "before"]
           },
           "execution_time": {
-            "type": "string"
+            "type": "string",
+            "description": "Execution Time in milliseconds",
+            "example": "98"
           },
           "fk_hook_id": {
-            "$ref": "#/components/schemas/StringOrNull"
+            "$ref": "#/components/schemas/StringOrNull",
+            "description": "Foreign Key to Hook"
           },
           "id": {
-            "$ref": "#/components/schemas/Id",
+            "$ref": "#/components/schemas/StringOrNull",
             "description": "Unique ID"
           },
           "notifications": {
-            "type": "string"
+            "type": "string",
+            "description": "Hook Notification"
           },
           "operation": {
-            "type": "string"
+            "type": "string",
+            "description": "Hook Operation",
+            "enum": ["insert", "update", "delete"],
+            "example": "insert"
+          },
+          "payload": {
+            "type": "string",
+            "description": "Hook Payload",
+            "example": "{\"method\":\"POST\",\"body\":\"{{ json data }}\",\"headers\":[{}],\"parameters\":[{}],\"auth\":\"\",\"path\":\"https://webhook.site/6eb45ce5-b611-4be1-8b96-c2965755662b\"}"
           },
-          "payload": {},
           "project_id": {
-            "type": "string"
+            "type": "string",
+            "description": "Project ID",
+            "example": "p_tbhl1hnycvhe5l"
           },
           "response": {
-            "type": "string"
+            "$ref": "#/components/schemas/StringOrNull",
+            "description": "Hook Response"
           },
           "test_call": {
-            "$ref": "#/components/schemas/Bool"
+            "$ref": "#/components/schemas/Bool",
+            "description": "Is this testing hook call?"
           },
           "triggered_by": {
-            "type": "string"
+            "$ref": "#/components/schemas/StringOrNull",
+            "description": "Who triggered the hook?"
           },
           "type": {
-            "type": "string"
+            "type": "string",
+            "example": "URL",
+            "description": "Hook Type"
           }
-        },
-        "x-stoplight": {
-          "id": "t3hlkw7zdqpom"
         }
       },
+      "HookLogList": {
+        "description": "Model for Hook Log List",
+        "x-stoplight": {
+          "id": "upury390qrd53"
+        },
+        "examples": [],
+        "title": "Hook Log List Model",
+        "type": "object",
+        "x-examples": {
+          "example-1": {
+            "bases": {
+              "list": [
+                {
+                  "alias": "string",
+                  "database": "string",
+                  "host": "string",
+                  "id": "string",
+                  "params": "string",
+                  "password": "string",
+                  "port": 0,
+                  "project_id": "string",
+                  "ssl": "string",
+                  "type": "string",
+                  "url": "string",
+                  "username": "string"
+                }
+              ],
+              "pageInfo": {
+                "isFirstPage": true,
+                "isLastPage": true,
+                "pageSize": 0,
+                "sort": "string",
+                "totalRows": 0
+              }
+            }
+          }
+        },
+        "properties": {
+          "list": {
+            "minItems": 1,
+            "type": "array",
+            "uniqueItems": true,
+            "description": "List of hook objects",
+            "items": {
+              "$ref": "#/components/schemas/HookLog"
+            }
+          },
+          "pageInfo": {
+            "$ref": "#/components/schemas/Paginated"
+          }
+        },
+        "required": ["list", "pageInfo"]
+      },
       "HookTestReq": {
         "description": "Model for Hook Test Request",
         "examples": [
@@ -16441,7 +16786,7 @@
         },
         "required": ["hook", "payload"],
         "x-stoplight": {
-          "id": "p2t60nmuy6x26"
+          "id": "t523aaetv4ouo"
         }
       },
       "Id": {
@@ -16452,7 +16797,7 @@
         "title": "ID Model",
         "type": "string",
         "x-stoplight": {
-          "id": "srvzhcm5j7d65"
+          "id": "y6fmtic1d1shr"
         }
       },
       "Kanban": {
@@ -16519,7 +16864,7 @@
           }
         },
         "x-stoplight": {
-          "id": "1jq82nu2uugxr"
+          "id": "5r5zzs9a7ai64"
         }
       },
       "KanbanColumn": {
@@ -16592,7 +16937,7 @@
           }
         },
         "x-stoplight": {
-          "id": "ipigcz5c7b5qy"
+          "id": "pjk7pky2i6w7j"
         }
       },
       "KanbanUpdateReq": {
@@ -16669,7 +17014,7 @@
           }
         },
         "x-stoplight": {
-          "id": "ufp4dyqfvlk6a"
+          "id": "nzhwki0tq91mj"
         }
       },
       "LicenseReq": {
@@ -16691,7 +17036,7 @@
         "title": "License Key Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "2hys6jqfbam2w"
+          "id": "2tr020jyvzaje"
         }
       },
       "LinkToAnotherColumnReq": {
@@ -16740,7 +17085,7 @@
         "title": "LinkToAnotherColumn Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "nx1h0s2wseid0"
+          "id": "3x9fwotpk3vde"
         }
       },
       "LinkToAnotherRecord": {
@@ -16816,7 +17161,7 @@
         "title": "LinkToAnotherRecord Model",
         "type": "object",
         "x-stoplight": {
-          "id": "845623nb0zp0w"
+          "id": "5m22fq1stz0bs"
         }
       },
       "Lookup": {
@@ -16856,7 +17201,7 @@
           }
         },
         "x-stoplight": {
-          "id": "22i9gmsgqt79n"
+          "id": "qhodn5h5sjbsz"
         }
       },
       "LookupColumnReq": {
@@ -16893,7 +17238,7 @@
           }
         },
         "x-stoplight": {
-          "id": "dhmss9g7ljbw7"
+          "id": "9cgn1ltvand3u"
         }
       },
       "Map": {
@@ -16970,13 +17315,13 @@
         "title": "Map Model",
         "type": "object",
         "x-stoplight": {
-          "id": "2gkbn859ho3ct"
+          "id": "0g3zvgirw5kaz"
         }
       },
       "MapUpdateReq": {
         "description": "Model for Map",
         "x-stoplight": {
-          "id": "u7xywz40dryws"
+          "id": "ulnej4ox46lau"
         },
         "examples": [
           {
@@ -17051,7 +17396,7 @@
         "title": "Map Column Model",
         "type": "object",
         "x-stoplight": {
-          "id": "ftaul6uruvc4z"
+          "id": "ymw6dfgts8s3q"
         }
       },
       "Meta": {
@@ -17070,7 +17415,7 @@
         ],
         "title": "Meta Model",
         "x-stoplight": {
-          "id": "pqxyr0shwtrp5"
+          "id": "o5pfub7ud6bk6"
         }
       },
       "ModelRoleVisibility": {
@@ -17113,7 +17458,7 @@
         "title": "ModelRoleVisibility Model",
         "type": "object",
         "x-stoplight": {
-          "id": "d3j1x4pulo4ng"
+          "id": "ep1wmfm8zzjw7"
         }
       },
       "NormalColumnRequest": {
@@ -17292,7 +17637,7 @@
         "type": "object",
         "required": ["column_name"],
         "x-stoplight": {
-          "id": "uzaqliigop3nw"
+          "id": "e715zmc8glgpl"
         }
       },
       "OrgUserReq": {
@@ -17317,7 +17662,7 @@
         "title": "Organisation User Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "pk8a8itnqcis1"
+          "id": "rgo441jq0x5ld"
         }
       },
       "Paginated": {
@@ -17359,7 +17704,7 @@
         "title": "Paginated Model",
         "type": "object",
         "x-stoplight": {
-          "id": "a5zhehpll01cm"
+          "id": "695ek5fqx7l65"
         }
       },
       "Password": {
@@ -17370,7 +17715,7 @@
         "title": "Password Model",
         "type": "string",
         "x-stoplight": {
-          "id": "mleq9lljoh76x"
+          "id": "juk25fjpj8jdk"
         }
       },
       "PasswordChangeReq": {
@@ -17394,7 +17739,7 @@
         "title": "Password Change Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "8a21c5za82w87"
+          "id": "063yexshac0xr"
         }
       },
       "PasswordForgotReq": {
@@ -17415,7 +17760,7 @@
         "title": "Password Forgot Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "ggt9lpf2gz2va"
+          "id": "vewwishkot5gy"
         }
       },
       "PasswordResetReq": {
@@ -17437,7 +17782,7 @@
         "title": "Password Reset Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "f63x3tpb8ti9r"
+          "id": "juiq70hujawwd"
         }
       },
       "Plugin": {
@@ -17554,7 +17899,7 @@
           }
         },
         "x-stoplight": {
-          "id": "0atoct4o6csg1"
+          "id": "5tnitw91zxe22"
         }
       },
       "PluginReq": {
@@ -17578,7 +17923,7 @@
           }
         },
         "x-stoplight": {
-          "id": "w6jwfvgpbhmt0"
+          "id": "jwg0bw0jjvoz4"
         }
       },
       "PluginTestReq": {
@@ -17620,7 +17965,7 @@
         },
         "required": ["title", "input", "category"],
         "x-stoplight": {
-          "id": "yye6yekmme06k"
+          "id": "sfunw9hbi6eti"
         }
       },
       "Project": {
@@ -17710,7 +18055,7 @@
           }
         },
         "x-stoplight": {
-          "id": "xzqakuahxm8d1"
+          "id": "cokbbcuqg6ggf"
         }
       },
       "ProjectList": {
@@ -17806,7 +18151,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "rb5o2yaf8ue64"
+          "id": "37n1y48c6mfux"
         }
       },
       "ProjectReq": {
@@ -17859,13 +18204,13 @@
         "title": "Project Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "km2fj1ebsroys"
+          "id": "gsxle49ts2t1m"
         }
       },
       "ProjectUpdateReq": {
         "description": "Model for Project Update Request",
         "x-stoplight": {
-          "id": "ou8zri28ak9yl"
+          "id": "98gjamvw0ps9f"
         },
         "examples": [
           {
@@ -17930,7 +18275,7 @@
         },
         "required": ["email", "roles"],
         "x-stoplight": {
-          "id": "9pgemwq7iirkp"
+          "id": "j8mnx42dkx0oo"
         }
       },
       "Rollup": {
@@ -17979,7 +18324,7 @@
           }
         },
         "x-stoplight": {
-          "id": "rq1o1yy2htfv0"
+          "id": "70tktm8p5ghjk"
         }
       },
       "RollupColumnReq": {
@@ -18030,7 +18375,7 @@
           }
         },
         "x-stoplight": {
-          "id": "8yc4ashgpj37h"
+          "id": "qtjqawfmifm16"
         }
       },
       "SelectOption": {
@@ -18072,7 +18417,7 @@
           }
         },
         "x-stoplight": {
-          "id": "sc5hl2s3rm8x7"
+          "id": "dpmp6frg1ns6q"
         }
       },
       "SelectOptions": {
@@ -18103,7 +18448,7 @@
         },
         "required": ["options"],
         "x-stoplight": {
-          "id": "r6d5rziqt288w"
+          "id": "nesh72pk907o9"
         }
       },
       "SharedBaseReq": {
@@ -18131,7 +18476,7 @@
           }
         },
         "x-stoplight": {
-          "id": "ybt81tfrpfvd2"
+          "id": "de0d2izgi3ssd"
         }
       },
       "SharedView": {
@@ -18169,7 +18514,7 @@
           }
         ],
         "x-stoplight": {
-          "id": "9wxqjviu1tfd4"
+          "id": "kt8tyazx1hl9p"
         }
       },
       "SharedViewList": {
@@ -18263,7 +18608,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "jtlp6vswbc96e"
+          "id": "5af0r928phzi8"
         }
       },
       "SharedViewReq": {
@@ -18287,7 +18632,7 @@
           }
         },
         "x-stoplight": {
-          "id": "zja4lmiol065l"
+          "id": "7rn8w0bn6rj27"
         }
       },
       "SignInReq": {
@@ -18313,7 +18658,7 @@
         "title": "Signin Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "2m1y6fuop0adc"
+          "id": "uuk84yov9ug31"
         }
       },
       "SignUpReq": {
@@ -18372,7 +18717,7 @@
         },
         "required": ["email", "password"],
         "x-stoplight": {
-          "id": "t7stkblz9wllz"
+          "id": "gcgfe08qwd747"
         }
       },
       "Sort": {
@@ -18425,7 +18770,7 @@
           }
         },
         "x-stoplight": {
-          "id": "tlcmtmjzcyhm6"
+          "id": "ia9gyblndemhc"
         }
       },
       "SortList": {
@@ -18506,7 +18851,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "7j3nbohh43tyy"
+          "id": "ufp0ghdiwrj7l"
         }
       },
       "SortReq": {
@@ -18532,7 +18877,7 @@
           }
         },
         "x-stoplight": {
-          "id": "shzdd8k3xswo9"
+          "id": "t6uwa7bvhea9w"
         }
       },
       "StringOrNull": {
@@ -18549,7 +18894,7 @@
         ],
         "title": "StringOrNull Model",
         "x-stoplight": {
-          "id": "1lecfrpmnndhi"
+          "id": "mjdkmqlwnnpqa"
         }
       },
       "Table": {
@@ -18978,7 +19323,7 @@
         },
         "required": ["table_name", "title"],
         "x-stoplight": {
-          "id": "986a3bp33neka"
+          "id": "jbfaq3weq7pqu"
         }
       },
       "TableList": {
@@ -19108,7 +19453,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "gemdr6sjuj4gl"
+          "id": "q6831buusfkmr"
         }
       },
       "TableReq": {
@@ -19249,7 +19594,7 @@
         "title": "Table Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "3i0r55tix0aso"
+          "id": "2778zbubk8oke"
         }
       },
       "User": {
@@ -19301,7 +19646,7 @@
         },
         "required": ["email", "email_verified", "firstname", "id", "lastname"],
         "x-stoplight": {
-          "id": "2uxbpdjvs379s"
+          "id": "j1eup2eblptjz"
         }
       },
       "UserInfo": {
@@ -19345,7 +19690,7 @@
         "title": "User Info Model",
         "type": "object",
         "x-stoplight": {
-          "id": "uatcf3jcnna1t"
+          "id": "gh2ryk6eif3ow"
         }
       },
       "UserList": {
@@ -19426,7 +19771,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "ygjybmp21hdgp"
+          "id": "46tznvolzhh6f"
         }
       },
       "View": {
@@ -19540,7 +19885,7 @@
         },
         "required": ["fk_model_id", "show", "title", "type"],
         "x-stoplight": {
-          "id": "66ki9gaxq3kwg"
+          "id": "97nh4i07eyrac"
         }
       },
       "ViewList": {
@@ -19668,13 +20013,13 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "2iat5dhhl4hoa"
+          "id": "82hxym7ti79r2"
         }
       },
       "ViewCreateReq": {
         "type": "object",
         "x-stoplight": {
-          "id": "venaxkw5uod3n"
+          "id": "1p0way06fnz8n"
         },
         "title": "ViewCreateReq",
         "description": "Model for View Create Request",
@@ -19743,7 +20088,7 @@
       "ViewUpdateReq": {
         "description": "Model for View Update Request",
         "x-stoplight": {
-          "id": "bo1mzzdpk82z0"
+          "id": "astobhpdfnmob"
         },
         "examples": [
           {
@@ -19808,7 +20153,7 @@
       "ViewColumnUpdateReq": {
         "description": "Model for View Column Update Request",
         "x-stoplight": {
-          "id": "jmhr4prd02ssy"
+          "id": "9a3vtqvzn30xs"
         },
         "examples": [
           {
@@ -19837,7 +20182,7 @@
       "ViewColumnReq": {
         "description": "Model for View Column Request",
         "x-stoplight": {
-          "id": "05tr5rxotp432"
+          "id": "2cj4deea7o4zb"
         },
         "examples": [
           {
@@ -19928,7 +20273,7 @@
         "title": "Visibility Rule Request Model",
         "type": "array",
         "x-stoplight": {
-          "id": "c6q9v9rtiduxg"
+          "id": "49mghoeqaud3a"
         }
       }
     },

From 917c1804fcfc997aa26951e1fb58f76d9d1b8001 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 19:52:50 +0800
Subject: [PATCH 036/161] refactor(nocodb): revise event and operation types

---
 packages/nocodb/src/lib/models/HookLog.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/nocodb/src/lib/models/HookLog.ts b/packages/nocodb/src/lib/models/HookLog.ts
index e88e26202b..b7d5231dde 100644
--- a/packages/nocodb/src/lib/models/HookLog.ts
+++ b/packages/nocodb/src/lib/models/HookLog.ts
@@ -6,13 +6,12 @@ import type { HookLogType } from 'nocodb-sdk';
 
 export default class HookLog implements HookLogType {
   id?: string;
-
   base_id?: string;
   project_id?: string;
   fk_hook_id?: string;
   type?: string;
-  event?: string;
-  operation?: string;
+  event?: 'after' | 'before';
+  operation?: 'insert' | 'update' | 'delete';
   test_call?: boolean;
   payload?: string;
   conditions?: string;

From 13a05fc0c7a50e861df94f76c17811256cec11ca Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 19:53:03 +0800
Subject: [PATCH 037/161] chore(sdk): regenerate Api.ts

---
 packages/nocodb-sdk/src/lib/Api.ts | 129 ++++++++++++++++++++++++++---
 1 file changed, 118 insertions(+), 11 deletions(-)

diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index be2fca8810..a3fa0b7e0e 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -622,6 +622,16 @@ export interface FilterListType {
   pageInfo: PaginatedType;
 }
 
+/**
+ * Model for Filter Log List
+ */
+export interface FilterLogListType {
+  /** List of filter objects */
+  list: FilterType[];
+  /** Model for Paginated */
+  pageInfo: PaginatedType;
+}
+
 /**
  * Model for Filter Request
  */
@@ -983,6 +993,29 @@ export interface GridType {
   columns?: GridColumnType[];
 }
 
+/**
+ * Model for Grid
+ */
+export interface GridCopyType {
+  /** Unique ID */
+  id?: IdType;
+  /** Project ID */
+  project_id?: IdType;
+  /** Base ID */
+  base_id?: IdType;
+  /** Foreign Key to View */
+  fk_view_id?: IdType;
+  /**
+   * Row Height
+   * @example 1
+   */
+  row_height?: number;
+  /** Meta info for Grid Model */
+  meta?: MetaType;
+  /** Grid View Columns */
+  columns?: GridColumnType[];
+}
+
 /**
  * Model for Grid Column
  */
@@ -1181,28 +1214,73 @@ export interface HookListType {
  * Model for Hook Log
  */
 export interface HookLogType {
+  /**
+   * Unique Base ID
+   * @example ds_jxuewivwbxeum2
+   */
   base_id?: string;
+  /** Hook Conditions */
   conditions?: string;
-  error?: string;
-  error_code?: string;
-  error_message?: string;
-  event?: string;
+  /** Error */
+  error?: StringOrNullType;
+  /** Error Code */
+  error_code?: StringOrNullType;
+  /** Error Message */
+  error_message?: StringOrNullType;
+  /**
+   * Hook Event
+   * @example after
+   */
+  event?: 'after' | 'before';
+  /**
+   * Execution Time in milliseconds
+   * @example 98
+   */
   execution_time?: string;
-  /** Model for StringOrNull */
+  /** Foreign Key to Hook */
   fk_hook_id?: StringOrNullType;
   /** Unique ID */
-  id?: IdType;
+  id?: StringOrNullType;
+  /** Hook Notification */
   notifications?: string;
-  operation?: string;
-  payload?: any;
+  /**
+   * Hook Operation
+   * @example insert
+   */
+  operation?: 'insert' | 'update' | 'delete';
+  /**
+   * Hook Payload
+   * @example {"method":"POST","body":"{{ json data }}","headers":[{}],"parameters":[{}],"auth":"","path":"https://webhook.site/6eb45ce5-b611-4be1-8b96-c2965755662b"}
+   */
+  payload?: string;
+  /**
+   * Project ID
+   * @example p_tbhl1hnycvhe5l
+   */
   project_id?: string;
-  response?: string;
-  /** Model for Bool */
+  /** Hook Response */
+  response?: StringOrNullType;
+  /** Is this testing hook call? */
   test_call?: BoolType;
-  triggered_by?: string;
+  /** Who triggered the hook? */
+  triggered_by?: StringOrNullType;
+  /**
+   * Hook Type
+   * @example URL
+   */
   type?: string;
 }
 
+/**
+ * Model for Hook Log List
+ */
+export interface HookLogListType {
+  /** List of hook objects */
+  list: HookLogType[];
+  /** Model for Paginated */
+  pageInfo: PaginatedType;
+}
+
 /**
  * Model for Hook Test Request
  */
@@ -6397,6 +6475,35 @@ export class Api<
         ...params,
       }),
   };
+  dbTableWebhookLogs = {
+    /**
+ * @description Get the log data in a given Hook
+ * 
+ * @tags DB Table Webhook Logs
+ * @name List
+ * @summary Get Hook Logs
+ * @request GET:/api/v1/db/meta/hooks/{hookId}/logs
+ * @response `200` `HookLogListType` OK
+ * @response `400` `{
+  \** @example BadRequest [Error]: <ERROR MESSAGE> *\
+  msg: string,
+
+}`
+ */
+    list: (hookId: IdType, params: RequestParams = {}) =>
+      this.request<
+        HookLogListType,
+        {
+          /** @example BadRequest [Error]: <ERROR MESSAGE> */
+          msg: string;
+        }
+      >({
+        path: `/api/v1/db/meta/hooks/${hookId}/logs`,
+        method: 'GET',
+        format: 'json',
+        ...params,
+      }),
+  };
   dbTableRow = {
     /**
  * @description List all table rows in a given table and project

From 5359080d975f72470aa52377f4ebfb86321e37d0 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 24 Mar 2023 19:53:53 +0800
Subject: [PATCH 038/161] wip(nc-gui): CallLog component

---
 .../nc-gui/components/webhook/CallLog.vue     | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 packages/nc-gui/components/webhook/CallLog.vue

diff --git a/packages/nc-gui/components/webhook/CallLog.vue b/packages/nc-gui/components/webhook/CallLog.vue
new file mode 100644
index 0000000000..34c2a44d4a
--- /dev/null
+++ b/packages/nc-gui/components/webhook/CallLog.vue
@@ -0,0 +1,28 @@
+<script setup lang="ts">
+import type { HookLogType, HookType } from 'nocodb-sdk'
+import { onBeforeMount, useApi } from '#imports'
+
+const props = defineProps<Props>()
+
+const { api } = useApi()
+
+const hookLogs = ref<HookLogType[]>([])
+
+interface Props {
+  hook: HookType
+}
+
+async function loadHookLogList() {
+  hookLogs.value = (await api.dbTableWebhookLogs.list(props.hook.id!)).list!
+}
+
+onBeforeMount(async () => {
+  await loadHookLogList()
+})
+</script>
+
+<template>
+  <div v-for="hookLog of hookLogs">
+    {{ hookLog.id }}
+  </div>
+</template>

From 97600cf41c0dbda29e73322d677c525f0fdf8b4d Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 25 Mar 2023 12:25:49 +0800
Subject: [PATCH 039/161] feat(nocodb): add id to hook samplePayload

---
 packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts b/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
index c92152a584..e598d4baea 100644
--- a/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
+++ b/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
@@ -1,4 +1,5 @@
 import { RelationTypes, UITypes } from 'nocodb-sdk';
+import { v4 as uuidv4 } from 'uuid';
 import View from '../../models/View';
 import Column from '../../models/Column';
 import Model from '../../models/Model';
@@ -31,6 +32,7 @@ export default async function populateSamplePayload(
 
   const samplePayload = {
     type: `${scope}.after.${operation}`,
+    id: uuidv4(),
     data: {
       table_id: model.id,
       table_name: model.title,

From 8baf2fe42897fe38e57783c9083238445d66ff7f Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 25 Mar 2023 13:14:33 +0800
Subject: [PATCH 040/161] refactor(nc-gui): remove icon margin in webhook list

---
 packages/nc-gui/components/webhook/List.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/webhook/List.vue b/packages/nc-gui/components/webhook/List.vue
index f1063e062d..50efd053c4 100644
--- a/packages/nc-gui/components/webhook/List.vue
+++ b/packages/nc-gui/components/webhook/List.vue
@@ -135,7 +135,7 @@ onMounted(() => {
               </template>
 
               <template #avatar>
-                <div class="my-1 px-2">
+                <div class="px-2">
                   <component :is="iconMap.hook" class="text-xl" />
                 </div>
                 <div class="px-2 text-white rounded" :class="{ 'bg-green-500': item.active, 'bg-gray-500': !item.active }">

From 4c6111fc9bd272c393a7252c0294e948ab0b533e Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 25 Mar 2023 14:17:55 +0800
Subject: [PATCH 041/161] feat(nocodb): add orderBy on created_at in HookLog.ts

---
 packages/nocodb/src/lib/models/HookLog.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/nocodb/src/lib/models/HookLog.ts b/packages/nocodb/src/lib/models/HookLog.ts
index b7d5231dde..d07b0f4233 100644
--- a/packages/nocodb/src/lib/models/HookLog.ts
+++ b/packages/nocodb/src/lib/models/HookLog.ts
@@ -39,6 +39,9 @@ export default class HookLog implements HookLogType {
       condition: {
         fk_hook_id: param.fk_hook_id,
       },
+      orderBy: {
+        created_at: 'desc',
+      },
     });
     return hookLogs?.map((h) => new HookLog(h));
   }

From f86d13a0731d560a38d5e3a3f2cb92da6eef3509 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 25 Mar 2023 14:26:54 +0800
Subject: [PATCH 042/161] fix(nc-gui): add iconMap from imports

---
 packages/nc-gui/components/webhook/Editor.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index f39e07bb3d..eeeaf7f363 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -18,6 +18,7 @@ import {
   useI18n,
   useNuxtApp,
   watch,
+  iconMap,
 } from '#imports'
 
 interface Props {

From f71327ff1a68ebf56c88c57a5d3ba3eb301d0dc9 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 25 Mar 2023 14:28:31 +0800
Subject: [PATCH 043/161] chore(nc-gui): lint

---
 packages/nc-gui/components/webhook/Editor.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index eeeaf7f363..5d29d7f0b2 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -7,6 +7,7 @@ import {
   computed,
   extractSdkResponseErrorMsg,
   fieldRequiredValidator,
+  iconMap,
   inject,
   message,
   onMounted,
@@ -18,7 +19,6 @@ import {
   useI18n,
   useNuxtApp,
   watch,
-  iconMap,
 } from '#imports'
 
 interface Props {
@@ -723,4 +723,4 @@ onMounted(async () => {
       <LazyWebhookCallLog :hook="hook" />
     </a-tab-pane>
   </a-tabs>
-</template>
\ No newline at end of file
+</template>

From 7fa474e0a0eb4bf39d6320cbb588c33a28bff132 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 25 Mar 2023 14:28:46 +0800
Subject: [PATCH 044/161] feat(nc-gui): hook call log

---
 .../nc-gui/components/webhook/CallLog.vue     | 58 +++++++++++++++++--
 1 file changed, 54 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/webhook/CallLog.vue b/packages/nc-gui/components/webhook/CallLog.vue
index 34c2a44d4a..bb3e8fce26 100644
--- a/packages/nc-gui/components/webhook/CallLog.vue
+++ b/packages/nc-gui/components/webhook/CallLog.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { HookLogType, HookType } from 'nocodb-sdk'
-import { onBeforeMount, useApi } from '#imports'
+import { onBeforeMount, parseProp, timeAgo, useApi } from '#imports'
 
 const props = defineProps<Props>()
 
@@ -8,6 +8,8 @@ const { api } = useApi()
 
 const hookLogs = ref<HookLogType[]>([])
 
+const activeKey = ref()
+
 interface Props {
   hook: HookType
 }
@@ -22,7 +24,55 @@ onBeforeMount(async () => {
 </script>
 
 <template>
-  <div v-for="hookLog of hookLogs">
-    {{ hookLog.id }}
-  </div>
+  <a-collapse v-model:activeKey="activeKey" class="nc-hook-log-collapse">
+    <a-collapse-panel v-for="(hookLog, idx) of hookLogs" :key="idx">
+      <template #header>
+        <div class="w-full cursor-pointer">
+          <div class="font-weight-medium flex">
+            <div class="flex-1">records.{{ hookLog.event }}.{{ hookLog.operation }} ({{ timeAgo(hookLog.created_at) }})</div>
+            <div
+              class="mx-1 px-2 py-1 text-white rounded bg-red-500"
+              :class="{ '!bg-green-500': parseProp(hookLog.response).status === 200 }"
+            >
+              {{ parseProp(hookLog.response).status }}
+              {{ parseProp(hookLog.response).statusText }}
+            </div>
+          </div>
+          <div>
+            <span class="font-weight-medium text-primary">
+              {{ parseProp(hookLog.payload).method }}
+            </span>
+            {{ parseProp(hookLog.payload).path }}
+          </div>
+        </div>
+      </template>
+
+      <div class="nc-hook-log-request">
+        <div class="nc-hook-pre-title">Request</div>
+        <pre class="nc-hook-pre">{{ parseProp(hookLog.response).config.headers }}</pre>
+      </div>
+
+      <div class="nc-hook-log-response">
+        <div class="nc-hook-pre-title">Response</div>
+        <pre class="nc-hook-pre">{{ parseProp(hookLog.response).headers }}</pre>
+      </div>
+
+      <div class="nc-hook-log-payload">
+        <div class="nc-hook-pre-title">Payload</div>
+        <pre class="nc-hook-pre">{{ parseProp(parseProp(hookLog.response).config.data) }}</pre>
+      </div>
+    </a-collapse-panel>
+  </a-collapse>
 </template>
+
+<style scoped lang="scss">
+.nc-hook-log-collapse {
+  .nc-hook-pre-title {
+    @apply font-weight-medium mb-2;
+  }
+  .nc-hook-pre {
+    @apply bg-gray-100;
+    padding: 10px;
+  }
+}
+</style>

From be7e4a514d8c5f249a11a09229ca1f0dbeb70668 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 25 Mar 2023 16:34:59 +0800
Subject: [PATCH 045/161] feat(nc-gui): revise hook call log style

---
 packages/nc-gui/components/webhook/CallLog.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/webhook/CallLog.vue b/packages/nc-gui/components/webhook/CallLog.vue
index bb3e8fce26..3e513d9985 100644
--- a/packages/nc-gui/components/webhook/CallLog.vue
+++ b/packages/nc-gui/components/webhook/CallLog.vue
@@ -31,7 +31,7 @@ onBeforeMount(async () => {
           <div class="font-weight-medium flex">
             <div class="flex-1">records.{{ hookLog.event }}.{{ hookLog.operation }} ({{ timeAgo(hookLog.created_at) }})</div>
             <div
-              class="mx-1 px-2 py-1 text-white rounded bg-red-500"
+              class="mx-1 px-2 py-1 text-white rounded bg-red-500 text-xs"
               :class="{ '!bg-green-500': parseProp(hookLog.response).status === 200 }"
             >
               {{ parseProp(hookLog.response).status }}
@@ -68,7 +68,7 @@ onBeforeMount(async () => {
 <style scoped lang="scss">
 .nc-hook-log-collapse {
   .nc-hook-pre-title {
-    @apply font-weight-medium mb-2;
+    @apply font-bold mb-2;
   }
   .nc-hook-pre {
     @apply bg-gray-100;

From de021191b38761d9fd4dd97d55087cf685ff5dad Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 25 Mar 2023 17:48:28 +0800
Subject: [PATCH 046/161] fix(nocodb): bulk all operations for hooks

---
 .../sql-data-mapper/lib/sql/BaseModelSqlv2.ts | 63 +++++++++++--------
 1 file changed, 37 insertions(+), 26 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 4a51d42504..9234f2866e 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
@@ -1942,7 +1942,7 @@ class BaseModelSqlv2 {
               chunkSize
             );
 
-      await this.afterBulkInsert(response, this.dbDriver, cookie);
+      await this.afterBulkInsert(response, insertDatas, this.dbDriver, cookie);
 
       return response;
     } catch (e) {
@@ -1989,8 +1989,8 @@ class BaseModelSqlv2 {
     data,
     { cookie }: { cookie?: any } = {}
   ) {
-    let res = [];
     try {
+      let count = 0;
       const updateData = await this.model.mapAliasToColumn(data);
       await this.validate(updateData);
       const pkValues = await this._extractPksValues(updateData);
@@ -2022,18 +2022,12 @@ class BaseModelSqlv2 {
 
         qb.update(updateData);
 
-        if (this.isPg || this.isMssql) {
-          qb.returning(
-            `${this.model.primaryKey.column_name} as ${this.model.primaryKey.title}`
-          );
-        }
-
-        res = (await qb) as any;
+        count = (await qb) as any;
       }
 
-      await this.afterBulkUpdate(res, this.dbDriver, cookie);
+      await this.afterBulkUpdate(count, this.dbDriver, cookie, true);
 
-      return res.length;
+      return count;
     } catch (e) {
       throw e;
     }
@@ -2098,15 +2092,9 @@ class BaseModelSqlv2 {
 
       qb.del();
 
-      if (this.isPg || this.isMssql) {
-        qb.returning(
-          `${this.model.primaryKey.column_name} as ${this.model.primaryKey.title}`
-        );
-      }
-
       const count = (await qb) as any;
 
-      await this.afterBulkDelete(count, this.dbDriver, cookie);
+      await this.afterBulkDelete(count, this.dbDriver, cookie, true);
 
       return count;
     } catch (e) {
@@ -2139,15 +2127,24 @@ class BaseModelSqlv2 {
     });
   }
 
-  public async afterBulkUpdate(data: any, _trx: any, req): Promise<void> {
-    await this.handleHooks('After.update', null, data, req);
+  public async afterBulkUpdate(
+    data: any,
+    _trx: any,
+    req,
+    isBulkAllOperation = false
+  ): Promise<void> {
+    let noOfUpdatedRecords = data;
+    if (!isBulkAllOperation) {
+      noOfUpdatedRecords = data.length;
+      await this.handleHooks('After.update', null, data, req);
+    }
 
     await Audit.insert({
       fk_model_id: this.model.id,
       op_type: AuditOperationTypes.DATA,
       op_sub_type: AuditOperationSubTypes.BULK_UPDATE,
       description: DOMPurify.sanitize(
-        `${data.length} records bulk updated in ${this.model.title}`
+        `${noOfUpdatedRecords} records bulk updated in ${this.model.title}`
       ),
       // details: JSON.stringify(data),
       ip: req?.clientIp,
@@ -2155,15 +2152,24 @@ class BaseModelSqlv2 {
     });
   }
 
-  public async afterBulkDelete(data: any, _trx: any, req): Promise<void> {
-    await this.handleHooks('After.delete', data, null, req);
+  public async afterBulkDelete(
+    data: any,
+    _trx: any,
+    req,
+    isBulkAllOperation = false
+  ): Promise<void> {
+    let noOfDeletedRecords = data;
+    if (!isBulkAllOperation) {
+      noOfDeletedRecords = data.length;
+      await this.handleHooks('After.delete', data, null, req);
+    }
 
     await Audit.insert({
       fk_model_id: this.model.id,
       op_type: AuditOperationTypes.DATA,
       op_sub_type: AuditOperationSubTypes.BULK_DELETE,
       description: DOMPurify.sanitize(
-        `${data.length} records bulk deleted in ${this.model.title}`
+        `${noOfDeletedRecords} records bulk deleted in ${this.model.title}`
       ),
       // details: JSON.stringify(data),
       ip: req?.clientIp,
@@ -2171,8 +2177,13 @@ class BaseModelSqlv2 {
     });
   }
 
-  public async afterBulkInsert(data: any[], _trx: any, req): Promise<void> {
-    await this.handleHooks('After.insert', null, data, req);
+  public async afterBulkInsert(
+    response: any,
+    data: any[],
+    _trx: any,
+    req
+  ): Promise<void> {
+    await this.handleHooks('After.insert', null, response, req);
 
     await Audit.insert({
       fk_model_id: this.model.id,

From 2d2d50f3c98b9f3f8ace2b70a30a580d8e418cba Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 25 Mar 2023 17:52:24 +0800
Subject: [PATCH 047/161] refactor(nocodb): lower case on hook events

---
 .../sql-data-mapper/lib/sql/BaseModelSqlv2.ts | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 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 9234f2866e..23fa267665 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
@@ -2107,11 +2107,11 @@ class BaseModelSqlv2 {
    * */
 
   public async beforeInsert(data: any, _trx: any, req): Promise<void> {
-    await this.handleHooks('Before.insert', null, data, req);
+    await this.handleHooks('before.insert', null, data, req);
   }
 
   public async afterInsert(data: any, _trx: any, req): Promise<void> {
-    await this.handleHooks('After.insert', null, data, req);
+    await this.handleHooks('after.insert', null, data, req);
     const id = this._extractPksValues(data);
     await Audit.insert({
       fk_model_id: this.model.id,
@@ -2136,7 +2136,7 @@ class BaseModelSqlv2 {
     let noOfUpdatedRecords = data;
     if (!isBulkAllOperation) {
       noOfUpdatedRecords = data.length;
-      await this.handleHooks('After.update', null, data, req);
+      await this.handleHooks('after.update', null, data, req);
     }
 
     await Audit.insert({
@@ -2161,7 +2161,7 @@ class BaseModelSqlv2 {
     let noOfDeletedRecords = data;
     if (!isBulkAllOperation) {
       noOfDeletedRecords = data.length;
-      await this.handleHooks('After.delete', data, null, req);
+      await this.handleHooks('after.delete', data, null, req);
     }
 
     await Audit.insert({
@@ -2183,7 +2183,7 @@ class BaseModelSqlv2 {
     _trx: any,
     req
   ): Promise<void> {
-    await this.handleHooks('After.insert', null, response, req);
+    await this.handleHooks('after.insert', null, response, req);
 
     await Audit.insert({
       fk_model_id: this.model.id,
@@ -2206,7 +2206,7 @@ class BaseModelSqlv2 {
       }
     }
     if (ignoreWebhook === undefined || ignoreWebhook === 'false') {
-      await this.handleHooks('Before.update', null, data, req);
+      await this.handleHooks('before.update', null, data, req);
     }
   }
 
@@ -2236,12 +2236,12 @@ class BaseModelSqlv2 {
       }
     }
     if (ignoreWebhook === undefined || ignoreWebhook === 'false') {
-      await this.handleHooks('After.update', prevData, newData, req);
+      await this.handleHooks('after.update', prevData, newData, req);
     }
   }
 
   public async beforeDelete(data: any, _trx: any, req): Promise<void> {
-    await this.handleHooks('Before.delete', null, data, req);
+    await this.handleHooks('before.delete', null, data, req);
   }
 
   public async afterDelete(data: any, _trx: any, req): Promise<void> {
@@ -2256,14 +2256,14 @@ class BaseModelSqlv2 {
       ip: req?.clientIp,
       user: req?.user?.email,
     });
-    await this.handleHooks('After.delete', data, null, req);
+    await this.handleHooks('after.delete', data, null, req);
   }
 
   private async handleHooks(hookName, prevData, newData, req): Promise<void> {
     const view = await View.get(this.viewId);
 
     // handle form view data submission
-    if (hookName === 'After.insert' && view.type === ViewTypes.FORM) {
+    if (hookName === 'after.insert' && view.type === ViewTypes.FORM) {
       try {
         const formView = await view.getView<FormView>();
         const { columns } = await FormView.getWithInfo(formView.fk_view_id);

From 4f6645ece7d9cf5465e57946b7d55f085e102091 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 25 Mar 2023 18:13:21 +0800
Subject: [PATCH 048/161] feat(nc-gui): add a-skeleton for hook call log

---
 packages/nc-gui/components/webhook/CallLog.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/webhook/CallLog.vue b/packages/nc-gui/components/webhook/CallLog.vue
index 3e513d9985..5f73141c88 100644
--- a/packages/nc-gui/components/webhook/CallLog.vue
+++ b/packages/nc-gui/components/webhook/CallLog.vue
@@ -4,7 +4,7 @@ import { onBeforeMount, parseProp, timeAgo, useApi } from '#imports'
 
 const props = defineProps<Props>()
 
-const { api } = useApi()
+const { api, isLoading } = useApi()
 
 const hookLogs = ref<HookLogType[]>([])
 
@@ -24,7 +24,8 @@ onBeforeMount(async () => {
 </script>
 
 <template>
-  <a-collapse v-model:activeKey="activeKey" class="nc-hook-log-collapse">
+  <a-skeleton v-if="isLoading" />
+  <a-collapse v-else v-model:activeKey="activeKey" class="nc-hook-log-collapse">
     <a-collapse-panel v-for="(hookLog, idx) of hookLogs" :key="idx">
       <template #header>
         <div class="w-full cursor-pointer">

From 12c495ca709debcf39218f0948462f104f4156f9 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 25 Mar 2023 18:13:31 +0800
Subject: [PATCH 049/161] feat(nocodb): only fetch the latest 10 records

---
 packages/nocodb/src/lib/models/HookLog.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/nocodb/src/lib/models/HookLog.ts b/packages/nocodb/src/lib/models/HookLog.ts
index d07b0f4233..7797b81a6b 100644
--- a/packages/nocodb/src/lib/models/HookLog.ts
+++ b/packages/nocodb/src/lib/models/HookLog.ts
@@ -42,6 +42,8 @@ export default class HookLog implements HookLogType {
       orderBy: {
         created_at: 'desc',
       },
+      // only fetch the latest 10 records
+      limit: 10,
     });
     return hookLogs?.map((h) => new HookLog(h));
   }

From d1d70110796ad2a157db0a500b8ba1d2bd5209cb Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 11:40:40 +0800
Subject: [PATCH 050/161] feat(nc-gui): add a-empty for call log

---
 packages/nc-gui/components/webhook/CallLog.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/components/webhook/CallLog.vue b/packages/nc-gui/components/webhook/CallLog.vue
index 5f73141c88..4709427c1f 100644
--- a/packages/nc-gui/components/webhook/CallLog.vue
+++ b/packages/nc-gui/components/webhook/CallLog.vue
@@ -25,6 +25,7 @@ onBeforeMount(async () => {
 
 <template>
   <a-skeleton v-if="isLoading" />
+  <a-empty v-else-if="!hookLogs.length" />
   <a-collapse v-else v-model:activeKey="activeKey" class="nc-hook-log-collapse">
     <a-collapse-panel v-for="(hookLog, idx) of hookLogs" :key="idx">
       <template #header>

From d3061a92313c3123d394dffcbb431566e7bdf2d3 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 12:39:33 +0800
Subject: [PATCH 051/161] fix(nocodb): add missing type & fk_hook_id in
 webhookHelper.ts

---
 packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index 1158fa467b..19fe63c4a7 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -245,8 +245,9 @@ export async function invokeWebhook(
 ) {
   let hookLog: HookLogType;
   const startTime = process.hrtime();
+  let notification;
   try {
-    const notification =
+    notification =
       typeof hook.notification === 'string'
         ? JSON.parse(hook.notification)
         : hook.notification;
@@ -299,6 +300,7 @@ export async function invokeWebhook(
           });
           hookLog = {
             ...hook,
+            fk_hook_id: hook.id,
             type: notification.type,
             payload: JSON.stringify(notification?.payload),
             response: JSON.stringify(res),
@@ -367,6 +369,8 @@ export async function invokeWebhook(
     console.log(e);
     hookLog = {
       ...hook,
+      type: notification.type,
+      fk_hook_id: hook.id,
       error_code: e.error_code,
       error_message: e.message,
       error: JSON.stringify(e),

From 13088c173d77dce972aa00031dd39e9ee97d0f17 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 12:51:41 +0800
Subject: [PATCH 052/161] fix(nocodb): throw error when plugin data is not
 found

---
 packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts b/packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts
index 49b1bc61bd..21e93fb3ed 100644
--- a/packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts
+++ b/packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts
@@ -181,7 +181,7 @@ class NcPluginMgrv2 {
       active: true,
     });
 
-    if (!pluginData) return null;
+    if (!pluginData) throw new Error('Plugin not configured / active');
 
     const pluginConfig = defaultPlugins.find(
       (c) => c.title === pluginData.title && c.category === PluginCategory.EMAIL
@@ -205,7 +205,7 @@ class NcPluginMgrv2 {
       active: true,
     });
 
-    if (!pluginData) throw new Error('Plugin not configured/active');
+    if (!pluginData) throw new Error('Plugin not configured / active');
 
     const pluginConfig = defaultPlugins.find(
       (c) => c.title === pluginData.title

From 89a51be837e75ac4969c476d11f1567c89549294 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 13:14:33 +0800
Subject: [PATCH 053/161] fix(nocodb): include missing payload & triggered_by
 in hookLog

---
 packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index 19fe63c4a7..3639b43eae 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -370,10 +370,12 @@ export async function invokeWebhook(
     hookLog = {
       ...hook,
       type: notification.type,
+      payload: JSON.stringify(notification?.payload),
       fk_hook_id: hook.id,
       error_code: e.error_code,
       error_message: e.message,
       error: JSON.stringify(e),
+      triggered_by: user?.email,
     };
     if (throwErrorOnFailure) throw e;
   } finally {

From 31ebed69f8acf892028716fee20c74bba4f22518 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 15:48:54 +0800
Subject: [PATCH 054/161] refactor(nocodb): rename to nc_029_webhook

---
 packages/nocodb/src/lib/migrations/XcMigrationSourcev2.ts | 8 ++++----
 ..._alter_hooklog_response_types.ts => nc_029_webhook.ts} | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)
 rename packages/nocodb/src/lib/migrations/v2/{nc_029_alter_hooklog_response_types.ts => nc_029_webhook.ts} (79%)

diff --git a/packages/nocodb/src/lib/migrations/XcMigrationSourcev2.ts b/packages/nocodb/src/lib/migrations/XcMigrationSourcev2.ts
index ce720b3b88..664e29ca2e 100644
--- a/packages/nocodb/src/lib/migrations/XcMigrationSourcev2.ts
+++ b/packages/nocodb/src/lib/migrations/XcMigrationSourcev2.ts
@@ -16,7 +16,7 @@ import * as nc_025_add_row_height from './v2/nc_025_add_row_height';
 import * as nc_026_map_view from './v2/nc_026_map_view';
 import * as nc_027_add_comparison_sub_op from './v2/nc_027_add_comparison_sub_op';
 import * as nc_028_add_enable_scanner_in_form_columns_meta_table from './v2/nc_028_add_enable_scanner_in_form_columns_meta_table';
-import * as nc_029_alter_hooklog_response_types from './v2/nc_029_alter_hooklog_response_types';
+import * as nc_029_webhook from './v2/nc_029_webhook';
 
 // Create a custom migration source class
 export default class XcMigrationSourcev2 {
@@ -44,7 +44,7 @@ export default class XcMigrationSourcev2 {
       'nc_026_map_view',
       'nc_027_add_comparison_sub_op',
       'nc_028_add_enable_scanner_in_form_columns_meta_table',
-      'nc_029_alter_hooklog_response_types',
+      'nc_029_webhook',
     ]);
   }
 
@@ -90,8 +90,8 @@ export default class XcMigrationSourcev2 {
         return nc_027_add_comparison_sub_op;
       case 'nc_028_add_enable_scanner_in_form_columns_meta_table':
         return nc_028_add_enable_scanner_in_form_columns_meta_table;
-      case 'nc_029_alter_hooklog_response_types':
-        return nc_029_alter_hooklog_response_types;
+      case 'nc_029_webhook':
+        return nc_029_webhook;
     }
   }
 }
diff --git a/packages/nocodb/src/lib/migrations/v2/nc_029_alter_hooklog_response_types.ts b/packages/nocodb/src/lib/migrations/v2/nc_029_webhook.ts
similarity index 79%
rename from packages/nocodb/src/lib/migrations/v2/nc_029_alter_hooklog_response_types.ts
rename to packages/nocodb/src/lib/migrations/v2/nc_029_webhook.ts
index 3aaff5d397..d597cd2015 100644
--- a/packages/nocodb/src/lib/migrations/v2/nc_029_alter_hooklog_response_types.ts
+++ b/packages/nocodb/src/lib/migrations/v2/nc_029_webhook.ts
@@ -14,6 +14,10 @@ const up = async (knex: Knex) => {
       table.text('response').alter();
     });
   }
+
+  await knex.schema.alterTable(MetaTable.COLUMNS, (table) => {
+    table.string('version');
+  });
 };
 
 const down = async (knex) => {
@@ -22,6 +26,10 @@ const down = async (knex) => {
       table.boolean('response').alter();
     });
   }
+
+  await knex.schema.alterTable(MetaTable.COLUMNS, (table) => {
+    table.dropColumn('version');
+  });
 };
 
 export { up, down };

From 5db32ff3cffef86f381cb025507e69858f45d0ae Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 16:02:25 +0800
Subject: [PATCH 055/161] fix(nocodb): incorrect metatable

---
 packages/nocodb/src/lib/migrations/v2/nc_029_webhook.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/lib/migrations/v2/nc_029_webhook.ts b/packages/nocodb/src/lib/migrations/v2/nc_029_webhook.ts
index d597cd2015..0c0aa450b0 100644
--- a/packages/nocodb/src/lib/migrations/v2/nc_029_webhook.ts
+++ b/packages/nocodb/src/lib/migrations/v2/nc_029_webhook.ts
@@ -15,7 +15,7 @@ const up = async (knex: Knex) => {
     });
   }
 
-  await knex.schema.alterTable(MetaTable.COLUMNS, (table) => {
+  await knex.schema.alterTable(MetaTable.HOOKS, (table) => {
     table.string('version');
   });
 };
@@ -27,7 +27,7 @@ const down = async (knex) => {
     });
   }
 
-  await knex.schema.alterTable(MetaTable.COLUMNS, (table) => {
+  await knex.schema.alterTable(MetaTable.HOOKS, (table) => {
     table.dropColumn('version');
   });
 };

From 097ae404e9c1166911179ca8f7d8a35fa17959c5 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 16:02:57 +0800
Subject: [PATCH 056/161] feat(nc-gui): revise call log layout

---
 .../nc-gui/components/webhook/CallLog.vue     | 43 +++++++++++++------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/components/webhook/CallLog.vue b/packages/nc-gui/components/webhook/CallLog.vue
index 4709427c1f..dbc4b3fef1 100644
--- a/packages/nc-gui/components/webhook/CallLog.vue
+++ b/packages/nc-gui/components/webhook/CallLog.vue
@@ -31,16 +31,23 @@ onBeforeMount(async () => {
       <template #header>
         <div class="w-full cursor-pointer">
           <div class="font-weight-medium flex">
-            <div class="flex-1">records.{{ hookLog.event }}.{{ hookLog.operation }} ({{ timeAgo(hookLog.created_at) }})</div>
+            <div class="flex-1">
+              {{ hookLog.type }}: records.{{ hookLog.event }}.{{ hookLog.operation }} ({{ timeAgo(hookLog.created_at) }})
+            </div>
             <div
+              v-if="hookLog.type === 'URL'"
               class="mx-1 px-2 py-1 text-white rounded bg-red-500 text-xs"
               :class="{ '!bg-green-500': parseProp(hookLog.response).status === 200 }"
             >
               {{ parseProp(hookLog.response).status }}
               {{ parseProp(hookLog.response).statusText }}
             </div>
+            <div v-if="hookLog.type === 'Email'">
+              <div v-if="hookLog.error_message" class="mx-1 px-2 py-1 text-white rounded text-xs bg-red-500">ERROR</div>
+              <div v-else class="mx-1 px-2 py-1 text-white rounded text-xs bg-green-500">OK</div>
+            </div>
           </div>
-          <div>
+          <div v-if="hookLog.type === 'URL'">
             <span class="font-weight-medium text-primary">
               {{ parseProp(hookLog.payload).method }}
             </span>
@@ -49,19 +56,31 @@ onBeforeMount(async () => {
         </div>
       </template>
 
-      <div class="nc-hook-log-request">
-        <div class="nc-hook-pre-title">Request</div>
-        <pre class="nc-hook-pre">{{ parseProp(hookLog.response).config.headers }}</pre>
-      </div>
+      <div v-if="hookLog.type === 'URL'">
+        <div class="nc-hook-log-request">
+          <div class="nc-hook-pre-title">Request</div>
+          <pre class="nc-hook-pre">{{ parseProp(hookLog.response).config.headers }}</pre>
+        </div>
 
-      <div class="nc-hook-log-response">
-        <div class="nc-hook-pre-title">Response</div>
-        <pre class="nc-hook-pre">{{ parseProp(hookLog.response).headers }}</pre>
+        <div class="nc-hook-log-response">
+          <div class="nc-hook-pre-title">Response</div>
+          <pre class="nc-hook-pre">{{ parseProp(hookLog.response).headers }}</pre>
+        </div>
+
+        <div class="nc-hook-log-payload">
+          <div class="nc-hook-pre-title">Payload</div>
+          <pre class="nc-hook-pre">{{ parseProp(parseProp(hookLog.response).config.data) }}</pre>
+        </div>
       </div>
 
-      <div class="nc-hook-log-payload">
-        <div class="nc-hook-pre-title">Payload</div>
-        <pre class="nc-hook-pre">{{ parseProp(parseProp(hookLog.response).config.data) }}</pre>
+      <div v-else-if="hookLog.type === 'Email'">
+        <div v-if="hookLog.error_message" class="mb-4">
+          {{ hookLog.error_message }}
+        </div>
+        <div class="nc-hook-log-payload">
+          <div class="nc-hook-pre-title">Payload</div>
+          <pre class="nc-hook-pre">{{ parseProp(hookLog.payload) }}</pre>
+        </div>
       </div>
     </a-collapse-panel>
   </a-collapse>

From 4bdcd192ddf654b6aecd1c9b62ea02e0197c1d5d Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 16:03:13 +0800
Subject: [PATCH 057/161] feat(nocodb): add ncHookUpgrader

---
 .../nocodb/src/lib/version-upgrader/NcUpgrader.ts   |  2 ++
 .../src/lib/version-upgrader/ncHookUpgrader.ts      | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 packages/nocodb/src/lib/version-upgrader/ncHookUpgrader.ts

diff --git a/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts
index 193f614d49..ebf48b75da 100644
--- a/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts
+++ b/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts
@@ -12,6 +12,7 @@ import ncDataTypesUpgrader from './ncDataTypesUpgrader';
 import ncProjectUpgraderV2_0090000 from './ncProjectUpgraderV2_0090000';
 import ncProjectEnvUpgrader0011045 from './ncProjectEnvUpgrader0011045';
 import ncProjectEnvUpgrader from './ncProjectEnvUpgrader';
+import ncHookUpgrader from './ncHookUpgrader';
 import type { NcConfig } from '../../interface/config';
 import type NcMetaIO from '../meta/NcMetaIO';
 
@@ -46,6 +47,7 @@ export default class NcUpgrader {
         { name: '0104004', handler: ncFilterUpgrader_0104004 },
         { name: '0105002', handler: ncStickyColumnUpgrader },
         { name: '0105003', handler: ncFilterUpgrader_0105003 },
+        { name: '0105004', handler: ncHookUpgrader },
       ];
       if (!(await ctx.ncMeta.knexConnection?.schema?.hasTable?.('nc_store'))) {
         return;
diff --git a/packages/nocodb/src/lib/version-upgrader/ncHookUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/ncHookUpgrader.ts
new file mode 100644
index 0000000000..41a842b4ea
--- /dev/null
+++ b/packages/nocodb/src/lib/version-upgrader/ncHookUpgrader.ts
@@ -0,0 +1,13 @@
+import { MetaTable } from '../utils/globals';
+import type { NcUpgraderCtx } from './NcUpgrader';
+
+export default async function ({ ncMeta }: NcUpgraderCtx) {
+  const actions = [];
+  const hooks = await ncMeta.metaList2(null, null, MetaTable.HOOKS);
+  for (const hook of hooks) {
+    actions.push(
+      ncMeta.metaUpdate(null, null, MetaTable.HOOKS, { version: 'v1' }, hook.id)
+    );
+  }
+  await Promise.all(actions);
+}

From 178b14f8de15309132796610883a53dfba700dcd Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 16:03:22 +0800
Subject: [PATCH 058/161] feat(nocodb): bump to 0105004

---
 packages/nocodb/src/lib/Noco.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/Noco.ts b/packages/nocodb/src/lib/Noco.ts
index 85c6ff8b61..8e3110b503 100644
--- a/packages/nocodb/src/lib/Noco.ts
+++ b/packages/nocodb/src/lib/Noco.ts
@@ -102,7 +102,7 @@ export default class Noco {
   constructor() {
     process.env.PORT = process.env.PORT || '8080';
     // todo: move
-    process.env.NC_VERSION = '0105003';
+    process.env.NC_VERSION = '0105004';
 
     // if env variable NC_MINIMAL_DBS is set, then disable project creation with external sources
     if (process.env.NC_MINIMAL_DBS) {

From 3f3204bb40ef79073cd2f3056e4a6e9ad8359ed8 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 16:17:13 +0800
Subject: [PATCH 059/161] feat(nocodb): add version to hook

---
 packages/nocodb/src/lib/models/Hook.ts  |   4 +
 packages/nocodb/src/schema/swagger.json | 210 ++++++++++++------------
 2 files changed, 113 insertions(+), 101 deletions(-)

diff --git a/packages/nocodb/src/lib/models/Hook.ts b/packages/nocodb/src/lib/models/Hook.ts
index 3334244e50..403bfbea9e 100644
--- a/packages/nocodb/src/lib/models/Hook.ts
+++ b/packages/nocodb/src/lib/models/Hook.ts
@@ -34,6 +34,7 @@ export default class Hook implements HookType {
 
   project_id?: string;
   base_id?: string;
+  version?: string;
 
   constructor(hook: Partial<Hook | HookReqType>) {
     Object.assign(this, hook);
@@ -156,6 +157,9 @@ export default class Hook implements HookType {
       insertObj.base_id = model.base_id;
     }
 
+    // new hook will set as version 2
+    insertObj.version = 'v2';
+
     const { id } = await ncMeta.metaInsert2(
       null,
       null,
diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json
index c7f32b6be6..ae22f32baa 100644
--- a/packages/nocodb/src/schema/swagger.json
+++ b/packages/nocodb/src/schema/swagger.json
@@ -5948,7 +5948,7 @@
         }
       ],
       "get": {
-        "summary": "Get Hook Logs",
+        "summary": "List Hook Logs",
         "operationId": "db-table-webhook-logs-list",
         "responses": {
           "200": {
@@ -5996,7 +5996,7 @@
           }
         },
         "tags": ["DB Table Webhook Logs"],
-        "description": "Get the log data in a given Hook",
+        "description": "List the log data in a given Hook",
         "parameters": [
           {
             "$ref": "#/components/parameters/xc-auth"
@@ -13716,7 +13716,7 @@
           }
         },
         "x-stoplight": {
-          "id": "it370mpkpd4mo"
+          "id": "95rfb0httdmw0"
         }
       },
       "ApiTokenReq": {
@@ -13737,13 +13737,13 @@
           }
         },
         "x-stoplight": {
-          "id": "uwroiaim8dm2p"
+          "id": "h3g2houpa6y9y"
         }
       },
       "ApiTokenList": {
         "description": "Model for API Token List",
         "x-stoplight": {
-          "id": "wnzpsmdzrwhi2"
+          "id": "35b7cvjplxmfm"
         },
         "examples": [
           {
@@ -13848,7 +13848,7 @@
           }
         },
         "x-stoplight": {
-          "id": "3fmfrjdlcgmrd"
+          "id": "pbx8hqgwdz7lw"
         }
       },
       "AttachmentReq": {
@@ -13886,7 +13886,7 @@
           }
         },
         "x-stoplight": {
-          "id": "o5x54q347g7wk"
+          "id": "jmahtr8c5rw7f"
         }
       },
       "Audit": {
@@ -14011,7 +14011,7 @@
           }
         },
         "x-stoplight": {
-          "id": "9evk17q5ozhen"
+          "id": "i5ug0n7j1wub8"
         }
       },
       "AuditRowUpdateReq": {
@@ -14051,7 +14051,7 @@
           }
         },
         "x-stoplight": {
-          "id": "gaksc2zunsxn3"
+          "id": "jcw57b1yv3xog"
         }
       },
       "Base": {
@@ -14128,7 +14128,7 @@
           }
         },
         "x-stoplight": {
-          "id": "cjc1f3xdpuhn0"
+          "id": "9hy3cgp0r2c95"
         }
       },
       "BaseList": {
@@ -14230,7 +14230,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "ufkgy8ah526p9"
+          "id": "kk8uqxeefumma"
         }
       },
       "BaseReq": {
@@ -14286,7 +14286,7 @@
         "title": "Base Request",
         "type": "object",
         "x-stoplight": {
-          "id": "ec2gzuidrzb05"
+          "id": "j2z6ain3204zi"
         }
       },
       "Bool": {
@@ -14308,7 +14308,7 @@
         ],
         "title": "Bool Model",
         "x-stoplight": {
-          "id": "ok0vakhbd76t7"
+          "id": "8n3vnyr22sbvj"
         }
       },
       "Column": {
@@ -14596,7 +14596,7 @@
           }
         },
         "x-stoplight": {
-          "id": "57ep883sdtjxj"
+          "id": "3a4lsn477mx4e"
         }
       },
       "ColumnList": {
@@ -14704,7 +14704,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "7nxvevdrdye9b"
+          "id": "rldg44w1alasg"
         }
       },
       "ColumnReq": {
@@ -14796,7 +14796,7 @@
         "title": "Column Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "5fibed0jjtlr8"
+          "id": "dvbn9dnme6jgi"
         }
       },
       "CommentReq": {
@@ -14829,13 +14829,13 @@
         },
         "required": ["fk_model_id", "row_id"],
         "x-stoplight": {
-          "id": "akpy6abwus2l2"
+          "id": "7nwlyinuliuvy"
         }
       },
       "CommentUpdateReq": {
         "description": "Model for Comment Update Request",
         "x-stoplight": {
-          "id": "icceq4bw1v0km"
+          "id": "r0f3ng2rahe38"
         },
         "examples": [
           {
@@ -15008,7 +15008,7 @@
         "title": "Filter Model",
         "type": "object",
         "x-stoplight": {
-          "id": "bvrjq1rxu3nsp"
+          "id": "f8vsb8alix01i"
         }
       },
       "FilterList": {
@@ -15097,13 +15097,13 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "r6vkd94fyxozp"
+          "id": "mfxg43iomcoue"
         }
       },
       "FilterLogList": {
         "description": "Model for Filter Log List",
         "x-stoplight": {
-          "id": "fnkro33vma0hm"
+          "id": "0voe9zdizy5qd"
         },
         "examples": [
           {
@@ -15204,7 +15204,7 @@
         "title": "Filter Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "y84fnz0i7hbvs"
+          "id": "pugjn1hobswqf"
         },
         "properties": {
           "comparison_op": {
@@ -15425,7 +15425,7 @@
           }
         },
         "x-stoplight": {
-          "id": "afkypb9o3rq26"
+          "id": "918aga51qb7w1"
         }
       },
       "FormUpdateReq": {
@@ -15496,7 +15496,7 @@
           }
         },
         "x-stoplight": {
-          "id": "m6bhkjsewt4ca"
+          "id": "zn4juts75pksq"
         }
       },
       "FormColumn": {
@@ -15590,7 +15590,7 @@
           }
         },
         "x-stoplight": {
-          "id": "257zo728yca9v"
+          "id": "gm46pinkspvrz"
         }
       },
       "FormColumnReq": {
@@ -15657,7 +15657,7 @@
           }
         },
         "x-stoplight": {
-          "id": "fkb1v0345thvk"
+          "id": "nmffmb1p3wkg9"
         }
       },
       "Formula": {
@@ -15698,7 +15698,7 @@
           }
         },
         "x-stoplight": {
-          "id": "vj4rcanzq3kfi"
+          "id": "hlu7yokpavxwb"
         }
       },
       "FormulaColumnReq": {
@@ -15735,7 +15735,7 @@
           }
         },
         "x-stoplight": {
-          "id": "gnaln1acb43hm"
+          "id": "v26r0c9hlimtv"
         }
       },
       "Gallery": {
@@ -15829,7 +15829,7 @@
         "title": "Gallery Model",
         "type": "object",
         "x-stoplight": {
-          "id": "a74prkhtnnyhm"
+          "id": "i0h7av37o4eks"
         }
       },
       "GalleryColumn": {
@@ -15864,13 +15864,13 @@
         "title": "Gallery Column Model",
         "type": "object",
         "x-stoplight": {
-          "id": "jvg5iiax5wl2w"
+          "id": "jdhvl7gb33fqo"
         }
       },
       "GalleryUpdateReq": {
         "description": "Model for Gallery View Update Request",
         "x-stoplight": {
-          "id": "w9wics1pxeiut"
+          "id": "x57k1fq4101e1"
         },
         "examples": [
           {
@@ -15923,7 +15923,7 @@
         "title": "Geo Location Model",
         "type": "object",
         "x-stoplight": {
-          "id": "hbtz74i4vhlpb"
+          "id": "685e1l91iuxhv"
         }
       },
       "Grid": {
@@ -16033,13 +16033,13 @@
           }
         },
         "x-stoplight": {
-          "id": "536fsmtot3wyr"
+          "id": "1xswddf91q5pu"
         }
       },
       "Grid - copy": {
         "description": "Model for Grid",
         "x-stoplight": {
-          "id": "lu6lfh8g5zjcr"
+          "id": "xheueli0578g0"
         },
         "examples": [
           {
@@ -16227,7 +16227,7 @@
           }
         },
         "x-stoplight": {
-          "id": "f7xbsa3t5ct1x"
+          "id": "g06nri6t6h6ke"
         }
       },
       "GridColumnReq": {
@@ -16265,13 +16265,13 @@
         "title": "Grid Column Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "ulgt2hbbj9lxr"
+          "id": "8v9cxve0332zg"
         }
       },
       "GridUpdateReq": {
         "description": "Model for Grid View Update",
         "x-stoplight": {
-          "id": "yy9okqonhfj6u"
+          "id": "g10t5gray4bk5"
         },
         "examples": [
           {
@@ -16321,6 +16321,9 @@
         ],
         "title": "Hook Model",
         "type": "object",
+        "x-stoplight": {
+          "id": "32blg2oqo6g7p"
+        },
         "properties": {
           "active": {
             "$ref": "#/components/schemas/Bool",
@@ -16388,16 +16391,21 @@
           "type": {
             "type": "string",
             "description": "Hook Type"
+          },
+          "version": {
+            "type": "string",
+            "x-stoplight": {
+              "id": "socewqvadj91n"
+            },
+            "example": "v2",
+            "description": "Hook Version"
           }
-        },
-        "x-stoplight": {
-          "id": "zge9ad0ftmp1b"
         }
       },
       "HookReq": {
         "description": "Model for Hook",
         "x-stoplight": {
-          "id": "0zcc73h12ebop"
+          "id": "85vr8fx3oea31"
         },
         "examples": [
           {
@@ -16575,7 +16583,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "5metgdb0snm6t"
+          "id": "n2sbatqu55day"
         }
       },
       "HookLog": {
@@ -16600,7 +16608,7 @@
         "title": "Hook Log Model",
         "type": "object",
         "x-stoplight": {
-          "id": "2ecbvr0ha9nha"
+          "id": "ni303795b18y5"
         },
         "properties": {
           "base_id": {
@@ -16685,7 +16693,7 @@
       "HookLogList": {
         "description": "Model for Hook Log List",
         "x-stoplight": {
-          "id": "upury390qrd53"
+          "id": "tfv7y629w2ap2"
         },
         "examples": [],
         "title": "Hook Log List Model",
@@ -16786,7 +16794,7 @@
         },
         "required": ["hook", "payload"],
         "x-stoplight": {
-          "id": "t523aaetv4ouo"
+          "id": "w64q11jiv01np"
         }
       },
       "Id": {
@@ -16797,7 +16805,7 @@
         "title": "ID Model",
         "type": "string",
         "x-stoplight": {
-          "id": "y6fmtic1d1shr"
+          "id": "obj8r7jhyfoqg"
         }
       },
       "Kanban": {
@@ -16864,7 +16872,7 @@
           }
         },
         "x-stoplight": {
-          "id": "5r5zzs9a7ai64"
+          "id": "sfbbvgbcv7je6"
         }
       },
       "KanbanColumn": {
@@ -16937,7 +16945,7 @@
           }
         },
         "x-stoplight": {
-          "id": "pjk7pky2i6w7j"
+          "id": "epfedw9ccxgxe"
         }
       },
       "KanbanUpdateReq": {
@@ -17014,7 +17022,7 @@
           }
         },
         "x-stoplight": {
-          "id": "nzhwki0tq91mj"
+          "id": "b1jlyk12kfuwx"
         }
       },
       "LicenseReq": {
@@ -17036,7 +17044,7 @@
         "title": "License Key Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "2tr020jyvzaje"
+          "id": "trgk6qlmgdyfo"
         }
       },
       "LinkToAnotherColumnReq": {
@@ -17085,7 +17093,7 @@
         "title": "LinkToAnotherColumn Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "3x9fwotpk3vde"
+          "id": "x59gz5reg12x3"
         }
       },
       "LinkToAnotherRecord": {
@@ -17161,7 +17169,7 @@
         "title": "LinkToAnotherRecord Model",
         "type": "object",
         "x-stoplight": {
-          "id": "5m22fq1stz0bs"
+          "id": "27q0vnr79hxla"
         }
       },
       "Lookup": {
@@ -17201,7 +17209,7 @@
           }
         },
         "x-stoplight": {
-          "id": "qhodn5h5sjbsz"
+          "id": "guyozhka8sx1t"
         }
       },
       "LookupColumnReq": {
@@ -17238,7 +17246,7 @@
           }
         },
         "x-stoplight": {
-          "id": "9cgn1ltvand3u"
+          "id": "hmeckhq2ciwpf"
         }
       },
       "Map": {
@@ -17315,13 +17323,13 @@
         "title": "Map Model",
         "type": "object",
         "x-stoplight": {
-          "id": "0g3zvgirw5kaz"
+          "id": "hd60sf3k0bs3w"
         }
       },
       "MapUpdateReq": {
         "description": "Model for Map",
         "x-stoplight": {
-          "id": "ulnej4ox46lau"
+          "id": "3hceyh9ukp5ln"
         },
         "examples": [
           {
@@ -17396,7 +17404,7 @@
         "title": "Map Column Model",
         "type": "object",
         "x-stoplight": {
-          "id": "ymw6dfgts8s3q"
+          "id": "bvk0acuepoqw1"
         }
       },
       "Meta": {
@@ -17415,7 +17423,7 @@
         ],
         "title": "Meta Model",
         "x-stoplight": {
-          "id": "o5pfub7ud6bk6"
+          "id": "2ohjoms6hjcym"
         }
       },
       "ModelRoleVisibility": {
@@ -17458,7 +17466,7 @@
         "title": "ModelRoleVisibility Model",
         "type": "object",
         "x-stoplight": {
-          "id": "ep1wmfm8zzjw7"
+          "id": "68m1dblcswem2"
         }
       },
       "NormalColumnRequest": {
@@ -17637,7 +17645,7 @@
         "type": "object",
         "required": ["column_name"],
         "x-stoplight": {
-          "id": "e715zmc8glgpl"
+          "id": "b67hswwa49t9u"
         }
       },
       "OrgUserReq": {
@@ -17662,7 +17670,7 @@
         "title": "Organisation User Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "rgo441jq0x5ld"
+          "id": "hs5aforkqjbkb"
         }
       },
       "Paginated": {
@@ -17704,7 +17712,7 @@
         "title": "Paginated Model",
         "type": "object",
         "x-stoplight": {
-          "id": "695ek5fqx7l65"
+          "id": "ny0v2losvmitz"
         }
       },
       "Password": {
@@ -17715,7 +17723,7 @@
         "title": "Password Model",
         "type": "string",
         "x-stoplight": {
-          "id": "juk25fjpj8jdk"
+          "id": "c6iocwuo2j8z8"
         }
       },
       "PasswordChangeReq": {
@@ -17739,7 +17747,7 @@
         "title": "Password Change Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "063yexshac0xr"
+          "id": "99dogahvh0gla"
         }
       },
       "PasswordForgotReq": {
@@ -17760,7 +17768,7 @@
         "title": "Password Forgot Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "vewwishkot5gy"
+          "id": "1kkft7m54ax45"
         }
       },
       "PasswordResetReq": {
@@ -17782,7 +17790,7 @@
         "title": "Password Reset Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "juiq70hujawwd"
+          "id": "i3gzz403zjwh8"
         }
       },
       "Plugin": {
@@ -17899,7 +17907,7 @@
           }
         },
         "x-stoplight": {
-          "id": "5tnitw91zxe22"
+          "id": "uux5n95kbh2r5"
         }
       },
       "PluginReq": {
@@ -17923,7 +17931,7 @@
           }
         },
         "x-stoplight": {
-          "id": "jwg0bw0jjvoz4"
+          "id": "pci8zg4wgn3bx"
         }
       },
       "PluginTestReq": {
@@ -17965,7 +17973,7 @@
         },
         "required": ["title", "input", "category"],
         "x-stoplight": {
-          "id": "sfunw9hbi6eti"
+          "id": "gest5kbecpjdi"
         }
       },
       "Project": {
@@ -18055,7 +18063,7 @@
           }
         },
         "x-stoplight": {
-          "id": "cokbbcuqg6ggf"
+          "id": "gae6rj3whdnj9"
         }
       },
       "ProjectList": {
@@ -18151,7 +18159,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "37n1y48c6mfux"
+          "id": "xbosckfm1h9l0"
         }
       },
       "ProjectReq": {
@@ -18204,13 +18212,13 @@
         "title": "Project Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "gsxle49ts2t1m"
+          "id": "aicbp4keo57ld"
         }
       },
       "ProjectUpdateReq": {
         "description": "Model for Project Update Request",
         "x-stoplight": {
-          "id": "98gjamvw0ps9f"
+          "id": "83257b35r118q"
         },
         "examples": [
           {
@@ -18275,7 +18283,7 @@
         },
         "required": ["email", "roles"],
         "x-stoplight": {
-          "id": "j8mnx42dkx0oo"
+          "id": "tq2wpd2agebjz"
         }
       },
       "Rollup": {
@@ -18324,7 +18332,7 @@
           }
         },
         "x-stoplight": {
-          "id": "70tktm8p5ghjk"
+          "id": "vdzh0qojyn9a9"
         }
       },
       "RollupColumnReq": {
@@ -18375,7 +18383,7 @@
           }
         },
         "x-stoplight": {
-          "id": "qtjqawfmifm16"
+          "id": "uw9fq6lp1lone"
         }
       },
       "SelectOption": {
@@ -18417,7 +18425,7 @@
           }
         },
         "x-stoplight": {
-          "id": "dpmp6frg1ns6q"
+          "id": "onnh5qie1ul32"
         }
       },
       "SelectOptions": {
@@ -18448,7 +18456,7 @@
         },
         "required": ["options"],
         "x-stoplight": {
-          "id": "nesh72pk907o9"
+          "id": "3i68n0spduuf9"
         }
       },
       "SharedBaseReq": {
@@ -18476,7 +18484,7 @@
           }
         },
         "x-stoplight": {
-          "id": "de0d2izgi3ssd"
+          "id": "ep7ikmx3sudcl"
         }
       },
       "SharedView": {
@@ -18514,7 +18522,7 @@
           }
         ],
         "x-stoplight": {
-          "id": "kt8tyazx1hl9p"
+          "id": "fqfohevz2zj4u"
         }
       },
       "SharedViewList": {
@@ -18608,7 +18616,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "5af0r928phzi8"
+          "id": "zdpekhmw0wvj3"
         }
       },
       "SharedViewReq": {
@@ -18632,7 +18640,7 @@
           }
         },
         "x-stoplight": {
-          "id": "7rn8w0bn6rj27"
+          "id": "0g3o2uo9y4h4g"
         }
       },
       "SignInReq": {
@@ -18658,7 +18666,7 @@
         "title": "Signin Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "uuk84yov9ug31"
+          "id": "dxxafjky40cz1"
         }
       },
       "SignUpReq": {
@@ -18717,7 +18725,7 @@
         },
         "required": ["email", "password"],
         "x-stoplight": {
-          "id": "gcgfe08qwd747"
+          "id": "2rcbk0flkc4yu"
         }
       },
       "Sort": {
@@ -18770,7 +18778,7 @@
           }
         },
         "x-stoplight": {
-          "id": "ia9gyblndemhc"
+          "id": "3jjbe2mjzy5li"
         }
       },
       "SortList": {
@@ -18851,7 +18859,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "ufp0ghdiwrj7l"
+          "id": "fsq6d3pi8b3iz"
         }
       },
       "SortReq": {
@@ -18877,7 +18885,7 @@
           }
         },
         "x-stoplight": {
-          "id": "t6uwa7bvhea9w"
+          "id": "lao7jfow2dbe7"
         }
       },
       "StringOrNull": {
@@ -18894,7 +18902,7 @@
         ],
         "title": "StringOrNull Model",
         "x-stoplight": {
-          "id": "mjdkmqlwnnpqa"
+          "id": "xh9dwrizrvfh6"
         }
       },
       "Table": {
@@ -19323,7 +19331,7 @@
         },
         "required": ["table_name", "title"],
         "x-stoplight": {
-          "id": "jbfaq3weq7pqu"
+          "id": "rvdu5okgpz1xk"
         }
       },
       "TableList": {
@@ -19453,7 +19461,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "q6831buusfkmr"
+          "id": "25z7dodhqs3lc"
         }
       },
       "TableReq": {
@@ -19594,7 +19602,7 @@
         "title": "Table Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "2778zbubk8oke"
+          "id": "kilqakhuuzstv"
         }
       },
       "User": {
@@ -19646,7 +19654,7 @@
         },
         "required": ["email", "email_verified", "firstname", "id", "lastname"],
         "x-stoplight": {
-          "id": "j1eup2eblptjz"
+          "id": "nwug6wvbc5yrp"
         }
       },
       "UserInfo": {
@@ -19690,7 +19698,7 @@
         "title": "User Info Model",
         "type": "object",
         "x-stoplight": {
-          "id": "gh2ryk6eif3ow"
+          "id": "qravubcoxvr6x"
         }
       },
       "UserList": {
@@ -19771,7 +19779,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "46tznvolzhh6f"
+          "id": "11epslmm9jcga"
         }
       },
       "View": {
@@ -19885,7 +19893,7 @@
         },
         "required": ["fk_model_id", "show", "title", "type"],
         "x-stoplight": {
-          "id": "97nh4i07eyrac"
+          "id": "pbahdgaroikdz"
         }
       },
       "ViewList": {
@@ -20013,13 +20021,13 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "82hxym7ti79r2"
+          "id": "5wwtppugkhbeh"
         }
       },
       "ViewCreateReq": {
         "type": "object",
         "x-stoplight": {
-          "id": "1p0way06fnz8n"
+          "id": "lksv99846uy60"
         },
         "title": "ViewCreateReq",
         "description": "Model for View Create Request",
@@ -20088,7 +20096,7 @@
       "ViewUpdateReq": {
         "description": "Model for View Update Request",
         "x-stoplight": {
-          "id": "astobhpdfnmob"
+          "id": "1enlswadfc6p5"
         },
         "examples": [
           {
@@ -20153,7 +20161,7 @@
       "ViewColumnUpdateReq": {
         "description": "Model for View Column Update Request",
         "x-stoplight": {
-          "id": "9a3vtqvzn30xs"
+          "id": "ifzuv29axterb"
         },
         "examples": [
           {
@@ -20182,7 +20190,7 @@
       "ViewColumnReq": {
         "description": "Model for View Column Request",
         "x-stoplight": {
-          "id": "2cj4deea7o4zb"
+          "id": "z4bq84nyqkhd8"
         },
         "examples": [
           {
@@ -20273,7 +20281,7 @@
         "title": "Visibility Rule Request Model",
         "type": "array",
         "x-stoplight": {
-          "id": "49mghoeqaud3a"
+          "id": "vuo5q4vwtarx8"
         }
       }
     },

From 708469d9af17b769d2722069e424144b119969a8 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 16:17:23 +0800
Subject: [PATCH 060/161] chore(sdk): regenerate Api.ts

---
 packages/nocodb-sdk/src/lib/Api.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index a3fa0b7e0e..b2600b18a2 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -1138,6 +1138,11 @@ export interface HookType {
   title?: string;
   /** Hook Type */
   type?: string;
+  /**
+   * Hook Version
+   * @example v2
+   */
+  version?: string;
 }
 
 /**
@@ -6477,11 +6482,11 @@ export class Api<
   };
   dbTableWebhookLogs = {
     /**
- * @description Get the log data in a given Hook
+ * @description List the log data in a given Hook
  * 
  * @tags DB Table Webhook Logs
  * @name List
- * @summary Get Hook Logs
+ * @summary List Hook Logs
  * @request GET:/api/v1/db/meta/hooks/{hookId}/logs
  * @response `200` `HookLogListType` OK
  * @response `400` `{

From 92ea751c453d8a0846afd256d43116b079bc61c6 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 16:27:55 +0800
Subject: [PATCH 061/161] feat(nnocodb): hide copy hook btn for v1 and add
 version label in hook list

---
 .../lib/meta/helpers/populateSamplePayload.ts | 38 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts b/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
index e598d4baea..90a78f7ba1 100644
--- a/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
+++ b/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
@@ -7,7 +7,43 @@ import type LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColu
 import type LookupColumn from '../../models/LookupColumn';
 import type SelectOption from '../../models/SelectOption';
 
-export default async function populateSamplePayload(
+export async function populateSamplePayload(
+  viewOrModel: View | Model,
+  includeNested = false,
+  operation = 'insert'
+) {
+  const out = {};
+  let columns: Column[] = [];
+  let model: Model;
+  if (viewOrModel instanceof View) {
+    const viewColumns = await viewOrModel.getColumns();
+    for (const col of viewColumns) {
+      if (col.show) columns.push(await Column.get({ colId: col.fk_column_id }));
+    }
+    model = await viewOrModel.getModel();
+    await model.getColumns();
+  } else if (viewOrModel instanceof Model) {
+    columns = await viewOrModel.getColumns();
+    model = viewOrModel;
+  }
+
+  for (const column of columns) {
+    if (
+      !includeNested &&
+      [UITypes.LinkToAnotherRecord, UITypes.Lookup].includes(column.uidt)
+    )
+      continue;
+
+    if (operation === 'delete' && model.primaryKey?.title !== column.title)
+      continue;
+
+    out[column.title] = await getSampleColumnValue(column);
+  }
+
+  return out;
+}
+
+export default async function populateSamplePayloadV2(
   viewOrModel: View | Model,
   includeNested = false,
   operation = 'insert',

From c3ac2f38783a5b4fcdb67cb293e1afa3ca347c36 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 17:14:49 +0800
Subject: [PATCH 062/161] feat(nocodb): include version in samplePayload api

---
 packages/nocodb/src/schema/swagger.json | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json
index ae22f32baa..9dd42043e9 100644
--- a/packages/nocodb/src/schema/swagger.json
+++ b/packages/nocodb/src/schema/swagger.json
@@ -1,5 +1,8 @@
 {
   "openapi": "3.1.0",
+  "x-stoplight": {
+    "id": "ayhjcuoo4l66r"
+  },
   "info": {
     "title": "nocodb",
     "version": "1.0",
@@ -12130,7 +12133,7 @@
         ]
       }
     },
-    "/api/v1/db/meta/tables/{tableId}/hooks/samplePayload/{operation}": {
+    "/api/v1/db/meta/tables/{tableId}/hooks/samplePayload/{operation}/{version}": {
       "parameters": [
         {
           "schema": {
@@ -12150,7 +12153,18 @@
           },
           "name": "operation",
           "in": "path",
-          "required": true
+          "required": true,
+          "description": "Hook Operation"
+        },
+        {
+          "schema": {
+            "type": "string",
+            "enum": ["v1", "v2"]
+          },
+          "name": "version",
+          "in": "path",
+          "required": true,
+          "description": "Hook Version"
         }
       ],
       "get": {
@@ -16398,7 +16412,8 @@
               "id": "socewqvadj91n"
             },
             "example": "v2",
-            "description": "Hook Version"
+            "description": "Hook Version",
+            "enum": ["v1", "v2"]
           }
         }
       },

From 17a0fc4f18680df4e32a0f93e3c134fcb82116ed Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 17:15:13 +0800
Subject: [PATCH 063/161] feat(nocodb): pass version to tableSampleData

---
 packages/nocodb/src/lib/controllers/hook.ctl.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/controllers/hook.ctl.ts b/packages/nocodb/src/lib/controllers/hook.ctl.ts
index ae7b7ce112..fec5f4e62b 100644
--- a/packages/nocodb/src/lib/controllers/hook.ctl.ts
+++ b/packages/nocodb/src/lib/controllers/hook.ctl.ts
@@ -58,6 +58,7 @@ export async function tableSampleData(req: Request, res: Response) {
     await hookService.tableSampleData({
       tableId: req.params.tableId,
       operation: req.params.operation as 'insert' | 'update',
+      version: req.params.version as 'v1' | 'v2',
     })
   );
 }
@@ -102,7 +103,7 @@ router.patch(
   ncMetaAclMw(hookUpdate, 'hookUpdate')
 );
 router.get(
-  '/api/v1/db/meta/tables/:tableId/hooks/samplePayload/:operation',
+  '/api/v1/db/meta/tables/:tableId/hooks/samplePayload/:operation/:version',
   metaApiMetrics,
   catchError(tableSampleData)
 );

From b0b63b5cef67e73202fdfbbf5398ca7237a717e4 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 17:15:26 +0800
Subject: [PATCH 064/161] chore(sdk): regenerate Api.ts

---
 packages/nocodb-sdk/src/lib/Api.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index b2600b18a2..550473a5d2 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -1142,7 +1142,7 @@ export interface HookType {
    * Hook Version
    * @example v2
    */
-  version?: string;
+  version?: 'v1' | 'v2';
 }
 
 /**
@@ -8970,7 +8970,7 @@ export class Api<
  * @tags DB Table Webhook
  * @name SamplePayloadGet
  * @summary Get Sample Hook Payload
- * @request GET:/api/v1/db/meta/tables/{tableId}/hooks/samplePayload/{operation}
+ * @request GET:/api/v1/db/meta/tables/{tableId}/hooks/samplePayload/{operation}/{version}
  * @response `200` `{
   \** Sample Payload Data *\
   data?: object,
@@ -8985,6 +8985,7 @@ export class Api<
     samplePayloadGet: (
       tableId: IdType,
       operation: 'update' | 'delete' | 'insert',
+      version: 'v1' | 'v2',
       params: RequestParams = {}
     ) =>
       this.request<
@@ -8997,7 +8998,7 @@ export class Api<
           msg: string;
         }
       >({
-        path: `/api/v1/db/meta/tables/${tableId}/hooks/samplePayload/${operation}`,
+        path: `/api/v1/db/meta/tables/${tableId}/hooks/samplePayload/${operation}/${version}`,
         method: 'GET',
         format: 'json',
         ...params,

From f02f9d095aa3d796ea4d2382ff7e718364daa084 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 17:15:34 +0800
Subject: [PATCH 065/161] fix(nc-gui): info icon

---
 packages/nc-gui/utils/iconUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/utils/iconUtils.ts b/packages/nc-gui/utils/iconUtils.ts
index d2b25f5b88..1c1bb15fb5 100644
--- a/packages/nc-gui/utils/iconUtils.ts
+++ b/packages/nc-gui/utils/iconUtils.ts
@@ -177,7 +177,7 @@ import NcIconsRowHeightExtraTall from '~icons/nc-icons/row-height-extra-tall'
 } as const */
 
 export const iconMap = {
-  info: h('span', { class: 'material-symbols-outlined' }, 'info_outline'),
+  info: h('span', { class: 'material-symbols-outlined' }, 'info'),
   loading: h('span', { class: 'material-symbols-outlined' }, 'autorenew'),
   arrowCollapse: h('span', { class: 'material-symbols-outlined' }, 'keyboard_arrow_up'),
   markerAlert: h('span', { class: 'material-symbols-outlined' }, 'warning'),

From 94f0a52bc42738a75afcc7fd06a662e510acbbf7 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 17:16:29 +0800
Subject: [PATCH 066/161] feat(nc-gui): include data usage in hook for non v2
 url hooks

---
 packages/nc-gui/components/webhook/Editor.vue | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 5d29d7f0b2..c33d705f8e 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -697,6 +697,24 @@ onMounted(async () => {
 
           <a-row>
             <a-col :span="24">
+              <div v-if="!(hook.version === 'v2' && hook.type === 'URL')" class="text-gray-600">
+                <em>Use context variable <strong>data</strong> to refer the record under consideration</em>
+
+                <a-tooltip bottom>
+                  <template #title>
+                    <span> <strong>data</strong> : Row data <br /> </span>
+                  </template>
+                  <component :is="iconMap.info" class="ml-2" />
+                </a-tooltip>
+
+                <div class="my-3">
+                  <a href="https://docs.nocodb.com/developer-resources/webhooks/" target="_blank">
+                    <!-- Document Reference -->
+                    {{ $t('labels.docReference') }}
+                  </a>
+                </div>
+              </div>
+
               <LazyWebhookTest
                 ref="webhookTestRef"
                 :hook="{

From 6f3f191d7bac2985b993540d2826cda02c95ce7e Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 17:16:50 +0800
Subject: [PATCH 067/161] feat(nc-gui): disable copy hook for v1 and add
 version label

---
 packages/nc-gui/components/webhook/List.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/webhook/List.vue b/packages/nc-gui/components/webhook/List.vue
index 50efd053c4..911138837d 100644
--- a/packages/nc-gui/components/webhook/List.vue
+++ b/packages/nc-gui/components/webhook/List.vue
@@ -129,9 +129,10 @@ onMounted(() => {
               </template>
 
               <template #title>
-                <span class="text-xl normal-case">
+                <div class="text-xl normal-case">
                   {{ item.title }}
-                </span>
+                  <span class="text-gray-400 text-sm"> ({{ item.version }}) </span>
+                </div>
               </template>
 
               <template #avatar>
@@ -150,7 +151,7 @@ onMounted(() => {
                 <div class="mr-2">{{ $t('labels.notifyVia') }} : {{ item?.notification?.type }}</div>
 
                 <div class="float-right pt-2 pr-1">
-                  <a-tooltip placement="left">
+                  <a-tooltip placement="left" v-if="item.version === 'v2'">
                     <template #title>
                       {{ $t('activity.copyWebhook') }}
                     </template>

From d44cf26ab2b5572a3ed8593a53993ccf6f608cf1 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 17:17:16 +0800
Subject: [PATCH 068/161] chore(nocodb): remove default in
 populateSamplePayload

---
 packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts b/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
index 90a78f7ba1..96a7591d91 100644
--- a/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
+++ b/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
@@ -43,7 +43,7 @@ export async function populateSamplePayload(
   return out;
 }
 
-export default async function populateSamplePayloadV2(
+export async function populateSamplePayloadV2(
   viewOrModel: View | Model,
   includeNested = false,
   operation = 'insert',

From f4b55745235c6f5c525451a70b89443f28d9b38f Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 17:17:34 +0800
Subject: [PATCH 069/161] feat(nocodb): show sample payload based on version

---
 packages/nocodb/src/lib/services/hook.svc.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/lib/services/hook.svc.ts b/packages/nocodb/src/lib/services/hook.svc.ts
index ec5d32f669..cec60718db 100644
--- a/packages/nocodb/src/lib/services/hook.svc.ts
+++ b/packages/nocodb/src/lib/services/hook.svc.ts
@@ -3,7 +3,10 @@ import { validatePayload } from '../meta/api/helpers';
 import { NcError } from '../meta/helpers/catchError';
 import { Hook, HookLog, Model } from '../models';
 import { invokeWebhook } from '../meta/helpers/webhookHelpers';
-import populateSamplePayload from '../meta/helpers/populateSamplePayload';
+import {
+  populateSamplePayload,
+  populateSamplePayloadV2,
+} from '../meta/helpers/populateSamplePayload';
 import type { HookReqType, HookTestReqType } from 'nocodb-sdk';
 
 function validateHookPayload(
@@ -98,8 +101,12 @@ export async function hookTest(param: {
 export async function tableSampleData(param: {
   tableId: string;
   operation: 'insert' | 'update';
+  version: 'v1' | 'v2';
 }) {
   const model = await Model.getByIdOrName({ id: param.tableId });
 
-  return await populateSamplePayload(model, false, param.operation);
+  if (param.version === 'v1') {
+    return await populateSamplePayload(model, false, param.operation);
+  }
+  return await populateSamplePayloadV2(model, false, param.operation);
 }

From 62013be1f30949cd6a521a9b76be0fe6e34c081f Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 17:17:46 +0800
Subject: [PATCH 070/161] feat(nc-gui): pass hook.version to samplePayloadGet

---
 packages/nc-gui/components/webhook/Test.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/webhook/Test.vue b/packages/nc-gui/components/webhook/Test.vue
index 2bff4fafa1..27d6ebd0b5 100644
--- a/packages/nc-gui/components/webhook/Test.vue
+++ b/packages/nc-gui/components/webhook/Test.vue
@@ -24,7 +24,7 @@ watch(
 )
 
 async function loadSampleData() {
-  sampleData.value = await $api.dbTableWebhook.samplePayloadGet(meta?.value?.id as string, hook?.operation || 'insert')
+  sampleData.value = await $api.dbTableWebhook.samplePayloadGet(meta?.value?.id as string, hook?.operation || 'insert', hook.version)
 }
 
 async function testWebhook() {

From 62d2e414fa8b3b861d25973bb8a93f409eb5bfcb Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 17:18:27 +0800
Subject: [PATCH 071/161] fix(nocodb): hook version type

---
 packages/nocodb/src/lib/models/Hook.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/models/Hook.ts b/packages/nocodb/src/lib/models/Hook.ts
index 403bfbea9e..e24bd9a460 100644
--- a/packages/nocodb/src/lib/models/Hook.ts
+++ b/packages/nocodb/src/lib/models/Hook.ts
@@ -34,7 +34,7 @@ export default class Hook implements HookType {
 
   project_id?: string;
   base_id?: string;
-  version?: string;
+  version?: 'v1' | 'v2';
 
   constructor(hook: Partial<Hook | HookReqType>) {
     Object.assign(this, hook);

From 3751366dcc442d6c9f3b4a70ce32d6cead5a071d Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 17:18:44 +0800
Subject: [PATCH 072/161] chore(nocodb): remove hook log hardcoded limit

---
 packages/nocodb/src/lib/models/HookLog.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/nocodb/src/lib/models/HookLog.ts b/packages/nocodb/src/lib/models/HookLog.ts
index 7797b81a6b..d07b0f4233 100644
--- a/packages/nocodb/src/lib/models/HookLog.ts
+++ b/packages/nocodb/src/lib/models/HookLog.ts
@@ -42,8 +42,6 @@ export default class HookLog implements HookLogType {
       orderBy: {
         created_at: 'desc',
       },
-      // only fetch the latest 10 records
-      limit: 10,
     });
     return hookLogs?.map((h) => new HookLog(h));
   }

From bb517753d7f350f43908c3797cb4f9eebd677ec7 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 17:37:54 +0800
Subject: [PATCH 073/161] refactor(nc-gui): reorder version tag in hook list

---
 packages/nc-gui/components/webhook/List.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/webhook/List.vue b/packages/nc-gui/components/webhook/List.vue
index 911138837d..16958f9de5 100644
--- a/packages/nc-gui/components/webhook/List.vue
+++ b/packages/nc-gui/components/webhook/List.vue
@@ -130,8 +130,8 @@ onMounted(() => {
 
               <template #title>
                 <div class="text-xl normal-case">
-                  {{ item.title }}
                   <span class="text-gray-400 text-sm"> ({{ item.version }}) </span>
+                  {{ item.title }}
                 </div>
               </template>
 

From 267373591f99f6a8d6dc36adee84a74daea85227 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 17:38:25 +0800
Subject: [PATCH 074/161] feat(nocodb): construct hook data based on version

---
 .../src/lib/meta/helpers/webhookHelpers.ts    | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index 3639b43eae..9dda9fc594 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -136,25 +136,30 @@ export async function validateCondition(filters: Filter[], data: any) {
 }
 
 export function constructWebHookData(hook, model, view, prevData, newData) {
-  // extend in the future - currently only support records
-  const scope = 'records';
+  if (hook.version === 'v2') {
+    // extend in the future - currently only support records
+    const scope = 'records';
 
-  return {
-    type: `${scope}.${hook.event}.${hook.operation}`,
-    id: uuidv4(),
-    data: {
-      table_id: model.id,
-      table_name: model.title,
-      view_id: view.id,
-      view_name: view.title,
-      ...(prevData && {
-        [hook.operation === 'delete' ? 'deleted_rows' : 'previous_rows']: [
-          prevData,
-        ],
-      }),
-      ...(newData && { rows: [newData] }),
-    },
-  };
+    return {
+      type: `${scope}.${hook.event}.${hook.operation}`,
+      id: uuidv4(),
+      data: {
+        table_id: model.id,
+        table_name: model.title,
+        view_id: view.id,
+        view_name: view.title,
+        ...(prevData && {
+          [hook.operation === 'delete' ? 'deleted_rows' : 'previous_rows']: [
+            prevData,
+          ],
+        }),
+        ...(newData && { rows: [newData] }),
+      },
+    };
+  }
+
+  // for v1, keep it as it is
+  return newData;
 }
 
 export async function handleHttpWebHook(

From 1bf1febef3c8c636a65cdfaa6d756b576ba42aa6 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 19:15:05 +0800
Subject: [PATCH 075/161] feat(nc-gui): add payload body editor

---
 packages/nc-gui/components/webhook/Editor.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index c33d705f8e..054ed8c04a 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -272,6 +272,9 @@ function setHook(newHook: HookType) {
       payload: notification.payload,
     },
   })
+  if (hook.version === 'v1') {
+    urlTabKey.value = 'body'
+  }
 }
 
 async function onEventChange() {
@@ -582,6 +585,15 @@ onMounted(async () => {
 
             <a-col :span="24">
               <a-tabs v-model:activeKey="urlTabKey" type="card" closeable="false" class="shadow-sm">
+                <a-tab-pane v-if="hook.version === 'v1'" key="body" tab="Body">
+                  <LazyMonacoEditor
+                    v-model="hook.notification.payload.body"
+                    disable-deep-compare
+                    :validate="false"
+                    class="min-h-60 max-h-80"
+                  />
+                </a-tab-pane>
+
                 <a-tab-pane key="params" tab="Params" force-render>
                   <LazyApiClientParams v-model="hook.notification.payload.parameters" />
                 </a-tab-pane>

From 5d29c8afdc33bcb207bb76c110bf3b4b6f06b4bc Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 19:19:41 +0800
Subject: [PATCH 076/161] feat(nocodb): add automationLogLevel

---
 packages/nocodb/src/schema/swagger.json | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json
index 9dd42043e9..751a21af90 100644
--- a/packages/nocodb/src/schema/swagger.json
+++ b/packages/nocodb/src/schema/swagger.json
@@ -1,8 +1,5 @@
 {
   "openapi": "3.1.0",
-  "x-stoplight": {
-    "id": "ayhjcuoo4l66r"
-  },
   "info": {
     "title": "nocodb",
     "version": "1.0",
@@ -12887,6 +12884,14 @@
                       "x-stoplight": {
                         "id": "bstdkpky2131f"
                       }
+                    },
+                    "automationLogLevel": {
+                      "type": "string",
+                      "x-stoplight": {
+                        "id": "uc3vaotye2eu8"
+                      },
+                      "enum": ["OFF", "ERROR", "ALL"],
+                      "example": "OFF"
                     }
                   }
                 },
@@ -12910,7 +12915,8 @@
                       "ee": false,
                       "ncAttachmentFieldSize": 20971520,
                       "ncMaxAttachmentsAllowed": 10,
-                      "isCloud": false
+                      "isCloud": false,
+                      "automationLogLevel": "OFF"
                     }
                   }
                 }

From 027b0593977951f6ee162858e1197bf4cef2c92b Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 19:37:48 +0800
Subject: [PATCH 077/161] feat(nc-gui): add automationLogLevel

---
 packages/nc-gui/composables/useGlobal/state.ts | 1 +
 packages/nc-gui/composables/useGlobal/types.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/nc-gui/composables/useGlobal/state.ts b/packages/nc-gui/composables/useGlobal/state.ts
index c04597652a..0567148619 100644
--- a/packages/nc-gui/composables/useGlobal/state.ts
+++ b/packages/nc-gui/composables/useGlobal/state.ts
@@ -101,6 +101,7 @@ export function useGlobalState(storageKey = 'nocodb-gui-v2'): State {
     ncAttachmentFieldSize: 20,
     ncMaxAttachmentsAllowed: 10,
     isCloud: false,
+    automationLogLevel: 'OFF',
   })
 
   /** reactive token payload */
diff --git a/packages/nc-gui/composables/useGlobal/types.ts b/packages/nc-gui/composables/useGlobal/types.ts
index adf615070c..5ddc0aec34 100644
--- a/packages/nc-gui/composables/useGlobal/types.ts
+++ b/packages/nc-gui/composables/useGlobal/types.ts
@@ -23,6 +23,7 @@ export interface AppInfo {
   ncAttachmentFieldSize: number
   ncMaxAttachmentsAllowed: number
   isCloud: boolean
+  automationLogLevel: 'OFF' | 'ERROR' | 'ALL'
 }
 
 export interface StoredState {

From 21293a74d17f726f0db4efe39546666620db044f Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 19:38:00 +0800
Subject: [PATCH 078/161] feat(nocodb): add automationLogLevel to util.svc.ts

---
 packages/nocodb/src/lib/services/util.svc.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nocodb/src/lib/services/util.svc.ts b/packages/nocodb/src/lib/services/util.svc.ts
index 47e5f30308..7400ded2e3 100644
--- a/packages/nocodb/src/lib/services/util.svc.ts
+++ b/packages/nocodb/src/lib/services/util.svc.ts
@@ -56,6 +56,7 @@ export async function appInfo(param: { req: { ncSiteUrl: string } }) {
     ncAttachmentFieldSize: NC_ATTACHMENT_FIELD_SIZE,
     ncMaxAttachmentsAllowed: +(process.env.NC_MAX_ATTACHMENTS_ALLOWED || 10),
     isCloud: process.env.NC_CLOUD === 'true',
+    automationLogLevel: process.env.NC_AUTOMATION_LOG_LEVEL,
   };
 
   return result;

From a56c95fb9aeb7a88e1dab66beb45d6289b73eb43 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 19:38:09 +0800
Subject: [PATCH 079/161] chore(sdk): regenerate Api.ts

---
 packages/nocodb-sdk/src/lib/Api.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index 550473a5d2..15d714e08b 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -8519,6 +8519,8 @@ export class Api<
   ncAttachmentFieldSize?: number,
   ncMaxAttachmentsAllowed?: number,
   isCloud?: boolean,
+  \** @example OFF *\
+  automationLogLevel?: "OFF" | "ERROR" | "ALL",
 
 }` OK
  * @response `400` `{
@@ -8548,6 +8550,8 @@ export class Api<
           ncAttachmentFieldSize?: number;
           ncMaxAttachmentsAllowed?: number;
           isCloud?: boolean;
+          /** @example OFF */
+          automationLogLevel?: 'OFF' | 'ERROR' | 'ALL';
         },
         {
           /** @example BadRequest [Error]: <ERROR MESSAGE> */

From da439486d218a0a8d9475703f17e4b7793011755 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 19:49:59 +0800
Subject: [PATCH 080/161] feat(nc-gui): disable call log if automationLogLevel
 is off

---
 packages/nc-gui/components/webhook/Editor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 054ed8c04a..8cd0df869c 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -743,7 +743,7 @@ onMounted(async () => {
       </a-form>
     </a-tab-pane>
 
-    <a-tab-pane key="hook-log" class="nc-hook-log" :disabled="!props.hook">
+    <a-tab-pane key="hook-log" class="nc-hook-log" :disabled="!props.hook || appInfo.automationLogLevel === 'OFF'">
       <template #tab>
         <span>
           <MdiHistory />

From 38bee3bae442655bcf069e49d9e17f9bbc83f4b0 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 19:50:21 +0800
Subject: [PATCH 081/161] feat(nocodb): set default automation log level to off

---
 packages/nocodb/src/lib/services/util.svc.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/services/util.svc.ts b/packages/nocodb/src/lib/services/util.svc.ts
index 7400ded2e3..6296797040 100644
--- a/packages/nocodb/src/lib/services/util.svc.ts
+++ b/packages/nocodb/src/lib/services/util.svc.ts
@@ -56,7 +56,7 @@ export async function appInfo(param: { req: { ncSiteUrl: string } }) {
     ncAttachmentFieldSize: NC_ATTACHMENT_FIELD_SIZE,
     ncMaxAttachmentsAllowed: +(process.env.NC_MAX_ATTACHMENTS_ALLOWED || 10),
     isCloud: process.env.NC_CLOUD === 'true',
-    automationLogLevel: process.env.NC_AUTOMATION_LOG_LEVEL,
+    automationLogLevel: process.env.NC_AUTOMATION_LOG_LEVEL || 'OFF',
   };
 
   return result;

From 9c5b8909f5076749f7518f686d163b691f406f09 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 20:42:42 +0800
Subject: [PATCH 082/161] chore(nc-gui): display hook log

---
 packages/nc-gui/components/webhook/Editor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 8cd0df869c..054ed8c04a 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -743,7 +743,7 @@ onMounted(async () => {
       </a-form>
     </a-tab-pane>
 
-    <a-tab-pane key="hook-log" class="nc-hook-log" :disabled="!props.hook || appInfo.automationLogLevel === 'OFF'">
+    <a-tab-pane key="hook-log" class="nc-hook-log" :disabled="!props.hook">
       <template #tab>
         <span>
           <MdiHistory />

From 9b333235eaddc31d9620f4a4cbb55d78844d433c Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 20:43:05 +0800
Subject: [PATCH 083/161] refactor(nocodb): change deleted_rows to rows

---
 .../src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts    | 4 ++--
 .../nocodb/src/lib/meta/helpers/populateSamplePayload.ts    | 6 ++----
 packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts      | 4 +---
 3 files changed, 5 insertions(+), 9 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 23fa267665..b738a5b26b 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
@@ -2161,7 +2161,7 @@ class BaseModelSqlv2 {
     let noOfDeletedRecords = data;
     if (!isBulkAllOperation) {
       noOfDeletedRecords = data.length;
-      await this.handleHooks('after.delete', data, null, req);
+      await this.handleHooks('after.delete', null, data, req);
     }
 
     await Audit.insert({
@@ -2256,7 +2256,7 @@ class BaseModelSqlv2 {
       ip: req?.clientIp,
       user: req?.user?.email,
     });
-    await this.handleHooks('after.delete', data, null, req);
+    await this.handleHooks('after.delete', null, data, req);
   }
 
   private async handleHooks(hookName, prevData, newData, req): Promise<void> {
diff --git a/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts b/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
index 96a7591d91..8d13135f15 100644
--- a/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
+++ b/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
@@ -94,10 +94,8 @@ export async function populateSamplePayloadV2(
 
   samplePayload.data = {
     ...samplePayload.data,
-    ...(prevRows && {
-      [operation === 'delete' ? 'deleted_rows' : 'previous_rows']: [prevRows],
-    }),
-    ...(operation !== 'delete' && rows && { rows: [rows] }),
+    ...(prevRows && { previous_rows: [prevRows] }),
+    ...(rows && { rows: [rows] }),
   };
 
   return samplePayload;
diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index 9dda9fc594..49b3b944eb 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -149,9 +149,7 @@ export function constructWebHookData(hook, model, view, prevData, newData) {
         view_id: view.id,
         view_name: view.title,
         ...(prevData && {
-          [hook.operation === 'delete' ? 'deleted_rows' : 'previous_rows']: [
-            prevData,
-          ],
+          previous_rows: [prevData],
         }),
         ...(newData && { rows: [newData] }),
       },

From 7f4f334dbe1de704bfe90a639660dda9c845e962 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 20:50:22 +0800
Subject: [PATCH 084/161] chore(nc-gui): lint

---
 packages/nc-gui/components/webhook/List.vue | 2 +-
 packages/nc-gui/components/webhook/Test.vue | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/webhook/List.vue b/packages/nc-gui/components/webhook/List.vue
index 16958f9de5..7dc178ff30 100644
--- a/packages/nc-gui/components/webhook/List.vue
+++ b/packages/nc-gui/components/webhook/List.vue
@@ -151,7 +151,7 @@ onMounted(() => {
                 <div class="mr-2">{{ $t('labels.notifyVia') }} : {{ item?.notification?.type }}</div>
 
                 <div class="float-right pt-2 pr-1">
-                  <a-tooltip placement="left" v-if="item.version === 'v2'">
+                  <a-tooltip v-if="item.version === 'v2'" placement="left">
                     <template #title>
                       {{ $t('activity.copyWebhook') }}
                     </template>
diff --git a/packages/nc-gui/components/webhook/Test.vue b/packages/nc-gui/components/webhook/Test.vue
index 27d6ebd0b5..d6a4daf0bb 100644
--- a/packages/nc-gui/components/webhook/Test.vue
+++ b/packages/nc-gui/components/webhook/Test.vue
@@ -24,7 +24,11 @@ watch(
 )
 
 async function loadSampleData() {
-  sampleData.value = await $api.dbTableWebhook.samplePayloadGet(meta?.value?.id as string, hook?.operation || 'insert', hook.version)
+  sampleData.value = await $api.dbTableWebhook.samplePayloadGet(
+    meta?.value?.id as string,
+    hook?.operation || 'insert',
+    hook.version,
+  )
 }
 
 async function testWebhook() {

From e28fce8661d8d2fdd74da40311d640532fe8b394 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 27 Mar 2023 21:21:18 +0800
Subject: [PATCH 085/161] feat(nocodb): show error logs if
 NC_AUTOMATION_LOG_LEVEL is set to ERROR

---
 packages/nocodb/src/lib/models/HookLog.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/nocodb/src/lib/models/HookLog.ts b/packages/nocodb/src/lib/models/HookLog.ts
index d07b0f4233..9555dd772d 100644
--- a/packages/nocodb/src/lib/models/HookLog.ts
+++ b/packages/nocodb/src/lib/models/HookLog.ts
@@ -39,6 +39,13 @@ export default class HookLog implements HookLogType {
       condition: {
         fk_hook_id: param.fk_hook_id,
       },
+      ...(process.env.NC_AUTOMATION_LOG_LEVEL === 'ERROR' && {
+        xcCondition: {
+          error_message: {
+            neq: null,
+          },
+        },
+      }),
       orderBy: {
         created_at: 'desc',
       },

From 755307faf25121963b98c860e85ffe87a9edbb87 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Mon, 27 Mar 2023 20:55:40 +0530
Subject: [PATCH 086/161] test: webhook v2

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/01-webhook.spec.ts | 142 +++++++++++++++++++---
 tests/playwright/tests/utils/general.ts   |  21 +++-
 2 files changed, 143 insertions(+), 20 deletions(-)

diff --git a/tests/playwright/tests/01-webhook.spec.ts b/tests/playwright/tests/01-webhook.spec.ts
index 66b8b5cc8c..548c0f283c 100644
--- a/tests/playwright/tests/01-webhook.spec.ts
+++ b/tests/playwright/tests/01-webhook.spec.ts
@@ -3,6 +3,7 @@ import { DashboardPage } from '../pages/Dashboard';
 import setup from '../setup';
 import makeServer from '../setup/server';
 import { WebhookFormPage } from '../pages/Dashboard/WebhookForm';
+import { isSubset } from '../utils';
 
 const hookPath = 'http://localhost:9090/hook';
 
@@ -16,9 +17,11 @@ async function clearServerData({ request }) {
   await expect(await response.json()).toBe(0);
 }
 
-async function verifyHookTrigger(count: number, value: string, request) {
+async function verifyHookTrigger(count: number, value: string, request, expectedData?: any) {
   // Retry since there can be lag between the time the hook is triggered and the time the server receives the request
   let response;
+
+  // retry since there can be lag between the time the hook is triggered and the time the server receives the request
   for (let i = 0; i < 20; i++) {
     response = await request.get(hookPath + '/count');
     if ((await response.json()) === count) {
@@ -30,17 +33,43 @@ async function verifyHookTrigger(count: number, value: string, request) {
 
   if (count) {
     let response;
+
+    // retry since there can be lag between the time the hook is triggered and the time the server receives the request
     for (let i = 0; i < 20; i++) {
       response = await request.get(hookPath + '/last');
-      if ((await response.json()).Title === value) {
+      const rspJson = await response.json();
+      if (rspJson.data.rows[0].Title === value) {
         break;
       }
       await new Promise(resolve => setTimeout(resolve, 150));
     }
-    await expect((await response.json()).Title).toBe(value);
+    const rspJson = await response.json();
+    await expect(rspJson?.data?.rows[0]?.Title).toBe(value);
+    if (expectedData) {
+      await expect(isSubset(rspJson, expectedData)).toBe(true);
+    }
   }
 }
 
+async function buildExpectedResponseData(type, value) {
+  const expectedData = {
+    type: 'records.after.insert',
+    data: {
+      table_name: 'Test',
+      view_name: 'Test',
+      rows: [
+        {
+          Title: 'Poole',
+        },
+      ],
+    },
+  };
+
+  expectedData.type = type;
+  expectedData.data.rows[0].Title = value;
+  return expectedData;
+}
+
 test.describe.serial('Webhook', () => {
   // start a server locally for webhook tests
 
@@ -58,7 +87,7 @@ test.describe.serial('Webhook', () => {
   });
 
   test('CRUD', async ({ request, page }) => {
-    // todo: Waiting for the server to start
+    // Waiting for the server to start
     await page.waitForTimeout(1000);
 
     // close 'Team & Auth' tab
@@ -66,6 +95,12 @@ test.describe.serial('Webhook', () => {
     await dashboard.closeTab({ title: 'Team & Auth' });
     await dashboard.treeView.createTable({ title: 'Test' });
 
+    // hook order
+    // hook-1: after insert
+    //  - verify trigger after insert
+    //  - verify no trigger after edit
+    //  - verify no trigger after delete
+
     // after insert hook
     await webhook.create({
       title: 'hook-1',
@@ -77,12 +112,24 @@ test.describe.serial('Webhook', () => {
       columnHeader: 'Title',
       value: 'Poole',
     });
-    await verifyHookTrigger(1, 'Poole', request);
+    await verifyHookTrigger(1, 'Poole', request, buildExpectedResponseData('records.after.insert', 'Poole'));
+
+    // trigger edit row & delete row
+    // verify that the hook is not triggered (count doesn't change in this case)
     await dashboard.grid.editRow({ index: 0, value: 'Delaware' });
     await verifyHookTrigger(1, 'Poole', request);
     await dashboard.grid.deleteRow(0);
     await verifyHookTrigger(1, 'Poole', request);
 
+    ///////////////////////////////////////////////////////////////////////////
+
+    // hook order
+    // hook-1: after insert
+    // hook-2: after update
+    //  - verify trigger after insert
+    //  - verify trigger after edit
+    //  - verify no trigger after delete
+
     // after update hook
     await webhook.create({
       title: 'hook-2',
@@ -95,12 +142,22 @@ test.describe.serial('Webhook', () => {
       columnHeader: 'Title',
       value: 'Poole',
     });
-    await verifyHookTrigger(1, 'Poole', request);
+    await verifyHookTrigger(1, 'Poole', request, buildExpectedResponseData('records.after.insert', 'Poole'));
     await dashboard.grid.editRow({ index: 0, value: 'Delaware' });
-    await verifyHookTrigger(2, 'Delaware', request);
+    await verifyHookTrigger(2, 'Delaware', request, buildExpectedResponseData('records.after.update', 'Delaware'));
     await dashboard.grid.deleteRow(0);
     await verifyHookTrigger(2, 'Delaware', request);
 
+    ///////////////////////////////////////////////////////////////////////////
+
+    // hook order
+    // hook-1: after insert
+    // hook-2: after update
+    // hook-3: after delete
+    //  - verify trigger after insert
+    //  - verify trigger after edit
+    //  - verify trigger after delete
+
     // after delete hook
     await webhook.create({
       title: 'hook-3',
@@ -112,13 +169,24 @@ test.describe.serial('Webhook', () => {
       columnHeader: 'Title',
       value: 'Poole',
     });
-    await verifyHookTrigger(1, 'Poole', request);
+    await verifyHookTrigger(1, 'Poole', request, buildExpectedResponseData('records.after.insert', 'Poole'));
     await dashboard.grid.editRow({ index: 0, value: 'Delaware' });
-    await verifyHookTrigger(2, 'Delaware', request);
+    await verifyHookTrigger(2, 'Delaware', request, buildExpectedResponseData('records.after.update', 'Delaware'));
     await dashboard.grid.deleteRow(0);
-    await verifyHookTrigger(3, 'Delaware', request);
+    await verifyHookTrigger(3, 'Delaware', request, buildExpectedResponseData('records.after.delete', 'Delaware'));
+
+    ///////////////////////////////////////////////////////////////////////////
 
     // modify webhook
+
+    // hook order
+    // hook-1: after delete
+    // hook-2: after delete
+    // hook-3: after delete
+    //  - verify no trigger after insert
+    //  - verify no trigger after edit
+    //  - verify trigger after delete
+
     await webhook.open({ index: 0 });
     await webhook.configureWebhook({
       title: 'hook-1-modified',
@@ -140,13 +208,28 @@ test.describe.serial('Webhook', () => {
       columnHeader: 'Title',
       value: 'Poole',
     });
+
+    // for insert & edit, the hook should not be triggered (count doesn't change in this case)
     await verifyHookTrigger(0, 'Poole', request);
     await dashboard.grid.editRow({ index: 0, value: 'Delaware' });
     await verifyHookTrigger(0, 'Delaware', request);
     await dashboard.grid.deleteRow(0);
-    await verifyHookTrigger(3, 'Delaware', request);
+
+    // for delete, the hook should be triggered (thrice in this case)
+    await verifyHookTrigger(3, 'Delaware', request, buildExpectedResponseData('records.after.delete', 'Delaware'));
+
+    ///////////////////////////////////////////////////////////////////////////
 
     // delete webhook
+
+    // hook order
+    // hook-1: -
+    // hook-2: -
+    // hook-3: -
+    //  - verify no trigger after insert
+    //  - verify no trigger after edit
+    //  - verify no trigger after delete
+
     await webhook.delete({ index: 0 });
     await webhook.delete({ index: 0 });
     await webhook.delete({ index: 0 });
@@ -212,7 +295,18 @@ test.describe.serial('Webhook', () => {
       save: true,
     });
 
-    // verify
+    ///////////////////////////////////////////////////////////////////////////
+
+    // webhook with condition
+
+    // hook order
+    // hook-1: after insert where Title is like 'Poole'
+    // hook-2: after update where Title is like 'Poole'
+    // hook-3: after delete where Title is like 'Poole'
+    //  - verify trigger after insert gets triggered only when Title is like 'Poole'
+    //  - verify trigger after edit gets triggered only when Title is like 'Poole'
+    //  - verify trigger after delete gets triggered only when Title is like 'Poole'
+
     await clearServerData({ request });
     await dashboard.grid.addNewRow({
       index: 0,
@@ -224,15 +318,25 @@ test.describe.serial('Webhook', () => {
       columnHeader: 'Title',
       value: 'Delaware',
     });
-    await verifyHookTrigger(1, 'Poole', request);
+    await verifyHookTrigger(1, 'Poole', request, buildExpectedResponseData('records.after.insert', 'Poole'));
     await dashboard.grid.editRow({ index: 0, value: 'Delaware' });
     await dashboard.grid.editRow({ index: 1, value: 'Poole' });
-    await verifyHookTrigger(2, 'Poole', request);
+    await verifyHookTrigger(2, 'Poole', request, buildExpectedResponseData('records.after.update', 'Poole'));
     await dashboard.grid.deleteRow(1);
     await dashboard.grid.deleteRow(0);
-    await verifyHookTrigger(3, 'Poole', request);
+    await verifyHookTrigger(3, 'Poole', request, buildExpectedResponseData('records.after.delete', 'Poole'));
+
+    ///////////////////////////////////////////////////////////////////////////
 
-    // Delete condition
+    // webhook after conditions are removed
+
+    // hook order
+    // hook-1: after insert
+    // hook-2: after update
+    // hook-3: after delete
+    //  - verify trigger after insert gets triggered when Title is like 'Poole' or not
+    //  - verify trigger after edit gets triggered when Title is like 'Poole' or not
+    //  - verify trigger after delete gets triggered when Title is like 'Poole' or not
     await webhook.open({ index: 2 });
     await webhook.deleteCondition({ save: true });
     await webhook.open({ index: 1 });
@@ -251,12 +355,12 @@ test.describe.serial('Webhook', () => {
       columnHeader: 'Title',
       value: 'Delaware',
     });
-    await verifyHookTrigger(2, 'Delaware', request);
+    await verifyHookTrigger(2, 'Delaware', request, buildExpectedResponseData('records.after.insert', 'Delaware'));
     await dashboard.grid.editRow({ index: 0, value: 'Delaware' });
     await dashboard.grid.editRow({ index: 1, value: 'Poole' });
-    await verifyHookTrigger(4, 'Poole', request);
+    await verifyHookTrigger(4, 'Poole', request, buildExpectedResponseData('records.after.update', 'Poole'));
     await dashboard.grid.deleteRow(1);
     await dashboard.grid.deleteRow(0);
-    await verifyHookTrigger(6, 'Delaware', request);
+    await verifyHookTrigger(6, 'Delaware', request, buildExpectedResponseData('records.after.delete', 'Delaware'));
   });
 });
diff --git a/tests/playwright/tests/utils/general.ts b/tests/playwright/tests/utils/general.ts
index 1571666b1a..2bb3bdf035 100644
--- a/tests/playwright/tests/utils/general.ts
+++ b/tests/playwright/tests/utils/general.ts
@@ -19,4 +19,23 @@ async function getTextExcludeIconText(selector) {
   return text.trim();
 }
 
-export { getTextExcludeIconText };
+function isSubset(obj, potentialSubset) {
+  for (const prop in potentialSubset) {
+    // eslint-disable-next-line no-prototype-builtins
+    if (potentialSubset.hasOwnProperty(prop)) {
+      const potentialValue = potentialSubset[prop];
+      const objValue = obj[prop];
+      if (typeof potentialValue === 'object' && typeof objValue === 'object') {
+        if (!isSubset(objValue, potentialValue)) {
+          return false;
+        }
+        // eslint-disable-next-line no-prototype-builtins
+      } else if (!obj.hasOwnProperty(prop) || objValue !== potentialValue) {
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
+export { getTextExcludeIconText, isSubset };

From f47a0e271a2d4942112a7e4cd0be7f02c41ffbb6 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 28 Mar 2023 13:53:08 +0800
Subject: [PATCH 087/161] feat(nocodb): add limit and offset to hook logs

---
 packages/nocodb/src/schema/swagger.json | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json
index 751a21af90..e8b647daf7 100644
--- a/packages/nocodb/src/schema/swagger.json
+++ b/packages/nocodb/src/schema/swagger.json
@@ -5998,6 +5998,22 @@
         "tags": ["DB Table Webhook Logs"],
         "description": "List the log data in a given Hook",
         "parameters": [
+          {
+            "schema": {
+              "type": "integer",
+              "minimum": 1
+            },
+            "in": "query",
+            "name": "limit"
+          },
+          {
+            "schema": {
+              "type": "integer",
+              "minimum": 0
+            },
+            "in": "query",
+            "name": "offset"
+          },
           {
             "$ref": "#/components/parameters/xc-auth"
           }

From b849d16a683ba1b99e1923999db7762b334ae35a Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 28 Mar 2023 13:53:24 +0800
Subject: [PATCH 088/161] feat(nocodb): add hookLogCount and pass query to
 HookLog.list

---
 packages/nocodb/src/lib/services/hook.svc.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/lib/services/hook.svc.ts b/packages/nocodb/src/lib/services/hook.svc.ts
index cec60718db..78f70084ac 100644
--- a/packages/nocodb/src/lib/services/hook.svc.ts
+++ b/packages/nocodb/src/lib/services/hook.svc.ts
@@ -29,8 +29,8 @@ export async function hookList(param: { tableId: string }) {
   return await Hook.list({ fk_model_id: param.tableId });
 }
 
-export async function hookLogList(param: { hookId: string }) {
-  return await HookLog.list({ fk_hook_id: param.hookId });
+export async function hookLogList(param: { query: any; hookId: string }) {
+  return await HookLog.list({ fk_hook_id: param.hookId }, param.query);
 }
 
 export async function hookCreate(param: {
@@ -110,3 +110,7 @@ export async function tableSampleData(param: {
   }
   return await populateSamplePayloadV2(model, false, param.operation);
 }
+
+export async function hookLogCount(param: { hookId: string }) {
+  return await HookLog.count({ hookId: param.hookId });
+}

From fd720204af1cba73bc0c934228148a7a6bede76c Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 28 Mar 2023 13:53:39 +0800
Subject: [PATCH 089/161] feat(nocodb): add count to HookLog

---
 packages/nocodb/src/lib/models/HookLog.ts | 28 ++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/models/HookLog.ts b/packages/nocodb/src/lib/models/HookLog.ts
index 9555dd772d..b0a077a3af 100644
--- a/packages/nocodb/src/lib/models/HookLog.ts
+++ b/packages/nocodb/src/lib/models/HookLog.ts
@@ -33,9 +33,16 @@ export default class HookLog implements HookLogType {
       event?: 'after' | 'before';
       operation?: 'insert' | 'delete' | 'update';
     },
+    {
+      limit = 25,
+      offset = 0,
+    }: {
+      limit?: number;
+      offset?: number;
+    },
     ncMeta = Noco.ncMeta
   ) {
-    const hookLogs = await ncMeta.metaList(null, null, MetaTable.HOOK_LOGS, {
+    const hookLogs = await ncMeta.metaList2(null, null, MetaTable.HOOK_LOGS, {
       condition: {
         fk_hook_id: param.fk_hook_id,
       },
@@ -49,6 +56,8 @@ export default class HookLog implements HookLogType {
       orderBy: {
         created_at: 'desc',
       },
+      limit,
+      offset,
     });
     return hookLogs?.map((h) => new HookLog(h));
   }
@@ -87,4 +96,21 @@ export default class HookLog implements HookLogType {
 
     return await ncMeta.metaInsert2(null, null, MetaTable.HOOK_LOGS, insertObj);
   }
+
+  public static async count(
+    { hookId }: { hookId?: string },
+    ncMeta = Noco.ncMeta
+  ) {
+    const qb = ncMeta.knex(MetaTable.HOOK_LOGS);
+
+    if (hookId) {
+      qb.where(`${MetaTable.HOOK_LOGS}.fk_hook_id`, hookId);
+    }
+
+    if (process.env.NC_AUTOMATION_LOG_LEVEL === 'ERROR') {
+      qb.whereNotNull(`${MetaTable.HOOK_LOGS}.error_message`);
+    }
+
+    return (await qb.count('id', { as: 'count' }).first())?.count ?? 0;
+  }
 }

From 00c9fd9d0a7a215edc32c52ae54a1eb08402d269 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 28 Mar 2023 13:54:07 +0800
Subject: [PATCH 090/161] feat(nocodb): enrich pageInfo in hookLogList

---
 packages/nocodb/src/lib/controllers/hook.ctl.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/controllers/hook.ctl.ts b/packages/nocodb/src/lib/controllers/hook.ctl.ts
index fec5f4e62b..5bb0ca979e 100644
--- a/packages/nocodb/src/lib/controllers/hook.ctl.ts
+++ b/packages/nocodb/src/lib/controllers/hook.ctl.ts
@@ -69,7 +69,16 @@ export async function hookLogList(
 ) {
   res.json(
     new PagedResponseImpl(
-      await hookService.hookLogList({ hookId: req.params.hookId })
+      await hookService.hookLogList({
+        query: req.query,
+        hookId: req.params.hookId,
+      }),
+      {
+        ...req.query,
+        count: await hookService.hookLogCount({
+          hookId: req.params.hookId,
+        }),
+      }
     )
   );
 }

From b3331fb7cf8b69964c67a52ddc70dffbe0912b87 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 28 Mar 2023 13:54:18 +0800
Subject: [PATCH 091/161] chore(sdk): regenerate Api.ts

---
 packages/nocodb-sdk/src/lib/Api.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index 15d714e08b..ff0152f373 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -6495,7 +6495,16 @@ export class Api<
 
 }`
  */
-    list: (hookId: IdType, params: RequestParams = {}) =>
+    list: (
+      hookId: IdType,
+      query?: {
+        /** @min 1 */
+        limit?: number;
+        /** @min 0 */
+        offset?: number;
+      },
+      params: RequestParams = {}
+    ) =>
       this.request<
         HookLogListType,
         {
@@ -6505,6 +6514,7 @@ export class Api<
       >({
         path: `/api/v1/db/meta/hooks/${hookId}/logs`,
         method: 'GET',
+        query: query,
         format: 'json',
         ...params,
       }),

From c7c751f15836789633718b18326e6c4ef703c7b0 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 28 Mar 2023 11:24:45 +0530
Subject: [PATCH 092/161] test: path correction

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/01-webhook.spec.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/playwright/tests/01-webhook.spec.ts b/tests/playwright/tests/01-webhook.spec.ts
index 548c0f283c..29637f2335 100644
--- a/tests/playwright/tests/01-webhook.spec.ts
+++ b/tests/playwright/tests/01-webhook.spec.ts
@@ -3,7 +3,7 @@ import { DashboardPage } from '../pages/Dashboard';
 import setup from '../setup';
 import makeServer from '../setup/server';
 import { WebhookFormPage } from '../pages/Dashboard/WebhookForm';
-import { isSubset } from '../utils';
+import { isSubset } from './utils/general';
 
 const hookPath = 'http://localhost:9090/hook';
 
@@ -95,6 +95,8 @@ test.describe.serial('Webhook', () => {
     await dashboard.closeTab({ title: 'Team & Auth' });
     await dashboard.treeView.createTable({ title: 'Test' });
 
+    // create
+    //
     // hook order
     // hook-1: after insert
     //  - verify trigger after insert
@@ -123,6 +125,8 @@ test.describe.serial('Webhook', () => {
 
     ///////////////////////////////////////////////////////////////////////////
 
+    // update
+    //
     // hook order
     // hook-1: after insert
     // hook-2: after update

From 1835705d57fb839ba652cccefb3453def49a3e0c Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 28 Mar 2023 13:56:15 +0800
Subject: [PATCH 093/161] feat(nc-gui): add pagination to hook log

---
 .../nc-gui/components/webhook/CallLog.vue     | 36 +++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui/components/webhook/CallLog.vue b/packages/nc-gui/components/webhook/CallLog.vue
index dbc4b3fef1..566c1e056e 100644
--- a/packages/nc-gui/components/webhook/CallLog.vue
+++ b/packages/nc-gui/components/webhook/CallLog.vue
@@ -1,6 +1,10 @@
 <script setup lang="ts">
 import type { HookLogType, HookType } from 'nocodb-sdk'
-import { onBeforeMount, parseProp, timeAgo, useApi } from '#imports'
+import { extractSdkResponseErrorMsg, onBeforeMount, parseProp, timeAgo, useApi } from '#imports'
+
+interface Props {
+  hook: HookType
+}
 
 const props = defineProps<Props>()
 
@@ -10,16 +14,27 @@ const hookLogs = ref<HookLogType[]>([])
 
 const activeKey = ref()
 
-interface Props {
-  hook: HookType
-}
+let totalRows = $ref(0)
+
+const currentPage = $ref(1)
 
-async function loadHookLogList() {
-  hookLogs.value = (await api.dbTableWebhookLogs.list(props.hook.id!)).list!
+const currentLimit = $ref(3)
+
+async function loadHookLogs(page = currentPage, limit = currentLimit) {
+  try {
+    const { list, pageInfo } = await api.dbTableWebhookLogs.list(props.hook.id!, {
+      offset: limit * (page - 1),
+      limit,
+    })
+    hookLogs.value = list
+    totalRows = pageInfo.totalRows ?? 0
+  } catch (e: any) {
+    message.error(await extractSdkResponseErrorMsg(e))
+  }
 }
 
 onBeforeMount(async () => {
-  await loadHookLogList()
+  await loadHookLogs(currentPage, currentLimit)
 })
 </script>
 
@@ -84,6 +99,13 @@ onBeforeMount(async () => {
       </div>
     </a-collapse-panel>
   </a-collapse>
+  <a-pagination
+    v-model:current="currentPage"
+    :page-size="currentLimit"
+    :total="totalRows"
+    show-less-items
+    @change="loadHookLogs"
+  />
 </template>
 
 <style scoped lang="scss">

From 20a5a348a50689635c0d3dbe4ebded0e52384e8f Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 28 Mar 2023 14:04:10 +0800
Subject: [PATCH 094/161] fix(nc-gui): cater empty records

---
 packages/nc-gui/components/webhook/CallLog.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/nc-gui/components/webhook/CallLog.vue b/packages/nc-gui/components/webhook/CallLog.vue
index 566c1e056e..d3f9c32aaf 100644
--- a/packages/nc-gui/components/webhook/CallLog.vue
+++ b/packages/nc-gui/components/webhook/CallLog.vue
@@ -22,6 +22,8 @@ const currentLimit = $ref(3)
 
 async function loadHookLogs(page = currentPage, limit = currentLimit) {
   try {
+    // cater empty records
+    page = page || 1
     const { list, pageInfo } = await api.dbTableWebhookLogs.list(props.hook.id!, {
       offset: limit * (page - 1),
       limit,

From 720034cf68f4ec84b8a77c9fbaa071a282f5850c Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 28 Mar 2023 12:05:13 +0530
Subject: [PATCH 095/161] test: webhook update verification for previous row
 data

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/01-webhook.spec.ts | 38 ++++++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/tests/playwright/tests/01-webhook.spec.ts b/tests/playwright/tests/01-webhook.spec.ts
index 29637f2335..e0a38d6c87 100644
--- a/tests/playwright/tests/01-webhook.spec.ts
+++ b/tests/playwright/tests/01-webhook.spec.ts
@@ -51,7 +51,7 @@ async function verifyHookTrigger(count: number, value: string, request, expected
   }
 }
 
-async function buildExpectedResponseData(type, value) {
+async function buildExpectedResponseData(type, value, oldValue?) {
   const expectedData = {
     type: 'records.after.insert',
     data: {
@@ -67,6 +67,14 @@ async function buildExpectedResponseData(type, value) {
 
   expectedData.type = type;
   expectedData.data.rows[0].Title = value;
+
+  if (oldValue) {
+    expectedData.data['previous_rows'] = [];
+    expectedData.data['previous_rows'][0] = {
+      Title: oldValue,
+    };
+  }
+
   return expectedData;
 }
 
@@ -148,7 +156,12 @@ test.describe.serial('Webhook', () => {
     });
     await verifyHookTrigger(1, 'Poole', request, buildExpectedResponseData('records.after.insert', 'Poole'));
     await dashboard.grid.editRow({ index: 0, value: 'Delaware' });
-    await verifyHookTrigger(2, 'Delaware', request, buildExpectedResponseData('records.after.update', 'Delaware'));
+    await verifyHookTrigger(
+      2,
+      'Delaware',
+      request,
+      buildExpectedResponseData('records.after.update', 'Delaware', 'Poole')
+    );
     await dashboard.grid.deleteRow(0);
     await verifyHookTrigger(2, 'Delaware', request);
 
@@ -175,7 +188,12 @@ test.describe.serial('Webhook', () => {
     });
     await verifyHookTrigger(1, 'Poole', request, buildExpectedResponseData('records.after.insert', 'Poole'));
     await dashboard.grid.editRow({ index: 0, value: 'Delaware' });
-    await verifyHookTrigger(2, 'Delaware', request, buildExpectedResponseData('records.after.update', 'Delaware'));
+    await verifyHookTrigger(
+      2,
+      'Delaware',
+      request,
+      buildExpectedResponseData('records.after.update', 'Delaware', 'Poole')
+    );
     await dashboard.grid.deleteRow(0);
     await verifyHookTrigger(3, 'Delaware', request, buildExpectedResponseData('records.after.delete', 'Delaware'));
 
@@ -325,7 +343,12 @@ test.describe.serial('Webhook', () => {
     await verifyHookTrigger(1, 'Poole', request, buildExpectedResponseData('records.after.insert', 'Poole'));
     await dashboard.grid.editRow({ index: 0, value: 'Delaware' });
     await dashboard.grid.editRow({ index: 1, value: 'Poole' });
-    await verifyHookTrigger(2, 'Poole', request, buildExpectedResponseData('records.after.update', 'Poole'));
+    await verifyHookTrigger(
+      2,
+      'Poole',
+      request,
+      buildExpectedResponseData('records.after.update', 'Poole', 'Delaware')
+    );
     await dashboard.grid.deleteRow(1);
     await dashboard.grid.deleteRow(0);
     await verifyHookTrigger(3, 'Poole', request, buildExpectedResponseData('records.after.delete', 'Poole'));
@@ -362,7 +385,12 @@ test.describe.serial('Webhook', () => {
     await verifyHookTrigger(2, 'Delaware', request, buildExpectedResponseData('records.after.insert', 'Delaware'));
     await dashboard.grid.editRow({ index: 0, value: 'Delaware' });
     await dashboard.grid.editRow({ index: 1, value: 'Poole' });
-    await verifyHookTrigger(4, 'Poole', request, buildExpectedResponseData('records.after.update', 'Poole'));
+    await verifyHookTrigger(
+      4,
+      'Poole',
+      request,
+      buildExpectedResponseData('records.after.update', 'Poole', 'Delaware')
+    );
     await dashboard.grid.deleteRow(1);
     await dashboard.grid.deleteRow(0);
     await verifyHookTrigger(6, 'Delaware', request, buildExpectedResponseData('records.after.delete', 'Delaware'));

From c850074d73b5c70ed7b35d98a761af01a17b94cb Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 28 Mar 2023 15:47:00 +0800
Subject: [PATCH 096/161] feat(nocodb): insert hook log based on
 NC_AUTOMATION_LOG_LEVEL

---
 .../src/lib/meta/helpers/webhookHelpers.ts    | 98 ++++++++++---------
 packages/nocodb/src/lib/models/HookLog.ts     |  3 +
 2 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index 49b3b944eb..6f27a3e56a 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -301,14 +301,16 @@ export async function invokeWebhook(
             subject: parseBody(notification?.payload?.subject, newData),
             html: parseBody(notification?.payload?.body, newData),
           });
-          hookLog = {
-            ...hook,
-            fk_hook_id: hook.id,
-            type: notification.type,
-            payload: JSON.stringify(notification?.payload),
-            response: JSON.stringify(res),
-            triggered_by: user?.email,
-          };
+          if (process.env.NC_AUTOMATION_LOG_LEVEL === 'ALL') {
+            hookLog = {
+              ...hook,
+              fk_hook_id: hook.id,
+              type: notification.type,
+              payload: JSON.stringify(notification?.payload),
+              response: JSON.stringify(res),
+              triggered_by: user?.email,
+            };
+          }
         }
         break;
       case 'URL':
@@ -323,25 +325,27 @@ export async function invokeWebhook(
             newData
           );
 
-          hookLog = {
-            ...hook,
-            fk_hook_id: hook.id,
-            type: notification.type,
-            payload: JSON.stringify(notification?.payload),
-            response: JSON.stringify({
-              status: res.status,
-              statusText: res.statusText,
-              headers: res.headers,
-              config: {
-                url: res.config.url,
-                method: res.config.method,
-                data: res.config.data,
-                headers: res.config.headers,
-                params: res.config.params,
-              },
-            }),
-            triggered_by: user?.email,
-          };
+          if (process.env.NC_AUTOMATION_LOG_LEVEL === 'ALL') {
+            hookLog = {
+              ...hook,
+              fk_hook_id: hook.id,
+              type: notification.type,
+              payload: JSON.stringify(notification?.payload),
+              response: JSON.stringify({
+                status: res.status,
+                statusText: res.statusText,
+                headers: res.headers,
+                config: {
+                  url: res.config.url,
+                  method: res.config.method,
+                  data: res.config.data,
+                  headers: res.config.headers,
+                  params: res.config.params,
+                },
+              }),
+              triggered_by: user?.email,
+            };
+          }
         }
         break;
       default:
@@ -357,29 +361,33 @@ export async function invokeWebhook(
             })
           );
 
-          hookLog = {
-            ...hook,
-            fk_hook_id: hook.id,
-            type: notification.type,
-            payload: JSON.stringify(notification?.payload),
-            response: JSON.stringify(res),
-            triggered_by: user?.email,
-          };
+          if (process.env.NC_AUTOMATION_LOG_LEVEL === 'ALL') {
+            hookLog = {
+              ...hook,
+              fk_hook_id: hook.id,
+              type: notification.type,
+              payload: JSON.stringify(notification?.payload),
+              response: JSON.stringify(res),
+              triggered_by: user?.email,
+            };
+          }
         }
         break;
     }
   } catch (e) {
     console.log(e);
-    hookLog = {
-      ...hook,
-      type: notification.type,
-      payload: JSON.stringify(notification?.payload),
-      fk_hook_id: hook.id,
-      error_code: e.error_code,
-      error_message: e.message,
-      error: JSON.stringify(e),
-      triggered_by: user?.email,
-    };
+    if (['ERROR', 'ALL'].includes(process.env.NC_AUTOMATION_LOG_LEVEL)) {
+      hookLog = {
+        ...hook,
+        type: notification.type,
+        payload: JSON.stringify(notification?.payload),
+        fk_hook_id: hook.id,
+        error_code: e.error_code,
+        error_message: e.message,
+        error: JSON.stringify(e),
+        triggered_by: user?.email,
+      };
+    }
     if (throwErrorOnFailure) throw e;
   } finally {
     if (hookLog) {
diff --git a/packages/nocodb/src/lib/models/HookLog.ts b/packages/nocodb/src/lib/models/HookLog.ts
index b0a077a3af..2b1292907c 100644
--- a/packages/nocodb/src/lib/models/HookLog.ts
+++ b/packages/nocodb/src/lib/models/HookLog.ts
@@ -63,6 +63,9 @@ export default class HookLog implements HookLogType {
   }
 
   public static async insert(hookLog: Partial<HookLog>, ncMeta = Noco.ncMeta) {
+    if (process.env.NC_AUTOMATION_LOG_LEVEL === 'OFF') {
+      return;
+    }
     const insertObj: any = extractProps(hookLog, [
       'base_id',
       'project_id',

From 2055e86219132427b3f9ab14139b9a40b273628f Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 28 Mar 2023 13:32:14 +0530
Subject: [PATCH 097/161] test: bulk update webhook verification

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/01-webhook.spec.ts | 130 ++++++++++++++++++++++
 1 file changed, 130 insertions(+)

diff --git a/tests/playwright/tests/01-webhook.spec.ts b/tests/playwright/tests/01-webhook.spec.ts
index e0a38d6c87..b311159bc8 100644
--- a/tests/playwright/tests/01-webhook.spec.ts
+++ b/tests/playwright/tests/01-webhook.spec.ts
@@ -4,8 +4,11 @@ import setup from '../setup';
 import makeServer from '../setup/server';
 import { WebhookFormPage } from '../pages/Dashboard/WebhookForm';
 import { isSubset } from './utils/general';
+import { Api, UITypes } from 'nocodb-sdk';
+import { rowMixedValue } from '../setup/xcdb-records';
 
 const hookPath = 'http://localhost:9090/hook';
+let api: Api<any>;
 
 // clear server data
 async function clearServerData({ request }) {
@@ -17,6 +20,23 @@ async function clearServerData({ request }) {
   await expect(await response.json()).toBe(0);
 }
 
+async function getWebhookResponses({ request, count = 1 }) {
+  let response;
+
+  // retry since there can be lag between the time the hook is triggered and the time the server receives the request
+  for (let i = 0; i < 20; i++) {
+    response = await request.get(hookPath + '/count');
+    if ((await response.json()) === count) {
+      break;
+    }
+    await new Promise(resolve => setTimeout(resolve, 100));
+  }
+  await expect(await response.json()).toBe(count);
+
+  response = await request.get(hookPath + '/all');
+  return await response.json();
+}
+
 async function verifyHookTrigger(count: number, value: string, request, expectedData?: any) {
   // Retry since there can be lag between the time the hook is triggered and the time the server receives the request
   let response;
@@ -92,6 +112,13 @@ test.describe.serial('Webhook', () => {
     context = await setup({ page });
     dashboard = new DashboardPage(page, context.project);
     webhook = dashboard.webhookForm;
+
+    api = new Api({
+      baseURL: `http://localhost:8080/`,
+      headers: {
+        'xc-auth': context.token,
+      },
+    });
   });
 
   test('CRUD', async ({ request, page }) => {
@@ -395,4 +422,107 @@ test.describe.serial('Webhook', () => {
     await dashboard.grid.deleteRow(0);
     await verifyHookTrigger(6, 'Delaware', request, buildExpectedResponseData('records.after.delete', 'Delaware'));
   });
+
+  test('Bulk operations', async ({ request, page }) => {
+    async function verifyBulkOperationTrigger(rsp, type, valueCounter, oldValueCounter?) {
+      for (let i = 0; i < rsp.length; i++) {
+        expect(rsp[i].type === type);
+        expect(rsp[i].data.table_name === 'numberBased');
+        expect(rsp[i].data.view_name === 'numberBased');
+        expect(rsp[i].data.rows.length === 25);
+        for (let j = 0; j < rsp[i].data.rows.length; j++) {
+          expect(rsp[i].data.rows[j].Number === (i * 25 + j + 1) * valueCounter);
+        }
+
+        if (oldValueCounter) {
+          expect(rsp[i].data.previous_rows.length === 25);
+          for (let j = 0; j < rsp[i].data.previous_rows.length; j++) {
+            expect(rsp[i].data.previous_rows[j].Number === (i * 25 + j + 1) * oldValueCounter);
+          }
+        }
+      }
+    }
+
+    // Waiting for the server to start
+    await page.waitForTimeout(1000);
+
+    // close 'Team & Auth' tab
+    await dashboard.closeTab({ title: 'Team & Auth' });
+
+    const columns = [
+      {
+        column_name: 'Id',
+        title: 'Id',
+        uidt: UITypes.ID,
+      },
+      {
+        column_name: 'Number',
+        title: 'Number',
+        uidt: UITypes.Number,
+      },
+    ];
+    let project, table;
+
+    try {
+      project = await api.project.read(context.project.id);
+      table = await api.base.tableCreate(context.project.id, project.bases?.[0].id, {
+        table_name: 'numberBased',
+        title: 'numberBased',
+        columns: columns,
+      });
+    } catch (e) {
+      console.error(e);
+    }
+
+    await page.reload();
+    await dashboard.treeView.openTable({ title: 'numberBased' });
+
+    // create after insert webhook
+    await webhook.create({
+      title: 'hook-1',
+      event: 'After Insert',
+    });
+    await webhook.create({
+      title: 'hook-1',
+      event: 'After Update',
+    });
+    await webhook.create({
+      title: 'hook-1',
+      event: 'After Delete',
+    });
+
+    await clearServerData({ request });
+    const rowAttributesForInsert = Array.from({ length: 50 }, (_, i) => ({
+      Id: i + 1,
+      Number: (i + 1) * 100,
+    }));
+    await api.dbTableRow.bulkCreate('noco', context.project.id, table.id, rowAttributesForInsert);
+    await page.reload();
+    // 50 records inserted, we expect 2 webhook responses
+    let rsp = await getWebhookResponses({ request, count: 2 });
+    await verifyBulkOperationTrigger(rsp, 'records.after.insert', 100);
+
+    // bulk update all rows
+    await clearServerData({ request });
+    // build rowAttributes for update to contain all the ids & their value set to 100
+    const rowAttributesForUpdate = Array.from({ length: 50 }, (_, i) => ({
+      Id: i + 1,
+      Number: (i + 1) * 111,
+    }));
+
+    await api.dbTableRow.bulkUpdate('noco', context.project.id, table.id, rowAttributesForUpdate);
+    await page.reload();
+    // 50 records updated, we expect 2 webhook responses
+    rsp = await getWebhookResponses({ request, count: 2 });
+    await verifyBulkOperationTrigger(rsp, 'records.after.update', 111, 100);
+
+    // bulk delete all rows
+    await clearServerData({ request });
+    const rowAttributesForDelete = Array.from({ length: 50 }, (_, i) => ({ Id: i + 1 }));
+
+    await api.dbTableRow.bulkDelete('noco', context.project.id, table.id, rowAttributesForDelete);
+    await page.reload();
+    rsp = await getWebhookResponses({ request, count: 2 });
+    await verifyBulkOperationTrigger(rsp, 'records.after.delete', 111);
+  });
 });

From 89094c8218bd461ac634db6ff9f04fa2b6482874 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 28 Mar 2023 18:07:17 +0800
Subject: [PATCH 098/161] feat(nc-gui): handle layout with hook log pagination

---
 .../nc-gui/components/webhook/CallLog.vue     | 129 +++++++++---------
 packages/nc-gui/components/webhook/Editor.vue |   2 +-
 2 files changed, 69 insertions(+), 62 deletions(-)

diff --git a/packages/nc-gui/components/webhook/CallLog.vue b/packages/nc-gui/components/webhook/CallLog.vue
index d3f9c32aaf..2f455b3629 100644
--- a/packages/nc-gui/components/webhook/CallLog.vue
+++ b/packages/nc-gui/components/webhook/CallLog.vue
@@ -18,7 +18,7 @@ let totalRows = $ref(0)
 
 const currentPage = $ref(1)
 
-const currentLimit = $ref(3)
+const currentLimit = $ref(25)
 
 async function loadHookLogs(page = currentPage, limit = currentLimit) {
   try {
@@ -43,71 +43,78 @@ onBeforeMount(async () => {
 <template>
   <a-skeleton v-if="isLoading" />
   <a-empty v-else-if="!hookLogs.length" />
-  <a-collapse v-else v-model:activeKey="activeKey" class="nc-hook-log-collapse">
-    <a-collapse-panel v-for="(hookLog, idx) of hookLogs" :key="idx">
-      <template #header>
-        <div class="w-full cursor-pointer">
-          <div class="font-weight-medium flex">
-            <div class="flex-1">
-              {{ hookLog.type }}: records.{{ hookLog.event }}.{{ hookLog.operation }} ({{ timeAgo(hookLog.created_at) }})
+  <a-layout v-else>
+    <a-layout-content>
+      <a-collapse v-model:activeKey="activeKey" class="nc-hook-log-collapse">
+        <a-collapse-panel v-for="(hookLog, idx) of hookLogs" :key="idx">
+          <template #header>
+            <div class="w-full cursor-pointer">
+              <div class="font-weight-medium flex">
+                <div class="flex-1">
+                  {{ hookLog.type }}: records.{{ hookLog.event }}.{{ hookLog.operation }} ({{ timeAgo(hookLog.created_at) }})
+                </div>
+                <div
+                  v-if="hookLog.type === 'URL'"
+                  class="mx-1 px-2 py-1 text-white rounded bg-red-500 text-xs"
+                  :class="{ '!bg-green-500': parseProp(hookLog.response).status === 200 }"
+                >
+                  {{ parseProp(hookLog.response).status }}
+                  {{ parseProp(hookLog.response).statusText }}
+                </div>
+                <div v-if="hookLog.type === 'Email'">
+                  <div v-if="hookLog.error_message" class="mx-1 px-2 py-1 text-white rounded text-xs bg-red-500">ERROR</div>
+                  <div v-else class="mx-1 px-2 py-1 text-white rounded text-xs bg-green-500">OK</div>
+                </div>
+              </div>
+              <div v-if="hookLog.type === 'URL'">
+                <span class="font-weight-medium text-primary">
+                  {{ parseProp(hookLog.payload).method }}
+                </span>
+                {{ parseProp(hookLog.payload).path }}
+              </div>
             </div>
-            <div
-              v-if="hookLog.type === 'URL'"
-              class="mx-1 px-2 py-1 text-white rounded bg-red-500 text-xs"
-              :class="{ '!bg-green-500': parseProp(hookLog.response).status === 200 }"
-            >
-              {{ parseProp(hookLog.response).status }}
-              {{ parseProp(hookLog.response).statusText }}
+          </template>
+
+          <div v-if="hookLog.type === 'URL'">
+            <div class="nc-hook-log-request">
+              <div class="nc-hook-pre-title">Request</div>
+              <pre class="nc-hook-pre">{{ parseProp(hookLog.response).config.headers }}</pre>
             </div>
-            <div v-if="hookLog.type === 'Email'">
-              <div v-if="hookLog.error_message" class="mx-1 px-2 py-1 text-white rounded text-xs bg-red-500">ERROR</div>
-              <div v-else class="mx-1 px-2 py-1 text-white rounded text-xs bg-green-500">OK</div>
+
+            <div class="nc-hook-log-response">
+              <div class="nc-hook-pre-title">Response</div>
+              <pre class="nc-hook-pre">{{ parseProp(hookLog.response).headers }}</pre>
+            </div>
+
+            <div class="nc-hook-log-payload">
+              <div class="nc-hook-pre-title">Payload</div>
+              <pre class="nc-hook-pre">{{ parseProp(parseProp(hookLog.response).config.data) }}</pre>
             </div>
           </div>
-          <div v-if="hookLog.type === 'URL'">
-            <span class="font-weight-medium text-primary">
-              {{ parseProp(hookLog.payload).method }}
-            </span>
-            {{ parseProp(hookLog.payload).path }}
+
+          <div v-else-if="hookLog.type === 'Email'">
+            <div v-if="hookLog.error_message" class="mb-4">
+              {{ hookLog.error_message }}
+            </div>
+            <div class="nc-hook-log-payload">
+              <div class="nc-hook-pre-title">Payload</div>
+              <pre class="nc-hook-pre">{{ parseProp(hookLog.payload) }}</pre>
+            </div>
           </div>
-        </div>
-      </template>
-
-      <div v-if="hookLog.type === 'URL'">
-        <div class="nc-hook-log-request">
-          <div class="nc-hook-pre-title">Request</div>
-          <pre class="nc-hook-pre">{{ parseProp(hookLog.response).config.headers }}</pre>
-        </div>
-
-        <div class="nc-hook-log-response">
-          <div class="nc-hook-pre-title">Response</div>
-          <pre class="nc-hook-pre">{{ parseProp(hookLog.response).headers }}</pre>
-        </div>
-
-        <div class="nc-hook-log-payload">
-          <div class="nc-hook-pre-title">Payload</div>
-          <pre class="nc-hook-pre">{{ parseProp(parseProp(hookLog.response).config.data) }}</pre>
-        </div>
-      </div>
-
-      <div v-else-if="hookLog.type === 'Email'">
-        <div v-if="hookLog.error_message" class="mb-4">
-          {{ hookLog.error_message }}
-        </div>
-        <div class="nc-hook-log-payload">
-          <div class="nc-hook-pre-title">Payload</div>
-          <pre class="nc-hook-pre">{{ parseProp(hookLog.payload) }}</pre>
-        </div>
-      </div>
-    </a-collapse-panel>
-  </a-collapse>
-  <a-pagination
-    v-model:current="currentPage"
-    :page-size="currentLimit"
-    :total="totalRows"
-    show-less-items
-    @change="loadHookLogs"
-  />
+        </a-collapse-panel>
+      </a-collapse>
+    </a-layout-content>
+    <a-layout-footer class="!bg-white text-center">
+      <a-pagination
+        v-model:current="currentPage"
+        style="width: calc(100% - 50px)"
+        :page-size="currentLimit"
+        :total="totalRows"
+        show-less-items
+        @change="loadHookLogs"
+      />
+    </a-layout-footer>
+  </a-layout>
 </template>
 
 <style scoped lang="scss">
diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 054ed8c04a..8b992efcc6 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -743,7 +743,7 @@ onMounted(async () => {
       </a-form>
     </a-tab-pane>
 
-    <a-tab-pane key="hook-log" class="nc-hook-log" :disabled="!props.hook">
+    <a-tab-pane key="hook-log" class="nc-hook-log h-[60vh]" :disabled="!props.hook">
       <template #tab>
         <span>
           <MdiHistory />

From dd665ae2d494f552a0a405c7ea037ac9bab82d77 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 28 Mar 2023 20:19:35 +0800
Subject: [PATCH 099/161] wip(nocodb): revise hooks and integrate with AST

---
 .../sql-data-mapper/lib/sql/BaseModelSqlv2.ts | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 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 b738a5b26b..077585461e 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
@@ -1,6 +1,7 @@
 import autoBind from 'auto-bind';
 import groupBy from 'lodash/groupBy';
 import DataLoader from 'dataloader';
+import { nocoExecute } from 'nc-help';
 import {
   AuditOperationSubTypes,
   AuditOperationTypes,
@@ -13,8 +14,10 @@ import ejs from 'ejs';
 import Validator from 'validator';
 import { customAlphabet } from 'nanoid';
 import DOMPurify from 'isomorphic-dompurify';
+import { getViewAndModelByAliasOrId } from '../../../../services/dbData/helpers';
 import Model from '../../../../models/Model';
 import Column from '../../../../models/Column';
+import Project from '../../../../models/Project';
 import Filter, {
   COMPARISON_OPS,
   COMPARISON_SUB_OPS,
@@ -32,6 +35,7 @@ import {
   invokeWebhook,
 } from '../../../../meta/helpers/webhookHelpers';
 import { NcError } from '../../../../meta/helpers/catchError';
+import getAst from './helpers/getAst';
 import { customValidators } from './customValidators';
 import formulaQueryBuilderv2 from './formulav2/formulaQueryBuilderv2';
 import genRollupSelectv2 from './genRollupSelectv2';
@@ -104,12 +108,20 @@ class BaseModelSqlv2 {
 
     qb.where(_wherePk(this.model.primaryKeys, id));
 
-    const data = (await this.execAndParse(qb))?.[0];
+    let data = (await this.execAndParse(qb))?.[0];
 
     if (data) {
       const proto = await this.getProto();
       data.__proto__ = proto;
     }
+
+    // retrieve virtual column data as well
+    const project = await Project.get(this.model.project_id);
+    const { model, view } = await getViewAndModelByAliasOrId({
+      projectName: project.title,
+      tableName: this.model.title,
+    });
+    data = await nocoExecute(await getAst({ model, view }), data, {});
     return data;
   }
 
@@ -1942,7 +1954,7 @@ class BaseModelSqlv2 {
               chunkSize
             );
 
-      await this.afterBulkInsert(response, insertDatas, this.dbDriver, cookie);
+      await this.afterBulkInsert(insertDatas, this.dbDriver, cookie);
 
       return response;
     } catch (e) {
@@ -1961,6 +1973,8 @@ class BaseModelSqlv2 {
       transaction = await this.dbDriver.transaction();
 
       // await this.beforeUpdateb(updateDatas, transaction);
+      const prevData = [];
+      const newData = [];
       const res = [];
       for (const d of updateDatas) {
         await this.validate(d);
@@ -1969,12 +1983,14 @@ class BaseModelSqlv2 {
           // pk not specified - bypass
           continue;
         }
+        prevData.push(await this.readByPk(pkValues));
         const wherePk = await this._wherePk(pkValues);
         await transaction(this.tnPath).update(d).where(wherePk);
         res.push(wherePk);
+        newData.push(await this.readByPk(pkValues));
       }
 
-      await this.afterBulkUpdate(res, this.dbDriver, cookie);
+      await this.afterBulkUpdate(prevData, newData, this.dbDriver, cookie);
       transaction.commit();
 
       return res;
@@ -2128,15 +2144,16 @@ class BaseModelSqlv2 {
   }
 
   public async afterBulkUpdate(
-    data: any,
+    prevData: any,
+    newData: any,
     _trx: any,
     req,
     isBulkAllOperation = false
   ): Promise<void> {
-    let noOfUpdatedRecords = data;
+    let noOfUpdatedRecords = newData;
     if (!isBulkAllOperation) {
-      noOfUpdatedRecords = data.length;
-      await this.handleHooks('after.update', null, data, req);
+      noOfUpdatedRecords = newData.length;
+      await this.handleHooks('after.update', prevData, newData, req);
     }
 
     await Audit.insert({
@@ -2177,13 +2194,8 @@ class BaseModelSqlv2 {
     });
   }
 
-  public async afterBulkInsert(
-    response: any,
-    data: any[],
-    _trx: any,
-    req
-  ): Promise<void> {
-    await this.handleHooks('after.insert', null, response, req);
+  public async afterBulkInsert(data: any[], _trx: any, req): Promise<void> {
+    await this.handleHooks('after.insert', null, data, req);
 
     await Audit.insert({
       fk_model_id: this.model.id,

From adf517ff620f10e66bc56c4d8c32fe7c869a1bb5 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 28 Mar 2023 20:43:06 +0530
Subject: [PATCH 100/161] test: webhook ltar, lookup, rollup

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/01-webhook.spec.ts | 175 +++++++++++++++++++++-
 1 file changed, 173 insertions(+), 2 deletions(-)

diff --git a/tests/playwright/tests/01-webhook.spec.ts b/tests/playwright/tests/01-webhook.spec.ts
index b311159bc8..0390eb27bf 100644
--- a/tests/playwright/tests/01-webhook.spec.ts
+++ b/tests/playwright/tests/01-webhook.spec.ts
@@ -5,7 +5,6 @@ import makeServer from '../setup/server';
 import { WebhookFormPage } from '../pages/Dashboard/WebhookForm';
 import { isSubset } from './utils/general';
 import { Api, UITypes } from 'nocodb-sdk';
-import { rowMixedValue } from '../setup/xcdb-records';
 
 const hookPath = 'http://localhost:9090/hook';
 let api: Api<any>;
@@ -109,7 +108,7 @@ test.describe.serial('Webhook', () => {
   });
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
     webhook = dashboard.webhookForm;
 
@@ -525,4 +524,176 @@ test.describe.serial('Webhook', () => {
     rsp = await getWebhookResponses({ request, count: 2 });
     await verifyBulkOperationTrigger(rsp, 'records.after.delete', 111);
   });
+
+  test('Virtual columns', async ({ request, page }) => {
+    let cityTable, countryTable;
+    const cityColumns = [
+      {
+        column_name: 'Id',
+        title: 'Id',
+        uidt: UITypes.ID,
+      },
+      {
+        column_name: 'City',
+        title: 'City',
+        uidt: UITypes.SingleLineText,
+        pv: true,
+      },
+      {
+        column_name: 'CityCode',
+        title: 'CityCode',
+        uidt: UITypes.Number,
+      },
+    ];
+    const countryColumns = [
+      {
+        column_name: 'Id',
+        title: 'Id',
+        uidt: UITypes.ID,
+      },
+      {
+        column_name: 'Country',
+        title: 'Country',
+        uidt: UITypes.SingleLineText,
+        pv: true,
+      },
+      {
+        column_name: 'CountryCode',
+        title: 'CountryCode',
+        uidt: UITypes.Number,
+      },
+    ];
+
+    try {
+      const project = await api.project.read(context.project.id);
+      cityTable = await api.base.tableCreate(context.project.id, project.bases?.[0].id, {
+        table_name: 'City',
+        title: 'City',
+        columns: cityColumns,
+      });
+      countryTable = await api.base.tableCreate(context.project.id, project.bases?.[0].id, {
+        table_name: 'Country',
+        title: 'Country',
+        columns: countryColumns,
+      });
+
+      const cityRowAttributes = [
+        { City: 'Mumbai', CityCode: 23 },
+        { City: 'Pune', CityCode: 33 },
+        { City: 'Delhi', CityCode: 43 },
+        { City: 'Bangalore', CityCode: 53 },
+      ];
+      await api.dbTableRow.bulkCreate('noco', context.project.id, cityTable.id, cityRowAttributes);
+
+      const countryRowAttributes = [
+        { Country: 'India', CountryCode: 1 },
+        { Country: 'USA', CountryCode: 2 },
+        { Country: 'UK', CountryCode: 3 },
+        { Country: 'Australia', CountryCode: 4 },
+      ];
+      await api.dbTableRow.bulkCreate('noco', context.project.id, countryTable.id, countryRowAttributes);
+
+      // create LTAR Country has-many City
+      countryTable = await api.dbTableColumn.create(countryTable.id, {
+        column_name: 'CityList',
+        title: 'CityList',
+        uidt: UITypes.LinkToAnotherRecord,
+        parentId: countryTable.id,
+        childId: cityTable.id,
+        type: 'hm',
+      });
+
+      // Create Lookup column in Country table
+      countryTable = await api.dbTableColumn.create(countryTable.id, {
+        column_name: 'CityCodeLookup',
+        title: 'CityCodeLookup',
+        uidt: UITypes.Lookup,
+        fk_relation_column_id: countryTable.columns.filter(c => c.title === 'CityList')[0].id,
+        fk_lookup_column_id: cityTable.columns.filter(c => c.title === 'CityCode')[0].id,
+      });
+
+      // Create Rollup column in Country table
+      countryTable = await api.dbTableColumn.create(countryTable.id, {
+        column_name: 'CityCodeRollup',
+        title: 'CityCodeRollup',
+        uidt: UITypes.Rollup,
+        fk_relation_column_id: countryTable.columns.filter(c => c.title === 'CityList')[0].id,
+        fk_rollup_column_id: cityTable.columns.filter(c => c.title === 'CityCode')[0].id,
+        rollup_function: 'count',
+      });
+
+      // Create links
+      await api.dbTableRow.nestedAdd('noco', context.project.title, countryTable.title, 1, 'hm', 'CityList', '1');
+      await api.dbTableRow.nestedAdd('noco', context.project.title, countryTable.title, 1, 'hm', 'CityList', '2');
+      await api.dbTableRow.nestedAdd('noco', context.project.title, countryTable.title, 2, 'hm', 'CityList', '3');
+      await api.dbTableRow.nestedAdd('noco', context.project.title, countryTable.title, 3, 'hm', 'CityList', '4');
+    } catch (e) {
+      console.log(e);
+    }
+
+    await page.reload();
+    await dashboard.treeView.openTable({ title: 'Country' });
+
+    // create after update webhook
+    // after update hook
+    await webhook.create({
+      title: 'hook-2',
+      event: 'After Update',
+    });
+
+    // clear server data
+    await clearServerData({ request });
+
+    // edit first record
+    await dashboard.grid.editRow({ index: 0, columnHeader: 'Country', value: 'INDIA', networkValidation: false });
+    const rsp = await getWebhookResponses({ request, count: 1 });
+
+    const expectedData = {
+      type: 'records.after.update',
+      data: {
+        table_name: 'Country',
+        view_name: 'Country',
+        previous_rows: [
+          {
+            Id: 1,
+            Country: 'India',
+            CountryCode: 1,
+            CityCodeRollup: 2,
+            CityList: [
+              {
+                Id: 1,
+                City: 'Mumbai',
+              },
+              {
+                Id: 2,
+                City: 'Pune',
+              },
+            ],
+            CityCodeLookup: [23, 33],
+          },
+        ],
+        rows: [
+          {
+            Id: 1,
+            Country: 'INDIA',
+            CountryCode: 1,
+            CityCodeRollup: 2,
+            CityList: [
+              {
+                Id: 1,
+                City: 'Mumbai',
+              },
+              {
+                Id: 2,
+                City: 'Pune',
+              },
+            ],
+            CityCodeLookup: [23, 33],
+          },
+        ],
+      },
+    };
+
+    await expect(isSubset(rsp[0], expectedData)).toBe(true);
+  });
 });

From ba36c56bfb722815ba90165779dd3a732e4941eb Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 28 Mar 2023 20:52:59 +0530
Subject: [PATCH 101/161] test: webhook for formula

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/01-webhook.spec.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/playwright/tests/01-webhook.spec.ts b/tests/playwright/tests/01-webhook.spec.ts
index 0390eb27bf..148ec61134 100644
--- a/tests/playwright/tests/01-webhook.spec.ts
+++ b/tests/playwright/tests/01-webhook.spec.ts
@@ -627,6 +627,14 @@ test.describe.serial('Webhook', () => {
       await api.dbTableRow.nestedAdd('noco', context.project.title, countryTable.title, 1, 'hm', 'CityList', '2');
       await api.dbTableRow.nestedAdd('noco', context.project.title, countryTable.title, 2, 'hm', 'CityList', '3');
       await api.dbTableRow.nestedAdd('noco', context.project.title, countryTable.title, 3, 'hm', 'CityList', '4');
+
+      // create formula column
+      countryTable = await api.dbTableColumn.create(countryTable.id, {
+        column_name: 'CityCodeFormula',
+        title: 'CityCodeFormula',
+        uidt: UITypes.Formula,
+        formula_raw: '({Id} * 100)',
+      });
     } catch (e) {
       console.log(e);
     }
@@ -647,6 +655,7 @@ test.describe.serial('Webhook', () => {
     // edit first record
     await dashboard.grid.editRow({ index: 0, columnHeader: 'Country', value: 'INDIA', networkValidation: false });
     const rsp = await getWebhookResponses({ request, count: 1 });
+    console.log(rsp);
 
     const expectedData = {
       type: 'records.after.update',
@@ -659,6 +668,7 @@ test.describe.serial('Webhook', () => {
             Country: 'India',
             CountryCode: 1,
             CityCodeRollup: 2,
+            CityCodeFormula: 100,
             CityList: [
               {
                 Id: 1,
@@ -678,6 +688,7 @@ test.describe.serial('Webhook', () => {
             Country: 'INDIA',
             CountryCode: 1,
             CityCodeRollup: 2,
+            CityCodeFormula: 100,
             CityList: [
               {
                 Id: 1,

From f93394da1c3c1e926695e170e67456fbecc8cce6 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 29 Mar 2023 12:30:26 +0800
Subject: [PATCH 102/161] fix(nocodb): revise bulk delete logic

---
 .../db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts  | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 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 077585461e..b9a6c9a901 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
@@ -2058,17 +2058,24 @@ class BaseModelSqlv2 {
 
       transaction = await this.dbDriver.transaction();
 
+      const deleted = [];
       const res = [];
       for (const d of deleteIds) {
-        if (Object.keys(d).length) {
-          await transaction(this.tnPath).del().where(d);
-          res.push(d);
+        await this.validate(d);
+        const pkValues = await this._extractPksValues(d);
+        if (!pkValues) {
+          // pk not specified - bypass
+          continue;
         }
+
+        deleted.push(await this.readByPk(pkValues));
+        await transaction(this.tnPath).del().where(d);
+        res.push(d);
       }
 
       transaction.commit();
 
-      await this.afterBulkDelete(res, this.dbDriver, cookie);
+      await this.afterBulkDelete(deleted, this.dbDriver, cookie);
 
       return res;
     } catch (e) {

From 809ffe36607da51dfc720d49f1337a0fb134dd0e Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 29 Mar 2023 13:09:33 +0800
Subject: [PATCH 103/161] feat(nc-gui): include bulk operations

---
 packages/nc-gui/components/webhook/Editor.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 8b992efcc6..9f64fbba15 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -178,6 +178,9 @@ const eventList = [
   { text: ['After', 'Insert'], value: ['after', 'insert'] },
   { text: ['After', 'Update'], value: ['after', 'update'] },
   { text: ['After', 'Delete'], value: ['after', 'delete'] },
+  { text: ['After', 'Bulk Insert'], value: ['after', 'bulkInsert'] },
+  { text: ['After', 'Bulk Update'], value: ['after', 'bulkUpdate'] },
+  { text: ['After', 'Bulk Delete'], value: ['after', 'bulkDelete'] },
 ]
 
 const notificationList = computed(() => {

From 04a1ee20b7a8d3dab9a643d9bdf3a8e28844978b Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 29 Mar 2023 13:09:48 +0800
Subject: [PATCH 104/161] feat(nc-gui): break hook operation camel case

---
 packages/nc-gui/components/webhook/List.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/webhook/List.vue b/packages/nc-gui/components/webhook/List.vue
index 7dc178ff30..59b2f3f63f 100644
--- a/packages/nc-gui/components/webhook/List.vue
+++ b/packages/nc-gui/components/webhook/List.vue
@@ -125,7 +125,7 @@ onMounted(() => {
           <a-list-item class="p-2 nc-hook" @click="emit('edit', item)">
             <a-list-item-meta>
               <template #description>
-                <span class="uppercase"> {{ item.event }} {{ item.operation }}</span>
+                <span class="uppercase"> {{ item.event }} {{ item.operation.replace(/[A-Z]/g, ' $&') }}</span>
               </template>
 
               <template #title>

From b28afa2e0da571918d28bd79e8ec6dbe936a202c Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 29 Mar 2023 13:13:22 +0800
Subject: [PATCH 105/161] feat(nocodb): add bulk operations to hook

---
 packages/nocodb/src/schema/swagger.json | 36 ++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json
index e8b647daf7..5ae1791527 100644
--- a/packages/nocodb/src/schema/swagger.json
+++ b/packages/nocodb/src/schema/swagger.json
@@ -12162,7 +12162,14 @@
         {
           "schema": {
             "type": "string",
-            "enum": ["update", "delete", "insert"]
+            "enum": [
+              "insert",
+              "update",
+              "delete",
+              "bulkInsert",
+              "bulkUpdate",
+              "bulkDelete"
+            ]
           },
           "name": "operation",
           "in": "path",
@@ -16399,7 +16406,14 @@
             "type": ["object", "string"]
           },
           "operation": {
-            "enum": ["delete", "insert", "update"],
+            "enum": [
+              "insert",
+              "update",
+              "delete",
+              "bulkInsert",
+              "bulkUpdate",
+              "bulkDelete"
+            ],
             "type": "string",
             "description": "Hook Operation",
             "example": "insert"
@@ -16503,7 +16517,14 @@
             "type": ["object", "string"]
           },
           "operation": {
-            "enum": ["delete", "insert", "update"],
+            "enum": [
+              "insert",
+              "update",
+              "delete",
+              "bulkInsert",
+              "bulkUpdate",
+              "bulkDelete"
+            ],
             "type": "string",
             "description": "Hook Operation",
             "example": "insert"
@@ -16695,7 +16716,14 @@
           "operation": {
             "type": "string",
             "description": "Hook Operation",
-            "enum": ["insert", "update", "delete"],
+            "enum": [
+              "insert",
+              "update",
+              "delete",
+              "bulkInsert",
+              "bulkUpdate",
+              "bulkDelete"
+            ],
             "example": "insert"
           },
           "payload": {

From 8c5e86d8f34ce5cb4386628eb571891464a15696 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 29 Mar 2023 13:13:40 +0800
Subject: [PATCH 106/161] fix(nocodb): fix hook types

---
 packages/nocodb/src/lib/models/Hook.ts    | 30 +++--------------------
 packages/nocodb/src/lib/models/HookLog.ts |  8 +++---
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/packages/nocodb/src/lib/models/Hook.ts b/packages/nocodb/src/lib/models/Hook.ts
index e24bd9a460..02c4a393a1 100644
--- a/packages/nocodb/src/lib/models/Hook.ts
+++ b/packages/nocodb/src/lib/models/Hook.ts
@@ -19,8 +19,8 @@ export default class Hook implements HookType {
   description?: string;
   env?: string;
   type?: string;
-  event?: 'after' | 'before';
-  operation?: 'insert' | 'delete' | 'update';
+  event?: HookType['event'];
+  operation?: HookType['operation'];
   async?: BoolType;
   payload?: string;
   url?: string;
@@ -79,8 +79,8 @@ export default class Hook implements HookType {
   static async list(
     param: {
       fk_model_id: string;
-      event?: 'after' | 'before';
-      operation?: 'insert' | 'delete' | 'update';
+      event?: HookType['event'];
+      operation?: HookType['operation'];
     },
     ncMeta = Noco.ncMeta
   ) {
@@ -136,17 +136,6 @@ export default class Hook implements HookType {
       'base_id',
     ]);
 
-    if (insertObj.event) {
-      insertObj.event = insertObj.event.toLowerCase() as 'after' | 'before';
-    }
-
-    if (insertObj.operation) {
-      insertObj.operation = insertObj.operation.toLowerCase() as
-        | 'insert'
-        | 'delete'
-        | 'update';
-    }
-
     if (insertObj.notification && typeof insertObj.notification === 'object') {
       insertObj.notification = JSON.stringify(insertObj.notification);
     }
@@ -200,17 +189,6 @@ export default class Hook implements HookType {
       'active',
     ]);
 
-    if (updateObj.event) {
-      updateObj.event = updateObj.event.toLowerCase() as 'after' | 'before';
-    }
-
-    if (updateObj.operation) {
-      updateObj.operation = updateObj.operation.toLowerCase() as
-        | 'insert'
-        | 'delete'
-        | 'update';
-    }
-
     if (updateObj.notification && typeof updateObj.notification === 'object') {
       updateObj.notification = JSON.stringify(updateObj.notification);
     }
diff --git a/packages/nocodb/src/lib/models/HookLog.ts b/packages/nocodb/src/lib/models/HookLog.ts
index 2b1292907c..12d0ed8b0d 100644
--- a/packages/nocodb/src/lib/models/HookLog.ts
+++ b/packages/nocodb/src/lib/models/HookLog.ts
@@ -10,8 +10,8 @@ export default class HookLog implements HookLogType {
   project_id?: string;
   fk_hook_id?: string;
   type?: string;
-  event?: 'after' | 'before';
-  operation?: 'insert' | 'update' | 'delete';
+  event?: HookLogType['event'];
+  operation?: HookLogType['operation'];
   test_call?: boolean;
   payload?: string;
   conditions?: string;
@@ -30,8 +30,8 @@ export default class HookLog implements HookLogType {
   static async list(
     param: {
       fk_hook_id: string;
-      event?: 'after' | 'before';
-      operation?: 'insert' | 'delete' | 'update';
+      event?: HookLogType['event'];
+      operation?: HookLogType['operation'];
     },
     {
       limit = 25,

From 23511d51333591f7342d701834a239e00503491c Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 29 Mar 2023 13:14:04 +0800
Subject: [PATCH 107/161] feat(nocodb): revise hook names

---
 .../lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 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 b9a6c9a901..f38bb0cb2e 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
@@ -2160,7 +2160,7 @@ class BaseModelSqlv2 {
     let noOfUpdatedRecords = newData;
     if (!isBulkAllOperation) {
       noOfUpdatedRecords = newData.length;
-      await this.handleHooks('after.update', prevData, newData, req);
+      await this.handleHooks('after.bulkUpdate', prevData, newData, req);
     }
 
     await Audit.insert({
@@ -2185,7 +2185,7 @@ class BaseModelSqlv2 {
     let noOfDeletedRecords = data;
     if (!isBulkAllOperation) {
       noOfDeletedRecords = data.length;
-      await this.handleHooks('after.delete', null, data, req);
+      await this.handleHooks('after.bulkDelete', null, data, req);
     }
 
     await Audit.insert({
@@ -2202,7 +2202,7 @@ class BaseModelSqlv2 {
   }
 
   public async afterBulkInsert(data: any[], _trx: any, req): Promise<void> {
-    await this.handleHooks('after.insert', null, data, req);
+    await this.handleHooks('after.insert.bulk', null, data, req);
 
     await Audit.insert({
       fk_model_id: this.model.id,
@@ -2282,7 +2282,10 @@ class BaseModelSqlv2 {
     const view = await View.get(this.viewId);
 
     // handle form view data submission
-    if (hookName === 'after.insert' && view.type === ViewTypes.FORM) {
+    if (
+      (hookName === 'after.insert' || hookName === 'after.bulkInsert') &&
+      view.type === ViewTypes.FORM
+    ) {
       try {
         const formView = await view.getView<FormView>();
         const { columns } = await FormView.getWithInfo(formView.fk_view_id);

From edcdaf9c47a4fcbe69b57ab2cc4161c3a4933b3c Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 29 Mar 2023 13:14:12 +0800
Subject: [PATCH 108/161] chore(sdk): regenerate Api.ts

---
 packages/nocodb-sdk/src/lib/Api.ts | 32 ++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index ff0152f373..b2ac509ca2 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -1115,7 +1115,13 @@ export interface HookType {
    * Hook Operation
    * @example insert
    */
-  operation?: 'delete' | 'insert' | 'update';
+  operation?:
+    | 'insert'
+    | 'update'
+    | 'delete'
+    | 'bulkInsert'
+    | 'bulkUpdate'
+    | 'bulkDelete';
   /**
    * Retry Count
    * @example 10
@@ -1178,7 +1184,13 @@ export interface HookReqType {
    * Hook Operation
    * @example insert
    */
-  operation: 'delete' | 'insert' | 'update';
+  operation:
+    | 'insert'
+    | 'update'
+    | 'delete'
+    | 'bulkInsert'
+    | 'bulkUpdate'
+    | 'bulkDelete';
   /**
    * Retry Count
    * @example 10
@@ -1252,7 +1264,13 @@ export interface HookLogType {
    * Hook Operation
    * @example insert
    */
-  operation?: 'insert' | 'update' | 'delete';
+  operation?:
+    | 'insert'
+    | 'update'
+    | 'delete'
+    | 'bulkInsert'
+    | 'bulkUpdate'
+    | 'bulkDelete';
   /**
    * Hook Payload
    * @example {"method":"POST","body":"{{ json data }}","headers":[{}],"parameters":[{}],"auth":"","path":"https://webhook.site/6eb45ce5-b611-4be1-8b96-c2965755662b"}
@@ -8998,7 +9016,13 @@ export class Api<
  */
     samplePayloadGet: (
       tableId: IdType,
-      operation: 'update' | 'delete' | 'insert',
+      operation:
+        | 'insert'
+        | 'update'
+        | 'delete'
+        | 'bulkInsert'
+        | 'bulkUpdate'
+        | 'bulkDelete',
       version: 'v1' | 'v2',
       params: RequestParams = {}
     ) =>

From 73bfc0108a019ece0e6491b7a52b6c1277840591 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 29 Mar 2023 13:48:23 +0800
Subject: [PATCH 109/161] fix(nocodb): hook version & operation types

---
 packages/nocodb/src/lib/controllers/hook.ctl.ts | 4 ++--
 packages/nocodb/src/lib/services/hook.svc.ts    | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/nocodb/src/lib/controllers/hook.ctl.ts b/packages/nocodb/src/lib/controllers/hook.ctl.ts
index 5bb0ca979e..bf909e2ffc 100644
--- a/packages/nocodb/src/lib/controllers/hook.ctl.ts
+++ b/packages/nocodb/src/lib/controllers/hook.ctl.ts
@@ -57,8 +57,8 @@ export async function tableSampleData(req: Request, res: Response) {
   res.json(
     await hookService.tableSampleData({
       tableId: req.params.tableId,
-      operation: req.params.operation as 'insert' | 'update',
-      version: req.params.version as 'v1' | 'v2',
+      operation: req.params.operation as HookType['operation'],
+      version: req.params.version as HookType['version'],
     })
   );
 }
diff --git a/packages/nocodb/src/lib/services/hook.svc.ts b/packages/nocodb/src/lib/services/hook.svc.ts
index 78f70084ac..a3122cff5a 100644
--- a/packages/nocodb/src/lib/services/hook.svc.ts
+++ b/packages/nocodb/src/lib/services/hook.svc.ts
@@ -8,6 +8,7 @@ import {
   populateSamplePayloadV2,
 } from '../meta/helpers/populateSamplePayload';
 import type { HookReqType, HookTestReqType } from 'nocodb-sdk';
+import { HookType } from 'nocodb-sdk';
 
 function validateHookPayload(
   notificationJsonOrObject: string | Record<string, any>
@@ -100,8 +101,8 @@ export async function hookTest(param: {
 
 export async function tableSampleData(param: {
   tableId: string;
-  operation: 'insert' | 'update';
-  version: 'v1' | 'v2';
+  operation: HookType['operation'];
+  version: HookType['version'];
 }) {
   const model = await Model.getByIdOrName({ id: param.tableId });
 

From 833c5b473314b191e9a2b2e6fea64663f8b1ceab Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 29 Mar 2023 13:48:39 +0800
Subject: [PATCH 110/161] fix(nocodb): show prevRows for update / bulkUpdate
 operations

---
 packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts b/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
index 8d13135f15..f6c117943a 100644
--- a/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
+++ b/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
@@ -88,7 +88,7 @@ export async function populateSamplePayloadV2(
   }
 
   let prevRows;
-  if (operation !== 'insert') {
+  if (['update', 'bulkUpdate'].includes(operation)) {
     prevRows = rows;
   }
 

From 8eaa55f59820ff5b1e8f08a89f8e1e73f3e62f67 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 29 Mar 2023 16:27:24 +0800
Subject: [PATCH 111/161] fix(nc-gui): init path for url hook

---
 packages/nc-gui/components/webhook/Editor.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 9f64fbba15..a5b4686599 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -58,6 +58,7 @@ const hook = reactive<
       body: '{{ json data }}',
       headers: [{}],
       parameters: [{}],
+      path: '',
     },
   },
   condition: false,

From c6864de3d40602aaa8b1649de772b3a63e105950 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 29 Mar 2023 17:14:30 +0800
Subject: [PATCH 112/161] fix(nocodb): bulk update logic

---
 .../src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 f38bb0cb2e..40c266c117 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
@@ -1975,6 +1975,7 @@ class BaseModelSqlv2 {
       // await this.beforeUpdateb(updateDatas, transaction);
       const prevData = [];
       const newData = [];
+      const updatePkValues = [];
       const res = [];
       for (const d of updateDatas) {
         await this.validate(d);
@@ -1987,11 +1988,16 @@ class BaseModelSqlv2 {
         const wherePk = await this._wherePk(pkValues);
         await transaction(this.tnPath).update(d).where(wherePk);
         res.push(wherePk);
+        updatePkValues.push(pkValues);
+      }
+
+      transaction.commit();
+
+      for (const pkValues of updatePkValues) {
         newData.push(await this.readByPk(pkValues));
       }
 
       await this.afterBulkUpdate(prevData, newData, this.dbDriver, cookie);
-      transaction.commit();
 
       return res;
     } catch (e) {

From b48c397cb2a49405ee0086a5f98451c17efa5795 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 29 Mar 2023 17:14:41 +0800
Subject: [PATCH 113/161] chore(nocodb): hook type

---
 packages/nocodb/src/lib/services/hook.svc.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/services/hook.svc.ts b/packages/nocodb/src/lib/services/hook.svc.ts
index a3122cff5a..c6a5b2b559 100644
--- a/packages/nocodb/src/lib/services/hook.svc.ts
+++ b/packages/nocodb/src/lib/services/hook.svc.ts
@@ -7,8 +7,8 @@ import {
   populateSamplePayload,
   populateSamplePayloadV2,
 } from '../meta/helpers/populateSamplePayload';
+import type { HookType } from 'nocodb-sdk';
 import type { HookReqType, HookTestReqType } from 'nocodb-sdk';
-import { HookType } from 'nocodb-sdk';
 
 function validateHookPayload(
   notificationJsonOrObject: string | Record<string, any>

From 8ef97ed04b9ac2b7c565a9137014f1bb6eb15267 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 29 Mar 2023 19:37:48 +0800
Subject: [PATCH 114/161] fix(nocodb): incorrect hook handle name

---
 .../nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 40c266c117..e5e1c3f5c6 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
@@ -2208,7 +2208,7 @@ class BaseModelSqlv2 {
   }
 
   public async afterBulkInsert(data: any[], _trx: any, req): Promise<void> {
-    await this.handleHooks('after.insert.bulk', null, data, req);
+    await this.handleHooks('after.bulkInsert', null, data, req);
 
     await Audit.insert({
       fk_model_id: this.model.id,

From 57d1b9ec3dde59ea825b16f5a64953ea5c5174b4 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 29 Mar 2023 19:38:10 +0800
Subject: [PATCH 115/161] feat(nocodb): use rows_inserted for bulk insert

---
 .../nocodb/src/lib/meta/helpers/populateSamplePayload.ts | 6 +++++-
 packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts   | 9 ++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts b/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
index f6c117943a..b1e9073710 100644
--- a/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
+++ b/packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
@@ -95,7 +95,11 @@ export async function populateSamplePayloadV2(
   samplePayload.data = {
     ...samplePayload.data,
     ...(prevRows && { previous_rows: [prevRows] }),
-    ...(rows && { rows: [rows] }),
+    ...(operation !== 'bulkInsert' && rows && { rows: [rows] }),
+    ...(operation === 'bulkInsert' &&
+      rows && {
+        row_inserted: 10,
+      }),
   };
 
   return samplePayload;
diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index 6f27a3e56a..f3e6dbd2a2 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -151,7 +151,14 @@ export function constructWebHookData(hook, model, view, prevData, newData) {
         ...(prevData && {
           previous_rows: [prevData],
         }),
-        ...(newData && { rows: [newData] }),
+        ...(hook.operation !== 'bulkInsert' && newData && { rows: [newData] }),
+        ...(hook.operation === 'bulkInsert' && {
+          rows_inserted: Array.isArray(newData)
+            ? newData.length
+            : newData
+            ? 1
+            : 0,
+        }),
       },
     };
   }

From 46170ac6e303f2b962564fa27f72300dde8c726e Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 29 Mar 2023 20:09:49 +0800
Subject: [PATCH 116/161] fix(nc-gui): broken div

---
 packages/nc-gui/components/webhook/Editor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index a4e228e316..7b214520d5 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -714,7 +714,7 @@ onMounted(async () => {
           <a-row>
             <a-col :span="24">
               <div v-if="!(hook.version === 'v2' && hook.type === 'URL')" class="text-gray-600">
-                <div class="flex items-center"></div>
+                <div class="flex items-center">
                   <em>Use context variable <strong>data</strong> to refer the record under consideration</em>
 
                   <a-tooltip bottom>

From d5248ee6456da00f42e0a0364dd82899fad6f30b Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 30 Mar 2023 12:47:59 +0800
Subject: [PATCH 117/161] fix(tests): expect empty object for deletedRow

---
 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 f523c74490..16054c7f3e 100644
--- a/packages/nocodb/tests/unit/model/tests/baseModelSql.test.ts
+++ b/packages/nocodb/tests/unit/model/tests/baseModelSql.test.ts
@@ -273,7 +273,7 @@ function baseModelSqlTests() {
 
     const deletedRow = await baseModelSql.readByPk(rowIdToDeleted);
 
-    expect(deletedRow).to.be.undefined;
+    expect(deletedRow).to.be.an('object').that.is.empty;
 
     console.log('Delete record', await Audit.projectAuditList(project.id, {}));
     const rowDeletedAudit = (await Audit.projectAuditList(project.id, {})).find(

From c4b48aac4adda5d50588b8ce273705b4c90b3b7c Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 30 Mar 2023 12:53:45 +0800
Subject: [PATCH 118/161] fix(nocodb): add missing null prevData for bulk
 update all operation

---
 .../nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 e5e1c3f5c6..d103d46c06 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
@@ -2047,7 +2047,7 @@ class BaseModelSqlv2 {
         count = (await qb) as any;
       }
 
-      await this.afterBulkUpdate(count, this.dbDriver, cookie, true);
+      await this.afterBulkUpdate(null, count, this.dbDriver, cookie, true);
 
       return count;
     } catch (e) {

From 77fc7770a43350450f8d8c85726932e86bcd582d Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 30 Mar 2023 13:55:43 +0800
Subject: [PATCH 119/161] chore(nc-gui): remove h-[60vh]

---
 packages/nc-gui/components/webhook/Editor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 7b214520d5..f0640b9afc 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -749,7 +749,7 @@ onMounted(async () => {
       </a-form>
     </a-tab-pane>
 
-    <a-tab-pane key="hook-log" class="nc-hook-log h-[60vh]" :disabled="!props.hook">
+    <a-tab-pane key="hook-log" class="nc-hook-log" :disabled="!props.hook">
       <template #tab>
         <span>
           <MdiHistory />

From 5636eddcc4e0cc76b2ebc224b75919d9b7dd3faa Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 30 Mar 2023 13:56:04 +0800
Subject: [PATCH 120/161] feat(nc-gui): include NC_AUTOMATION_LOG_LEVEL message

---
 .../nc-gui/components/webhook/CallLog.vue     | 151 ++++++++++--------
 1 file changed, 85 insertions(+), 66 deletions(-)

diff --git a/packages/nc-gui/components/webhook/CallLog.vue b/packages/nc-gui/components/webhook/CallLog.vue
index 2f455b3629..b4779f2812 100644
--- a/packages/nc-gui/components/webhook/CallLog.vue
+++ b/packages/nc-gui/components/webhook/CallLog.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { HookLogType, HookType } from 'nocodb-sdk'
-import { extractSdkResponseErrorMsg, onBeforeMount, parseProp, timeAgo, useApi } from '#imports'
+import { extractSdkResponseErrorMsg, onBeforeMount, parseProp, timeAgo, useApi, useGlobal } from '#imports'
 
 interface Props {
   hook: HookType
@@ -14,11 +14,13 @@ const hookLogs = ref<HookLogType[]>([])
 
 const activeKey = ref()
 
+const { appInfo } = useGlobal()
+
 let totalRows = $ref(0)
 
 const currentPage = $ref(1)
 
-const currentLimit = $ref(25)
+const currentLimit = $ref(10)
 
 async function loadHookLogs(page = currentPage, limit = currentLimit) {
   try {
@@ -42,79 +44,96 @@ onBeforeMount(async () => {
 
 <template>
   <a-skeleton v-if="isLoading" />
-  <a-empty v-else-if="!hookLogs.length" />
-  <a-layout v-else>
-    <a-layout-content>
-      <a-collapse v-model:activeKey="activeKey" class="nc-hook-log-collapse">
-        <a-collapse-panel v-for="(hookLog, idx) of hookLogs" :key="idx">
-          <template #header>
-            <div class="w-full cursor-pointer">
-              <div class="font-weight-medium flex">
-                <div class="flex-1">
-                  {{ hookLog.type }}: records.{{ hookLog.event }}.{{ hookLog.operation }} ({{ timeAgo(hookLog.created_at) }})
-                </div>
-                <div
-                  v-if="hookLog.type === 'URL'"
-                  class="mx-1 px-2 py-1 text-white rounded bg-red-500 text-xs"
-                  :class="{ '!bg-green-500': parseProp(hookLog.response).status === 200 }"
-                >
-                  {{ parseProp(hookLog.response).status }}
-                  {{ parseProp(hookLog.response).statusText }}
+  <div v-else>
+    <a-card class="!mb-[20px]" :body-style="{ padding: '10px' }">
+      <span v-if="appInfo.automationLogLevel === 'OFF'">
+        The NC_AUTOMATION_LOG_LEVEL is set to “OFF”, no logs will be displayed.
+      </span>
+      <span v-if="appInfo.automationLogLevel === 'ERROR'">
+        The NC_AUTOMATION_LOG_LEVEL is set to “ERROR”, only error logs will be displayed.
+      </span>
+      <span v-if="appInfo.automationLogLevel === 'ALL'">
+        The NC_AUTOMATION_LOG_LEVEL is set to “ALL”, both error and success logs will be displayed.
+      </span>
+      <span>
+        <!-- TODO: update the link -->
+        For additional configuration options, please refer the documentation <a href="#" target="_blank">here</a>.
+      </span>
+    </a-card>
+
+    <a-empty v-if="!hookLogs.length" />
+    <a-layout v-else>
+      <a-layout-content>
+        <a-collapse v-model:activeKey="activeKey" class="nc-hook-log-collapse">
+          <a-collapse-panel v-for="(hookLog, idx) of hookLogs" :key="idx">
+            <template #header>
+              <div class="w-full cursor-pointer">
+                <div class="font-weight-medium flex">
+                  <div class="flex-1">
+                    {{ hookLog.type }}: records.{{ hookLog.event }}.{{ hookLog.operation }} ({{ timeAgo(hookLog.created_at) }})
+                  </div>
+                  <div
+                    v-if="hookLog.type === 'URL'"
+                    class="mx-1 px-2 py-1 text-white rounded bg-red-500 text-xs"
+                    :class="{ '!bg-green-500': parseProp(hookLog.response).status === 200 }"
+                  >
+                    {{ parseProp(hookLog.response).status }}
+                    {{ parseProp(hookLog.response).statusText }}
+                  </div>
+                  <div v-if="hookLog.type === 'Email'">
+                    <div v-if="hookLog.error_message" class="mx-1 px-2 py-1 text-white rounded text-xs bg-red-500">ERROR</div>
+                    <div v-else class="mx-1 px-2 py-1 text-white rounded text-xs bg-green-500">OK</div>
+                  </div>
                 </div>
-                <div v-if="hookLog.type === 'Email'">
-                  <div v-if="hookLog.error_message" class="mx-1 px-2 py-1 text-white rounded text-xs bg-red-500">ERROR</div>
-                  <div v-else class="mx-1 px-2 py-1 text-white rounded text-xs bg-green-500">OK</div>
+                <div v-if="hookLog.type === 'URL'">
+                  <span class="font-weight-medium text-primary">
+                    {{ parseProp(hookLog.payload).method }}
+                  </span>
+                  {{ parseProp(hookLog.payload).path }}
                 </div>
               </div>
-              <div v-if="hookLog.type === 'URL'">
-                <span class="font-weight-medium text-primary">
-                  {{ parseProp(hookLog.payload).method }}
-                </span>
-                {{ parseProp(hookLog.payload).path }}
-              </div>
-            </div>
-          </template>
+            </template>
 
-          <div v-if="hookLog.type === 'URL'">
-            <div class="nc-hook-log-request">
-              <div class="nc-hook-pre-title">Request</div>
-              <pre class="nc-hook-pre">{{ parseProp(hookLog.response).config.headers }}</pre>
-            </div>
+            <div v-if="hookLog.type === 'URL'">
+              <div class="nc-hook-log-request">
+                <div class="nc-hook-pre-title">Request</div>
+                <pre class="nc-hook-pre">{{ parseProp(hookLog.response).config.headers }}</pre>
+              </div>
 
-            <div class="nc-hook-log-response">
-              <div class="nc-hook-pre-title">Response</div>
-              <pre class="nc-hook-pre">{{ parseProp(hookLog.response).headers }}</pre>
-            </div>
+              <div class="nc-hook-log-response">
+                <div class="nc-hook-pre-title">Response</div>
+                <pre class="nc-hook-pre">{{ parseProp(hookLog.response).headers }}</pre>
+              </div>
 
-            <div class="nc-hook-log-payload">
-              <div class="nc-hook-pre-title">Payload</div>
-              <pre class="nc-hook-pre">{{ parseProp(parseProp(hookLog.response).config.data) }}</pre>
+              <div class="nc-hook-log-payload">
+                <div class="nc-hook-pre-title">Payload</div>
+                <pre class="nc-hook-pre">{{ parseProp(parseProp(hookLog.response).config.data) }}</pre>
+              </div>
             </div>
-          </div>
 
-          <div v-else-if="hookLog.type === 'Email'">
-            <div v-if="hookLog.error_message" class="mb-4">
-              {{ hookLog.error_message }}
-            </div>
-            <div class="nc-hook-log-payload">
-              <div class="nc-hook-pre-title">Payload</div>
-              <pre class="nc-hook-pre">{{ parseProp(hookLog.payload) }}</pre>
+            <div v-else-if="hookLog.type === 'Email'">
+              <div v-if="hookLog.error_message" class="mb-4">
+                {{ hookLog.error_message }}
+              </div>
+              <div class="nc-hook-log-payload">
+                <div class="nc-hook-pre-title">Payload</div>
+                <pre class="nc-hook-pre">{{ parseProp(hookLog.payload) }}</pre>
+              </div>
             </div>
-          </div>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-layout-content>
-    <a-layout-footer class="!bg-white text-center">
-      <a-pagination
-        v-model:current="currentPage"
-        style="width: calc(100% - 50px)"
-        :page-size="currentLimit"
-        :total="totalRows"
-        show-less-items
-        @change="loadHookLogs"
-      />
-    </a-layout-footer>
-  </a-layout>
+          </a-collapse-panel>
+        </a-collapse>
+      </a-layout-content>
+      <a-layout-footer class="!bg-white text-center">
+        <a-pagination
+          v-model:current="currentPage"
+          :page-size="currentLimit"
+          :total="totalRows"
+          show-less-items
+          @change="loadHookLogs"
+        />
+      </a-layout-footer>
+    </a-layout>
+  </div>
 </template>
 
 <style scoped lang="scss">

From 505c8f84d7e0106eb443047cc766ffc20aebc791 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 30 Mar 2023 14:28:47 +0800
Subject: [PATCH 121/161] feat(nc-gui): revise call log display logic

---
 .../nc-gui/components/webhook/CallLog.vue     | 141 ++++++++++--------
 1 file changed, 76 insertions(+), 65 deletions(-)

diff --git a/packages/nc-gui/components/webhook/CallLog.vue b/packages/nc-gui/components/webhook/CallLog.vue
index b4779f2812..d8a4c97153 100644
--- a/packages/nc-gui/components/webhook/CallLog.vue
+++ b/packages/nc-gui/components/webhook/CallLog.vue
@@ -22,6 +22,10 @@ const currentPage = $ref(1)
 
 const currentLimit = $ref(10)
 
+const showLogs = computed(
+  () => !(appInfo.value.automationLogLevel === 'OFF' || (appInfo.value.automationLogLevel === 'ALL' && !appInfo.value.ee)),
+)
+
 async function loadHookLogs(page = currentPage, limit = currentLimit) {
   try {
     // cater empty records
@@ -38,7 +42,9 @@ async function loadHookLogs(page = currentPage, limit = currentLimit) {
 }
 
 onBeforeMount(async () => {
-  await loadHookLogs(currentPage, currentLimit)
+  if (showLogs.value) {
+    await loadHookLogs(currentPage, currentLimit)
+  }
 })
 </script>
 
@@ -53,7 +59,10 @@ onBeforeMount(async () => {
         The NC_AUTOMATION_LOG_LEVEL is set to “ERROR”, only error logs will be displayed.
       </span>
       <span v-if="appInfo.automationLogLevel === 'ALL'">
-        The NC_AUTOMATION_LOG_LEVEL is set to “ALL”, both error and success logs will be displayed.
+        <span v-if="appInfo.ee">
+          The NC_AUTOMATION_LOG_LEVEL is set to “ALL”, both error and success logs will be displayed.
+        </span>
+        <span v-else> Upgrade to Enterprise Edition to show all the logs. </span>
       </span>
       <span>
         <!-- TODO: update the link -->
@@ -61,78 +70,80 @@ onBeforeMount(async () => {
       </span>
     </a-card>
 
-    <a-empty v-if="!hookLogs.length" />
-    <a-layout v-else>
-      <a-layout-content>
-        <a-collapse v-model:activeKey="activeKey" class="nc-hook-log-collapse">
-          <a-collapse-panel v-for="(hookLog, idx) of hookLogs" :key="idx">
-            <template #header>
-              <div class="w-full cursor-pointer">
-                <div class="font-weight-medium flex">
-                  <div class="flex-1">
-                    {{ hookLog.type }}: records.{{ hookLog.event }}.{{ hookLog.operation }} ({{ timeAgo(hookLog.created_at) }})
+    <div v-if="showLogs">
+      <a-empty v-if="!hookLogs.length" />
+      <a-layout v-else>
+        <a-layout-content>
+          <a-collapse v-model:activeKey="activeKey" class="nc-hook-log-collapse">
+            <a-collapse-panel v-for="(hookLog, idx) of hookLogs" :key="idx">
+              <template #header>
+                <div class="w-full cursor-pointer">
+                  <div class="font-weight-medium flex">
+                    <div class="flex-1">
+                      {{ hookLog.type }}: records.{{ hookLog.event }}.{{ hookLog.operation }} ({{ timeAgo(hookLog.created_at) }})
+                    </div>
+                    <div
+                      v-if="hookLog.type === 'URL'"
+                      class="mx-1 px-2 py-1 text-white rounded bg-red-500 text-xs"
+                      :class="{ '!bg-green-500': parseProp(hookLog.response).status === 200 }"
+                    >
+                      {{ parseProp(hookLog.response).status }}
+                      {{ parseProp(hookLog.response).statusText }}
+                    </div>
+                    <div v-if="hookLog.type === 'Email'">
+                      <div v-if="hookLog.error_message" class="mx-1 px-2 py-1 text-white rounded text-xs bg-red-500">ERROR</div>
+                      <div v-else class="mx-1 px-2 py-1 text-white rounded text-xs bg-green-500">OK</div>
+                    </div>
                   </div>
-                  <div
-                    v-if="hookLog.type === 'URL'"
-                    class="mx-1 px-2 py-1 text-white rounded bg-red-500 text-xs"
-                    :class="{ '!bg-green-500': parseProp(hookLog.response).status === 200 }"
-                  >
-                    {{ parseProp(hookLog.response).status }}
-                    {{ parseProp(hookLog.response).statusText }}
+                  <div v-if="hookLog.type === 'URL'">
+                    <span class="font-weight-medium text-primary">
+                      {{ parseProp(hookLog.payload).method }}
+                    </span>
+                    {{ parseProp(hookLog.payload).path }}
                   </div>
-                  <div v-if="hookLog.type === 'Email'">
-                    <div v-if="hookLog.error_message" class="mx-1 px-2 py-1 text-white rounded text-xs bg-red-500">ERROR</div>
-                    <div v-else class="mx-1 px-2 py-1 text-white rounded text-xs bg-green-500">OK</div>
-                  </div>
-                </div>
-                <div v-if="hookLog.type === 'URL'">
-                  <span class="font-weight-medium text-primary">
-                    {{ parseProp(hookLog.payload).method }}
-                  </span>
-                  {{ parseProp(hookLog.payload).path }}
                 </div>
-              </div>
-            </template>
+              </template>
 
-            <div v-if="hookLog.type === 'URL'">
-              <div class="nc-hook-log-request">
-                <div class="nc-hook-pre-title">Request</div>
-                <pre class="nc-hook-pre">{{ parseProp(hookLog.response).config.headers }}</pre>
-              </div>
+              <div v-if="hookLog.type === 'URL'">
+                <div class="nc-hook-log-request">
+                  <div class="nc-hook-pre-title">Request</div>
+                  <pre class="nc-hook-pre">{{ parseProp(hookLog.response).config.headers }}</pre>
+                </div>
 
-              <div class="nc-hook-log-response">
-                <div class="nc-hook-pre-title">Response</div>
-                <pre class="nc-hook-pre">{{ parseProp(hookLog.response).headers }}</pre>
-              </div>
+                <div class="nc-hook-log-response">
+                  <div class="nc-hook-pre-title">Response</div>
+                  <pre class="nc-hook-pre">{{ parseProp(hookLog.response).headers }}</pre>
+                </div>
 
-              <div class="nc-hook-log-payload">
-                <div class="nc-hook-pre-title">Payload</div>
-                <pre class="nc-hook-pre">{{ parseProp(parseProp(hookLog.response).config.data) }}</pre>
+                <div class="nc-hook-log-payload">
+                  <div class="nc-hook-pre-title">Payload</div>
+                  <pre class="nc-hook-pre">{{ parseProp(parseProp(hookLog.response).config.data) }}</pre>
+                </div>
               </div>
-            </div>
 
-            <div v-else-if="hookLog.type === 'Email'">
-              <div v-if="hookLog.error_message" class="mb-4">
-                {{ hookLog.error_message }}
-              </div>
-              <div class="nc-hook-log-payload">
-                <div class="nc-hook-pre-title">Payload</div>
-                <pre class="nc-hook-pre">{{ parseProp(hookLog.payload) }}</pre>
+              <div v-else-if="hookLog.type === 'Email'">
+                <div v-if="hookLog.error_message" class="mb-4">
+                  {{ hookLog.error_message }}
+                </div>
+                <div class="nc-hook-log-payload">
+                  <div class="nc-hook-pre-title">Payload</div>
+                  <pre class="nc-hook-pre">{{ parseProp(hookLog.payload) }}</pre>
+                </div>
               </div>
-            </div>
-          </a-collapse-panel>
-        </a-collapse>
-      </a-layout-content>
-      <a-layout-footer class="!bg-white text-center">
-        <a-pagination
-          v-model:current="currentPage"
-          :page-size="currentLimit"
-          :total="totalRows"
-          show-less-items
-          @change="loadHookLogs"
-        />
-      </a-layout-footer>
-    </a-layout>
+            </a-collapse-panel>
+          </a-collapse>
+        </a-layout-content>
+        <a-layout-footer class="!bg-white text-center">
+          <a-pagination
+            v-model:current="currentPage"
+            :page-size="currentLimit"
+            :total="totalRows"
+            show-less-items
+            @change="loadHookLogs"
+          />
+        </a-layout-footer>
+      </a-layout>
+    </div>
   </div>
 </template>
 

From 41176313a4e4d4c3378214f347ab2fb0859072c0 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 30 Mar 2023 17:01:51 +0800
Subject: [PATCH 122/161] fix(nocodb): adopt new design of ast

---
 .../src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 8c000ccb3a..c91acf8720 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
@@ -147,7 +147,8 @@ class BaseModelSqlv2 {
       projectName: project.title,
       tableName: this.model.title,
     });
-    data = await nocoExecute(await getAst({ model, view }), data, {});
+    const { ast } = await getAst({ model, view });
+    data = await nocoExecute(ast, data, {});
     return data;
   }
 

From 43c89b7c4c909abc606321ece21d32cab8c7634e Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 30 Mar 2023 17:38:26 +0800
Subject: [PATCH 123/161] docs: add NC_AUTOMATION_LOG_LEVEL

---
 .../content/en/getting-started/environment-variables.md        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/noco-docs/content/en/getting-started/environment-variables.md b/packages/noco-docs/content/en/getting-started/environment-variables.md
index b3ac5d4d0f..2c277d41d4 100644
--- a/packages/noco-docs/content/en/getting-started/environment-variables.md
+++ b/packages/noco-docs/content/en/getting-started/environment-variables.md
@@ -61,4 +61,5 @@ For production usecases, it is **recommended** to configure
 | NC_ADMIN_PASSWORD | For updating/creating super admin with provided email and password. Your password should have at least 8 letters with one uppercase, one number and one special letter(Allowed special chars $&+,:;=?@#\|'.^*()%!_-" ) |  |  |
 | NODE_OPTIONS | For passing Node.js [options](https://nodejs.org/api/cli.html#node_optionsoptions) to instance |  |  |
 | NC_MINIMAL_DBS | Create a new SQLite file for each project. All the db files are stored in `nc_minimal_dbs` folder in current working directory. (This option restricts project creation on external sources) |  |  |
-| NC_DISABLE_AUDIT | Disable Audit Log | `false` |  |
\ No newline at end of file
+| NC_DISABLE_AUDIT | Disable Audit Log | `false` |  |
+| NC_AUTOMATION_LOG_LEVEL | Possible Values: `OFF`, `ERROR`, `ALL`. See [Webhooks](/developer-resources/webhooks#call-log) for details. | `OFF` |  |
\ No newline at end of file

From ea913d4e287edb2466730b2e2bf0661accdf3ef8 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 30 Mar 2023 17:38:43 +0800
Subject: [PATCH 124/161] docs: add webhook v2 & call log content

---
 .../en/developer-resources/webhooks.md        | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/packages/noco-docs/content/en/developer-resources/webhooks.md b/packages/noco-docs/content/en/developer-resources/webhooks.md
index 820acfeaba..eba7f7e86c 100644
--- a/packages/noco-docs/content/en/developer-resources/webhooks.md
+++ b/packages/noco-docs/content/en/developer-resources/webhooks.md
@@ -19,6 +19,7 @@ Some types of notifications can be triggered by a webhook after a particular eve
 <img width="686" alt="image" src="https://user-images.githubusercontent.com/35857179/194849248-1d0b80c6-f65b-4075-8ebd-af7dc735c2c3.png">
 
 ### Configure Webhook
+
   - General configurations
     - Webhook Name
     - Webhook Trigger
@@ -32,6 +33,16 @@ Some types of notifications can be triggered by a webhook after a particular eve
 
 <!-- ![image](https://user-images.githubusercontent.com/35857179/166660248-a3c81a34-4334-48c2-846a-65759d761559.png) -->
 
+## Call Log
+
+Call Log allows user to check the call history of the hook. By default, it has been disabled. However, it can be configured by using environment variable `NC_AUTOMATION_LOG_LEVEL`.
+
+- `NC_AUTOMATION_LOG_LEVEL=OFF`: No logs will be displayed and no history will be inserted to meta database.
+- `NC_AUTOMATION_LOG_LEVEL=ERROR`: only error logs will be displayed and history of error logs will be inserted to meta database.
+- `NC_AUTOMATION_LOG_LEVEL=ALL`: Both error and success logs will be displayed and history of both types of logs will be inserted to meta database. **This option is only available for Enterprise Edition.**
+
+![image](https://user-images.githubusercontent.com/35857179/228790148-1e3f21c7-9385-413a-843f-b93073ca6bea.png)
+
 
 ## Triggers
 
@@ -59,6 +70,11 @@ The triggers will trigger asynchronously without blocking the actual operation.
   
 ## Accessing Data: Handlebars
 
+
+<alert type="warning">
+You can accessing data using handlebars for v1 webhooks only.
+</alert>
+
 The current row data and other details will be available in the hooks payload so the user can use [handlebar syntax](https://handlebarsjs.com/guide/#simple-expressions) to use data.
 
 > We are using [Handlebars](https://handlebarsjs.com/) library to parse the payload internally.
@@ -136,6 +152,7 @@ Detailed procedure for discord webhook described [here](https://support.discord.
 
 
 ## Slack
+
 ### 1. Create WebHook
 -   Details to create slack webhook are captured [here](https://api.slack.com/messaging/webhooks)
 
@@ -196,3 +213,13 @@ Detailed procedure for discord webhook described [here](https://support.discord.
     -   **Body**: Message to be posted over Teams channel, via webhooks on trigger of configured event.
         -   Body can contain plain text &
         -   Handlebars {{ }}
+
+## Webhook V2
+
+Webhook v2 is available after v0.106.0. Here's the differences.
+
+- Response Payload has been predefined and cannot configure in Body using Handlebars. The payload can be referenced under `Sample Payload` in Hook detail page.
+- Support the following bulk operations:
+    -   AFTER BULK INSERT
+    -   AFTER BULK UPDATE
+    -   AFTER BULK DELETE
\ No newline at end of file

From 7ade5a8d718ecba4859068e9aa7d56d8ba53962f Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 30 Mar 2023 17:39:46 +0800
Subject: [PATCH 125/161] feat(nc-gui): update doc link in CallLog.vue

---
 packages/nc-gui/components/webhook/CallLog.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/webhook/CallLog.vue b/packages/nc-gui/components/webhook/CallLog.vue
index d8a4c97153..5a19bc86b4 100644
--- a/packages/nc-gui/components/webhook/CallLog.vue
+++ b/packages/nc-gui/components/webhook/CallLog.vue
@@ -65,8 +65,8 @@ onBeforeMount(async () => {
         <span v-else> Upgrade to Enterprise Edition to show all the logs. </span>
       </span>
       <span>
-        <!-- TODO: update the link -->
-        For additional configuration options, please refer the documentation <a href="#" target="_blank">here</a>.
+        For additional configuration options, please refer the documentation
+        <a href="https://docs.nocodb.com/developer-resources/webhooks#call-log" target="_blank">here</a>.
       </span>
     </a-card>
 

From 477793c4d0d67fe9ad140bbb60b5049842511be7 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 30 Mar 2023 17:57:21 +0800
Subject: [PATCH 126/161] feat(nc-gui): show bulk operation for v2 hooks only

---
 packages/nc-gui/components/webhook/Editor.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index f0640b9afc..ecf1b8774d 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -179,9 +179,13 @@ const eventList = [
   { text: ['After', 'Insert'], value: ['after', 'insert'] },
   { text: ['After', 'Update'], value: ['after', 'update'] },
   { text: ['After', 'Delete'], value: ['after', 'delete'] },
-  { text: ['After', 'Bulk Insert'], value: ['after', 'bulkInsert'] },
-  { text: ['After', 'Bulk Update'], value: ['after', 'bulkUpdate'] },
-  { text: ['After', 'Bulk Delete'], value: ['after', 'bulkDelete'] },
+  ...(hook.version === 'v2'
+    ? [
+        { text: ['After', 'Bulk Insert'], value: ['after', 'bulkInsert'] },
+        { text: ['After', 'Bulk Update'], value: ['after', 'bulkUpdate'] },
+        { text: ['After', 'Bulk Delete'], value: ['after', 'bulkDelete'] },
+      ]
+    : []),
 ]
 
 const notificationList = computed(() => {

From ef9d1f3b5a44ff744f8a4fc220737ce49abf1a53 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 30 Mar 2023 18:01:18 +0800
Subject: [PATCH 127/161] fix(nc-gui): set eventList when the hook is ready

---
 packages/nc-gui/components/webhook/Editor.vue | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index ecf1b8774d..08ea2e4bdb 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -175,18 +175,7 @@ const formInput = ref({
   ],
 })
 
-const eventList = [
-  { text: ['After', 'Insert'], value: ['after', 'insert'] },
-  { text: ['After', 'Update'], value: ['after', 'update'] },
-  { text: ['After', 'Delete'], value: ['after', 'delete'] },
-  ...(hook.version === 'v2'
-    ? [
-        { text: ['After', 'Bulk Insert'], value: ['after', 'bulkInsert'] },
-        { text: ['After', 'Bulk Update'], value: ['after', 'bulkUpdate'] },
-        { text: ['After', 'Bulk Delete'], value: ['after', 'bulkDelete'] },
-      ]
-    : []),
-]
+const eventList = ref<Record<string, any>[]>([])
 
 const notificationList = computed(() => {
   return appInfo.isCloud
@@ -283,6 +272,19 @@ function setHook(newHook: HookType) {
   if (hook.version === 'v1') {
     urlTabKey.value = 'body'
   }
+
+  eventList.value = [
+    { text: ['After', 'Insert'], value: ['after', 'insert'] },
+    { text: ['After', 'Update'], value: ['after', 'update'] },
+    { text: ['After', 'Delete'], value: ['after', 'delete'] },
+    ...(hook.version === 'v2'
+      ? [
+          { text: ['After', 'Bulk Insert'], value: ['after', 'bulkInsert'] },
+          { text: ['After', 'Bulk Update'], value: ['after', 'bulkUpdate'] },
+          { text: ['After', 'Bulk Delete'], value: ['after', 'bulkDelete'] },
+        ]
+      : []),
+  ]
 }
 
 async function onEventChange() {
@@ -763,4 +765,4 @@ onMounted(async () => {
       <LazyWebhookCallLog :hook="hook" />
     </a-tab-pane>
   </a-tabs>
-</template>
+</template>
\ No newline at end of file

From 9480952e194ddb49a471e0cba2741c7c8d9afd7c Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 30 Mar 2023 18:35:18 +0800
Subject: [PATCH 128/161] fix(nocodb): prevent saving bulk operation for v1
 hooks

---
 packages/nocodb/src/lib/models/Hook.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/nocodb/src/lib/models/Hook.ts b/packages/nocodb/src/lib/models/Hook.ts
index 02c4a393a1..1b0e0761a3 100644
--- a/packages/nocodb/src/lib/models/Hook.ts
+++ b/packages/nocodb/src/lib/models/Hook.ts
@@ -7,6 +7,7 @@ import {
 import Noco from '../Noco';
 import NocoCache from '../cache/NocoCache';
 import { extractProps } from '../meta/helpers/extractProps';
+import { NcError } from '../meta/helpers/catchError';
 import Model from './Model';
 import Filter from './Filter';
 import HookFilter from './HookFilter';
@@ -187,8 +188,18 @@ export default class Hook implements HookType {
       'retry_interval',
       'timeout',
       'active',
+      'version',
     ]);
 
+    if (
+      updateObj.version &&
+      updateObj.operation &&
+      updateObj.version === 'v1' &&
+      ['bulkInsert', 'bulkUpdate', 'bulkDelete'].includes(updateObj.operation)
+    ) {
+      NcError.badRequest(`${updateObj.operation} not supported in v1 hook`);
+    }
+
     if (updateObj.notification && typeof updateObj.notification === 'object') {
       updateObj.notification = JSON.stringify(updateObj.notification);
     }

From de11e3c89e799a3b1f8103e4768c2f4aa3592b45 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 30 Mar 2023 18:59:39 +0800
Subject: [PATCH 129/161] fix(nc-gui): fix eventList logic

---
 packages/nc-gui/components/webhook/Editor.vue | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 08ea2e4bdb..c04098fd7d 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -175,7 +175,14 @@ const formInput = ref({
   ],
 })
 
-const eventList = ref<Record<string, any>[]>([])
+const eventList = ref<Record<string, any>[]>([
+  { text: ['After', 'Insert'], value: ['after', 'insert'] },
+  { text: ['After', 'Update'], value: ['after', 'update'] },
+  { text: ['After', 'Delete'], value: ['after', 'delete'] },
+  { text: ['After', 'Bulk Insert'], value: ['after', 'bulkInsert'] },
+  { text: ['After', 'Bulk Update'], value: ['after', 'bulkUpdate'] },
+  { text: ['After', 'Bulk Delete'], value: ['after', 'bulkDelete'] },
+])
 
 const notificationList = computed(() => {
   return appInfo.isCloud
@@ -271,20 +278,12 @@ function setHook(newHook: HookType) {
   })
   if (hook.version === 'v1') {
     urlTabKey.value = 'body'
+    eventList.value = [
+      { text: ['After', 'Insert'], value: ['after', 'insert'] },
+      { text: ['After', 'Update'], value: ['after', 'update'] },
+      { text: ['After', 'Delete'], value: ['after', 'delete'] },
+    ]
   }
-
-  eventList.value = [
-    { text: ['After', 'Insert'], value: ['after', 'insert'] },
-    { text: ['After', 'Update'], value: ['after', 'update'] },
-    { text: ['After', 'Delete'], value: ['after', 'delete'] },
-    ...(hook.version === 'v2'
-      ? [
-          { text: ['After', 'Bulk Insert'], value: ['after', 'bulkInsert'] },
-          { text: ['After', 'Bulk Update'], value: ['after', 'bulkUpdate'] },
-          { text: ['After', 'Bulk Delete'], value: ['after', 'bulkDelete'] },
-        ]
-      : []),
-  ]
 }
 
 async function onEventChange() {
@@ -765,4 +764,4 @@ onMounted(async () => {
       <LazyWebhookCallLog :hook="hook" />
     </a-tab-pane>
   </a-tabs>
-</template>
\ No newline at end of file
+</template>

From 3df67a7f5178e14dc45f262d358316a5313865d1 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 30 Mar 2023 19:16:49 +0800
Subject: [PATCH 130/161] fix(nocodb): show invite link even smtp not
 configured

---
 .../src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts  | 2 +-
 packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts     | 8 +++++++-
 packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts    | 2 +-
 3 files changed, 9 insertions(+), 3 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 c91acf8720..fb755d0c09 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
@@ -2486,7 +2486,7 @@ class BaseModelSqlv2 {
             formView,
             filteredColumns
           );
-          (await NcPluginMgrv2.emailAdapter())?.mailSend({
+          (await NcPluginMgrv2.emailAdapter(false))?.mailSend({
             to: emails.join(','),
             subject: 'NocoDB Form',
             html: ejs.render(formSubmissionEmailTemplate, {
diff --git a/packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts b/packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts
index 21e93fb3ed..d236eb8597 100644
--- a/packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts
+++ b/packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts
@@ -174,6 +174,7 @@ class NcPluginMgrv2 {
   }
 
   public static async emailAdapter(
+    isUserInvite = true,
     ncMeta = Noco.ncMeta
   ): Promise<IEmailAdapter> {
     const pluginData = await ncMeta.metaGet2(null, null, MetaTable.PLUGIN, {
@@ -181,7 +182,12 @@ class NcPluginMgrv2 {
       active: true,
     });
 
-    if (!pluginData) throw new Error('Plugin not configured / active');
+    if (!pluginData) {
+      // return null to show the invite link in UI
+      if (isUserInvite) return null;
+      // for webhooks, throw the error
+      throw new Error('Plugin not configured / active');
+    }
 
     const pluginConfig = defaultPlugins.find(
       (c) => c.title === pluginData.title && c.category === PluginCategory.EMAIL
diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index f3e6dbd2a2..574a517179 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -302,7 +302,7 @@ export async function invokeWebhook(
       case 'Email':
         {
           const res = await (
-            await NcPluginMgrv2.emailAdapter()
+            await NcPluginMgrv2.emailAdapter(false)
           )?.mailSend({
             to: parseBody(notification?.payload?.to, newData),
             subject: parseBody(notification?.payload?.subject, newData),

From bc77bf363a59b8bf418c77315d40584df23406e6 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 30 Mar 2023 21:00:09 +0800
Subject: [PATCH 131/161] feat(nocodb): trigger hooks for LTAR add/remove child

---
 .../src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts    | 6 ++++++
 1 file changed, 6 insertions(+)

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 fb755d0c09..182cbb66de 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
@@ -2676,6 +2676,8 @@ class BaseModelSqlv2 {
         break;
     }
 
+    const response = await this.readByPk(rowId);
+    await this.afterInsert(response, this.dbDriver, cookie);
     await this.afterAddChild(rowId, childId, cookie);
   }
 
@@ -2723,6 +2725,8 @@ class BaseModelSqlv2 {
     const childTn = this.getTnPath(childTable);
     const parentTn = this.getTnPath(parentTable);
 
+    const prevData = await this.readByPk(rowId);
+
     switch (colOptions.type) {
       case RelationTypes.MANY_TO_MANY:
         {
@@ -2774,6 +2778,8 @@ class BaseModelSqlv2 {
         break;
     }
 
+    const newData = await this.readByPk(rowId);
+    await this.afterUpdate(prevData, newData, this.dbDriver, cookie);
     await this.afterRemoveChild(rowId, childId, cookie);
   }
 

From 73b7168011fbb356b81a2eafcb97f971080619ea Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 30 Mar 2023 21:41:18 +0530
Subject: [PATCH 132/161] test: webhook for bulk apis

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/01-webhook.spec.ts | 65 +++++++++++++----------
 1 file changed, 37 insertions(+), 28 deletions(-)

diff --git a/tests/playwright/tests/01-webhook.spec.ts b/tests/playwright/tests/01-webhook.spec.ts
index 148ec61134..9573ffa477 100644
--- a/tests/playwright/tests/01-webhook.spec.ts
+++ b/tests/playwright/tests/01-webhook.spec.ts
@@ -423,20 +423,30 @@ test.describe.serial('Webhook', () => {
   });
 
   test('Bulk operations', async ({ request, page }) => {
-    async function verifyBulkOperationTrigger(rsp, type, valueCounter, oldValueCounter?) {
+    async function verifyBulkOperationTrigger(rsp, type) {
       for (let i = 0; i < rsp.length; i++) {
-        expect(rsp[i].type === type);
-        expect(rsp[i].data.table_name === 'numberBased');
-        expect(rsp[i].data.view_name === 'numberBased');
-        expect(rsp[i].data.rows.length === 25);
-        for (let j = 0; j < rsp[i].data.rows.length; j++) {
-          expect(rsp[i].data.rows[j].Number === (i * 25 + j + 1) * valueCounter);
-        }
+        expect(rsp[i].type).toBe(type);
+        expect(rsp[i].data.table_name).toBe('numberBased');
+        expect(rsp[i].data.view_name).toBe('numberBased');
+
+        // only for insert, rows inserted will not be returned in response. just count
+        if (type === 'records.after.bulkInsert') {
+          expect(rsp[i].data.rows_inserted).toBe(50);
+        } else if (type === 'records.after.bulkUpdate') {
+          expect(rsp[i].data.rows.length).toBe(50);
+          expect(rsp[i].data.previous_rows.length).toBe(50);
+
+          // verify records
+          for (let j = 0; j < rsp[i].data.rows.length; j++) {
+            expect(rsp[i].data.rows[j].Number).toBe(111 * (j + 1));
+            expect(rsp[i].data.previous_rows[j].Number).toBe(100 * (j + 1) - 111);
+          }
+        } else if (type === 'records.after.bulkDelete') {
+          expect(rsp[i].data.rows.length).toBe(50);
 
-        if (oldValueCounter) {
-          expect(rsp[i].data.previous_rows.length === 25);
-          for (let j = 0; j < rsp[i].data.previous_rows.length; j++) {
-            expect(rsp[i].data.previous_rows[j].Number === (i * 25 + j + 1) * oldValueCounter);
+          // verify records
+          for (let j = 0; j < rsp[i].data.rows.length; j++) {
+            expect(rsp[i].data.rows[j].Number).toBe(111 * (j + 1));
           }
         }
       }
@@ -479,15 +489,15 @@ test.describe.serial('Webhook', () => {
     // create after insert webhook
     await webhook.create({
       title: 'hook-1',
-      event: 'After Insert',
+      event: 'After Bulk Insert',
     });
     await webhook.create({
       title: 'hook-1',
-      event: 'After Update',
+      event: 'After Bulk Update',
     });
     await webhook.create({
       title: 'hook-1',
-      event: 'After Delete',
+      event: 'After Bulk Delete',
     });
 
     await clearServerData({ request });
@@ -498,8 +508,8 @@ test.describe.serial('Webhook', () => {
     await api.dbTableRow.bulkCreate('noco', context.project.id, table.id, rowAttributesForInsert);
     await page.reload();
     // 50 records inserted, we expect 2 webhook responses
-    let rsp = await getWebhookResponses({ request, count: 2 });
-    await verifyBulkOperationTrigger(rsp, 'records.after.insert', 100);
+    let rsp = await getWebhookResponses({ request, count: 1 });
+    await verifyBulkOperationTrigger(rsp, 'records.after.bulkInsert');
 
     // bulk update all rows
     await clearServerData({ request });
@@ -512,8 +522,8 @@ test.describe.serial('Webhook', () => {
     await api.dbTableRow.bulkUpdate('noco', context.project.id, table.id, rowAttributesForUpdate);
     await page.reload();
     // 50 records updated, we expect 2 webhook responses
-    rsp = await getWebhookResponses({ request, count: 2 });
-    await verifyBulkOperationTrigger(rsp, 'records.after.update', 111, 100);
+    rsp = await getWebhookResponses({ request, count: 1 });
+    await verifyBulkOperationTrigger(rsp, 'records.after.bulkUpdate');
 
     // bulk delete all rows
     await clearServerData({ request });
@@ -521,8 +531,8 @@ test.describe.serial('Webhook', () => {
 
     await api.dbTableRow.bulkDelete('noco', context.project.id, table.id, rowAttributesForDelete);
     await page.reload();
-    rsp = await getWebhookResponses({ request, count: 2 });
-    await verifyBulkOperationTrigger(rsp, 'records.after.delete', 111);
+    rsp = await getWebhookResponses({ request, count: 1 });
+    await verifyBulkOperationTrigger(rsp, 'records.after.bulkDelete');
   });
 
   test('Virtual columns', async ({ request, page }) => {
@@ -655,7 +665,6 @@ test.describe.serial('Webhook', () => {
     // edit first record
     await dashboard.grid.editRow({ index: 0, columnHeader: 'Country', value: 'INDIA', networkValidation: false });
     const rsp = await getWebhookResponses({ request, count: 1 });
-    console.log(rsp);
 
     const expectedData = {
       type: 'records.after.update',
@@ -666,8 +675,8 @@ test.describe.serial('Webhook', () => {
           {
             Id: 1,
             Country: 'India',
-            CountryCode: 1,
-            CityCodeRollup: 2,
+            CountryCode: '1',
+            CityCodeRollup: '2',
             CityCodeFormula: 100,
             CityList: [
               {
@@ -679,15 +688,15 @@ test.describe.serial('Webhook', () => {
                 City: 'Pune',
               },
             ],
-            CityCodeLookup: [23, 33],
+            CityCodeLookup: ['23', '33'],
           },
         ],
         rows: [
           {
             Id: 1,
             Country: 'INDIA',
-            CountryCode: 1,
-            CityCodeRollup: 2,
+            CountryCode: '1',
+            CityCodeRollup: '2',
             CityCodeFormula: 100,
             CityList: [
               {
@@ -699,7 +708,7 @@ test.describe.serial('Webhook', () => {
                 City: 'Pune',
               },
             ],
-            CityCodeLookup: [23, 33],
+            CityCodeLookup: ['23', '33'],
           },
         ],
       },

From cc3a9af228b159fb622087f7c5d7382212efb2a5 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 31 Mar 2023 00:27:46 +0800
Subject: [PATCH 133/161] fix(nocodb): previous_rows & rows format

---
 packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index 574a517179..0989089186 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -149,9 +149,10 @@ export function constructWebHookData(hook, model, view, prevData, newData) {
         view_id: view.id,
         view_name: view.title,
         ...(prevData && {
-          previous_rows: [prevData],
+          previous_rows: Array.isArray(prevData) ? prevData : [prevData],
         }),
-        ...(hook.operation !== 'bulkInsert' && newData && { rows: [newData] }),
+        ...(hook.operation !== 'bulkInsert' &&
+          newData && { rows: Array.isArray(newData) ? newData : [newData] }),
         ...(hook.operation === 'bulkInsert' && {
           rows_inserted: Array.isArray(newData)
             ? newData.length

From 329f1c5542c8789b7501a1576a9e59eb6f6adc7e Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 30 Mar 2023 22:10:57 +0530
Subject: [PATCH 134/161] test: number to string corrections for pg

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/01-webhook.spec.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/playwright/tests/01-webhook.spec.ts b/tests/playwright/tests/01-webhook.spec.ts
index 9573ffa477..415b21bbd0 100644
--- a/tests/playwright/tests/01-webhook.spec.ts
+++ b/tests/playwright/tests/01-webhook.spec.ts
@@ -438,15 +438,15 @@ test.describe.serial('Webhook', () => {
 
           // verify records
           for (let j = 0; j < rsp[i].data.rows.length; j++) {
-            expect(rsp[i].data.rows[j].Number).toBe(111 * (j + 1));
-            expect(rsp[i].data.previous_rows[j].Number).toBe(100 * (j + 1) - 111);
+            expect(+rsp[i].data.rows[j].Number).toBe(111 * (j + 1));
+            expect(+rsp[i].data.previous_rows[j].Number).toBe(100 * (j + 1));
           }
         } else if (type === 'records.after.bulkDelete') {
           expect(rsp[i].data.rows.length).toBe(50);
 
           // verify records
           for (let j = 0; j < rsp[i].data.rows.length; j++) {
-            expect(rsp[i].data.rows[j].Number).toBe(111 * (j + 1));
+            expect(+rsp[i].data.rows[j].Number).toBe(111 * (j + 1));
           }
         }
       }

From 24fb56866fd438f9e89acd9d542a9a7286a8ca73 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Fri, 31 Mar 2023 06:59:20 +0530
Subject: [PATCH 135/161] test: webhook fix for mysql & sqlite

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/01-webhook.spec.ts | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/tests/playwright/tests/01-webhook.spec.ts b/tests/playwright/tests/01-webhook.spec.ts
index 415b21bbd0..325bde44bb 100644
--- a/tests/playwright/tests/01-webhook.spec.ts
+++ b/tests/playwright/tests/01-webhook.spec.ts
@@ -5,6 +5,7 @@ import makeServer from '../setup/server';
 import { WebhookFormPage } from '../pages/Dashboard/WebhookForm';
 import { isSubset } from './utils/general';
 import { Api, UITypes } from 'nocodb-sdk';
+import { isMysql, isPg, isSqlite } from '../setup/db';
 
 const hookPath = 'http://localhost:9090/hook';
 let api: Api<any>;
@@ -714,6 +715,28 @@ test.describe.serial('Webhook', () => {
       },
     };
 
+    if (isSqlite(context) || isMysql(context)) {
+      // @ts-ignore
+      expectedData.data.previous_rows[0].CountryCode = 1;
+      // @ts-ignore
+      expectedData.data.rows[0].CountryCode = 1;
+      // @ts-ignore
+      expectedData.data.previous_rows[0].CityCodeRollup = 2;
+      // @ts-ignore
+      expectedData.data.rows[0].CityCodeRollup = 2;
+      // @ts-ignore
+      expectedData.data.previous_rows[0].CityCodeLookup = [23, 33];
+      // @ts-ignore
+      expectedData.data.rows[0].CityCodeLookup = [23, 33];
+
+      if (isMysql(context)) {
+        // @ts-ignore
+        expectedData.data.previous_rows[0].CityCodeFormula = '100';
+        // @ts-ignore
+        expectedData.data.rows[0].CityCodeFormula = '100';
+      }
+    }
+
     await expect(isSubset(rsp[0], expectedData)).toBe(true);
   });
 });

From b65b66faefccec2ca44b8384d623fc243914245e Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 31 Mar 2023 12:43:25 +0800
Subject: [PATCH 136/161] feat(nc-gui): put automation log level to enums.ts

---
 packages/nc-gui/lib/enums.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/nc-gui/lib/enums.ts b/packages/nc-gui/lib/enums.ts
index ab6e8b03df..b4aadc53c6 100644
--- a/packages/nc-gui/lib/enums.ts
+++ b/packages/nc-gui/lib/enums.ts
@@ -99,3 +99,9 @@ export enum DataSourcesSubTab {
   Misc = 'Misc',
   Edit = 'Edit',
 }
+
+export enum AutomationLogLevel {
+  OFF = 'OFF',
+  ERROR = 'ERROR',
+  ALL = 'ALL',
+}

From 1c532bb436c291a5e411f12e7f9fabb72ab4ff6b Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 31 Mar 2023 12:43:33 +0800
Subject: [PATCH 137/161] refactor(nc-gui): use AutomationLogLevel

---
 packages/nc-gui/components/webhook/CallLog.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/webhook/CallLog.vue b/packages/nc-gui/components/webhook/CallLog.vue
index 5a19bc86b4..3d72ae998c 100644
--- a/packages/nc-gui/components/webhook/CallLog.vue
+++ b/packages/nc-gui/components/webhook/CallLog.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { HookLogType, HookType } from 'nocodb-sdk'
-import { extractSdkResponseErrorMsg, onBeforeMount, parseProp, timeAgo, useApi, useGlobal } from '#imports'
+import { extractSdkResponseErrorMsg, onBeforeMount, parseProp, timeAgo, useApi, useGlobal, AutomationLogLevel } from '#imports'
 
 interface Props {
   hook: HookType
@@ -23,7 +23,11 @@ const currentPage = $ref(1)
 const currentLimit = $ref(10)
 
 const showLogs = computed(
-  () => !(appInfo.value.automationLogLevel === 'OFF' || (appInfo.value.automationLogLevel === 'ALL' && !appInfo.value.ee)),
+  () =>
+    !(
+      appInfo.value.automationLogLevel === AutomationLogLevel.OFF ||
+      (appInfo.value.automationLogLevel === AutomationLogLevel.ALL && !appInfo.value.ee)
+    ),
 )
 
 async function loadHookLogs(page = currentPage, limit = currentLimit) {
@@ -52,13 +56,13 @@ onBeforeMount(async () => {
   <a-skeleton v-if="isLoading" />
   <div v-else>
     <a-card class="!mb-[20px]" :body-style="{ padding: '10px' }">
-      <span v-if="appInfo.automationLogLevel === 'OFF'">
+      <span v-if="appInfo.automationLogLevel === AutomationLogLevel.OFF">
         The NC_AUTOMATION_LOG_LEVEL is set to “OFF”, no logs will be displayed.
       </span>
-      <span v-if="appInfo.automationLogLevel === 'ERROR'">
+      <span v-if="appInfo.automationLogLevel === AutomationLogLevel.ERROR">
         The NC_AUTOMATION_LOG_LEVEL is set to “ERROR”, only error logs will be displayed.
       </span>
-      <span v-if="appInfo.automationLogLevel === 'ALL'">
+      <span v-if="appInfo.automationLogLevel === AutomationLogLevel.ALL">
         <span v-if="appInfo.ee">
           The NC_AUTOMATION_LOG_LEVEL is set to “ALL”, both error and success logs will be displayed.
         </span>

From 57bdd32ee7f5100d72240595a6dcf4866f359837 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 31 Mar 2023 13:50:45 +0800
Subject: [PATCH 138/161] fix(nc-gui): hook editor display

---
 packages/nc-gui/components/webhook/Editor.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index c04098fd7d..85c1462adc 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -63,6 +63,7 @@ const hook = reactive<
   },
   condition: false,
   active: true,
+  version: 'v2',
 })
 
 const urlTabKey = ref('params')
@@ -628,7 +629,6 @@ onMounted(async () => {
             <a-col :span="24">
               <a-form-item v-bind="validateInfos['notification.channels']">
                 <LazyWebhookChannelMultiSelect
-                  v-if="slackChannels.length > 0"
                   v-model="hook.notification.payload.channels"
                   :selected-channel-list="hook.notification.payload.channels"
                   :available-channel-list="slackChannels"
@@ -642,7 +642,6 @@ onMounted(async () => {
             <a-col :span="24">
               <a-form-item v-bind="validateInfos['notification.channels']">
                 <LazyWebhookChannelMultiSelect
-                  v-if="teamsChannels.length > 0"
                   v-model="hook.notification.payload.channels"
                   :selected-channel-list="hook.notification.payload.channels"
                   :available-channel-list="teamsChannels"
@@ -656,7 +655,6 @@ onMounted(async () => {
             <a-col :span="24">
               <a-form-item v-bind="validateInfos['notification.channels']">
                 <LazyWebhookChannelMultiSelect
-                  v-if="discordChannels.length > 0"
                   v-model="hook.notification.payload.channels"
                   :selected-channel-list="hook.notification.payload.channels"
                   :available-channel-list="discordChannels"
@@ -670,7 +668,6 @@ onMounted(async () => {
             <a-col :span="24">
               <a-form-item v-bind="validateInfos['notification.channels']">
                 <LazyWebhookChannelMultiSelect
-                  v-if="mattermostChannels.length > 0"
                   v-model="hook.notification.payload.channels"
                   :selected-channel-list="hook.notification.payload.channels"
                   :available-channel-list="mattermostChannels"
@@ -718,7 +715,7 @@ onMounted(async () => {
 
           <a-row>
             <a-col :span="24">
-              <div v-if="!(hook.version === 'v2' && hook.type === 'URL')" class="text-gray-600">
+              <div v-if="!(hook.version === 'v2' && hook.notification.type === 'URL')" class="text-gray-600">
                 <div class="flex items-center">
                   <em>Use context variable <strong>data</strong> to refer the record under consideration</em>
 

From 7d0037b30545c90dbad20cdaa93d3fd0bf31a250 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 31 Mar 2023 16:50:24 +0800
Subject: [PATCH 139/161] fix(nocodb): add missing await for transaction

---
 .../src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts  | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 182cbb66de..8ab975d42c 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
@@ -2132,7 +2132,7 @@ class BaseModelSqlv2 {
         updatePkValues.push(pkValues);
       }
 
-      transaction.commit();
+      await transaction.commit();
 
       for (const pkValues of updatePkValues) {
         newData.push(await this.readByPk(pkValues));
@@ -2142,7 +2142,7 @@ class BaseModelSqlv2 {
 
       return res;
     } catch (e) {
-      if (transaction) transaction.rollback();
+      if (transaction) await transaction.rollback();
       throw e;
     }
   }
@@ -2220,13 +2220,13 @@ class BaseModelSqlv2 {
         res.push(d);
       }
 
-      transaction.commit();
+      await transaction.commit();
 
       await this.afterBulkDelete(deleted, this.dbDriver, cookie);
 
       return res;
     } catch (e) {
-      if (transaction) transaction.rollback();
+      if (transaction) await transaction.rollback();
       console.log(e);
       throw e;
     }

From 38e4b7351adb6a46637a27dc15ec9077c8adbd0d Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 31 Mar 2023 18:42:39 +0800
Subject: [PATCH 140/161] fix(nc-gui): incorrect validation infos key

---
 packages/nc-gui/components/webhook/Editor.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 85c1462adc..351226ae61 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -627,7 +627,7 @@ onMounted(async () => {
 
           <a-row v-if="hook.notification.type === 'Slack'" type="flex">
             <a-col :span="24">
-              <a-form-item v-bind="validateInfos['notification.channels']">
+              <a-form-item v-bind="validateInfos['notification.payload.channels']">
                 <LazyWebhookChannelMultiSelect
                   v-model="hook.notification.payload.channels"
                   :selected-channel-list="hook.notification.payload.channels"
@@ -640,7 +640,7 @@ onMounted(async () => {
 
           <a-row v-if="hook.notification.type === 'Microsoft Teams'" type="flex">
             <a-col :span="24">
-              <a-form-item v-bind="validateInfos['notification.channels']">
+              <a-form-item v-bind="validateInfos['notification.payload.channels']">
                 <LazyWebhookChannelMultiSelect
                   v-model="hook.notification.payload.channels"
                   :selected-channel-list="hook.notification.payload.channels"
@@ -653,7 +653,7 @@ onMounted(async () => {
 
           <a-row v-if="hook.notification.type === 'Discord'" type="flex">
             <a-col :span="24">
-              <a-form-item v-bind="validateInfos['notification.channels']">
+              <a-form-item v-bind="validateInfos['notification.payload.channels']">
                 <LazyWebhookChannelMultiSelect
                   v-model="hook.notification.payload.channels"
                   :selected-channel-list="hook.notification.payload.channels"
@@ -666,7 +666,7 @@ onMounted(async () => {
 
           <a-row v-if="hook.notification.type === 'Mattermost'" type="flex">
             <a-col :span="24">
-              <a-form-item v-bind="validateInfos['notification.channels']">
+              <a-form-item v-bind="validateInfos['notification.payload.channels']">
                 <LazyWebhookChannelMultiSelect
                   v-model="hook.notification.payload.channels"
                   :selected-channel-list="hook.notification.payload.channels"

From bfd5f1dac1e0e88427e47f5397a6c1f33f512e6e Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 31 Mar 2023 19:49:02 +0800
Subject: [PATCH 141/161] chore(nc-gui): lint

---
 packages/nc-gui/components/webhook/CallLog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/webhook/CallLog.vue b/packages/nc-gui/components/webhook/CallLog.vue
index 3d72ae998c..1fdf3c0a43 100644
--- a/packages/nc-gui/components/webhook/CallLog.vue
+++ b/packages/nc-gui/components/webhook/CallLog.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { HookLogType, HookType } from 'nocodb-sdk'
-import { extractSdkResponseErrorMsg, onBeforeMount, parseProp, timeAgo, useApi, useGlobal, AutomationLogLevel } from '#imports'
+import { AutomationLogLevel, extractSdkResponseErrorMsg, onBeforeMount, parseProp, timeAgo, useApi, useGlobal } from '#imports'
 
 interface Props {
   hook: HookType

From d50c24b871f6b374418ae4ba02d091ea8f68e3b8 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 31 Mar 2023 19:49:20 +0800
Subject: [PATCH 142/161] fix(nc-gui): channel multi select logic

---
 .../components/webhook/ChannelMultiSelect.vue | 49 ++++++++++++-------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/packages/nc-gui/components/webhook/ChannelMultiSelect.vue b/packages/nc-gui/components/webhook/ChannelMultiSelect.vue
index d9c07bc594..d90e3c9df7 100644
--- a/packages/nc-gui/components/webhook/ChannelMultiSelect.vue
+++ b/packages/nc-gui/components/webhook/ChannelMultiSelect.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, useVModel, watch } from '#imports'
+import { onBeforeMount, useVModel, watch } from '#imports'
 
 interface Props {
   modelValue: Record<string, any>[]
@@ -17,24 +17,9 @@ const vModel = useVModel(rest, 'modelValue', emit)
 const localChannelValues = $ref<number[]>([])
 
 // availableChannelList with idx enriched
-let availableChannelWithIdxList = $ref<Record<string, any>[]>()
+let availableChannelWithIdxList = $ref<Record<string, any>[]>([])
 
-watch(
-  () => localChannelValues,
-  (v) => {
-    const res = []
-    for (const channelIdx of v) {
-      const target = availableChannelWithIdxList.find((availableChannel) => availableChannel.idx === channelIdx)
-      if (target) {
-        // push without target.idx
-        res.push({ webhook_url: target.webhook_url, channel: target.channel })
-      }
-    }
-    vModel.value = res
-  },
-)
-
-onMounted(() => {
+function setAvailableChannelWithIdxList(availableChannelList: Record<string, any>[]) {
   if (availableChannelList.length) {
     // enrich idx
     let idx = 0
@@ -54,7 +39,33 @@ onMounted(() => {
       }
     }
   }
-})
+}
+
+watch(
+  () => availableChannelList,
+  (n, o) => {
+    if (n !== o) {
+      setAvailableChannelWithIdxList(n)
+    }
+  },
+)
+
+watch(
+  () => localChannelValues,
+  (v) => {
+    const res = []
+    for (const channelIdx of v) {
+      const target = availableChannelWithIdxList.find((availableChannel) => availableChannel.idx === channelIdx)
+      if (target) {
+        // push without target.idx
+        res.push({ webhook_url: target.webhook_url, channel: target.channel })
+      }
+    }
+    vModel.value = res
+  },
+)
+
+onBeforeMount(() => setAvailableChannelWithIdxList(availableChannelList))
 </script>
 
 <template>

From 3958ea76f49ff216145a4bdb5ce7b8777b307b71 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 31 Mar 2023 19:49:40 +0800
Subject: [PATCH 143/161] fix(nc-gui): hook channel validation

---
 packages/nc-gui/components/webhook/Editor.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 351226ae61..b9afda00cc 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -241,6 +241,9 @@ const { validate, validateInfos } = useForm(hook, validators)
 function onNotTypeChange(reset = false) {
   if (reset) {
     hook.notification.payload = {} as Record<string, any>
+    if (['Slack', 'Microsoft Teams', 'Discord', 'Mattermost'].includes(hook.notification.type)) {
+      hook.notification.payload.channels = []
+    }
   }
 
   if (hook.notification.type === 'Slack') {
@@ -287,7 +290,7 @@ function setHook(newHook: HookType) {
   }
 }
 
-async function onEventChange() {
+function onEventChange() {
   const { notification: { payload = {}, type = {} } = {} } = hook
 
   Object.assign(hook, {
@@ -300,20 +303,20 @@ async function onEventChange() {
 
   hook.notification.payload = payload
 
-  let channels: Ref<Record<string, any>[] | null> = ref(null)
+  const channels: Ref<Record<string, any>[] | null> = ref(null)
 
   switch (hook.notification.type) {
     case 'Slack':
-      channels = slackChannels
+      channels.value = slackChannels.value
       break
     case 'Microsoft Teams':
-      channels = teamsChannels
+      channels.value = teamsChannels.value
       break
     case 'Discord':
-      channels = discordChannels
+      channels.value = discordChannels.value
       break
     case 'Mattermost':
-      channels = mattermostChannels
+      channels.value = mattermostChannels.value
       break
   }
 

From 2d3c416d267a6ec4b79ec89812005edc94564d5a Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 31 Mar 2023 19:50:53 +0800
Subject: [PATCH 144/161] refactor(nc-gui): channel type

---
 packages/nc-gui/components/webhook/Editor.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index b9afda00cc..dd61761889 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -223,10 +223,7 @@ const validators = computed(() => {
       'notification.payload.subject': [fieldRequiredValidator()],
       'notification.payload.body': [fieldRequiredValidator()],
     }),
-    ...((hook.notification.type === 'Slack' ||
-      hook.notification.type === 'Microsoft Teams' ||
-      hook.notification.type === 'Discord' ||
-      hook.notification.type === 'Mattermost') && {
+    ...(['Slack', 'Microsoft Teams', 'Discord', 'Mattermost'].includes(hook.notification.type) && {
       'notification.payload.channels': [fieldRequiredValidator()],
       'notification.payload.body': [fieldRequiredValidator()],
     }),

From 608d76a34aa924a73ab869b5a25d9e420404c9b7 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 31 Mar 2023 19:52:02 +0800
Subject: [PATCH 145/161] refactor(nc-gui): rename to onNotificationTypeChange

---
 packages/nc-gui/components/webhook/Editor.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index dd61761889..2e60349da4 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -235,7 +235,7 @@ const validators = computed(() => {
 })
 const { validate, validateInfos } = useForm(hook, validators)
 
-function onNotTypeChange(reset = false) {
+function onNotificationTypeChange(reset = false) {
   if (reset) {
     hook.notification.payload = {} as Record<string, any>
     if (['Slack', 'Microsoft Teams', 'Discord', 'Mattermost'].includes(hook.notification.type)) {
@@ -444,7 +444,7 @@ onMounted(async () => {
     hook.eventOperation = `${hook.event} ${hook.operation}`
   }
 
-  onNotTypeChange()
+  onNotificationTypeChange()
 })
 </script>
 
@@ -540,7 +540,7 @@ onMounted(async () => {
                   class="nc-select-hook-notification-type"
                   :placeholder="$t('general.notification')"
                   dropdown-class-name="nc-dropdown-webhook-notification"
-                  @change="onNotTypeChange(true)"
+                  @change="onNotificationTypeChange(true)"
                 >
                   <a-select-option v-for="(notificationOption, i) in notificationList" :key="i" :value="notificationOption.type">
                     <div class="flex items-center">

From 2c7ba554017f7e5b054b961fa064956b469331e9 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 31 Mar 2023 19:54:12 +0800
Subject: [PATCH 146/161] fix(nc-gui): set payload body for channels

---
 packages/nc-gui/components/webhook/Editor.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 2e60349da4..a4f9104932 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -240,6 +240,7 @@ function onNotificationTypeChange(reset = false) {
     hook.notification.payload = {} as Record<string, any>
     if (['Slack', 'Microsoft Teams', 'Discord', 'Mattermost'].includes(hook.notification.type)) {
       hook.notification.payload.channels = []
+      hook.notification.payload.body = ''
     }
   }
 
@@ -628,6 +629,7 @@ onMounted(async () => {
           <a-row v-if="hook.notification.type === 'Slack'" type="flex">
             <a-col :span="24">
               <a-form-item v-bind="validateInfos['notification.payload.channels']">
+                {{ hook }}
                 <LazyWebhookChannelMultiSelect
                   v-model="hook.notification.payload.channels"
                   :selected-channel-list="hook.notification.payload.channels"

From ad416847015d0d9755da43ef6f6ab762af07b5c4 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 31 Mar 2023 19:54:27 +0800
Subject: [PATCH 147/161] chore(nc-gui): remove debug hook

---
 packages/nc-gui/components/webhook/Editor.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index a4f9104932..fe652c5dda 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -629,7 +629,6 @@ onMounted(async () => {
           <a-row v-if="hook.notification.type === 'Slack'" type="flex">
             <a-col :span="24">
               <a-form-item v-bind="validateInfos['notification.payload.channels']">
-                {{ hook }}
                 <LazyWebhookChannelMultiSelect
                   v-model="hook.notification.payload.channels"
                   :selected-channel-list="hook.notification.payload.channels"

From f26fc796d73e30942541670c305b661d10e6eba7 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 1 Apr 2023 16:20:52 +0800
Subject: [PATCH 148/161] feat(nocodb): throw error so that the error can be
 logged in hook log

---
 packages/nocodb/src/lib/plugins/discord/Discord.ts               | 1 +
 packages/nocodb/src/lib/plugins/mattermost/Mattermost.ts         | 1 +
 packages/nocodb/src/lib/plugins/slack/Slack.ts                   | 1 +
 packages/nocodb/src/lib/plugins/teams/Teams.ts                   | 1 +
 packages/nocodb/src/lib/plugins/twilio/Twilio.ts                 | 1 +
 packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsapp.ts | 1 +
 .../nocodb/src/lib/v1-legacy/plugins/adapters/discord/Discord.ts | 1 +
 .../src/lib/v1-legacy/plugins/adapters/mattermost/Mattermost.ts  | 1 +
 .../nocodb/src/lib/v1-legacy/plugins/adapters/slack/Slack.ts     | 1 +
 .../nocodb/src/lib/v1-legacy/plugins/adapters/twilio/Twilio.ts   | 1 +
 10 files changed, 10 insertions(+)

diff --git a/packages/nocodb/src/lib/plugins/discord/Discord.ts b/packages/nocodb/src/lib/plugins/discord/Discord.ts
index 6bfbedd952..c127e235e5 100644
--- a/packages/nocodb/src/lib/plugins/discord/Discord.ts
+++ b/packages/nocodb/src/lib/plugins/discord/Discord.ts
@@ -14,6 +14,7 @@ export default class Discord implements IWebhookNotificationAdapter {
         });
       } catch (e) {
         console.log(e);
+        throw e;
       }
     }
   }
diff --git a/packages/nocodb/src/lib/plugins/mattermost/Mattermost.ts b/packages/nocodb/src/lib/plugins/mattermost/Mattermost.ts
index 7be83b32c8..19009c1bec 100644
--- a/packages/nocodb/src/lib/plugins/mattermost/Mattermost.ts
+++ b/packages/nocodb/src/lib/plugins/mattermost/Mattermost.ts
@@ -14,6 +14,7 @@ export default class Mattermost implements IWebhookNotificationAdapter {
         });
       } catch (e) {
         console.log(e);
+        throw e;
       }
     }
   }
diff --git a/packages/nocodb/src/lib/plugins/slack/Slack.ts b/packages/nocodb/src/lib/plugins/slack/Slack.ts
index fbdaac6be4..73dcf114d6 100644
--- a/packages/nocodb/src/lib/plugins/slack/Slack.ts
+++ b/packages/nocodb/src/lib/plugins/slack/Slack.ts
@@ -14,6 +14,7 @@ export default class Slack implements IWebhookNotificationAdapter {
         });
       } catch (e) {
         console.log(e);
+        throw e;
       }
     }
   }
diff --git a/packages/nocodb/src/lib/plugins/teams/Teams.ts b/packages/nocodb/src/lib/plugins/teams/Teams.ts
index 13ca771d02..d60a0a5d00 100644
--- a/packages/nocodb/src/lib/plugins/teams/Teams.ts
+++ b/packages/nocodb/src/lib/plugins/teams/Teams.ts
@@ -14,6 +14,7 @@ export default class Teams implements IWebhookNotificationAdapter {
         });
       } catch (e) {
         console.log(e);
+        throw e;
       }
     }
   }
diff --git a/packages/nocodb/src/lib/plugins/twilio/Twilio.ts b/packages/nocodb/src/lib/plugins/twilio/Twilio.ts
index 7de848c872..fcbbbc7dcd 100644
--- a/packages/nocodb/src/lib/plugins/twilio/Twilio.ts
+++ b/packages/nocodb/src/lib/plugins/twilio/Twilio.ts
@@ -23,6 +23,7 @@ export default class Twilio implements IWebhookNotificationAdapter {
         });
       } catch (e) {
         console.log(e);
+        throw e;
       }
     }
   }
diff --git a/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsapp.ts b/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsapp.ts
index 1120fa1f35..be5290580f 100644
--- a/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsapp.ts
+++ b/packages/nocodb/src/lib/plugins/twilioWhatsapp/TwilioWhatsapp.ts
@@ -23,6 +23,7 @@ export default class TwilioWhatsapp implements IWebhookNotificationAdapter {
         });
       } catch (e) {
         console.log(e);
+        throw e;
       }
     }
   }
diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/discord/Discord.ts b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/discord/Discord.ts
index 3ec868ab9a..6e73a3dd2a 100644
--- a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/discord/Discord.ts
+++ b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/discord/Discord.ts
@@ -14,6 +14,7 @@ export default class Discord {
         });
       } catch (e) {
         console.log(e);
+        throw e;
       }
     }
   }
diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/mattermost/Mattermost.ts b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/mattermost/Mattermost.ts
index 4157253c54..66f311a31a 100644
--- a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/mattermost/Mattermost.ts
+++ b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/mattermost/Mattermost.ts
@@ -14,6 +14,7 @@ export default class Mattermost {
         });
       } catch (e) {
         console.log(e);
+        throw e;
       }
     }
   }
diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/slack/Slack.ts b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/slack/Slack.ts
index fa53c8f6d7..12732dc3f8 100644
--- a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/slack/Slack.ts
+++ b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/slack/Slack.ts
@@ -14,6 +14,7 @@ export default class Slack {
         });
       } catch (e) {
         console.log(e);
+        throw e;
       }
     }
   }
diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/twilio/Twilio.ts b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/twilio/Twilio.ts
index 5f718ea0de..cc8bc9bd70 100644
--- a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/twilio/Twilio.ts
+++ b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/twilio/Twilio.ts
@@ -37,6 +37,7 @@ export default class Twilio {
         });
       } catch (e) {
         console.log(e);
+        throw e;
       }
     }
   }

From 3680378e545665b6091f8799099fe7abed3de4ff Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 1 Apr 2023 17:45:12 +0800
Subject: [PATCH 149/161] fix(nocodb): return error for hook test

---
 .../nocodb/src/lib/controllers/hook.ctl.ts    | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/nocodb/src/lib/controllers/hook.ctl.ts b/packages/nocodb/src/lib/controllers/hook.ctl.ts
index bf909e2ffc..5786ad0f74 100644
--- a/packages/nocodb/src/lib/controllers/hook.ctl.ts
+++ b/packages/nocodb/src/lib/controllers/hook.ctl.ts
@@ -46,11 +46,21 @@ export async function hookUpdate(
 }
 
 export async function hookTest(req: Request<any, any>, res: Response) {
-  await hookService.hookTest({
-    hookTest: req.body,
-    tableId: req.params.tableId,
-  });
-  res.json({ msg: 'The hook has been tested successfully' });
+  try {
+    await hookService.hookTest({
+      hookTest: {
+        ...req.body,
+        payload: {
+          ...req.body.payload,
+          user: (req as any)?.user,
+        },
+      },
+      tableId: req.params.tableId,
+    });
+    res.json({ msg: 'The hook has been tested successfully' });
+  } catch (e) {
+    throw e;
+  }
 }
 
 export async function tableSampleData(req: Request, res: Response) {

From 4bc4d11ab5d76beb7c4faebbc84caacbbca5b429 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 1 Apr 2023 17:45:46 +0800
Subject: [PATCH 150/161] fix(nocodb): throw errors for invokeWebhook

---
 packages/nocodb/src/lib/services/hook.svc.ts | 26 ++++++++++++--------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/packages/nocodb/src/lib/services/hook.svc.ts b/packages/nocodb/src/lib/services/hook.svc.ts
index c6a5b2b559..c5a7c52a9a 100644
--- a/packages/nocodb/src/lib/services/hook.svc.ts
+++ b/packages/nocodb/src/lib/services/hook.svc.ts
@@ -81,20 +81,26 @@ export async function hookTest(param: {
 
   const model = await Model.getByIdOrName({ id: param.tableId });
 
+  T.emit('evt', { evt_type: 'webhooks:tested' });
+
   const {
     hook,
     payload: { data, user },
   } = param.hookTest;
-  await invokeWebhook(
-    new Hook(hook),
-    model,
-    data,
-    user,
-    (hook as any)?.filters,
-    true
-  );
-
-  T.emit('evt', { evt_type: 'webhooks:tested' });
+  try {
+    await invokeWebhook(
+      new Hook(hook),
+      model,
+      null,
+      null,
+      data,
+      user,
+      (hook as any)?.filters,
+      true
+    );
+  } catch (e) {
+    throw e;
+  }
 
   return true;
 }

From 5aba390dd19dee10f3ad5ec0835a3d2e05df1fc4 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 1 Apr 2023 17:49:50 +0800
Subject: [PATCH 151/161] fix(nocodb): revise default hooklog response

---
 .../nocodb/src/lib/meta/helpers/webhookHelpers.ts   | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index 0989089186..f382c5cd5f 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -375,7 +375,18 @@ export async function invokeWebhook(
               fk_hook_id: hook.id,
               type: notification.type,
               payload: JSON.stringify(notification?.payload),
-              response: JSON.stringify(res),
+              response: JSON.stringify({
+                status: res.status,
+                statusText: res.statusText,
+                headers: res.headers,
+                config: {
+                  url: res.config.url,
+                  method: res.config.method,
+                  data: res.config.data,
+                  headers: res.config.headers,
+                  params: res.config.params,
+                },
+              }),
               triggered_by: user?.email,
             };
           }

From 7817818bd0fa1a47af17ff49b7fb77974fdcaaec Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 1 Apr 2023 17:56:29 +0800
Subject: [PATCH 152/161] fix(nocodb): return axios response

---
 packages/nocodb/src/lib/plugins/discord/Discord.ts              | 2 +-
 packages/nocodb/src/lib/plugins/mattermost/Mattermost.ts        | 2 +-
 packages/nocodb/src/lib/plugins/slack/Slack.ts                  | 2 +-
 packages/nocodb/src/lib/plugins/teams/Teams.ts                  | 2 +-
 .../src/lib/v1-legacy/plugins/adapters/discord/Discord.ts       | 2 +-
 .../src/lib/v1-legacy/plugins/adapters/mattermost/Mattermost.ts | 2 +-
 .../nocodb/src/lib/v1-legacy/plugins/adapters/slack/Slack.ts    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/nocodb/src/lib/plugins/discord/Discord.ts b/packages/nocodb/src/lib/plugins/discord/Discord.ts
index c127e235e5..a83f522503 100644
--- a/packages/nocodb/src/lib/plugins/discord/Discord.ts
+++ b/packages/nocodb/src/lib/plugins/discord/Discord.ts
@@ -9,7 +9,7 @@ export default class Discord implements IWebhookNotificationAdapter {
   public async sendMessage(content: string, payload: any): Promise<any> {
     for (const { webhook_url } of payload?.channels) {
       try {
-        await axios.post(webhook_url, {
+        return await axios.post(webhook_url, {
           content,
         });
       } catch (e) {
diff --git a/packages/nocodb/src/lib/plugins/mattermost/Mattermost.ts b/packages/nocodb/src/lib/plugins/mattermost/Mattermost.ts
index 19009c1bec..65bfa902b7 100644
--- a/packages/nocodb/src/lib/plugins/mattermost/Mattermost.ts
+++ b/packages/nocodb/src/lib/plugins/mattermost/Mattermost.ts
@@ -9,7 +9,7 @@ export default class Mattermost implements IWebhookNotificationAdapter {
   public async sendMessage(text: string, payload: any): Promise<any> {
     for (const { webhook_url } of payload?.channels) {
       try {
-        await axios.post(webhook_url, {
+        return await axios.post(webhook_url, {
           text,
         });
       } catch (e) {
diff --git a/packages/nocodb/src/lib/plugins/slack/Slack.ts b/packages/nocodb/src/lib/plugins/slack/Slack.ts
index 73dcf114d6..2e2ebcf0dc 100644
--- a/packages/nocodb/src/lib/plugins/slack/Slack.ts
+++ b/packages/nocodb/src/lib/plugins/slack/Slack.ts
@@ -9,7 +9,7 @@ export default class Slack implements IWebhookNotificationAdapter {
   public async sendMessage(text: string, payload: any): Promise<any> {
     for (const { webhook_url } of payload?.channels) {
       try {
-        await axios.post(webhook_url, {
+        return await axios.post(webhook_url, {
           text,
         });
       } catch (e) {
diff --git a/packages/nocodb/src/lib/plugins/teams/Teams.ts b/packages/nocodb/src/lib/plugins/teams/Teams.ts
index d60a0a5d00..868d7d5aa2 100644
--- a/packages/nocodb/src/lib/plugins/teams/Teams.ts
+++ b/packages/nocodb/src/lib/plugins/teams/Teams.ts
@@ -9,7 +9,7 @@ export default class Teams implements IWebhookNotificationAdapter {
   public async sendMessage(Text: string, payload: any): Promise<any> {
     for (const { webhook_url } of payload?.channels) {
       try {
-        await axios.post(webhook_url, {
+        return await axios.post(webhook_url, {
           Text,
         });
       } catch (e) {
diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/discord/Discord.ts b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/discord/Discord.ts
index 6e73a3dd2a..310e97dd4c 100644
--- a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/discord/Discord.ts
+++ b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/discord/Discord.ts
@@ -9,7 +9,7 @@ export default class Discord {
   ): Promise<any> {
     for (const { webhook_url } of webhooks) {
       try {
-        await axios.post(webhook_url, {
+        return await axios.post(webhook_url, {
           content,
         });
       } catch (e) {
diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/mattermost/Mattermost.ts b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/mattermost/Mattermost.ts
index 66f311a31a..fa0a08ef5f 100644
--- a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/mattermost/Mattermost.ts
+++ b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/mattermost/Mattermost.ts
@@ -9,7 +9,7 @@ export default class Mattermost {
   ): Promise<any> {
     for (const { webhook_url } of webhooks) {
       try {
-        await axios.post(webhook_url, {
+        return await axios.post(webhook_url, {
           text,
         });
       } catch (e) {
diff --git a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/slack/Slack.ts b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/slack/Slack.ts
index 12732dc3f8..5e4097c70d 100644
--- a/packages/nocodb/src/lib/v1-legacy/plugins/adapters/slack/Slack.ts
+++ b/packages/nocodb/src/lib/v1-legacy/plugins/adapters/slack/Slack.ts
@@ -9,7 +9,7 @@ export default class Slack {
   ): Promise<any> {
     for (const { webhook_url } of webhooks) {
       try {
-        await axios.post(webhook_url, {
+        return await axios.post(webhook_url, {
           text,
         });
       } catch (e) {

From 4728c65c139414ae60430f50d370ebfff00b88e5 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 1 Apr 2023 18:33:31 +0800
Subject: [PATCH 153/161] fix(nocodb): fix test hook flag

---
 packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts | 5 +++--
 packages/nocodb/src/lib/services/hook.svc.ts           | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index f382c5cd5f..426a9e46c2 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -252,7 +252,8 @@ export async function invokeWebhook(
   newData,
   user,
   testFilters = null,
-  throwErrorOnFailure = false
+  throwErrorOnFailure = false,
+  testHook = false
 ) {
   let hookLog: HookLogType;
   const startTime = process.hrtime();
@@ -413,7 +414,7 @@ export async function invokeWebhook(
       hookLog.execution_time = parseHrtimeToMilliSeconds(
         process.hrtime(startTime)
       );
-      HookLog.insert({ ...hookLog, test_call: !!testFilters });
+      HookLog.insert({ ...hookLog, test_call: testHook });
     }
   }
 }
diff --git a/packages/nocodb/src/lib/services/hook.svc.ts b/packages/nocodb/src/lib/services/hook.svc.ts
index c5a7c52a9a..7e61419d69 100644
--- a/packages/nocodb/src/lib/services/hook.svc.ts
+++ b/packages/nocodb/src/lib/services/hook.svc.ts
@@ -96,6 +96,7 @@ export async function hookTest(param: {
       data,
       user,
       (hook as any)?.filters,
+      true,
       true
     );
   } catch (e) {

From 02ecf688cf8ad52689e8b10881244b33e58af82c Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 1 Apr 2023 19:31:28 +0800
Subject: [PATCH 154/161] fix(nc-gui): revise call log structure

---
 .../nc-gui/components/webhook/CallLog.vue     | 69 ++++++++++++-------
 1 file changed, 44 insertions(+), 25 deletions(-)

diff --git a/packages/nc-gui/components/webhook/CallLog.vue b/packages/nc-gui/components/webhook/CallLog.vue
index 1fdf3c0a43..fd1aaa540a 100644
--- a/packages/nc-gui/components/webhook/CallLog.vue
+++ b/packages/nc-gui/components/webhook/CallLog.vue
@@ -38,13 +38,31 @@ async function loadHookLogs(page = currentPage, limit = currentLimit) {
       offset: limit * (page - 1),
       limit,
     })
-    hookLogs.value = list
+    hookLogs.value = parseHookLog(list)
     totalRows = pageInfo.totalRows ?? 0
   } catch (e: any) {
     message.error(await extractSdkResponseErrorMsg(e))
   }
 }
 
+function parseHookLog(hookLogs: any) {
+  for (const hookLog of hookLogs) {
+    if (hookLog?.response) {
+      hookLog.response = parseProp(hookLog.response)
+    }
+    if (hookLog?.response?.config?.data) {
+      hookLog.response.config.data = parseProp(hookLog.response.config.data)
+    }
+    if (hookLog?.payload) {
+      hookLog.payload = parseProp(hookLog.payload)
+    }
+    if (hookLog?.notification) {
+      hookLog.notification = parseProp(hookLog.notification)
+    }
+  }
+  return hookLogs
+}
+
 onBeforeMount(async () => {
   if (showLogs.value) {
     await loadHookLogs(currentPage, currentLimit)
@@ -86,52 +104,53 @@ onBeforeMount(async () => {
                     <div class="flex-1">
                       {{ hookLog.type }}: records.{{ hookLog.event }}.{{ hookLog.operation }} ({{ timeAgo(hookLog.created_at) }})
                     </div>
-                    <div
-                      v-if="hookLog.type === 'URL'"
-                      class="mx-1 px-2 py-1 text-white rounded bg-red-500 text-xs"
-                      :class="{ '!bg-green-500': parseProp(hookLog.response).status === 200 }"
-                    >
-                      {{ parseProp(hookLog.response).status }}
-                      {{ parseProp(hookLog.response).statusText }}
-                    </div>
+
                     <div v-if="hookLog.type === 'Email'">
                       <div v-if="hookLog.error_message" class="mx-1 px-2 py-1 text-white rounded text-xs bg-red-500">ERROR</div>
                       <div v-else class="mx-1 px-2 py-1 text-white rounded text-xs bg-green-500">OK</div>
                     </div>
+                    <div
+                      v-else
+                      class="mx-1 px-2 py-1 text-white rounded bg-red-500 text-xs"
+                      :class="{ '!bg-green-500': hookLog.response?.status === 200 }"
+                    >
+                      {{ hookLog.response?.status }}
+                      {{ hookLog.response?.statusText || (hookLog.response?.status === 200 ? 'OK' : 'ERROR') }}
+                    </div>
                   </div>
                   <div v-if="hookLog.type === 'URL'">
                     <span class="font-weight-medium text-primary">
-                      {{ parseProp(hookLog.payload).method }}
+                      {{ hookLog.payload.method }}
                     </span>
-                    {{ parseProp(hookLog.payload).path }}
+                    {{ hookLog.payload.path }}
                   </div>
                 </div>
               </template>
 
-              <div v-if="hookLog.type === 'URL'">
-                <div class="nc-hook-log-request">
+              <div v-if="hookLog.error_message" class="mb-4">
+                {{ hookLog.error_message }}
+              </div>
+
+              <div v-if="hookLog.type !== 'Email'">
+                <div v-if="hookLog?.response?.config?.headers" class="nc-hook-log-request">
                   <div class="nc-hook-pre-title">Request</div>
-                  <pre class="nc-hook-pre">{{ parseProp(hookLog.response).config.headers }}</pre>
+                  <pre class="nc-hook-pre">{{ hookLog.response.config.headers }}</pre>
                 </div>
 
-                <div class="nc-hook-log-response">
+                <div v-if="hookLog?.response?.headers" class="nc-hook-log-response">
                   <div class="nc-hook-pre-title">Response</div>
-                  <pre class="nc-hook-pre">{{ parseProp(hookLog.response).headers }}</pre>
+                  <pre class="nc-hook-pre">{{ hookLog.response.headers }}</pre>
                 </div>
 
-                <div class="nc-hook-log-payload">
+                <div v-if="hookLog?.response?.config?.data" class="nc-hook-log-payload">
                   <div class="nc-hook-pre-title">Payload</div>
-                  <pre class="nc-hook-pre">{{ parseProp(parseProp(hookLog.response).config.data) }}</pre>
+                  <pre class="nc-hook-pre">{{ hookLog.response.config.data }}</pre>
                 </div>
               </div>
-
-              <div v-else-if="hookLog.type === 'Email'">
-                <div v-if="hookLog.error_message" class="mb-4">
-                  {{ hookLog.error_message }}
-                </div>
-                <div class="nc-hook-log-payload">
+              <div v-else>
+                <div v-if="hookLog?.payload" class="nc-hook-log-payload">
                   <div class="nc-hook-pre-title">Payload</div>
-                  <pre class="nc-hook-pre">{{ parseProp(hookLog.payload) }}</pre>
+                  <pre class="nc-hook-pre">{{ hookLog.payload }}</pre>
                 </div>
               </div>
             </a-collapse-panel>

From edc681bd6f2b900174793816237380b23c772a08 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 3 Apr 2023 12:11:53 +0800
Subject: [PATCH 155/161] fix(nocodb): bulk delete logic

---
 .../src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 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 8ab975d42c..4a76d42304 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
@@ -2206,22 +2206,25 @@ class BaseModelSqlv2 {
       transaction = await this.dbDriver.transaction();
 
       const deleted = [];
+      const deletePkValues = [];
       const res = [];
       for (const d of deleteIds) {
-        await this.validate(d);
         const pkValues = await this._extractPksValues(d);
         if (!pkValues) {
           // pk not specified - bypass
           continue;
         }
-
-        deleted.push(await this.readByPk(pkValues));
+        deletePkValues.push(pkValues);
         await transaction(this.tnPath).del().where(d);
         res.push(d);
       }
 
       await transaction.commit();
 
+      for (const pkValues of deletePkValues) {
+        deleted.push(await this.readByPk(pkValues));
+      }
+
       await this.afterBulkDelete(deleted, this.dbDriver, cookie);
 
       return res;

From a80f8fd99c90572e2688fed182a531d6989f7cde Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 3 Apr 2023 12:41:37 +0800
Subject: [PATCH 156/161] chore(nc-gui): version cant be undefined

---
 packages/nc-gui/components/webhook/Test.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/webhook/Test.vue b/packages/nc-gui/components/webhook/Test.vue
index d6a4daf0bb..88cc1c20ce 100644
--- a/packages/nc-gui/components/webhook/Test.vue
+++ b/packages/nc-gui/components/webhook/Test.vue
@@ -27,7 +27,7 @@ async function loadSampleData() {
   sampleData.value = await $api.dbTableWebhook.samplePayloadGet(
     meta?.value?.id as string,
     hook?.operation || 'insert',
-    hook.version,
+    hook.version!,
   )
 }
 

From 62286c41ea40900efeaa61fcdc480c493ff7059b Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 3 Apr 2023 12:42:08 +0800
Subject: [PATCH 157/161] fix(nocodb): view can be undefined in hook test

---
 packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index 426a9e46c2..e19673708a 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -146,8 +146,8 @@ export function constructWebHookData(hook, model, view, prevData, newData) {
       data: {
         table_id: model.id,
         table_name: model.title,
-        view_id: view.id,
-        view_name: view.title,
+        view_id: view?.id,
+        view_name: view?.title,
         ...(prevData && {
           previous_rows: Array.isArray(prevData) ? prevData : [prevData],
         }),

From d425a65741041763c61afa8b95c1f3d1a5b8338e Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 3 Apr 2023 14:02:04 +0800
Subject: [PATCH 158/161] chore(nc-gui): add margin bottom to header plus
 button

---
 packages/nc-gui/components/api-client/Headers.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/api-client/Headers.vue b/packages/nc-gui/components/api-client/Headers.vue
index a5f1efbc2f..1839046a51 100644
--- a/packages/nc-gui/components/api-client/Headers.vue
+++ b/packages/nc-gui/components/api-client/Headers.vue
@@ -123,7 +123,7 @@ const filterOption = (input: string, option: Option) => {
 
         <tr>
           <td :colspan="12" class="text-center">
-            <a-button type="default" class="!bg-gray-100 rounded-md border-none mr-1" @click="addHeaderRow">
+            <a-button type="default" class="!bg-gray-100 rounded-md border-none mr-1 mb-3" @click="addHeaderRow">
               <template #icon>
                 <component :is="iconMap.plus" class="flex mx-auto" />
               </template>

From c0087751dd8e6e4e73da5b619c6762b1702a74e1 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 3 Apr 2023 16:21:57 +0800
Subject: [PATCH 159/161] fix(nocodb): commit transaction after reading all
 deleted records

---
 .../src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts      | 4 ++--
 1 file changed, 2 insertions(+), 2 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 4a76d42304..05038999cc 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
@@ -2219,12 +2219,12 @@ class BaseModelSqlv2 {
         res.push(d);
       }
 
-      await transaction.commit();
-
       for (const pkValues of deletePkValues) {
         deleted.push(await this.readByPk(pkValues));
       }
 
+      await transaction.commit();
+
       await this.afterBulkDelete(deleted, this.dbDriver, cookie);
 
       return res;

From 681674925705b9e479460454f17bba26388d36e5 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 3 Apr 2023 17:16:39 +0800
Subject: [PATCH 160/161] fix(nocodb): bulk delete transaction issue

---
 .../lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts | 12 +++++-------
 1 file changed, 5 insertions(+), 7 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 05038999cc..d154aea3c8 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
@@ -2203,10 +2203,7 @@ class BaseModelSqlv2 {
         ids.map((d) => this.model.mapAliasToColumn(d))
       );
 
-      transaction = await this.dbDriver.transaction();
-
       const deleted = [];
-      const deletePkValues = [];
       const res = [];
       for (const d of deleteIds) {
         const pkValues = await this._extractPksValues(d);
@@ -2214,13 +2211,14 @@ class BaseModelSqlv2 {
           // pk not specified - bypass
           continue;
         }
-        deletePkValues.push(pkValues);
-        await transaction(this.tnPath).del().where(d);
+        deleted.push(await this.readByPk(pkValues));
         res.push(d);
       }
 
-      for (const pkValues of deletePkValues) {
-        deleted.push(await this.readByPk(pkValues));
+      transaction = await this.dbDriver.transaction();
+
+      for (const d of res) {
+        await transaction(this.tnPath).del().where(d);
       }
 
       await transaction.commit();

From 3f3b9230da585c2768bf86a968fefc447710c958 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 3 Apr 2023 17:29:47 +0800
Subject: [PATCH 161/161] feat(nocodb): add error log

---
 packages/nocodb/src/lib/controllers/hook.ctl.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nocodb/src/lib/controllers/hook.ctl.ts b/packages/nocodb/src/lib/controllers/hook.ctl.ts
index 5786ad0f74..0dc90be12b 100644
--- a/packages/nocodb/src/lib/controllers/hook.ctl.ts
+++ b/packages/nocodb/src/lib/controllers/hook.ctl.ts
@@ -59,6 +59,7 @@ export async function hookTest(req: Request<any, any>, res: Response) {
     });
     res.json({ msg: 'The hook has been tested successfully' });
   } catch (e) {
+    console.error(e);
     throw e;
   }
 }