Skip to content

Commit b516bb3

Browse files
mbondyrambondyra
committed
Merge commit '27d1fa1797b21a975173e89e9d65a2d029b64304' into chart_expressions-xy-extended_layers
# Conflicts: # src/plugins/chart_expressions/expression_xy/common/expression_functions/annotation_layer.ts # src/plugins/chart_expressions/expression_xy/public/components/annotations.tsx # src/plugins/chart_expressions/expression_xy/public/components/xy_chart.test.tsx # src/plugins/chart_expressions/expression_xy/public/components/xy_chart.tsx # src/plugins/event_annotation/common/index.ts # src/plugins/event_annotation/common/manual_event_annotation/index.ts # src/plugins/event_annotation/common/types.ts # x-pack/plugins/lens/public/xy_visualization/xy_config_panel/annotations_config_panel/index.tsx # x-pack/plugins/lens/public/xy_visualization/xy_config_panel/color_picker.tsx # x-pack/plugins/lens/public/xy_visualization/xy_config_panel/reference_line_config_panel/reference_line_panel.tsx # x-pack/plugins/lens/public/xy_visualization/xy_config_panel/shared/icon_select.tsx # x-pack/plugins/lens/public/xy_visualization/xy_config_panel/shared/marker_decoration_settings.tsx
2 parents 59ee004 + 27d1fa1 commit b516bb3

122 files changed

Lines changed: 2510 additions & 1217 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.

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,6 @@
271271
"handlebars": "4.7.7",
272272
"he": "^1.2.0",
273273
"history": "^4.9.0",
274-
"history-extra": "^5.0.1",
275274
"hjson": "3.2.1",
276275
"http-proxy-agent": "^2.1.0",
277276
"https-proxy-agent": "^5.0.0",

‎src/plugins/chart_expressions/expression_xy/common/expression_functions/annotation_layer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export function annotationLayerFunction(): ExpressionFunctionDefinition<
3030
help: strings.getAnnotationLayerHideHelp(),
3131
},
3232
annotations: {
33-
types: ['manual_event_annotation'],
33+
types: ['manual_point_event_annotation', 'manual_range_event_annotation'],
3434
help: strings.getAnnotationLayerAnnotationsHelp(),
3535
multi: true,
3636
},

‎src/plugins/chart_expressions/expression_xy/common/expression_functions/extended_annotation_layer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export function extendedAnnotationLayerFunction(): ExpressionFunctionDefinition<
3030
help: strings.getAnnotationLayerHideHelp(),
3131
},
3232
annotations: {
33-
types: ['manual_event_annotation'],
33+
types: ['manual_point_event_annotation', 'manual_range_event_annotation'],
3434
help: strings.getAnnotationLayerAnnotationsHelp(),
3535
multi: true,
3636
},

‎src/plugins/chart_expressions/expression_xy/common/index.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ export type {
4141
AxesSettingsConfig,
4242
CommonXYLayerConfig,
4343
AnnotationLayerArgs,
44-
XYLayerConfigResult,
4544
ExtendedYConfigResult,
4645
GridlinesConfigResult,
4746
DataLayerConfigResult,

‎src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,6 @@ export type XYExtendedLayerConfig =
291291
| ExtendedReferenceLineLayerConfig
292292
| ExtendedAnnotationLayerConfig;
293293

294-
export type XYLayerConfigResult =
295-
| DataLayerConfigResult
296-
| ReferenceLineLayerConfigResult
297-
| AnnotationLayerConfigResult;
298294
export type XYExtendedLayerConfigResult =
299295
| ExtendedDataLayerConfigResult
300296
| ExtendedReferenceLineLayerConfigResult

‎src/plugins/chart_expressions/expression_xy/common/types/expression_renderers.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
*/
88

99
import { AnnotationTooltipFormatter } from '@elastic/charts';
10-
import { AvailableAnnotationIcon, EventAnnotationArgs } from '@kbn/event-annotation-plugin/common';
10+
import {
11+
AvailableAnnotationIcon,
12+
ManualPointEventAnnotationArgs,
13+
} from '@kbn/event-annotation-plugin/common';
1114
import { XY_VIS_RENDERER } from '../constants';
1215
import { XYProps } from './expression_functions';
1316

@@ -21,7 +24,7 @@ export interface XYRender {
2124
value: XYChartProps;
2225
}
2326

24-
export interface CollectiveConfig extends Omit<EventAnnotationArgs, 'icon'> {
27+
export interface CollectiveConfig extends Omit<ManualPointEventAnnotationArgs, 'icon'> {
2528
roundedTimestamp: number;
2629
axisMode: 'bottom';
2730
icon?: AvailableAnnotationIcon | string;

‎src/plugins/chart_expressions/expression_xy/public/components/__snapshots__/xy_chart.test.tsx.snap‎

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

‎src/plugins/chart_expressions/expression_xy/public/components/annotations.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,7 @@
1616
transform: rotate(45deg);
1717
transform-origin: center;
1818
}
19+
20+
.xyAnnotationTooltipDetail {
21+
padding: $euiSizeXS ($euiSizeXS * 2);
22+
}

0 commit comments

Comments
 (0)