[Security Solution] put back savedObjectId in error message (#74775) (#…

…74866) * put back savedObjectId in error message * fix type error
elastic · Aug 12, 2020 · be34b0f · be34b0f
1 parent 4368f63
commit be34b0f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.tsx b/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.tsx
@@ -24,6 +24,8 @@ import React, { useCallback, useState } from 'react';
 import {
   ImportDataResponse,
   ImportDataProps,
+  ImportRulesResponseError,
+  ImportResponseError,
 } from '../../../detections/containers/detection_engine/rules';
 import {
   displayErrorToast,
@@ -49,6 +51,12 @@ interface ImportDataModalProps {
   title: string;
 }
 
+const isImportRulesResponseError = (
+  error: ImportRulesResponseError | ImportResponseError
+): error is ImportRulesResponseError => {
+  return (error as ImportRulesResponseError).rule_id !== undefined;
+};
+
 /**
  * Modal component for importing Rules from a json file
  */
@@ -97,7 +105,11 @@ export const ImportDataModalComponent = ({
         }
         if (importResponse.errors.length > 0) {
           const formattedErrors = importResponse.errors.map((e) =>
-            failedDetailed(e.rule_id, e.error.status_code, e.error.message)
+            failedDetailed(
+              isImportRulesResponseError(e) ? e.rule_id : e.id,
+              e.error.status_code,
+              e.error.message
+            )
           );
           displayErrorToast(errorMessage, formattedErrors, dispatchToaster);
         }

diff --git a/...ck/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts b/...ck/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts
@@ -236,10 +236,18 @@ export interface ImportRulesResponseError {
   };
 }
 
+export interface ImportResponseError {
+  id: string;
+  error: {
+    status_code: number;
+    message: string;
+  };
+}
+
 export interface ImportDataResponse {
   success: boolean;
   success_count: number;
-  errors: ImportRulesResponseError[];
+  errors: Array<ImportRulesResponseError | ImportResponseError>;
 }
 
 export interface ExportDocumentsProps {