expression fix

elastic · Jul 1, 2020 · 9f42172 · 9f42172
1 parent 9cf9232
commit 9f42172
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 20 deletions.
diff --git a/x-pack/plugins/lens/public/xy_visualization/color_configuration.ts b/x-pack/plugins/lens/public/xy_visualization/color_configuration.ts
diff --git a/x-pack/plugins/lens/public/xy_visualization/to_expression.ts b/x-pack/plugins/lens/public/xy_visualization/to_expression.ts
@@ -188,8 +188,8 @@ export const buildExpression = (
                               function: 'lens_xy_yConfig',
                               arguments: {
                                 forAccessor: [yConfig.forAccessor],
-                                axisMode: [yConfig.axisMode],
-                                color: [yConfig.color],
+                                axisMode: yConfig.axisMode ? [yConfig.axisMode] : [],
+                                color: yConfig.color ? [yConfig.color] : [],
                               },
                             },
                           ],

diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.tsx
@@ -186,16 +186,20 @@ const ColorPicker = ({
 
   const handleColor: EuiColorPickerProps['onChange'] = (newColor, output) => {
     setColor(newColor, output);
-    if (output.isValid) {
+
+    if (output.isValid || newColor === '') {
       const newYConfigs = [...(layer.yConfig || [])];
       const existingIndex = newYConfigs.findIndex((yConfig) => yConfig.forAccessor === accessor);
       if (existingIndex !== -1) {
-        newYConfigs[existingIndex].color = newColor;
+        if (newColor === '') {
+          delete newYConfigs[existingIndex].color;
+        } else {
+          newYConfigs[existingIndex].color = newColor;
+        }
       } else {
         newYConfigs.push({
           forAccessor: accessor,
           color: newColor,
-          axisMode: 'auto',
         });
       }
       setState(updateLayer(state, { ...layer, yConfig: newYConfigs }, index));