From 3fbffcb8e01262c43a994c71afddb1cd980481af Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Wed, 7 Oct 2020 09:43:24 +0200
Subject: [PATCH] Discover loading spinner cleanup

---
 .../public/application/components/discover_legacy.tsx     | 7 +------
 .../components/loading_spinner/loading_spinner.tsx        | 4 ++--
 test/functional/page_objects/discover_page.ts             | 8 ++++----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/plugins/discover/public/application/components/discover_legacy.tsx b/src/plugins/discover/public/application/components/discover_legacy.tsx
index de1faaf9fc19d..139b2ca69d9e4 100644
--- a/src/plugins/discover/public/application/components/discover_legacy.tsx
+++ b/src/plugins/discover/public/application/components/discover_legacy.tsx
@@ -211,12 +211,7 @@ export function DiscoverLegacy({
                 />
               )}
               {resultState === 'uninitialized' && <DiscoverUninitialized onRefresh={fetch} />}
-              {/* @TODO: Solved in the Angular way to satisfy functional test - should be improved*/}
-              <span style={{ display: resultState !== 'loading' ? 'none' : '' }}>
-                <div className="dscOverlay">
-                  <LoadingSpinner />
-                </div>
-              </span>
+              {resultState === 'loading' && <LoadingSpinner />}
               {resultState === 'ready' && (
                 <div className="dscWrapper__content">
                   <SkipBottomButton onClick={onSkipBottomButtonClick} />
diff --git a/src/plugins/discover/public/application/components/loading_spinner/loading_spinner.tsx b/src/plugins/discover/public/application/components/loading_spinner/loading_spinner.tsx
index 4e1754638d479..e3cc396783628 100644
--- a/src/plugins/discover/public/application/components/loading_spinner/loading_spinner.tsx
+++ b/src/plugins/discover/public/application/components/loading_spinner/loading_spinner.tsx
@@ -22,7 +22,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 export function LoadingSpinner() {
   return (
-    <>
+    <div className="dscOverlay">
       <EuiTitle size="s" data-test-subj="loadingSpinnerText">
         <h2>
           <FormattedMessage id="discover.searchingTitle" defaultMessage="Searching" />
@@ -30,6 +30,6 @@ export function LoadingSpinner() {
       </EuiTitle>
       <EuiSpacer size="m" />
       <EuiLoadingSpinner size="l" data-test-subj="loadingSpinner" />
-    </>
+    </div>
   );
 }
diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts
index e522f41952a49..1f5248e1b10ae 100644
--- a/test/functional/page_objects/discover_page.ts
+++ b/test/functional/page_objects/discover_page.ts
@@ -27,8 +27,6 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
   const { header } = getPageObjects(['header']);
   const browser = getService('browser');
   const globalNav = getService('globalNav');
-  const config = getService('config');
-  const defaultFindTimeout = config.get('timeouts.find');
   const elasticChart = getService('elasticChart');
   const docTable = getService('docTable');
 
@@ -84,8 +82,10 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
     }
 
     public async waitUntilSearchingHasFinished() {
-      const spinner = await testSubjects.find('loadingSpinner');
-      await find.waitForElementHidden(spinner, defaultFindTimeout * 10);
+      await retry.waitFor('loading spinner doesnt exist', async () => {
+        const spinner = await testSubjects.exists('loadingSpinner');
+        return !spinner;
+      });
     }
 
     public async getColumnHeaders() {