From d7c0ca852e7ad2288868286b28013c3e3a0713b5 Mon Sep 17 00:00:00 2001 From: Yi Date: Fri, 30 Aug 2024 20:08:57 +0800 Subject: [PATCH] feat: inner parallels will be added to its corresponding branch --- web/app/components/workflow/run/tracing-panel.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/web/app/components/workflow/run/tracing-panel.tsx b/web/app/components/workflow/run/tracing-panel.tsx index 344af50552..97e0c95db5 100644 --- a/web/app/components/workflow/run/tracing-panel.tsx +++ b/web/app/components/workflow/run/tracing-panel.tsx @@ -77,10 +77,12 @@ function buildLogTree(nodes: NodeTracing[]): TracingNodeProps[] { let parallel_id = node.execution_metadata?.parallel_id ?? null const parent_parallel_id = node.execution_metadata?.parent_parallel_id ?? null let parallel_start_node_id = node.execution_metadata?.parallel_start_node_id ?? null + const parent_parallel_start_node_id = node.execution_metadata?.parent_parallel_start_node_id ?? null if (node.node_type === BlockEnum.Iteration) { parallel_id = node.parallel_id ?? null parallel_start_node_id = node.parallel_start_node_id ?? null + console.log(node) } if (!parallel_id) { @@ -103,7 +105,10 @@ function buildLogTree(nodes: NodeTracing[]): TracingNodeProps[] { parallelStacks[parallel_id] = newParallelGroup if (parent_parallel_id && parallelStacks[parent_parallel_id]) { - parallelStacks[parent_parallel_id].children.push(newParallelGroup) + const sameBranchIndex = parallelStacks[parent_parallel_id].children.findLastIndex(c => + c.data?.execution_metadata.parallel_start_node_id === parent_parallel_start_node_id, + ) + parallelStacks[parent_parallel_id].children.splice(sameBranchIndex + 1, 0, newParallelGroup) newParallelGroup.parallelTitle = getParallelTitle(parent_parallel_id) } else { @@ -123,7 +128,7 @@ function buildLogTree(nodes: NodeTracing[]): TracingNodeProps[] { } else { const sameBranchIndex = parallelStacks[parallel_id].children.findLastIndex(c => - c.data?.execution_metadata.parallel_start_node_id === node.execution_metadata?.parallel_start_node_id, + c.data?.execution_metadata.parallel_start_node_id === parallel_start_node_id, ) parallelStacks[parallel_id].children.splice(sameBranchIndex + 1, 0, { id: node.id,