Skip to content

[8.18] [refactoring] Distinguish User Controls from Risk Engine in DashboardEnablementPanel (#212441)#212519

Merged
kibanamachine merged 1 commit intoelastic:8.18from
kibanamachine:backport/8.18/pr-212441
Feb 27, 2025
Merged

[8.18] [refactoring] Distinguish User Controls from Risk Engine in DashboardEnablementPanel (#212441)#212519
kibanamachine merged 1 commit intoelastic:8.18from
kibanamachine:backport/8.18/pr-212441

Conversation

@kibanamachine
Copy link
Contributor

Backport

This will backport the following commits from main to 8.18:

Questions ?

Please refer to the Backport tool documentation

…EnablementPanel (elastic#212441)

## Summary
This PR refactors naming and logic in EntityStoreEnablementModal to
improve readability and better distinguish between:
1. Feature enablement state – Whether Risk Score or Entity Store is
actually enabled.
2. User-selected state – Whether the user has checked the corresponding
toggle.

#### Changes

- Renamed disabled → canToggle to clearly represent UI interaction.
- Renamed enablements → userSelectedEnablements to reflect user-selected
toggle states, not feature enablement.
- Refactored shouldAllowEnablement logic for clarity and correctness:
- If riskScore is enabled, return whether the user has enabled
entityStore.
- If entityStore is enabled, return whether the user has enabled
riskScore.
     - Otherwise, return true if either toggle is selected.
- Updated corresponding tests to reflect naming and logic changes.

## Testing/Validation
Manually tested the toggling behaviour still works as before and modal
still shows warning, and disables the "enable" button when there are no
available options selected.

### Validation Video

https://github.com/user-attachments/assets/0f2a3f59-e2a0-4c8b-a350-70a9573a8566
(cherry picked from commit 874cee2)
@kibanamachine kibanamachine added the backport This PR is a backport of another PR label Feb 26, 2025
@kibanamachine kibanamachine enabled auto-merge (squash) February 26, 2025 13:45
@elasticmachine
Copy link
Contributor

elasticmachine commented Feb 26, 2025

💚 Build Succeeded

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
securitySolution 9.1MB 9.1MB +17.0B

History

cc @CAWilson94

@CAWilson94
Copy link
Contributor

Desk tested again: working fine 👍

Modal warning should show under conditions -

(RiskScore & EntityEngine notInstalled) && both switched are not in checked state.
(RiskScore is installed and in checked state) && EntityEngine is not installed and NOT in checked state.
(EntityEngine is installed and in checked state) && RiskEngine is not installed and NOT in checked state.
When modal warning shows, the "Enable" action button will be greyed out and disabled.

Copy link
Member

@machadoum machadoum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@kibanamachine kibanamachine merged commit 74665d2 into elastic:8.18 Feb 27, 2025
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants