mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 09:19:04 -04:00
[8.18] [Security Solution] Hide conflict badges when rule customization is not enabled (#214365) (#214407)
# Backport This will backport the following commits from `main` to `8.18`: - [[Security Solution] Hide conflict badges when rule customization is not enabled (#214365)](https://github.com/elastic/kibana/pull/214365) <!--- 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-03-13T14:52:48Z","message":"[Security Solution] Hide conflict badges when rule customization is not enabled (#214365)\n\n**Resolves: https://github.com/elastic/kibana/issues/214301**\n\n## Summary\n\nThis PR removes conflict badges from the Rule Updates table for users\nwith license that is insufficient for prebuilt rule customization.\n\n**Before (on Basic license)**\n<img width=\"1014\" alt=\"Schermafbeelding 2025-03-13 om 13 44 07\"\nsrc=\"https://github.com/user-attachments/assets/fd830253-80d0-4250-861c-88b0a11d6786\"\n/>\n\n\n**After (on Basic license)**\n<img width=\"1014\" alt=\"Schermafbeelding 2025-03-13 om 13 39 01\"\nsrc=\"https://github.com/user-attachments/assets/f8b00964-72bf-4d0a-9f03-9e47231c5227\"\n/>\n\nSince users on Basic license can't customize rules, it doesn't make\nsense to show these badges - they are not actionable anyways.\n\nUsers will still see a callout mentioning that their modifications will\nbe erased if they open a flyout for a customized rule.\n\n<img width=\"953\" alt=\"Schermafbeelding 2025-03-13 om 13 41 21\"\nsrc=\"https://github.com/user-attachments/assets/b2a2514e-2b19-4653-9076-d742130b30b6\"\n/>","sha":"9f2e07f2dedce88e51b80afd0cb215b6467c8f37","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","Team:Detections and Resp","Team: SecuritySolution","Team:Detection Rule Management","Feature:Prebuilt Detection Rules","backport:version","v8.18.0","v9.1.0","v8.19.0"],"title":"[Security Solution] Hide conflict badges when rule customization is not enabled","number":214365,"url":"https://github.com/elastic/kibana/pull/214365","mergeCommit":{"message":"[Security Solution] Hide conflict badges when rule customization is not enabled (#214365)\n\n**Resolves: https://github.com/elastic/kibana/issues/214301**\n\n## Summary\n\nThis PR removes conflict badges from the Rule Updates table for users\nwith license that is insufficient for prebuilt rule customization.\n\n**Before (on Basic license)**\n<img width=\"1014\" alt=\"Schermafbeelding 2025-03-13 om 13 44 07\"\nsrc=\"https://github.com/user-attachments/assets/fd830253-80d0-4250-861c-88b0a11d6786\"\n/>\n\n\n**After (on Basic license)**\n<img width=\"1014\" alt=\"Schermafbeelding 2025-03-13 om 13 39 01\"\nsrc=\"https://github.com/user-attachments/assets/f8b00964-72bf-4d0a-9f03-9e47231c5227\"\n/>\n\nSince users on Basic license can't customize rules, it doesn't make\nsense to show these badges - they are not actionable anyways.\n\nUsers will still see a callout mentioning that their modifications will\nbe erased if they open a flyout for a customized rule.\n\n<img width=\"953\" alt=\"Schermafbeelding 2025-03-13 om 13 41 21\"\nsrc=\"https://github.com/user-attachments/assets/b2a2514e-2b19-4653-9076-d742130b30b6\"\n/>","sha":"9f2e07f2dedce88e51b80afd0cb215b6467c8f37"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","8.18","8.x"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/214365","number":214365,"mergeCommit":{"message":"[Security Solution] Hide conflict badges when rule customization is not enabled (#214365)\n\n**Resolves: https://github.com/elastic/kibana/issues/214301**\n\n## Summary\n\nThis PR removes conflict badges from the Rule Updates table for users\nwith license that is insufficient for prebuilt rule customization.\n\n**Before (on Basic license)**\n<img width=\"1014\" alt=\"Schermafbeelding 2025-03-13 om 13 44 07\"\nsrc=\"https://github.com/user-attachments/assets/fd830253-80d0-4250-861c-88b0a11d6786\"\n/>\n\n\n**After (on Basic license)**\n<img width=\"1014\" alt=\"Schermafbeelding 2025-03-13 om 13 39 01\"\nsrc=\"https://github.com/user-attachments/assets/f8b00964-72bf-4d0a-9f03-9e47231c5227\"\n/>\n\nSince users on Basic license can't customize rules, it doesn't make\nsense to show these badges - they are not actionable anyways.\n\nUsers will still see a callout mentioning that their modifications will\nbe erased if they open a flyout for a customized rule.\n\n<img width=\"953\" alt=\"Schermafbeelding 2025-03-13 om 13 41 21\"\nsrc=\"https://github.com/user-attachments/assets/b2a2514e-2b19-4653-9076-d742130b30b6\"\n/>","sha":"9f2e07f2dedce88e51b80afd0cb215b6467c8f37"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Nikita Indik <nikita.indik@elastic.co>
This commit is contained in:
parent
e1b9411764
commit
ae70f3ee8b
1 changed files with 1 additions and 1 deletions
|
@ -246,7 +246,7 @@ export const useUpgradePrebuiltRulesTableColumns = (): TableColumn[] => {
|
|||
() => [
|
||||
RULE_NAME_COLUMN,
|
||||
MODIFIED_COLUMN,
|
||||
CONFLICT_COLUMN,
|
||||
...(isRulesCustomizationEnabled ? [CONFLICT_COLUMN] : []),
|
||||
...(showRelatedIntegrations ? [INTEGRATIONS_COLUMN] : []),
|
||||
TAGS_COLUMN,
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue