From 53409fb34757ca16da2aa5476136c77bd013e323 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 5 Sep 2022 14:10:34 +0800
Subject: [PATCH 1/3] fix(gui-v2): avoid watch logic to trigger even after
 signout

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

diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
index 0687a34a94..2a16f9cadd 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
@@ -10,6 +10,8 @@ const isPublic = inject(IsPublicInj, ref(false))
 
 const { filterAutoSave } = useGlobal()
 
+const state = useGlobal()
+
 const filterComp = ref<typeof ColumnFilter>()
 
 const { nestedFilters } = useSmartsheetStoreOrThrow()
@@ -26,7 +28,7 @@ const { filters, loadFilters } = useViewFilters(
 const filtersLength = ref(0)
 
 watchEffect(async () => {
-  if (activeView?.value) {
+  if (activeView?.value && state.signedIn.value) {
     await loadFilters()
 
     filtersLength.value = filters.value.length || 0
diff --git a/packages/nc-gui-v2/composables/useViewColumns.ts b/packages/nc-gui-v2/composables/useViewColumns.ts
index 472b8af703..827ad0f909 100644
--- a/packages/nc-gui-v2/composables/useViewColumns.ts
+++ b/packages/nc-gui-v2/composables/useViewColumns.ts
@@ -202,7 +202,11 @@ export function useViewColumns(view: Ref<ViewType> | undefined, meta: ComputedRe
   })
 
   // reload view columns when table meta changes
-  watch(meta, () => loadViewColumns())
+  watch(meta, async (newVal, oldVal) => {
+    if (newVal !== oldVal && meta.value) {
+      await loadViewColumns()
+    }
+  })
 
   return {
     fields,

From e5188cad1f78ca45b0b525f1f5f8b636ac91fbc7 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 5 Sep 2022 15:05:38 +0800
Subject: [PATCH 2/3] fix(gui-v2): infinite filter calls

---
 .../smartsheet-toolbar/ColumnFilterMenu.vue       | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
index 2a16f9cadd..cbb6c4031b 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type ColumnFilter from './ColumnFilter.vue'
-import { ActiveViewInj, IsLockedInj, IsPublicInj, computed, inject, ref, useGlobal, useViewFilters, watchEffect } from '#imports'
+import { ActiveViewInj, IsLockedInj, IsPublicInj, computed, inject, ref, useGlobal, useViewFilters } from '#imports'
 
 const isLocked = inject(IsLockedInj, ref(false))
 
@@ -10,8 +10,6 @@ const isPublic = inject(IsPublicInj, ref(false))
 
 const { filterAutoSave } = useGlobal()
 
-const state = useGlobal()
-
 const filterComp = ref<typeof ColumnFilter>()
 
 const { nestedFilters } = useSmartsheetStoreOrThrow()
@@ -27,13 +25,14 @@ const { filters, loadFilters } = useViewFilters(
 
 const filtersLength = ref(0)
 
-watchEffect(async () => {
-  if (activeView?.value && state.signedIn.value) {
+watch(
+  () => activeView?.value,
+  async () => {
     await loadFilters()
-
     filtersLength.value = filters.value.length || 0
-  }
-})
+  },
+  { immediate: true },
+)
 
 const applyChanges = async () => await filterComp.value?.applyChanges()
 </script>

From e1b59fe3e4a87a270f2bde20f629b7e74689e4a7 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 5 Sep 2022 15:07:40 +0800
Subject: [PATCH 3/3] fix(gui-v2): revise watch in useViewColumn

---
 packages/nc-gui-v2/composables/useViewColumns.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui-v2/composables/useViewColumns.ts b/packages/nc-gui-v2/composables/useViewColumns.ts
index 827ad0f909..b338d44b62 100644
--- a/packages/nc-gui-v2/composables/useViewColumns.ts
+++ b/packages/nc-gui-v2/composables/useViewColumns.ts
@@ -202,11 +202,14 @@ export function useViewColumns(view: Ref<ViewType> | undefined, meta: ComputedRe
   })
 
   // reload view columns when table meta changes
-  watch(meta, async (newVal, oldVal) => {
-    if (newVal !== oldVal && meta.value) {
-      await loadViewColumns()
-    }
-  })
+  watch(
+    () => meta,
+    async (newVal, oldVal) => {
+      if (newVal !== oldVal && meta.value) {
+        await loadViewColumns()
+      }
+    },
+  )
 
   return {
     fields,