From b992bdb62dca2b3007767b34934047c537a9d43a Mon Sep 17 00:00:00 2001 From: Adela Almasan <88068998+adela-almasan@users.noreply.github.com> Date: Fri, 21 Apr 2023 15:50:45 -0500 Subject: [PATCH] Annotations: Avoid crash when listing panels (that are rows) (#66869) --- .../components/AnnotationSettings/AnnotationSettingsEdit.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx b/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx index c02049a8be3..2cf14413013 100644 --- a/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx +++ b/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx @@ -142,6 +142,10 @@ export const AnnotationSettingsEdit = ({ editIdx, dashboard }: Props) => { const panels: Array> = useMemo( () => dashboard?.panels + // Filtering out rows at the moment, revisit to only include panels that support annotations + // However the information to know if a panel supports annotations requires it to be already loaded + // panel.plugin?.dataSupport?.annotations + .filter((panel) => config.panels[panel.type]) .map((panel) => ({ value: panel.id, label: panel.title ?? `Panel ${panel.id}`,