Update UI to show both 'entered' and 'crossing'. Update results filters

elastic · Nov 3, 2020 · 441b44c · 441b44c
1 parent 6f6c2cf
commit 441b44c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/geo_threshold/geo_threshold.ts b/x-pack/plugins/stack_alerts/server/alert_types/geo_threshold/geo_threshold.ts
@@ -144,11 +144,14 @@ export function getMovedEntities(
         []
       )
       // Do not track entries to or exits from 'other'
-      .filter((entityMovementDescriptor: EntityMovementDescriptor) =>
-        trackingEvent === 'entered'
-          ? entityMovementDescriptor.currLocation.shapeId !== OTHER_CATEGORY
-          : entityMovementDescriptor.prevLocation.shapeId !== OTHER_CATEGORY
-      )
+      .filter((entityMovementDescriptor: EntityMovementDescriptor) => {
+        if (trackingEvent !== 'crossing') {
+          return trackingEvent === 'entered'
+            ? entityMovementDescriptor.currLocation.shapeId !== OTHER_CATEGORY
+            : entityMovementDescriptor.prevLocation.shapeId !== OTHER_CATEGORY;
+        }
+        return true;
+      })
   );
 }
 

diff --git a/...i/public/application/components/builtin_alert_types/geo_threshold/query_builder/index.tsx b/...i/public/application/components/builtin_alert_types/geo_threshold/query_builder/index.tsx
@@ -275,7 +275,7 @@ export const GeoThresholdAlertTypeExpression: React.FunctionComponent<AlertTypeP
                 }
                 fullWidth
                 onChange={(e) => setAlertParams('trackingEvent', e.target.value)}
-                options={[conditionOptions[0]]} // TODO: Make all options avab. before merge
+                options={conditionOptions}
               />
             </div>
           </EuiFormRow>

diff --git a/...ggers_actions_ui/public/application/components/builtin_alert_types/geo_threshold/types.ts b/...ggers_actions_ui/public/application/components/builtin_alert_types/geo_threshold/types.ts
@@ -7,6 +7,7 @@
 export enum TrackingEvent {
   entered = 'entered',
   exited = 'exited',
+  crossing = 'crossing',
 }
 
 export interface GeoThresholdAlertParams {