Moved setting of default alert type to the server api

YulNaumenko · YulNaumenko · commit 0e7f7b8b4264 · 2020-02-19T12:11:46.000-08:00
diff --git a/x-pack/legacy/plugins/monitoring/server/alerts/license_expiration.ts b/x-pack/legacy/plugins/monitoring/server/alerts/license_expiration.ts
@@ -54,6 +54,7 @@ export const getLicenseExpiration = (
         }),
       },
     ],
+    defaultActionGroup: 'default',
     async executor({
       services,
       params,
diff --git a/x-pack/plugins/alerting/common/index.ts b/x-pack/plugins/alerting/common/index.ts
@@ -7,3 +7,8 @@
 export * from './alert';
 export * from './alert_instance';
 export * from './alert_task_instance';
+
+export interface ActionGroup {
+  id: string;
+  name: string;
+}
diff --git a/x-pack/plugins/alerting/server/index.ts b/x-pack/plugins/alerting/server/index.ts
@@ -12,6 +12,7 @@ export type AlertsClient = PublicMethodsOf<AlertsClientClass>;
 
 export {
   AlertType,
+  ActionGroup,
   AlertingPlugin,
   AlertExecutorOptions,
   AlertActionParams,
diff --git a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts
@@ -15,6 +15,7 @@ const alertType: AlertType = {
     { id: 'default', name: 'Default' },
     { id: 'other-group', name: 'Other Group' },
   ],
+  defaultActionGroup: 'default',
   executor: jest.fn(),
 };
 
diff --git a/x-pack/plugins/alerting/server/types.ts b/x-pack/plugins/alerting/server/types.ts
@@ -8,7 +8,7 @@ import { AlertInstance } from './alert_instance';
 import { AlertTypeRegistry as OrigAlertTypeRegistry } from './alert_type_registry';
 import { PluginSetupContract, PluginStartContract } from './plugin';
 import { SavedObjectAttributes, SavedObjectsClientContract } from '../../../../src/core/server';
-import { Alert, AlertActionParams } from '../common';
+import { Alert, AlertActionParams, ActionGroup } from '../common';
 import { AlertsClient } from './alerts_client';
 export * from '../common';
 
@@ -52,18 +52,14 @@ export interface AlertExecutorOptions {
   updatedBy: string | null;
 }
 
-export interface ActionGroup {
-  id: string;
-  name: string;
-}
-
 export interface AlertType {
   id: string;
   name: string;
   validate?: {
     params?: { validate: (object: any) => any };
   };
   actionGroups: ActionGroup[];
+  defaultActionGroup: ActionGroup['id'];
   executor: ({ services, params, state }: AlertExecutorOptions) => Promise<State | void>;
 }
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/index.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/index.ts
@@ -101,6 +101,5 @@ export function getAlertType(): AlertTypeModel {
       return validationResult;
     },
     defaultActionMessage: 'Alert [{{ctx.metadata.name}}] has exceeded the threshold',
-    defaultActionGroup: 'alert',
   };
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_add/alert_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_add/alert_form.tsx
@@ -118,9 +118,7 @@ export const AlertForm = ({
   const [alertThrottleUnit, setAlertThrottleUnit] = useState<string>('m');
   const [isAddActionPanelOpen, setIsAddActionPanelOpen] = useState<boolean>(true);
   const [connectors, setConnectors] = useState<ActionConnector[]>([]);
-  const [defaultActionGroup, setDefaultActionGroup] = useState<string>(
-    alertTypeModel?.defaultActionGroup ?? 'default'
-  );
+  const [defaultActionGroup, setDefaultActionGroup] = useState<string>('default');
   const [activeActionItem, setActiveActionItem] = useState<ActiveActionConnectorState | undefined>(
     undefined
   );
@@ -167,13 +165,14 @@ export const AlertForm = ({
           ],
           name: 'threshold',
           actionVariables: ['ctx.metadata.name', 'ctx.metadata.test'],
+          defaultActionGroup: 'alert',
         });
         const index: AlertTypeIndex = {};
         for (const alertTypeItem of alertTypes) {
           index[alertTypeItem.id] = alertTypeItem;
         }
-        if (!alertTypeModel?.defaultActionGroup && alert.alertTypeId && index[alert.alertTypeId]) {
-          setDefaultActionGroup(index[alert.alertTypeId].actionGroups[0].id);
+        if (alert.alertTypeId && index[alert.alertTypeId]) {
+          setDefaultActionGroup(index[alert.alertTypeId].defaultActionGroup);
         }
         setAlertTypesIndex(index);
       } catch (e) {
@@ -295,15 +294,8 @@ export const AlertForm = ({
         onClick={() => {
           setAlertProperty('alertTypeId', item.id);
           setAlertTypeModel(item);
-          if (item.defaultActionGroup) {
-            setDefaultActionGroup(item.defaultActionGroup);
-          } else if (
-            !alertTypeModel?.defaultActionGroup &&
-            alertTypesIndex &&
-            alertTypesIndex[item.id] &&
-            alertTypesIndex[item.id].actionGroups.length > 0
-          ) {
-            setDefaultActionGroup(alertTypesIndex[item.id].actionGroups[0].id);
+          if (alertTypesIndex && alertTypesIndex[item.id]) {
+            setDefaultActionGroup(alertTypesIndex[item.id].defaultActionGroup);
           }
         }}
       >
diff --git a/x-pack/plugins/triggers_actions_ui/public/types.ts b/x-pack/plugins/triggers_actions_ui/public/types.ts
@@ -3,6 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import { ActionGroup } from '../../alerting/common';
 import { ActionType } from '../../actions/common';
 import { TypeRegistry } from './application/type_registry';
 import {
@@ -70,18 +71,16 @@ export interface ActionConnectorTableItem extends ActionConnector {
   actionType: ActionType['name'];
 }
 
-export interface ActionGroup {
-  id: string;
-  name: string;
-}
-
 export interface AlertType {
   id: string;
   name: string;
   actionGroups: ActionGroup[];
   actionVariables: string[];
+  defaultActionGroup: ActionGroup['id'];
 }
 
+export type SanitizedAlertType = Omit<AlertType, 'apiKey'>;
+
 export type AlertWithoutId = Omit<Alert, 'id'>;
 
 export interface AlertTableItem extends Alert {
@@ -96,7 +95,6 @@ export interface AlertTypeModel {
   validate: (alertParams: any) => ValidationResult;
   alertParamsExpression: React.FunctionComponent<any>;
   defaultActionMessage?: string;
-  defaultActionGroup?: string;
 }
 
 export interface IErrorObject {

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,5 @@ export function getAlertType(): AlertTypeModel {`
`101`	`101`	`return validationResult;`
`102`	`102`	`},`
`103`	`103`	`defaultActionMessage: 'Alert [{{ctx.metadata.name}}] has exceeded the threshold',`
`104`		`- defaultActionGroup: 'alert',`
`105`	`104`	`};`
`106`	`105`	`}`