corrected copy and added tooltips

gmmorris · Oct 5, 2020 · 484c8d1 · 484c8d1
1 parent e62c1e6
commit 484c8d1
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 49 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
@@ -7,12 +7,19 @@
 import React, { Fragment, useEffect, useState, useMemo } from 'react';
 import { map } from 'lodash/fp';
 import { isSome } from 'fp-ts/lib/Option';
-import { EuiFormRow, EuiComboBox, EuiSelectOption, EuiHorizontalRule } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { EuiSelect } from '@elastic/eui';
-import { EuiFlexGroup } from '@elastic/eui';
-import { EuiFlexItem } from '@elastic/eui';
-import { EuiSpacer } from '@elastic/eui';
+import {
+  EuiFormRow,
+  EuiComboBox,
+  EuiSelectOption,
+  EuiHorizontalRule,
+  EuiSelect,
+  EuiFormControlLayout,
+  EuiIconTip,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiSpacer,
+} from '@elastic/eui';
 
 import { ActionParamsProps } from '../../../../types';
 import { TextAreaWithMessageVariables } from '../../text_area_with_message_variables';
@@ -246,28 +253,6 @@ const JiraParamsFields: React.FunctionComponent<ActionParamsProps<JiraActionPara
               <EuiSpacer size="m" />
             </>
           )}
-          {!isActionBeingConfiguredByAnAlert && (
-            <Fragment>
-              <EuiFormRow
-                fullWidth
-                label={i18n.translate(
-                  'xpack.triggersActionsUI.components.builtinActionTypes.jira.savedObjectIdFieldLabel',
-                  {
-                    defaultMessage: 'Referenced Saved Object ID (optional)',
-                  }
-                )}
-              >
-                <TextFieldWithMessageVariables
-                  index={index}
-                  editAction={editSubActionProperty}
-                  messageVariables={messageVariables}
-                  paramsProperty={'savedObjectId'}
-                  inputTargetValue={savedObjectId}
-                />
-              </EuiFormRow>
-              <EuiSpacer size="m" />
-            </Fragment>
-          )}
           <EuiFormRow
             fullWidth
             error={errors.title}
@@ -289,6 +274,45 @@ const JiraParamsFields: React.FunctionComponent<ActionParamsProps<JiraActionPara
             />
           </EuiFormRow>
           <EuiSpacer size="m" />
+          {!isActionBeingConfiguredByAnAlert && (
+            <Fragment>
+              <EuiFormRow
+                fullWidth
+                label={i18n.translate(
+                  'xpack.triggersActionsUI.components.builtinActionTypes.jira.savedObjectIdFieldLabel',
+                  {
+                    defaultMessage: 'Object ID (optional)',
+                  }
+                )}
+              >
+                <EuiFlexItem>
+                  <EuiFormControlLayout
+                    fullWidth
+                    append={
+                      <EuiIconTip
+                        content={i18n.translate(
+                          'xpack.triggersActionsUI.components.builtinActionTypes.jira.savedObjectIdFieldHelp',
+                          {
+                            defaultMessage:
+                              'Jira will associate this action with a Kibana Saved Object ID.',
+                          }
+                        )}
+                      />
+                    }
+                  >
+                    <TextFieldWithMessageVariables
+                      index={index}
+                      editAction={editSubActionProperty}
+                      messageVariables={messageVariables}
+                      paramsProperty={'savedObjectId'}
+                      inputTargetValue={savedObjectId}
+                    />
+                  </EuiFormControlLayout>
+                </EuiFlexItem>
+              </EuiFormRow>
+              <EuiSpacer size="m" />
+            </Fragment>
+          )}
           {hasLabels && (
             <>
               <EuiFlexGroup>

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
@@ -13,6 +13,8 @@ import {
   EuiTitle,
   EuiComboBoxOptionOption,
   EuiSelectOption,
+  EuiFormControlLayout,
+  EuiIconTip,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { isSome } from 'fp-ts/lib/Option';
@@ -231,17 +233,32 @@ const ResilientParamsFields: React.FunctionComponent<ActionParamsProps<Resilient
             label={i18n.translate(
               'xpack.triggersActionsUI.components.builtinActionTypes.resilient.savedObjectIdFieldLabel',
               {
-                defaultMessage: 'Referenced Saved Object ID (optional)',
+                defaultMessage: 'Object ID (optional)',
               }
             )}
           >
-            <TextFieldWithMessageVariables
-              index={index}
-              editAction={editSubActionProperty}
-              messageVariables={messageVariables}
-              paramsProperty={'savedObjectId'}
-              inputTargetValue={savedObjectId}
-            />
+            <EuiFormControlLayout
+              fullWidth
+              append={
+                <EuiIconTip
+                  content={i18n.translate(
+                    'xpack.triggersActionsUI.components.builtinActionTypes.resilient.savedObjectIdFieldHelp',
+                    {
+                      defaultMessage:
+                        'IBM Resilient will associate this action with a Kibana Saved Object ID.',
+                    }
+                  )}
+                />
+              }
+            >
+              <TextFieldWithMessageVariables
+                index={index}
+                editAction={editSubActionProperty}
+                messageVariables={messageVariables}
+                paramsProperty={'savedObjectId'}
+                inputTargetValue={savedObjectId}
+              />
+            </EuiFormControlLayout>
           </EuiFormRow>
           <EuiSpacer size="m" />
         </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
@@ -5,13 +5,17 @@
  */
 
 import React, { Fragment, useEffect } from 'react';
-import { EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { EuiSelect } from '@elastic/eui';
-import { EuiFlexGroup } from '@elastic/eui';
-import { EuiFlexItem } from '@elastic/eui';
-import { EuiSpacer } from '@elastic/eui';
-import { EuiTitle } from '@elastic/eui';
+import {
+  EuiFormRow,
+  EuiSelect,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiSpacer,
+  EuiTitle,
+  EuiFormControlLayout,
+  EuiIconTip,
+} from '@elastic/eui';
 import { isSome } from 'fp-ts/lib/Option';
 import { ActionParamsProps } from '../../../../types';
 import { ServiceNowActionParams } from './types';
@@ -188,17 +192,32 @@ const ServiceNowParamsFields: React.FunctionComponent<ActionParamsProps<
             label={i18n.translate(
               'xpack.triggersActionsUI.components.builtinActionTypes.serviceNow.savedObjectIdFieldLabel',
               {
-                defaultMessage: 'Referenced Saved Object ID (optional)',
+                defaultMessage: 'Object ID (optional)',
               }
             )}
           >
-            <TextFieldWithMessageVariables
-              index={index}
-              editAction={editSubActionProperty}
-              messageVariables={messageVariables}
-              paramsProperty={'savedObjectId'}
-              inputTargetValue={savedObjectId}
-            />
+            <EuiFormControlLayout
+              fullWidth
+              append={
+                <EuiIconTip
+                  content={i18n.translate(
+                    'xpack.triggersActionsUI.components.builtinActionTypes.serviceNow.savedObjectIdFieldHelp',
+                    {
+                      defaultMessage:
+                        'ServiceNow will associate this action with a Kibana Saved Object ID.',
+                    }
+                  )}
+                />
+              }
+            >
+              <TextFieldWithMessageVariables
+                index={index}
+                editAction={editSubActionProperty}
+                messageVariables={messageVariables}
+                paramsProperty={'savedObjectId'}
+                inputTargetValue={savedObjectId}
+              />
+            </EuiFormControlLayout>
           </EuiFormRow>
           <EuiSpacer size="m" />
         </Fragment>