Skip to content

Commit 38b5738

Browse files
aslilacaslilac
authored
feat(site): edit organization member roles (#13977)
1 parent 15fda23 commit 38b5738

30 files changed

+504
-141
lines changed

‎coderd/apidoc/docs.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/organizationmembers.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
-- - Use both to get a specific org member row
66
SELECT
77
sqlc.embed(organization_members),
8-
users.username, users.avatar_url, users.name, users.rbac_roles as "global_roles"
8+
users.username, users.avatar_url, users.name, users.email, users.rbac_roles as "global_roles"
99
FROM
1010
organization_members
1111
INNER JOIN

‎coderd/members.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ func convertOrganizationMembersWithUserData(ctx context.Context, db database.Sto
319319
Username: rows[i].Username,
320320
AvatarURL: rows[i].AvatarURL,
321321
Name: rows[i].Name,
322+
Email: rows[i].Email,
322323
GlobalRoles: db2sdk.SlimRolesFromNames(rows[i].GlobalRoles),
323324
OrganizationMember: convertedMembers[i],
324325
})

‎codersdk/organizations.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ type OrganizationMemberWithUserData struct {
7474
Username string `table:"username,default_sort" json:"username"`
7575
Name string `table:"name" json:"name"`
7676
AvatarURL string `json:"avatar_url"`
77+
Email string `json:"email"`
7778
GlobalRoles []SlimRole `json:"global_roles"`
7879
OrganizationMember `table:"m,recursive_inline"`
7980
}

‎docs/api/members.md

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/api/schemas.md

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎site/src/api/api.ts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,27 @@ class ApiMethods {
549549
return response.data;
550550
};
551551

552+
getOrganizationRoles = async (organizationId: string) => {
553+
const response = await this.axios.get<TypesGen.AssignableRoles[]>(
554+
`/api/v2/organizations/${organizationId}/members/roles`,
555+
);
556+
557+
return response.data;
558+
};
559+
560+
updateOrganizationMemberRoles = async (
561+
organizationId: string,
562+
userId: string,
563+
roles: TypesGen.SlimRole["name"][],
564+
): Promise<TypesGen.User> => {
565+
const response = await this.axios.put<TypesGen.User>(
566+
`/api/v2/organizations/${organizationId}/members/${userId}/roles`,
567+
{ roles },
568+
);
569+
570+
return response.data;
571+
};
572+
552573
addOrganizationMember = async (organizationId: string, userId: string) => {
553574
const response = await this.axios.post<TypesGen.OrganizationMember>(
554575
`/api/v2/organizations/${organizationId}/members/${userId}`,

‎site/src/api/queries/organizations.ts

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export const deleteOrganization = (queryClient: QueryClient) => {
4949
export const organizationMembers = (id: string) => {
5050
return {
5151
queryFn: () => API.getOrganizationMembers(id),
52-
key: ["organization", id, "members"],
52+
queryKey: ["organization", id, "members"],
5353
};
5454
};
5555

@@ -80,6 +80,25 @@ export const removeOrganizationMember = (
8080
};
8181
};
8282

83+
export const updateOrganizationMemberRoles = (
84+
queryClient: QueryClient,
85+
organizationId: string,
86+
) => {
87+
return {
88+
mutationFn: ({ userId, roles }: { userId: string; roles: string[] }) => {
89+
return API.updateOrganizationMemberRoles(organizationId, userId, roles);
90+
},
91+
92+
onSuccess: async () => {
93+
await queryClient.invalidateQueries([
94+
"organization",
95+
organizationId,
96+
"members",
97+
]);
98+
},
99+
};
100+
};
101+
83102
export const organizationsKey = ["organizations"] as const;
84103

85104
export const organizations = () => {

0 commit comments

Comments
 (0)