Skip to content

Commit

Permalink
[8.7] [Security Solution][Alerts] Update mapping conflicts warning me…
Browse files Browse the repository at this point in the history
…ssage (#152726) (#152755)

# Backport

This will backport the following commits from `main` to `8.7`:
- [[Security Solution][Alerts] Update mapping conflicts warning message
(#152726)](#152726)

<!--- Backport version: 8.9.7 -->

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

<!--BACKPORT [{"author":{"name":"Ievgen
Sorokopud","email":"ievgen.sorokopud@elastic.co"},"sourceCommit":{"committedDate":"2023-03-06T18:23:26Z","message":"[Security
Solution][Alerts] Update mapping conflicts warning message
(#152726)\n\n## Summary\r\n\r\nThese changes update warning message that
we show to user to indicate\r\nindex mapping conflicts while selecting a
field to build a Rule\r\nException.\r\n\r\nNew tooltip
message:\r\n\r\n<img width=\"829\" alt=\"Screenshot 2023-03-06 at 16 18
51\"\r\nsrc=\"https://user-images.githubusercontent.com/2700761/223154197-ee4ed680-5cc1-4b48-82d8-e225aa24519b.png\">\r\n\r\n[Main
ticket](#146845 to
[this PR](#149149
@nastasha-solomon","sha":"ce9631850d8631eb72b52687fb5ed0b7645f207d","branchLabelMapping":{"^v8.8.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:
SecuritySolution","Team:Security Solution Platform","Team:Detection
Alerts","backport:prev-minor","ci:cloud-deploy","v8.8.0"],"number":152726,"url":"#152726
Solution][Alerts] Update mapping conflicts warning message
(#152726)\n\n## Summary\r\n\r\nThese changes update warning message that
we show to user to indicate\r\nindex mapping conflicts while selecting a
field to build a Rule\r\nException.\r\n\r\nNew tooltip
message:\r\n\r\n<img width=\"829\" alt=\"Screenshot 2023-03-06 at 16 18
51\"\r\nsrc=\"https://user-images.githubusercontent.com/2700761/223154197-ee4ed680-5cc1-4b48-82d8-e225aa24519b.png\">\r\n\r\n[Main
ticket](#146845 to
[this PR](#149149
@nastasha-solomon","sha":"ce9631850d8631eb72b52687fb5ed0b7645f207d"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.8.0","labelRegex":"^v8.8.0$","isSourceBranch":true,"state":"MERGED","url":"#152726
Solution][Alerts] Update mapping conflicts warning message
(#152726)\n\n## Summary\r\n\r\nThese changes update warning message that
we show to user to indicate\r\nindex mapping conflicts while selecting a
field to build a Rule\r\nException.\r\n\r\nNew tooltip
message:\r\n\r\n<img width=\"829\" alt=\"Screenshot 2023-03-06 at 16 18
51\"\r\nsrc=\"https://user-images.githubusercontent.com/2700761/223154197-ee4ed680-5cc1-4b48-82d8-e225aa24519b.png\">\r\n\r\n[Main
ticket](#146845 to
[this PR](#149149
@nastasha-solomon","sha":"ce9631850d8631eb72b52687fb5ed0b7645f207d"}}]}]
BACKPORT-->

Co-authored-by: Ievgen Sorokopud <ievgen.sorokopud@elastic.co>
  • Loading branch information
kibanamachine and e40pud committed Mar 6, 2023
1 parent 4ebbdef commit 78a3f43
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ export const FIELD_CONFLICT_INDICES_WARNING_TITLE = i18n.translate(
export const FIELD_CONFLICT_INDICES_WARNING_DESCRIPTION = i18n.translate(
'autocomplete.conflictIndicesWarning.description',
{
defaultMessage: 'This field is defined as several types across different indices.',
defaultMessage:
'This field is defined as different types across the following indices or is unmapped. This can cause unexpected query results.',
}
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ describe('BuilderEntryItem', () => {
);

expect(wrapper.find('.euiFormHelpText.euiFormRow__text').text()).toMatch(
/This field is defined as several types across different indices./
/This field is defined as different types across the following indices or is unmapped. This can cause unexpected query results./
);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ export const CUSTOM_COMBOBOX_OPTION_TEXT = i18n.translate(
export const FIELD_CONFLICT_INDICES_WARNING_DESCRIPTION = i18n.translate(
'xpack.lists.exceptions.field.mappingConflict.description',
{
defaultMessage: 'This field is defined as several types across different indices.',
defaultMessage:
'This field is defined as different types across the following indices or is unmapped. This can cause unexpected query results.',
}
);

Expand Down

0 comments on commit 78a3f43

Please sign in to comment.