Skip to content

[Beats CM] Fix beat list redirect to welcome page #24146

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

Merged
merged 1 commit into from
Oct 17, 2018
Merged

[Beats CM] Fix beat list redirect to welcome page #24146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions x-pack/plugins/beats_management/public/pages/main/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ interface MainPagesState {
enrollmentToken: string;
} | null;
beats: CMPopulatedBeat[];
unfilteredBeats: CMPopulatedBeat[];
loadedBeatsAtLeastOnce: boolean;
}

Expand All @@ -50,6 +51,7 @@ class MainPagesComponent extends React.PureComponent<MainPagesProps, MainPagesSt
this.state = {
loadedBeatsAtLeastOnce: false,
beats: [],
unfilteredBeats: [],
};
}
public onSelectedTabChanged = (id: string) => {
Expand All @@ -68,7 +70,7 @@ class MainPagesComponent extends React.PureComponent<MainPagesProps, MainPagesSt
public render() {
if (
this.state.loadedBeatsAtLeastOnce &&
this.state.beats.length === 0 &&
this.state.unfilteredBeats.length === 0 &&
!this.props.location.pathname.includes('/overview/initial')
) {
return <Redirect to="/overview/initial/help" />;
Expand Down Expand Up @@ -231,15 +233,21 @@ class MainPagesComponent extends React.PureComponent<MainPagesProps, MainPagesSt
}

let beats: CMPopulatedBeat[];
let unfilteredBeats: CMPopulatedBeat[];
try {
beats = await this.props.libs.beats.getAll(query);
[beats, unfilteredBeats] = await Promise.all([
this.props.libs.beats.getAll(query),
this.props.libs.beats.getAll(),
]);
} catch (e) {
beats = [];
unfilteredBeats = [];
}
if (this.mounted) {
this.setState({
loadedBeatsAtLeastOnce: true,
beats,
unfilteredBeats,
});
}
};
Expand Down