fix: Role assign ui fixes #3521
Merged
Conversation
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
Emyrk
commented
Aug 15, 2022
Comment on lines
+126
to
+129
| ResourceRoleAssignment: {ActionCreate, ActionRead, ActionUpdate, ActionDelete}, | ||
| ResourceUser: {ActionCreate, ActionRead, ActionUpdate, ActionDelete}, | ||
| // Full perms to manage org members | ||
| ResourceOrganizationMember: {ActionCreate, ActionRead, ActionUpdate, ActionDelete}, |
There was a problem hiding this comment.
Needs org_member role to create new users
RoleAssignment to assign roles. They can only assign org_member and member roles right now.
Kira-Pilot
reviewed
Aug 15, 2022
| export const getSiteRoles = async (): Promise<Array<TypesGen.Role>> => { | ||
| const response = await axios.get<Array<TypesGen.Role>>(`/api/v2/users/roles`) | ||
| export const getSiteRoles = async (): Promise<Array<TypesGen.AssignableRoles>> => { | ||
| const response = await axios.get<Array<TypesGen.AssignableRoles>>(`/api/v2/users/roles`) |
There was a problem hiding this comment.
Eventually, it would be nice differentiate the two roles endpoints by label a bit more. In the network tab, all I see is "roles" and it's hard to filter or figure out what I'm looking at.
|
Nice job! Do you mind adding two tests?
LMK if you need help! |
Will get on this tomorrow 👍 |
johnstcn
approved these changes
Aug 16, 2022
coderd/rbac/builtin_test.go
Outdated
| @@ -251,8 +251,8 @@ func TestRolePermissions(t *testing.T) { | |||
| Actions: []rbac.Action{rbac.ActionCreate, rbac.ActionUpdate, rbac.ActionDelete}, | |||
| Resource: rbac.ResourceRoleAssignment, | |||
| AuthorizeMap: map[bool][]authSubject{ | |||
| true: {admin}, | |||
| false: {orgAdmin, orgMemberMe, otherOrgAdmin, otherOrgMember, memberMe, templateAdmin, userAdmin}, | |||
| true: {admin, userAdmin}, | |||
There was a problem hiding this comment.
I thought we got rid of admin?
There was a problem hiding this comment.
admin is just the name of the owner user. Forgot to rename the var 👍
Kira-Pilot
reviewed
Aug 16, 2022
| export const MockSiteRoles = [MockUserAdminRole, MockAuditorRole] | ||
| export const MockAssignableSiteRoles = [MockAssignableOwnerRole, MockAssignableUserAdminRole, MockAssignableAuditorRole] | ||
|
|
||
| export function assignableRole(role: TypesGen.Role, assignable: boolean): TypesGen.AssignableRoles { |
Kira-Pilot
reviewed
Aug 16, 2022
| MockOwnerRole, MockTemplateAdminRole, | ||
| MockUserAdminRole, | ||
| render | ||
| } from "../../testHelpers/renderHelpers" |
There was a problem hiding this comment.
Suggested change
| } from "../../testHelpers/renderHelpers" | |
| } from "testHelpers/renderHelpers" |
We're trying to favor absolute paths when we're not in the same directory as whatever we're importing.
Kira-Pilot
reviewed
Aug 16, 2022
Kira-Pilot
reviewed
Aug 16, 2022
Kira-Pilot
approved these changes
Aug 16, 2022
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.
What this does
Roles you cannot assign are disabled
Fixes
User admin also needs the ability to create organization_members to create a new user. Creating a new user assigns them to the single org atm.