From 8264352bbe27c527e2738aaf95bf9c4e51fa294b Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Wed, 15 Apr 2020 08:33:10 +0200
Subject: [PATCH] [Discover] Fix broken setting of bucketInterval (#62939)

* Fix broken setting of bucketInterval, remove $watch

* Fix and adapt functional tests
---
 .../discover/np_ready/angular/discover.html   |  1 +
 .../discover/np_ready/angular/discover.js     | 14 +++----------
 .../apps/discover/_discover_histogram.js      | 20 +++++++++----------
 test/functional/page_objects/discover_page.ts |  5 +++++
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html
index d068e824a3e0a8..1221b01657e45f 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html
@@ -140,6 +140,7 @@ <h1 class="euiScreenReaderOnly">{{screenTitle}}</h1>
                         position="'top'"
                       ></icon-tip>
                       <span
+                        data-test-subj="discoverIntervalSelectScaledToDesc"
                         i18n-id="kbn.discover.scaledToDescription"
                         i18n-default-message="Scaled to {bucketIntervalDescription}"
                         i18n-values="{
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
index 630ba22d4f3a6f..d770e8334b3af9 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
@@ -675,17 +675,6 @@ function discoverController(
         }
       });
 
-      $scope.$watch('vis.aggs', function() {
-        // no timefield, no vis, nothing to update
-        if (!getTimeField() || !$scope.vis) return;
-
-        const buckets = $scope.vis.data.aggs.byTypeName('buckets');
-
-        if (buckets && buckets.length === 1) {
-          $scope.bucketInterval = buckets[0].buckets.getInterval();
-        }
-      });
-
       $scope.$watchMulti(
         ['rows', 'fetchStatus'],
         (function updateResultState() {
@@ -891,6 +880,9 @@ function discoverController(
         tabifiedData,
         getDimensions($scope.vis.data.aggs.aggs, $scope.timeRange)
       );
+      if ($scope.vis.data.aggs.aggs[1]) {
+        $scope.bucketInterval = $scope.vis.data.aggs.aggs[1].buckets.getInterval();
+      }
     }
 
     $scope.hits = resp.hits.total;
diff --git a/test/functional/apps/discover/_discover_histogram.js b/test/functional/apps/discover/_discover_histogram.js
index f815c505a8c277..eeef3333aab0fc 100644
--- a/test/functional/apps/discover/_discover_histogram.js
+++ b/test/functional/apps/discover/_discover_histogram.js
@@ -66,9 +66,8 @@ export default function({ getService, getPageObjects }) {
     });
 
     it('should visualize monthly data with different day intervals', async () => {
-      //Nov 1, 2017 @ 01:00:00.000 - Mar 21, 2018 @ 02:00:00.000
-      const fromTime = '2017-11-01 00:00:00.000';
-      const toTime = '2018-03-21 00:00:00.000';
+      const fromTime = 'Nov 01, 2017 @ 00:00:00.000';
+      const toTime = 'Mar 21, 2018 @ 00:00:00.000';
       await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
       await PageObjects.discover.setChartInterval('Monthly');
       await PageObjects.header.waitUntilLoadingHasFinished();
@@ -76,24 +75,25 @@ export default function({ getService, getPageObjects }) {
       expect(chartCanvasExist).to.be(true);
     });
     it('should visualize weekly data with within DST changes', async () => {
-      //Nov 1, 2017 @ 01:00:00.000 - Mar 21, 2018 @ 02:00:00.000
-      const fromTime = '2018-03-01 00:00:00.000';
-      const toTime = '2018-05-01 00:00:00.000';
+      const fromTime = 'Mar 01, 2018 @ 00:00:00.000';
+      const toTime = 'May 01, 2018 @ 00:00:00.000';
       await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
       await PageObjects.discover.setChartInterval('Weekly');
       await PageObjects.header.waitUntilLoadingHasFinished();
       const chartCanvasExist = await elasticChart.canvasExists();
       expect(chartCanvasExist).to.be(true);
     });
-    it('should visualize monthly data with different years Scaled to 30d', async () => {
-      //Nov 1, 2017 @ 01:00:00.000 - Mar 21, 2018 @ 02:00:00.000
-      const fromTime = '2010-01-01 00:00:00.000';
-      const toTime = '2018-03-21 00:00:00.000';
+    it('should visualize monthly data with different years Scaled to 30 days', async () => {
+      const fromTime = 'Jan 01, 2010 @ 00:00:00.000';
+      const toTime = 'Mar 21, 2019 @ 00:00:00.000';
+
       await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
       await PageObjects.discover.setChartInterval('Daily');
       await PageObjects.header.waitUntilLoadingHasFinished();
       const chartCanvasExist = await elasticChart.canvasExists();
       expect(chartCanvasExist).to.be(true);
+      const chartIntervalScaledDesc = await PageObjects.discover.getChartIntervalScaledToDesc();
+      expect(chartIntervalScaledDesc).to.be('Scaled to 30 days');
     });
   });
 }
diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts
index 00bf87621864ab..e43a7749403912 100644
--- a/test/functional/page_objects/discover_page.ts
+++ b/test/functional/page_objects/discover_page.ts
@@ -162,6 +162,11 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
       return selectedOption.getVisibleText();
     }
 
+    public async getChartIntervalScaledToDesc() {
+      await header.waitUntilLoadingHasFinished();
+      return await testSubjects.getVisibleText('discoverIntervalSelectScaledToDesc');
+    }
+
     public async setChartInterval(interval: string) {
       const optionElement = await find.byCssSelector(`option[label="${interval}"]`, 5000);
       await optionElement.click();