[Cases] ServiceNow connectors UI changes

docs/management/connectors/action-types/servicenow-sir.asciidoc

@@ -72,13 +72,11 @@ image::management/connectors/images/servicenow-sir-params-test.png[ServiceNow Se
 ServiceNow SecOps actions have the following configuration properties.
 
 Short description::    A short description for the incident, used for searching the contents of the knowledge base.
-Source Ips::           A list of source IPs related to the incident. The IPs will be added as observables to the security incident.
-Destination Ips::      A list of destination IPs related to the incident. The IPs will be added as observables to the security incident.
-Malware URLs::         A list of malware URLs related to the incident. The URLs will be added as observables to the security incident.
-Malware Hashes::       A list of malware hashes related to the incident. The hashes  will be added as observables to the security incident.
 Priority::             The priority of the incident.
 Category::             The category of the incident.
 Subcategory::          The subcategory of the incident.
+Correlation ID::       All actions sharing this ID will be associated with the same ServiceNow security incident. If an incident exists in ServiceNow with the same correlation ID the security incident will be updated. Default value: `<rule ID>:<alert instance ID>`.
+Correlation Display::  A descriptive label of the alert for correlation purposes in ServiceNow.
 Description::          The details about the incident.
 Additional comments::  Additional information for the client, such as how to troubleshoot the issue.
 

docs/management/connectors/action-types/servicenow.asciidoc

@@ -76,6 +76,8 @@ Severity::             The severity of the incident.
 Impact::               The effect an incident has on business. Can be measured by the number of affected users or by how critical it is to the business in question.
 Category::             The category of the incident.
 Subcategory::          The category of the incident.
+Correlation ID::       All actions sharing this ID will be associated with the same ServiceNow incident. If an incident exists in ServiceNow with the same correlation ID the incident will be updated. Default value: `<rule ID>:<alert instance ID>`.
+Correlation Display::  A descriptive label of the alert for correlation purposes in ServiceNow.
 Short description::    A short description for the incident, used for searching the contents of the knowledge base.
 Description::          The details about the incident.
 Additional comments::  Additional information for the client, such as how to troubleshoot the issue.

src/core/public/doc_links/doc_links_service.ts

@@ -327,6 +327,7 @@ export class DocLinksService {
           preconfiguredConnectors: `${KIBANA_DOCS}pre-configured-connectors.html`,
           preconfiguredAlertHistoryConnector: `${KIBANA_DOCS}index-action-type.html#preconfigured-connector-alert-history`,
           serviceNowAction: `${KIBANA_DOCS}servicenow-action-type.html#configuring-servicenow`,
+          serviceNowSIRAction: `${KIBANA_DOCS}servicenow-sir-action-type.html`,
           setupPrerequisites: `${KIBANA_DOCS}alerting-setup.html#alerting-prerequisites`,
           slackAction: `${KIBANA_DOCS}slack-action-type.html#configuring-slack`,
           teamsAction: `${KIBANA_DOCS}teams-action-type.html#configuring-teams`,

x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.test.tsx

@@ -190,12 +190,13 @@ describe('ConnectorsDropdown', () => {
             >
               <span>
                 My Connector
+                 (deprecated)
               </span>
             </EuiFlexItem>
             <EuiFlexItem
               grow={false}
             >
-              <EuiIconTip
+              <Styled(EuiIconTip)
                 aria-label="Deprecated connector"
                 color="warning"
                 content="Please update your connector"

x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.tsx

@@ -14,6 +14,7 @@ import { ActionConnector } from '../../containers/configure/types';
 import * as i18n from './translations';
 import { useKibana } from '../../common/lib/kibana';
 import { getConnectorIcon, isLegacyConnector } from '../utils';
+import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
 
 export interface Props {
   connectors: ActionConnector[];
@@ -57,6 +58,11 @@ const addNewConnector = {
   'data-test-subj': 'dropdown-connector-add-connector',
 };
 
+const StyledEuiIconTip = euiStyled(EuiIconTip)`
+  margin-left: ${({ theme }) => theme.eui.euiSizeS}
+  margin-bottom: 0 !important;
+`;
+
 const ConnectorsDropdownComponent: React.FC<Props> = ({
   connectors,
   disabled,
@@ -87,11 +93,14 @@ const ConnectorsDropdownComponent: React.FC<Props> = ({
                   />
                 </EuiFlexItem>
                 <EuiFlexItem grow={false}>
-                  <span>{connector.name}</span>
+                  <span>
+                    {connector.name}
+                    {isLegacyConnector(connector) && ` (${i18n.DEPRECATED_TOOLTIP_TEXT})`}
+                  </span>
                 </EuiFlexItem>
                 {isLegacyConnector(connector) && (
                   <EuiFlexItem grow={false}>
-                    <EuiIconTip
+                    <StyledEuiIconTip
                       aria-label={i18n.DEPRECATED_TOOLTIP_TITLE}
                       size={ICON_SIZE}
                       type="alert"

x-pack/plugins/cases/public/components/configure_cases/translations.ts

@@ -170,6 +170,13 @@ export const DEPRECATED_TOOLTIP_TITLE = i18n.translate(
   }
 );
 
+export const DEPRECATED_TOOLTIP_TEXT = i18n.translate(
+  'xpack.cases.configureCases.deprecatedTooltipText',
+  {
+    defaultMessage: 'deprecated',
+  }
+);
+
 export const DEPRECATED_TOOLTIP_CONTENT = i18n.translate(
   'xpack.cases.configureCases.deprecatedTooltipContent',
   {

x-pack/plugins/cases/public/components/connectors/card.tsx

@@ -6,7 +6,7 @@
  */
 
 import React, { memo, useMemo } from 'react';
-import { EuiCard, EuiIcon, EuiLoadingSpinner } from '@elastic/eui';
+import { EuiCard, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiLoadingSpinner } from '@elastic/eui';
 import styled from 'styled-components';
 
 import { ConnectorTypes } from '../../../common';
@@ -59,16 +59,20 @@ const ConnectorCardDisplay: React.FC<ConnectorCardProps> = ({
     <>
       {isLoading && <EuiLoadingSpinner data-test-subj="connector-card-loading" />}
       {!isLoading && (
-        <EuiCard
-          data-test-subj={`connector-card`}
-          description={description}
-          display="plain"
-          icon={icon}
-          layout="horizontal"
-          paddingSize="none"
-          title={title}
-          titleSize="xs"
-        />
+        <EuiFlexGroup direction="row">
+          <EuiFlexItem>
+            <EuiCard
+              data-test-subj={`connector-card`}
+              description={description}
+              display="plain"
+              layout="horizontal"
+              paddingSize="none"
+              title={title}
+              titleSize="xs"
+            />
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>{icon}</EuiFlexItem>
+        </EuiFlexGroup>
       )}
     </>
   );

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

@@ -157,7 +157,7 @@ const ServiceNowITSMFieldsComponent: React.FunctionComponent<
       {showConnectorWarning && (
         <EuiFlexGroup>
           <EuiFlexItem>
-            <DeprecatedCallout type={isEdit ? 'danger' : 'warning'} />
+            <DeprecatedCallout />
           </EuiFlexItem>
         </EuiFlexGroup>
       )}

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

@@ -173,7 +173,7 @@ const ServiceNowSIRFieldsComponent: React.FunctionComponent<
       {showConnectorWarning && (
         <EuiFlexGroup>
           <EuiFlexItem>
-            <DeprecatedCallout type={isEdit ? 'danger' : 'warning'} />
+            <DeprecatedCallout />
           </EuiFlexItem>
         </EuiFlexGroup>
       )}

x-pack/plugins/translations/translations/ja-JP.json

@@ -25008,11 +25008,8 @@
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.categoryTitle": "カテゴリー",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.commentsTextAreaFieldLabel": "追加のコメント",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.descriptionTextAreaFieldLabel": "説明",
-    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.destinationIPTitle": "デスティネーション IP",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.impactSelectFieldLabel": "インパクト",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.invalidApiUrlTextField": "URL が無効です。",
-    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.malwareHashTitle": "マルウェアハッシュ",
-    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.malwareURLTitle": "マルウェアURL",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.passwordTextFieldLabel": "パスワード",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.prioritySelectFieldLabel": "優先度",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.reenterValuesLabel": "ユーザー名とパスワードは暗号化されます。これらのフィールドの値を再入力してください。",
@@ -25022,7 +25019,6 @@
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.requiredUsernameTextField": "ユーザー名が必要です。",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.requireHttpsApiUrlTextField": "URL は https:// から始める必要があります。",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.severitySelectFieldLabel": "深刻度",
-    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.sourceIPTitle": "ソース IP",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.subcategoryTitle": "サブカテゴリー",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.title": "インシデント",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.titleFieldLabel": "短い説明（必須）",

x-pack/plugins/translations/translations/zh-CN.json

@@ -25436,11 +25436,8 @@
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.categoryTitle": "类别",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.commentsTextAreaFieldLabel": "其他注释",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.descriptionTextAreaFieldLabel": "描述",
-    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.destinationIPTitle": "目标 IP",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.impactSelectFieldLabel": "影响",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.invalidApiUrlTextField": "URL 无效。",
-    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.malwareHashTitle": "恶意软件哈希",
-    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.malwareURLTitle": "恶意软件 URL",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.passwordTextFieldLabel": "密码",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.prioritySelectFieldLabel": "优先级",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.reenterValuesLabel": "用户名和密码已加密。请为这些字段重新输入值。",
@@ -25450,7 +25447,6 @@
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.requiredUsernameTextField": "“用户名”必填。",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.requireHttpsApiUrlTextField": "URL 必须以 https:// 开头。",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.severitySelectFieldLabel": "严重性",
-    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.sourceIPTitle": "源 IP",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.subcategoryTitle": "子类别",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.title": "事件",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.titleFieldLabel": "简短描述（必填）",

x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/credentials.tsx

@@ -5,24 +5,13 @@
  * 2.0.
  */
 
-import React, { memo, useCallback } from 'react';
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiFormRow,
-  EuiLink,
-  EuiFieldText,
-  EuiSpacer,
-  EuiTitle,
-  EuiFieldPassword,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
+import React, { memo } from 'react';
+import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { ActionConnectorFieldsProps } from '../../../../../public/types';
-import { useKibana } from '../../../../common/lib/kibana';
-import { getEncryptedFieldNotifyLabel } from '../../get_encrypted_field_notify_label';
 import * as i18n from './translations';
 import { ServiceNowActionConnector } from './types';
-import { isFieldInvalid } from './helpers';
+import { CredentialsApiUrl } from './credentials_api_url';
+import { CredentialsAuth } from './credentials_auth';
 
 interface Props {
   action: ActionConnectorFieldsProps<ServiceNowActionConnector>['action'];
@@ -41,70 +30,20 @@ const CredentialsComponent: React.FC<Props> = ({
   editActionSecrets,
   editActionConfig,
 }) => {
-  const { docLinks } = useKibana().services;
-  const { apiUrl } = action.config;
-  const { username, password } = action.secrets;
-
-  const isApiUrlInvalid = isFieldInvalid(apiUrl, errors.apiUrl);
-  const isUsernameInvalid = isFieldInvalid(username, errors.username);
-  const isPasswordInvalid = isFieldInvalid(password, errors.password);
-
-  const handleOnChangeActionConfig = useCallback(
-    (key: string, value: string) => editActionConfig(key, value),
-    [editActionConfig]
-  );
-
-  const handleOnChangeSecretConfig = useCallback(
-    (key: string, value: string) => editActionSecrets(key, value),
-    [editActionSecrets]
-  );
-
   return (
     <>
       <EuiFlexGroup direction="column">
         <EuiFlexItem>
           <EuiTitle size="xxs">
             <h4>{i18n.SN_INSTANCE_LABEL}</h4>
           </EuiTitle>
-          <p>
-            <FormattedMessage
-              id="xpack.triggersActionsUI.components.builtinActionTypes.serviceNowAction.apiUrlHelpLabel"
-              defaultMessage="Please provide the full URL to the desired ServiceNow instance. If you do not have one, you can {instance}"
-              values={{
-                instance: (
-                  <EuiLink href={docLinks.links.alerting.serviceNowAction} target="_blank">
-                    {i18n.SETUP_DEV_INSTANCE}
-                  </EuiLink>
-                ),
-              }}
-            />
-          </p>
-        </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiFormRow
-            id="apiUrl"
-            fullWidth
-            error={errors.apiUrl}
-            isInvalid={isApiUrlInvalid}
-            label={i18n.API_URL_LABEL}
-            helpText={i18n.API_URL_HELPTEXT}
-          >
-            <EuiFieldText
-              fullWidth
-              isInvalid={isApiUrlInvalid}
-              name="apiUrl"
-              readOnly={readOnly}
-              value={apiUrl || ''} // Needed to prevent uncontrolled input error when value is undefined
-              data-test-subj="apiUrlFromInput"
-              onChange={(evt) => handleOnChangeActionConfig('apiUrl', evt.target.value)}
-              onBlur={() => {
-                if (!apiUrl) {
-                  editActionConfig('apiUrl', '');
-                }
-              }}
-              disabled={isLoading}
-            />
-          </EuiFormRow>
+          <CredentialsApiUrl
+            action={action}
+            errors={errors}
+            readOnly={readOnly}
+            isLoading={isLoading}
+            editActionConfig={editActionConfig}
+          />
         </EuiFlexItem>
       </EuiFlexGroup>
       <EuiSpacer size="m" />
@@ -115,75 +54,15 @@ const CredentialsComponent: React.FC<Props> = ({
           </EuiTitle>
         </EuiFlexItem>
       </EuiFlexGroup>
-      <EuiSpacer size="m" />
-      <EuiFlexGroup>
-        <EuiFlexItem>
-          <EuiFormRow fullWidth>
-            {getEncryptedFieldNotifyLabel(
-              !action.id,
-              2,
-              action.isMissingSecrets ?? false,
-              i18n.REENTER_VALUES_LABEL
-            )}
-          </EuiFormRow>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiSpacer size="m" />
-      <EuiFlexGroup>
-        <EuiFlexItem>
-          <EuiFormRow
-            id="connector-servicenow-username"
-            fullWidth
-            error={errors.username}
-            isInvalid={isUsernameInvalid}
-            label={i18n.USERNAME_LABEL}
-          >
-            <EuiFieldText
-              fullWidth
-              isInvalid={isUsernameInvalid}
-              readOnly={readOnly}
-              name="connector-servicenow-username"
-              value={username || ''} // Needed to prevent uncontrolled input error when value is undefined
-              data-test-subj="connector-servicenow-username-form-input"
-              onChange={(evt) => handleOnChangeSecretConfig('username', evt.target.value)}
-              onBlur={() => {
-                if (!username) {
-                  editActionSecrets('username', '');
-                }
-              }}
-              disabled={isLoading}
-            />
-          </EuiFormRow>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiSpacer size="m" />
-      <EuiFlexGroup>
-        <EuiFlexItem>
-          <EuiFormRow
-            id="connector-servicenow-password"
-            fullWidth
-            error={errors.password}
-            isInvalid={isPasswordInvalid}
-            label={i18n.PASSWORD_LABEL}
-          >
-            <EuiFieldPassword
-              fullWidth
-              readOnly={readOnly}
-              isInvalid={isPasswordInvalid}
-              name="connector-servicenow-password"
-              value={password || ''} // Needed to prevent uncontrolled input error when value is undefined
-              data-test-subj="connector-servicenow-password-form-input"
-              onChange={(evt) => handleOnChangeSecretConfig('password', evt.target.value)}
-              onBlur={() => {
-                if (!password) {
-                  editActionSecrets('password', '');
-                }
-              }}
-              disabled={isLoading}
-            />
-          </EuiFormRow>
-        </EuiFlexItem>
-      </EuiFlexGroup>
+      <EuiFlexItem>
+        <CredentialsAuth
+          action={action}
+          errors={errors}
+          readOnly={readOnly}
+          isLoading={isLoading}
+          editActionSecrets={editActionSecrets}
+        />
+      </EuiFlexItem>
     </>
   );
 };