fixed due to review comments

elastic · Mar 18, 2020 · c8df66c · c8df66c
1 parent 4081635
commit c8df66c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/.../triggers_actions_ui/public/application/components/builtin_alert_types/threshold/index.ts b/.../triggers_actions_ui/public/application/components/builtin_alert_types/threshold/index.ts
@@ -89,7 +89,7 @@ export function getAlertType(): AlertTypeModel {
           )
         );
       }
-      if (!threshold || threshold.length === 0 || (threshold.length === 1 && !threshold[0])) {
+      if (!threshold || threshold.length === 0) {
         errors.threshold0.push(
           i18n.translate('xpack.triggersActionsUI.sections.addAlert.error.requiredThreshold0Text', {
             defaultMessage: 'Threshold0, is required.',
@@ -110,9 +110,12 @@ export function getAlertType(): AlertTypeModel {
       }
       if (threshold && threshold.length === 2 && threshold[0] > threshold[1]) {
         errors.threshold1.push(
-          i18n.translate('xpack.triggersActionsUI.sections.addAlert.error.requiredThreshold1Text', {
-            defaultMessage: 'Threshold1 should be > Threshold0.',
-          })
+          i18n.translate(
+            'xpack.triggersActionsUI.sections.addAlert.error.greaterThenThreshold0Text',
+            {
+              defaultMessage: 'Threshold1 should be > Threshold0.',
+            }
+          )
         );
       }
       return validationResult;

diff --git a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/threshold.tsx b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/threshold.tsx
@@ -105,10 +105,10 @@ export const ThresholdExpression = ({
               value={thresholdComparator}
               onChange={e => {
                 onChangeSelectedThresholdComparator(e.target.value);
-                const thresholdValues: number[] | undefined = [];
-                Array.from(Array(comparators[e.target.value].requiredValues)).map((_notUsed, i) => {
-                  thresholdValues.push(threshold[i] ?? 0);
-                });
+                const thresholdValues = threshold.slice(
+                  0,
+                  comparators[e.target.value].requiredValues
+                );
                 onChangeSelectedThreshold(thresholdValues);
               }}
               options={Object.values(comparators).map(({ text, value }) => {