IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use annotations data observable (#28050)

Browse Source
This commit is contained in:
Dominik Prokop 2020-10-06 12:43:45 +02:00 committed by GitHub
parent aa6c98f7ff
commit 810c327e31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/app/plugins/panel/graph3/plugins/AnnotationsPlugin.tsx
View File

@ -4,6 +4,7 @@ import { getAnnotationsFromData } from 'app/features/annotations/standardAnnotat
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { css } from 'emotion';
import { AnnotationMarker } from './AnnotationMarker';
import { useObservable } from 'react-use';
interface AnnotationsPluginProps {
annotations: DataFrame[];
@ -14,7 +15,7 @@ export const AnnotationsPlugin: React.FC<AnnotationsPluginProps> = ({ annotation
const pluginId = 'AnnotationsPlugin';
const pluginsApi = usePlotPluginContext();
const plotContext = usePlotContext();
const annotationsRef = useRef<AnnotationEvent[] | null>(null);
const annotationsRef = useRef<AnnotationEvent[]>();
const [renderCounter, setRenderCounter] = useState(0);
const theme = useTheme();
@ -28,15 +29,17 @@ export const AnnotationsPlugin: React.FC<AnnotationsPluginProps> = ({ annotation
[timeZone]
);
const annotationsData = useMemo(() => {
return getAnnotationsFromData(annotations);
}, [annotations]);
const annotationEventsStream = useMemo(() => getAnnotationsFromData(annotations), [annotations]);
const annotationsData = useObservable<AnnotationEvent[]>(annotationEventsStream);
const annotationMarkers = useMemo(() => {
if (!plotContext || !plotContext?.u) {
return null;
}
const markers = [];
const markers: AnnotationEvent[] = [];
if (!annotationsData) {
return markers;
}
for (let i = 0; i < annotationsData.length; i++) {
const annotation = annotationsData[i];