[PM-31364] discard edits dialog to policies page#20096
Open
[PM-31364] discard edits dialog to policies page#20096
Conversation
* Added `openDrawer` method to `PolicyDialogComponent` and `MultiStepPolicyEditDialogComponent` to support opening dialogs in a drawer format. * Updated `edit` method in `PoliciesComponent` to conditionally use the drawer based on the `PolicyDrawers` feature flag. * Introduced `PolicyDrawers` feature flag in `feature-flag.enum.ts` to control the new drawer functionality.
* Updated `policy-edit-dialog.component.html` and `multi-step-policy-edit-dialog.component.html` to conditionally apply full height class based on drawer state. * Modified `PolicyEditDialogComponent` to include a host binding for full height when in drawer mode.
…drawer mode by adding a host binding for the full height class based on the dialog reference state.
…m-25627-convery-policy-dialogs-to-drawers
…er cleanup on destroy. Added drawerRef to handle drawer state and close it when the component is destroyed.
…le, allowing for potential updates to the dialog reference during component lifecycle.
…onent - Introduced PoliciesDeactivateGuard to prevent navigation away from the PoliciesComponent if there are unsaved changes in the drawer. - Enhanced PoliciesComponent with a canDeactivate method to check for unsaved changes. - Updated policy-edit-dialog components to implement discard edits confirmation dialogs. - Added localization messages for discard edits confirmation prompts. - Modified organization-settings-routing to include the new guard for the policies route.
Contributor
Bitwarden Claude Code ReviewOverall Assessment: REQUEST CHANGES This PR adds a "discard edits" confirmation dialog when navigating away from an open policy drawer with unsaved changes. It introduces a The shared dialog service changes ( Code Review Details
|
![claude[bot]](https://avatars.githubusercontent.com/in/1236702?s=60&v=4){kind=small}
Comment on lines
211
to
+212
| }); | ||
| // Clear the predicate so the drawer closes immediately after a successful save. |
Contributor
There was a problem hiding this comment.
closePredicate clear on the confirm() cancellation path
Details and fix
The predicate is correctly cleared here before close("saved"), but the same pattern is missing a few lines above (around the original line 162) where confirm() returns false:
if ((await policyComponent.confirm?.()) == false) {
this.dialogRef.close(); // <-- triggers closePredicate in drawer mode
return;
}When OrganizationDataOwnershipComponent.confirm() returns false, the drawer's close() delegates to tryClose(), which invokes closePredicate. Since the form is dirty at that point, the user sees a second "Discard edits?" dialog after already cancelling the confirmation warning.
Add this.dialogRef.closePredicate = undefined; before this.dialogRef.close() in the confirm() cancellation path to match this pattern.
Contributor
|
New Issues (17)Checkmarx found the following issues in this Pull Request
|
- Changed cancel button text from "Keep editing" to "Back to editing" for clarity. - Updated dialog type to "danger" to better reflect the action's implications. - Added option to hide the dialog icon for a cleaner interface. - Localized new button text and updated existing localization for discard edits confirmation.
|
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
1 participant
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.
🎟️ Tracking
https://bitwarden.atlassian.net/browse/PM-31364
📔 Objective
Adds a discard edits modal when navigating away with changes in the opened policy drawer.
📸 Screenshots