From 53409fb34757ca16da2aa5476136c77bd013e323 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Mon, 5 Sep 2022 14:10:34 +0800 Subject: [PATCH] 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() 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 | 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,