Skip to content

Commit a7803f2

Browse files
committed
Merge branch 'master' of github.com:elastic/kibana into scaling_panel_on_create_wizard
2 parents 05720d2 + 0bf62cb commit a7803f2

File tree

74 files changed

+1381
-1310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1381
-1310
lines changed

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filterbar.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<b>Signature:</b>
88

99
```typescript
10-
FilterBar: React.ComponentClass<Pick<Props, "className" | "indexPatterns" | "filters" | "onFiltersUpdated">, any> & {
10+
FilterBar: React.ComponentClass<Pick<Props, "className" | "filters" | "indexPatterns" | "onFiltersUpdated">, any> & {
1111
WrappedComponent: React.ComponentType<Props & ReactIntl.InjectedIntlProps>;
1212
}
1313
```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<b>Signature:</b>
88

99
```typescript
10-
SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "intl" | "indexPatterns" | "filters" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, "query" | "isLoading" | "indexPatterns" | "filters" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, any> & {
11-
WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "intl" | "indexPatterns" | "filters" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange"> & ReactIntl.InjectedIntlProps>;
10+
SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "intl" | "indexPatterns" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, "query" | "isLoading" | "filters" | "indexPatterns" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, any> & {
11+
WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "intl" | "indexPatterns" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange"> & ReactIntl.InjectedIntlProps>;
1212
}
1313
```

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
"@elastic/charts": "^18.1.0",
122122
"@elastic/datemath": "5.0.2",
123123
"@elastic/ems-client": "7.7.0",
124-
"@elastic/eui": "20.0.2",
124+
"@elastic/eui": "21.0.1",
125125
"@elastic/filesaver": "1.1.2",
126126
"@elastic/good": "8.1.1-kibana2",
127127
"@elastic/numeral": "2.4.0",

packages/kbn-ui-shared-deps/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"devDependencies": {
1212
"@elastic/charts": "^18.1.0",
1313
"abortcontroller-polyfill": "^1.4.0",
14-
"@elastic/eui": "20.0.2",
14+
"@elastic/eui": "21.0.1",
1515
"@kbn/babel-preset": "1.0.0",
1616
"@kbn/dev-utils": "1.0.0",
1717
"@kbn/i18n": "1.0.0",

src/legacy/core_plugins/vis_default_editor/public/components/__snapshots__/agg.test.tsx.snap

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/plugins/advanced_settings/public/management_app/advanced_settings.tsx

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,7 @@
1919

2020
import React, { Component } from 'react';
2121
import { Subscription } from 'rxjs';
22-
import {
23-
Comparators,
24-
EuiFlexGroup,
25-
EuiFlexItem,
26-
EuiSpacer,
27-
// @ts-ignore
28-
Query,
29-
} from '@elastic/eui';
22+
import { Comparators, EuiFlexGroup, EuiFlexItem, EuiSpacer, Query } from '@elastic/eui';
3023

3124
import { useParams } from 'react-router-dom';
3225
import { CallOuts } from './components/call_outs';
@@ -38,7 +31,7 @@ import { ComponentRegistry } from '../';
3831

3932
import { getAriaName, toEditableConfig, DEFAULT_CATEGORY } from './lib';
4033

41-
import { FieldSetting, IQuery, SettingsChanges } from './types';
34+
import { FieldSetting, SettingsChanges } from './types';
4235

4336
interface AdvancedSettingsProps {
4437
enableSaving: boolean;
@@ -54,7 +47,7 @@ interface AdvancedSettingsComponentProps extends AdvancedSettingsProps {
5447

5548
interface AdvancedSettingsState {
5649
footerQueryMatched: boolean;
57-
query: IQuery;
50+
query: Query;
5851
filteredSettings: Record<string, FieldSetting[]>;
5952
}
6053

@@ -156,7 +149,7 @@ export class AdvancedSettingsComponent extends Component<
156149
}, {});
157150
}
158151

159-
onQueryChange = ({ query }: { query: IQuery }) => {
152+
onQueryChange = ({ query }: { query: Query }) => {
160153
this.setState({
161154
query,
162155
filteredSettings: this.mapSettings(Query.execute(query, this.settings)),

src/plugins/advanced_settings/public/management_app/components/search/search.tsx

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,14 @@
1919

2020
import React, { Fragment, PureComponent } from 'react';
2121
import { i18n } from '@kbn/i18n';
22-
import {
23-
// @ts-ignore
24-
EuiSearchBar,
25-
EuiFormErrorText,
26-
} from '@elastic/eui';
27-
import { IQuery } from '../../types';
22+
import { EuiSearchBar, EuiFormErrorText, Query } from '@elastic/eui';
2823

2924
import { getCategoryName } from '../../lib';
3025

3126
interface SearchProps {
3227
categories: string[];
33-
query: IQuery;
34-
onQueryChange: ({ query }: { query: IQuery }) => void;
28+
query: Query;
29+
onQueryChange: ({ query }: { query: Query }) => void;
3530
}
3631

3732
export class Search extends PureComponent<SearchProps> {
@@ -53,7 +48,7 @@ export class Search extends PureComponent<SearchProps> {
5348
parseErrorMessage: null,
5449
};
5550

56-
onChange = ({ query, error }: { query: IQuery; error: { message: string } }) => {
51+
onChange = ({ query, error }: { query: Query | null; error: { message: string } | null }) => {
5752
if (error) {
5853
this.setState({
5954
isSearchTextValid: false,
@@ -66,7 +61,7 @@ export class Search extends PureComponent<SearchProps> {
6661
isSearchTextValid: true,
6762
parseErrorMessage: null,
6863
});
69-
this.props.onQueryChange({ query });
64+
this.props.onQueryChange({ query: query! });
7065
};
7166

7267
render() {
@@ -82,12 +77,12 @@ export class Search extends PureComponent<SearchProps> {
8277

8378
const filters = [
8479
{
85-
type: 'field_value_selection',
80+
type: 'field_value_selection' as const,
8681
field: 'category',
8782
name: i18n.translate('advancedSettings.categorySearchLabel', {
8883
defaultMessage: 'Category',
8984
}),
90-
multiSelect: 'or',
85+
multiSelect: 'or' as const,
9186
options: this.categories,
9287
},
9388
];

src/plugins/advanced_settings/public/management_app/types.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,3 @@ export interface FieldState {
5454
isInvalid?: boolean;
5555
error?: string | null;
5656
}
57-
58-
export interface IQuery {
59-
ast: any; // incomplete
60-
text: string;
61-
syntax: any; // incomplete
62-
}

0 commit comments

Comments
 (0)