[Security Solution][Detections] Fix labels and issue with mandatory fields (#84525)

cnasikas · web-flow · commit 636f91c29a55 · 2020-12-01T18:01:37.000+02:00
* Fix labeling and bugs

* Improve naming
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -19600,7 +19600,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
@@ -19619,7 +19619,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/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.test.tsx b/x-pack/plugins/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/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.tsx b/x-pack/plugins/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/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/translations.ts b/x-pack/plugins/triggers_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/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient.test.tsx b/x-pack/plugins/triggers_actions_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/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient.tsx b/x-pack/plugins/triggers_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/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/translations.ts b/x-pack/plugins/triggers_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/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.test.tsx b/x-pack/plugins/triggers_actions_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/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.tsx b/x-pack/plugins/triggers_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/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/translations.ts b/x-pack/plugins/triggers_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.',
   }
 );

Original file line number	Diff line number	Diff line change
`@@ -127,10 +127,10 @@ export const DESCRIPTION_REQUIRED = i18n.translate(`
`127`	`127`	`}`
`128`	`128`	`);`
`129`	`129`
`130`		`-export const TITLE_REQUIRED = i18n.translate(`
`131`		`- 'xpack.triggersActionsUI.components.builtinActionTypes.jira.requiredTitleTextField',`
	`130`	`+export const SUMMARY_REQUIRED = i18n.translate(`
	`131`	`+ 'xpack.triggersActionsUI.components.builtinActionTypes.jira.requiredSummaryTextField',`
`132`	`132`	`{`
`133`		`- defaultMessage: 'Title is required.',`
	`133`	`+ defaultMessage: 'Summary is required.',`
`134`	`134`	`}`
`135`	`135`	`);`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -134,16 +134,16 @@ export const MAPPING_FIELD_COMMENTS = i18n.translate(`
`134`	`134`	`);`
`135`	`135`
`136`	`136`	`export const DESCRIPTION_REQUIRED = i18n.translate(`
`137`		`- 'xpack.triggersActionsUI.components.builtinActionTypes.common.requiredDescriptionTextField',`
	`137`	`+ 'xpack.triggersActionsUI.components.builtinActionTypes.resilient.requiredDescriptionTextField',`
`138`	`138`	`{`
`139`	`139`	`defaultMessage: 'Description is required.',`
`140`	`140`	`}`
`141`	`141`	`);`
`142`	`142`
`143`		`-export const TITLE_REQUIRED = i18n.translate(`
`144`		`- 'xpack.triggersActionsUI.components.builtinActionTypes.common.requiredTitleTextField',`
	`143`	`+export const NAME_REQUIRED = i18n.translate(`
	`144`	`+ 'xpack.triggersActionsUI.components.builtinActionTypes.resilient.requiredNameTextField',`
`145`	`145`	`{`
`146`		`- defaultMessage: 'Title is required.',`
	`146`	`+ defaultMessage: 'Name is required.',`
`147`	`147`	`}`
`148`	`148`	`);`
`149`	`149`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ export function getActionType(): ActionTypeModel<`
`67`	`67`	`title: new Array<string>(),`
`68`	`68`	`};`
`69`	`69`	`validationResult.errors = errors;`
`70`		`- if (actionParams.subActionParams && !actionParams.subActionParams.title?.length) {`
	`70`	`+ if (!actionParams.subActionParams?.title?.length) {`
`71`	`71`	`errors.title.push(i18n.TITLE_REQUIRED);`
`72`	`72`	`}`
`73`	`73`	`return validationResult;`
Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,6 @@ export const DESCRIPTION_REQUIRED = i18n.translate(`
`157`	`157`	`export const TITLE_REQUIRED = i18n.translate(`
`158`	`158`	`'xpack.triggersActionsUI.components.builtinActionTypes.common.requiredTitleTextField',`
`159`	`159`	`{`
`160`		`- defaultMessage: 'Title is required.',`
	`160`	`+ defaultMessage: 'Short description is required.',`
`161`	`161`	`}`
`162`	`162`	`);`