[Security Solution] Improve bulk update modal copy#227803
Merged
nikitaindik merged 6 commits intoelastic:mainfrom Jul 16, 2025
Merged
[Security Solution] Improve bulk update modal copy#227803nikitaindik merged 6 commits intoelastic:mainfrom
nikitaindik merged 6 commits intoelastic:mainfrom
Conversation
Tweak wording RTL test refactoring Remove unnecessary translation parameter Update i18n
nikitaindik
added
Team:Detections and Resp
Contributor
|
Pinging @elastic/security-detections-response (Team:Detections and Resp) |
Contributor
|
Pinging @elastic/security-solution (Team: SecuritySolution) |
Contributor
|
Pinging @elastic/security-detection-rule-management (Team:Detection Rule Management) |
Contributor
Author
|
@nastasha-solomon Could you please review the wording in the screenshots? |
nikitaindik
commented
Jul 14, 2025
| createDetectionRules: `${ELASTIC_DOCS}solutions/security/detect-and-alert/create-detection-rule`, | ||
| updatePrebuiltDetectionRules: `${ELASTIC_DOCS}solutions/security/detect-and-alert/install-manage-elastic-prebuilt-rules#update-prebuilt-rules`, | ||
| prebuiltRuleCustomizationPromoBlog: isServerless | ||
| ? '' // URL for Serverless to be added later, once the blog post is published. Issue: https://github.com/elastic/kibana/issues/209000 |
Contributor
Author
dplumlee
approved these changes
Jul 15, 2025
Contributor
dplumlee
left a comment
dplumlee
left a comment
There was a problem hiding this comment.
Pulled down and tested all the logic paths, lgtm @nikitaindik! Language also looks good, much clearer
Comment on lines
+110
to
+165
| const docsUrl = useKibana().services.docLinks.links.securitySolution.resolvePrebuiltRuleConflicts; | ||
|
|
||
| export const RULES_WITHOUT_CONFLICTS_AND_RULES_WITH_SOLVABLE_CONFLICTS = ({ | ||
| numOfRulesWithoutConflicts, | ||
| numOfRulesWithSolvableConflicts, | ||
| }: { | ||
| numOfRulesWithoutConflicts: number; | ||
| numOfRulesWithSolvableConflicts: number; | ||
| }) => ( | ||
| <> | ||
| <FormattedMessage | ||
| id="xpack.securitySolution.detectionEngine.upgradeConflictsModal.rulesWithoutConflictsAndRulesWithSolvableConflicts" | ||
| defaultMessage="{numOfRulesWithSolvableConflictsStrong} of the {numOfRulesStrong} selected {numOfRules, plural, =1 {rule has} other {rules have}} auto-resolved conflicts. To safely update them, we recommend addressing the conflicts from the rule update flyout." | ||
| values={{ | ||
| numOfRules: numOfRulesWithoutConflicts + numOfRulesWithSolvableConflicts, | ||
| numOfRulesStrong: ( | ||
| <strong>{numOfRulesWithoutConflicts + numOfRulesWithSolvableConflicts}</strong> | ||
| ), | ||
| numOfRulesWithSolvableConflictsStrong: <strong>{numOfRulesWithSolvableConflicts}</strong>, | ||
| }} | ||
| /> | ||
| <br /> | ||
| <br /> | ||
| {PROCEED_WITH_CONFLICT_FREE_RULES(numOfRulesWithoutConflicts)} | ||
| <br /> | ||
| {PROCEED_WITH_CONFLICT_FREE_AND_SOLVABLE_CONFLICT_RULES({ | ||
| numOfRulesWithoutConflicts, | ||
| numOfRulesWithSolvableConflicts, | ||
| })} | ||
| </> | ||
| ); | ||
| return ( | ||
| <> | ||
| <div> | ||
| <FormattedMessage | ||
| id="xpack.securitySolution.detectionEngine.upgradeConflictsModal.rulesWithAutoResolvedConflictsGuidance" | ||
| defaultMessage="{numOfRulesWithSolvableConflictsStrong} {numOfRulesWithSolvableConflicts, plural, =1 {rule} other {rules}} with auto-resolved {numOfRulesWithSolvableConflicts, plural, =1 {conflict} other {conflicts}} can still be updated. Choose one of the following options:" | ||
| values={{ | ||
| numOfRulesWithSolvableConflicts, | ||
| numOfRulesWithSolvableConflictsStrong: ( | ||
| <strong>{numOfRulesWithSolvableConflicts}</strong> | ||
| ), | ||
| }} | ||
| /> | ||
| <ul> | ||
| <li> | ||
| <FormattedMessage | ||
| id="xpack.securitySolution.detectionEngine.upgradeConflictsModal.useRuleUpdateFlyout" | ||
| defaultMessage="Use the rule update flyout to address auto-resolved conflicts. This is the safest option and gives you more control over the final update. {learnMoreLink}" | ||
| values={{ | ||
| learnMoreLink: ( | ||
| <EuiLink href={docsUrl} target="_blank"> | ||
| <FormattedMessage | ||
| id="xpack.securitySolution.detectionEngine.upgradeConflictsModal.learnMore" | ||
| defaultMessage="Learn more" | ||
| /> | ||
| </EuiLink> | ||
| ), | ||
| }} | ||
| /> | ||
| </li> | ||
| <li> | ||
| <FormattedMessage | ||
| id="xpack.securitySolution.detectionEngine.upgradeConflictsModal.bulkUpdateRules" | ||
| defaultMessage="Click {updateRules} to bulk-update rules with auto-resolved conflicts and rules without conflicts." | ||
| values={{ | ||
| updateRules: ( | ||
| <strong> | ||
| {UPGRADE_RULES_WITH_CONFLICTS( | ||
| numOfRulesWithSolvableConflicts + numOfRulesWithoutConflicts | ||
| )} | ||
| </strong> | ||
| ), | ||
| }} | ||
| /> | ||
| </li> | ||
| <EuiCallOut | ||
| title={ACCEPT_SOLVABLE_CONFLICTS_WARNING} | ||
| color="warning" | ||
| iconType="warning" | ||
| /> | ||
| </ul> | ||
| </div> | ||
| <br /> | ||
| </> |
Contributor
There was a problem hiding this comment.
nit: this seems like more jsx than we'd usually put in a translations file (eui elements, hooks, etc.), might be worth making its own component and just keeping the messages in here.
Contributor
Author
There was a problem hiding this comment.
I was thinking about it too. However, since this text is closely tied to the layout in this case, I figured it would be more readable to include it in a single translation export.
| 'xpack.securitySolution.detectionEngine.upgradeConflictsModal.acceptSolvableConflictsWarning', | ||
| { | ||
| defaultMessage: | ||
| 'Only choose this option if you’re comfortable accepting the fixes Elastic suggested.', |
Contributor
There was a problem hiding this comment.
@nastasha-solomon this reads a bit weird to me but I can't really figure out why. Any thoughts? I don't feel strongly enough about it to need a change, just wondering
Contributor
There was a problem hiding this comment.
@dplumlee have you had a chance to ruminate on this a bit more? Do you think this suggestion would be unclear or confusing for users?
Contributor
There was a problem hiding this comment.
Not enough to change it, was just wanting a sanity check. If you think it sounds good I'm probably overthinking it 👍
nastasha-solomon
approved these changes
Jul 16, 2025
Contributor
nastasha-solomon
left a comment
nastasha-solomon
left a comment
There was a problem hiding this comment.
lgtm - thanks for making these changes, @nikitaindik !
Contributor
|
Starting backport for target branches: 8.18, 8.19, 9.0, 9.1 https://github.com/elastic/kibana/actions/runs/16324727685 |
Contributor
💛 Build succeeded, but was flaky
Failed CI StepsTest Failures
Metrics [docs]Module Count
Async chunks
Page load bundle
History
cc @nikitaindik |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Jul 16, 2025
**Resolves: elastic/docs-content#1063 ## Summary This PR updates the UI copy for the "bulk update with conflicts" modal. ### Changes - Clarified the modal text - Made the warning for auto-resolved conflicts more visible (now it's an `EuiCallout`) - Added tests for modal text content ## Screenshots #### Only rules with solvable conflicts <img width="818" height="456" alt="Screenshot 2025-07-14 at 13 35 55" src="https://github.com/user-attachments/assets/a458d050-cbce-43fd-a953-0d37e9bc8fe2" /> #### Only rules with non-solvable conflicts <img width="650" height="267" alt="Screenshot 2025-07-14 at 13 37 32" src="https://github.com/user-attachments/assets/c0bb0547-5080-4bf3-8c4e-57dc7d0fb2e3" /> #### Rules with solvable conflicts and rules with non-solvable conflicts <img width="786" height="506" alt="Screenshot 2025-07-14 at 13 38 41" src="https://github.com/user-attachments/assets/e071ace1-30d1-41bf-ab9e-00834bf6933b" /> #### Rules with solvable conflicts and conflict-free rules <img width="786" height="502" alt="Screenshot 2025-07-14 at 13 44 07" src="https://github.com/user-attachments/assets/da57efb0-90d1-4cd4-8f99-65a311dd6555" /> #### Rules with non-solvable conflicts and conflict-free rules <img width="786" height="350" alt="Screenshot 2025-07-14 at 13 39 54" src="https://github.com/user-attachments/assets/84b3b050-4ec7-40b1-857c-4e59bc18592b" /> #### Rules with non-solvable conflicts, rules with solvable conflicts and conflict-free rules <img width="786" height="574" alt="Screenshot 2025-07-14 at 13 41 23" src="https://github.com/user-attachments/assets/e4290d36-c075-4969-8c66-7ea2a88ff222" /> (cherry picked from commit 81de395)
Contributor
💔 Some backports could not be created
Note: Successful backport PRs will be merged automatically after passing CI. Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
nikitaindik
added a commit
to nikitaindik/kibana
that referenced
this pull request
Jul 16, 2025
**Resolves: elastic/docs-content#1063 ## Summary This PR updates the UI copy for the "bulk update with conflicts" modal. ### Changes - Clarified the modal text - Made the warning for auto-resolved conflicts more visible (now it's an `EuiCallout`) - Added tests for modal text content ## Screenshots #### Only rules with solvable conflicts <img width="818" height="456" alt="Screenshot 2025-07-14 at 13 35 55" src="https://github.com/user-attachments/assets/a458d050-cbce-43fd-a953-0d37e9bc8fe2" /> #### Only rules with non-solvable conflicts <img width="650" height="267" alt="Screenshot 2025-07-14 at 13 37 32" src="https://github.com/user-attachments/assets/c0bb0547-5080-4bf3-8c4e-57dc7d0fb2e3" /> #### Rules with solvable conflicts and rules with non-solvable conflicts <img width="786" height="506" alt="Screenshot 2025-07-14 at 13 38 41" src="https://github.com/user-attachments/assets/e071ace1-30d1-41bf-ab9e-00834bf6933b" /> #### Rules with solvable conflicts and conflict-free rules <img width="786" height="502" alt="Screenshot 2025-07-14 at 13 44 07" src="https://github.com/user-attachments/assets/da57efb0-90d1-4cd4-8f99-65a311dd6555" /> #### Rules with non-solvable conflicts and conflict-free rules <img width="786" height="350" alt="Screenshot 2025-07-14 at 13 39 54" src="https://github.com/user-attachments/assets/84b3b050-4ec7-40b1-857c-4e59bc18592b" /> #### Rules with non-solvable conflicts, rules with solvable conflicts and conflict-free rules <img width="786" height="574" alt="Screenshot 2025-07-14 at 13 41 23" src="https://github.com/user-attachments/assets/e4290d36-c075-4969-8c66-7ea2a88ff222" /> (cherry picked from commit 81de395) # Conflicts: # x-pack/platform/plugins/private/translations/translations/fr-FR.json # x-pack/platform/plugins/private/translations/translations/ja-JP.json # x-pack/platform/plugins/private/translations/translations/zh-CN.json
nikitaindik
added a commit
to nikitaindik/kibana
that referenced
this pull request
Jul 16, 2025
**Resolves: elastic/docs-content#1063 ## Summary This PR updates the UI copy for the "bulk update with conflicts" modal. ### Changes - Clarified the modal text - Made the warning for auto-resolved conflicts more visible (now it's an `EuiCallout`) - Added tests for modal text content ## Screenshots #### Only rules with solvable conflicts <img width="818" height="456" alt="Screenshot 2025-07-14 at 13 35 55" src="https://github.com/user-attachments/assets/a458d050-cbce-43fd-a953-0d37e9bc8fe2" /> #### Only rules with non-solvable conflicts <img width="650" height="267" alt="Screenshot 2025-07-14 at 13 37 32" src="https://github.com/user-attachments/assets/c0bb0547-5080-4bf3-8c4e-57dc7d0fb2e3" /> #### Rules with solvable conflicts and rules with non-solvable conflicts <img width="786" height="506" alt="Screenshot 2025-07-14 at 13 38 41" src="https://github.com/user-attachments/assets/e071ace1-30d1-41bf-ab9e-00834bf6933b" /> #### Rules with solvable conflicts and conflict-free rules <img width="786" height="502" alt="Screenshot 2025-07-14 at 13 44 07" src="https://github.com/user-attachments/assets/da57efb0-90d1-4cd4-8f99-65a311dd6555" /> #### Rules with non-solvable conflicts and conflict-free rules <img width="786" height="350" alt="Screenshot 2025-07-14 at 13 39 54" src="https://github.com/user-attachments/assets/84b3b050-4ec7-40b1-857c-4e59bc18592b" /> #### Rules with non-solvable conflicts, rules with solvable conflicts and conflict-free rules <img width="786" height="574" alt="Screenshot 2025-07-14 at 13 41 23" src="https://github.com/user-attachments/assets/e4290d36-c075-4969-8c66-7ea2a88ff222" /> (cherry picked from commit 81de395) # Conflicts: # src/platform/packages/shared/kbn-doc-links/src/get_doc_links.ts # x-pack/platform/plugins/private/translations/translations/fr-FR.json # x-pack/platform/plugins/private/translations/translations/ja-JP.json # x-pack/platform/plugins/private/translations/translations/zh-CN.json
kibanamachine
added a commit
that referenced
this pull request
Jul 16, 2025
…228268) # Backport This will backport the following commits from `main` to `9.1`: - [[Security Solution] Improve bulk update modal copy (#227803)](#227803) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Nikita Indik","email":"nikita.indik@elastic.co"},"sourceCommit":{"committedDate":"2025-07-16T16:13:48Z","message":"[Security Solution] Improve bulk update modal copy (#227803)\n\n**Resolves: https://github.com/elastic/docs-content/issues/1063**\n\n## Summary\nThis PR updates the UI copy for the \"bulk update with conflicts\" modal.\n\n### Changes\n- Clarified the modal text\n- Made the warning for auto-resolved conflicts more visible (now it's an\n`EuiCallout`)\n- Added tests for modal text content\n\n## Screenshots\n#### Only rules with solvable conflicts\n<img width=\"818\" height=\"456\" alt=\"Screenshot 2025-07-14 at 13 35 55\"\nsrc=\"https://github.com/user-attachments/assets/a458d050-cbce-43fd-a953-0d37e9bc8fe2\"\n/>\n\n#### Only rules with non-solvable conflicts\n<img width=\"650\" height=\"267\" alt=\"Screenshot 2025-07-14 at 13 37 32\"\nsrc=\"https://github.com/user-attachments/assets/c0bb0547-5080-4bf3-8c4e-57dc7d0fb2e3\"\n/>\n\n#### Rules with solvable conflicts and rules with non-solvable conflicts\n<img width=\"786\" height=\"506\" alt=\"Screenshot 2025-07-14 at 13 38 41\"\nsrc=\"https://github.com/user-attachments/assets/e071ace1-30d1-41bf-ab9e-00834bf6933b\"\n/>\n\n#### Rules with solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"502\" alt=\"Screenshot 2025-07-14 at 13 44 07\"\nsrc=\"https://github.com/user-attachments/assets/da57efb0-90d1-4cd4-8f99-65a311dd6555\"\n/>\n\n#### Rules with non-solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"350\" alt=\"Screenshot 2025-07-14 at 13 39 54\"\nsrc=\"https://github.com/user-attachments/assets/84b3b050-4ec7-40b1-857c-4e59bc18592b\"\n/>\n\n#### Rules with non-solvable conflicts, rules with solvable conflicts\nand conflict-free rules\n<img width=\"786\" height=\"574\" alt=\"Screenshot 2025-07-14 at 13 41 23\"\nsrc=\"https://github.com/user-attachments/assets/e4290d36-c075-4969-8c66-7ea2a88ff222\"\n/>","sha":"81de395d09c1cbaf156bdc039e7809798fcb6ff7","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Detections and Resp","Team: SecuritySolution","Team:Detection Rule Management","ui-copy","Feature:Prebuilt Detection Rules","backport:version","v9.1.0","v8.19.0","v9.2.0","v8.18.4","v9.0.4"],"title":"[Security Solution] Improve bulk update modal copy","number":227803,"url":"https://github.com/elastic/kibana/pull/227803","mergeCommit":{"message":"[Security Solution] Improve bulk update modal copy (#227803)\n\n**Resolves: https://github.com/elastic/docs-content/issues/1063**\n\n## Summary\nThis PR updates the UI copy for the \"bulk update with conflicts\" modal.\n\n### Changes\n- Clarified the modal text\n- Made the warning for auto-resolved conflicts more visible (now it's an\n`EuiCallout`)\n- Added tests for modal text content\n\n## Screenshots\n#### Only rules with solvable conflicts\n<img width=\"818\" height=\"456\" alt=\"Screenshot 2025-07-14 at 13 35 55\"\nsrc=\"https://github.com/user-attachments/assets/a458d050-cbce-43fd-a953-0d37e9bc8fe2\"\n/>\n\n#### Only rules with non-solvable conflicts\n<img width=\"650\" height=\"267\" alt=\"Screenshot 2025-07-14 at 13 37 32\"\nsrc=\"https://github.com/user-attachments/assets/c0bb0547-5080-4bf3-8c4e-57dc7d0fb2e3\"\n/>\n\n#### Rules with solvable conflicts and rules with non-solvable conflicts\n<img width=\"786\" height=\"506\" alt=\"Screenshot 2025-07-14 at 13 38 41\"\nsrc=\"https://github.com/user-attachments/assets/e071ace1-30d1-41bf-ab9e-00834bf6933b\"\n/>\n\n#### Rules with solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"502\" alt=\"Screenshot 2025-07-14 at 13 44 07\"\nsrc=\"https://github.com/user-attachments/assets/da57efb0-90d1-4cd4-8f99-65a311dd6555\"\n/>\n\n#### Rules with non-solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"350\" alt=\"Screenshot 2025-07-14 at 13 39 54\"\nsrc=\"https://github.com/user-attachments/assets/84b3b050-4ec7-40b1-857c-4e59bc18592b\"\n/>\n\n#### Rules with non-solvable conflicts, rules with solvable conflicts\nand conflict-free rules\n<img width=\"786\" height=\"574\" alt=\"Screenshot 2025-07-14 at 13 41 23\"\nsrc=\"https://github.com/user-attachments/assets/e4290d36-c075-4969-8c66-7ea2a88ff222\"\n/>","sha":"81de395d09c1cbaf156bdc039e7809798fcb6ff7"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","8.19","8.18","9.0"],"targetPullRequestStates":[{"branch":"9.1","label":"v9.1.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/227803","number":227803,"mergeCommit":{"message":"[Security Solution] Improve bulk update modal copy (#227803)\n\n**Resolves: https://github.com/elastic/docs-content/issues/1063**\n\n## Summary\nThis PR updates the UI copy for the \"bulk update with conflicts\" modal.\n\n### Changes\n- Clarified the modal text\n- Made the warning for auto-resolved conflicts more visible (now it's an\n`EuiCallout`)\n- Added tests for modal text content\n\n## Screenshots\n#### Only rules with solvable conflicts\n<img width=\"818\" height=\"456\" alt=\"Screenshot 2025-07-14 at 13 35 55\"\nsrc=\"https://github.com/user-attachments/assets/a458d050-cbce-43fd-a953-0d37e9bc8fe2\"\n/>\n\n#### Only rules with non-solvable conflicts\n<img width=\"650\" height=\"267\" alt=\"Screenshot 2025-07-14 at 13 37 32\"\nsrc=\"https://github.com/user-attachments/assets/c0bb0547-5080-4bf3-8c4e-57dc7d0fb2e3\"\n/>\n\n#### Rules with solvable conflicts and rules with non-solvable conflicts\n<img width=\"786\" height=\"506\" alt=\"Screenshot 2025-07-14 at 13 38 41\"\nsrc=\"https://github.com/user-attachments/assets/e071ace1-30d1-41bf-ab9e-00834bf6933b\"\n/>\n\n#### Rules with solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"502\" alt=\"Screenshot 2025-07-14 at 13 44 07\"\nsrc=\"https://github.com/user-attachments/assets/da57efb0-90d1-4cd4-8f99-65a311dd6555\"\n/>\n\n#### Rules with non-solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"350\" alt=\"Screenshot 2025-07-14 at 13 39 54\"\nsrc=\"https://github.com/user-attachments/assets/84b3b050-4ec7-40b1-857c-4e59bc18592b\"\n/>\n\n#### Rules with non-solvable conflicts, rules with solvable conflicts\nand conflict-free rules\n<img width=\"786\" height=\"574\" alt=\"Screenshot 2025-07-14 at 13 41 23\"\nsrc=\"https://github.com/user-attachments/assets/e4290d36-c075-4969-8c66-7ea2a88ff222\"\n/>","sha":"81de395d09c1cbaf156bdc039e7809798fcb6ff7"}},{"branch":"8.18","label":"v8.18.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.0","label":"v9.0.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Nikita Indik <nikita.indik@elastic.co>
Contributor
Author
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
nikitaindik
added a commit
to nikitaindik/kibana
that referenced
this pull request
Jul 16, 2025
**Resolves: elastic/docs-content#1063 ## Summary This PR updates the UI copy for the "bulk update with conflicts" modal. ### Changes - Clarified the modal text - Made the warning for auto-resolved conflicts more visible (now it's an `EuiCallout`) - Added tests for modal text content ## Screenshots #### Only rules with solvable conflicts <img width="818" height="456" alt="Screenshot 2025-07-14 at 13 35 55" src="https://github.com/user-attachments/assets/a458d050-cbce-43fd-a953-0d37e9bc8fe2" /> #### Only rules with non-solvable conflicts <img width="650" height="267" alt="Screenshot 2025-07-14 at 13 37 32" src="https://github.com/user-attachments/assets/c0bb0547-5080-4bf3-8c4e-57dc7d0fb2e3" /> #### Rules with solvable conflicts and rules with non-solvable conflicts <img width="786" height="506" alt="Screenshot 2025-07-14 at 13 38 41" src="https://github.com/user-attachments/assets/e071ace1-30d1-41bf-ab9e-00834bf6933b" /> #### Rules with solvable conflicts and conflict-free rules <img width="786" height="502" alt="Screenshot 2025-07-14 at 13 44 07" src="https://github.com/user-attachments/assets/da57efb0-90d1-4cd4-8f99-65a311dd6555" /> #### Rules with non-solvable conflicts and conflict-free rules <img width="786" height="350" alt="Screenshot 2025-07-14 at 13 39 54" src="https://github.com/user-attachments/assets/84b3b050-4ec7-40b1-857c-4e59bc18592b" /> #### Rules with non-solvable conflicts, rules with solvable conflicts and conflict-free rules <img width="786" height="574" alt="Screenshot 2025-07-14 at 13 41 23" src="https://github.com/user-attachments/assets/e4290d36-c075-4969-8c66-7ea2a88ff222" /> (cherry picked from commit 81de395) # Conflicts: # src/platform/packages/shared/kbn-doc-links/src/get_doc_links.ts # x-pack/platform/plugins/private/translations/translations/fr-FR.json # x-pack/platform/plugins/private/translations/translations/ja-JP.json # x-pack/platform/plugins/private/translations/translations/zh-CN.json
nikitaindik
added a commit
that referenced
this pull request
Jul 16, 2025
…228280) # Backport This will backport the following commits from `main` to `9.0`: - [[Security Solution] Improve bulk update modal copy (#227803)](#227803) <!--- Backport version: 10.0.1 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Nikita Indik","email":"nikita.indik@elastic.co"},"sourceCommit":{"committedDate":"2025-07-16T16:13:48Z","message":"[Security Solution] Improve bulk update modal copy (#227803)\n\n**Resolves: https://github.com/elastic/docs-content/issues/1063**\n\n## Summary\nThis PR updates the UI copy for the \"bulk update with conflicts\" modal.\n\n### Changes\n- Clarified the modal text\n- Made the warning for auto-resolved conflicts more visible (now it's an\n`EuiCallout`)\n- Added tests for modal text content\n\n## Screenshots\n#### Only rules with solvable conflicts\n<img width=\"818\" height=\"456\" alt=\"Screenshot 2025-07-14 at 13 35 55\"\nsrc=\"https://github.com/user-attachments/assets/a458d050-cbce-43fd-a953-0d37e9bc8fe2\"\n/>\n\n#### Only rules with non-solvable conflicts\n<img width=\"650\" height=\"267\" alt=\"Screenshot 2025-07-14 at 13 37 32\"\nsrc=\"https://github.com/user-attachments/assets/c0bb0547-5080-4bf3-8c4e-57dc7d0fb2e3\"\n/>\n\n#### Rules with solvable conflicts and rules with non-solvable conflicts\n<img width=\"786\" height=\"506\" alt=\"Screenshot 2025-07-14 at 13 38 41\"\nsrc=\"https://github.com/user-attachments/assets/e071ace1-30d1-41bf-ab9e-00834bf6933b\"\n/>\n\n#### Rules with solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"502\" alt=\"Screenshot 2025-07-14 at 13 44 07\"\nsrc=\"https://github.com/user-attachments/assets/da57efb0-90d1-4cd4-8f99-65a311dd6555\"\n/>\n\n#### Rules with non-solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"350\" alt=\"Screenshot 2025-07-14 at 13 39 54\"\nsrc=\"https://github.com/user-attachments/assets/84b3b050-4ec7-40b1-857c-4e59bc18592b\"\n/>\n\n#### Rules with non-solvable conflicts, rules with solvable conflicts\nand conflict-free rules\n<img width=\"786\" height=\"574\" alt=\"Screenshot 2025-07-14 at 13 41 23\"\nsrc=\"https://github.com/user-attachments/assets/e4290d36-c075-4969-8c66-7ea2a88ff222\"\n/>","sha":"81de395d09c1cbaf156bdc039e7809798fcb6ff7","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Detections and Resp","Team: SecuritySolution","Team:Detection Rule Management","ui-copy","Feature:Prebuilt Detection Rules","backport:version","v9.1.0","v8.19.0","v9.2.0","v8.18.4","v9.0.4"],"title":"[Security Solution] Improve bulk update modal copy","number":227803,"url":"https://github.com/elastic/kibana/pull/227803","mergeCommit":{"message":"[Security Solution] Improve bulk update modal copy (#227803)\n\n**Resolves: https://github.com/elastic/docs-content/issues/1063**\n\n## Summary\nThis PR updates the UI copy for the \"bulk update with conflicts\" modal.\n\n### Changes\n- Clarified the modal text\n- Made the warning for auto-resolved conflicts more visible (now it's an\n`EuiCallout`)\n- Added tests for modal text content\n\n## Screenshots\n#### Only rules with solvable conflicts\n<img width=\"818\" height=\"456\" alt=\"Screenshot 2025-07-14 at 13 35 55\"\nsrc=\"https://github.com/user-attachments/assets/a458d050-cbce-43fd-a953-0d37e9bc8fe2\"\n/>\n\n#### Only rules with non-solvable conflicts\n<img width=\"650\" height=\"267\" alt=\"Screenshot 2025-07-14 at 13 37 32\"\nsrc=\"https://github.com/user-attachments/assets/c0bb0547-5080-4bf3-8c4e-57dc7d0fb2e3\"\n/>\n\n#### Rules with solvable conflicts and rules with non-solvable conflicts\n<img width=\"786\" height=\"506\" alt=\"Screenshot 2025-07-14 at 13 38 41\"\nsrc=\"https://github.com/user-attachments/assets/e071ace1-30d1-41bf-ab9e-00834bf6933b\"\n/>\n\n#### Rules with solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"502\" alt=\"Screenshot 2025-07-14 at 13 44 07\"\nsrc=\"https://github.com/user-attachments/assets/da57efb0-90d1-4cd4-8f99-65a311dd6555\"\n/>\n\n#### Rules with non-solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"350\" alt=\"Screenshot 2025-07-14 at 13 39 54\"\nsrc=\"https://github.com/user-attachments/assets/84b3b050-4ec7-40b1-857c-4e59bc18592b\"\n/>\n\n#### Rules with non-solvable conflicts, rules with solvable conflicts\nand conflict-free rules\n<img width=\"786\" height=\"574\" alt=\"Screenshot 2025-07-14 at 13 41 23\"\nsrc=\"https://github.com/user-attachments/assets/e4290d36-c075-4969-8c66-7ea2a88ff222\"\n/>","sha":"81de395d09c1cbaf156bdc039e7809798fcb6ff7"}},"sourceBranch":"main","suggestedTargetBranches":["8.19","8.18","9.0"],"targetPullRequestStates":[{"branch":"9.1","label":"v9.1.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/228268","number":228268,"state":"OPEN"},{"branch":"8.19","label":"v8.19.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/227803","number":227803,"mergeCommit":{"message":"[Security Solution] Improve bulk update modal copy (#227803)\n\n**Resolves: https://github.com/elastic/docs-content/issues/1063**\n\n## Summary\nThis PR updates the UI copy for the \"bulk update with conflicts\" modal.\n\n### Changes\n- Clarified the modal text\n- Made the warning for auto-resolved conflicts more visible (now it's an\n`EuiCallout`)\n- Added tests for modal text content\n\n## Screenshots\n#### Only rules with solvable conflicts\n<img width=\"818\" height=\"456\" alt=\"Screenshot 2025-07-14 at 13 35 55\"\nsrc=\"https://github.com/user-attachments/assets/a458d050-cbce-43fd-a953-0d37e9bc8fe2\"\n/>\n\n#### Only rules with non-solvable conflicts\n<img width=\"650\" height=\"267\" alt=\"Screenshot 2025-07-14 at 13 37 32\"\nsrc=\"https://github.com/user-attachments/assets/c0bb0547-5080-4bf3-8c4e-57dc7d0fb2e3\"\n/>\n\n#### Rules with solvable conflicts and rules with non-solvable conflicts\n<img width=\"786\" height=\"506\" alt=\"Screenshot 2025-07-14 at 13 38 41\"\nsrc=\"https://github.com/user-attachments/assets/e071ace1-30d1-41bf-ab9e-00834bf6933b\"\n/>\n\n#### Rules with solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"502\" alt=\"Screenshot 2025-07-14 at 13 44 07\"\nsrc=\"https://github.com/user-attachments/assets/da57efb0-90d1-4cd4-8f99-65a311dd6555\"\n/>\n\n#### Rules with non-solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"350\" alt=\"Screenshot 2025-07-14 at 13 39 54\"\nsrc=\"https://github.com/user-attachments/assets/84b3b050-4ec7-40b1-857c-4e59bc18592b\"\n/>\n\n#### Rules with non-solvable conflicts, rules with solvable conflicts\nand conflict-free rules\n<img width=\"786\" height=\"574\" alt=\"Screenshot 2025-07-14 at 13 41 23\"\nsrc=\"https://github.com/user-attachments/assets/e4290d36-c075-4969-8c66-7ea2a88ff222\"\n/>","sha":"81de395d09c1cbaf156bdc039e7809798fcb6ff7"}},{"branch":"8.18","label":"v8.18.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.0","label":"v9.0.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
nikitaindik
added a commit
that referenced
this pull request
Jul 16, 2025
…228290) # Backport This will backport the following commits from `main` to `8.19`: - [[Security Solution] Improve bulk update modal copy (#227803)](#227803) <!--- Backport version: 10.0.1 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Nikita Indik","email":"nikita.indik@elastic.co"},"sourceCommit":{"committedDate":"2025-07-16T16:13:48Z","message":"[Security Solution] Improve bulk update modal copy (#227803)\n\n**Resolves: https://github.com/elastic/docs-content/issues/1063**\n\n## Summary\nThis PR updates the UI copy for the \"bulk update with conflicts\" modal.\n\n### Changes\n- Clarified the modal text\n- Made the warning for auto-resolved conflicts more visible (now it's an\n`EuiCallout`)\n- Added tests for modal text content\n\n## Screenshots\n#### Only rules with solvable conflicts\n<img width=\"818\" height=\"456\" alt=\"Screenshot 2025-07-14 at 13 35 55\"\nsrc=\"https://github.com/user-attachments/assets/a458d050-cbce-43fd-a953-0d37e9bc8fe2\"\n/>\n\n#### Only rules with non-solvable conflicts\n<img width=\"650\" height=\"267\" alt=\"Screenshot 2025-07-14 at 13 37 32\"\nsrc=\"https://github.com/user-attachments/assets/c0bb0547-5080-4bf3-8c4e-57dc7d0fb2e3\"\n/>\n\n#### Rules with solvable conflicts and rules with non-solvable conflicts\n<img width=\"786\" height=\"506\" alt=\"Screenshot 2025-07-14 at 13 38 41\"\nsrc=\"https://github.com/user-attachments/assets/e071ace1-30d1-41bf-ab9e-00834bf6933b\"\n/>\n\n#### Rules with solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"502\" alt=\"Screenshot 2025-07-14 at 13 44 07\"\nsrc=\"https://github.com/user-attachments/assets/da57efb0-90d1-4cd4-8f99-65a311dd6555\"\n/>\n\n#### Rules with non-solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"350\" alt=\"Screenshot 2025-07-14 at 13 39 54\"\nsrc=\"https://github.com/user-attachments/assets/84b3b050-4ec7-40b1-857c-4e59bc18592b\"\n/>\n\n#### Rules with non-solvable conflicts, rules with solvable conflicts\nand conflict-free rules\n<img width=\"786\" height=\"574\" alt=\"Screenshot 2025-07-14 at 13 41 23\"\nsrc=\"https://github.com/user-attachments/assets/e4290d36-c075-4969-8c66-7ea2a88ff222\"\n/>","sha":"81de395d09c1cbaf156bdc039e7809798fcb6ff7","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Detections and Resp","Team: SecuritySolution","Team:Detection Rule Management","ui-copy","Feature:Prebuilt Detection Rules","backport:version","v9.1.0","v8.19.0","v9.2.0","v8.18.4","v9.0.4"],"title":"[Security Solution] Improve bulk update modal copy","number":227803,"url":"https://github.com/elastic/kibana/pull/227803","mergeCommit":{"message":"[Security Solution] Improve bulk update modal copy (#227803)\n\n**Resolves: https://github.com/elastic/docs-content/issues/1063**\n\n## Summary\nThis PR updates the UI copy for the \"bulk update with conflicts\" modal.\n\n### Changes\n- Clarified the modal text\n- Made the warning for auto-resolved conflicts more visible (now it's an\n`EuiCallout`)\n- Added tests for modal text content\n\n## Screenshots\n#### Only rules with solvable conflicts\n<img width=\"818\" height=\"456\" alt=\"Screenshot 2025-07-14 at 13 35 55\"\nsrc=\"https://github.com/user-attachments/assets/a458d050-cbce-43fd-a953-0d37e9bc8fe2\"\n/>\n\n#### Only rules with non-solvable conflicts\n<img width=\"650\" height=\"267\" alt=\"Screenshot 2025-07-14 at 13 37 32\"\nsrc=\"https://github.com/user-attachments/assets/c0bb0547-5080-4bf3-8c4e-57dc7d0fb2e3\"\n/>\n\n#### Rules with solvable conflicts and rules with non-solvable conflicts\n<img width=\"786\" height=\"506\" alt=\"Screenshot 2025-07-14 at 13 38 41\"\nsrc=\"https://github.com/user-attachments/assets/e071ace1-30d1-41bf-ab9e-00834bf6933b\"\n/>\n\n#### Rules with solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"502\" alt=\"Screenshot 2025-07-14 at 13 44 07\"\nsrc=\"https://github.com/user-attachments/assets/da57efb0-90d1-4cd4-8f99-65a311dd6555\"\n/>\n\n#### Rules with non-solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"350\" alt=\"Screenshot 2025-07-14 at 13 39 54\"\nsrc=\"https://github.com/user-attachments/assets/84b3b050-4ec7-40b1-857c-4e59bc18592b\"\n/>\n\n#### Rules with non-solvable conflicts, rules with solvable conflicts\nand conflict-free rules\n<img width=\"786\" height=\"574\" alt=\"Screenshot 2025-07-14 at 13 41 23\"\nsrc=\"https://github.com/user-attachments/assets/e4290d36-c075-4969-8c66-7ea2a88ff222\"\n/>","sha":"81de395d09c1cbaf156bdc039e7809798fcb6ff7"}},"sourceBranch":"main","suggestedTargetBranches":["8.19","8.18","9.0"],"targetPullRequestStates":[{"branch":"9.1","label":"v9.1.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/228268","number":228268,"state":"OPEN"},{"branch":"8.19","label":"v8.19.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/227803","number":227803,"mergeCommit":{"message":"[Security Solution] Improve bulk update modal copy (#227803)\n\n**Resolves: https://github.com/elastic/docs-content/issues/1063**\n\n## Summary\nThis PR updates the UI copy for the \"bulk update with conflicts\" modal.\n\n### Changes\n- Clarified the modal text\n- Made the warning for auto-resolved conflicts more visible (now it's an\n`EuiCallout`)\n- Added tests for modal text content\n\n## Screenshots\n#### Only rules with solvable conflicts\n<img width=\"818\" height=\"456\" alt=\"Screenshot 2025-07-14 at 13 35 55\"\nsrc=\"https://github.com/user-attachments/assets/a458d050-cbce-43fd-a953-0d37e9bc8fe2\"\n/>\n\n#### Only rules with non-solvable conflicts\n<img width=\"650\" height=\"267\" alt=\"Screenshot 2025-07-14 at 13 37 32\"\nsrc=\"https://github.com/user-attachments/assets/c0bb0547-5080-4bf3-8c4e-57dc7d0fb2e3\"\n/>\n\n#### Rules with solvable conflicts and rules with non-solvable conflicts\n<img width=\"786\" height=\"506\" alt=\"Screenshot 2025-07-14 at 13 38 41\"\nsrc=\"https://github.com/user-attachments/assets/e071ace1-30d1-41bf-ab9e-00834bf6933b\"\n/>\n\n#### Rules with solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"502\" alt=\"Screenshot 2025-07-14 at 13 44 07\"\nsrc=\"https://github.com/user-attachments/assets/da57efb0-90d1-4cd4-8f99-65a311dd6555\"\n/>\n\n#### Rules with non-solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"350\" alt=\"Screenshot 2025-07-14 at 13 39 54\"\nsrc=\"https://github.com/user-attachments/assets/84b3b050-4ec7-40b1-857c-4e59bc18592b\"\n/>\n\n#### Rules with non-solvable conflicts, rules with solvable conflicts\nand conflict-free rules\n<img width=\"786\" height=\"574\" alt=\"Screenshot 2025-07-14 at 13 41 23\"\nsrc=\"https://github.com/user-attachments/assets/e4290d36-c075-4969-8c66-7ea2a88ff222\"\n/>","sha":"81de395d09c1cbaf156bdc039e7809798fcb6ff7"}},{"branch":"8.18","label":"v8.18.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.0","label":"v9.0.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
nikitaindik
added a commit
that referenced
this pull request
Jul 16, 2025
…228291) # Backport This will backport the following commits from `main` to `8.18`: - [[Security Solution] Improve bulk update modal copy (#227803)](#227803) <!--- Backport version: 10.0.1 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Nikita Indik","email":"nikita.indik@elastic.co"},"sourceCommit":{"committedDate":"2025-07-16T16:13:48Z","message":"[Security Solution] Improve bulk update modal copy (#227803)\n\n**Resolves: https://github.com/elastic/docs-content/issues/1063**\n\n## Summary\nThis PR updates the UI copy for the \"bulk update with conflicts\" modal.\n\n### Changes\n- Clarified the modal text\n- Made the warning for auto-resolved conflicts more visible (now it's an\n`EuiCallout`)\n- Added tests for modal text content\n\n## Screenshots\n#### Only rules with solvable conflicts\n<img width=\"818\" height=\"456\" alt=\"Screenshot 2025-07-14 at 13 35 55\"\nsrc=\"https://github.com/user-attachments/assets/a458d050-cbce-43fd-a953-0d37e9bc8fe2\"\n/>\n\n#### Only rules with non-solvable conflicts\n<img width=\"650\" height=\"267\" alt=\"Screenshot 2025-07-14 at 13 37 32\"\nsrc=\"https://github.com/user-attachments/assets/c0bb0547-5080-4bf3-8c4e-57dc7d0fb2e3\"\n/>\n\n#### Rules with solvable conflicts and rules with non-solvable conflicts\n<img width=\"786\" height=\"506\" alt=\"Screenshot 2025-07-14 at 13 38 41\"\nsrc=\"https://github.com/user-attachments/assets/e071ace1-30d1-41bf-ab9e-00834bf6933b\"\n/>\n\n#### Rules with solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"502\" alt=\"Screenshot 2025-07-14 at 13 44 07\"\nsrc=\"https://github.com/user-attachments/assets/da57efb0-90d1-4cd4-8f99-65a311dd6555\"\n/>\n\n#### Rules with non-solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"350\" alt=\"Screenshot 2025-07-14 at 13 39 54\"\nsrc=\"https://github.com/user-attachments/assets/84b3b050-4ec7-40b1-857c-4e59bc18592b\"\n/>\n\n#### Rules with non-solvable conflicts, rules with solvable conflicts\nand conflict-free rules\n<img width=\"786\" height=\"574\" alt=\"Screenshot 2025-07-14 at 13 41 23\"\nsrc=\"https://github.com/user-attachments/assets/e4290d36-c075-4969-8c66-7ea2a88ff222\"\n/>","sha":"81de395d09c1cbaf156bdc039e7809798fcb6ff7","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Detections and Resp","Team: SecuritySolution","Team:Detection Rule Management","ui-copy","Feature:Prebuilt Detection Rules","backport:version","v9.1.0","v8.19.0","v9.2.0","v8.18.4","v9.0.4"],"title":"[Security Solution] Improve bulk update modal copy","number":227803,"url":"https://github.com/elastic/kibana/pull/227803","mergeCommit":{"message":"[Security Solution] Improve bulk update modal copy (#227803)\n\n**Resolves: https://github.com/elastic/docs-content/issues/1063**\n\n## Summary\nThis PR updates the UI copy for the \"bulk update with conflicts\" modal.\n\n### Changes\n- Clarified the modal text\n- Made the warning for auto-resolved conflicts more visible (now it's an\n`EuiCallout`)\n- Added tests for modal text content\n\n## Screenshots\n#### Only rules with solvable conflicts\n<img width=\"818\" height=\"456\" alt=\"Screenshot 2025-07-14 at 13 35 55\"\nsrc=\"https://github.com/user-attachments/assets/a458d050-cbce-43fd-a953-0d37e9bc8fe2\"\n/>\n\n#### Only rules with non-solvable conflicts\n<img width=\"650\" height=\"267\" alt=\"Screenshot 2025-07-14 at 13 37 32\"\nsrc=\"https://github.com/user-attachments/assets/c0bb0547-5080-4bf3-8c4e-57dc7d0fb2e3\"\n/>\n\n#### Rules with solvable conflicts and rules with non-solvable conflicts\n<img width=\"786\" height=\"506\" alt=\"Screenshot 2025-07-14 at 13 38 41\"\nsrc=\"https://github.com/user-attachments/assets/e071ace1-30d1-41bf-ab9e-00834bf6933b\"\n/>\n\n#### Rules with solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"502\" alt=\"Screenshot 2025-07-14 at 13 44 07\"\nsrc=\"https://github.com/user-attachments/assets/da57efb0-90d1-4cd4-8f99-65a311dd6555\"\n/>\n\n#### Rules with non-solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"350\" alt=\"Screenshot 2025-07-14 at 13 39 54\"\nsrc=\"https://github.com/user-attachments/assets/84b3b050-4ec7-40b1-857c-4e59bc18592b\"\n/>\n\n#### Rules with non-solvable conflicts, rules with solvable conflicts\nand conflict-free rules\n<img width=\"786\" height=\"574\" alt=\"Screenshot 2025-07-14 at 13 41 23\"\nsrc=\"https://github.com/user-attachments/assets/e4290d36-c075-4969-8c66-7ea2a88ff222\"\n/>","sha":"81de395d09c1cbaf156bdc039e7809798fcb6ff7"}},"sourceBranch":"main","suggestedTargetBranches":["8.19","8.18","9.0"],"targetPullRequestStates":[{"branch":"9.1","label":"v9.1.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/228268","number":228268,"state":"OPEN"},{"branch":"8.19","label":"v8.19.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/227803","number":227803,"mergeCommit":{"message":"[Security Solution] Improve bulk update modal copy (#227803)\n\n**Resolves: https://github.com/elastic/docs-content/issues/1063**\n\n## Summary\nThis PR updates the UI copy for the \"bulk update with conflicts\" modal.\n\n### Changes\n- Clarified the modal text\n- Made the warning for auto-resolved conflicts more visible (now it's an\n`EuiCallout`)\n- Added tests for modal text content\n\n## Screenshots\n#### Only rules with solvable conflicts\n<img width=\"818\" height=\"456\" alt=\"Screenshot 2025-07-14 at 13 35 55\"\nsrc=\"https://github.com/user-attachments/assets/a458d050-cbce-43fd-a953-0d37e9bc8fe2\"\n/>\n\n#### Only rules with non-solvable conflicts\n<img width=\"650\" height=\"267\" alt=\"Screenshot 2025-07-14 at 13 37 32\"\nsrc=\"https://github.com/user-attachments/assets/c0bb0547-5080-4bf3-8c4e-57dc7d0fb2e3\"\n/>\n\n#### Rules with solvable conflicts and rules with non-solvable conflicts\n<img width=\"786\" height=\"506\" alt=\"Screenshot 2025-07-14 at 13 38 41\"\nsrc=\"https://github.com/user-attachments/assets/e071ace1-30d1-41bf-ab9e-00834bf6933b\"\n/>\n\n#### Rules with solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"502\" alt=\"Screenshot 2025-07-14 at 13 44 07\"\nsrc=\"https://github.com/user-attachments/assets/da57efb0-90d1-4cd4-8f99-65a311dd6555\"\n/>\n\n#### Rules with non-solvable conflicts and conflict-free rules\n<img width=\"786\" height=\"350\" alt=\"Screenshot 2025-07-14 at 13 39 54\"\nsrc=\"https://github.com/user-attachments/assets/84b3b050-4ec7-40b1-857c-4e59bc18592b\"\n/>\n\n#### Rules with non-solvable conflicts, rules with solvable conflicts\nand conflict-free rules\n<img width=\"786\" height=\"574\" alt=\"Screenshot 2025-07-14 at 13 41 23\"\nsrc=\"https://github.com/user-attachments/assets/e4290d36-c075-4969-8c66-7ea2a88ff222\"\n/>","sha":"81de395d09c1cbaf156bdc039e7809798fcb6ff7"}},{"branch":"8.18","label":"v8.18.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.0","label":"v9.0.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
This was referenced Jul 17, 2025
Bluefinger
pushed a commit
to Bluefinger/kibana
that referenced
this pull request
Jul 22, 2025
**Resolves: elastic/docs-content#1063 ## Summary This PR updates the UI copy for the "bulk update with conflicts" modal. ### Changes - Clarified the modal text - Made the warning for auto-resolved conflicts more visible (now it's an `EuiCallout`) - Added tests for modal text content ## Screenshots #### Only rules with solvable conflicts <img width="818" height="456" alt="Screenshot 2025-07-14 at 13 35 55" src="https://github.com/user-attachments/assets/a458d050-cbce-43fd-a953-0d37e9bc8fe2" /> #### Only rules with non-solvable conflicts <img width="650" height="267" alt="Screenshot 2025-07-14 at 13 37 32" src="https://github.com/user-attachments/assets/c0bb0547-5080-4bf3-8c4e-57dc7d0fb2e3" /> #### Rules with solvable conflicts and rules with non-solvable conflicts <img width="786" height="506" alt="Screenshot 2025-07-14 at 13 38 41" src="https://github.com/user-attachments/assets/e071ace1-30d1-41bf-ab9e-00834bf6933b" /> #### Rules with solvable conflicts and conflict-free rules <img width="786" height="502" alt="Screenshot 2025-07-14 at 13 44 07" src="https://github.com/user-attachments/assets/da57efb0-90d1-4cd4-8f99-65a311dd6555" /> #### Rules with non-solvable conflicts and conflict-free rules <img width="786" height="350" alt="Screenshot 2025-07-14 at 13 39 54" src="https://github.com/user-attachments/assets/84b3b050-4ec7-40b1-857c-4e59bc18592b" /> #### Rules with non-solvable conflicts, rules with solvable conflicts and conflict-free rules <img width="786" height="574" alt="Screenshot 2025-07-14 at 13 41 23" src="https://github.com/user-attachments/assets/e4290d36-c075-4969-8c66-7ea2a88ff222" />
kertal
pushed a commit
to kertal/kibana
that referenced
this pull request
Jul 25, 2025
**Resolves: elastic/docs-content#1063 ## Summary This PR updates the UI copy for the "bulk update with conflicts" modal. ### Changes - Clarified the modal text - Made the warning for auto-resolved conflicts more visible (now it's an `EuiCallout`) - Added tests for modal text content ## Screenshots #### Only rules with solvable conflicts <img width="818" height="456" alt="Screenshot 2025-07-14 at 13 35 55" src="https://github.com/user-attachments/assets/a458d050-cbce-43fd-a953-0d37e9bc8fe2" /> #### Only rules with non-solvable conflicts <img width="650" height="267" alt="Screenshot 2025-07-14 at 13 37 32" src="https://github.com/user-attachments/assets/c0bb0547-5080-4bf3-8c4e-57dc7d0fb2e3" /> #### Rules with solvable conflicts and rules with non-solvable conflicts <img width="786" height="506" alt="Screenshot 2025-07-14 at 13 38 41" src="https://github.com/user-attachments/assets/e071ace1-30d1-41bf-ab9e-00834bf6933b" /> #### Rules with solvable conflicts and conflict-free rules <img width="786" height="502" alt="Screenshot 2025-07-14 at 13 44 07" src="https://github.com/user-attachments/assets/da57efb0-90d1-4cd4-8f99-65a311dd6555" /> #### Rules with non-solvable conflicts and conflict-free rules <img width="786" height="350" alt="Screenshot 2025-07-14 at 13 39 54" src="https://github.com/user-attachments/assets/84b3b050-4ec7-40b1-857c-4e59bc18592b" /> #### Rules with non-solvable conflicts, rules with solvable conflicts and conflict-free rules <img width="786" height="574" alt="Screenshot 2025-07-14 at 13 41 23" src="https://github.com/user-attachments/assets/e4290d36-c075-4969-8c66-7ea2a88ff222" />
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves: elastic/docs-content#1063
Summary
This PR updates the UI copy for the "bulk update with conflicts" modal.
Changes
EuiCallout)Screenshots
Only rules with solvable conflicts
Only rules with non-solvable conflicts
Rules with solvable conflicts and rules with non-solvable conflicts
Rules with solvable conflicts and conflict-free rules
Rules with non-solvable conflicts and conflict-free rules
Rules with non-solvable conflicts, rules with solvable conflicts and conflict-free rules