Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fleet] Handle errors happenning during Fleet setup in the UI #87185

Merged
merged 2 commits into from
Jan 4, 2021
Merged

[Fleet] Handle errors happenning during Fleet setup in the UI #87185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
454999b
[Fleet] Handle errors happenning during Fleet setup in the UI
nchaulet Jan 4, 2021
db7e438
Update x-pack/plugins/fleet/public/applications/fleet/sections/agents…
nchaulet Jan 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion x-pack/plugins/fleet/public/applications/fleet/hooks/use_fleet_status.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ interface FleetStatusState {
enabled: boolean;
isLoading: boolean;
isReady: boolean;
error?: Error;
missingRequirements?: GetFleetStatusResponse['missing_requirements'];
}

Expand Down Expand Up @@ -44,7 +45,7 @@ export const FleetStatusProvider: React.FC = ({ children }) => {
missingRequirements: res.data?.missing_requirements,
}));
} catch (error) {
setState((s) => ({ ...s, isLoading: true }));
setState((s) => ({ ...s, isLoading: false, error }));
}
}
useEffect(() => {
Expand Down
20 changes: 19 additions & 1 deletion x-pack/plugins/fleet/public/applications/fleet/sections/agents/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,18 @@
* you may not use this file except in compliance with the Elastic License.
*/
import React from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
import { HashRouter as Router, Route, Switch, Redirect } from 'react-router-dom';
import { PAGE_ROUTING_PATHS } from '../../constants';
import { Loading } from '../../components';
import { Loading, Error } from '../../components';
import { useConfig, useFleetStatus, useBreadcrumbs, useCapabilities } from '../../hooks';
import { AgentListPage } from './agent_list_page';
import { SetupPage } from './setup_page';
import { AgentDetailsPage } from './agent_details_page';
import { NoAccessPage } from './error_pages/no_access';
import { EnrollmentTokenListPage } from './enrollment_token_list_page';
import { ListLayout } from './components/list_layout';
import { WithoutHeaderLayout } from '../../layouts';

export const FleetApp: React.FunctionComponent = () => {
useBreadcrumbs('fleet');
Expand All @@ -27,6 +29,22 @@ export const FleetApp: React.FunctionComponent = () => {
return <Loading />;
}

if (fleetStatus.error) {
return (
<WithoutHeaderLayout>
<Error
title={
<FormattedMessage
id="xpack.fleet.agentsInitializationErrorMessageTitle"
defaultMessage="Unable to initialize central management for Elastic Agents"
/>
}
error={fleetStatus.error}
/>
</WithoutHeaderLayout>
);
}

if (fleetStatus.isReady === false) {
return (
<SetupPage
Expand Down