From 09c1502f9cc76e6cfa8424fd0a421b54abe093ac Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Mon, 2 Mar 2020 08:08:59 -0700
Subject: [PATCH] use constant for geo_point and geo_shape, more TS noise

---
 .../discover/np_ready/angular/context_state.ts      |  2 +-
 .../components/field_chooser/field_chooser.js       | 12 +++++++++---
 .../field_chooser/lib/visualize_url_utils.ts        | 13 ++++++++++---
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_state.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_state.ts
index 381a0a06db113..a42b849c87f2c 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_state.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_state.ts
@@ -47,7 +47,7 @@ interface AppState {
    * Number of records to be fetched after the anchor records (older records)
    */
   successorCount: number;
-  query: Query;
+  query?: Query;
 }
 
 interface GlobalState {
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.js
index 03649d5fc4d15..df970ab5f2584 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.js
@@ -24,7 +24,10 @@ import './discover_field';
 import './discover_field_search_directive';
 import './discover_index_pattern_directive';
 import fieldChooserTemplate from './field_chooser.html';
-import { IndexPatternFieldList } from '../../../../../../../../plugins/data/public';
+import {
+  IndexPatternFieldList,
+  KBN_FIELD_TYPES,
+} from '../../../../../../../../plugins/data/public';
 import { getMapsAppUrl, isFieldVisualizable, isMapsAppRegistered } from './lib/visualize_url_utils';
 
 export function createFieldChooserDirective($location, config, $route) {
@@ -187,12 +190,15 @@ export function createFieldChooserDirective($location, config, $route) {
           return '';
         }
 
-        if ((field.type === 'geo_point' || field.type === 'geo_shape') && isMapsAppRegistered()) {
+        if (
+          (field.type === KBN_FIELD_TYPES.GEO_POINT || field.type === KBN_FIELD_TYPES.GEO_SHAPE) &&
+          isMapsAppRegistered()
+        ) {
           return getMapsAppUrl(field, $scope.indexPattern, $scope.state, $scope.columns);
         }
 
         let agg = {};
-        const isGeoPoint = field.type === 'geo_point';
+        const isGeoPoint = field.type === KBN_FIELD_TYPES.GEO_POINT;
         const type = isGeoPoint ? 'tile_map' : 'histogram';
         // If we're visualizing a date field, and our index is time based (and thus has a time filter),
         // then run a date histogram
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/lib/visualize_url_utils.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/lib/visualize_url_utils.ts
index 6b30611fb9bfc..fa5bda7d3d8b5 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/lib/visualize_url_utils.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/lib/visualize_url_utils.ts
@@ -18,7 +18,11 @@
  */
 import uuid from 'uuid/v4';
 import rison from 'rison-node';
-import { IFieldType, IIndexPattern } from 'src/plugins/data/public';
+import {
+  IFieldType,
+  IIndexPattern,
+  KBN_FIELD_TYPES,
+} from '../../../../../../../../../plugins/data/public';
 import { AppState } from '../../../angular/context_state';
 import { getServices } from '../../../../kibana_services';
 
@@ -40,7 +44,10 @@ export function isMapsAppRegistered() {
 }
 
 export function isFieldVisualizable(field: IFieldType) {
-  if ((field.type === 'geo_point' || field.type === 'geo_shape') && isMapsAppRegistered()) {
+  if (
+    (field.type === KBN_FIELD_TYPES.GEO_POINT || field.type === KBN_FIELD_TYPES.GEO_SHAPE) &&
+    isMapsAppRegistered()
+  ) {
     return true;
   }
   return field.visualizable;
@@ -65,7 +72,7 @@ export function getMapsAppUrl(
   }
 
   // Copy filters and query in app state
-  const mapsAppState = {
+  const mapsAppState: object = {
     filters: appState.filters || [],
   };
   if (appState.query) {