Disable removal of org user role if user has others
#2427
Merged
Conversation
This file contains 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
|
Hey irfanhabib! Thanks for submitting this pull request! I'm here to inform the recipients of the pull request that you and the commit authors have already signed the CLA. |
Codecov Report
@@ Coverage Diff @@
## v2-master #2427 +/- ##
=============================================
- Coverage 70.81% 70.74% -0.07%
=============================================
Files 589 589
Lines 24760 24790 +30
Branches 5578 5593 +15
=============================================
+ Hits 17534 17538 +4
- Misses 7226 7252 +26 |
richard-cox
suggested changes
Jun 20, 2018
| map( (entity: CfUser) => this.cfUserService.hasRoles(entity)) | ||
| ); | ||
| } else { | ||
| chipConfig.hideClearButton$ = this.canRemovePermission(perm.cfGuid, perm.orgGuid, perm.spaceGuid).pipe( |
There was a problem hiding this comment.
The permissions check still need to be applied. ATM a non-manager can remove an org user role if it's the only role that user has
| // If there are other roles than Org User, disable clear button | ||
| chipConfig.hideClearButton$ = this.userEntity.pipe( | ||
| filter(p => !!p), | ||
| map( (entity: CfUser) => this.cfUserService.hasRoles(entity)) |
There was a problem hiding this comment.
This check needs to be specific per org. ATM a user cannot remove an org with a user role if there are other orgs with roles.
| const orgRoles = this.getOrgRolesFromUser(user); | ||
| const spaceRoles = this.getSpaceRolesFromUser(user); | ||
|
|
||
| let hasRoles = false; |
There was a problem hiding this comment.
It would be good to return early if the hasRoles flag becomes true
irfanhabib
added
comments-addressed
and removed
needs attention
richard-cox
approved these changes
Jun 20, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.