Skip to content
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

Feature/flyout alert name validation #367

Merged
merged 6 commits into from
Jan 18, 2023
Merged

Feature/flyout alert name validation #367

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f78f8dd
[FEATURE] Detector must have at least one alert set #288
jovancvetkovic3006 Jan 9, 2023
1ea796c
Merge branch 'main' of https://github.com/opensearch-project/security…
jovancvetkovic3006 Jan 11, 2023
058d35a
[FEATURE] Add cypress custom commands to support better type events #364
jovancvetkovic3006 Jan 14, 2023
7070136
[FEATURE] Trigger name should be required in Create alert trigger fly…
jovancvetkovic3006 Jan 14, 2023
2cefc11
Merge branch 'main' of https://github.com/opensearch-project/security…
jovancvetkovic3006 Jan 14, 2023
fabbd5c
Merge branch 'main' of https://github.com/opensearch-project/security…
jovancvetkovic3006 Jan 17, 2023
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
12 changes: 9 additions & 3 deletions public/pages/Findings/components/CreateAlertFlyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { DEFAULT_EMPTY_DATA } from '../../../utils/constants';
import { NotificationChannelTypeOptions } from '../../CreateDetector/components/ConfigureAlerts/models/interfaces';
import { Finding } from '../models/interfaces';
import { getEmptyAlertCondition } from '../../CreateDetector/components/ConfigureAlerts/utils/helpers';
import { validateName } from '../../../utils/validation';

interface CreateAlertFlyoutProps extends RouteComponentProps {
closeFlyout: (refreshPage?: boolean) => void;
Expand All @@ -42,6 +43,7 @@ interface CreateAlertFlyoutState {
loading: boolean;
detector: Detector;
submitting: boolean;
isTriggerDataValid: boolean;
}

export default class CreateAlertFlyout extends Component<
Expand All @@ -55,6 +57,7 @@ export default class CreateAlertFlyout extends Component<
loading: false,
detector: this.props.finding.detector._source,
submitting: false,
isTriggerDataValid: false,
};
}

Expand Down Expand Up @@ -85,7 +88,10 @@ export default class CreateAlertFlyout extends Component<
};

onAlertConditionChange = (newDetector: Detector): void => {
this.setState({ detector: { ...newDetector } });
const isTriggerDataValid = newDetector.triggers.every((trigger) => {
return !!trigger.name && validateName(trigger.name);
});
this.setState({ detector: { ...newDetector }, isTriggerDataValid });
};

onCreate = async () => {
Expand Down Expand Up @@ -120,7 +126,7 @@ export default class CreateAlertFlyout extends Component<
closeFlyout,
notificationChannels,
} = this.props;
const { alertCondition, loading, detector, submitting } = this.state;
const { alertCondition, loading, detector, submitting, isTriggerDataValid } = this.state;
const indexNum = triggers.length;
return (
<EuiFlyout onClose={closeFlyout} ownFocus={true} size={'m'}>
Expand Down Expand Up @@ -159,7 +165,7 @@ export default class CreateAlertFlyout extends Component<

<EuiFlexItem grow={false}>
<EuiButton
disabled={submitting}
disabled={submitting || !isTriggerDataValid}
fill={true}
isLoading={submitting}
onClick={this.onCreate}
Expand Down