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 88249dc7f5..9af0ebe9a3 100644 --- a/web/app/components/workflow-app/hooks/use-workflow-run.ts +++ b/web/app/components/workflow-app/hooks/use-workflow-run.ts @@ -675,6 +675,7 @@ export const useWorkflowRun = () => { const handleStopRun = useCallback((taskId: string) => { const setStoppedState = () => { const { + workflowRunningData, setWorkflowRunningData, setIsListening, setShowVariableInspectPanel, @@ -682,16 +683,27 @@ export const useWorkflowRun = () => { setListeningTriggerNodeId, } = workflowStore.getState() - setWorkflowRunningData({ - result: { - status: WorkflowRunningStatus.Stopped, - inputs_truncated: false, - process_data_truncated: false, - outputs_truncated: false, - }, - tracing: [], - resultText: '', - }) + if (workflowRunningData) { + setWorkflowRunningData({ + ...workflowRunningData, + result: { + ...workflowRunningData.result, + status: WorkflowRunningStatus.Stopped, + }, + }) + } + else { + setWorkflowRunningData({ + result: { + status: WorkflowRunningStatus.Stopped, + inputs_truncated: false, + process_data_truncated: false, + outputs_truncated: false, + }, + tracing: [], + resultText: '', + }) + } setIsListening(false) setListeningTriggerType(null) setListeningTriggerNodeId(null) diff --git a/web/app/components/workflow/panel/workflow-preview.tsx b/web/app/components/workflow/panel/workflow-preview.tsx index cf739d738e..d631f96caa 100644 --- a/web/app/components/workflow/panel/workflow-preview.tsx +++ b/web/app/components/workflow/panel/workflow-preview.tsx @@ -63,6 +63,10 @@ const WorkflowPreview = () => { return 'TRACING' })() + const shouldShowTracingLoading = effectiveTab === 'TRACING' + && !workflowRunningData?.tracing?.length + && (workflowRunningData?.result?.status === WorkflowRunningStatus.Running || !workflowRunningData?.result) + const handleTabChange = (tab: string) => { setUserSelectedTab(tab) } @@ -258,7 +262,7 @@ const WorkflowPreview = () => { /> ) : null} - {effectiveTab === 'TRACING' && !workflowRunningData?.tracing?.length + {shouldShowTracingLoading ? (