[Lens] Add log and sqrt scale (#131940)

* add log and sqrt scale * Update axis_settings_popover.tsx * fix types * carry over scale types * fix test * bump limit ever so slightly Co-authored-by: Stratoula Kalafateli <efstratia.kalafateli@elastic.co>
elastic · May 16, 2022 · b1473f8 · b1473f8
1 parent ee22d7e
commit b1473f8
Show file tree

Hide file tree

Showing 27 changed files with 150 additions and 65 deletions.
diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
@@ -128,5 +128,5 @@ pageLoadAssetSize:
   eventAnnotation: 19334
   screenshotting: 22870
   synthetics: 40958
-  expressionXY: 30000
+  expressionXY: 31000
   kibanaUsageCollection: 16463
diff --git a/src/plugins/chart_expressions/expression_xy/common/__mocks__/index.ts b/src/plugins/chart_expressions/expression_xy/common/__mocks__/index.ts
@@ -56,7 +56,6 @@ export const sampleLayer: DataLayerConfig = {
   splitAccessor: 'd',
   columnToLabel: '{"a": "Label A", "b": "Label B", "d": "Label D"}',
   xScaleType: 'ordinal',
-  yScaleType: 'linear',
   isHistogram: false,
   palette: mockPaletteOutput,
   table: createSampleDatatableWithRows([]),
@@ -108,6 +107,8 @@ export const createArgsWithLayers = (
     type: 'axisExtentConfig',
   },
   layers: Array.isArray(layers) ? layers : [layers],
+  yLeftScale: 'linear',
+  yRightScale: 'linear',
 });
 
 export function sampleArgs() {

diff --git a/...ins/chart_expressions/expression_xy/common/expression_functions/common_data_layer_args.ts b/...ins/chart_expressions/expression_xy/common/expression_functions/common_data_layer_args.ts
@@ -7,7 +7,7 @@
  */
 
 import { ArgumentType } from '@kbn/expressions-plugin/common';
-import { SeriesTypes, XScaleTypes, YScaleTypes, Y_CONFIG } from '../constants';
+import { SeriesTypes, XScaleTypes, Y_CONFIG } from '../constants';
 import { strings } from '../i18n';
 import { DataLayerArgs, ExtendedDataLayerArgs } from '../types';
 
@@ -44,12 +44,6 @@ export const commonDataLayerArgs: Omit<
     default: false,
     help: strings.getIsHistogramHelp(),
   },
-  yScaleType: {
-    options: [...Object.values(YScaleTypes)],
-    help: strings.getYScaleTypeHelp(),
-    default: YScaleTypes.LINEAR,
-    strict: true,
-  },
   yConfig: {
     types: [Y_CONFIG],
     help: strings.getYConfigHelp(),

diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/common_xy_args.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/common_xy_args.ts
@@ -17,6 +17,7 @@ import {
   TICK_LABELS_CONFIG,
   ValueLabelModes,
   XYCurveTypes,
+  YScaleTypes,
 } from '../constants';
 import { strings } from '../i18n';
 import { LayeredXyVisFn, XyVisFn } from '../types';
@@ -46,6 +47,18 @@ export const commonXYArgs: CommonXYFn['args'] = {
     help: strings.getYRightExtentHelp(),
     default: `{${AXIS_EXTENT_CONFIG}}`,
   },
+  yLeftScale: {
+    options: [...Object.values(YScaleTypes)],
+    help: strings.getYLeftScaleTypeHelp(),
+    default: YScaleTypes.LINEAR,
+    strict: true,
+  },
+  yRightScale: {
+    options: [...Object.values(YScaleTypes)],
+    help: strings.getYRightScaleTypeHelp(),
+    default: YScaleTypes.LINEAR,
+    strict: true,
+  },
   legend: {
     types: [LEGEND_CONFIG],
     help: strings.getLegendHelp(),

diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis_fn.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis_fn.ts
@@ -31,7 +31,6 @@ const createDataLayer = (args: XYArgs, table: Datatable): DataLayerConfigResult
   seriesType: args.seriesType,
   hide: args.hide,
   columnToLabel: args.columnToLabel,
-  yScaleType: args.yScaleType,
   xScaleType: args.xScaleType,
   isHistogram: args.isHistogram,
   palette: args.palette,
@@ -55,7 +54,6 @@ export const xyVisFn: XyVisFn['fn'] = async (data, args, handlers) => {
     hide,
     splitAccessor,
     columnToLabel,
-    yScaleType,
     xScaleType,
     isHistogram,
     yConfig,

diff --git a/src/plugins/chart_expressions/expression_xy/common/i18n/index.tsx b/src/plugins/chart_expressions/expression_xy/common/i18n/index.tsx
@@ -49,6 +49,14 @@ export const strings = {
     i18n.translate('expressionXY.xyVis.yRightExtent.help', {
       defaultMessage: 'Y right axis extents',
     }),
+  getYLeftScaleTypeHelp: () =>
+    i18n.translate('expressionXY.xyVis.yLeftScaleType.help', {
+      defaultMessage: 'The scale type of the left y axis',
+    }),
+  getYRightScaleTypeHelp: () =>
+    i18n.translate('expressionXY.xyVis.yRightScaleType.help', {
+      defaultMessage: 'The scale type of the right y axis',
+    }),
   getLegendHelp: () =>
     i18n.translate('expressionXY.xyVis.legend.help', {
       defaultMessage: 'Configure the chart legend.',
@@ -149,10 +157,6 @@ export const strings = {
     i18n.translate('expressionXY.dataLayer.isHistogram.help', {
       defaultMessage: 'Whether to layout the chart as a histogram',
     }),
-  getYScaleTypeHelp: () =>
-    i18n.translate('expressionXY.dataLayer.yScaleType.help', {
-      defaultMessage: 'The scale type of the y axes',
-    }),
   getSplitAccessorHelp: () =>
     i18n.translate('expressionXY.dataLayer.splitAccessor.help', {
       defaultMessage: 'The column to split by',

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
@@ -101,7 +101,6 @@ export interface DataLayerArgs {
   hide?: boolean;
   splitAccessor?: string | ExpressionValueVisDimension;
   columnToLabel?: string; // Actually a JSON key-value pair
-  yScaleType: YScaleType;
   xScaleType: XScaleType;
   isHistogram: boolean;
   palette: PaletteOutput;
@@ -120,7 +119,6 @@ export interface ExtendedDataLayerArgs {
   hide?: boolean;
   splitAccessor?: string;
   columnToLabel?: string; // Actually a JSON key-value pair
-  yScaleType: YScaleType;
   xScaleType: XScaleType;
   isHistogram: boolean;
   palette: PaletteOutput;
@@ -187,6 +185,8 @@ export interface XYArgs extends DataLayerArgs {
   yRightTitle: string;
   yLeftExtent: AxisExtentConfigResult;
   yRightExtent: AxisExtentConfigResult;
+  yLeftScale: YScaleType;
+  yRightScale: YScaleType;
   legend: LegendConfigResult;
   endValue?: EndValue;
   emphasizeFitting?: boolean;
@@ -213,6 +213,8 @@ export interface LayeredXYArgs {
   yRightTitle: string;
   yLeftExtent: AxisExtentConfigResult;
   yRightExtent: AxisExtentConfigResult;
+  yLeftScale: YScaleType;
+  yRightScale: YScaleType;
   legend: LegendConfigResult;
   endValue?: EndValue;
   emphasizeFitting?: boolean;
@@ -236,6 +238,8 @@ export interface XYProps {
   yRightTitle: string;
   yLeftExtent: AxisExtentConfigResult;
   yRightExtent: AxisExtentConfigResult;
+  yLeftScale: YScaleType;
+  yRightScale: YScaleType;
   legend: LegendConfigResult;
   endValue?: EndValue;
   emphasizeFitting?: boolean;

diff --git a/src/plugins/chart_expressions/expression_xy/public/__mocks__/index.tsx b/src/plugins/chart_expressions/expression_xy/public/__mocks__/index.tsx
@@ -164,7 +164,6 @@ export const dateHistogramLayer: DataLayerConfig = {
   layerType: LayerTypes.DATA,
   hide: false,
   xAccessor: 'xAccessorId',
-  yScaleType: 'linear',
   xScaleType: 'time',
   isHistogram: true,
   splitAccessor: 'splitAccessorId',

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/legend_action.test.tsx b/src/plugins/chart_expressions/expression_xy/public/components/legend_action.test.tsx
@@ -162,7 +162,6 @@ const sampleLayer: DataLayerConfig = {
   splitAccessor: 'splitAccessorId',
   columnToLabel: '{"a": "Label A", "b": "Label B", "d": "Label D"}',
   xScaleType: 'ordinal',
-  yScaleType: 'linear',
   isHistogram: false,
   palette: mockPaletteOutput,
   table,