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

elastic · Jul 20, 2020 · 4ccf1ae · 4ccf1ae
1 parent 0f964f6
commit 4ccf1ae
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/...ugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx b/...ugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx
@@ -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"

diff --git a/...gins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx b/...gins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx
@@ -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>

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