Skip to content

[7.x] [Security Solution] put back savedObjectId in error message (#74775) #74865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
angorayc merged 1 commit into from
Aug 12, 2020
Merged

[7.x] [Security Solution] put back savedObjectId in error message (#74775) #74865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion x-pack/plugins/security_solution/public/common/components/import_data_modal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import React, { useCallback, useState } from 'react';
import {
ImportDataResponse,
ImportDataProps,
ImportRulesResponseError,
ImportResponseError,
} from '../../../detections/containers/detection_engine/rules';
import {
displayErrorToast,
Expand All @@ -48,6 +50,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
*/
Expand Down Expand Up @@ -96,7 +104,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);
}
Expand Down
10 changes: 9 additions & 1 deletion ...ck/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,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 {
Expand Down