fix priority reset bug (#113626)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
elastic · Oct 4, 2021 · 59b15df · 59b15df
1 parent 3d0da7f
commit 59b15df
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/...s_actions_ui/public/application/components/builtin_action_types/jira/jira_params.test.tsx b/...s_actions_ui/public/application/components/builtin_action_types/jira/jira_params.test.tsx
@@ -95,6 +95,10 @@ describe('JiraParamsFields renders', () => {
       description: { allowedValues: [], defaultValue: {} },
     },
   };
+  const useGetFieldsByIssueTypeResponseLoading = {
+    isLoading: true,
+    fields: {},
+  };
 
   beforeEach(() => {
     jest.clearAllMocks();
@@ -421,5 +425,19 @@ describe('JiraParamsFields renders', () => {
       expect(editAction.mock.calls[0][1].incident.priority).toEqual('Medium');
       expect(editAction.mock.calls[1][1].incident.priority).toEqual(null);
     });
+
+    test('Preserve priority when the issue type fields are loading and hasPriority becomes stale', () => {
+      useGetFieldsByIssueTypeMock
+        .mockReturnValueOnce(useGetFieldsByIssueTypeResponseLoading)
+        .mockReturnValue(useGetFieldsByIssueTypeResponse);
+      const wrapper = mount(<JiraParamsFields {...defaultProps} />);
+
+      expect(editAction).not.toBeCalled();
+
+      wrapper.setProps({ ...defaultProps }); // just to force component call useGetFieldsByIssueType again
+
+      expect(editAction).toBeCalledTimes(1);
+      expect(editAction.mock.calls[0][1].incident.priority).toEqual('Medium');
+    });
   });
 });
diff --git a/...iggers_actions_ui/public/application/components/builtin_action_types/jira/jira_params.tsx b/...iggers_actions_ui/public/application/components/builtin_action_types/jira/jira_params.tsx
@@ -147,11 +147,11 @@ const JiraParamsFields: React.FunctionComponent<ActionParamsProps<JiraActionPara
   }, [editSubActionProperty, fields, incident.issueType, incident.priority]);
 
   useEffect(() => {
-    if (!hasPriority && incident.priority != null) {
+    if (!isLoadingFields && !hasPriority && incident.priority != null) {
       editSubActionProperty('priority', null);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [hasPriority]);
+  }, [hasPriority, isLoadingFields]);
 
   const labelOptions = useMemo(
     () => (incident.labels ? incident.labels.map((label: string) => ({ label })) : []),

diff --git a/.../public/application/components/builtin_action_types/jira/use_get_fields_by_issue_type.tsx b/.../public/application/components/builtin_action_types/jira/use_get_fields_by_issue_type.tsx
@@ -62,8 +62,8 @@ export const useGetFieldsByIssueType = ({
         });
 
         if (!didCancel) {
-          setIsLoading(false);
           setFields(res.data ?? {});
+          setIsLoading(false);
           if (res.status && res.status === 'error') {
             toastNotifications.addDanger({
               title: i18n.FIELDS_API_ERROR,