adds type guards for backwards compatability

elastic · Aug 16, 2021 · 370ac1d · 370ac1d
1 parent 3fcdb14
commit 370ac1d
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 2 deletions.
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/common/schemas.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/common/schemas.ts
@@ -170,7 +170,12 @@ export type RuleNameOverride = t.TypeOf<typeof rule_name_override>;
 export const ruleNameOverrideOrUndefined = t.union([rule_name_override, t.undefined]);
 export type RuleNameOverrideOrUndefined = t.TypeOf<typeof ruleNameOverrideOrUndefined>;
 
-export const status = t.keyof({ open: null, closed: null, acknowledged: null });
+export const status = t.keyof({
+  open: null,
+  closed: null,
+  acknowledged: null,
+  'in-progress': null, // TODO: Remove after `acknowledged` migrations
+});
 export type Status = t.TypeOf<typeof status>;
 
 export enum RuleExecutionStatus {

diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
@@ -173,6 +173,7 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
           case 'open':
             title = i18n.OPENED_ALERT_SUCCESS_TOAST(updated);
             break;
+          case 'in-progress':
           case 'acknowledged':
             title = i18n.ACKNOWLEDGED_ALERT_SUCCESS_TOAST(updated);
         }
@@ -192,6 +193,7 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
         case 'open':
           title = i18n.OPENED_ALERT_FAILED_TOAST;
           break;
+        case 'in-progress':
         case 'acknowledged':
           title = i18n.ACKNOWLEDGED_ALERT_FAILED_TOAST;
       }

diff --git a/...olution/public/detections/components/alerts_table/timeline_actions/use_alerts_actions.tsx b/...olution/public/detections/components/alerts_table/timeline_actions/use_alerts_actions.tsx
@@ -60,6 +60,7 @@ export const useAlertsActions = ({
           case 'open':
             title = i18n.OPENED_ALERT_SUCCESS_TOAST(updated);
             break;
+          case 'in-progress':
           case 'acknowledged':
             title = i18n.ACKNOWLEDGED_ALERT_SUCCESS_TOAST(updated);
         }
@@ -82,6 +83,7 @@ export const useAlertsActions = ({
         case 'open':
           title = i18n.OPENED_ALERT_FAILED_TOAST;
           break;
+        case 'in-progress':
         case 'acknowledged':
           title = i18n.ACKNOWLEDGED_ALERT_FAILED_TOAST;
       }

diff --git a/x-pack/plugins/timelines/common/constants.ts b/x-pack/plugins/timelines/common/constants.ts
@@ -12,6 +12,11 @@ export const DEFAULT_NUMBER_FORMAT = 'format:number:defaultPattern';
 
 export const FILTER_OPEN: AlertStatus = 'open';
 export const FILTER_CLOSED: AlertStatus = 'closed';
+
+/**
+ * @deprecated
+ * TODO: Remove after `acknowledged` migration
+ */
 export const FILTER_IN_PROGRESS: AlertStatus = 'in-progress';
 export const FILTER_ACKNOWLEDGED: AlertStatus = 'acknowledged';
 

diff --git a/x-pack/plugins/timelines/common/types/timeline/actions/index.ts b/x-pack/plugins/timelines/common/types/timeline/actions/index.ts
@@ -100,4 +100,10 @@ export interface BulkActionsObjectProp {
 }
 export type BulkActionsProp = boolean | BulkActionsObjectProp;
 
-export type AlertStatus = 'open' | 'closed' | 'acknowledged';
+/**
+ * @deprecated
+ * TODO: remove when `acknowledged` migrations are finished
+ */
+export type InProgressStatus = 'in-progress';
+
+export type AlertStatus = 'open' | 'closed' | 'acknowledged' | InProgressStatus;
diff --git a/...ins/timelines/public/components/t_grid/toolbar/bulk_actions/alert_status_bulk_actions.tsx b/...ins/timelines/public/components/t_grid/toolbar/bulk_actions/alert_status_bulk_actions.tsx
@@ -99,6 +99,7 @@ export const AlertStatusBulkActionsComponent = React.memo<StatefulAlertStatusBul
             case 'open':
               title = i18n.OPENED_ALERT_SUCCESS_TOAST(updated);
               break;
+            case 'in-progress':
             case 'acknowledged':
               title = i18n.ACKNOWLEDGED_ALERT_SUCCESS_TOAST(updated);
           }
@@ -122,6 +123,7 @@ export const AlertStatusBulkActionsComponent = React.memo<StatefulAlertStatusBul
           case 'open':
             title = i18n.OPENED_ALERT_FAILED_TOAST;
             break;
+          case 'in-progress':
           case 'acknowledged':
             title = i18n.ACKNOWLEDGED_ALERT_FAILED_TOAST;
         }