Skip to content

[6.x][BeatsCM] Backport refactor fixes #27034

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
mattapperson merged 2 commits into from
Dec 17, 2018
Merged

[6.x][BeatsCM] Backport refactor fixes #27034

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
0680efa
wrap non error in a try/catch (#26898)
mattapperson Dec 10, 2018
bb8ba90
[Beats CM] Add basic license type (#26935)
mattapperson Dec 11, 2018
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
4 changes: 2 additions & 2 deletions x-pack/plugins/beats_management/common/constants/security.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@

export const REQUIRED_ROLES = ['beats_admin'];
export const REQUIRED_LICENSES = ['standard', 'gold', 'trial', 'platinum'];
export const LICENSES = ['oss', 'standard', 'gold', 'trial', 'platinum'];
export type LicenseType = 'oss' | 'trial' | 'standard' | 'basic' | 'gold' | 'platinum';
export const LICENSES = ['oss', 'basic', 'standard', 'gold', 'trial', 'platinum'];
export type LicenseType = 'oss' | 'basic' | 'trial' | 'standard' | 'basic' | 'gold' | 'platinum';
8 changes: 6 additions & 2 deletions x-pack/plugins/beats_management/public/router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,12 @@ export class AppRouter extends Component<RouterProps, RouterState> {

public async componentWillMount() {
if (this.state.loadingStatus === 'loading') {
await this.props.beatsContainer.reload();
await this.props.tagsContainer.reload();
try {
await this.props.beatsContainer.reload();
await this.props.tagsContainer.reload();
} catch (e) {
// TODO in a furture version we will better manage this "error" in a returned arg
}

const countOfEverything =
this.props.beatsContainer.state.list.length + this.props.tagsContainer.state.list.length;
Expand Down