Skip to content

feat(site): embed users page in management settings #14006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 25, 2024
Merged

feat(site): embed users page in management settings #14006

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
92cebb2
embed users page in management settings
aslilac Jul 24, 2024
f02441e
🧹
aslilac Jul 24, 2024
053b747
oof
aslilac Jul 24, 2024
267c54c
add user button is important
aslilac Jul 24, 2024
ca0f5c2
storybook friendly
aslilac Jul 24, 2024
1179e51
fix navigation
aslilac Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
storybook friendly
  • Loading branch information
@aslilac
aslilac committed Jul 24, 2024
commit ca0f5c22a45d6a0ffcd5eab89700f313a30fbbf2
9 changes: 8 additions & 1 deletion site/src/pages/UsersPage/UsersPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,17 @@ const UsersPage: FC = () => {
const searchParamsResult = useSearchParams();
const { entitlements, experiments, organizationId } = useDashboard();
const [searchParams] = searchParamsResult;
const isMultiOrg = experiments.includes("multi-organization");

const groupsByUserIdQuery = useQuery(groupsByUserId(organizationId));
const authMethodsQuery = useQuery(authMethods());

const { permissions, user: me } = useAuthenticated();
const { updateUsers: canEditUsers, viewDeploymentValues } = permissions;
const {
createUser: canCreateUser,
updateUsers: canEditUsers,
viewDeploymentValues,
} = permissions;
const rolesQuery = useQuery(roles());
const { data: deploymentValues } = useQuery({
...deploymentConfig(),
Expand Down Expand Up @@ -159,6 +164,8 @@ const UsersPage: FC = () => {
menus: { status: statusMenu },
}}
usersQuery={usersQuery}
isMultiOrg={isMultiOrg}
canCreateUser={canCreateUser}
/>

<DeleteDialog
Expand Down
13 changes: 6 additions & 7 deletions site/src/pages/UsersPage/UsersPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import {
PaginationContainer,
type PaginationResult,
} from "components/PaginationWidget/PaginationContainer";
import { useAuthenticated } from "contexts/auth/RequireAuth";
import { useDashboard } from "modules/dashboard/useDashboard";
import { UsersFilter } from "./UsersFilter";
import { UsersTable } from "./UsersTable/UsersTable";

Expand Down Expand Up @@ -38,6 +36,10 @@ export interface UsersPageViewProps {
actorID: string;
groupsByUserId: GroupsByUserId | undefined;
usersQuery: PaginationResult;

// TODO: Refactor these out once we remove the multi-organization experiment.
isMultiOrg?: boolean;
canCreateUser?: boolean;
}

export const UsersPageView: FC<UsersPageViewProps> = ({
Expand All @@ -61,13 +63,10 @@ export const UsersPageView: FC<UsersPageViewProps> = ({
authMethods,
groupsByUserId,
usersQuery,
isMultiOrg,
canCreateUser,
}) => {
const { experiments } = useDashboard();
const { permissions } = useAuthenticated();
const navigate = useNavigate();
const { createUser: canCreateUser } = permissions;

const isMultiOrg = experiments.includes("multi-organization");

return (
<>
Expand Down