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

[Stack Monitoring] Fix blank page between loading page and overview (#114550)

Browse source 
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Zacqary Adam Xeper 2021-10-12 10:23:01 -05:00 committed by GitHub
parent f4ef2b116b
commit 435404e961
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
x-pack/plugins/monitoring/public/application/pages/loading_page.tsx
View file

@ -15,12 +15,20 @@ import { CODE_PATH_ELASTICSEARCH } from '../../../common/constants';
const CODE_PATHS = [CODE_PATH_ELASTICSEARCH];
export const LoadingPage = () => {
export const LoadingPage = ({ staticLoadingState }: { staticLoadingState?: boolean }) => {
const { clusters, loaded } = useClusters(null, undefined, CODE_PATHS);
const title = i18n.translate('xpack.monitoring.loading.pageTitle', {
defaultMessage: 'Loading',
});
if (staticLoadingState) {
return (
<PageTemplate title={title}>
<PageLoading />;
</PageTemplate>
);
}
return (
<PageTemplate title={title}>
{loaded === false ? <PageLoading /> : renderRedirections(clusters)}

5
x-pack/plugins/monitoring/public/application/route_init.tsx
View file

@ -9,6 +9,7 @@ import { Route, Redirect, useLocation } from 'react-router-dom';
import { useClusters } from './hooks/use_clusters';
import { GlobalStateContext } from './contexts/global_state_context';
import { getClusterFromClusters } from '../lib/get_cluster_from_clusters';
import { LoadingPage } from './pages/loading_page';
export interface ComponentProps {
clusters: [];
@ -66,7 +67,9 @@ export const RouteInit: React.FC<RouteInitProps> = ({
<Route path={path}>
<Component clusters={clusters} />
</Route>
) : null;
) : (
<LoadingPage staticLoadingState />
);
};
const isExpired = (license: any): boolean => {