From aaf17fd0b7cac838c51ee219898be2338b227d6b Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Thu, 25 Jun 2020 09:17:33 -0600
Subject: [PATCH] review feedback

---
 .../layer_template.test.tsx.snap              | 107 ++++++++++++++++++
 .../create_choropleth_layer_descriptor.ts     |   1 +
 .../layer_template.test.tsx                   |  42 +++++++
 .../layer_template.tsx                        |  31 ++---
 .../geo_index_pattern_select.test.tsx.snap    | 104 +++++++++++++++++
 .../geo_index_pattern_select.test.tsx         |  42 +++++++
 6 files changed, 314 insertions(+), 13 deletions(-)
 create mode 100644 x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/__snapshots__/layer_template.test.tsx.snap
 create mode 100644 x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.test.tsx
 create mode 100644 x-pack/plugins/maps/public/components/__snapshots__/geo_index_pattern_select.test.tsx.snap
 create mode 100644 x-pack/plugins/maps/public/components/geo_index_pattern_select.test.tsx

diff --git a/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/__snapshots__/layer_template.test.tsx.snap b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/__snapshots__/layer_template.test.tsx.snap
new file mode 100644
index 00000000000000..fca33effee7299
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/__snapshots__/layer_template.test.tsx.snap
@@ -0,0 +1,107 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`should render EMS UI when left source is BOUNDARIES_SOURCE.EMS 1`] = `
+<Fragment>
+  <EuiPanel>
+    <EuiTitle
+      size="xs"
+    >
+      <h5>
+        <FormattedMessage
+          defaultMessage="Boundaries source"
+          id="xpack.maps.choropleth.boundariesLabel"
+          values={Object {}}
+        />
+      </h5>
+    </EuiTitle>
+    <EuiSpacer
+      size="m"
+    />
+    <EuiFormRow
+      describedByIds={Array []}
+      display="row"
+      fullWidth={false}
+      hasChildLabel={true}
+      hasEmptyLabelSpace={false}
+      labelType="label"
+    >
+      <EuiRadioGroup
+        idSelected="EMS"
+        onChange={[Function]}
+        options={
+          Array [
+            Object {
+              "id": "ELASTICSEARCH",
+              "label": "Points, lines, and polygons from Elasticsearch",
+            },
+            Object {
+              "id": "EMS",
+              "label": "Administrative boundaries from Elastic Maps Service",
+            },
+          ]
+        }
+      />
+    </EuiFormRow>
+    <EMSFileSelect
+      onChange={[Function]}
+      value={null}
+    />
+  </EuiPanel>
+  <EuiSpacer
+    size="s"
+  />
+</Fragment>
+`;
+
+exports[`should render elasticsearch UI when left source is BOUNDARIES_SOURCE.ELASTICSEARCH 1`] = `
+<Fragment>
+  <EuiPanel>
+    <EuiTitle
+      size="xs"
+    >
+      <h5>
+        <FormattedMessage
+          defaultMessage="Boundaries source"
+          id="xpack.maps.choropleth.boundariesLabel"
+          values={Object {}}
+        />
+      </h5>
+    </EuiTitle>
+    <EuiSpacer
+      size="m"
+    />
+    <EuiFormRow
+      describedByIds={Array []}
+      display="row"
+      fullWidth={false}
+      hasChildLabel={true}
+      hasEmptyLabelSpace={false}
+      labelType="label"
+    >
+      <EuiRadioGroup
+        idSelected="ELASTICSEARCH"
+        onChange={[Function]}
+        options={
+          Array [
+            Object {
+              "id": "ELASTICSEARCH",
+              "label": "Points, lines, and polygons from Elasticsearch",
+            },
+            Object {
+              "id": "EMS",
+              "label": "Administrative boundaries from Elastic Maps Service",
+            },
+          ]
+        }
+      />
+    </EuiFormRow>
+    <GeoIndexPatternSelect
+      onChange={[Function]}
+      value=""
+    />
+  </EuiPanel>
+  <EuiSpacer
+    size="s"
+  />
+</Fragment>
+`;
diff --git a/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/create_choropleth_layer_descriptor.ts b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/create_choropleth_layer_descriptor.ts
index bc69b0b5c59d97..61fb6ef54c2073 100644
--- a/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/create_choropleth_layer_descriptor.ts
+++ b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/create_choropleth_layer_descriptor.ts
@@ -134,6 +134,7 @@ export function createEsChoroplethLayerDescriptor({
       geoField: leftGeoField,
       scalingType: SCALING_TYPES.LIMIT,
       tooltipProperties: [leftJoinField],
+      applyGlobalQuery: false,
     }),
     leftField: leftJoinField,
     rightIndexPatternId,
diff --git a/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.test.tsx b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.test.tsx
new file mode 100644
index 00000000000000..e9d25320712036
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.test.tsx
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+jest.mock('../../../kibana_services', () => {
+  const MockIndexPatternSelect = (props: unknown) => {
+    return <div />;
+  };
+  return {
+    getIndexPatternSelectComponent: () => {
+      return MockIndexPatternSelect;
+    },
+  };
+});
+
+import React from 'react';
+import { shallow } from 'enzyme';
+import { BOUNDARIES_SOURCE, LayerTemplate } from './layer_template';
+
+const renderWizardArguments = {
+  previewLayers: () => {},
+  mapColors: [],
+  isIndexingTriggered: false,
+  onRemove: () => {},
+  onIndexReady: () => {},
+  importSuccessHandler: () => {},
+  importErrorHandler: () => {},
+};
+
+test('should render elasticsearch UI when left source is BOUNDARIES_SOURCE.ELASTICSEARCH', async () => {
+  const component = shallow(<LayerTemplate {...renderWizardArguments} />);
+  component.setState({ leftSource: BOUNDARIES_SOURCE.ELASTICSEARCH });
+  expect(component).toMatchSnapshot();
+});
+
+test('should render EMS UI when left source is BOUNDARIES_SOURCE.EMS', async () => {
+  const component = shallow(<LayerTemplate {...renderWizardArguments} />);
+  component.setState({ leftSource: BOUNDARIES_SOURCE.EMS });
+  expect(component).toMatchSnapshot();
+});
diff --git a/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.tsx b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.tsx
index c10d0c57832f87..e6e8c3612f9ceb 100644
--- a/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.tsx
@@ -123,19 +123,24 @@ export class LayerTemplate extends Component<RenderWizardArguments, State> {
       return;
     }
 
-    const fields = emsFileLayer.getFieldsInLanguage();
-    this.setState({
-      leftEmsFields: fields
-        .filter((field) => {
-          return field.type === 'id';
-        })
-        .map((field) => {
-          return {
-            value: field.name,
-            label: field.description,
-          };
-        }),
-    });
+    const leftEmsFields = emsFileLayer
+      .getFieldsInLanguage()
+      .filter((field) => {
+        return field.type === 'id';
+      })
+      .map((field) => {
+        return {
+          value: field.name,
+          label: field.description,
+        };
+      });
+    this.setState(
+      {
+        leftEmsFields,
+        leftJoinField: leftEmsFields.length ? leftEmsFields[0].value : null,
+      },
+      this._previewLayer
+    );
   };
 
   _onLeftSourceChange = (optionId: string) => {
diff --git a/x-pack/plugins/maps/public/components/__snapshots__/geo_index_pattern_select.test.tsx.snap b/x-pack/plugins/maps/public/components/__snapshots__/geo_index_pattern_select.test.tsx.snap
new file mode 100644
index 00000000000000..809fe618625130
--- /dev/null
+++ b/x-pack/plugins/maps/public/components/__snapshots__/geo_index_pattern_select.test.tsx.snap
@@ -0,0 +1,104 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`should render 1`] = `
+<Fragment>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    label="Index pattern"
+    labelType="label"
+  >
+    <MockIndexPatternSelect
+      fieldTypes={
+        Array [
+          "geo_point",
+          "geo_shape",
+        ]
+      }
+      indexPatternId="indexPatternId"
+      isClearable={false}
+      isDisabled={false}
+      onChange={[Function]}
+      onNoIndexPatterns={[Function]}
+      placeholder="Select index pattern"
+    />
+  </EuiFormRow>
+</Fragment>
+`;
+
+exports[`should render no index pattern warning when there are no matching index patterns 1`] = `
+<Fragment>
+  <EuiCallOut
+    color="warning"
+    title="Couldn't find any index patterns with geospatial fields"
+  >
+    <p>
+      <FormattedMessage
+        defaultMessage="You'll need to "
+        id="xpack.maps.noIndexPattern.doThisPrefixDescription"
+        values={Object {}}
+      />
+      <EuiLink
+        href="abc//app/management/kibana/indexPatterns"
+      >
+        <FormattedMessage
+          defaultMessage="create an index pattern"
+          id="xpack.maps.noIndexPattern.doThisLinkTextDescription"
+          values={Object {}}
+        />
+      </EuiLink>
+      <FormattedMessage
+        defaultMessage=" with geospatial fields."
+        id="xpack.maps.noIndexPattern.doThisSuffixDescription"
+        values={Object {}}
+      />
+    </p>
+    <p>
+      <FormattedMessage
+        defaultMessage="Don't have any geospatial data sets? "
+        id="xpack.maps.noIndexPattern.hintDescription"
+        values={Object {}}
+      />
+      <EuiLink
+        href="abc//app/home#/tutorial_directory/sampleData"
+      >
+        <FormattedMessage
+          defaultMessage="Get started with some sample data sets."
+          id="xpack.maps.noIndexPattern.getStartedLinkText"
+          values={Object {}}
+        />
+      </EuiLink>
+    </p>
+  </EuiCallOut>
+  <EuiSpacer
+    size="s"
+  />
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    label="Index pattern"
+    labelType="label"
+  >
+    <MockIndexPatternSelect
+      fieldTypes={
+        Array [
+          "geo_point",
+          "geo_shape",
+        ]
+      }
+      indexPatternId="indexPatternId"
+      isClearable={false}
+      isDisabled={true}
+      onChange={[Function]}
+      onNoIndexPatterns={[Function]}
+      placeholder="Select index pattern"
+    />
+  </EuiFormRow>
+</Fragment>
+`;
diff --git a/x-pack/plugins/maps/public/components/geo_index_pattern_select.test.tsx b/x-pack/plugins/maps/public/components/geo_index_pattern_select.test.tsx
new file mode 100644
index 00000000000000..74d29e7d7e59a8
--- /dev/null
+++ b/x-pack/plugins/maps/public/components/geo_index_pattern_select.test.tsx
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+jest.mock('../kibana_services', () => {
+  const MockIndexPatternSelect = (props: unknown) => {
+    return <div />;
+  };
+  const MockHttp = {
+    basePath: {
+      prepend: (path: string) => {
+        return `abc/${path}`;
+      },
+    },
+  };
+  return {
+    getIndexPatternSelectComponent: () => {
+      return MockIndexPatternSelect;
+    },
+    getHttp: () => {
+      return MockHttp;
+    },
+  };
+});
+
+import React from 'react';
+import { shallow } from 'enzyme';
+import { GeoIndexPatternSelect } from './geo_index_pattern_select';
+
+test('should render', async () => {
+  const component = shallow(<GeoIndexPatternSelect onChange={() => {}} value={'indexPatternId'} />);
+
+  expect(component).toMatchSnapshot();
+});
+
+test('should render no index pattern warning when there are no matching index patterns', async () => {
+  const component = shallow(<GeoIndexPatternSelect onChange={() => {}} value={'indexPatternId'} />);
+  component.setState({ noGeoIndexPatternsExist: true });
+  expect(component).toMatchSnapshot();
+});