[Discover] Loading spinner cleanup (#79819) (#80673)

elastic · Oct 15, 2020 · d31c227 · d31c227
1 parent a849d73
commit d31c227
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git 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
@@ -22,14 +22,14 @@ 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" />
         </h2>
       </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
@@ -27,10 +27,10 @@ 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');
+  const config = getService('config');
+  const defaultFindTimeout = config.get('timeouts.find');
 
   class DiscoverPage {
     public async getChartTimespan() {
@@ -84,8 +84,7 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
     }
 
     public async waitUntilSearchingHasFinished() {
-      const spinner = await testSubjects.find('loadingSpinner');
-      await find.waitForElementHidden(spinner, defaultFindTimeout * 10);
+      await testSubjects.missingOrFail('loadingSpinner', { timeout: defaultFindTimeout * 10 });
     }
 
     public async getColumnHeaders() {