Revert "remove deprecated xpack:defaultAdminEmail from email action"

alisonelizabeth · alisonelizabeth · commit 87ff8aa75960 · 2019-06-27T21:27:41.000-04:00
This reverts commit ccecb29.
diff --git a/x-pack/legacy/plugins/watcher/public/models/action/email_action.js b/x-pack/legacy/plugins/watcher/public/models/action/email_action.js
@@ -7,13 +7,15 @@
 import { get, isArray } from 'lodash';
 import { BaseAction } from './base_action';
 import { i18n } from '@kbn/i18n';
+import chrome from 'ui/chrome';
 
 export class EmailAction extends BaseAction {
   constructor(props = {}) {
     super(props);
 
-    const toArray = get(props, 'to');
-
+    const uiSettings = chrome.getUiSettingsClient();
+    const defaultToEmail = uiSettings.get('xPack:defaultAdminEmail');
+    const toArray = get(props, 'to', defaultToEmail);
     this.to = isArray(toArray) ? toArray : toArray && [ toArray ];
 
     const defaultSubject = i18n.translate('xpack.watcher.models.emailAction.defaultSubjectText', {
@@ -22,7 +24,6 @@ export class EmailAction extends BaseAction {
         context: '{{ctx.metadata.name}}',
       }
     });
-
     this.subject = get(props, 'subject', props.ignoreDefaults ? null : defaultSubject);
 
     this.body = get(props, 'body');
diff --git a/x-pack/legacy/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/action_fields/email_action_fields.tsx b/x-pack/legacy/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/action_fields/email_action_fields.tsx
@@ -33,7 +33,7 @@ export const EmailActionFields: React.FunctionComponent<Props> = ({
         errorKey="to"
         fullWidth
         errors={errors}
-        isShowingErrors={hasErrors && to !== undefined}
+        isShowingErrors={hasErrors && to !== null}
         label={i18n.translate(
           'xpack.watcher.sections.watchEdit.threshold.emailAction.recipientTextFieldLabel',
           {

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ export const EmailActionFields: React.FunctionComponent<Props> = ({`
`33`	`33`	`errorKey="to"`
`34`	`34`	`fullWidth`
`35`	`35`	`errors={errors}`
`36`		`- isShowingErrors={hasErrors && to !== undefined}`
	`36`	`+ isShowingErrors={hasErrors && to !== null}`
`37`	`37`	`label={i18n.translate(`
`38`	`38`	`'xpack.watcher.sections.watchEdit.threshold.emailAction.recipientTextFieldLabel',`
`39`	`39`	`{`