Added ability to assign alert actions to resolved action group in UI

x-pack/plugins/alerts/common/builtin_action_groups.ts

@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { i18n } from '@kbn/i18n';
+import { ActionGroup } from './alert_type';
+
+export const ResolvedActionGroup: ActionGroup = {
+  id: 'resolved',
+  name: i18n.translate('xpack.alerts.builtinActionGroups.resolved', {
+    defaultMessage: 'Resolved',
+  }),
+};
+
+export function getBuiltinActionGroups(): ActionGroup[] {
+  return [ResolvedActionGroup];
+}

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

@@ -11,6 +11,7 @@ import { ActionParamsProps } from '../../../../types';
 import { EmailActionParams } from '../types';
 import { TextFieldWithMessageVariables } from '../../text_field_with_message_variables';
 import { TextAreaWithMessageVariables } from '../../text_area_with_message_variables';
+import { resolvedActionGroupMessage } from '../../../constants';
 
 export const EmailParamsFields = ({
   actionParams,
@@ -28,11 +29,18 @@ export const EmailParamsFields = ({
   const [addBCC, setAddBCC] = useState<boolean>(false);
 
   useEffect(() => {
-    if (!message && defaultMessage && defaultMessage.length > 0) {
+    if (defaultMessage === resolvedActionGroupMessage) {
+      editAction('message', defaultMessage, index);
+    } else if (
+      (!message || message === resolvedActionGroupMessage) &&
+      defaultMessage &&
+      defaultMessage.length > 0
+    ) {
       editAction('message', defaultMessage, index);
     }
+
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [defaultMessage]);
 
   return (
     <Fragment>

x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.tsx

@@ -9,6 +9,7 @@ import { EuiSelect, EuiFormRow } from '@elastic/eui';
 import { ActionParamsProps } from '../../../../types';
 import { ServerLogActionParams } from '.././types';
 import { TextAreaWithMessageVariables } from '../../text_area_with_message_variables';
+import { resolvedActionGroupMessage } from '../../../constants';
 
 export const ServerLogParamsFields: React.FunctionComponent<ActionParamsProps<
   ServerLogActionParams
@@ -25,11 +26,22 @@ export const ServerLogParamsFields: React.FunctionComponent<ActionParamsProps<
 
   useEffect(() => {
     editAction('level', 'info', index);
-    if (!message && defaultMessage && defaultMessage.length > 0) {
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  useEffect(() => {
+    if (defaultMessage === resolvedActionGroupMessage) {
+      editAction('message', defaultMessage, index);
+    } else if (
+      (!message || message === resolvedActionGroupMessage) &&
+      defaultMessage &&
+      defaultMessage.length > 0
+    ) {
       editAction('message', defaultMessage, index);
     }
+
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [defaultMessage]);
 
   return (
     <Fragment>

x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack_params.tsx

@@ -8,6 +8,7 @@ import { i18n } from '@kbn/i18n';
 import { ActionParamsProps } from '../../../../types';
 import { SlackActionParams } from '../types';
 import { TextAreaWithMessageVariables } from '../../text_area_with_message_variables';
+import { resolvedActionGroupMessage } from '../../../constants';
 
 const SlackParamsFields: React.FunctionComponent<ActionParamsProps<SlackActionParams>> = ({
   actionParams,
@@ -19,11 +20,18 @@ const SlackParamsFields: React.FunctionComponent<ActionParamsProps<SlackActionPa
 }) => {
   const { message } = actionParams;
   useEffect(() => {
-    if (!message && defaultMessage && defaultMessage.length > 0) {
+    if (defaultMessage === resolvedActionGroupMessage) {
+      editAction('message', defaultMessage, index);
+    } else if (
+      (!message || message === resolvedActionGroupMessage) &&
+      defaultMessage &&
+      defaultMessage.length > 0
+    ) {
       editAction('message', defaultMessage, index);
     }
+
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [defaultMessage]);
 
   return (
     <TextAreaWithMessageVariables

x-pack/plugins/triggers_actions_ui/public/application/constants/index.ts

@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { i18n } from '@kbn/i18n';
+
 export { BASE_ALERT_API_PATH } from '../../../../alerts/common';
 export { BASE_ACTION_API_PATH } from '../../../../actions/common';
 
@@ -14,6 +16,13 @@ export const routeToConnectors = `/connectors`;
 export const routeToAlerts = `/alerts`;
 export const routeToAlertDetails = `/alert/:alertId`;
 
+export const resolvedActionGroupMessage = i18n.translate(
+  'xpack.triggersActionsUI.sections.actionForm.ResolvedMessage',
+  {
+    defaultMessage: 'Resolved',
+  }
+);
+
 export { TIME_UNITS } from './time_units';
 export enum SORT_ORDERS {
   ASCENDING = 'asc',

x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.ts

@@ -5,14 +5,16 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { AlertType, ActionVariable } from '../../types';
+import { ActionVariable, ActionVariables } from '../../types';
 
 // return a "flattened" list of action variables for an alertType
-export function actionVariablesFromAlertType(alertType: AlertType): ActionVariable[] {
+export function actionVariablesFromAlertType(actionVariables: ActionVariables): ActionVariable[] {
   const alwaysProvidedVars = getAlwaysProvidedActionVariables();
-  const contextVars = prefixKeys(alertType.actionVariables.context, 'context.');
-  const paramsVars = prefixKeys(alertType.actionVariables.params, 'params.');
-  const stateVars = prefixKeys(alertType.actionVariables.state, 'state.');
+  const contextVars = actionVariables.context
+    ? prefixKeys(actionVariables.context, 'context.')
+    : [];
+  const paramsVars = prefixKeys(actionVariables.params, 'params.');
+  const stateVars = prefixKeys(actionVariables.state, 'state.');
 
   return alwaysProvidedVars.concat(contextVars, paramsVars, stateVars);
 }

x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx

@@ -27,7 +27,7 @@ import {
   ActionTypeIndex,
   ActionConnector,
   ActionType,
-  ActionVariable,
+  ActionVariables,
 } from '../../../types';
 import { SectionLoading } from '../../components/section_loading';
 import { ConnectorAddModal } from './connector_add_modal';
@@ -51,7 +51,7 @@ export interface ActionAccordionFormProps {
   toastNotifications: ToastsSetup;
   docLinks: DocLinksStart;
   actionTypes?: ActionType[];
-  messageVariables?: ActionVariable[];
+  messageVariables?: ActionVariables;
   defaultActionMessage?: string;
   setHasActionsDisabled?: (value: boolean) => void;
   setHasActionsWithBrokenConnector?: (value: boolean) => void;

x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_form.tsx

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Fragment, Suspense, useState } from 'react';
+import React, { Fragment, Suspense, useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
@@ -25,10 +25,20 @@ import {
   EuiLoadingSpinner,
   EuiBadge,
 } from '@elastic/eui';
-import { IErrorObject, AlertAction, ActionTypeIndex, ActionConnector } from '../../../types';
+import { ResolvedActionGroup } from '../../../../../alerts/common';
+import {
+  IErrorObject,
+  AlertAction,
+  ActionTypeIndex,
+  ActionConnector,
+  ActionVariables,
+  ActionVariable,
+} from '../../../types';
 import { checkActionFormActionTypeEnabled } from '../../lib/check_action_type_enabled';
 import { hasSaveActionsCapability } from '../../lib/capabilities';
 import { ActionAccordionFormProps } from './action_form';
+import { actionVariablesFromAlertType } from '../../lib/action_variables';
+import { resolvedActionGroupMessage } from '../../constants';
 
 export type ActionTypeFormProps = {
   actionItem: AlertAction;
@@ -88,6 +98,21 @@ export const ActionTypeForm = ({
   setActionGroupIdByIndex,
 }: ActionTypeFormProps) => {
   const [isOpen, setIsOpen] = useState(true);
+  const [availableActionVariables, setAvailableActionVariables] = useState<ActionVariable[]>([]);
+  const [availableDefaultActionMessage, setAvailableDefaultActionMessage] = useState<
+    string | undefined
+  >(undefined);
+
+  useEffect(() => {
+    setAvailableActionVariables(getAvailableActionVariables(messageVariables, actionItem.group));
+    const res =
+      actionItem.group === ResolvedActionGroup.id
+        ? resolvedActionGroupMessage
+        : defaultActionMessage;
+    setAvailableDefaultActionMessage(res);
+    // setActionParamsProperty('message', res, index);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [actionItem.group]);
 
   const canSave = hasSaveActionsCapability(capabilities);
   const getSelectedOptions = (actionItemId: string) => {
@@ -244,8 +269,8 @@ export const ActionTypeForm = ({
             index={index}
             errors={actionParamsErrors.errors}
             editAction={setActionParamsProperty}
-            messageVariables={messageVariables}
-            defaultMessage={defaultActionMessage ?? undefined}
+            messageVariables={availableActionVariables}
+            defaultMessage={availableDefaultActionMessage}
             docLinks={docLinks}
             http={http}
             toastNotifications={toastNotifications}
@@ -337,3 +362,20 @@ export const ActionTypeForm = ({
     </Fragment>
   );
 };
+
+function getAvailableActionVariables(
+  actionVariables: ActionVariables | undefined,
+  actionGroup: string
+) {
+  if (!actionVariables) {
+    return [];
+  }
+  const filteredActionVariables =
+    actionGroup === ResolvedActionGroup.id
+      ? { params: actionVariables.params, state: actionVariables.state }
+      : actionVariables;
+
+  return actionVariablesFromAlertType(filteredActionVariables).sort((a, b) =>
+    a.name.toUpperCase().localeCompare(b.name.toUpperCase())
+  );
+}

x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.tsx

@@ -40,7 +40,6 @@ import {
   getDurationUnitValue,
 } from '../../../../../alerts/common/parse_duration';
 import { loadAlertTypes } from '../../lib/alert_api';
-import { actionVariablesFromAlertType } from '../../lib/action_variables';
 import { AlertReducerAction } from './alert_reducer';
 import {
   AlertTypeModel,
@@ -458,9 +457,7 @@ export const AlertForm = ({
           actions={alert.actions}
           setHasActionsDisabled={setHasActionsDisabled}
           setHasActionsWithBrokenConnector={setHasActionsWithBrokenConnector}
-          messageVariables={actionVariablesFromAlertType(
-            alertTypesIndex.get(alert.alertTypeId)!
-          ).sort((a, b) => a.name.toUpperCase().localeCompare(b.name.toUpperCase()))}
+          messageVariables={alertTypesIndex.get(alert.alertTypeId)!.actionVariables}
           defaultActionGroupId={defaultActionGroupId}
           actionGroups={alertTypesIndex.get(alert.alertTypeId)!.actionGroups}
           setActionIdByIndex={(id: string, index: number) => setActionProperty('id', id, index)}

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

@@ -133,7 +133,7 @@ export interface ActionVariable {
 }
 
 export interface ActionVariables {
-  context: ActionVariable[];
+  context?: ActionVariable[];
   state: ActionVariable[];
   params: ActionVariable[];
 }