[8.17] [refactoring] Distinguish User Controls from Risk Engine in DashboardEnablementPanel (#212441)#212561
Merged
CAWilson94 merged 4 commits intoelastic:8.17from Feb 27, 2025
Merged
Conversation
…EnablementPanel (elastic#212441) 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. - 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. 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. https://github.com/user-attachments/assets/0f2a3f59-e2a0-4c8b-a350-70a9573a8566 (cherry picked from commit 874cee2)
…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
CAWilson94
commented
Feb 26, 2025
| canToggle: entityStore.status === 'enabled', | ||
| checked: entityStore.status !== 'enabled', | ||
| canToggle: entityStore.status !== 'enabled', | ||
| checked: true, |
Contributor
Author
There was a problem hiding this comment.
On initial modal load, should expect that the toggles are always checked.
CAWilson94
commented
Feb 26, 2025
...ity_solution/public/entity_analytics/components/entity_store/components/dashboard_panels.tsx
Outdated
Show resolved
Hide resolved
Contributor
Author
|
Desk tested again after merge fixes - works 👍 Modal warning should show under conditions -
When modal warning shows, the "Enable" action button will be greyed out and disabled. |
CAWilson94
commented
Feb 26, 2025
| enableStore={enableEntityStore} | ||
| riskScore={{ disabled: isRiskScoreAvailable, checked: !isRiskScoreAvailable }} | ||
| riskScore={{ | ||
| canToggle: !isRiskScoreAvailable, |
Contributor
Author
There was a problem hiding this comment.
RiskEngineStatusEnum came after this version, merge mix up corrected with isRiskScoreAvailable added back in.
Contributor
💛 Build succeeded, but was flaky
Failed CI StepsTest Failures
Metrics [docs]
History
|
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
3 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
mainto8.17:Questions ?
Please refer to the Backport tool documentation