really best bug fixes

elastic · Dec 14, 2020 · 3552e98 · 3552e98
1 parent 497bef5
commit 3552e98
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 6 deletions.
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
@@ -85,7 +85,8 @@ const JiraParamsFields: React.FunctionComponent<ActionParamsProps<JiraActionPara
   ]);
   const hasParent = useMemo(() => Object.prototype.hasOwnProperty.call(fields, 'parent'), [fields]);
   const issueTypesSelectOptions: EuiSelectOption[] = useMemo(() => {
-    if (!incident.issueType && issueTypes.length > 0) {
+    const doesIssueTypeExist = issueTypes.some((t) => t.id === incident.issueType);
+    if ((!incident.issueType || !doesIssueTypeExist) && issueTypes.length > 0) {
       editSubActionProperty('issueType', issueTypes[0].id ?? '');
     }
     return issueTypes.map((type) => ({
@@ -96,7 +97,8 @@ const JiraParamsFields: React.FunctionComponent<ActionParamsProps<JiraActionPara
   const prioritiesSelectOptions: EuiSelectOption[] = useMemo(() => {
     if (incident.issueType != null && fields != null) {
       const priorities = fields.priority != null ? fields.priority.allowedValues : [];
-      if (!incident.priority && priorities.length > 0) {
+      const doesPriorityExist = priorities.some((p) => p.name === incident.priority);
+      if ((!incident.priority || !doesPriorityExist) && priorities.length > 0) {
         editSubActionProperty('priority', priorities[0].name ?? '');
       }
       return priorities.map((p: { id: string; name: string }) => {
@@ -132,8 +134,18 @@ const JiraParamsFields: React.FunctionComponent<ActionParamsProps<JiraActionPara
     if (!actionParams.subAction) {
       editAction('subAction', 'pushToService', index);
     }
+    if (!actionParams.subActionParams) {
+      editAction(
+        'subActionParams',
+        {
+          incident: {},
+          comments: [],
+        },
+        index
+      );
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [actionParams]);
   return (
     <Fragment>
       <>

diff --git a/...ions_ui/public/application/components/builtin_action_types/resilient/resilient_params.tsx b/...ions_ui/public/application/components/builtin_action_types/resilient/resilient_params.tsx
@@ -141,8 +141,18 @@ const ResilientParamsFields: React.FunctionComponent<ActionParamsProps<Resilient
     if (!actionParams.subAction) {
       editAction('subAction', 'pushToService', index);
     }
+    if (!actionParams.subActionParams) {
+      editAction(
+        'subActionParams',
+        {
+          incident: {},
+          comments: [],
+        },
+        index
+      );
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [actionParams]);
 
   return (
     <Fragment>

diff --git a/...ns_ui/public/application/components/builtin_action_types/servicenow/servicenow_params.tsx b/...ns_ui/public/application/components/builtin_action_types/servicenow/servicenow_params.tsx
@@ -88,8 +88,18 @@ const ServiceNowParamsFields: React.FunctionComponent<
     if (!actionParams.subAction) {
       editAction('subAction', 'pushToService', index);
     }
+    if (!actionParams.subActionParams) {
+      editAction(
+        'subActionParams',
+        {
+          incident: {},
+          comments: [],
+        },
+        index
+      );
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [actionParams]);
 
   return (
     <Fragment>

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_reducer.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_reducer.ts
@@ -154,7 +154,7 @@ export const alertReducer = <AlertPhase extends InitialAlert | Alert>(
       >;
       if (
         index === undefined ||
-        alert.actions.length === 0 ||
+        alert.actions[index] == null ||
         isEqual(alert.actions[index][key], value)
       ) {
         return state;