Feature/flyout alert name validation (opensearch-project#367)

* [FEATURE] Detector must have at least one alert set opensearch-project#288 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Add cypress custom commands to support better type events opensearch-project#364 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Trigger name should be required in Create alert trigger flyout opensearch-project#352 Signed-off-by: Jovan Cvetkovic <[email protected]> Signed-off-by: Jovan Cvetkovic <[email protected]>
riysaxen-amzn · Jan 18, 2023 · 50430e3 · 50430e3
1 parent 8b40f16
commit 50430e3
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/public/pages/Findings/components/CreateAlertFlyout.tsx b/public/pages/Findings/components/CreateAlertFlyout.tsx
@@ -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;
@@ -42,6 +43,7 @@ interface CreateAlertFlyoutState {
   loading: boolean;
   detector: Detector;
   submitting: boolean;
+  isTriggerDataValid: boolean;
 }
 
 export default class CreateAlertFlyout extends Component<
@@ -55,6 +57,7 @@ export default class CreateAlertFlyout extends Component<
       loading: false,
       detector: this.props.finding.detector._source,
       submitting: false,
+      isTriggerDataValid: false,
     };
   }
 
@@ -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 () => {
@@ -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'}>
@@ -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}