From 0b9fe763faeb4e6c421071937432fbdaf7a0bf5e Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Tue, 22 Sep 2020 10:28:37 -0400
Subject: [PATCH] make use of currentLayerType consistent

---
 .../update_source_editor.test.tsx.snap        | 62 +------------------
 .../update_source_editor.js                   |  6 +-
 .../update_source_editor.test.tsx             |  8 +--
 3 files changed, 5 insertions(+), 71 deletions(-)

diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/__snapshots__/update_source_editor.test.tsx.snap b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/__snapshots__/update_source_editor.test.tsx.snap
index 97d51e77fb87cf..dfce6b36396a75 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/__snapshots__/update_source_editor.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/__snapshots__/update_source_editor.test.tsx.snap
@@ -60,7 +60,7 @@ exports[`source editor geo_grid_source default vector layer config should allow
 </Fragment>
 `;
 
-exports[`source editor geo_grid_source should put limitations based on heatmap-rendering selection should disable multiple metrics 1`] = `
+exports[`source editor geo_grid_source should put limitations based on heatmap-rendering selection should not allow super-fine option for heatmaps and should not allow multiple metrics 1`] = `
 <Fragment>
   <EuiPanel>
     <EuiTitle
@@ -88,66 +88,6 @@ exports[`source editor geo_grid_source should put limitations based on heatmap-r
   <EuiSpacer
     size="s"
   />
-  <EuiPanel>
-    <EuiTitle
-      size="xs"
-    >
-      <h6>
-        <FormattedMessage
-          defaultMessage="Grid parameters"
-          id="xpack.maps.source.esGrid.geoTileGridLabel"
-          values={Object {}}
-        />
-      </h6>
-    </EuiTitle>
-    <EuiSpacer
-      size="m"
-    />
-    <ResolutionEditor
-      includeSuperFine={true}
-      onChange={[Function]}
-      resolution="COARSE"
-    />
-    <RenderAsSelect
-      isColumnCompressed={true}
-      onChange={[Function]}
-      renderAs="heatmap"
-    />
-  </EuiPanel>
-  <EuiSpacer
-    size="s"
-  />
-</Fragment>
-`;
-
-exports[`source editor geo_grid_source should put limitations based on heatmap-rendering selection should not allow super-fine option for heatmaps 1`] = `
-<Fragment>
-  <EuiPanel>
-    <EuiTitle
-      size="xs"
-    >
-      <h6>
-        <FormattedMessage
-          defaultMessage="Metrics"
-          id="xpack.maps.source.esGrid.metricsLabel"
-          values={Object {}}
-        />
-      </h6>
-    </EuiTitle>
-    <EuiSpacer
-      size="m"
-    />
-    <MetricsEditor
-      allowMultipleMetrics={true}
-      fields={null}
-      metrics={Array []}
-      metricsFilter={null}
-      onChange={[Function]}
-    />
-  </EuiPanel>
-  <EuiSpacer
-    size="s"
-  />
   <EuiPanel>
     <EuiTitle
       size="xs"
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.js
index daf19d2a6f0bd4..7e885c291b952e 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.js
@@ -6,7 +6,7 @@
 
 import React, { Fragment, Component } from 'react';
 
-import { GRID_RESOLUTION, LAYER_TYPE, RENDER_AS } from '../../../../common/constants';
+import { GRID_RESOLUTION, LAYER_TYPE } from '../../../../common/constants';
 import { MetricsEditor } from '../../../components/metrics_editor';
 import { getIndexPatternService } from '../../../kibana_services';
 import { ResolutionEditor } from './resolution_editor';
@@ -89,13 +89,13 @@ export class UpdateSourceEditor extends Component {
 
   _renderMetricsPanel() {
     const metricsFilter =
-      this.props.renderAs === RENDER_AS.HEATMAP
+      this.props.currentLayerType === LAYER_TYPE.HEATMAP
         ? (metric) => {
             //these are countable metrics, where blending heatmap color blobs make sense
             return isMetricCountable(metric.value);
           }
         : null;
-    const allowMultipleMetrics = this.props.renderAs !== RENDER_AS.HEATMAP;
+    const allowMultipleMetrics = this.props.currentLayerType !== LAYER_TYPE.HEATMAP;
     return (
       <EuiPanel>
         <EuiTitle size="xs">
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.test.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.test.tsx
index 2d9dce6c82f882..ceb79230bc8320 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.test.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.test.tsx
@@ -29,17 +29,11 @@ describe('source editor geo_grid_source', () => {
   });
 
   describe('should put limitations based on heatmap-rendering selection', () => {
-    test('should not allow super-fine option for heatmaps', async () => {
+    test('should not allow super-fine option for heatmaps and should not allow multiple metrics', async () => {
       const component = shallow(
         <UpdateSourceEditor {...defaultProps} currentLayerType={LAYER_TYPE.HEATMAP} />
       );
       expect(component).toMatchSnapshot();
     });
-    test('should disable multiple metrics', async () => {
-      const component = shallow(
-        <UpdateSourceEditor {...defaultProps} renderAs={RENDER_AS.HEATMAP} />
-      );
-      expect(component).toMatchSnapshot();
-    });
   });
 });