From bde5499552ca7a273f1fc39905192a85579f99ac Mon Sep 17 00:00:00 2001 From: Tyler Tolley Date: Fri, 2 Feb 2018 07:29:54 -0700 Subject: [PATCH 1/2] #10724 Fix finding the x bucket --- public/app/plugins/panel/heatmap/heatmap_tooltip.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/public/app/plugins/panel/heatmap/heatmap_tooltip.ts b/public/app/plugins/panel/heatmap/heatmap_tooltip.ts index 17621dfe398..a1f8691f84f 100644 --- a/public/app/plugins/panel/heatmap/heatmap_tooltip.ts +++ b/public/app/plugins/panel/heatmap/heatmap_tooltip.ts @@ -153,7 +153,15 @@ export class HeatmapTooltip { getXBucketIndex(offsetX, data) { let x = this.scope.xScale.invert(offsetX - this.scope.yAxisWidth).valueOf(); - let xBucketIndex = getValueBucketBound(x, data.xBucketSize, 1); + let xBucket = _.find(data.buckets, (bucket, bucketIndex) => { + return x-bucket.x <= data.xBucketSize && x-bucket.x >0; + }); + let xBucketIndex; + if(!xBucket) + xBucketIndex = getValueBucketBound(x, data.xBucketSize, 1); + else + xBucketIndex = xBucket.x; + return xBucketIndex; } From ca3c1d8c631c1d04f2db7d4a50c9faccc34a2dc2 Mon Sep 17 00:00:00 2001 From: Tyler Tolley Date: Fri, 2 Feb 2018 09:31:05 -0700 Subject: [PATCH 2/2] #10724 Fix whitespace --- public/app/plugins/panel/heatmap/heatmap_tooltip.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/app/plugins/panel/heatmap/heatmap_tooltip.ts b/public/app/plugins/panel/heatmap/heatmap_tooltip.ts index a1f8691f84f..81bac685d3a 100644 --- a/public/app/plugins/panel/heatmap/heatmap_tooltip.ts +++ b/public/app/plugins/panel/heatmap/heatmap_tooltip.ts @@ -157,11 +157,11 @@ export class HeatmapTooltip { return x-bucket.x <= data.xBucketSize && x-bucket.x >0; }); let xBucketIndex; - if(!xBucket) + if (!xBucket) { xBucketIndex = getValueBucketBound(x, data.xBucketSize, 1); - else + } else { xBucketIndex = xBucket.x; - + } return xBucketIndex; }