From 7ba428d5fc3c2b345c41063e081e5da914c981d8 Mon Sep 17 00:00:00 2001 From: Jen Huang Date: Thu, 1 Nov 2018 13:52:23 -0700 Subject: [PATCH 1/2] Fix invalid date histogram interval warning --- src/ui/public/time_buckets/time_buckets.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ui/public/time_buckets/time_buckets.js b/src/ui/public/time_buckets/time_buckets.js index 0da2fc868c977..b75eeaa31c17a 100644 --- a/src/ui/public/time_buckets/time_buckets.js +++ b/src/ui/public/time_buckets/time_buckets.js @@ -225,7 +225,13 @@ TimeBuckets.prototype.setInterval = function (input) { TimeBuckets.prototype.getInterval = function (useNormalizedEsInterval = true) { const self = this; const duration = self.getDuration(); - return decorateInterval(maybeScaleInterval(readInterval())); + const parsedInterval = readInterval(); + + if(useNormalizedEsInterval) { + return decorateInterval(maybeScaleInterval(parsedInterval)); + } else { + return decorateInterval(parsedInterval); + } // either pull the interval from state or calculate the auto-interval function readInterval() { @@ -251,6 +257,7 @@ TimeBuckets.prototype.getInterval = function (useNormalizedEsInterval = true) { if (+scaled === +interval) return interval; decorateInterval(interval); + decorateInterval(scaled); return _.assign(scaled, { preScaled: interval, scale: interval / scaled, From bf81179b5adcc793643346544ec33a358198e1f1 Mon Sep 17 00:00:00 2001 From: Jen Huang Date: Fri, 2 Nov 2018 14:22:36 -0700 Subject: [PATCH 2/2] Remove erroneous line --- src/ui/public/time_buckets/time_buckets.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ui/public/time_buckets/time_buckets.js b/src/ui/public/time_buckets/time_buckets.js index b75eeaa31c17a..a828b856b1dbd 100644 --- a/src/ui/public/time_buckets/time_buckets.js +++ b/src/ui/public/time_buckets/time_buckets.js @@ -257,7 +257,6 @@ TimeBuckets.prototype.getInterval = function (useNormalizedEsInterval = true) { if (+scaled === +interval) return interval; decorateInterval(interval); - decorateInterval(scaled); return _.assign(scaled, { preScaled: interval, scale: interval / scaled,