fixed buggy default message behaviour

elastic · Nov 24, 2020 · 00f7ef3 · 00f7ef3
1 parent 7d5fb8e
commit 00f7ef3
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 30 deletions.
diff --git a/...gers_actions_ui/public/application/components/builtin_action_types/email/email_params.tsx b/...gers_actions_ui/public/application/components/builtin_action_types/email/email_params.tsx
@@ -11,7 +11,6 @@ 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,17 +27,19 @@ export const EmailParamsFields = ({
   const [addCC, setAddCC] = useState<boolean>(false);
   const [addBCC, setAddBCC] = useState<boolean>(false);
 
+  const [[isUsingDefault, defaultMessageUsed], setDefaultMessageUsage] = useState<
+    [boolean, string | undefined]
+  >([false, defaultMessage]);
   useEffect(() => {
-    if (defaultMessage === resolvedActionGroupMessage) {
-      editAction('message', defaultMessage, index);
-    } else if (
-      (!message || message === resolvedActionGroupMessage) &&
-      defaultMessage &&
-      defaultMessage.length > 0
+    if (
+      !actionParams?.message ||
+      (isUsingDefault &&
+        actionParams?.message === defaultMessageUsed &&
+        defaultMessageUsed !== defaultMessage)
     ) {
+      setDefaultMessageUsage([true, defaultMessage]);
       editAction('message', defaultMessage, index);
     }
-
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [defaultMessage]);
 

diff --git a/...ns_ui/public/application/components/builtin_action_types/server_log/server_log_params.tsx b/...ns_ui/public/application/components/builtin_action_types/server_log/server_log_params.tsx
@@ -3,17 +3,16 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import React, { Fragment, useEffect } from 'react';
+import React, { Fragment, useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 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>
-> = ({ actionParams, editAction, index, errors, messageVariables, defaultMessage }) => {
+export const ServerLogParamsFields: React.FunctionComponent<ActionParamsProps<
+  ServerLogActionParams
+>> = ({ actionParams, editAction, index, errors, messageVariables, defaultMessage }) => {
   const { message, level } = actionParams;
   const levelOptions = [
     { value: 'trace', text: 'Trace' },
@@ -23,25 +22,26 @@ export const ServerLogParamsFields: React.FunctionComponent<
     { value: 'error', text: 'Error' },
     { value: 'fatal', text: 'Fatal' },
   ];
-
   useEffect(() => {
     if (!actionParams?.level) {
       editAction('level', 'info', index);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  const [[isUsingDefault, defaultMessageUsed], setDefaultMessageUsage] = useState<
+    [boolean, string | undefined]
+  >([false, defaultMessage]);
   useEffect(() => {
-    if (defaultMessage === resolvedActionGroupMessage) {
-      editAction('message', defaultMessage, index);
-    } else if (
-      (!message || message === resolvedActionGroupMessage) &&
-      defaultMessage &&
-      defaultMessage.length > 0
+    if (
+      !actionParams?.message ||
+      (isUsingDefault &&
+        actionParams?.message === defaultMessageUsed &&
+        defaultMessageUsed !== defaultMessage)
     ) {
+      setDefaultMessageUsage([true, defaultMessage]);
       editAction('message', defaultMessage, index);
     }
-
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [defaultMessage]);
 

diff --git a/...gers_actions_ui/public/application/components/builtin_action_types/slack/slack_params.tsx b/...gers_actions_ui/public/application/components/builtin_action_types/slack/slack_params.tsx
@@ -3,12 +3,11 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 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,17 +18,19 @@ const SlackParamsFields: React.FunctionComponent<ActionParamsProps<SlackActionPa
   defaultMessage,
 }) => {
   const { message } = actionParams;
+  const [[isUsingDefault, defaultMessageUsed], setDefaultMessageUsage] = useState<
+    [boolean, string | undefined]
+  >([false, defaultMessage]);
   useEffect(() => {
-    if (defaultMessage === resolvedActionGroupMessage) {
-      editAction('message', defaultMessage, index);
-    } else if (
-      (!message || message === resolvedActionGroupMessage) &&
-      defaultMessage &&
-      defaultMessage.length > 0
+    if (
+      !actionParams?.message ||
+      (isUsingDefault &&
+        actionParams?.message === defaultMessageUsed &&
+        defaultMessageUsed !== defaultMessage)
     ) {
+      setDefaultMessageUsage([true, defaultMessage]);
       editAction('message', defaultMessage, index);
     }
-
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [defaultMessage]);