[9.1] [Security Solution] Improve bulk update modal copy (#227803)#228268
Merged
kibanamachine merged 1 commit intoelastic:9.1from Jul 16, 2025
Merged
[9.1] [Security Solution] Improve bulk update modal copy (#227803)#228268kibanamachine merged 1 commit intoelastic:9.1from
kibanamachine merged 1 commit intoelastic:9.1from
Conversation
**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)
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
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
2 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.
Backport
This will backport the following commits from
mainto9.1:Questions ?
Please refer to the Backport tool documentation