From 748c5355aa260d49e1620eb3a299b0f128d72708 Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Fri, 11 Jul 2025 16:00:36 +0800
Subject: [PATCH] chore: pass specail value to fetch vars

---
 .../workflow-app/components/workflow-main.tsx |  5 ++++-
 .../workflow-app/hooks/use-workflow-run.ts    |  7 ++++++-
 .../hooks/use-fetch-workflow-inspect-vars.ts  | 19 +++++++++++++------
 .../hooks/use-inspect-vars-crud-common.ts     |  1 -
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/web/app/components/workflow-app/components/workflow-main.tsx b/web/app/components/workflow-app/components/workflow-main.tsx
index f0b9bab2cf..8cd6005818 100644
--- a/web/app/components/workflow-app/components/workflow-main.tsx
+++ b/web/app/components/workflow-app/components/workflow-main.tsx
@@ -64,7 +64,10 @@ const WorkflowMain = ({
     handleWorkflowStartRunInChatflow,
     handleWorkflowStartRunInWorkflow,
   } = useWorkflowStartRun()
-  const { fetchInspectVars } = useSetWorkflowVarsWithValue()
+  const { fetchInspectVars } = useSetWorkflowVarsWithValue({
+    flowId: workflowStore.getState().appId,
+    ...useConfigsMap(),
+  })
   const {
     hasNodeInspectVars,
     hasSetInspectVar,
diff --git a/web/app/components/workflow-app/hooks/use-workflow-run.ts b/web/app/components/workflow-app/hooks/use-workflow-run.ts
index 4e7f5ef982..c303211715 100644
--- a/web/app/components/workflow-app/hooks/use-workflow-run.ts
+++ b/web/app/components/workflow-app/hooks/use-workflow-run.ts
@@ -21,6 +21,7 @@ import { noop } from 'lodash-es'
 import { useNodesSyncDraft } from './use-nodes-sync-draft'
 import { useInvalidAllLastRun } from '@/service/use-workflow'
 import { useSetWorkflowVarsWithValue } from '../../workflow/hooks/use-fetch-workflow-inspect-vars'
+import { useConfigsMap } from './use-configs-map'
 
 export const useWorkflowRun = () => {
   const store = useStoreApi()
@@ -32,7 +33,11 @@ export const useWorkflowRun = () => {
   const pathname = usePathname()
   const appId = useAppStore.getState().appDetail?.id
   const invalidAllLastRun = useInvalidAllLastRun(appId as string)
-  const { fetchInspectVars } = useSetWorkflowVarsWithValue()
+  const configsMap = useConfigsMap()
+  const { fetchInspectVars } = useSetWorkflowVarsWithValue({
+    flowId: appId as string,
+    ...configsMap,
+  })
 
   const {
     handleWorkflowStarted,
diff --git a/web/app/components/workflow/hooks/use-fetch-workflow-inspect-vars.ts b/web/app/components/workflow/hooks/use-fetch-workflow-inspect-vars.ts
index 07c2f3bd5f..27a9ea9d2d 100644
--- a/web/app/components/workflow/hooks/use-fetch-workflow-inspect-vars.ts
+++ b/web/app/components/workflow/hooks/use-fetch-workflow-inspect-vars.ts
@@ -6,12 +6,20 @@ import type { Node } from '@/app/components/workflow/types'
 import { fetchAllInspectVars } from '@/service/workflow'
 import { useInvalidateConversationVarValues, useInvalidateSysVarValues } from '@/service/use-workflow'
 import { useNodesInteractionsWithoutSync } from '@/app/components/workflow/hooks/use-nodes-interactions-without-sync'
-import { useConfigsMap } from '../../workflow-app/hooks/use-configs-map'
 
-export const useSetWorkflowVarsWithValue = () => {
+type Params = {
+  flowId: string
+  conversationVarsUrl: string
+  systemVarsUrl: string
+}
+
+export const useSetWorkflowVarsWithValue = ({
+  flowId,
+  conversationVarsUrl,
+  systemVarsUrl,
+}: Params) => {
   const workflowStore = useWorkflowStore()
   const store = useStoreApi()
-  const { conversationVarsUrl, systemVarsUrl } = useConfigsMap()
   const invalidateConversationVarValues = useInvalidateConversationVarValues(conversationVarsUrl)
   const invalidateSysVarValues = useInvalidateSysVarValues(systemVarsUrl)
   const { handleCancelAllNodeSuccessStatus } = useNodesInteractionsWithoutSync()
@@ -58,13 +66,12 @@ export const useSetWorkflowVarsWithValue = () => {
   }, [workflowStore, store])
 
   const fetchInspectVars = useCallback(async () => {
-    const { appId } = workflowStore.getState()
     invalidateConversationVarValues()
     invalidateSysVarValues()
-    const data = await fetchAllInspectVars(appId)
+    const data = await fetchAllInspectVars(flowId)
     setInspectVarsToStore(data)
     handleCancelAllNodeSuccessStatus() // to make sure clear node output show the unset status
-  }, [workflowStore, invalidateConversationVarValues, invalidateSysVarValues, setInspectVarsToStore, handleCancelAllNodeSuccessStatus])
+  }, [invalidateConversationVarValues, invalidateSysVarValues, flowId, setInspectVarsToStore, handleCancelAllNodeSuccessStatus])
   return {
     fetchInspectVars,
   }
diff --git a/web/app/components/workflow/hooks/use-inspect-vars-crud-common.ts b/web/app/components/workflow/hooks/use-inspect-vars-crud-common.ts
index f0d8a762db..ffcfd81666 100644
--- a/web/app/components/workflow/hooks/use-inspect-vars-crud-common.ts
+++ b/web/app/components/workflow/hooks/use-inspect-vars-crud-common.ts
@@ -31,7 +31,6 @@ export const useInspectVarsCrudCommon = ({
   systemVarsUrl,
 }: Params) => {
   const workflowStore = useWorkflowStore()
-  console.log(conversationVarsUrl, flowId)
   const invalidateConversationVarValues = useInvalidateConversationVarValues(conversationVarsUrl!)
   const { mutateAsync: doResetConversationVar } = useResetConversationVar(flowId)
   const { mutateAsync: doResetToLastRunValue } = useResetToLastRunValue(flowId)