Fix validation for index threshold when selecting an index (elastic#6…

…1615) * Fix validation for index threshold when selecting an index * Ensure timeField gets validation message Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
mikecote · Apr 1, 2020 · c25f30c · c25f30c
1 parent 9d6d320
commit c25f30c
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/...ers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.tsx b/...ers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.tsx
@@ -145,6 +145,13 @@ export const IndexThresholdAlertTypeExpression: React.FunctionComponent<IndexThr
     }
   };
 
+  const closeIndexPopover = () => {
+    setIndexPopoverOpen(false);
+    if (timeField === undefined) {
+      setAlertParams('timeField', '');
+    }
+  };
+
   useEffect(() => {
     const indexPatternsFunction = async () => {
       setIndexPatterns(await getIndexPatterns());
@@ -293,18 +300,16 @@ export const IndexThresholdAlertTypeExpression: React.FunctionComponent<IndexThr
                         defaultMessage: 'index',
                       }
                     )}
-                    value={index ? index.join(' ') : firstFieldOption.text}
+                    value={index && index.length > 0 ? index.join(' ') : firstFieldOption.text}
                     isActive={indexPopoverOpen}
                     onClick={() => {
                       setIndexPopoverOpen(true);
                     }}
-                    color={index ? 'secondary' : 'danger'}
+                    color={index && index.length > 0 && timeField !== '' ? 'secondary' : 'danger'}
                   />
                 }
                 isOpen={indexPopoverOpen}
-                closePopover={() => {
-                  setIndexPopoverOpen(false);
-                }}
+                closePopover={closeIndexPopover}
                 ownFocus
                 withTitle
                 anchorPosition="downLeft"
@@ -331,9 +336,7 @@ export const IndexThresholdAlertTypeExpression: React.FunctionComponent<IndexThr
                               defaultMessage: 'Close',
                             }
                           )}
-                          onClick={() => {
-                            setIndexPopoverOpen(false);
-                          }}
+                          onClick={closeIndexPopover}
                         />
                       </EuiFlexItem>
                     </EuiFlexGroup>