Skip to content

Commit 2ce3dae

Browse files
bpmctbpmct
authored
chore: add cherry-picks for patch 2.17.4 (#16186)
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" />
1 parent d1a02c0 commit 2ce3dae

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
@@ -231,13 +231,15 @@ export const createTemplate = async (
231231
* random name.
232232
*/
233233
export const createGroup = async (page: Page): Promise<string> => {
234-
await page.goto("/groups/create", { waitUntil: "domcontentloaded" });
235-
await expectUrl(page).toHavePathName("/groups/create");
234+
await page.goto("/deployment/groups/create", {
235+
waitUntil: "domcontentloaded",
236+
});
237+
await expectUrl(page).toHavePathName("/deployment/groups/create");
236238

237239
const name = randomName();
238240
await page.getByLabel("Name", { exact: true }).fill(name);
239241
await page.getByTestId("form-submit").click();
240-
await expectUrl(page).toHavePathName(`/groups/${name}`);
242+
await expectUrl(page).toHavePathName(`/deployment/groups/${name}`);
241243
return name;
242244
};
243245

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ const DeploymentSettingsNavigation: FC<DeploymentSettingsNavigationProps> = ({
142142
{permissions.viewAllUsers && (
143143
<SidebarNavSubItem href="users">Users</SidebarNavSubItem>
144144
)}
145+
{permissions.viewAnyGroup && (
146+
<SidebarNavSubItem href="groups">Groups</SidebarNavSubItem>
147+
)}
145148
{permissions.viewNotificationTemplate && (
146149
<SidebarNavSubItem href="notifications">
147150
<Stack direction="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
const newGroup = await createGroupMutation.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
const getFieldHelpers = getFormHelpers<CreateGroupRequest>(form, error);
47-
const onCancel = () => navigate("/groups");
47+
const onCancel = () => 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
await deleteGroupMutation.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-
const groupPageLink = `/groups/${group.name}`;
99+
const groupPageLink = `/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
const navigate = useNavigate();
1919

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

2424
const helmet = (
@@ -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
import GroupAdd from "@mui/icons-material/GroupAddOutlined";
2-
import PersonAdd from "@mui/icons-material/PersonAddOutlined";
32
import Button from "@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 { type FC, Suspense } from "react";
13-
import {
14-
Outlet,
15-
Link as RouterLink,
16-
useLocation,
17-
useNavigate,
18-
} from "react-router-dom";
9+
import { Outlet, Link as RouterLink } from "react-router-dom";
1910

2011
export const UsersLayout: FC = () => {
2112
const { permissions } = useAuthenticated();
22-
const { showOrganizations } = useDashboard();
23-
const navigate = useNavigate();
2413
const feats = useFeatureVisibility();
25-
const location = useLocation();
26-
const activeTab = 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-
<TabLink to={linkToUsers} value="users">
68-
Users
69-
</TabLink>
70-
<TabLink to="/groups" value="groups">
71-
Groups
72-
</TabLink>
73-
</TabsList>
74-
</Margins>
75-
</Tabs>
76-
)}
77-
7837
<Margins>
7938
<Suspense fallback={<Loader />}>
8039
<Outlet />

‎site/src/router.tsx

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ const templateRouter = () => {
339339
);
340340
};
341341

342-
const groupsRouter = () => {
342+
const organizationGroupsRouter = () => {
343343
return (
344344
<Route path="groups">
345345
<Route index element={<OrganizationGroupsPage />} />
@@ -417,7 +417,7 @@ export const router = createBrowserRouter(
417417
<Route path=":organization">
418418
<Route index element={<OrganizationSettingsPage />} />
419419
<Route path="members" element={<OrganizationMembersPage />} />
420-
{groupsRouter()}
420+
{organizationGroupsRouter()}
421421
<Route path="roles">
422422
<Route index element={<OrganizationCustomRolesPage />} />
423423
<Route path="create" element={<CreateEditRolePage />} />
@@ -469,7 +469,18 @@ export const router = createBrowserRouter(
469469

470470
<Route path="users" element={<UsersPage />} />
471471
<Route path="users/create" element={<CreateUserPage />} />
472-
{groupsRouter()}
472+
<Route path="groups">
473+
<Route element={<UsersLayout />}>
474+
<Route index element={<GroupsPage />} />
475+
</Route>
476+
477+
<Route path="create" element={<CreateGroupPage />} />
478+
<Route path=":groupName" element={<GroupPage />} />
479+
<Route
480+
path=":groupName/settings"
481+
element={<SettingsGroupPage />}
482+
/>
483+
</Route>
473484
</Route>
474485

475486
<Route path="/settings" element={<UserSettingsLayout />}>

0 commit comments

Comments
 (0)