Skip to content

Commit 21597fe

Browse files
elasticmachineelasticmachine
authored
Merge branch '7.x' into backport/7.x/pr-68871
2 parents 1e1113a + 8d1ae01 commit 21597fe

395 files changed

Lines changed: 13671 additions & 5745 deletions

File tree

Some content is hidden

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

‎.eslintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ target
3333
/x-pack/plugins/canvas/shareable_runtime/build
3434
/x-pack/plugins/canvas/storybook
3535
/x-pack/plugins/monitoring/public/lib/jquery_flot
36+
/x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/**
3637
/x-pack/legacy/plugins/infra/common/graphql/types.ts
3738
/x-pack/legacy/plugins/infra/public/graphql/types.ts
3839
/x-pack/legacy/plugins/infra/server/graphql/types.ts

‎packages/kbn-monaco/src/xjson/grammar.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,13 @@ export const createParser = () => {
200200

201201
try {
202202
value();
203+
white();
203204
} catch (e) {
204205
errored = true;
205206
annos.push({ type: AnnoTypes.error, at: e.at - 1, text: e.message });
206207
}
207208
if (!errored && ch) {
208-
error('Syntax error');
209+
annos.push({ type: AnnoTypes.error, at: at, text: 'Syntax Error' });
209210
}
210211
return { annotations: annos };
211212
}

‎packages/kbn-monaco/src/xjson/language.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ export const registerGrammarChecker = (editor: monaco.editor.IEditor) => {
5252

5353
const updateAnnos = async () => {
5454
const { annotations } = await wps.getAnnos();
55-
const model = editor.getModel() as monaco.editor.ITextModel;
55+
const model = editor.getModel() as monaco.editor.ITextModel | null;
56+
if (!model) {
57+
return;
58+
}
5659
monaco.editor.setModelMarkers(
5760
model,
5861
OWNER,

‎src/plugins/discover/public/application/components/sidebar/discover_field_bucket.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.dscFieldDetails__barContainer {
2+
// Constrains value to the flex item, and allows for truncation when necessary
3+
min-width: 0;
4+
}

‎src/plugins/discover/public/application/components/sidebar/discover_field_bucket.tsx‎

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
* under the License.
1818
*/
1919
import React from 'react';
20-
import { EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
20+
import { EuiText, EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
2121
import { i18n } from '@kbn/i18n';
2222
import { StringFieldProgressBar } from './string_progress_bar';
2323
import { Bucket } from './types';
2424
import { IndexPatternField } from '../../../../../data/public';
25+
import './discover_field_bucket.scss';
2526

2627
interface Props {
2728
bucket: Bucket;
@@ -47,18 +48,40 @@ export function DiscoverFieldBucket({ field, bucket, onAddFilter }: Props) {
4748

4849
return (
4950
<>
50-
<EuiFlexGroup gutterSize="xs" responsive={false}>
51-
<EuiFlexItem className="eui-textTruncate">
52-
<EuiText size="xs" className="eui-textTruncate">
53-
{bucket.display === '' ? emptyTxt : bucket.display}
54-
</EuiText>
51+
<EuiFlexGroup justifyContent="spaceBetween" responsive={false} gutterSize="s">
52+
<EuiFlexItem className="dscFieldDetails__barContainer" grow={1}>
53+
<EuiFlexGroup justifyContent="spaceBetween" gutterSize="xs" responsive={false}>
54+
<EuiFlexItem grow={1} className="eui-textTruncate">
55+
<EuiText
56+
title={
57+
bucket.display === ''
58+
? emptyTxt
59+
: `${bucket.display}: ${bucket.count} (${bucket.percent}%)`
60+
}
61+
size="xs"
62+
className="eui-textTruncate"
63+
>
64+
{bucket.display === '' ? emptyTxt : bucket.display}
65+
</EuiText>
66+
</EuiFlexItem>
67+
<EuiFlexItem grow={false} className="eui-textTruncate">
68+
<EuiText color="secondary" size="xs" className="eui-textTruncate">
69+
{bucket.percent}%
70+
</EuiText>
71+
</EuiFlexItem>
72+
</EuiFlexGroup>
73+
<StringFieldProgressBar
74+
value={bucket.value}
75+
percent={bucket.percent}
76+
count={bucket.count}
77+
/>
5578
</EuiFlexItem>
5679
{field.filterable && (
5780
<EuiFlexItem grow={false}>
5881
<div>
5982
<EuiButtonIcon
6083
iconSize="s"
61-
iconType="magnifyWithPlus"
84+
iconType="plusInCircle"
6285
onClick={() => onAddFilter(field, bucket.value, '+')}
6386
aria-label={addLabel}
6487
data-test-subj={`plus-${field.name}-${bucket.value}`}
@@ -73,7 +96,7 @@ export function DiscoverFieldBucket({ field, bucket, onAddFilter }: Props) {
7396
/>
7497
<EuiButtonIcon
7598
iconSize="s"
76-
iconType="magnifyWithMinus"
99+
iconType="minusInCircle"
77100
onClick={() => onAddFilter(field, bucket.value, '-')}
78101
aria-label={removeLabel}
79102
data-test-subj={`minus-${field.name}-${bucket.value}`}
@@ -90,7 +113,7 @@ export function DiscoverFieldBucket({ field, bucket, onAddFilter }: Props) {
90113
</EuiFlexItem>
91114
)}
92115
</EuiFlexGroup>
93-
<StringFieldProgressBar percent={bucket.percent} count={bucket.count} />
116+
<EuiSpacer size="s" />
94117
</>
95118
);
96119
}

‎src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919
import React from 'react';
20-
import { EuiLink, EuiSpacer, EuiIconTip, EuiText } from '@elastic/eui';
20+
import { EuiLink, EuiIconTip, EuiText } from '@elastic/eui';
2121
import { FormattedMessage } from '@kbn/i18n/react';
2222
import { DiscoverFieldBucket } from './discover_field_bucket';
2323
import { getWarnings } from './lib/get_warnings';
@@ -78,7 +78,6 @@ export function DiscoverFieldDetails({
7878

7979
{details.visualizeUrl && (
8080
<>
81-
<EuiSpacer size={'s'} />
8281
<EuiLink
8382
onClick={() => {
8483
getServices().core.application.navigateToApp(details.visualizeUrl.app, {

‎src/plugins/discover/public/application/components/sidebar/discover_sidebar.scss‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,6 @@
121121
}
122122
}
123123

124-
/*
125-
Fixes EUI known issue https://github.com/elastic/eui/issues/1749
126-
*/
127-
.dscProgressBarTooltip__anchor {
128-
display: block;
129-
}
130-
131-
132124
.dscFieldSearch {
133125
padding: $euiSizeS;
134126
}

‎src/plugins/discover/public/application/components/sidebar/string_progress_bar.tsx‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,18 @@
1717
* under the License.
1818
*/
1919
import React from 'react';
20-
import { EuiFlexGroup, EuiFlexItem, EuiProgress, EuiText, EuiToolTip } from '@elastic/eui';
20+
import { EuiProgress } from '@elastic/eui';
2121

2222
interface Props {
2323
percent: number;
2424
count: number;
25+
value: string;
2526
}
2627

27-
export function StringFieldProgressBar(props: Props) {
28+
export function StringFieldProgressBar({ value, percent, count }: Props) {
29+
const ariaLabel = `${value}: ${count} (${percent}%)`;
30+
2831
return (
29-
<EuiToolTip
30-
anchorClassName="dscProgressBarTooltip__anchor"
31-
content={props.count}
32-
delay="regular"
33-
position="right"
34-
>
35-
<EuiFlexGroup alignItems="center" responsive={false}>
36-
<EuiFlexItem>
37-
<EuiProgress
38-
value={props.percent}
39-
max={100}
40-
color="secondary"
41-
aria-hidden={true}
42-
size="l"
43-
/>
44-
</EuiFlexItem>
45-
<EuiFlexItem grow={false}>
46-
<EuiText size="xs">{props.percent}%</EuiText>
47-
</EuiFlexItem>
48-
</EuiFlexGroup>
49-
</EuiToolTip>
32+
<EuiProgress value={percent} max={100} color="secondary" aria-label={ariaLabel} size="s" />
5033
);
5134
}

‎src/plugins/ui_actions/public/actions/action_internal.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ import { Presentable } from '../util/presentable';
2424
import { uiToReactComponent } from '../../../kibana_react/public';
2525
import { ActionType } from '../types';
2626

27+
/**
28+
* @internal
29+
*/
2730
export class ActionInternal<A extends ActionDefinition = ActionDefinition>
2831
implements Action<Context<A>>, Presentable<Context<A>> {
2932
constructor(public readonly definition: A) {}

‎src/plugins/ui_actions/public/service/ui_actions_service.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import { UiActionsService } from './ui_actions_service';
2121
import { Action, ActionInternal, createAction } from '../actions';
2222
import { createHelloWorldAction } from '../tests/test_samples';
23-
import { ActionRegistry, TriggerRegistry, TriggerId, ActionType } from '../types';
23+
import { TriggerRegistry, TriggerId, ActionType, ActionRegistry } from '../types';
2424
import { Trigger } from '../triggers';
2525

2626
// Casting to ActionType or TriggerId is a hack - in a real situation use

0 commit comments

Comments
 (0)