From 7d03a6646a0283ffd28721278841c409f30c53da Mon Sep 17 00:00:00 2001 From: Joe Reuter Date: Tue, 22 Mar 2022 18:23:32 +0100 Subject: [PATCH 1/4] log data tables properly --- .../expression_functions/gauge_function.ts | 16 +++++--- .../expression_functions/heatmap_function.ts | 2 +- .../metric_vis_function.ts | 2 +- .../mosaic_vis_function.ts | 16 +++++--- .../expression_functions/pie_vis_function.ts | 16 +++++--- .../treemap_vis_function.ts | 16 +++++--- .../waffle_vis_function.ts | 16 +++++--- .../expression_functions/tagcloud_function.ts | 2 +- .../common/utils/prepare_log_table.ts | 26 ++++++++----- .../expressions/datatable/datatable_fn.ts | 20 ++++++++-- .../common/expressions/expressions_utils.ts | 16 -------- .../common/expressions/xy_chart/xy_chart.ts | 38 ++++++++++++++++++- .../choropleth_chart/expression_function.ts | 26 ++++++++++++- 13 files changed, 147 insertions(+), 65 deletions(-) delete mode 100644 x-pack/plugins/lens/common/expressions/expressions_utils.ts diff --git a/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.ts b/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.ts index abc957b369d2d..133c8114bdb50 100644 --- a/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.ts +++ b/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.ts @@ -182,12 +182,16 @@ export const gaugeFunction = (): GaugeExpressionFunctionDefinition => ({ } if (handlers?.inspectorAdapters?.tables) { - const logTable = prepareLogTable(data, [ - [metric ? [metric] : undefined, strings.getMetricHelp()], - [min ? [min] : undefined, strings.getMinHelp()], - [max ? [max] : undefined, strings.getMaxHelp()], - [goal ? [goal] : undefined, strings.getGoalHelp()], - ]); + const logTable = prepareLogTable( + data, + [ + [metric ? [metric] : undefined, strings.getMetricHelp()], + [min ? [min] : undefined, strings.getMinHelp()], + [max ? [max] : undefined, strings.getMaxHelp()], + [goal ? [goal] : undefined, strings.getGoalHelp()], + ], + true + ); handlers.inspectorAdapters.tables.logDatatable('default', logTable); } diff --git a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.ts b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.ts index 44520a30a9b82..8858cc43971a6 100644 --- a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.ts +++ b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.ts @@ -212,7 +212,7 @@ export const heatmapFunction = (): HeatmapExpressionFunctionDefinition => ({ }) ); } - const logTable = prepareLogTable(data, argsTable); + const logTable = prepareLogTable(data, argsTable, true); handlers.inspectorAdapters.tables.logDatatable('default', logTable); } return { diff --git a/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.ts b/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.ts index 34e93c4d31ddd..bea25fbf708d7 100644 --- a/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.ts +++ b/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.ts @@ -162,7 +162,7 @@ export const metricVisFunction = (): MetricVisExpressionFunctionDefinition => ({ }), ]); } - const logTable = prepareLogTable(input, argsTable); + const logTable = prepareLogTable(input, argsTable, true); handlers.inspectorAdapters.tables.logDatatable('default', logTable); } diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.ts index e5d1f424dd5f3..d3179026f3c9e 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.ts +++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.ts @@ -134,12 +134,16 @@ export const mosaicVisFunction = (): MosaicVisExpressionFunctionDefinition => ({ }; if (handlers?.inspectorAdapters?.tables) { - const logTable = prepareLogTable(context, [ - [[args.metric], strings.getSliceSizeHelp()], - [args.buckets, strings.getSliceHelp()], - [args.splitColumn, strings.getColumnSplitHelp()], - [args.splitRow, strings.getRowSplitHelp()], - ]); + const logTable = prepareLogTable( + context, + [ + [[args.metric], strings.getSliceSizeHelp()], + [args.buckets, strings.getSliceHelp()], + [args.splitColumn, strings.getColumnSplitHelp()], + [args.splitRow, strings.getRowSplitHelp()], + ], + true + ); handlers.inspectorAdapters.tables.logDatatable('default', logTable); } diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.ts index cb9dd7fd04aed..5edab8f7c5226 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.ts +++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.ts @@ -154,12 +154,16 @@ export const pieVisFunction = (): PieVisExpressionFunctionDefinition => ({ }; if (handlers?.inspectorAdapters?.tables) { - const logTable = prepareLogTable(context, [ - [[args.metric], strings.getSliceSizeHelp()], - [args.buckets, strings.getSliceHelp()], - [args.splitColumn, strings.getColumnSplitHelp()], - [args.splitRow, strings.getRowSplitHelp()], - ]); + const logTable = prepareLogTable( + context, + [ + [[args.metric], strings.getSliceSizeHelp()], + [args.buckets, strings.getSliceHelp()], + [args.splitColumn, strings.getColumnSplitHelp()], + [args.splitRow, strings.getRowSplitHelp()], + ], + true + ); handlers.inspectorAdapters.tables.logDatatable('default', logTable); } diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.ts index 102baec7cf2a6..cda9e59da0610 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.ts +++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.ts @@ -134,12 +134,16 @@ export const treemapVisFunction = (): TreemapVisExpressionFunctionDefinition => }; if (handlers?.inspectorAdapters?.tables) { - const logTable = prepareLogTable(context, [ - [[args.metric], strings.getSliceSizeHelp()], - [args.buckets, strings.getSliceHelp()], - [args.splitColumn, strings.getColumnSplitHelp()], - [args.splitRow, strings.getRowSplitHelp()], - ]); + const logTable = prepareLogTable( + context, + [ + [[args.metric], strings.getSliceSizeHelp()], + [args.buckets, strings.getSliceHelp()], + [args.splitColumn, strings.getColumnSplitHelp()], + [args.splitRow, strings.getRowSplitHelp()], + ], + true + ); handlers.inspectorAdapters.tables.logDatatable('default', logTable); } diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.ts index 073b78431fac9..3ff35d1277dba 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.ts +++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.ts @@ -129,12 +129,16 @@ export const waffleVisFunction = (): WaffleVisExpressionFunctionDefinition => ({ }; if (handlers?.inspectorAdapters?.tables) { - const logTable = prepareLogTable(context, [ - [[args.metric], strings.getSliceSizeHelp()], - [buckets, strings.getSliceHelp()], - [args.splitColumn, strings.getColumnSplitHelp()], - [args.splitRow, strings.getRowSplitHelp()], - ]); + const logTable = prepareLogTable( + context, + [ + [[args.metric], strings.getSliceSizeHelp()], + [buckets, strings.getSliceHelp()], + [args.splitColumn, strings.getColumnSplitHelp()], + [args.splitRow, strings.getRowSplitHelp()], + ], + true + ); handlers.inspectorAdapters.tables.logDatatable('default', logTable); } diff --git a/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.ts b/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.ts index 1a07d607ede3e..e4ccecd6a0069 100644 --- a/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.ts +++ b/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.ts @@ -164,7 +164,7 @@ export const tagcloudFunction: ExpressionTagcloudFunction = () => { if (args.bucket) { argsTable.push([[args.bucket], dimension.tags]); } - const logTable = prepareLogTable(input, argsTable); + const logTable = prepareLogTable(input, argsTable, true); handlers.inspectorAdapters.tables.logDatatable('default', logTable); } return { diff --git a/src/plugins/visualizations/common/utils/prepare_log_table.ts b/src/plugins/visualizations/common/utils/prepare_log_table.ts index af36ccccff350..36234a0fcaa58 100644 --- a/src/plugins/visualizations/common/utils/prepare_log_table.ts +++ b/src/plugins/visualizations/common/utils/prepare_log_table.ts @@ -57,17 +57,23 @@ const getDimensionName = ( } }; -export const prepareLogTable = (datatable: Datatable, dimensions: Dimension[]) => { +export const prepareLogTable = ( + datatable: Datatable, + dimensions: Dimension[], + removeUnmappedColumns: boolean = false +) => { return { ...datatable, - columns: datatable.columns.map((column, columnIndex) => { - return { - ...column, - meta: { - ...column.meta, - dimensionName: getDimensionName(column, columnIndex, dimensions), - }, - }; - }), + columns: datatable.columns + .map((column, columnIndex) => { + return { + ...column, + meta: { + ...column.meta, + dimensionName: getDimensionName(column, columnIndex, dimensions), + }, + }; + }) + .filter((column) => !removeUnmappedColumns || column.meta.dimensionName), }; }; diff --git a/x-pack/plugins/lens/common/expressions/datatable/datatable_fn.ts b/x-pack/plugins/lens/common/expressions/datatable/datatable_fn.ts index 41bf51764b539..9c4d81cf087e0 100644 --- a/x-pack/plugins/lens/common/expressions/datatable/datatable_fn.ts +++ b/x-pack/plugins/lens/common/expressions/datatable/datatable_fn.ts @@ -6,6 +6,8 @@ */ import { cloneDeep } from 'lodash'; +import { i18n } from '@kbn/i18n'; +import { prepareLogTable } from '../../../../../../src/plugins/visualizations/common/utils'; import { FormatFactory, LensMultiTable } from '../../types'; import { transposeTable } from './transpose_helpers'; import { computeSummaryRowForColumn } from './summary'; @@ -15,7 +17,6 @@ import type { ExecutionContext, } from '../../../../../../src/plugins/expressions'; import type { DatatableExpressionFunction } from './types'; -import { logDataTable } from '../expressions_utils'; function isRange(meta: { params?: { id?: string } } | undefined) { return meta?.params?.id === 'range'; @@ -26,13 +27,26 @@ export const datatableFn = getFormatFactory: (context: ExecutionContext) => FormatFactory | Promise ): DatatableExpressionFunction['fn'] => async (data, args, context) => { + const [firstTable] = Object.values(data.tables); if (context?.inspectorAdapters?.tables) { - logDataTable(context.inspectorAdapters.tables, data.tables); + const logTable = prepareLogTable( + Object.values(data.tables)[0], + [ + [ + args.columns.map((column) => column.columnId), + i18n.translate('xpack.lens.datatable.column.help', { + defaultMessage: 'Datatable column', + }), + ], + ], + true + ); + + context.inspectorAdapters.tables.logDatatable('default', logTable); } let untransposedData: LensMultiTable | undefined; // do the sorting at this level to propagate it also at CSV download - const [firstTable] = Object.values(data.tables); const [layerId] = Object.keys(context.inspectorAdapters.tables || {}); const formatters: Record> = {}; const formatFactory = await getFormatFactory(context); diff --git a/x-pack/plugins/lens/common/expressions/expressions_utils.ts b/x-pack/plugins/lens/common/expressions/expressions_utils.ts deleted file mode 100644 index 795b23e26e830..0000000000000 --- a/x-pack/plugins/lens/common/expressions/expressions_utils.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* - * 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; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import type { TablesAdapter } from '../../../../../src/plugins/expressions'; -import type { Datatable } from '../../../../../src/plugins/expressions'; - -export const logDataTable = ( - tableAdapter: TablesAdapter, - datatables: Record = {} -) => { - Object.entries(datatables).forEach(([key, table]) => tableAdapter.logDatatable(key, table)); -}; diff --git a/x-pack/plugins/lens/common/expressions/xy_chart/xy_chart.ts b/x-pack/plugins/lens/common/expressions/xy_chart/xy_chart.ts index 481494d52966f..07fcffd4a278c 100644 --- a/x-pack/plugins/lens/common/expressions/xy_chart/xy_chart.ts +++ b/x-pack/plugins/lens/common/expressions/xy_chart/xy_chart.ts @@ -10,13 +10,32 @@ import type { ExpressionValueSearchContext } from '../../../../../../src/plugins import type { LensMultiTable } from '../../types'; import type { XYArgs } from './xy_args'; import { fittingFunctionDefinitions } from './fitting_function'; -import { logDataTable } from '../expressions_utils'; +import { prepareLogTable } from '../../../../../../src/plugins/visualizations/common/utils'; export interface XYChartProps { data: LensMultiTable; args: XYArgs; } +const strings = { + getMetricHelp: () => + i18n.translate('xpack.lens.xy.logDatatable.metric', { + defaultMessage: 'Vertical axis', + }), + getXAxisHelp: () => + i18n.translate('xpack.lens.xy.logDatatable.x', { + defaultMessage: 'Horizontal axis', + }), + getBreakdownHelp: () => + i18n.translate('xpack.lens.xy.logDatatable.breakDown', { + defaultMessage: 'Break down by', + }), + getReferenceLineHelp: () => + i18n.translate('xpack.lens.xy.logDatatable.breakDown', { + defaultMessage: 'Break down by', + }), +}; + export interface XYRender { type: 'render'; as: 'lens_xy_chart_renderer'; @@ -159,7 +178,22 @@ export const xyChart: ExpressionFunctionDefinition< }, fn(data: LensMultiTable, args: XYArgs, handlers) { if (handlers?.inspectorAdapters?.tables) { - logDataTable(handlers.inspectorAdapters.tables, data.tables); + args.layers.forEach(({ layerId, accessors, xAccessor, splitAccessor, layerType }) => { + const logTable = prepareLogTable( + data.tables[layerId], + [ + [ + accessors ? accessors : undefined, + layerType === 'data' ? strings.getMetricHelp() : strings.getReferenceLineHelp(), + ], + [xAccessor ? [xAccessor] : undefined, strings.getXAxisHelp()], + [splitAccessor ? [splitAccessor] : undefined, strings.getBreakdownHelp()], + ], + true + ); + + handlers.inspectorAdapters.tables.logDatatable(layerId, logTable); + }); } return { type: 'render', diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/expression_function.ts b/x-pack/plugins/maps/public/lens/choropleth_chart/expression_function.ts index 9b2f06d888b07..403f0ed9bfb40 100644 --- a/x-pack/plugins/maps/public/lens/choropleth_chart/expression_function.ts +++ b/x-pack/plugins/maps/public/lens/choropleth_chart/expression_function.ts @@ -6,9 +6,11 @@ */ import type { ExpressionFunctionDefinition } from 'src/plugins/expressions/common'; +import { i18n } from '@kbn/i18n'; import type { LensMultiTable } from '../../../../lens/common'; import type { ChoroplethChartConfig, ChoroplethChartProps } from './types'; import { RENDERER_ID } from './expression_renderer'; +import { prepareLogTable } from '../../../../../../src/plugins/visualizations/common/utils'; interface ChoroplethChartRender { type: 'render'; @@ -56,7 +58,29 @@ export const getExpressionFunction = (): ExpressionFunctionDefinition< }, }, inputTypes: ['lens_multitable'], - fn(data, args) { + fn(data, args, handlers) { + if (handlers?.inspectorAdapters?.tables) { + const logTable = prepareLogTable( + Object.values(data.tables)[0], + [ + [ + args.valueAccessor ? [args.valueAccessor] : undefined, + i18n.translate('xpack.maps.logDatatable.value', { + defaultMessage: 'Value', + }), + ], + [ + args.regionAccessor ? [args.regionAccessor] : undefined, + i18n.translate('xpack.maps.logDatatable.region', { + defaultMessage: 'Region key', + }), + ], + ], + true + ); + + handlers.inspectorAdapters.tables.logDatatable('default', logTable); + } return { type: 'render', as: RENDERER_ID, From 7a480e541c5bb797c82d18eca8151e253a5c0529 Mon Sep 17 00:00:00 2001 From: Joe Reuter Date: Wed, 23 Mar 2022 12:01:20 +0100 Subject: [PATCH 2/4] update tests --- .../heatmap_function.test.ts.snap | 19 +------------------ .../mosaic_vis_function.test.ts.snap | 8 -------- .../treemap_vis_function.test.ts.snap | 8 -------- .../waffle_vis_function.test.ts.snap | 16 ---------------- 4 files changed, 1 insertion(+), 50 deletions(-) diff --git a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/__snapshots__/heatmap_function.test.ts.snap b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/__snapshots__/heatmap_function.test.ts.snap index 7e2a8084d5166..07f4c1e7c91df 100644 --- a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/__snapshots__/heatmap_function.test.ts.snap +++ b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/__snapshots__/heatmap_function.test.ts.snap @@ -2,24 +2,7 @@ exports[`interpreter/functions#heatmap logs correct datatable to inspector 1`] = ` Object { - "columns": Array [ - Object { - "id": "col-0-1", - "meta": Object { - "dimensionName": undefined, - "type": "number", - }, - "name": "Count", - }, - Object { - "id": "col-1-2", - "meta": Object { - "dimensionName": undefined, - "type": "string", - }, - "name": "Dest", - }, - ], + "columns": Array [], "rows": Array [ Object { "col-0-1": 0, diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/__snapshots__/mosaic_vis_function.test.ts.snap b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/__snapshots__/mosaic_vis_function.test.ts.snap index e07e367d10787..81ada60a772cd 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/__snapshots__/mosaic_vis_function.test.ts.snap +++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/__snapshots__/mosaic_vis_function.test.ts.snap @@ -27,14 +27,6 @@ Object { }, "name": "Field 3", }, - Object { - "id": "col-0-4", - "meta": Object { - "dimensionName": undefined, - "type": "number", - }, - "name": "Field 4", - }, ], "rows": Array [ Object { diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/__snapshots__/treemap_vis_function.test.ts.snap b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/__snapshots__/treemap_vis_function.test.ts.snap index ff2a4ece368f8..e1d9f98f57209 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/__snapshots__/treemap_vis_function.test.ts.snap +++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/__snapshots__/treemap_vis_function.test.ts.snap @@ -27,14 +27,6 @@ Object { }, "name": "Field 3", }, - Object { - "id": "col-0-4", - "meta": Object { - "dimensionName": undefined, - "type": "number", - }, - "name": "Field 4", - }, ], "rows": Array [ Object { diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/__snapshots__/waffle_vis_function.test.ts.snap b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/__snapshots__/waffle_vis_function.test.ts.snap index b0905139d3f1b..33525b33f6f96 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/__snapshots__/waffle_vis_function.test.ts.snap +++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/__snapshots__/waffle_vis_function.test.ts.snap @@ -19,22 +19,6 @@ Object { }, "name": "Field 2", }, - Object { - "id": "col-0-3", - "meta": Object { - "dimensionName": undefined, - "type": "number", - }, - "name": "Field 3", - }, - Object { - "id": "col-0-4", - "meta": Object { - "dimensionName": undefined, - "type": "number", - }, - "name": "Field 4", - }, ], "rows": Array [ Object { From b7520c4f3059220961348a8cd04aeaf32e50ec8d Mon Sep 17 00:00:00 2001 From: Joe Reuter Date: Thu, 24 Mar 2022 14:17:15 +0100 Subject: [PATCH 3/4] fix heatmap --- .../heatmap_function.test.ts.snap | 19 ++++++++++++++++++- .../expression_functions/heatmap_function.ts | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/__snapshots__/heatmap_function.test.ts.snap b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/__snapshots__/heatmap_function.test.ts.snap index 07f4c1e7c91df..761b2c3adb156 100644 --- a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/__snapshots__/heatmap_function.test.ts.snap +++ b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/__snapshots__/heatmap_function.test.ts.snap @@ -2,7 +2,24 @@ exports[`interpreter/functions#heatmap logs correct datatable to inspector 1`] = ` Object { - "columns": Array [], + "columns": Array [ + Object { + "id": "col-0-1", + "meta": Object { + "dimensionName": "Metric", + "type": "number", + }, + "name": "Count", + }, + Object { + "id": "col-1-2", + "meta": Object { + "dimensionName": "X axis", + "type": "string", + }, + "name": "Dest", + }, + ], "rows": Array [ Object { "col-0-1": 0, diff --git a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.ts b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.ts index 8858cc43971a6..a1a04af76fd8b 100644 --- a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.ts +++ b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.ts @@ -28,7 +28,7 @@ const convertToVisDimension = ( const column = columns.find((c) => c.id === accessor); if (!column) return; return { - accessor: Number(column.id), + accessor: column, format: { id: column.meta.params?.id, params: { ...column.meta.params?.params }, From 9caba0ff060b6eb61b6e95bb4bc3a98c7e2a2aa9 Mon Sep 17 00:00:00 2001 From: Joe Reuter Date: Thu, 24 Mar 2022 16:02:11 +0100 Subject: [PATCH 4/4] fix annotations --- x-pack/plugins/lens/common/expressions/xy_chart/xy_chart.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/lens/common/expressions/xy_chart/xy_chart.ts b/x-pack/plugins/lens/common/expressions/xy_chart/xy_chart.ts index 45e962fb81610..3c68837defdd9 100644 --- a/x-pack/plugins/lens/common/expressions/xy_chart/xy_chart.ts +++ b/x-pack/plugins/lens/common/expressions/xy_chart/xy_chart.ts @@ -193,7 +193,11 @@ export const xyChart: ExpressionFunctionDefinition< }, fn(data: LensMultiTable, args: XYArgs, handlers) { if (handlers?.inspectorAdapters?.tables) { - args.layers.forEach(({ layerId, accessors, xAccessor, splitAccessor, layerType }) => { + args.layers.forEach((layer) => { + if (layer.layerType === 'annotations') { + return; + } + const { layerId, accessors, xAccessor, splitAccessor, layerType } = layer; const logTable = prepareLogTable( data.tables[layerId], [