Fixed parent pipeline aggregation, multi split series and respect Show values option

Author: VladLasitsa

src/plugins/vis_types/xy/public/convert_to_lens/configurations/index.test.ts

@@ -23,6 +23,7 @@ describe('getConfiguration', () => {
         { columnId: '2', isBucketed: true, isSplit: false, operationType: 'date_histogram' },
         { columnId: '3', isBucketed: true, isSplit: true },
       ] as Column[],
+      metrics: ['1'],
       columnOrder: [],
       seriesId: '1',
       collapseFn: 'max',
@@ -35,6 +36,7 @@ describe('getConfiguration', () => {
         { columnId: '4', isBucketed: false },
         { columnId: '5', isBucketed: true, isSplit: false, operationType: 'date_histogram' },
       ] as Column[],
+      metrics: ['4'],
       columnOrder: [],
       seriesId: '2',
       collapseFn: undefined,
@@ -45,6 +47,7 @@ describe('getConfiguration', () => {
       layerId: 'layer-3',
       columns: [{ columnId: '7', isBucketed: false }] as Column[],
       columnOrder: [],
+      metrics: ['7'],
       seriesId: '',
       collapseFn: undefined,
       isReferenceLineLayer: true,
@@ -143,6 +146,7 @@ describe('getConfiguration', () => {
       },
       tickLabelsVisibilitySettings: { x: true, yLeft: true, yRight: true },
       valueLabels: 'hide',
+      valuesInLegend: false,
       xTitle: undefined,
       yLeftExtent: { enforce: true, lowerBound: undefined, mode: 'full', upperBound: undefined },
       yLeftScale: 'linear',

src/plugins/vis_types/xy/public/convert_to_lens/configurations/index.ts

@@ -113,12 +113,6 @@ function getDataLayers(
 ): XYDataLayerConfig[] {
   return layers.map((layer) => {
     const xColumn = layer.columns.find((c) => c.isBucketed && !c.isSplit);
-    const yAccessors = layer.columns.reduce<string[]>((acc, column) => {
-      if (!column.isBucketed) {
-        acc.push(column.columnId);
-      }
-      return acc;
-    }, []);
     const splitAccessor = layer.columns.find(
       (column) => column.isBucketed && column.isSplit
     )?.columnId;
@@ -134,15 +128,15 @@ function getDataLayers(
     const seriesType = getSeriesType(serie?.type, serie?.mode, isHorizontal, isPercentage);
     return {
       layerId: layer.layerId,
-      accessors: yAccessors,
+      accessors: layer.metrics,
       layerType: 'data',
       seriesType,
       xAccessor: xColumn?.columnId,
       simpleView: false,
       splitAccessor,
       palette: vis.params.palette ?? vis.type.visConfig.defaults.palette,
-      yConfig: yAccessors.map((accessor) => ({
-        forAccessor: accessor,
+      yConfig: layer.metrics.map((metricId) => ({
+        forAccessor: metricId,
         axisMode: getYAxisPosition(yAxis?.position ?? 'left'),
       })),
       xScaleType: getXScaleType(xColumn),
@@ -153,15 +147,7 @@ function getDataLayers(
 }
 
 function getReferenceLineLayers(
-  layers: Array<{
-    indexPatternId: string;
-    layerId: string;
-    columns: Column[];
-    columnOrder: never[];
-    seriesId: string;
-    isReferenceLineLayer: boolean;
-    collapseFn?: string;
-  }>,
+  layers: Layer[],
   vis: Vis<VisParams>
 ): XYReferenceLineLayerConfig[] {
   const thresholdLineConfig = vis.params.thresholdLine ?? vis.type.visConfig.defaults.thresholdLine;
@@ -171,10 +157,10 @@ function getReferenceLineLayers(
     return {
       layerType: 'referenceLine',
       layerId: layer.layerId,
-      accessors: layer.columns.map((c) => c.columnId),
-      yConfig: layer.columns.map((c) => {
+      accessors: layer.metrics,
+      yConfig: layer.metrics.map((metricId) => {
         return {
-          forAccessor: c.columnId,
+          forAccessor: metricId,
           axisMode: getYAxisPosition(yAxis?.position ?? 'left'),
           color: thresholdLineConfig.color,
           lineWidth: thresholdLineConfig.width !== null ? thresholdLineConfig.width : undefined,
@@ -261,6 +247,7 @@ export const getConfiguration = (
     xTitle: xAxis.title.text,
     valueLabels:
       vis.params.labels.show ?? vis.type.visConfig.defaults.labels?.show ? 'show' : 'hide',
+    valuesInLegend: Boolean(vis.params.labels.show ?? vis.type.visConfig.defaults.labels?.show),
     curveType: getCurveType(
       series[0].interpolate === InterpolationMode.StepAfter
         ? InterpolationMode.Linear

src/plugins/vis_types/xy/public/convert_to_lens/index.test.ts

@@ -49,6 +49,16 @@ describe('convertToLens', () => {
     expect(result).toBeNull();
   });
 
+  test('should return null if  multi split series defined', async () => {
+    mockGetVisSchemas.mockReturnValue({
+      metric: [{ aggId: '1' }],
+      group: [{}, {}],
+    });
+    const result = await convertToLens(sampleAreaVis as any, { getAbsoluteTime: () => {} } as any);
+    expect(mockGetVisSchemas).toBeCalledTimes(1);
+    expect(result).toBeNull();
+  });
+
   test('should return null if sibling pipeline agg defined together with split series', async () => {
     mockGetColumnsFromVis.mockReturnValue([
       {

src/plugins/vis_types/xy/public/convert_to_lens/index.ts

@@ -20,6 +20,7 @@ export interface Layer {
   indexPatternId: string;
   layerId: string;
   columns: Column[];
+  metrics: string[];
   columnOrder: never[];
   seriesId: string;
   isReferenceLineLayer: boolean;
@@ -58,6 +59,11 @@ export const convertToLens: ConvertXYToLensVisualization = async (vis, timefilte
     timeRange: timefilter.getAbsoluteTime(),
   });
 
+  // doesn't support multi split series
+  if (visSchemas.group && visSchemas.group.length > 1) {
+    return null;
+  }
+
   const firstValueAxesId = vis.params.valueAxes[0].id;
   const updatedSeries = getSeriesParams(
     vis.data.aggs,
@@ -146,6 +152,7 @@ export const convertToLens: ConvertXYToLensVisualization = async (vis, timefilte
       indexPatternId,
       layerId,
       columns: l.columns.map(excludeMetaFromColumn),
+      metrics: l.metrics,
       columnOrder: [],
       seriesId: series?.data.id!,
       collapseFn,
@@ -154,11 +161,13 @@ export const convertToLens: ConvertXYToLensVisualization = async (vis, timefilte
   });
 
   if (vis.params.thresholdLine.show) {
+    const staticValueColumn = createStaticValueColumn(vis.params.thresholdLine.value || 0);
     layers.push({
       indexPatternId,
       layerId: uuid.default(),
-      columns: [createStaticValueColumn(vis.params.thresholdLine.value || 0)],
+      columns: [staticValueColumn],
       columnOrder: [],
+      metrics: [staticValueColumn.columnId],
       isReferenceLineLayer: true,
       collapseFn: undefined,
       seriesId: '',

src/plugins/vis_types/xy/public/to_ast.ts

@@ -434,6 +434,7 @@ export const toExpressionAst: VisToExpressionAst<VisParams> = async (vis, params
     splitColumnAccessor: dimensions.splitColumn?.map(prepareVisDimension),
     splitRowAccessor: dimensions.splitRow?.map(prepareVisDimension),
     valueLabels: vis.params.labels.show ? 'show' : 'hide',
+    valuesInLegend: vis.params.labels.show,
     singleTable: true,
   });