Merge commit '27d1fa1797b21a975173e89e9d65a2d029b64304' into chart_ex…

…pressions-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
elastic · May 3, 2022 · b516bb3 · b516bb3
2 parents 59ee004 + 27d1fa1
commit b516bb3
Show file tree

Hide file tree

Showing 122 changed files with 2,510 additions and 1,217 deletions.
diff --git a/package.json b/package.json
@@ -271,7 +271,6 @@
     "handlebars": "4.7.7",
     "he": "^1.2.0",
     "history": "^4.9.0",
-    "history-extra": "^5.0.1",
     "hjson": "3.2.1",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^5.0.0",

diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/annotation_layer.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/annotation_layer.ts
@@ -30,7 +30,7 @@ export function annotationLayerFunction(): ExpressionFunctionDefinition<
         help: strings.getAnnotationLayerHideHelp(),
       },
       annotations: {
-        types: ['manual_event_annotation'],
+        types: ['manual_point_event_annotation', 'manual_range_event_annotation'],
         help: strings.getAnnotationLayerAnnotationsHelp(),
         multi: true,
       },

diff --git a/.../chart_expressions/expression_xy/common/expression_functions/extended_annotation_layer.ts b/.../chart_expressions/expression_xy/common/expression_functions/extended_annotation_layer.ts
@@ -30,7 +30,7 @@ export function extendedAnnotationLayerFunction(): ExpressionFunctionDefinition<
         help: strings.getAnnotationLayerHideHelp(),
       },
       annotations: {
-        types: ['manual_event_annotation'],
+        types: ['manual_point_event_annotation', 'manual_range_event_annotation'],
         help: strings.getAnnotationLayerAnnotationsHelp(),
         multi: true,
       },

diff --git a/src/plugins/chart_expressions/expression_xy/common/index.ts b/src/plugins/chart_expressions/expression_xy/common/index.ts
@@ -41,7 +41,6 @@ export type {
   AxesSettingsConfig,
   CommonXYLayerConfig,
   AnnotationLayerArgs,
-  XYLayerConfigResult,
   ExtendedYConfigResult,
   GridlinesConfigResult,
   DataLayerConfigResult,

diff --git a/src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts
@@ -291,10 +291,6 @@ export type XYExtendedLayerConfig =
   | ExtendedReferenceLineLayerConfig
   | ExtendedAnnotationLayerConfig;
 
-export type XYLayerConfigResult =
-  | DataLayerConfigResult
-  | ReferenceLineLayerConfigResult
-  | AnnotationLayerConfigResult;
 export type XYExtendedLayerConfigResult =
   | ExtendedDataLayerConfigResult
   | ExtendedReferenceLineLayerConfigResult

diff --git a/src/plugins/chart_expressions/expression_xy/common/types/expression_renderers.ts b/src/plugins/chart_expressions/expression_xy/common/types/expression_renderers.ts
@@ -7,7 +7,10 @@
  */
 
 import { AnnotationTooltipFormatter } from '@elastic/charts';
-import { AvailableAnnotationIcon, EventAnnotationArgs } from '@kbn/event-annotation-plugin/common';
+import {
+  AvailableAnnotationIcon,
+  ManualPointEventAnnotationArgs,
+} from '@kbn/event-annotation-plugin/common';
 import { XY_VIS_RENDERER } from '../constants';
 import { XYProps } from './expression_functions';
 
@@ -21,7 +24,7 @@ export interface XYRender {
   value: XYChartProps;
 }
 
-export interface CollectiveConfig extends Omit<EventAnnotationArgs, 'icon'> {
+export interface CollectiveConfig extends Omit<ManualPointEventAnnotationArgs, 'icon'> {
   roundedTimestamp: number;
   axisMode: 'bottom';
   icon?: AvailableAnnotationIcon | string;

diff --git a/...ns/chart_expressions/expression_xy/public/components/__snapshots__/xy_chart.test.tsx.snap b/...ns/chart_expressions/expression_xy/public/components/__snapshots__/xy_chart.test.tsx.snap
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/annotations.scss b/src/plugins/chart_expressions/expression_xy/public/components/annotations.scss
@@ -16,3 +16,7 @@
   transform: rotate(45deg);
   transform-origin: center;
 }
+
+.xyAnnotationTooltipDetail {
+  padding: $euiSizeXS ($euiSizeXS * 2);
+}