Skip to content

Commit

Permalink
[8.9] [Rule Details] - Update rule details data view id text (#164494) (
Browse files Browse the repository at this point in the history
#165021)

# Backport

This will backport the following commits from `main` to `8.9`:
- [[Rule Details] - Update rule details data view id text
(#164494)](#164494)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Yara
Tercero","email":"yctercero@users.noreply.github.com"},"sourceCommit":{"committedDate":"2023-08-28T16:29:00Z","message":"[Rule
Details] - Update rule details data view id text
(#164494)\n\n**Resolves:
https://github.com/elastic/kibana/issues/164828**\r\n**Related UX
writing
issue:\r\nhttps://github.com/elastic/ux-writing/issues/46**\r\n\r\n##
Summary\r\n\r\nIn rule details page, when a rule has a data view
selected, two labels\r\nshow up as \"Data View\". This appears to be a
bug, as one of those labels\r\nshould be \"Data view ID\" and another
should be \"Data view index\r\npattern\".\r\n\r\nThanks to @MadameSheema
@nikitaindik for finding this. \r\n\r\n### Before
\r\n\r\n![image](https://github.com/elastic/kibana/assets/10927944/8ac8b6d4-1005-4c03-a71a-31216a1287c5)\r\n\r\n###
After\r\n<img width=\"808\" alt=\"Screenshot 2023-08-26 at 19 30
54\"\r\nsrc=\"https://github.com/elastic/kibana/assets/15949146/b511bf92-0e90-4455-834c-36b8e75b2a58\">\r\n\r\n\r\n###
Checklist\r\n\r\n- [x] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n\r\n---------\r\n\r\nCo-authored-by:
Nikita Indik
<nikita.indik@elastic.co>","sha":"31e95574ae6d8cfa9e0ba4595e1068e9391b423d","branchLabelMapping":{"^v8.11.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","Team:Detection
Rule Management","ui-copy","Feature:Rule Details","Team:Detection
Engine","v8.10.0","v8.11.0","v8.9.2"],"number":164494,"url":"https://github.com/elastic/kibana/pull/164494","mergeCommit":{"message":"[Rule
Details] - Update rule details data view id text
(#164494)\n\n**Resolves:
https://github.com/elastic/kibana/issues/164828**\r\n**Related UX
writing
issue:\r\nhttps://github.com/elastic/ux-writing/issues/46**\r\n\r\n##
Summary\r\n\r\nIn rule details page, when a rule has a data view
selected, two labels\r\nshow up as \"Data View\". This appears to be a
bug, as one of those labels\r\nshould be \"Data view ID\" and another
should be \"Data view index\r\npattern\".\r\n\r\nThanks to @MadameSheema
@nikitaindik for finding this. \r\n\r\n### Before
\r\n\r\n![image](https://github.com/elastic/kibana/assets/10927944/8ac8b6d4-1005-4c03-a71a-31216a1287c5)\r\n\r\n###
After\r\n<img width=\"808\" alt=\"Screenshot 2023-08-26 at 19 30
54\"\r\nsrc=\"https://github.com/elastic/kibana/assets/15949146/b511bf92-0e90-4455-834c-36b8e75b2a58\">\r\n\r\n\r\n###
Checklist\r\n\r\n- [x] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n\r\n---------\r\n\r\nCo-authored-by:
Nikita Indik
<nikita.indik@elastic.co>","sha":"31e95574ae6d8cfa9e0ba4595e1068e9391b423d"}},"sourceBranch":"main","suggestedTargetBranches":["8.9"],"targetPullRequestStates":[{"branch":"8.10","label":"v8.10.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/165015","number":165015,"state":"OPEN"},{"branch":"main","label":"v8.11.0","labelRegex":"^v8.11.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/164494","number":164494,"mergeCommit":{"message":"[Rule
Details] - Update rule details data view id text
(#164494)\n\n**Resolves:
https://github.com/elastic/kibana/issues/164828**\r\n**Related UX
writing
issue:\r\nhttps://github.com/elastic/ux-writing/issues/46**\r\n\r\n##
Summary\r\n\r\nIn rule details page, when a rule has a data view
selected, two labels\r\nshow up as \"Data View\". This appears to be a
bug, as one of those labels\r\nshould be \"Data view ID\" and another
should be \"Data view index\r\npattern\".\r\n\r\nThanks to @MadameSheema
@nikitaindik for finding this. \r\n\r\n### Before
\r\n\r\n![image](https://github.com/elastic/kibana/assets/10927944/8ac8b6d4-1005-4c03-a71a-31216a1287c5)\r\n\r\n###
After\r\n<img width=\"808\" alt=\"Screenshot 2023-08-26 at 19 30
54\"\r\nsrc=\"https://github.com/elastic/kibana/assets/15949146/b511bf92-0e90-4455-834c-36b8e75b2a58\">\r\n\r\n\r\n###
Checklist\r\n\r\n- [x] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n\r\n---------\r\n\r\nCo-authored-by:
Nikita Indik
<nikita.indik@elastic.co>","sha":"31e95574ae6d8cfa9e0ba4595e1068e9391b423d"}},{"branch":"8.9","label":"v8.9.2","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Yara Tercero <yctercero@users.noreply.github.com>
  • Loading branch information
nikitaindik and yctercero authored Aug 28, 2023
1 parent 41f6c48 commit 098c0aa
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const SAVED_QUERY_DETAILS = /^Saved query$/;

export const SAVED_QUERY_FILTERS_DETAILS = 'Saved query filters';

export const DATA_VIEW_DETAILS = 'Data View';
export const DATA_VIEW_DETAILS = 'Data view';

export const DEFINITION_DETAILS =
'[data-test-subj=definitionRule] [data-test-subj="listItemColumnStepRuleDescription"]';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,21 +79,11 @@ export const schema: FormSchema<DefineStepRule> = {
},
],
},
dataViewTitle: {
label: i18n.translate(
'xpack.securitySolution.detectionEngine.createRule.stepAboutRule.dataViewSelector',
{
defaultMessage: 'Data View',
}
),
validations: [],
},
// TODO: populate the dataViewTitle in a better way
dataViewId: {
label: i18n.translate(
'xpack.securitySolution.detectionEngine.createRule.stepAboutRule.dataViewSelector',
{
defaultMessage: 'Data View',
defaultMessage: 'Data view',
}
),
fieldsToValidateOnChange: ['dataViewId'],
Expand Down Expand Up @@ -129,6 +119,15 @@ export const schema: FormSchema<DefineStepRule> = {
},
],
},
dataViewTitle: {
label: i18n.translate(
'xpack.securitySolution.detectionEngine.createRule.stepAboutRule.dataViewTitleSelector',
{
defaultMessage: 'Data view index pattern',
}
),
validations: [],
},
eqlOptions: {},
queryBar: {
validations: [
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -31361,7 +31361,6 @@
"xpack.securitySolution.detectionEngine.createRule.savedQueryFiltersLabel": "Filtres de requête enregistrés",
"xpack.securitySolution.detectionEngine.createRule.savedQueryLabel": "Requête enregistrée",
"xpack.securitySolution.detectionEngine.createRule.stepAboutRule.authorFieldEmptyError": "L'auteur doit être renseigné",
"xpack.securitySolution.detectionEngine.createRule.stepAboutRule.dataViewSelector": "Vue de données",
"xpack.securitySolution.detectionEngine.createRule.stepAboutRule.descriptionFieldRequiredError": "Une description est requise.",
"xpack.securitySolution.detectionEngine.createRule.stepAboutRule.fiedIndexPatternsLabel": "Modèles d'indexation",
"xpack.securitySolution.detectionEngine.createRule.stepAboutRule.fieldAssociatedToEndpointListLabel": "Ajouter des exceptions de point de terminaison existantes à la règle",
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -31355,7 +31355,6 @@
"xpack.securitySolution.detectionEngine.createRule.savedQueryFiltersLabel": "保存されたクエリフィルター",
"xpack.securitySolution.detectionEngine.createRule.savedQueryLabel": "保存されたクエリ",
"xpack.securitySolution.detectionEngine.createRule.stepAboutRule.authorFieldEmptyError": "作成者は空にする必要があります",
"xpack.securitySolution.detectionEngine.createRule.stepAboutRule.dataViewSelector": "データビュー",
"xpack.securitySolution.detectionEngine.createRule.stepAboutRule.descriptionFieldRequiredError": "説明が必要です。",
"xpack.securitySolution.detectionEngine.createRule.stepAboutRule.fiedIndexPatternsLabel": "インデックスパターン",
"xpack.securitySolution.detectionEngine.createRule.stepAboutRule.fieldAssociatedToEndpointListLabel": "既存のエンドポイント例外をルールに追加",
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -31351,7 +31351,6 @@
"xpack.securitySolution.detectionEngine.createRule.savedQueryFiltersLabel": "已保存查询筛选",
"xpack.securitySolution.detectionEngine.createRule.savedQueryLabel": "已保存查询",
"xpack.securitySolution.detectionEngine.createRule.stepAboutRule.authorFieldEmptyError": "作者不得为空",
"xpack.securitySolution.detectionEngine.createRule.stepAboutRule.dataViewSelector": "数据视图",
"xpack.securitySolution.detectionEngine.createRule.stepAboutRule.descriptionFieldRequiredError": "描述必填。",
"xpack.securitySolution.detectionEngine.createRule.stepAboutRule.fiedIndexPatternsLabel": "索引模式",
"xpack.securitySolution.detectionEngine.createRule.stepAboutRule.fieldAssociatedToEndpointListLabel": "将现有的终端例外添加到规则",
Expand Down

0 comments on commit 098c0aa

Please sign in to comment.