mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-11-17 08:20:12 +00:00
fix: stream logs of a selected step nested in a subflow or loop (#12334)
This commit is contained in:
@@ -108,6 +108,10 @@
|
||||
innerModule?: FlowModuleValue | undefined
|
||||
render?: boolean
|
||||
selectedNode?: string | undefined
|
||||
/** Job of the node selected in the root viewer's graph. Nested viewers have no
|
||||
* selectedNode of their own, so this is how a step inside a subflow, loop or retry
|
||||
* knows it is selected and must stream its logs. */
|
||||
selectedJobId?: string | undefined
|
||||
globalModuleStates: Record<string, GraphModuleState>[]
|
||||
globalDurationStatuses?: Record<string, DurationStatus>[]
|
||||
isSelectedBranch?: boolean
|
||||
@@ -169,6 +173,7 @@
|
||||
innerModule = undefined,
|
||||
render = true,
|
||||
selectedNode = $bindable(undefined),
|
||||
selectedJobId = undefined,
|
||||
globalModuleStates,
|
||||
globalDurationStatuses = [],
|
||||
updateRecursiveRefreshFn = undefined,
|
||||
@@ -1407,6 +1412,11 @@
|
||||
|
||||
let noLogs = $derived(graphTabOpen && !isNodeSelected)
|
||||
|
||||
// The root viewer's module states hold every nested step, prefixed for subflows.
|
||||
let effectiveSelectedJobId = $derived(
|
||||
selectedJobId ?? localModuleStates?.[selectedNode ?? '']?.job_id
|
||||
)
|
||||
|
||||
/**
|
||||
* Returns a string like "forloopmodid1-{iter1}-forloopmodid2-{iter2}-forloopmodid3-{iter3}-"
|
||||
* that can be used to prefix tool call store keys for nested tool calls.
|
||||
@@ -1668,6 +1678,7 @@
|
||||
}}
|
||||
{onResultStreamUpdate}
|
||||
graphTabOpen={selected == 'graph' && graphTabOpen}
|
||||
selectedJobId={effectiveSelectedJobId}
|
||||
isNodeSelected={forloop_selected == loopJobId}
|
||||
toolCallStore={{
|
||||
getStoredToolCallJob: (storeKey: string) =>
|
||||
@@ -1765,6 +1776,7 @@
|
||||
jobId={failedRetry}
|
||||
{onResultStreamUpdate}
|
||||
graphTabOpen={selected == 'graph' && graphTabOpen}
|
||||
selectedJobId={effectiveSelectedJobId}
|
||||
isNodeSelected={retry_selected == failedRetry}
|
||||
/>
|
||||
</div>
|
||||
@@ -1801,6 +1813,7 @@
|
||||
}}
|
||||
{onResultStreamUpdate}
|
||||
graphTabOpen={selected == 'graph' && graphTabOpen}
|
||||
selectedJobId={effectiveSelectedJobId}
|
||||
isNodeSelected={false}
|
||||
/>
|
||||
{:else if mod.flow_jobs?.length == 0 && mod.job == '00000000-0000-0000-0000-000000000000'}
|
||||
@@ -1842,7 +1855,8 @@
|
||||
}}
|
||||
{onResultStreamUpdate}
|
||||
graphTabOpen={selected == 'graph' && graphTabOpen}
|
||||
isNodeSelected={localModuleStates?.[selectedNode ?? '']?.job_id == mod.job}
|
||||
selectedJobId={effectiveSelectedJobId}
|
||||
isNodeSelected={effectiveSelectedJobId == mod.job}
|
||||
{toolCallStore}
|
||||
showLogsWithResult={['script', 'rawscript'].includes(
|
||||
job.raw_flow?.modules[i]?.value?.type ?? ''
|
||||
@@ -2085,7 +2099,11 @@
|
||||
wrapperClass={closableDetails ? 'grow min-w-0' : 'shrink-0'}
|
||||
>
|
||||
{#if !hideTimeline}
|
||||
<Tab value="timeline" label="Timeline" class={closableDetails ? 'px-0' : ''} />
|
||||
<Tab
|
||||
value="timeline"
|
||||
label="Timeline"
|
||||
class={closableDetails ? 'px-0' : ''}
|
||||
/>
|
||||
{/if}
|
||||
<Tab
|
||||
value="node_status"
|
||||
|
||||
Reference in New Issue
Block a user