[Alerting UI] Alert and Connector flyouts Save and Save&Test buttons …

…should be active by default. (elastic#86708) * Alert and Connector flyouts Save and Save&Test buttons should be active by default. * fixed typechecks * fixed typechecks * refactored repeted code * fixed typechecks * fixed typechecks * fixed typechecks * fixed due to comments * fixed failing tests * fixed due to comments * fixed due to comments * fixed due to comments * fixed typescript checks
YulNaumenko · Jan 5, 2021 · e0af132 · e0af132
1 parent 4bbb559
commit e0af132
Show file tree

Hide file tree

Showing 60 changed files with 1,285 additions and 584 deletions.
diff --git a/x-pack/plugins/monitoring/public/alerts/alert_form.test.tsx b/x-pack/plugins/monitoring/public/alerts/alert_form.test.tsx
@@ -15,7 +15,12 @@ import { act } from 'react-dom/test-utils';
 import { coreMock } from 'src/core/public/mocks';
 import { actionTypeRegistryMock } from '../../../triggers_actions_ui/public/application/action_type_registry.mock';
 import { alertTypeRegistryMock } from '../../../triggers_actions_ui/public/application/alert_type_registry.mock';
-import { ValidationResult, Alert } from '../../../triggers_actions_ui/public/types';
+import {
+  ValidationResult,
+  Alert,
+  ConnectorValidationResult,
+  GenericValidationResult,
+} from '../../../triggers_actions_ui/public/types';
 import { AlertForm } from '../../../triggers_actions_ui/public/application/sections/alert_form/alert_form';
 import ActionForm from '../../../triggers_actions_ui/public/application/sections/action_connector_form/action_form';
 import { Legacy } from '../legacy_shims';
@@ -88,8 +93,13 @@ describe('alert_form', () => {
     id: 'alert-action-type',
     iconClass: '',
     selectMessage: '',
-    validateConnector: validationMethod,
-    validateParams: validationMethod,
+    validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
+      return {};
+    },
+    validateParams: (): GenericValidationResult<unknown> => {
+      const validationResult = { errors: {} };
+      return validationResult;
+    },
     actionConnectorFields: null,
     actionParamsFields: mockedActionParamsFields,
   };

diff --git a/x-pack/plugins/security_solution/public/cases/components/connectors/case/index.ts b/x-pack/plugins/security_solution/public/cases/components/connectors/case/index.ts
@@ -32,7 +32,7 @@ export function getActionType(): ActionTypeModel {
     iconClass: 'securityAnalyticsApp',
     selectMessage: i18n.CASE_CONNECTOR_DESC,
     actionTypeTitle: i18n.CASE_CONNECTOR_TITLE,
-    validateConnector: () => ({ errors: {} }),
+    validateConnector: () => ({ config: { errors: {} }, secrets: { errors: {} } }),
     validateParams,
     actionConnectorFields: null,
     actionParamsFields: lazy(() => import('./fields')),

diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.tsx
@@ -253,7 +253,7 @@ export const IndexThresholdAlertTypeExpression: React.FunctionComponent<
           fullWidth
           name="thresholdTimeField"
           data-test-subj="thresholdAlertTimeFieldSelect"
-          value={timeField}
+          value={timeField || ''}
           onChange={(e) => {
             setAlertParams('timeField', e.target.value);
           }}

diff --git a/...iggers_actions_ui/public/application/components/builtin_action_types/email/email.test.tsx b/...iggers_actions_ui/public/application/components/builtin_action_types/email/email.test.tsx
@@ -48,12 +48,18 @@ describe('connector validation', () => {
     } as EmailActionConnector;
 
     expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
-      errors: {
-        from: [],
-        port: [],
-        host: [],
-        user: [],
-        password: [],
+      config: {
+        errors: {
+          from: [],
+          port: [],
+          host: [],
+        },
+      },
+      secrets: {
+        errors: {
+          user: [],
+          password: [],
+        },
       },
     });
   });
@@ -78,12 +84,18 @@ describe('connector validation', () => {
     } as EmailActionConnector;
 
     expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
-      errors: {
-        from: [],
-        port: [],
-        host: [],
-        user: [],
-        password: [],
+      config: {
+        errors: {
+          from: [],
+          port: [],
+          host: [],
+        },
+      },
+      secrets: {
+        errors: {
+          user: [],
+          password: [],
+        },
       },
     });
   });
@@ -103,12 +115,18 @@ describe('connector validation', () => {
     } as EmailActionConnector;
 
     expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
-      errors: {
-        from: [],
-        port: ['Port is required.'],
-        host: ['Host is required.'],
-        user: [],
-        password: [],
+      config: {
+        errors: {
+          from: [],
+          port: ['Port is required.'],
+          host: ['Host is required.'],
+        },
+      },
+      secrets: {
+        errors: {
+          user: [],
+          password: [],
+        },
       },
     });
   });
@@ -132,12 +150,18 @@ describe('connector validation', () => {
     } as EmailActionConnector;
 
     expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
-      errors: {
-        from: [],
-        port: [],
-        host: [],
-        user: [],
-        password: ['Password is required when username is used.'],
+      config: {
+        errors: {
+          from: [],
+          port: [],
+          host: [],
+        },
+      },
+      secrets: {
+        errors: {
+          user: [],
+          password: ['Password is required when username is used.'],
+        },
       },
     });
   });
@@ -161,12 +185,18 @@ describe('connector validation', () => {
     } as EmailActionConnector;
 
     expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
-      errors: {
-        from: [],
-        port: [],
-        host: [],
-        user: ['Username is required when password is used.'],
-        password: [],
+      config: {
+        errors: {
+          from: [],
+          port: [],
+          host: [],
+        },
+      },
+      secrets: {
+        errors: {
+          user: ['Username is required when password is used.'],
+          password: [],
+        },
       },
     });
   });

diff --git a/...ns/triggers_actions_ui/public/application/components/builtin_action_types/email/email.tsx b/...ns/triggers_actions_ui/public/application/components/builtin_action_types/email/email.tsx
@@ -5,7 +5,11 @@
  */
 import { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
-import { ActionTypeModel, ValidationResult } from '../../../../types';
+import {
+  ActionTypeModel,
+  ConnectorValidationResult,
+  GenericValidationResult,
+} from '../../../../types';
 import { EmailActionParams, EmailConfig, EmailSecrets, EmailActionConnector } from '../types';
 
 export function getActionType(): ActionTypeModel<EmailConfig, EmailSecrets, EmailActionParams> {
@@ -25,18 +29,25 @@ export function getActionType(): ActionTypeModel<EmailConfig, EmailSecrets, Emai
         defaultMessage: 'Send to email',
       }
     ),
-    validateConnector: (action: EmailActionConnector): ValidationResult => {
-      const validationResult = { errors: {} };
-      const errors = {
+    validateConnector: (
+      action: EmailActionConnector
+    ): ConnectorValidationResult<Omit<EmailConfig, 'secure' | 'hasAuth'>, EmailSecrets> => {
+      const configErrors = {
         from: new Array<string>(),
         port: new Array<string>(),
         host: new Array<string>(),
+      };
+      const secretsErrors = {
         user: new Array<string>(),
         password: new Array<string>(),
       };
-      validationResult.errors = errors;
+
+      const validationResult = {
+        config: { errors: configErrors },
+        secrets: { errors: secretsErrors },
+      };
       if (!action.config.from) {
-        errors.from.push(
+        configErrors.from.push(
           i18n.translate(
             'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredFromText',
             {
@@ -46,7 +57,7 @@ export function getActionType(): ActionTypeModel<EmailConfig, EmailSecrets, Emai
         );
       }
       if (action.config.from && !action.config.from.trim().match(mailformat)) {
-        errors.from.push(
+        configErrors.from.push(
           i18n.translate(
             'xpack.triggersActionsUI.components.builtinActionTypes.error.formatFromText',
             {
@@ -56,7 +67,7 @@ export function getActionType(): ActionTypeModel<EmailConfig, EmailSecrets, Emai
         );
       }
       if (!action.config.port) {
-        errors.port.push(
+        configErrors.port.push(
           i18n.translate(
             'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredPortText',
             {
@@ -66,7 +77,7 @@ export function getActionType(): ActionTypeModel<EmailConfig, EmailSecrets, Emai
         );
       }
       if (!action.config.host) {
-        errors.host.push(
+        configErrors.host.push(
           i18n.translate(
             'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredHostText',
             {
@@ -76,7 +87,7 @@ export function getActionType(): ActionTypeModel<EmailConfig, EmailSecrets, Emai
         );
       }
       if (action.config.hasAuth && !action.secrets.user && !action.secrets.password) {
-        errors.user.push(
+        secretsErrors.user.push(
           i18n.translate(
             'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredAuthUserNameText',
             {
@@ -86,7 +97,7 @@ export function getActionType(): ActionTypeModel<EmailConfig, EmailSecrets, Emai
         );
       }
       if (action.config.hasAuth && !action.secrets.user && !action.secrets.password) {
-        errors.password.push(
+        secretsErrors.password.push(
           i18n.translate(
             'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredAuthPasswordText',
             {
@@ -96,7 +107,7 @@ export function getActionType(): ActionTypeModel<EmailConfig, EmailSecrets, Emai
         );
       }
       if (action.secrets.user && !action.secrets.password) {
-        errors.password.push(
+        secretsErrors.password.push(
           i18n.translate(
             'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredPasswordText',
             {
@@ -106,7 +117,7 @@ export function getActionType(): ActionTypeModel<EmailConfig, EmailSecrets, Emai
         );
       }
       if (!action.secrets.user && action.secrets.password) {
-        errors.user.push(
+        secretsErrors.user.push(
           i18n.translate(
             'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredUserText',
             {
@@ -117,16 +128,17 @@ export function getActionType(): ActionTypeModel<EmailConfig, EmailSecrets, Emai
       }
       return validationResult;
     },
-    validateParams: (actionParams: EmailActionParams): ValidationResult => {
-      const validationResult = { errors: {} };
+    validateParams: (
+      actionParams: EmailActionParams
+    ): GenericValidationResult<EmailActionParams> => {
       const errors = {
         to: new Array<string>(),
         cc: new Array<string>(),
         bcc: new Array<string>(),
         message: new Array<string>(),
         subject: new Array<string>(),
       };
-      validationResult.errors = errors;
+      const validationResult = { errors };
       if (
         (!(actionParams.to instanceof Array) || actionParams.to.length === 0) &&
         (!(actionParams.cc instanceof Array) || actionParams.cc.length === 0) &&

diff --git a/...s_actions_ui/public/application/components/builtin_action_types/email/email_connector.tsx b/...s_actions_ui/public/application/components/builtin_action_types/email/email_connector.tsx
@@ -192,7 +192,7 @@ export const EmailActionConnectorFields: React.FunctionComponent<
               }
             )}
             disabled={readOnly}
-            checked={hasAuth}
+            checked={hasAuth || false}
             onChange={(e) => {
               editActionConfig('hasAuth', e.target.checked);
               if (!e.target.checked) {

diff --git a/..._actions_ui/public/application/components/builtin_action_types/es_index/es_index.test.tsx b/..._actions_ui/public/application/components/builtin_action_types/es_index/es_index.test.tsx
@@ -42,8 +42,13 @@ describe('index connector validation', () => {
     } as EsIndexActionConnector;
 
     expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
-      errors: {
-        index: [],
+      config: {
+        errors: {
+          index: [],
+        },
+      },
+      secrets: {
+        errors: {},
       },
     });
   });
@@ -62,8 +67,13 @@ describe('index connector validation with minimal config', () => {
     } as EsIndexActionConnector;
 
     expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
-      errors: {
-        index: [],
+      config: {
+        errors: {
+          index: [],
+        },
+      },
+      secrets: {
+        errors: {},
       },
     });
   });

diff --git a/...ggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.tsx b/...ggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.tsx
@@ -5,7 +5,11 @@
  */
 import { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
-import { ActionTypeModel, ValidationResult } from '../../../../types';
+import {
+  ActionTypeModel,
+  GenericValidationResult,
+  ConnectorValidationResult,
+} from '../../../../types';
 import { EsIndexActionConnector, EsIndexConfig, IndexActionParams } from '../types';
 
 export function getActionType(): ActionTypeModel<EsIndexConfig, unknown, IndexActionParams> {
@@ -24,14 +28,15 @@ export function getActionType(): ActionTypeModel<EsIndexConfig, unknown, IndexAc
         defaultMessage: 'Index data',
       }
     ),
-    validateConnector: (action: EsIndexActionConnector): ValidationResult => {
-      const validationResult = { errors: {} };
-      const errors = {
+    validateConnector: (
+      action: EsIndexActionConnector
+    ): ConnectorValidationResult<Pick<EsIndexConfig, 'index'>, unknown> => {
+      const configErrors = {
         index: new Array<string>(),
       };
-      validationResult.errors = errors;
+      const validationResult = { config: { errors: configErrors }, secrets: { errors: {} } };
       if (!action.config.index) {
-        errors.index.push(
+        configErrors.index.push(
           i18n.translate(
             'xpack.triggersActionsUI.components.builtinActionTypes.indexAction.error.requiredIndexText',
             {
@@ -44,12 +49,13 @@ export function getActionType(): ActionTypeModel<EsIndexConfig, unknown, IndexAc
     },
     actionConnectorFields: lazy(() => import('./es_index_connector')),
     actionParamsFields: lazy(() => import('./es_index_params')),
-    validateParams: (actionParams: IndexActionParams): ValidationResult => {
-      const validationResult = { errors: {} };
+    validateParams: (
+      actionParams: IndexActionParams
+    ): GenericValidationResult<IndexActionParams> => {
       const errors = {
         documents: new Array<string>(),
       };
-      validationResult.errors = errors;
+      const validationResult = { errors };
       if (!actionParams.documents?.length || Object.keys(actionParams.documents[0]).length === 0) {
         errors.documents.push(
           i18n.translate(