Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Dec 1, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/ja-JP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20038,7 +20038,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": "親問題を選択",
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20057,7 +20057,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": "选择父问题",
Expand Down
2 changes: 1 addition & 1 deletion ...triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ describe('jira action params validation', () => {

expect(actionTypeModel.validateParams(actionParams)).toEqual({
errors: {
title: ['Title is required.'],
title: ['Summary is required.'],
},
});
});
Expand Down
4 changes: 2 additions & 2 deletions ...gins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,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;
},
Expand Down
6 changes: 3 additions & 3 deletions ...iggers_actions_ui/public/application/components/builtin_action_types/jira/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,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.',
}
);

Expand Down
2 changes: 1 addition & 1 deletion ...ctions_ui/public/application/components/builtin_action_types/resilient/resilient.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ describe('resilient action params validation', () => {

expect(actionTypeModel.validateParams(actionParams)).toEqual({
errors: {
title: ['Title is required.'],
title: ['Name is required.'],
},
});
});
Expand Down
5 changes: 3 additions & 2 deletions ...ers_actions_ui/public/application/components/builtin_action_types/resilient/resilient.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,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;
},
Expand Down
8 changes: 4 additions & 4 deletions ...s_actions_ui/public/application/components/builtin_action_types/resilient/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,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.',
}
);

Expand Down
2 changes: 1 addition & 1 deletion ...ions_ui/public/application/components/builtin_action_types/servicenow/servicenow.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ describe('servicenow action params validation', () => {

expect(actionTypeModel.validateParams(actionParams)).toEqual({
errors: {
title: ['Title is required.'],
title: ['Short description is required.'],
},
});
});
Expand Down
2 changes: 1 addition & 1 deletion ...s_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,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;
Expand Down
2 changes: 1 addition & 1 deletion ..._actions_ui/public/application/components/builtin_action_types/servicenow/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,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.',
}
);