From b73419e4978438b7b336ace61e35c81d6f4436a2 Mon Sep 17 00:00:00 2001 From: Maksim Gaponov Date: Mon, 13 Nov 2023 17:43:42 +0000 Subject: [PATCH 1/2] mergeChildrenCriticalPath shortcuts for an empty critical path Signed-off-by: Maksim Gaponov --- .../TracePage/TraceTimelineViewer/VirtualizedTraceView.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/VirtualizedTraceView.tsx b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/VirtualizedTraceView.tsx index f3ecb97879..5d26535a8e 100644 --- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/VirtualizedTraceView.tsx +++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/VirtualizedTraceView.tsx @@ -163,6 +163,9 @@ function mergeChildrenCriticalPath( spanID: string, criticalPath: criticalPathSection[] ): criticalPathSection[] { + if (criticalPath.length == 0) { + return criticalPath; + } // Define an array to store the IDs of the span and its descendants (if the span is collapsed) const allRequiredSpanIds = [spanID]; From adaad395e43e52cf917102afde354ef522ebd4de Mon Sep 17 00:00:00 2001 From: Maksim Gaponov Date: Mon, 13 Nov 2023 18:06:11 +0000 Subject: [PATCH 2/2] Refactor the fix Signed-off-by: Maksim Gaponov --- .../TracePage/TraceTimelineViewer/VirtualizedTraceView.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/VirtualizedTraceView.tsx b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/VirtualizedTraceView.tsx index 5d26535a8e..f1074f3131 100644 --- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/VirtualizedTraceView.tsx +++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/VirtualizedTraceView.tsx @@ -163,8 +163,8 @@ function mergeChildrenCriticalPath( spanID: string, criticalPath: criticalPathSection[] ): criticalPathSection[] { - if (criticalPath.length == 0) { - return criticalPath; + if (!criticalPath) { + return []; } // Define an array to store the IDs of the span and its descendants (if the span is collapsed) const allRequiredSpanIds = [spanID];