From db19afd71154612b1c26ad7dd6480717fe470078 Mon Sep 17 00:00:00 2001 From: elijahbenizzy Date: Mon, 16 Dec 2024 10:59:45 -0800 Subject: [PATCH 1/3] Fixes issue with Burr demo The mini-telemetry never showed up -- this is because we relied on annotations being loaded but skipped them if the BE does not support it. --- telemetry/ui/src/components/routes/app/AppView.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/telemetry/ui/src/components/routes/app/AppView.tsx b/telemetry/ui/src/components/routes/app/AppView.tsx index d7f4c7a9..f86bc2b9 100644 --- a/telemetry/ui/src/components/routes/app/AppView.tsx +++ b/telemetry/ui/src/components/routes/app/AppView.tsx @@ -392,8 +392,9 @@ export const AppView = (props: { } if (error) return
Error loading steps
; - if (data === undefined || backendSpec === undefined || annotationsData === undefined) + if (data === undefined || backendSpec === undefined) { return ; + } const displayAnnotations = props.allowAnnotations && backendSpec.supports_annotations; // TODO -- re-enable this if I want... // const previousActions = @@ -513,7 +514,7 @@ export const AppView = (props: { setTopToBottomChronological={setTopToBottomChronological} toggleInspectViewOpen={() => setInspectViewOpen(!inspectViewOpen)} displayAnnotations={displayAnnotations} - annotations={annotationsData} + annotations={annotationsData || []} /> {!fullScreen && props.orientation === 'stacked_horizontal' && ( From d073e7fd39865a7d0a6a3802e3dbaf3b7fb4f2b1 Mon Sep 17 00:00:00 2001 From: elijahbenizzy Date: Mon, 16 Dec 2024 11:37:28 -0800 Subject: [PATCH 2/3] Fixes embedded sub-table-row Previously we had a weird flex that caused the table row to be overly tall. This fixes it. --- telemetry/ui/src/components/routes/app/StepList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telemetry/ui/src/components/routes/app/StepList.tsx b/telemetry/ui/src/components/routes/app/StepList.tsx index 9d9c7eee..cf2cd995 100644 --- a/telemetry/ui/src/components/routes/app/StepList.tsx +++ b/telemetry/ui/src/components/routes/app/StepList.tsx @@ -652,7 +652,7 @@ const StepSubTableRow = (props: { setCurrentSelectedIndex={setCurrentSelectedIndex} > {spanIDUniqueToAction} From 2bbcd45a2fc3199c78f4d3d403aad8a922518a45 Mon Sep 17 00:00:00 2001 From: elijahbenizzy Date: Mon, 16 Dec 2024 11:43:20 -0800 Subject: [PATCH 3/3] Fixes table row that didn't expand the whole length --- telemetry/ui/src/components/routes/app/StepList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telemetry/ui/src/components/routes/app/StepList.tsx b/telemetry/ui/src/components/routes/app/StepList.tsx index cf2cd995..c5276111 100644 --- a/telemetry/ui/src/components/routes/app/StepList.tsx +++ b/telemetry/ui/src/components/routes/app/StepList.tsx @@ -735,7 +735,7 @@ const StepSubTableRow = (props: { )} - {props.displayAnnotations && } + ) : (