Skip to content

Commit

Permalink
update eui to 4.5.1 (elastic#24218)
Browse files Browse the repository at this point in the history
* update eui to 4.5.1

* icons declared for logging / infra

* remove eui types that are now in EUI directly

* clean up duplicated EUI typescript definitions

* Fix EuiSelect usage in beats enrollment
  • Loading branch information
snide committed Oct 20, 2018
1 parent 6b4b0fe commit ab29946
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 40 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"**/@types/node": "8.10.21"
},
"dependencies": {
"@elastic/eui": "4.4.1",
"@elastic/eui": "4.5.1",
"@elastic/filesaver": "1.1.2",
"@elastic/numeral": "2.3.2",
"@elastic/ui-ace": "0.2.3",
Expand Down
2 changes: 1 addition & 1 deletion x-pack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
},
"dependencies": {
"@elastic/datemath": "^4.0.2",
"@elastic/eui": "4.4.1",
"@elastic/eui": "4.5.1",
"@elastic/node-crypto": "0.1.2",
"@elastic/node-phantom-simple": "2.2.4",
"@elastic/numeral": "2.3.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ export class EnrollBeat extends React.Component<BeatsProps, any> {
<EuiSelect
value={this.state.beatType}
options={[
{ value: 'filebeat', label: 'Filebeat' },
{ value: 'metricbeat', label: 'Metricbeat' },
{ value: 'filebeat', text: 'Filebeat' },
{ value: 'metricbeat', text: 'Metricbeat' },
]}
onChange={(e: any) => this.setState({ beatType: e.target.value })}
fullWidth={true}
Expand All @@ -149,17 +149,17 @@ export class EnrollBeat extends React.Component<BeatsProps, any> {
options={[
{
value: `sudo ${this.state.beatType}`,
label: 'DEB / RPM',
text: 'DEB / RPM',
},
{
value: `PS C:\\Program Files\\${capitalize(this.state.beatType)}> ${
this.state.beatType
}.exe`,
label: 'Windows',
text: 'Windows',
},
{
value: `./${this.state.beatType}`,
label: 'MacOS',
text: 'MacOS',
},
]}
onChange={(e: any) => this.setState({ command: e.target.value })}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/infra/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export function infra(kibana: any) {
euiIconType: 'infraApp',
id: 'infra:home',
order: 8000,
title: 'InfraOps',
title: 'Infra Ops',
url: `/app/${APP_ID}#/home`,
},
{
Expand Down
23 changes: 0 additions & 23 deletions x-pack/plugins/infra/types/eui.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,6 @@ declare module '@elastic/eui' {

export const EuiErrorBoundary: React.SFC<EuiErrorBoundaryProps>;

type EuiSelectProps = CommonProps & {
compressed?: boolean;
disabled?: boolean;
fullWidth?: boolean;
hasNoInitialSelection?: boolean;
inputRef?: Ref<HTMLSelectElement>;
isInvalid?: boolean;
isLoading?: boolean;
onChange?: (arg: any) => void;
options?: any[];
value: any;
};
export const EuiSelect: React.SFC<EuiSelectProps>;

type EuiSizesResponsive = 'xs' | 's' | 'm' | 'l' | 'xl';
type EuiResponsiveProps = CommonProps & {
children: React.ReactNode;
Expand All @@ -178,13 +164,4 @@ declare module '@elastic/eui' {
};

export const EuiDatePickerRange: React.SFC<EuiDatePickerRangeProps>;

type EuiFieldNumberProps = CommonProps & {
defaultValue: string;
value?: number;
onChange?: (arg: any) => void;
step?: number;
};

export const EuiFieldNumber: React.SFC<EuiFieldNumberProps>;
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
// TODO: Remove once typescript definitions are in EUI
declare module '@elastic/eui' {
export const EuiBasicTable: React.SFC<any>;
export const EuiTextColor: React.SFC<any>;
}

import moment from 'moment';
Expand Down
8 changes: 4 additions & 4 deletions x-pack/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
dependencies:
moment "^2.13.0"

"@elastic/eui@4.4.1":
version "4.4.1"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-4.4.1.tgz#a1a4ab5bb209da8ea6d48c065476e74b1f48249b"
integrity sha512-SLgJQEDEuH16GFGmRmMvPUingisoNMjpdHnNqns9lug5Zk0PS96306xpbaXb3R+mz0RVQQjWsjnFJMN91QD26A==
"@elastic/eui@4.5.1":
version "4.5.1"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-4.5.1.tgz#29ac4f07ab80b229ff4b183f7ced580b84a13df5"
integrity sha512-wUI2ALqKH2MPS7xUsfzm6QOmtnw2itSlWxIaje3y6kbnGyjdSyrewpaws6TRQL7bHss+ylKTVwJCWR6dSC3nVw==
dependencies:
classnames "^2.2.5"
core-js "^2.5.1"
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@
version "0.0.0"
uid ""

"@elastic/eui@4.4.1":
version "4.4.1"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-4.4.1.tgz#a1a4ab5bb209da8ea6d48c065476e74b1f48249b"
integrity sha512-SLgJQEDEuH16GFGmRmMvPUingisoNMjpdHnNqns9lug5Zk0PS96306xpbaXb3R+mz0RVQQjWsjnFJMN91QD26A==
"@elastic/eui@4.5.1":
version "4.5.1"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-4.5.1.tgz#29ac4f07ab80b229ff4b183f7ced580b84a13df5"
integrity sha512-wUI2ALqKH2MPS7xUsfzm6QOmtnw2itSlWxIaje3y6kbnGyjdSyrewpaws6TRQL7bHss+ylKTVwJCWR6dSC3nVw==
dependencies:
classnames "^2.2.5"
core-js "^2.5.1"
Expand Down

0 comments on commit ab29946

Please sign in to comment.