maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Discover] Loading spinner cleanup (#79819)

Browse source
This commit is contained in:
Matthias Wilhelm 2020-10-12 20:11:20 +02:00 committed by GitHub
parent 591585df17
commit 3f3589d74b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/plugins/discover/public/application/components/discover_legacy.tsx
View file

@ -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} />

4
src/plugins/discover/public/application/components/loading_spinner/loading_spinner.tsx
View file

@ -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>
);
}

7
test/functional/page_objects/discover_page.ts
View file

@ -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() {