Merge branch 'cases_servicenow_sir_fields' of github.com:cnasikas/kibana into cases_servicenow_sir_fields

Author: cnasikas

x-pack/plugins/security_solution/public/cases/components/connector_selector/form.tsx

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React from 'react';
+import React, { useCallback } from 'react';
 import { isEmpty } from 'lodash/fp';
 import { EuiFormRow } from '@elastic/eui';
 
@@ -21,6 +21,7 @@ interface ConnectorSelectorProps {
   idAria: string;
   isEdit: boolean;
   isLoading: boolean;
+  handleChange?: (newValue: string) => void;
 }
 export const ConnectorSelector = ({
   connectors,
@@ -30,8 +31,19 @@ export const ConnectorSelector = ({
   idAria,
   isEdit = true,
   isLoading = false,
+  handleChange,
 }: ConnectorSelectorProps) => {
   const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
+  const onChange = useCallback(
+    (val: string) => {
+      if (handleChange) {
+        handleChange(val);
+      }
+      field.setValue(val);
+    },
+    [handleChange, field]
+  );
+
   return isEdit ? (
     <EuiFormRow
       data-test-subj={dataTestSubj}
@@ -47,7 +59,7 @@ export const ConnectorSelector = ({
         connectors={connectors}
         disabled={disabled}
         isLoading={isLoading}
-        onChange={field.setValue}
+        onChange={onChange}
         selectedConnector={isEmpty(field.value) ? 'none' : field.value}
       />
     </EuiFormRow>

x-pack/plugins/security_solution/public/cases/components/connectors/jira/case_fields.tsx

@@ -139,14 +139,6 @@ const JiraFieldsComponent: React.FunctionComponent<ConnectorFieldsProps<JiraFiel
     [currentIssueType, fields, onChange, parent, priority]
   );
 
-  // When connector change set fields to null
-  useEffect(() => {
-    if (!init.current) {
-      onChange({ issueType: null, priority: null, parent: null });
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [connector]);
-
   // Set field at initialization
   useEffect(() => {
     if (init.current) {

x-pack/plugins/security_solution/public/cases/components/connectors/resilient/case_fields.tsx

@@ -136,14 +136,6 @@ const ResilientFieldsComponent: React.FunctionComponent<
     }
   }, [incidentTypes, onFieldChange]);
 
-  // When connector change set fields to null
-  useEffect(() => {
-    if (!init.current) {
-      onChange({ incidentTypes: null, severityCode: null });
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [connector]);
-
   // Set field at initialization
   useEffect(() => {
     if (init.current) {

x-pack/plugins/security_solution/public/cases/components/connectors/servicenow/servicenow_itsm_case_fields.tsx

@@ -96,14 +96,6 @@ const ServiceNowITSMFieldsComponent: React.FunctionComponent<
     [fields, onChange]
   );
 
-  // When connector change set fields to null
-  useEffect(() => {
-    if (!init.current) {
-      onChange({ urgency: null, severity: null, impact: null });
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [connector]);
-
   // Set field at initialization
   useEffect(() => {
     if (init.current) {

x-pack/plugins/security_solution/public/cases/components/connectors/servicenow/servicenow_sir_case_fields.tsx

@@ -170,22 +170,6 @@ const ServiceNowSIRFieldsComponent: React.FunctionComponent<
     ]
   );
 
-  // When connector change set fields to null
-  useEffect(() => {
-    if (!init.current) {
-      onChange({
-        category: null,
-        destIp: true,
-        malwareHash: true,
-        malwareUrl: true,
-        priority: null,
-        sourceIp: null,
-        subcategory: null,
-      });
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [connector]);
-
   // Set field at initialization
   useEffect(() => {
     if (init.current) {

x-pack/plugins/security_solution/public/cases/components/create/connector.tsx

@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import React, { memo } from 'react';
+import React, { memo, useCallback } from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
-import { UseField, useFormData, FieldHook } from '../../../shared_imports';
+import { UseField, useFormData, FieldHook, useFormContext } from '../../../shared_imports';
 import { useConnectors } from '../../containers/configure/use_connectors';
 import { ConnectorSelector } from '../connector_selector/form';
 import { ConnectorFieldsForm } from '../connectors/fields_form';
@@ -42,7 +42,15 @@ const ConnectorFields = ({ connectors, isEdit, field }: ConnectorsFieldProps) =>
 };
 
 const ConnectorComponent: React.FC<Props> = ({ isLoading }) => {
+  const { getFields } = useFormContext();
   const { loading: isLoadingConnectors, connectors } = useConnectors();
+  const handleConnectorChange = useCallback(
+    (newConnector) => {
+      const { fields } = getFields();
+      fields.setValue(null);
+    },
+    [getFields]
+  );
 
   return (
     <EuiFlexGroup>
@@ -52,6 +60,7 @@ const ConnectorComponent: React.FC<Props> = ({ isLoading }) => {
           component={ConnectorSelector}
           componentProps={{
             connectors,
+            handleChange: handleConnectorChange,
             dataTestSubj: 'caseConnectors',
             disabled: isLoading || isLoadingConnectors,
             idAria: 'caseConnectors',