From c87612cb846d9dbf5a60d5301f4cac89ee653c1d Mon Sep 17 00:00:00 2001
From: ymao1 <ying.mao@elastic.co>
Date: Wed, 18 Nov 2020 18:11:25 -0500
Subject: [PATCH] Not resetting server log level if level is defined (#83651)
 (#83719)

---
 .../server_log/server_log_params.test.tsx                     | 4 +++-
 .../builtin_action_types/server_log/server_log_params.tsx     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.test.tsx
index e8429a54b618cf..3243c37a04ee74 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.test.tsx
@@ -12,6 +12,7 @@ import { coreMock } from 'src/core/public/mocks';
 
 describe('ServerLogParamsFields renders', () => {
   const mocks = coreMock.createSetup();
+  const editAction = jest.fn();
 
   test('all params fields is rendered', () => {
     const actionParams = {
@@ -22,7 +23,7 @@ describe('ServerLogParamsFields renders', () => {
       <ServerLogParamsFields
         actionParams={actionParams}
         errors={{ message: [] }}
-        editAction={() => {}}
+        editAction={editAction}
         index={0}
         defaultMessage={'test default message'}
         docLinks={{ ELASTIC_WEBSITE_URL: '', DOC_LINK_VERSION: '' } as DocLinksStart}
@@ -30,6 +31,7 @@ describe('ServerLogParamsFields renders', () => {
         http={mocks.http}
       />
     );
+    expect(editAction).not.toHaveBeenCalled();
     expect(wrapper.find('[data-test-subj="loggingLevelSelect"]').length > 0).toBeTruthy();
     expect(
       wrapper.find('[data-test-subj="loggingLevelSelect"]').first().prop('value')
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.tsx
index a3619f96a45b23..c4f434f1387479 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.tsx
@@ -25,7 +25,9 @@ export const ServerLogParamsFields: React.FunctionComponent<ActionParamsProps<
   ];
 
   useEffect(() => {
-    editAction('level', 'info', index);
+    if (!actionParams?.level) {
+      editAction('level', 'info', index);
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);