From 56039cb0f785cfaa625b0cc324fa8d1422a91157 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Sat, 6 Jan 2024 09:16:24 +0000
Subject: [PATCH] fix: avoid loading view filters to webhook condition

---
 .../nc-gui/components/smartsheet/toolbar/ColumnFilter.vue | 4 ++--
 packages/nc-gui/composables/useViewFilters.ts             | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
index ef75edda8f..e2210c9439 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
@@ -188,7 +188,7 @@ watch(
   () => activeView.value?.id,
   (n, o) => {
     // if nested no need to reload since it will get reloaded from parent
-    if (!nested.value && n !== o && (hookId?.value || !webHook.value)) loadFilters(hookId?.value)
+    if (!nested.value && n !== o && (hookId?.value || !webHook.value)) loadFilters(hookId?.value, webHook.value)
   },
 )
 
@@ -325,7 +325,7 @@ const showFilterInput = (filter: Filter) => {
 }
 
 onMounted(() => {
-  loadFilters(hookId?.value)
+  loadFilters(hookId?.value, webHook.value)
 })
 
 onMounted(async () => {
diff --git a/packages/nc-gui/composables/useViewFilters.ts b/packages/nc-gui/composables/useViewFilters.ts
index 5029ae052f..065e52bd03 100644
--- a/packages/nc-gui/composables/useViewFilters.ts
+++ b/packages/nc-gui/composables/useViewFilters.ts
@@ -190,7 +190,7 @@ export function useViewFilters(
     }
   }
 
-  const loadFilters = async (hookId?: string) => {
+  const loadFilters = async (hookId?: string, isWebhook = false) => {
     if (!view.value?.id) return
 
     if (nestedMode.value) {
@@ -199,11 +199,11 @@ export function useViewFilters(
     }
 
     try {
-      if (hookId) {
+      if (isWebhook || hookId) {
         if (parentId) {
           filters.value = (await $api.dbTableFilter.childrenRead(parentId)).list as Filter[]
-        } else {
-          filters.value = (await $api.dbTableWebhookFilter.read(hookId!)).list as Filter[]
+        } else if (hookId) {
+          filters.value = (await $api.dbTableWebhookFilter.read(hookId)).list as Filter[]
         }
       } else {
         if (parentId) {