Skip to content

Commit 267c54c

Browse files
committed
add user button is important
1 parent 053b747 commit 267c54c

File tree

2 files changed

+36
-1
lines changed

2 files changed

+36
-1
lines changed

site/src/pages/UsersPage/UsersLayout.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ export const UsersLayout: FC = () => {
2727
const location = useLocation();
2828
const activeTab = location.pathname.endsWith("groups") ? "groups" : "users";
2929

30+
const isMultiOrg = experiments.includes("multi-organization");
31+
3032
return (
3133
<>
3234
<Margins>
@@ -59,7 +61,7 @@ export const UsersLayout: FC = () => {
5961
</PageHeader>
6062
</Margins>
6163

62-
{!experiments.includes("multi-organization") && (
64+
{!isMultiOrg && (
6365
<Tabs
6466
css={{ marginBottom: 40, marginTop: -TAB_PADDING_Y }}
6567
active={activeTab}

site/src/pages/UsersPage/UsersPageView.tsx

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1+
import PersonAdd from "@mui/icons-material/PersonAdd";
2+
import Button from "@mui/material/Button";
13
import type { ComponentProps, FC } from "react";
4+
import { useNavigate } from "react-router-dom";
25
import type { GroupsByUserId } from "api/queries/groups";
36
import type * as TypesGen from "api/typesGenerated";
7+
import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader";
48
import {
59
PaginationContainer,
610
type PaginationResult,
711
} from "components/PaginationWidget/PaginationContainer";
12+
import { useAuthenticated } from "contexts/auth/RequireAuth";
13+
import { useDashboard } from "modules/dashboard/useDashboard";
814
import { UsersFilter } from "./UsersFilter";
915
import { UsersTable } from "./UsersTable/UsersTable";
1016

@@ -56,8 +62,35 @@ export const UsersPageView: FC<UsersPageViewProps> = ({
5662
groupsByUserId,
5763
usersQuery,
5864
}) => {
65+
const { experiments } = useDashboard();
66+
const { permissions } = useAuthenticated();
67+
const navigate = useNavigate();
68+
const { createUser: canCreateUser } = permissions;
69+
70+
const isMultiOrg = experiments.includes("multi-organization");
71+
5972
return (
6073
<>
74+
{isMultiOrg && (
75+
<PageHeader
76+
css={{ paddingTop: 0 }}
77+
actions={
78+
<>
79+
{canCreateUser && (
80+
<Button
81+
onClick={() => navigate("/users/create")}
82+
startIcon={<PersonAdd />}
83+
>
84+
Create user
85+
</Button>
86+
)}
87+
</>
88+
}
89+
>
90+
<PageHeaderTitle>Users</PageHeaderTitle>
91+
</PageHeader>
92+
)}
93+
6194
<UsersFilter {...filterProps} />
6295

6396
<PaginationContainer query={usersQuery} paginationUnitLabel="users">

0 commit comments

Comments
 (0)