Type fixes

Aaron Caldwell · Aaron Caldwell · commit e6903e3a15e8 · 2020-12-02T10:27:23.000-07:00
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/index.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/index.tsx
@@ -67,7 +67,6 @@ export const GeoContainmentAlertTypeExpression: React.FunctionComponent<
     boundaryIndexQuery,
     boundaryGeoField,
     boundaryNameField,
-    delayOffsetWithUnits,
   } = alertParams;
 
   const [indexPattern, _setIndexPattern] = useState<IIndexPattern>({
@@ -137,7 +136,6 @@ export const GeoContainmentAlertTypeExpression: React.FunctionComponent<
         boundaryIndexId: boundaryIndexId ?? DEFAULT_VALUES.BOUNDARY_INDEX_ID,
         boundaryGeoField: boundaryGeoField ?? DEFAULT_VALUES.BOUNDARY_GEO_FIELD,
         boundaryNameField: boundaryNameField ?? DEFAULT_VALUES.BOUNDARY_NAME_FIELD,
-        delayOffsetWithUnits: delayOffsetWithUnits ?? DEFAULT_VALUES.DELAY_OFFSET_WITH_UNITS,
       });
       if (!alertsContext.dataIndexPatterns) {
         return;
@@ -150,9 +148,6 @@ export const GeoContainmentAlertTypeExpression: React.FunctionComponent<
         const _boundaryIndexPattern = await alertsContext.dataIndexPatterns.get(boundaryIndexId);
         setBoundaryIndexPattern(_boundaryIndexPattern);
       }
-      if (delayOffsetWithUnits) {
-        setDelayOffset(+delayOffsetWithUnits.replace(/\D/g, ''));
-      }
     };
     initToDefaultParams();
     // eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/geo_containment.ts b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/geo_containment.ts
@@ -14,7 +14,6 @@ import { ActionGroupId, GEO_CONTAINMENT_ID, GeoContainmentParams } from './alert
 interface LatestEntityLocation {
   location: number[];
   shapeLocationId: string;
-  entityName: string;
   dateInShape: string | null;
   docId: string;
 }
@@ -24,13 +23,11 @@ export function transformResults(
   results: SearchResponse<unknown> | undefined,
   dateField: string,
   geoField: string
-): Map<string, EntityLocation> {
+): Map<string, LatestEntityLocation> {
   if (!results) {
-    return [];
+    return new Map();
   }
-  // For the latest of all results, get most recent
   const buckets = _.get(results, 'aggregations.shapes.buckets', {});
-  // @ts-expect-error
   const arrResults = _.flatMap(buckets, (bucket: unknown, bucketKey: string) => {
     const subBuckets = _.get(bucket, 'entitySplit.buckets', []);
     return _.map(subBuckets, (subBucket) => {
@@ -45,7 +42,7 @@ export function transformResults(
             .map((coordString) => +coordString)
             .reverse()
             .value()
-        : null;
+        : [];
       const dateInShape = _.get(
         subBucket,
         `entityHits.hits.hits[0].fields["${dateField}"][0]`,
@@ -64,13 +61,19 @@ export function transformResults(
   });
   const orderedResults = _.orderBy(arrResults, ['entityName', 'dateInShape'], ['asc', 'desc'])
     // Get unique
-    .reduce((accu: Map<string, EntityLocation>, el: LatestEntityLocation) => {
-      const { entityName, ...locationData } = el;
-      if (!accu.has(entityName)) {
-        accu.set(entityName, locationData);
-      }
-      return accu;
-    }, new Map());
+    .reduce(
+      (
+        accu: Map<string, LatestEntityLocation>,
+        el: LatestEntityLocation & { entityName: string }
+      ) => {
+        const { entityName, ...locationData } = el;
+        if (!accu.has(entityName)) {
+          accu.set(entityName, locationData);
+        }
+        return accu;
+      },
+      new Map()
+    );
   return orderedResults;
 }
 
@@ -144,7 +147,7 @@ export const getGeoContainmentExecutor = (log: Logger) =>
       currentIntervalResults = await executeEsQuery(currIntervalStartTime, currIntervalEndTime);
     }
 
-    const currLocationMap: Map<string, EntityLocation> = transformResults(
+    const currLocationMap: Map<string, LatestEntityLocation> = transformResults(
       currentIntervalResults,
       params.dateField,
       params.geoField
