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

Commit17ad284

Browse files
authored
fix: fix deployment settings navigation issues (#16780)
1 parent24f3445 commit17ad284

18 files changed

+350
-221
lines changed

‎site/e2e/tests/roles.spec.ts

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
import{typePage,expect,test}from"@playwright/test";
2+
import{
3+
createOrganization,
4+
createOrganizationMember,
5+
setupApiCalls,
6+
}from"../api";
7+
import{license,users}from"../constants";
8+
import{login,requiresLicense}from"../helpers";
9+
import{beforeCoderTest}from"../hooks";
10+
11+
test.beforeEach(async({ page})=>{
12+
beforeCoderTest(page);
13+
});
14+
15+
typeAdminSetting=(typeofadminSettings)[number];
16+
17+
constadminSettings=[
18+
"Deployment",
19+
"Organizations",
20+
"Healthcheck",
21+
"Audit Logs",
22+
]asconst;
23+
24+
asyncfunctionhasAccessToAdminSettings(page:Page,settings:AdminSetting[]){
25+
// Organizations and Audit Logs both require a license to be visible
26+
constvisibleSettings=license
27+
?settings
28+
:settings.filter((it)=>it!=="Organizations"&&it!=="Audit Logs");
29+
constadminSettingsButton=page.getByRole("button",{
30+
name:"Admin settings",
31+
});
32+
if(visibleSettings.length<1){
33+
awaitexpect(adminSettingsButton).not.toBeVisible();
34+
return;
35+
}
36+
37+
awaitadminSettingsButton.click();
38+
39+
for(constnameofvisibleSettings){
40+
awaitexpect(page.getByText(name,{exact:true})).toBeVisible();
41+
}
42+
43+
consthiddenSettings=adminSettings.filter(
44+
(it)=>!visibleSettings.includes(it),
45+
);
46+
for(constnameofhiddenSettings){
47+
awaitexpect(page.getByText(name,{exact:true})).not.toBeVisible();
48+
}
49+
}
50+
51+
test.describe("roles admin settings access",()=>{
52+
test("member cannot see admin settings",async({ page})=>{
53+
awaitlogin(page,users.member);
54+
awaitpage.goto("/",{waitUntil:"domcontentloaded"});
55+
56+
// None, "Admin settings" button should not be visible
57+
awaithasAccessToAdminSettings(page,[]);
58+
});
59+
60+
test("template admin can see admin settings",async({ page})=>{
61+
awaitlogin(page,users.templateAdmin);
62+
awaitpage.goto("/",{waitUntil:"domcontentloaded"});
63+
64+
awaithasAccessToAdminSettings(page,["Deployment","Organizations"]);
65+
});
66+
67+
test("user admin can see admin settings",async({ page})=>{
68+
awaitlogin(page,users.userAdmin);
69+
awaitpage.goto("/",{waitUntil:"domcontentloaded"});
70+
71+
awaithasAccessToAdminSettings(page,["Deployment","Organizations"]);
72+
});
73+
74+
test("auditor can see admin settings",async({ page})=>{
75+
awaitlogin(page,users.auditor);
76+
awaitpage.goto("/",{waitUntil:"domcontentloaded"});
77+
78+
awaithasAccessToAdminSettings(page,[
79+
"Deployment",
80+
"Organizations",
81+
"Audit Logs",
82+
]);
83+
});
84+
85+
test("admin can see admin settings",async({ page})=>{
86+
awaitlogin(page,users.admin);
87+
awaitpage.goto("/",{waitUntil:"domcontentloaded"});
88+
89+
awaithasAccessToAdminSettings(page,[
90+
"Deployment",
91+
"Organizations",
92+
"Healthcheck",
93+
"Audit Logs",
94+
]);
95+
});
96+
});
97+
98+
test.describe("org-scoped roles admin settings access",()=>{
99+
requiresLicense();
100+
101+
test.beforeEach(async({ page})=>{
102+
awaitlogin(page);
103+
awaitsetupApiCalls(page);
104+
});
105+
106+
test("org template admin can see admin settings",async({ page})=>{
107+
constorg=awaitcreateOrganization();
108+
constorgTemplateAdmin=awaitcreateOrganizationMember({
109+
[org.id]:["organization-template-admin"],
110+
});
111+
112+
awaitlogin(page,orgTemplateAdmin);
113+
awaitpage.goto("/",{waitUntil:"domcontentloaded"});
114+
115+
awaithasAccessToAdminSettings(page,["Organizations"]);
116+
});
117+
118+
test("org user admin can see admin settings",async({ page})=>{
119+
constorg=awaitcreateOrganization();
120+
constorgUserAdmin=awaitcreateOrganizationMember({
121+
[org.id]:["organization-user-admin"],
122+
});
123+
124+
awaitlogin(page,orgUserAdmin);
125+
awaitpage.goto("/",{waitUntil:"domcontentloaded"});
126+
127+
awaithasAccessToAdminSettings(page,["Deployment","Organizations"]);
128+
});
129+
130+
test("org auditor can see admin settings",async({ page})=>{
131+
constorg=awaitcreateOrganization();
132+
constorgAuditor=awaitcreateOrganizationMember({
133+
[org.id]:["organization-auditor"],
134+
});
135+
136+
awaitlogin(page,orgAuditor);
137+
awaitpage.goto("/",{waitUntil:"domcontentloaded"});
138+
139+
awaithasAccessToAdminSettings(page,["Organizations","Audit Logs"]);
140+
});
141+
142+
test("org admin can see admin settings",async({ page})=>{
143+
constorg=awaitcreateOrganization();
144+
constorgAdmin=awaitcreateOrganizationMember({
145+
[org.id]:["organization-admin"],
146+
});
147+
148+
awaitlogin(page,orgAdmin);
149+
awaitpage.goto("/",{waitUntil:"domcontentloaded"});
150+
151+
awaithasAccessToAdminSettings(page,[
152+
"Deployment",
153+
"Organizations",
154+
"Audit Logs",
155+
]);
156+
});
157+
});

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ import type {
66
UpdateOrganizationRequest,
77
}from"api/typesGenerated";
88
import{
9-
typeAnyOrganizationPermissions,
109
typeOrganizationPermissionName,
1110
typeOrganizationPermissions,
12-
anyOrganizationPermissionChecks,
1311
organizationPermissionChecks,
1412
}from"modules/management/organizationPermissions";
1513
importtype{QueryClient}from"react-query";
@@ -266,21 +264,6 @@ export const organizationsPermissions = (
266264
};
267265
};
268266

269-
exportconstanyOrganizationPermissionsKey=[
270-
"authorization",
271-
"anyOrganization",
272-
];
273-
274-
exportconstanyOrganizationPermissions=()=>{
275-
return{
276-
queryKey:anyOrganizationPermissionsKey,
277-
queryFn:()=>
278-
API.checkAuthorization({
279-
checks:anyOrganizationPermissionChecks,
280-
})asPromise<AnyOrganizationPermissions>,
281-
};
282-
};
283-
284267
exportconstgetOrganizationIdpSyncClaimFieldValuesKey=(
285268
organization:string,
286269
field:string,

‎site/src/contexts/auth/AuthProvider.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
useContext,
1919
}from"react";
2020
import{useMutation,useQuery,useQueryClient}from"react-query";
21-
import{typePermissions,permissionsToCheck}from"./permissions";
21+
import{typePermissions,permissionChecks}from"./permissions";
2222

2323
exporttypeAuthContextValue={
2424
isLoading:boolean;
@@ -50,13 +50,13 @@ export const AuthProvider: FC<PropsWithChildren> = ({ children }) => {
5050
consthasFirstUserQuery=useQuery(hasFirstUser(userMetadataState));
5151

5252
constpermissionsQuery=useQuery({
53-
...checkAuthorization({checks:permissionsToCheck}),
53+
...checkAuthorization({checks:permissionChecks}),
5454
enabled:userQuery.data!==undefined,
5555
});
5656

5757
constqueryClient=useQueryClient();
5858
constloginMutation=useMutation(
59-
login({checks:permissionsToCheck},queryClient),
59+
login({checks:permissionChecks},queryClient),
6060
);
6161

6262
constlogoutMutation=useMutation(logout(queryClient));

0 commit comments

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