storybook friendly

aslilac · aslilac · commit ca0f5c22a45d · 2024-07-24T22:28:05.000Z
diff --git a/site/src/pages/UsersPage/UsersPage.tsx b/site/src/pages/UsersPage/UsersPage.tsx
@@ -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(),
@@ -159,6 +164,8 @@ const UsersPage: FC = () => {
           menus: { status: statusMenu },
         }}
         usersQuery={usersQuery}
+        isMultiOrg={isMultiOrg}
+        canCreateUser={canCreateUser}
       />
 
       <DeleteDialog
diff --git a/site/src/pages/UsersPage/UsersPageView.tsx b/site/src/pages/UsersPage/UsersPageView.tsx
@@ -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";
 
@@ -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> = ({
@@ -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 (
     <>
