Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit38b5738

Browse files
authored
feat(site): edit organization member roles (#13977)
1 parent15fda23 commit38b5738

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 aboutcustomizing 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 aboutcustomizing 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 aboutcustomizing 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_rolesas"global_roles"
8+
users.username,users.avatar_url,users.name,users.email,users.rbac_rolesas"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
Usernamestring`table:"username,default_sort" json:"username"`
7575
Namestring`table:"name" json:"name"`
7676
AvatarURLstring`json:"avatar_url"`
77+
Emailstring`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 aboutcustomizing 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 aboutcustomizing 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
returnresponse.data;
550550
};
551551

552+
getOrganizationRoles=async(organizationId:string)=>{
553+
constresponse=awaitthis.axios.get<TypesGen.AssignableRoles[]>(
554+
`/api/v2/organizations/${organizationId}/members/roles`,
555+
);
556+
557+
returnresponse.data;
558+
};
559+
560+
updateOrganizationMemberRoles=async(
561+
organizationId:string,
562+
userId:string,
563+
roles:TypesGen.SlimRole["name"][],
564+
):Promise<TypesGen.User>=>{
565+
constresponse=awaitthis.axios.put<TypesGen.User>(
566+
`/api/v2/organizations/${organizationId}/members/${userId}/roles`,
567+
{ roles},
568+
);
569+
570+
returnresponse.data;
571+
};
572+
552573
addOrganizationMember=async(organizationId:string,userId:string)=>{
553574
constresponse=awaitthis.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
exportconstorganizationMembers=(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+
exportconstupdateOrganizationMemberRoles=(
84+
queryClient:QueryClient,
85+
organizationId:string,
86+
)=>{
87+
return{
88+
mutationFn:({ userId, roles}:{userId:string;roles:string[]})=>{
89+
returnAPI.updateOrganizationMemberRoles(organizationId,userId,roles);
90+
},
91+
92+
onSuccess:async()=>{
93+
awaitqueryClient.invalidateQueries([
94+
"organization",
95+
organizationId,
96+
"members",
97+
]);
98+
},
99+
};
100+
};
101+
83102
exportconstorganizationsKey=["organizations"]asconst;
84103

85104
exportconstorganizations=()=>{

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,10 @@ export const roles = () => {
66
queryFn:API.getRoles,
77
};
88
};
9+
10+
exportconstorganizationRoles=(organizationId:string)=>{
11+
return{
12+
queryKey:["organization",organizationId,"roles"],
13+
queryFn:()=>API.getOrganizationRoles(organizationId),
14+
};
15+
};

‎site/src/api/typesGenerated.ts

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.
Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
import{fireEvent,screen,within}from"@testing-library/react";
2+
importuserEventfrom"@testing-library/user-event";
3+
import{HttpResponse,http}from"msw";
4+
importtype{SlimRole}from"api/typesGenerated";
5+
import{MockUser,MockOrganizationAuditorRole}from"testHelpers/entities";
6+
import{
7+
renderWithTemplateSettingsLayout,
8+
waitForLoaderToBeRemoved,
9+
}from"testHelpers/renderHelpers";
10+
import{server}from"testHelpers/server";
11+
importOrganizationMembersPagefrom"./OrganizationMembersPage";
12+
13+
jest.spyOn(console,"error").mockImplementation(()=>{});
14+
15+
beforeAll(()=>{
16+
server.use(
17+
http.get("/api/v2/experiments",()=>{
18+
returnHttpResponse.json(["multi-organization"]);
19+
}),
20+
);
21+
});
22+
23+
constrenderPage=async()=>{
24+
renderWithTemplateSettingsLayout(<OrganizationMembersPage/>,{
25+
route:`/organizations/my-organization/members`,
26+
path:`/organizations/:organization/members`,
27+
});
28+
awaitwaitForLoaderToBeRemoved();
29+
};
30+
31+
constremoveMember=async()=>{
32+
constuser=userEvent.setup();
33+
// Click on the "More options" button to display the "Remove" option
34+
constmoreButtons=awaitscreen.findAllByLabelText("More options");
35+
// get MockUser2
36+
constselectedMoreButton=moreButtons[0];
37+
38+
awaituser.click(selectedMoreButton);
39+
40+
constremoveButton=screen.getByText(/Remove/);
41+
awaituser.click(removeButton);
42+
};
43+
44+
constupdateUserRole=async(role:SlimRole)=>{
45+
// Get the first user in the table
46+
constusers=awaitscreen.findAllByText(/.*@coder.com/);
47+
constuserRow=users[0].closest("tr");
48+
if(!userRow){
49+
thrownewError("Error on get the first user row");
50+
}
51+
52+
// Click on the "edit icon" to display the role options
53+
consteditButton=within(userRow).getByTitle("Edit user roles");
54+
fireEvent.click(editButton);
55+
56+
// Click on the role option
57+
constfieldset=awaitscreen.findByTitle("Available roles");
58+
constroleOption=within(fieldset).getByText(role.display_name);
59+
fireEvent.click(roleOption);
60+
61+
return{
62+
userRow,
63+
};
64+
};
65+
66+
describe("OrganizationMembersPage",()=>{
67+
describe("remove member",()=>{
68+
describe("when it is success",()=>{
69+
it("shows a success message",async()=>{
70+
awaitrenderPage();
71+
awaitremoveMember();
72+
awaitscreen.findByText("Member removed.");
73+
});
74+
});
75+
});
76+
77+
describe("Update user role",()=>{
78+
describe("when it is success",()=>{
79+
it("updates the roles",async()=>{
80+
server.use(
81+
http.put(
82+
`/api/v2/organizations/:organizationId/members/${MockUser.id}/roles`,
83+
async()=>{
84+
returnHttpResponse.json({
85+
...MockUser,
86+
roles:[...MockUser.roles,MockOrganizationAuditorRole],
87+
});
88+
},
89+
),
90+
);
91+
92+
awaitrenderPage();
93+
awaitupdateUserRole(MockOrganizationAuditorRole);
94+
awaitscreen.findByText("Roles updated successfully.");
95+
});
96+
});
97+
98+
describe("when it fails",()=>{
99+
it("shows an error message",async()=>{
100+
server.use(
101+
http.put(
102+
`/api/v2/organizations/:organizationId/members/${MockUser.id}/roles`,
103+
()=>{
104+
returnHttpResponse.json(
105+
{message:"Error on updating the user roles."},
106+
{status:400},
107+
);
108+
},
109+
),
110+
);
111+
112+
awaitrenderPage();
113+
awaitupdateUserRole(MockOrganizationAuditorRole);
114+
awaitscreen.findByText("Error on updating the user roles.");
115+
});
116+
});
117+
});
118+
});

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp