[Canvas] XY. Step 3. Move XY functions and renderer from vis_types to chart_expressions.

.i18nrc.json

@@ -27,6 +27,7 @@
     "expressionRevealImage": "src/plugins/expression_reveal_image",
     "expressionShape": "src/plugins/expression_shape",
     "expressionTagcloud": "src/plugins/chart_expressions/expression_tagcloud",
+    "expressionXy": "src/plugins/chart_expressions/expression_xy",
     "inputControl": "src/plugins/input_control_vis",
     "inspector": "src/plugins/inspector",
     "inspectorViews": "src/legacy/core_plugins/inspector_views",

docs/developer/plugin-list.asciidoc

@@ -119,6 +119,10 @@ for use in their own application.
 |Expression Tagcloud plugin adds a tagcloud renderer and function to the expression plugin. The renderer will display the Wordcloud chart.
 
 
+|{kib-repo}blob/{branch}/src/plugins/chart_expressions/expression_xy/README.md[expressionXy]
+|Expression XY plugin adds a xy renderer and function to the expression plugin. The renderer will display the xy-axis chart.
+
+
 |{kib-repo}blob/{branch}/src/plugins/field_formats/README.md[fieldFormats]
 |Index pattern fields formatters
 

packages/kbn-optimizer/limits.yml

@@ -88,7 +88,6 @@ pageLoadAssetSize:
   visTypeTimeseries: 55203
   visTypeVega: 153573
   visTypeVislib: 242838
-  visTypeXy: 113478
   visualizations: 90000
   visualize: 57431
   watcher: 43598
@@ -115,3 +114,5 @@ pageLoadAssetSize:
   expressionTagcloud: 27505
   expressions: 239290
   securitySolution: 231753
+  expressionXy: 56824
+  visTypeXy: 38728

src/plugins/chart_expressions/expression_xy/README.md

@@ -0,0 +1,9 @@
+# expressionXY
+
+Expression XY plugin adds a `xy` renderer and function to the expression plugin. The renderer will display the xy-axis chart.
+
+---
+
+## Development
+
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions setting up your development environment.

src/plugins/chart_expressions/expression_xy/common/constants.ts

@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export const EXPRESSION_NAME = 'xy_vis';

src/plugins/vis_types/xy/public/expression_functions/category_axis.ts → src/plugins/chart_expressions/expression_xy/common/expression_functions/category_axis.ts

@@ -7,91 +7,64 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type {
-  ExpressionFunctionDefinition,
-  Datatable,
-  ExpressionValueBoxed,
-} from '../../../../expressions/public';
-import type { CategoryAxis } from '../types';
-import type { ExpressionValueScale } from './vis_scale';
-import type { ExpressionValueLabel } from './label';
-
-export interface Arguments extends Omit<CategoryAxis, 'title' | 'scale' | 'labels'> {
-  title?: string;
-  scale: ExpressionValueScale;
-  labels: ExpressionValueLabel;
-}
-
-export type ExpressionValueCategoryAxis = ExpressionValueBoxed<
-  'category_axis',
-  {
-    id: CategoryAxis['id'];
-    show: CategoryAxis['show'];
-    position: CategoryAxis['position'];
-    axisType: CategoryAxis['type'];
-    title: {
-      text?: string;
-    };
-    labels: CategoryAxis['labels'];
-    scale: CategoryAxis['scale'];
-  }
->;
+import type { ExpressionFunctionDefinition, Datatable } from '../../../../expressions/public';
+import { ExpressionValueCategoryAxis, ExpressionValueCategoryAxisArguments } from '../types';
 
 export const categoryAxis = (): ExpressionFunctionDefinition<
   'categoryaxis',
   Datatable | null,
-  Arguments,
+  ExpressionValueCategoryAxisArguments,
   ExpressionValueCategoryAxis
 > => ({
   name: 'categoryaxis',
-  help: i18n.translate('visTypeXy.function.categoryAxis.help', {
+  help: i18n.translate('expressionXy.function.categoryAxis.help', {
     defaultMessage: 'Generates category axis object',
   }),
   type: 'category_axis',
   args: {
     id: {
       types: ['string'],
-      help: i18n.translate('visTypeXy.function.categoryAxis.id.help', {
+      help: i18n.translate('expressionXy.function.categoryAxis.id.help', {
         defaultMessage: 'Id of category axis',
       }),
       required: true,
     },
     show: {
       types: ['boolean'],
-      help: i18n.translate('visTypeXy.function.categoryAxis.show.help', {
+      help: i18n.translate('expressionXy.function.categoryAxis.show.help', {
         defaultMessage: 'Show the category axis',
       }),
       required: true,
     },
     position: {
       types: ['string'],
-      help: i18n.translate('visTypeXy.function.categoryAxis.position.help', {
+      help: i18n.translate('expressionXy.function.categoryAxis.position.help', {
         defaultMessage: 'Position of the category axis',
       }),
       required: true,
     },
     type: {
       types: ['string'],
-      help: i18n.translate('visTypeXy.function.categoryAxis.type.help', {
+      help: i18n.translate('expressionXy.function.categoryAxis.type.help', {
         defaultMessage: 'Type of the category axis. Can be category or value',
       }),
       required: true,
     },
     title: {
       types: ['string'],
-      help: i18n.translate('visTypeXy.function.categoryAxis.title.help', {
+      help: i18n.translate('expressionXy.function.categoryAxis.title.help', {
         defaultMessage: 'Title of the category axis',
       }),
     },
     scale: {
       types: ['vis_scale'],
-      help: i18n.translate('visTypeXy.function.categoryAxis.scale.help', {
+      help: i18n.translate('expressionXy.function.categoryAxis.scale.help', {
         defaultMessage: 'Scale config',
       }),
     },
     labels: {
       types: ['label'],
-      help: i18n.translate('visTypeXy.function.categoryAxis.labels.help', {
+      help: i18n.translate('expressionXy.function.categoryAxis.labels.help', {
         defaultMessage: 'Axis label config',
       }),
     },

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

@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export { visTypeXyVisFn } from './xy_vis_fn';
+export { categoryAxis } from './category_axis';
+export { timeMarker } from './time_marker';
+export { valueAxis } from './value_axis';
+export { seriesParam } from './series_param';
+export { thresholdLine } from './threshold_line';
+export { label } from './label';
+export { visScale } from './vis_scale';
+export { xDomain } from './x_domain';

src/plugins/vis_types/xy/public/expression_functions/label.ts → src/plugins/chart_expressions/expression_xy/common/expression_functions/label.ts

@@ -7,70 +7,54 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { Labels } from '../../../../charts/public';
-import type {
-  ExpressionFunctionDefinition,
-  Datatable,
-  ExpressionValueBoxed,
-} from '../../../../expressions/public';
-
-export type ExpressionValueLabel = ExpressionValueBoxed<
-  'label',
-  {
-    color?: Labels['color'];
-    filter?: Labels['filter'];
-    overwriteColor?: Labels['overwriteColor'];
-    rotate?: Labels['rotate'];
-    show?: Labels['show'];
-    truncate?: Labels['truncate'];
-  }
->;
+import type { ExpressionFunctionDefinition, Datatable } from '../../../../expressions/public';
+import { ExpressionValueLabel, ExpressionValueLabelArguments } from '../types';
 
 export const label = (): ExpressionFunctionDefinition<
   'label',
   Datatable | null,
-  Labels,
+  ExpressionValueLabelArguments,
   ExpressionValueLabel
 > => ({
   name: 'label',
-  help: i18n.translate('visTypeXy.function.label.help', {
+  help: i18n.translate('expressionXy.function.label.help', {
     defaultMessage: 'Generates label object',
   }),
   type: 'label',
   args: {
     color: {
       types: ['string'],
-      help: i18n.translate('visTypeXy.function.label.color.help', {
+      help: i18n.translate('expressionXy.function.label.color.help', {
         defaultMessage: 'Color of label',
       }),
     },
     filter: {
       types: ['boolean'],
-      help: i18n.translate('visTypeXy.function.label.filter.help', {
+      help: i18n.translate('expressionXy.function.label.filter.help', {
         defaultMessage: 'Hides overlapping labels and duplicates on axis',
       }),
     },
     overwriteColor: {
       types: ['boolean'],
-      help: i18n.translate('visTypeXy.function.label.overwriteColor.help', {
+      help: i18n.translate('expressionXy.function.label.overwriteColor.help', {
         defaultMessage: 'Overwrite color',
       }),
     },
     rotate: {
       types: ['number'],
-      help: i18n.translate('visTypeXy.function.label.rotate.help', {
+      help: i18n.translate('expressionXy.function.label.rotate.help', {
         defaultMessage: 'Rotate angle',
       }),
     },
     show: {
       types: ['boolean'],
-      help: i18n.translate('visTypeXy.function.label.show.help', {
+      help: i18n.translate('expressionXy.function.label.show.help', {
         defaultMessage: 'Show label',
       }),
     },
     truncate: {
       types: ['number', 'null'],
-      help: i18n.translate('visTypeXy.function.label.truncate.help', {
+      help: i18n.translate('expressionXy.function.label.truncate.help', {
         defaultMessage: 'The number of symbols before truncating',
       }),
     },

src/plugins/vis_types/xy/public/expression_functions/series_param.ts → src/plugins/chart_expressions/expression_xy/common/expression_functions/series_param.ts

@@ -7,113 +7,88 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type {
-  ExpressionFunctionDefinition,
-  Datatable,
-  ExpressionValueBoxed,
-} from '../../../../expressions/public';
-import type { SeriesParam } from '../types';
-
-export interface Arguments extends Omit<SeriesParam, 'data'> {
-  label: string;
-  id: string;
-}
-
-export type ExpressionValueSeriesParam = ExpressionValueBoxed<
-  'series_param',
-  {
-    data: { label: string; id: string };
-    drawLinesBetweenPoints?: boolean;
-    interpolate?: SeriesParam['interpolate'];
-    lineWidth?: number;
-    mode: SeriesParam['mode'];
-    show: boolean;
-    showCircles: boolean;
-    circlesRadius: number;
-    seriesParamType: SeriesParam['type'];
-    valueAxis: string;
-  }
->;
+import type { ExpressionFunctionDefinition, Datatable } from '../../../../expressions/public';
+import { ExpressionValueSeriesParam, ExpressionValueSeriesParamArguments } from '../types';
 
 export const seriesParam = (): ExpressionFunctionDefinition<
   'seriesparam',
   Datatable,
-  Arguments,
+  ExpressionValueSeriesParamArguments,
   ExpressionValueSeriesParam
 > => ({
   name: 'seriesparam',
-  help: i18n.translate('visTypeXy.function.seriesparam.help', {
+  help: i18n.translate('expressionXy.function.seriesparam.help', {
     defaultMessage: 'Generates series param object',
   }),
   type: 'series_param',
   inputTypes: ['datatable'],
   args: {
     label: {
       types: ['string'],
-      help: i18n.translate('visTypeXy.function.seriesParam.label.help', {
+      help: i18n.translate('expressionXy.function.seriesParam.label.help', {
         defaultMessage: 'Name of series param',
       }),
       required: true,
     },
     id: {
       types: ['string'],
-      help: i18n.translate('visTypeXy.function.seriesParam.id.help', {
+      help: i18n.translate('expressionXy.function.seriesParam.id.help', {
         defaultMessage: 'Id of series param',
       }),
       required: true,
     },
     drawLinesBetweenPoints: {
       types: ['boolean'],
-      help: i18n.translate('visTypeXy.function.seriesParam.drawLinesBetweenPoints.help', {
+      help: i18n.translate('expressionXy.function.seriesParam.drawLinesBetweenPoints.help', {
         defaultMessage: 'Draw lines between points',
       }),
     },
     interpolate: {
       types: ['string'],
-      help: i18n.translate('visTypeXy.function.seriesParam.interpolate.help', {
+      help: i18n.translate('expressionXy.function.seriesParam.interpolate.help', {
         defaultMessage: 'Interpolate mode. Can be linear, cardinal or step-after',
       }),
     },
     show: {
       types: ['boolean'],
-      help: i18n.translate('visTypeXy.function.seriesParam.show.help', {
+      help: i18n.translate('expressionXy.function.seriesParam.show.help', {
         defaultMessage: 'Show param',
       }),
       required: true,
     },
     lineWidth: {
       types: ['number'],
-      help: i18n.translate('visTypeXy.function.seriesParam.lineWidth.help', {
+      help: i18n.translate('expressionXy.function.seriesParam.lineWidth.help', {
         defaultMessage: 'Width of line',
       }),
     },
     mode: {
       types: ['string'],
-      help: i18n.translate('visTypeXy.function.seriesParam.mode.help', {
+      help: i18n.translate('expressionXy.function.seriesParam.mode.help', {
         defaultMessage: 'Chart mode. Can be stacked or percentage',
       }),
     },
     showCircles: {
       types: ['boolean'],
-      help: i18n.translate('visTypeXy.function.seriesParam.showCircles.help', {
+      help: i18n.translate('expressionXy.function.seriesParam.showCircles.help', {
         defaultMessage: 'Show circles',
       }),
     },
     circlesRadius: {
       types: ['number'],
-      help: i18n.translate('visTypeXy.function.seriesParam.circlesRadius.help', {
+      help: i18n.translate('expressionXy.function.seriesParam.circlesRadius.help', {
         defaultMessage: 'Defines the circles size (radius)',
       }),
     },
     type: {
       types: ['string'],
-      help: i18n.translate('visTypeXy.function.seriesParam.type.help', {
+      help: i18n.translate('expressionXy.function.seriesParam.type.help', {
         defaultMessage: 'Chart type. Can be line, area or histogram',
       }),
     },
     valueAxis: {
       types: ['string'],
-      help: i18n.translate('visTypeXy.function.seriesParam.valueAxis.help', {
+      help: i18n.translate('expressionXy.function.seriesParam.valueAxis.help', {
         defaultMessage: 'Name of value axis',
       }),
     },