Handle locations with names but no geo data.

elastic · Jan 17, 2020 · f40ece0 · f40ece0
1 parent d082c03
commit f40ece0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 22 deletions.
diff --git a/...acy/plugins/uptime/public/components/functional/location_map/embeddables/embedded_map.tsx b/...acy/plugins/uptime/public/components/functional/location_map/embeddables/embedded_map.tsx
@@ -12,19 +12,15 @@ import { start } from '../../../../../../../../../src/legacy/core_plugins/embedd
 import * as i18n from './translations';
 // @ts-ignore
 import { MAP_SAVED_OBJECT_TYPE } from '../../../../../../maps/common/constants';
+import { Location } from '../../../../../common/runtime_types';
 
 import { MapEmbeddable } from './types';
 import { getLayerList } from './map_config';
 import { UptimeThemeContext } from '../../../../contexts';
 
 export interface EmbeddedMapProps {
-  upPoints: LocationPoint[];
-  downPoints: LocationPoint[];
-}
-
-export interface LocationPoint {
-  lat: string;
-  lon: string;
+  upPoints: Location[];
+  downPoints: Location[];
 }
 
 const EmbeddedPanel = styled.div`

diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_map.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_map.tsx
@@ -8,8 +8,8 @@ import React from 'react';
 import styled from 'styled-components';
 import { EuiFlexGroup, EuiFlexItem, EuiErrorBoundary } from '@elastic/eui';
 import { LocationStatusTags } from './location_status_tags';
-import { EmbeddedMap, LocationPoint } from './embeddables/embedded_map';
-import { MonitorLocations } from '../../../../common/runtime_types';
+import { EmbeddedMap } from './embeddables/embedded_map';
+import { Location, MonitorLocations, MonitorLocation } from '../../../../common/runtime_types';
 import { UNNAMED_LOCATION } from '../../../../common/constants';
 import { LocationMissingWarning } from './location_missing';
 
@@ -26,21 +26,21 @@ interface LocationMapProps {
 }
 
 export const LocationMap = ({ monitorLocations }: LocationMapProps) => {
-  const upPoints: LocationPoint[] = [];
-  const downPoints: LocationPoint[] = [];
+  const upPoints: Location[] = [];
+  const downPoints: Location[] = [];
 
   let isGeoInfoMissing = false;
 
   if (monitorLocations?.locations) {
-    monitorLocations.locations.forEach((item: any) => {
-      if (item.geo?.name !== UNNAMED_LOCATION) {
-        if (item.summary.down === 0) {
+    monitorLocations.locations.forEach((item: MonitorLocation) => {
+      if (item.geo?.name === UNNAMED_LOCATION || !item.geo?.location) {
+        isGeoInfoMissing = true;
+      } else if (item.geo?.name !== UNNAMED_LOCATION) {
+        if (item?.summary?.down === 0) {
           upPoints.push(item.geo.location);
         } else {
           downPoints.push(item.geo.location);
         }
-      } else if (item.geo?.name === UNNAMED_LOCATION) {
-        isGeoInfoMissing = true;
       }
     });
   }

diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts
@@ -346,16 +346,18 @@ export const elasticsearchMonitorsAdapter: UMMonitorsAdapter = {
     const result = await callES('search', params);
     const locations = result?.aggregations?.location?.buckets ?? [];
 
-    const getGeo = (locGeo: any) => {
+    const getGeo = (locGeo: { name: string; location?: string }) => {
       if (locGeo) {
         const { name, location } = locGeo;
-        const latLon = location.trim().split(',');
+        const latLon = location?.trim().split(',');
         return {
           name,
-          location: {
-            lat: latLon[0],
-            lon: latLon[1],
-          },
+          location: latLon
+            ? {
+                lat: latLon[0],
+                lon: latLon[1],
+              }
+            : undefined,
         };
       } else {
         return {