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] Detector must have at least one alert set #288 #289

Merged
merged 2 commits into from
Jan 9, 2023
Merged

[FEATURE] Detector must have at least one alert set #288 #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 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
7903628
[FEATURE] Detector must have at least one alert set #288
jovancvetkovic3006 Jan 9, 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
14 changes: 10 additions & 4 deletions public/pages/CreateDetector/components/ConfigureAlerts/containers/ConfigureAlerts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
parseNotificationChannelsToOptions,
} from '../utils/helpers';
import { NotificationsService } from '../../../../../services';
import { validateName } from '../../../../../utils/validation';

interface ConfigureAlertsProps extends RouteComponentProps {
detector: Detector;
Expand Down Expand Up @@ -81,8 +82,9 @@ export default class ConfigureAlerts extends Component<ConfigureAlertsProps, Con

onAlertTriggerChanged = (newDetector: Detector): void => {
const isTriggerDataValid = newDetector.triggers.every((trigger) => {
return !!trigger.name && trigger.severity;
return !!trigger.name && validateName(trigger.name) && trigger.severity;
});

this.props.changeDetector(newDetector);
this.props.updateDataValidState(DetectorCreationStep.CONFIGURE_ALERTS, isTriggerDataValid);
};
Expand Down Expand Up @@ -130,9 +132,13 @@ export default class ConfigureAlerts extends Component<ConfigureAlertsProps, Con
paddingSize={'none'}
initialIsOpen={true}
extraAction={
<EuiButton color="danger" onClick={() => this.onDelete(index)}>
Remove alert trigger
</EuiButton>
triggers.length > 1 ? (
<EuiButton color="danger" onClick={() => this.onDelete(index)}>
Remove alert trigger
</EuiButton>
) : (
<></>
)
}
>
<EuiHorizontalRule margin={'xs'} />
Expand Down
16 changes: 13 additions & 3 deletions public/pages/Detectors/components/UpdateAlertConditions/UpdateAlertConditions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
getPlugins,
successNotificationToast,
} from '../../../../utils/helpers';
import { DetectorCreationStep } from '../../../CreateDetector/models/types';

export interface UpdateAlertConditionsProps
extends RouteComponentProps<any, any, { detectorHit: DetectorHit }> {
Expand All @@ -39,6 +40,7 @@ export interface UpdateAlertConditionsState {
rulesOptions: RuleOptions[];
submitting: boolean;
plugins: string[];
isTriggerNameValid: boolean;
}

export default class UpdateAlertConditions extends Component<
Expand All @@ -53,6 +55,7 @@ export default class UpdateAlertConditions extends Component<
rulesOptions: [],
submitting: false,
plugins: [],
isTriggerNameValid: true,
};
}

Expand Down Expand Up @@ -189,8 +192,15 @@ export default class UpdateAlertConditions extends Component<
});
};

updateDataValidState = (step: DetectorCreationStep, isValid: boolean): void => {
this.setState({
isTriggerNameValid: isValid,
});
};

render() {
const { detector, rulesOptions, submitting } = this.state;
const { detector, rulesOptions, submitting, isTriggerNameValid } = this.state;
const isSaveDisabled = submitting || !isTriggerNameValid;
return (
<div>
<ConfigureAlerts
Expand All @@ -199,7 +209,7 @@ export default class UpdateAlertConditions extends Component<
detector={detector}
rulesOptions={rulesOptions}
changeDetector={this.changeDetector}
updateDataValidState={() => {}}
updateDataValidState={this.updateDataValidState}
hasNotificationPlugin={this.state.plugins.includes(OS_NOTIFICATION_PLUGIN)}
/>

Expand All @@ -211,7 +221,7 @@ export default class UpdateAlertConditions extends Component<
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButton
disabled={submitting}
disabled={isSaveDisabled}
fill={true}
isLoading={submitting}
onClick={this.onSave}
Expand Down