[7.x] [Security Solution][Detections] Fix labels and issue with manda…

…tory fields (#84525) (#84686) * Fix labeling and bugs * Improve naming
elastic · Dec 1, 2020 · acc56cc · acc56cc
1 parent ad383f1
commit acc56cc
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 18 deletions.
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -19610,7 +19610,6 @@
     "xpack.triggersActionsUI.components.builtinActionTypes.jira.requiredDescriptionTextField": "説明が必要です。",
     "xpack.triggersActionsUI.components.builtinActionTypes.jira.requiredEmailTextField": "電子メールアドレスまたはユーザー名が必要です",
     "xpack.triggersActionsUI.components.builtinActionTypes.jira.requiredProjectKeyTextField": "プロジェクトキーが必要です",
-    "xpack.triggersActionsUI.components.builtinActionTypes.jira.requiredTitleTextField": "タイトルが必要です。",
     "xpack.triggersActionsUI.components.builtinActionTypes.jira.savedObjectIdFieldHelp": "JIRAは、このアクションを、Kibanaの保存されたオブジェクトのIDに関連付けます。",
     "xpack.triggersActionsUI.components.builtinActionTypes.jira.savedObjectIdFieldLabel": "オブジェクトID（任意）",
     "xpack.triggersActionsUI.components.builtinActionTypes.jira.searchIssuesComboBoxAriaLabel": "親問題を選択",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -19629,7 +19629,6 @@
     "xpack.triggersActionsUI.components.builtinActionTypes.jira.requiredDescriptionTextField": "“描述”必填。",
     "xpack.triggersActionsUI.components.builtinActionTypes.jira.requiredEmailTextField": "“电子邮件”或“用户名”必填",
     "xpack.triggersActionsUI.components.builtinActionTypes.jira.requiredProjectKeyTextField": "“项目键”必填",
-    "xpack.triggersActionsUI.components.builtinActionTypes.jira.requiredTitleTextField": "“标题”必填。",
     "xpack.triggersActionsUI.components.builtinActionTypes.jira.savedObjectIdFieldHelp": "JIRA 将此操作与 Kibana 已保存对象的 ID 关联。",
     "xpack.triggersActionsUI.components.builtinActionTypes.jira.savedObjectIdFieldLabel": "对象 ID（可选）",
     "xpack.triggersActionsUI.components.builtinActionTypes.jira.searchIssuesComboBoxAriaLabel": "选择父问题",

diff --git a/...triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.test.tsx b/...triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.test.tsx
@@ -93,7 +93,7 @@ describe('jira action params validation', () => {
 
     expect(actionTypeModel.validateParams(actionParams)).toEqual({
       errors: {
-        title: ['Title is required.'],
+        title: ['Summary is required.'],
       },
     });
   });

diff --git a/...gins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.tsx b/...gins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.tsx
@@ -64,8 +64,8 @@ export function getActionType(): ActionTypeModel<JiraConfig, JiraSecrets, JiraAc
         title: new Array<string>(),
       };
       validationResult.errors = errors;
-      if (actionParams.subActionParams && !actionParams.subActionParams.title?.length) {
-        errors.title.push(i18n.TITLE_REQUIRED);
+      if (!actionParams.subActionParams?.title?.length) {
+        errors.title.push(i18n.SUMMARY_REQUIRED);
       }
       return validationResult;
     },

diff --git a/...iggers_actions_ui/public/application/components/builtin_action_types/jira/translations.ts b/...iggers_actions_ui/public/application/components/builtin_action_types/jira/translations.ts
@@ -127,10 +127,10 @@ export const DESCRIPTION_REQUIRED = i18n.translate(
   }
 );
 
-export const TITLE_REQUIRED = i18n.translate(
-  'xpack.triggersActionsUI.components.builtinActionTypes.jira.requiredTitleTextField',
+export const SUMMARY_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.jira.requiredSummaryTextField',
   {
-    defaultMessage: 'Title is required.',
+    defaultMessage: 'Summary is required.',
   }
 );
 

diff --git a/...ctions_ui/public/application/components/builtin_action_types/resilient/resilient.test.tsx b/...ctions_ui/public/application/components/builtin_action_types/resilient/resilient.test.tsx
@@ -93,7 +93,7 @@ describe('resilient action params validation', () => {
 
     expect(actionTypeModel.validateParams(actionParams)).toEqual({
       errors: {
-        title: ['Title is required.'],
+        title: ['Name is required.'],
       },
     });
   });

diff --git a/...ers_actions_ui/public/application/components/builtin_action_types/resilient/resilient.tsx b/...ers_actions_ui/public/application/components/builtin_action_types/resilient/resilient.tsx
@@ -72,8 +72,9 @@ export function getActionType(): ActionTypeModel<
         title: new Array<string>(),
       };
       validationResult.errors = errors;
-      if (actionParams.subActionParams && !actionParams.subActionParams.title?.length) {
-        errors.title.push(i18n.TITLE_REQUIRED);
+
+      if (!actionParams.subActionParams?.title?.length) {
+        errors.title.push(i18n.NAME_REQUIRED);
       }
       return validationResult;
     },

diff --git a/...s_actions_ui/public/application/components/builtin_action_types/resilient/translations.ts b/...s_actions_ui/public/application/components/builtin_action_types/resilient/translations.ts
@@ -134,16 +134,16 @@ export const MAPPING_FIELD_COMMENTS = i18n.translate(
 );
 
 export const DESCRIPTION_REQUIRED = i18n.translate(
-  'xpack.triggersActionsUI.components.builtinActionTypes.common.requiredDescriptionTextField',
+  'xpack.triggersActionsUI.components.builtinActionTypes.resilient.requiredDescriptionTextField',
   {
     defaultMessage: 'Description is required.',
   }
 );
 
-export const TITLE_REQUIRED = i18n.translate(
-  'xpack.triggersActionsUI.components.builtinActionTypes.common.requiredTitleTextField',
+export const NAME_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.resilient.requiredNameTextField',
   {
-    defaultMessage: 'Title is required.',
+    defaultMessage: 'Name is required.',
   }
 );
 

diff --git a/...ions_ui/public/application/components/builtin_action_types/servicenow/servicenow.test.tsx b/...ions_ui/public/application/components/builtin_action_types/servicenow/servicenow.test.tsx
@@ -90,7 +90,7 @@ describe('servicenow action params validation', () => {
 
     expect(actionTypeModel.validateParams(actionParams)).toEqual({
       errors: {
-        title: ['Title is required.'],
+        title: ['Short description is required.'],
       },
     });
   });

diff --git a/...s_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.tsx b/...s_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.tsx
@@ -67,7 +67,7 @@ export function getActionType(): ActionTypeModel<
         title: new Array<string>(),
       };
       validationResult.errors = errors;
-      if (actionParams.subActionParams && !actionParams.subActionParams.title?.length) {
+      if (!actionParams.subActionParams?.title?.length) {
         errors.title.push(i18n.TITLE_REQUIRED);
       }
       return validationResult;

diff --git a/..._actions_ui/public/application/components/builtin_action_types/servicenow/translations.ts b/..._actions_ui/public/application/components/builtin_action_types/servicenow/translations.ts
@@ -157,6 +157,6 @@ export const DESCRIPTION_REQUIRED = i18n.translate(
 export const TITLE_REQUIRED = i18n.translate(
   'xpack.triggersActionsUI.components.builtinActionTypes.common.requiredTitleTextField',
   {
-    defaultMessage: 'Title is required.',
+    defaultMessage: 'Short description is required.',
   }
 );