[Maps] clear transient layer when required fields are cleared (#31726)

* [Maps] clear transient layer when required fields are cleared * review feedback
elastic · Feb 22, 2019 · 0b14bb4 · 0b14bb4
1 parent 4c5d281
commit 0b14bb4
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 17 deletions.
diff --git a/x-pack/plugins/maps/public/components/layer_addpanel/view.js b/x-pack/plugins/maps/public/components/layer_addpanel/view.js
@@ -31,6 +31,12 @@ export class AddLayerPanel extends Component {
   }
 
   _previewLayer = (source) => {
+    if (!source) {
+      this.setState({ layer: null });
+      this.props.removeTransientLayer();
+      return;
+    }
+
     this.setState({
       layer: source.createDefaultLayer({}, this.props.mapColors)
     },

diff --git a/x-pack/plugins/maps/public/shared/layers/sources/es_geo_grid_source/create_source_editor.js b/x-pack/plugins/maps/public/shared/layers/sources/es_geo_grid_source/create_source_editor.js
@@ -129,13 +129,11 @@ export class CreateSourceEditor extends Component {
       geoField,
       requestType
     } = this.state;
-    if (indexPatternId && geoField) {
-      this.props.onSelect({
-        indexPatternId,
-        geoField,
-        requestType: requestType.value
-      });
-    }
+
+    const sourceConfig = (indexPatternId && geoField)
+      ? { indexPatternId, geoField, requestType: requestType.value }
+      : null;
+    this.props.onSelect(sourceConfig);
   };
 
   _onNoIndexPatterns = () => {

diff --git a/x-pack/plugins/maps/public/shared/layers/sources/es_geo_grid_source/es_geo_grid_source.js b/x-pack/plugins/maps/public/shared/layers/sources/es_geo_grid_source/es_geo_grid_source.js
@@ -66,6 +66,11 @@ export class ESGeoGridSource extends AbstractESSource {
 
   static renderEditor({ onPreviewSource, inspectorAdapters }) {
     const onSelect = (sourceConfig) => {
+      if (!sourceConfig) {
+        onPreviewSource(null);
+        return;
+      }
+
       const sourceDescriptor = ESGeoGridSource.createDescriptor(sourceConfig);
       const source = new ESGeoGridSource(sourceDescriptor, inspectorAdapters);
       onPreviewSource(source);

diff --git a/x-pack/plugins/maps/public/shared/layers/sources/es_search_source/create_source_editor.js b/x-pack/plugins/maps/public/shared/layers/sources/es_search_source/create_source_editor.js
@@ -108,12 +108,11 @@ export class CreateSourceEditor extends Component {
       indexPatternId,
       geoField,
     } = this.state;
-    if (indexPatternId && geoField) {
-      this.props.onSelect({
-        indexPatternId,
-        geoField,
-      });
-    }
+
+    const sourceConfig = (indexPatternId && geoField)
+      ? { indexPatternId, geoField }
+      : null;
+    this.props.onSelect(sourceConfig);
   }
 
   _onNoIndexPatterns = () => {

diff --git a/x-pack/plugins/maps/public/shared/layers/sources/es_search_source/es_search_source.js b/x-pack/plugins/maps/public/shared/layers/sources/es_search_source/es_search_source.js
@@ -22,12 +22,17 @@ export class ESSearchSource extends AbstractESSource {
   static description = 'Geospatial data from a Kibana index pattern';
 
   static renderEditor({ onPreviewSource, inspectorAdapters }) {
-    const onSelect = (layerConfig) => {
-      const layerSource = new ESSearchSource({
+    const onSelect = (sourceConfig) => {
+      if (!sourceConfig) {
+        onPreviewSource(null);
+        return;
+      }
+
+      const source = new ESSearchSource({
         id: uuid(),
-        ...layerConfig
+        ...sourceConfig
       }, inspectorAdapters);
-      onPreviewSource(layerSource);
+      onPreviewSource(source);
     };
     return (<CreateSourceEditor onSelect={onSelect}/>);
   }