[ML] Fixes series color in data visualizer metric distribution chart (#…

…44499)
elastic · Sep 2, 2019 · 51cfa8f · 51cfa8f
1 parent 993f4c4
commit 51cfa8f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 34 deletions.
diff --git a/...izer/index_based/components/field_data_card/document_count_chart/document_count_chart.tsx b/...izer/index_based/components/field_data_card/document_count_chart/document_count_chart.tsx
@@ -12,7 +12,6 @@ import {
   Axis,
   BarSeries,
   Chart,
-  DataSeriesColorsValues,
   getAxisId,
   getSpecId,
   niceTimeFormatter,
@@ -59,22 +58,23 @@ export const DocumentCountChart: FC<Props> = ({
 
   const dateFormatter = niceTimeFormatter([timeRangeEarliest, timeRangeLatest]);
 
-  // TODO - switch to use inline areaSeriesStyle to set series fill once charts version is 8.0.0+
   const IS_DARK_THEME = useUiChromeContext()
     .getUiSettingsClient()
     .get('theme:darkMode');
   const themeName = IS_DARK_THEME ? darkTheme : lightTheme;
   const EVENT_RATE_COLOR = themeName.euiColorVis2;
-  const barSeriesColorValues: DataSeriesColorsValues = {
-    colorValues: [],
-    specId: getSpecId(SPEC_ID),
-  };
-  const seriesColors = new Map([[barSeriesColorValues, EVENT_RATE_COLOR]]);
 
   return (
     <div style={{ width, height }}>
       <Chart>
-        <Settings xDomain={xDomain} />
+        <Settings
+          xDomain={xDomain}
+          theme={{
+            colors: {
+              vizColors: [EVENT_RATE_COLOR],
+            },
+          }}
+        />
         <Axis
           id={getAxisId('bottom')}
           position={Position.Bottom}
@@ -91,7 +91,6 @@ export const DocumentCountChart: FC<Props> = ({
           yAccessors={['value']}
           // Display empty chart when no data in range
           data={chartPoints.length > 0 ? chartPoints : [{ time: timeRangeEarliest, value: 0 }]}
-          customSeriesColors={seriesColors}
         />
       </Chart>
     </div>

diff --git a/..._based/components/field_data_card/metric_distribution_chart/metric_distribution_chart.tsx b/..._based/components/field_data_card/metric_distribution_chart/metric_distribution_chart.tsx
@@ -13,7 +13,6 @@ import {
   Axis,
   Chart,
   CurveType,
-  DataSeriesColorsValues,
   getAxisId,
   getSpecId,
   Position,
@@ -55,17 +54,11 @@ export const MetricDistributionChart: FC<Props> = ({ width, height, chartData, f
     defaultMessage: 'distribution',
   });
 
-  // TODO - switch to use inline areaSeriesStyle to set series fill once charts version is 8.0.0+
   const IS_DARK_THEME = useUiChromeContext()
     .getUiSettingsClient()
     .get('theme:darkMode');
   const themeName = IS_DARK_THEME ? darkTheme : lightTheme;
-  const EVENT_RATE_COLOR = themeName.euiColorVis1;
-  const seriesColorValues: DataSeriesColorsValues = {
-    colorValues: [],
-    specId: getSpecId(SPEC_ID),
-  };
-  const seriesColors = new Map([[seriesColorValues, EVENT_RATE_COLOR]]);
+  const AREA_SERIES_COLOR = themeName.euiColorVis1;
 
   const headerFormatter: TooltipValueFormatter = (tooltipData: TooltipValue) => {
     const xValue = tooltipData.value;
@@ -87,9 +80,11 @@ export const MetricDistributionChart: FC<Props> = ({ width, height, chartData, f
       <Chart>
         <Settings
           theme={{
+            colors: {
+              vizColors: [AREA_SERIES_COLOR],
+            },
             areaSeriesStyle: {
               line: {
-                stroke: 'red',
                 strokeWidth: 1,
                 visible: true,
               },
@@ -98,7 +93,7 @@ export const MetricDistributionChart: FC<Props> = ({ width, height, chartData, f
                 radius: 0,
                 opacity: 0,
               },
-              area: { fill: 'red', visible: true, opacity: 1 },
+              area: { visible: true, opacity: 1 },
             },
           }}
           tooltip={{ headerFormatter }}
@@ -123,21 +118,6 @@ export const MetricDistributionChart: FC<Props> = ({ width, height, chartData, f
           yAccessors={['y']}
           data={chartData.length > 0 ? chartData : [{ x: 0, y: 0 }]}
           curve={CurveType.CURVE_STEP_AFTER}
-          // TODO - switch to use inline areaSeriesStyle to set series fill once charts version is 8.0.0+
-          // areaSeriesStyle={{
-          //   line: {
-          //     stroke: 'red',
-          //     strokeWidth: 0,
-          //     visible: false,
-          //   },
-          //   point: {
-          //     visible: false,
-          //     radius: 0,
-          //     opacity: 0,
-          //   },
-          //   area: { fill: 'red', visible: true, opacity: 1 },
-          // }}
-          customSeriesColors={seriesColors}
         />
       </Chart>
     </div>