From 386a70f69c13be2e0389f1ace3c84dd195a7a6d2 Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Thu, 26 Nov 2020 15:45:21 +0100
Subject: [PATCH] [Discover] Fix navigating back when changing index pattern
 (#84061)

---
 .../public/application/angular/discover.js      |  6 +++---
 .../discover/_indexpattern_without_timefield.ts | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/plugins/discover/public/application/angular/discover.js b/src/plugins/discover/public/application/angular/discover.js
index 272c2f2ca6187..7059593c0c4e7 100644
--- a/src/plugins/discover/public/application/angular/discover.js
+++ b/src/plugins/discover/public/application/angular/discover.js
@@ -252,7 +252,8 @@ function discoverController($element, $route, $scope, $timeout, $window, Promise
     if (!_.isEqual(newStatePartial, oldStatePartial)) {
       $scope.$evalAsync(async () => {
         if (oldStatePartial.index !== newStatePartial.index) {
-          //in case of index switch the route has currently to be reloaded, legacy
+          //in case of index pattern switch the route has currently to be reloaded, legacy
+          $route.reload();
           return;
         }
 
@@ -289,8 +290,7 @@ function discoverController($element, $route, $scope, $timeout, $window, Promise
         $scope.state.sort,
         config.get(MODIFY_COLUMNS_ON_SWITCH)
       );
-      await replaceUrlAppState(nextAppState);
-      $route.reload();
+      await setAppState(nextAppState);
     }
   };
 
diff --git a/test/functional/apps/discover/_indexpattern_without_timefield.ts b/test/functional/apps/discover/_indexpattern_without_timefield.ts
index 677b27c31bd86..20d783690277f 100644
--- a/test/functional/apps/discover/_indexpattern_without_timefield.ts
+++ b/test/functional/apps/discover/_indexpattern_without_timefield.ts
@@ -20,6 +20,7 @@
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
+  const browser = getService('browser');
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
   const security = getService('security');
@@ -50,5 +51,21 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         throw new Error('Expected timepicker to exist');
       }
     });
+    it('should switch between with and without timefield using the browser back button', async () => {
+      await PageObjects.discover.selectIndexPattern('without-timefield');
+      if (await PageObjects.timePicker.timePickerExists()) {
+        throw new Error('Expected timepicker not to exist');
+      }
+
+      await PageObjects.discover.selectIndexPattern('with-timefield');
+      if (!(await PageObjects.timePicker.timePickerExists())) {
+        throw new Error('Expected timepicker to exist');
+      }
+      // Navigating back to discover
+      await browser.goBack();
+      if (await PageObjects.timePicker.timePickerExists()) {
+        throw new Error('Expected timepicker not to exist');
+      }
+    });
   });
 }