Merge branch 'feature/129299' of github.com:dej611/kibana into featur…

…e/129299
elastic · Sep 7, 2022 · 64535f2 · 64535f2
2 parents cdf64fe + f3f6bdb
commit 64535f2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/src/plugins/chart_expressions/expression_xy/common/__mocks__/index.ts b/src/plugins/chart_expressions/expression_xy/common/__mocks__/index.ts
@@ -133,6 +133,7 @@ export const createArgsWithLayers = (
  ],
  layers: Array.isArray(layers) ? layers : [layers],
  annotations: {
+ type: 'event_annotations_result',
  layers: [],
  datatable: {
  type: 'datatable',

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
@@ -232,16 +232,21 @@ export interface XYArgs extends DataLayerArgs {
  showTooltip: boolean;
 }
 
+export interface ExpressionAnnotationsLayers {
+ layers: AnnotationLayerConfigResult[];
+ datatable: Datatable;
+}
+export type ExpressionAnnotationResult = ExpressionAnnotationsLayers & {
+ type: 'event_annotations_result';
+};
+
 export interface LayeredXYArgs {
  legend: LegendConfigResult;
  endValue?: EndValue;
  emphasizeFitting?: boolean;
  valueLabels: ValueLabelMode;
  layers?: XYExtendedLayerConfigResult[];
- annotations?: {
- layers: AnnotationLayerConfigResult[];
- datatable: Datatable;
- };
+ annotations?: ExpressionAnnotationResult;
  fittingFunction?: FittingFunction;
  fillOpacity?: number;
  hideEndzones?: boolean;
@@ -282,10 +287,7 @@ export interface XYProps {
  orderBucketsBySum?: boolean;
  showTooltip: boolean;
  singleTable?: boolean;
- annotations?: {
- layers: AnnotationLayerConfigResult[];
- datatable: Datatable;
- };
+ annotations?: ExpressionAnnotationResult;
 }
 
 export interface AnnotationLayerArgs {

diff --git a/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.test.tsx b/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.test.tsx
@@ -3084,6 +3084,7 @@ describe('XYChart component', () => {
  ...args,
  layers: [dateHistogramLayer],
  annotations: {
+ type: 'event_annotations_result' as const,
  layers: annotationLayers,
  datatable: {
  type: 'datatable' as const,

diff --git a/x-pack/plugins/lens/public/visualizations/xy/state_helpers.ts b/x-pack/plugins/lens/public/visualizations/xy/state_helpers.ts
@@ -217,7 +217,7 @@ export function validateColumn(
  }
  if (missingTooltipFields.length) {
  invalidMessages.push(
- i18n.translate('xpack.lens.xyChart.annotationError.textFieldNotFound', {
+ i18n.translate('xpack.lens.xyChart.annotationError.tooltipFieldNotFound', {
  defaultMessage:
  'Tooltip {missingFields, plural, one {field} other {fields}} {missingTooltipFields} not found in data view {dataView}',
  values: {