Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

AnnotationWindow renders appropriately

pull/10616/head
Luke Morris 2018-02-19 10:09:32 -08:00
parent fe24ba6dfc
commit b1096b2ba2
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/src/shared/annotations/styles.js
View File

@ -193,21 +193,22 @@ export const annotationWindowStyle = (annotation, dygraph) => {
// TODO: export and test this function // TODO: export and test this function
const [startX, endX] = dygraph.xAxisRange() const [startX, endX] = dygraph.xAxisRange()
const containerLeftPadding = 16 const containerLeftPadding = 16
const windowEnd = Number(annotation.time) + Number(annotation.duration) const startTime = +annotation.startTime
const endTime = +annotation.endTime
let windowStartXCoord = dygraph.toDomXCoord(annotation.time) let windowStartXCoord = dygraph.toDomXCoord(startTime)
let windowEndXCoord = dygraph.toDomXCoord(windowEnd) let windowEndXCoord = dygraph.toDomXCoord(endTime)
let visibility = 'visible' let visibility = 'visible'
if (annotation.time < startX) { if (startTime < startX) {
windowStartXCoord = dygraph.toDomXCoord(startX) windowStartXCoord = dygraph.toDomXCoord(startX)
} }
if (windowEnd > endX) { if (endTime > endX) {
windowEndXCoord = dygraph.toDomXCoord(endX) windowEndXCoord = dygraph.toDomXCoord(endX)
} }
if (windowEnd < startX || annotation.time > endX) { if (endTime < startX || startTime > endX) {
visibility = 'hidden' visibility = 'hidden'
} }

9
ui/src/shared/components/Annotations.js
View File

@ -75,10 +75,11 @@ class Annotations extends Component {
onDeleteAnnotation={handleDeleteAnnotation} onDeleteAnnotation={handleDeleteAnnotation}
/> />
)} )}
{annotations.map((a, i) => { {annotations.filter(a => !a.id.includes('-end')).map((a, i) => {
return a.duration return (
? <AnnotationWindow key={i} annotation={a} dygraph={dygraph} /> a.startTime !== a.endTime &&
: null <AnnotationWindow key={i} annotation={a} dygraph={dygraph} />
)
})} })}
</div> </div>
) )