From 90b6442ca65b732a128148a6c60d1db8ff8bad1f Mon Sep 17 00:00:00 2001
From: Uladzislau Lasitsa <Uladzislau_Lasitsa@epam.com>
Date: Mon, 5 Oct 2020 19:46:02 +0300
Subject: [PATCH] [Visualize] Horizontal Bar Graph Visualizations have Vertical
 Bar Graph Type (#78536)

* Fixed useEffect in metric_axes. Update type in params instead of type of vis

* Fixed tests

* Fixed tests

* Update current chart type definition

Co-authored-by: sulemanof <daniil_suleiman@epam.com>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../options/metrics_axes/index.test.tsx       | 28 -------------------
 .../components/options/metrics_axes/index.tsx | 11 +-------
 .../options/point_series/point_series.tsx     |  9 ++++--
 src/plugins/vis_type_vislib/public/types.ts   |  1 +
 4 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.test.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.test.tsx
index 524792d1460fe..0cc737f19e5c6 100644
--- a/src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.test.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.test.tsx
@@ -134,34 +134,6 @@ describe('MetricsAxisOptions component', () => {
       const updatedSeries = [{ ...chart, data: { id: agg.id, label: agg.makeLabel() } }];
       expect(setValue).toHaveBeenCalledWith(SERIES_PARAMS, updatedSeries);
     });
-
-    it('should update visType when one seriesParam', () => {
-      const comp = mount(<MetricsAxisOptions {...defaultProps} />);
-      expect(defaultProps.vis.type.type).toBe(ChartTypes.AREA);
-
-      comp.setProps({
-        stateParams: {
-          ...defaultProps.stateParams,
-          seriesParams: [{ ...chart, type: ChartTypes.LINE }],
-        },
-      });
-
-      expect(defaultProps.vis.setState).toHaveBeenLastCalledWith({ type: ChartTypes.LINE });
-    });
-
-    it('should set histogram visType when multiple seriesParam', () => {
-      const comp = mount(<MetricsAxisOptions {...defaultProps} />);
-      expect(defaultProps.vis.type.type).toBe(ChartTypes.AREA);
-
-      comp.setProps({
-        stateParams: {
-          ...defaultProps.stateParams,
-          seriesParams: [chart, { ...chart, type: ChartTypes.LINE }],
-        },
-      });
-
-      expect(defaultProps.vis.setState).toHaveBeenLastCalledWith({ type: ChartTypes.HISTOGRAM });
-    });
   });
 
   describe('updateAxisTitle', () => {
diff --git a/src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.tsx
index d885f8fb0b12f..18687404b9114 100644
--- a/src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.tsx
@@ -18,7 +18,7 @@
  */
 
 import React, { useState, useEffect, useCallback, useMemo } from 'react';
-import { cloneDeep, uniq, get } from 'lodash';
+import { cloneDeep, get } from 'lodash';
 import { EuiSpacer } from '@elastic/eui';
 
 import { IAggConfig } from 'src/plugins/data/public';
@@ -293,15 +293,6 @@ function MetricsAxisOptions(props: ValidationVisOptionsProps<BasicVislibParams>)
     updateAxisTitle(updatedSeries);
   }, [metrics, firstValueAxesId, setValue, stateParams.seriesParams, updateAxisTitle]);
 
-  const visType = useMemo(() => {
-    const types = uniq(stateParams.seriesParams.map(({ type }) => type));
-    return types.length === 1 ? types[0] : 'histogram';
-  }, [stateParams.seriesParams]);
-
-  useEffect(() => {
-    vis.setState({ ...vis.serialize(), type: visType });
-  }, [vis, visType]);
-
   return isTabSelected ? (
     <>
       <SeriesPanel
diff --git a/src/plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx b/src/plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx
index a27d0be8018c9..18073d2218877 100644
--- a/src/plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
+import React, { useMemo } from 'react';
 import { EuiPanel, EuiTitle, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { uniq } from 'lodash';
 
 import { ValidationVisOptionsProps } from '../../common';
 import { BasicOptions, SwitchOption } from '../../../../../charts/public';
@@ -31,6 +32,10 @@ import { ChartTypes } from '../../../utils/collections';
 function PointSeriesOptions(props: ValidationVisOptionsProps<BasicVislibParams>) {
   const { stateParams, setValue, vis } = props;
 
+  const currentChartTypes = useMemo(() => uniq(stateParams.seriesParams.map(({ type }) => type)), [
+    stateParams.seriesParams,
+  ]);
+
   return (
     <>
       <EuiPanel paddingSize="s">
@@ -68,7 +73,7 @@ function PointSeriesOptions(props: ValidationVisOptionsProps<BasicVislibParams>)
           />
         )}
 
-        {vis.type.name === ChartTypes.HISTOGRAM && (
+        {currentChartTypes.includes(ChartTypes.HISTOGRAM) && (
           <SwitchOption
             data-test-subj="showValuesOnChart"
             label={i18n.translate('visTypeVislib.editors.pointSeries.showLabels', {
diff --git a/src/plugins/vis_type_vislib/public/types.ts b/src/plugins/vis_type_vislib/public/types.ts
index 83d0b49b1c551..a29f0bcb5c52a 100644
--- a/src/plugins/vis_type_vislib/public/types.ts
+++ b/src/plugins/vis_type_vislib/public/types.ts
@@ -93,4 +93,5 @@ export interface BasicVislibParams extends CommonVislibParams {
   };
   seriesParams: SeriesParam[];
   times: TimeMarker[];
+  type: string;
 }