Fixed errors which are happening if switch between alert types

elastic · Mar 17, 2020 · 93eeb23 · 93eeb23
1 parent 631d93d
commit 93eeb23
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 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
@@ -28,6 +28,7 @@ import {
   getMatchingIndicesForThresholdAlertType,
   getThresholdAlertTypeFields,
   loadIndexPatterns,
+  getSavedObjectsClient,
 } from './lib/api';
 import { getTimeFieldOptions } from '../../../../common/lib/get_time_options';
 import { ThresholdVisualization } from './visualization';
@@ -125,9 +126,11 @@ export const IndexThresholdAlertTypeExpression: React.FunctionComponent<IndexThr
   );
 
   const getIndexPatterns = async () => {
-    const indexPatternObjects = await loadIndexPatterns();
-    const titles = indexPatternObjects.map((indexPattern: any) => indexPattern.attributes.title);
-    setIndexPatterns(titles);
+    if (getSavedObjectsClient()) {
+      const indexPatternObjects = await loadIndexPatterns();
+      const titles = indexPatternObjects.map((indexPattern: any) => indexPattern.attributes.title);
+      setIndexPatterns(titles);
+    }
   };
 
   const expressionErrorMessage = i18n.translate(

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.tsx
@@ -155,6 +155,7 @@ export const AlertForm = ({ alert, canChangeTrigger = true, dispatch, errors }:
         onClick={() => {
           setAlertProperty('alertTypeId', item.id);
           setAlertTypeModel(item);
+          setAlertProperty('params', {});
           if (alertTypesIndex && alertTypesIndex[item.id]) {
             setDefaultActionGroupId(alertTypesIndex[item.id].defaultActionGroupId);
           }
@@ -194,6 +195,7 @@ export const AlertForm = ({ alert, canChangeTrigger = true, dispatch, errors }:
               onClick={() => {
                 setAlertProperty('alertTypeId', null);
                 setAlertTypeModel(null);
+                setAlertProperty('params', {});
               }}
             />
           </EuiFlexItem>