From 33c260b216eace15aa6f5bd98aeeef96f21edcf0 Mon Sep 17 00:00:00 2001
From: Matt Bargar <mbargar@gmail.com>
Date: Fri, 6 Dec 2019 13:04:26 -0500
Subject: [PATCH] Preserve currently loaded Saved Query in Discover when page
 reloads (#52323)

* Fix import

* Add test that would have failed with previous bug
---
 .../kibana/public/discover/angular/discover.js       |  4 ++--
 test/functional/apps/discover/_saved_queries.js      | 12 ++++++++++++
 .../services/saved_query_management_component.ts     |  9 +++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/angular/discover.js
index 7abb7166aa902a4..ec0c5c34f7a9360 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/discover.js
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/discover.js
@@ -79,7 +79,7 @@ import { getIndexPatternId } from '../helpers/get_index_pattern_id';
 import { registerTimefilterWithGlobalStateFactory } from '../../../../../ui/public/timefilter/setup_router';
 import { FilterStateManager } from '../../../../data/public/filter/filter_manager';
 
-const { savedQueryService } = data.query.savedQueries;
+const { getSavedQuery } = data.query.savedQueries;
 
 const fetchStatuses = {
   UNINITIALIZED: 'uninitialized',
@@ -972,7 +972,7 @@ function discoverController(
       return;
     }
     if (!$scope.savedQuery || newSavedQueryId !== $scope.savedQuery.id) {
-      savedQueryService.getSavedQuery(newSavedQueryId).then((savedQuery) => {
+      getSavedQuery(newSavedQueryId).then((savedQuery) => {
         $scope.$evalAsync(() => {
           $scope.savedQuery = savedQuery;
           updateStateFromSavedQuery(savedQuery);
diff --git a/test/functional/apps/discover/_saved_queries.js b/test/functional/apps/discover/_saved_queries.js
index 8fbc40f86e8dca1..3ae8f51fb76dcb7 100644
--- a/test/functional/apps/discover/_saved_queries.js
+++ b/test/functional/apps/discover/_saved_queries.js
@@ -24,6 +24,7 @@ export default function ({ getService, getPageObjects }) {
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
   const PageObjects = getPageObjects(['common', 'discover', 'timePicker']);
+  const browser = getService('browser');
 
   const defaultSettings = {
     defaultIndex: 'logstash-*',
@@ -86,6 +87,17 @@ export default function ({ getService, getPageObjects }) {
         expect(timePickerValues.end).to.not.eql(PageObjects.timePicker.defaultEndTime);
       });
 
+      it('preserves the currently loaded query when the page is reloaded', async () => {
+        await browser.refresh();
+        const timePickerValues = await PageObjects.timePicker.getTimeConfigAsAbsoluteTimes();
+        expect(await filterBar.hasFilter('extension.raw', 'jpg')).to.be(true);
+        expect(timePickerValues.start).to.not.eql(PageObjects.timePicker.defaultStartTime);
+        expect(timePickerValues.end).to.not.eql(PageObjects.timePicker.defaultEndTime);
+        expect(await PageObjects.discover.getHitCount()).to.be('2,792');
+        expect(await savedQueryManagementComponent.getCurrentlyLoadedQueryID()).to.be('OkResponse');
+      });
+
+
       it('allows saving changes to a currently loaded query via the saved query management component', async () => {
         await queryBar.setQuery('response:404');
         await savedQueryManagementComponent.updateCurrentlyLoadedQuery(
diff --git a/test/functional/services/saved_query_management_component.ts b/test/functional/services/saved_query_management_component.ts
index d6de0be0c172e65..9f0a8ded649b2cf 100644
--- a/test/functional/services/saved_query_management_component.ts
+++ b/test/functional/services/saved_query_management_component.ts
@@ -26,6 +26,15 @@ export function SavedQueryManagementComponentProvider({ getService }: FtrProvide
   const retry = getService('retry');
 
   class SavedQueryManagementComponent {
+    public async getCurrentlyLoadedQueryID() {
+      await this.openSavedQueryManagementComponent();
+      try {
+        return await testSubjects.getVisibleText('~saved-query-list-item-selected');
+      } catch {
+        return undefined;
+      }
+    }
+
     public async saveNewQuery(
       name: string,
       description: string,