From f64925fef5c080d620917ee55495913dccf17805 Mon Sep 17 00:00:00 2001
From: Yongtae Park <samuel.park@megazone.com>
Date: Tue, 27 May 2025 18:03:13 +0900
Subject: [PATCH] fix(dashboard): edit admin dashboard workspace vars-filter
 scenario

Signed-off-by: samuel.park <samuel.park@megazone.com>
---
 .../components/DashboardToolsetScope.vue               | 10 ++++++++--
 .../stores/dashboard-detail-info-store.ts              |  1 -
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/services/_shared/dashboard/dashboard-detail/components/DashboardToolsetScope.vue b/apps/web/src/services/_shared/dashboard/dashboard-detail/components/DashboardToolsetScope.vue
index 59fedf905c..e97b25e872 100644
--- a/apps/web/src/services/_shared/dashboard/dashboard-detail/components/DashboardToolsetScope.vue
+++ b/apps/web/src/services/_shared/dashboard/dashboard-detail/components/DashboardToolsetScope.vue
@@ -1,5 +1,7 @@
 <script lang="ts" setup="">
-import { computed, reactive, watch } from 'vue';
+import {
+    computed, reactive, watch, onUnmounted,
+} from 'vue';
 
 import { isEqual } from 'lodash';
 
@@ -24,7 +26,6 @@ import { workspaceStateFormatter } from '@/services/advanced/composables/refined
 import { WORKSPACE_STATE } from '@/services/advanced/constants/workspace-constant';
 
 
-
 const allReferenceStore = useAllReferenceStore();
 const dashboardDetailStore = useDashboardDetailInfoStore();
 const dashboardDetailState = dashboardDetailStore.state;
@@ -98,6 +99,11 @@ const handleConfirmPerformanceDelay = () => {
 watch(() => storeState.workspaces, (workspaces) => {
     if (workspaces) initSelectedWorkspace();
 }, { immediate: true });
+
+onUnmounted(() => {
+    dashboardDetailStore.setSelectedWorkspaceId(undefined);
+    state.selectedWorkspaceItems = [];
+});
 </script>
 
 <template>
diff --git a/apps/web/src/services/_shared/dashboard/dashboard-detail/stores/dashboard-detail-info-store.ts b/apps/web/src/services/_shared/dashboard/dashboard-detail/stores/dashboard-detail-info-store.ts
index 9d4adc57c2..80d5b3358f 100644
--- a/apps/web/src/services/_shared/dashboard/dashboard-detail/stores/dashboard-detail-info-store.ts
+++ b/apps/web/src/services/_shared/dashboard/dashboard-detail/stores/dashboard-detail-info-store.ts
@@ -154,7 +154,6 @@ export const useDashboardDetailInfoStore = defineStore('dashboard-detail-info',
         setVariablesInitMap({});
         setLoadingWidgets(false);
         state.showDateRangeNotification = true;
-        state.selectedWorkspaceId = undefined;
     };
     const setDashboardInfoStoreStateV2 = (dashboardInfo?: DashboardModel) => {
         if (!dashboardInfo || isEmpty(dashboardInfo)) {