[Uptime] Default alert connectors email settings

x-pack/plugins/translations/translations/ja-JP.json

@@ -27232,7 +27232,6 @@
     "xpack.uptime.alerts.monitorStatus.timerangeValueField.expression": "within",
     "xpack.uptime.alerts.monitorStatus.timerangeValueField.value": "最終{value}",
     "xpack.uptime.alerts.searchPlaceholder.kql": "KQL構文を使用してフィルタリング",
-    "xpack.uptime.alerts.settings.createConnector": "コネクターを作成",
     "xpack.uptime.alerts.timerangeUnitSelectable.daysOption.ariaLabel": "「日」の時間範囲選択項目",
     "xpack.uptime.alerts.timerangeUnitSelectable.hoursOption.ariaLabel": "「時間」の時間範囲選択項目",
     "xpack.uptime.alerts.timerangeUnitSelectable.minutesOption.ariaLabel": "「分」の時間範囲選択項目",

x-pack/plugins/translations/translations/zh-CN.json

@@ -27702,7 +27702,6 @@
     "xpack.uptime.alerts.monitorStatus.timerangeValueField.expression": "之内",
     "xpack.uptime.alerts.monitorStatus.timerangeValueField.value": "上一 {value}",
     "xpack.uptime.alerts.searchPlaceholder.kql": "使用 kql 语法筛选",
-    "xpack.uptime.alerts.settings.createConnector": "创建连接器",
     "xpack.uptime.alerts.timerangeUnitSelectable.daysOption.ariaLabel": "“天”时间范围选择项",
     "xpack.uptime.alerts.timerangeUnitSelectable.hoursOption.ariaLabel": "“小时”时间范围选择项",
     "xpack.uptime.alerts.timerangeUnitSelectable.minutesOption.ariaLabel": "“分钟”时间范围选择项",

x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_params.tsx

@@ -21,6 +21,9 @@ export const EmailParamsFields = ({
   errors,
   messageVariables,
   defaultMessage,
+  isLoading,
+  isDisabled,
+  showEmailSubjectAndMessage = true,
 }: ActionParamsProps<EmailActionParams>) => {
   const { to, cc, bcc, subject, message } = actionParams;
   const toOptions = to ? to.map((label: string) => ({ label })) : [];
@@ -65,15 +68,15 @@ export const EmailParamsFields = ({
         labelAppend={
           <>
             <span>
-              {!addCC ? (
+              {!addCC && (!cc || cc?.length === 0) ? (
                 <EuiButtonEmpty size="xs" onClick={() => setAddCC(true)}>
                   <FormattedMessage
                     defaultMessage="Cc"
                     id="xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.addCcButton"
                   />
                 </EuiButtonEmpty>
               ) : null}
-              {!addBCC ? (
+              {!addBCC && (!bcc || bcc?.length === 0) ? (
                 <EuiButtonEmpty size="xs" onClick={() => setAddBCC(true)}>
                   <FormattedMessage
                     defaultMessage="Bcc"
@@ -88,6 +91,8 @@ export const EmailParamsFields = ({
         <EuiComboBox
           noSuggestions
           isInvalid={isToInvalid}
+          isLoading={isLoading}
+          isDisabled={isDisabled}
           fullWidth
           data-test-subj="toEmailAddressInput"
           selectedOptions={toOptions}
@@ -113,11 +118,12 @@ export const EmailParamsFields = ({
           }}
         />
       </EuiFormRow>
-      {addCC ? (
+      {addCC || (cc && cc?.length > 0) ? (
         <EuiFormRow
           fullWidth
           error={errors.cc}
           isInvalid={isCCInvalid}
+          isDisabled={isDisabled}
           label={i18n.translate(
             'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientCopyTextFieldLabel',
             {
@@ -128,6 +134,7 @@ export const EmailParamsFields = ({
           <EuiComboBox
             noSuggestions
             isInvalid={isCCInvalid}
+            isLoading={isLoading}
             fullWidth
             data-test-subj="ccEmailAddressInput"
             selectedOptions={ccOptions}
@@ -154,7 +161,7 @@ export const EmailParamsFields = ({
           />
         </EuiFormRow>
       ) : null}
-      {addBCC ? (
+      {addBCC || (bcc && bcc?.length > 0) ? (
         <EuiFormRow
           fullWidth
           error={errors.bcc}
@@ -169,6 +176,8 @@ export const EmailParamsFields = ({
           <EuiComboBox
             noSuggestions
             isInvalid={isBCCInvalid}
+            isDisabled={isDisabled}
+            isLoading={isLoading}
             fullWidth
             data-test-subj="bccEmailAddressInput"
             selectedOptions={bccOptions}
@@ -195,40 +204,44 @@ export const EmailParamsFields = ({
           />
         </EuiFormRow>
       ) : null}
-      <EuiFormRow
-        fullWidth
-        error={errors.subject}
-        isInvalid={isSubjectInvalid}
-        label={i18n.translate(
-          'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.subjectTextFieldLabel',
-          {
-            defaultMessage: 'Subject',
-          }
-        )}
-      >
-        <TextFieldWithMessageVariables
+      {showEmailSubjectAndMessage && (
+        <EuiFormRow
+          fullWidth
+          error={errors.subject}
+          isInvalid={isSubjectInvalid}
+          label={i18n.translate(
+            'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.subjectTextFieldLabel',
+            {
+              defaultMessage: 'Subject',
+            }
+          )}
+        >
+          <TextFieldWithMessageVariables
+            index={index}
+            editAction={editAction}
+            messageVariables={messageVariables}
+            paramsProperty={'subject'}
+            inputTargetValue={subject}
+            errors={(errors.subject ?? []) as string[]}
+          />
+        </EuiFormRow>
+      )}
+      {showEmailSubjectAndMessage && (
+        <TextAreaWithMessageVariables
           index={index}
           editAction={editAction}
           messageVariables={messageVariables}
-          paramsProperty={'subject'}
-          inputTargetValue={subject}
-          errors={(errors.subject ?? []) as string[]}
+          paramsProperty={'message'}
+          inputTargetValue={message}
+          label={i18n.translate(
+            'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.messageTextAreaFieldLabel',
+            {
+              defaultMessage: 'Message',
+            }
+          )}
+          errors={(errors.message ?? []) as string[]}
         />
-      </EuiFormRow>
-      <TextAreaWithMessageVariables
-        index={index}
-        editAction={editAction}
-        messageVariables={messageVariables}
-        paramsProperty={'message'}
-        inputTargetValue={message}
-        label={i18n.translate(
-          'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.messageTextAreaFieldLabel',
-          {
-            defaultMessage: 'Message',
-          }
-        )}
-        errors={(errors.message ?? []) as string[]}
-      />
+      )}
     </>
   );
 };

x-pack/plugins/triggers_actions_ui/public/types.ts

@@ -106,6 +106,9 @@ export interface ActionParamsProps<TParams> {
   messageVariables?: ActionVariable[];
   defaultMessage?: string;
   actionConnector?: ActionConnector;
+  isLoading?: boolean;
+  isDisabled?: boolean;
+  showEmailSubjectAndMessage?: boolean;
 }
 
 export interface Pagination {

x-pack/plugins/uptime/common/runtime_types/dynamic_settings.ts

@@ -7,12 +7,27 @@
 
 import * as t from 'io-ts';
 
-export const DynamicSettingsType = t.strict({
-  heartbeatIndices: t.string,
-  certAgeThreshold: t.number,
-  certExpirationThreshold: t.number,
-  defaultConnectors: t.array(t.string),
-});
+const DefaultEmailType = t.intersection([
+  t.type({
+    to: t.array(t.string),
+  }),
+  t.partial({
+    cc: t.array(t.string),
+    bcc: t.array(t.string),
+  }),
+]);
+
+export const DynamicSettingsType = t.intersection([
+  t.strict({
+    heartbeatIndices: t.string,
+    certAgeThreshold: t.number,
+    certExpirationThreshold: t.number,
+    defaultConnectors: t.array(t.string),
+  }),
+  t.partial({
+    defaultEmail: DefaultEmailType,
+  }),
+]);
 
 export const DynamicSettingsSaveType = t.intersection([
   t.type({
@@ -24,4 +39,5 @@ export const DynamicSettingsSaveType = t.intersection([
 ]);
 
 export type DynamicSettings = t.TypeOf<typeof DynamicSettingsType>;
+export type DefaultEmail = t.TypeOf<typeof DefaultEmailType>;
 export type DynamicSettingsSaveResponse = t.TypeOf<typeof DynamicSettingsSaveType>;

x-pack/plugins/uptime/e2e/journeys/alerts/default_email_settings.ts

@@ -0,0 +1,102 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { journey, step, before } from '@elastic/synthetics';
+import {
+  assertNotText,
+  assertText,
+  byTestId,
+  loginToKibana,
+  waitForLoadingToFinish,
+} from '../utils';
+import { settingsPageProvider } from '../../page_objects/settings';
+
+journey('DefaultEmailSettings', async ({ page, params }) => {
+  const settings = settingsPageProvider({ page, kibanaUrl: params.kibanaUrl });
+
+  before(async () => {
+    await waitForLoadingToFinish({ page });
+  });
+
+  const queryParams = new URLSearchParams({
+    dateRangeStart: '2021-11-21T22:06:06.502Z',
+    dateRangeEnd: '2021-11-21T22:10:08.203Z',
+  }).toString();
+
+  const baseUrl = `${params.kibanaUrl}/app/uptime/settings`;
+
+  step('Go to uptime', async () => {
+    await page.goto(`${baseUrl}?${queryParams}`, {
+      waitUntil: 'networkidle',
+    });
+    await loginToKibana({ page });
+  });
+
+  step('clear existing settings', async () => {
+    await settings.dismissSyntheticsCallout();
+    await page.waitForSelector(byTestId('"default-connectors-input-loaded"'));
+    await page.waitForTimeout(10 * 1000);
+    const toEmailInput = await page.$(byTestId('toEmailAddressInput'));
+
+    if (toEmailInput !== null) {
+      await page.click(`${byTestId('toEmailAddressInput')} >> ${byTestId('comboBoxClearButton')}`);
+      await page.click(
+        `${byTestId('"default-connectors-input-loaded"')} >> ${byTestId('comboBoxClearButton')}`
+      );
+      await settings.saveSettings();
+    }
+  });
+
+  step('Add email connector', async () => {
+    await page.click(byTestId('createConnectorButton'));
+    await page.click(byTestId('".email-card"'));
+    await page.fill(byTestId('nameInput'), 'Test connector');
+    await page.fill(byTestId('emailFromInput'), 'test@gmail.com');
+
+    await page.selectOption(byTestId('emailServiceSelectInput'), 'other');
+    await page.fill(byTestId('emailHostInput'), 'test');
+    await page.fill(byTestId('emailPortInput'), '1025');
+    await page.click('text=Require authentication for this server');
+    await page.click(byTestId('saveNewActionButton'));
+  });
+
+  step('Select email connector', async () => {
+    await assertNotText({ page, text: 'Bcc' });
+    await page.click(byTestId('default-connectors-input-loaded'));
+    await page.click(byTestId('"Test connector"'));
+
+    await assertText({ page, text: 'Bcc' });
+
+    await settings.assertText({ text: 'To email is required for email connector' });
+
+    await settings.assertApplyDisabled();
+
+    await settings.fillToEmail('test@gmail.com');
+
+    await settings.assertApplyEnabled();
+  });
+
+  step('Checks for invalid email', async () => {
+    await settings.fillToEmail('test@gmail');
+
+    await settings.assertText({ text: 'test@gmail is not a valid email.' });
+
+    await settings.assertApplyDisabled();
+    await settings.removeInvalidEmail('test@gmail');
+  });
+
+  step('Save settings', async () => {
+    await settings.saveSettings();
+  });
+});

x-pack/plugins/uptime/e2e/journeys/alerts/index.ts

@@ -7,3 +7,4 @@
 
 export * from './tls_alert_flyouts_in_alerting_app';
 export * from './status_alert_flyouts_in_alerting_app';
+export * from './default_email_settings';

x-pack/plugins/uptime/e2e/journeys/utils.ts

@@ -40,3 +40,7 @@ export const assertText = async ({ page, text }: { page: Page; text: string }) =
   await page.waitForSelector(`text=${text}`);
   expect(await page.$(`text=${text}`)).toBeTruthy();
 };
+
+export const assertNotText = async ({ page, text }: { page: Page; text: string }) => {
+  expect(await page.$(`text=${text}`)).toBeFalsy();
+};

x-pack/plugins/uptime/e2e/page_objects/login.tsx

@@ -8,12 +8,12 @@ import { Page } from '@elastic/synthetics';
 
 export function loginPageProvider({
   page,
-  isRemote,
+  isRemote = false,
   username = 'elastic',
   password = 'changeme',
 }: {
   page: Page;
-  isRemote: boolean;
+  isRemote?: boolean;
   username?: string;
   password?: string;
 }) {

x-pack/plugins/uptime/e2e/page_objects/settings.tsx

@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { expect, Page } from '@elastic/synthetics';
+import { loginPageProvider } from './login';
+import { utilsPageProvider } from './utils';
+import { byTestId } from '../journeys/utils';
+
+export function settingsPageProvider({ page }: { page: Page; kibanaUrl: string }) {
+  return {
+    ...loginPageProvider({ page }),
+    ...utilsPageProvider({ page }),
+
+    async fillToEmail(text: string) {
+      await page.fill(
+        '[data-test-subj=toEmailAddressInput] >> [data-test-subj=comboBoxSearchInput]',
+        text
+      );
+
+      await page.click(byTestId('uptimeSettingsPage'));
+    },
+    async saveSettings() {
+      await page.click(byTestId('apply-settings-button'));
+      await this.waitForLoadingToFinish();
+      await this.assertText({ text: 'Settings saved!' });
+    },
+    async assertApplyEnabled() {
+      expect(await page.isEnabled(byTestId('apply-settings-button'))).toBeTruthy();
+    },
+    async assertApplyDisabled() {
+      expect(await page.isEnabled(byTestId('apply-settings-button'))).toBeFalsy();
+    },
+    async removeInvalidEmail(invalidEmail: string) {
+      await page.click(`[title="Remove ${invalidEmail} from selection in this group"]`);
+    },
+  };
+}