maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Security Solution][Detections]Exceptions modal bugs (#72471)

Browse source
This commit is contained in:
Davis Plumlee 2020-07-20 15:34:26 -04:00 committed by GitHub
parent 0f964f6691
commit 4ccf1aed96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx
View file

@ -21,6 +21,7 @@ import {
EuiCallOut,
EuiText,
} from '@elastic/eui';
import { Status } from '../../../../../common/detection_engine/schemas/common/schemas';
import { alertsIndexPattern } from '../../../../../common/endpoint/constants';
import {
ExceptionListItemSchema,
@ -67,6 +68,7 @@ interface AddExceptionModalProps {
};
onCancel: () => void;
onConfirm: (didCloseAlert: boolean) => void;
alertStatus?: Status;
}
const Modal = styled(EuiModal)`
@ -105,6 +107,7 @@ export const AddExceptionModal = memo(function AddExceptionModal({
alertData,
onCancel,
onConfirm,
alertStatus,
}: AddExceptionModalProps) {
const { http } = useKibana().services;
const [comment, setComment] = useState('');
@ -183,7 +186,8 @@ export const AddExceptionModal = memo(function AddExceptionModal({
if (indexPatternLoading === false && isSignalIndexLoading === false) {
setShouldDisableBulkClose(
entryHasListType(exceptionItemsToAdd) ||
entryHasNonEcsType(exceptionItemsToAdd, indexPatterns)
entryHasNonEcsType(exceptionItemsToAdd, indexPatterns) ||
exceptionItemsToAdd.length === 0
);
}
}, [
@ -335,7 +339,7 @@ export const AddExceptionModal = memo(function AddExceptionModal({
</ModalBodySection>
<EuiHorizontalRule />
<ModalBodySection>
{alertData !== undefined && (
{alertData !== undefined && alertStatus !== 'closed' && (
<EuiFormRow fullWidth>
<EuiCheckbox
id="close-alert-on-add-add-exception-checkbox"

10
x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx
View file

@ -41,6 +41,7 @@ import {
entryHasListType,
entryHasNonEcsType,
} from '../helpers';
import { Loader } from '../../loader';
interface EditExceptionModalProps {
ruleName: string;
@ -124,7 +125,8 @@ export const EditExceptionModal = memo(function EditExceptionModal({
if (indexPatternLoading === false && isSignalIndexLoading === false) {
setShouldDisableBulkClose(
entryHasListType(exceptionItemsToAdd) ||
entryHasNonEcsType(exceptionItemsToAdd, indexPatterns)
entryHasNonEcsType(exceptionItemsToAdd, indexPatterns) ||
exceptionItemsToAdd.length === 0
);
}
}, [
@ -204,7 +206,11 @@ export const EditExceptionModal = memo(function EditExceptionModal({
</ModalHeaderSubtitle>
</ModalHeader>
{!isSignalIndexLoading && (
{(addExceptionIsLoading || indexPatternLoading || isSignalIndexLoading) && (
<Loader data-test-subj="loadingEditExceptionModal" size="xl" />
)}
{!isSignalIndexLoading && !addExceptionIsLoading && !indexPatternLoading && (
<>
<ModalBodySection className="builder-section">
<EuiText>{i18n.EXCEPTION_BUILDER_INFO}</EuiText>

1
x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
View file

@ -458,6 +458,7 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
alertData={addExceptionModalState.alertData}
onCancel={onAddExceptionCancel}
onConfirm={onAddExceptionConfirm}
alertStatus={filterGroup}
/>
)}
</>