From 7181811f96f54bc6a88b84f28e0a2e86040b5201 Mon Sep 17 00:00:00 2001 From: Dominik Prokop Date: Thu, 7 Dec 2023 15:33:56 +0100 Subject: [PATCH] AnnotationsMarker: Fix non-null assertion operator usage (#79205) --- .../timeseries/plugins/annotations/AnnotationMarker.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx b/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx index 4c5f312f171..6a936dbbfeb 100644 --- a/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx +++ b/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx @@ -35,7 +35,7 @@ const POPPER_CONFIG = { }; export function AnnotationMarker({ annotation, timeZone, width }: Props) { - const { canAddAnnotations, canEditAnnotations, canDeleteAnnotations, ...panelCtx } = usePanelContext(); + const { canEditAnnotations, canDeleteAnnotations, ...panelCtx } = usePanelContext(); const commonStyles = useStyles2(getCommonAnnotationStyles); const styles = useStyles2(getStyles); @@ -97,11 +97,12 @@ export function AnnotationMarker({ annotation, timeZone, width }: Props) { timeFormatter={timeFormatter} onEdit={onAnnotationEdit} onDelete={onAnnotationDelete} - canEdit={canEditAnnotations!(annotation.dashboardUID)} - canDelete={canDeleteAnnotations!(annotation.dashboardUID)} + canEdit={canEditAnnotations ? canEditAnnotations(annotation.dashboardUID) : false} + canDelete={canDeleteAnnotations ? canDeleteAnnotations(annotation.dashboardUID) : false} /> ); }, [canEditAnnotations, canDeleteAnnotations, onAnnotationDelete, onAnnotationEdit, timeFormatter, annotation]); + const isRegionAnnotation = Boolean(annotation.isRegion) && width > MIN_REGION_ANNOTATION_WIDTH; let left = `${width / 2}px`;