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

Commita5a7326

Browse files
bpmctjaaydenh
andauthored
chore: add cherry picks for v2.18.3 (#16187)
fixes#16182<img width="1177" alt="Screenshot 2025-01-17 at 23 20 04"src="https://github.com/user-attachments/assets/e0eec4bb-6b50-45e9-a27b-d3a89552562a"/><img width="1163" alt="Screenshot 2025-01-17 at 23 20 12"src="https://github.com/user-attachments/assets/d8a7129c-0240-4ef5-9f21-84cda5631366"/><img width="1161" alt="Screenshot 2025-01-17 at 23 20 22"src="https://github.com/user-attachments/assets/0ec78f3d-ec96-46a6-8def-aad4700712ac"/>(cherry picked from commitfbc2a73)---------Co-authored-by: Jaayden Halko <jaayden.halko@gmail.com>
1 parentd15c470 commita5a7326

File tree

9 files changed

+34
-59
lines changed

9 files changed

+34
-59
lines changed

‎site/e2e/helpers.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,13 +232,15 @@ export const createTemplate = async (
232232
* random name.
233233
*/
234234
exportconstcreateGroup=async(page:Page):Promise<string>=>{
235-
awaitpage.goto("/groups/create",{waitUntil:"domcontentloaded"});
236-
awaitexpectUrl(page).toHavePathName("/groups/create");
235+
awaitpage.goto("/deployment/groups/create",{
236+
waitUntil:"domcontentloaded",
237+
});
238+
awaitexpectUrl(page).toHavePathName("/deployment/groups/create");
237239

238240
constname=randomName();
239241
awaitpage.getByLabel("Name",{exact:true}).fill(name);
240242
awaitpage.getByTestId("form-submit").click();
241-
awaitexpectUrl(page).toHavePathName(`/groups/${name}`);
243+
awaitexpectUrl(page).toHavePathName(`/deployment/groups/${name}`);
242244
returnname;
243245
};
244246

‎site/src/modules/management/SidebarView.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ const DeploymentSettingsNavigation: FC<DeploymentSettingsNavigationProps> = ({
147147
{permissions.viewAllUsers&&(
148148
<SidebarNavSubItemhref="users">Users</SidebarNavSubItem>
149149
)}
150+
{permissions.viewAnyGroup&&(
151+
<SidebarNavSubItemhref="groups">Groups</SidebarNavSubItem>
152+
)}
150153
{permissions.viewNotificationTemplate&&(
151154
<SidebarNavSubItemhref="notifications">
152155
<Stackdirection="row"alignItems="center"spacing={1}>

‎site/src/pages/GroupsPage/CreateGroupPage.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const CreateGroupPage: FC = () => {
1919
<CreateGroupPageView
2020
onSubmit={async(data)=>{
2121
constnewGroup=awaitcreateGroupMutation.mutateAsync(data);
22-
navigate(`/groups/${newGroup.name}`);
22+
navigate(`/deployment/groups/${newGroup.name}`);
2323
}}
2424
error={createGroupMutation.error}
2525
isLoading={createGroupMutation.isLoading}

‎site/src/pages/GroupsPage/CreateGroupPageView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export const CreateGroupPageView: FC<CreateGroupPageViewProps> = ({
4444
initialTouched,
4545
});
4646
constgetFieldHelpers=getFormHelpers<CreateGroupRequest>(form,error);
47-
constonCancel=()=>navigate("/groups");
47+
constonCancel=()=>navigate("/deployment/groups");
4848

4949
return(
5050
<Margins>

‎site/src/pages/GroupsPage/GroupPage.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ export const GroupPage: FC = () => {
211211
try{
212212
awaitdeleteGroupMutation.mutateAsync(groupId);
213213
displaySuccess("Group deleted successfully.");
214-
navigate("/groups");
214+
navigate("/deployment/groups");
215215
}catch(error){
216216
displayError(getErrorMessage(error,"Failed to delete group."));
217217
}

‎site/src/pages/GroupsPage/GroupsPageView.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export const GroupsPageView: FC<GroupsPageViewProps> = ({
8181
canCreateGroup&&(
8282
<Button
8383
component={RouterLink}
84-
to="/groups/create"
84+
to="/deployment/groups/create"
8585
startIcon={<AddOutlined/>}
8686
variant="contained"
8787
>
@@ -96,7 +96,7 @@ export const GroupsPageView: FC<GroupsPageViewProps> = ({
9696

9797
<Cond>
9898
{groups?.map((group)=>{
99-
constgroupPageLink=`/groups/${group.name}`;
99+
constgroupPageLink=`/deployment/groups/${group.name}`;
100100

101101
return(
102102
<TableRow

‎site/src/pages/GroupsPage/SettingsGroupPage.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const SettingsGroupPage: FC = () => {
1818
constnavigate=useNavigate();
1919

2020
constnavigateToGroup=()=>{
21-
navigate(`/groups/${groupName}`);
21+
navigate(`/deployment/groups/${groupName}`);
2222
};
2323

2424
consthelmet=(
@@ -56,7 +56,7 @@ export const SettingsGroupPage: FC = () => {
5656
add_users:[],
5757
remove_users:[],
5858
});
59-
navigate(`/groups/${data.name}`,{replace:true});
59+
navigate(`/deployment/groups/${data.name}`,{replace:true});
6060
}catch(error){
6161
displayError(getErrorMessage(error,"Failed to update group"));
6262
}

‎site/src/pages/UsersPage/UsersLayout.tsx‎

Lines changed: 5 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,39 @@
11
importGroupAddfrom"@mui/icons-material/GroupAddOutlined";
2-
importPersonAddfrom"@mui/icons-material/PersonAddOutlined";
32
importButtonfrom"@mui/material/Button";
43
import{Loader}from"components/Loader/Loader";
54
import{Margins}from"components/Margins/Margins";
65
import{PageHeader,PageHeaderTitle}from"components/PageHeader/PageHeader";
7-
import{TAB_PADDING_Y,TabLink,Tabs,TabsList}from"components/Tabs/Tabs";
86
import{useAuthenticated}from"contexts/auth/RequireAuth";
9-
import{useDashboard}from"modules/dashboard/useDashboard";
107
import{useFeatureVisibility}from"modules/dashboard/useFeatureVisibility";
11-
import{linkToUsers}from"modules/navigation";
128
import{typeFC,Suspense}from"react";
13-
import{
14-
Outlet,
15-
LinkasRouterLink,
16-
useLocation,
17-
useNavigate,
18-
}from"react-router-dom";
9+
import{Outlet,LinkasRouterLink}from"react-router-dom";
1910

2011
exportconstUsersLayout:FC=()=>{
2112
const{ permissions}=useAuthenticated();
22-
const{ showOrganizations}=useDashboard();
23-
constnavigate=useNavigate();
2413
constfeats=useFeatureVisibility();
25-
constlocation=useLocation();
26-
constactiveTab=location.pathname.endsWith("groups") ?"groups" :"users";
2714

2815
return(
2916
<>
3017
<Margins>
3118
<PageHeader
3219
actions={
33-
<>
34-
{permissions.createUser&&(
35-
<Button
36-
onClick={()=>{
37-
navigate("/users/create");
38-
}}
39-
startIcon={<PersonAdd/>}
40-
>
41-
Create user
42-
</Button>
43-
)}
20+
<div>
4421
{permissions.createGroup&&feats.template_rbac&&(
4522
<Button
4623
component={RouterLink}
4724
startIcon={<GroupAdd/>}
48-
to="/groups/create"
25+
to="/deployment/groups/create"
4926
>
5027
Create group
5128
</Button>
5229
)}
53-
</>
30+
</div>
5431
}
5532
>
56-
<PageHeaderTitle>Users</PageHeaderTitle>
33+
<PageHeaderTitle>Groups</PageHeaderTitle>
5734
</PageHeader>
5835
</Margins>
5936

60-
{!showOrganizations&&(
61-
<Tabs
62-
css={{marginBottom:40,marginTop:-TAB_PADDING_Y}}
63-
active={activeTab}
64-
>
65-
<Margins>
66-
<TabsList>
67-
<TabLinkto={linkToUsers}value="users">
68-
Users
69-
</TabLink>
70-
<TabLinkto="/groups"value="groups">
71-
Groups
72-
</TabLink>
73-
</TabsList>
74-
</Margins>
75-
</Tabs>
76-
)}
77-
7837
<Margins>
7938
<Suspensefallback={<Loader/>}>
8039
<Outlet/>

‎site/src/router.tsx‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ const templateRouter = () => {
342342
);
343343
};
344344

345-
constgroupsRouter=()=>{
345+
constorganizationGroupsRouter=()=>{
346346
return(
347347
<Routepath="groups">
348348
<Routeindexelement={<OrganizationGroupsPage/>}/>
@@ -420,7 +420,7 @@ export const router = createBrowserRouter(
420420
<Routepath=":organization">
421421
<Routeindexelement={<OrganizationSettingsPage/>}/>
422422
<Routepath="members"element={<OrganizationMembersPage/>}/>
423-
{groupsRouter()}
423+
{organizationGroupsRouter()}
424424
<Routepath="roles">
425425
<Routeindexelement={<OrganizationCustomRolesPage/>}/>
426426
<Routepath="create"element={<CreateEditRolePage/>}/>
@@ -473,7 +473,18 @@ export const router = createBrowserRouter(
473473

474474
<Routepath="users"element={<UsersPage/>}/>
475475
<Routepath="users/create"element={<CreateUserPage/>}/>
476-
{groupsRouter()}
476+
<Routepath="groups">
477+
<Routeelement={<UsersLayout/>}>
478+
<Routeindexelement={<GroupsPage/>}/>
479+
</Route>
480+
481+
<Routepath="create"element={<CreateGroupPage/>}/>
482+
<Routepath=":groupName"element={<GroupPage/>}/>
483+
<Route
484+
path=":groupName/settings"
485+
element={<SettingsGroupPage/>}
486+
/>
487+
</Route>
477488
</Route>
478489

479490
<Routepath="/settings"element={<UserSettingsLayout/>}>

0 commit comments

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