Jul 26, 2024 · Jul 25, 2024 · Jul 25, 2024 · Jul 25, 2024 · Jul 26, 2024 · Jul 26, 2024
diff --git a/site/src/pages/ManagementSettingsPage/GroupsPage/GroupsPage.tsx b/site/src/pages/ManagementSettingsPage/GroupsPage/GroupsPage.tsx
 import { type FC, useEffect } from "react";
 import { Helmet } from "react-helmet-async";
 import { useQuery } from "react-query";
 import { Link as RouterLink, useParams } from "react-router-dom";
 import {
  Navigate,
  Link as RouterLink,
  useLocation,
  useParams,
 } from "react-router-dom";
 import { getErrorMessage } from "api/errors";
 import { groups } from "api/queries/groups";
 import { displayError } from "components/GlobalSnackbar/utils";
 import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader";
 import { useAuthenticated } from "contexts/auth/RequireAuth";
 import { useDashboard } from "modules/dashboard/useDashboard";
 import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
 import { pageTitle } from "utils/page";
 import GroupsPageView from "./GroupsPageView";
 import { useOrganizationSettings } from "../ManagementSettingsLayout";
 import { Organization } from "api/typesGenerated";

 export const GroupsPage: FC = () => {
  const { permissions } = useAuthenticated();
  const { createGroup: canCreateGroup } = permissions;
  const { template_rbac: isTemplateRBACEnabled } = useFeatureVisibility();
  const {
    multiple_organizations: organizationsEnabled,
    template_rbac: isTemplateRBACEnabled,
  } = useFeatureVisibility();
  const { experiments } = useDashboard();
  const location = useLocation();
  const { organization = "default" } = useParams() as { organization: string };
  const groupsQuery = useQuery(groups(organization));
  const { organizations } = useOrganizationSettings();

  useEffect(() => {
    if (groupsQuery.error) {
    }
  }, [groupsQuery.error]);

  if (
    organizationsEnabled &&
    experiments.includes("multi-organization") &&
    location.pathname === "/deployment/groups"
  ) {
    const defaultName =
      getOrganizationNameByDefault(organizations) ?? "default";
    return <Navigate to={`/organizations/${defaultName}/groups`} replace />;
  }

  return (
    <>
      <Helmet>
 };

 export default GroupsPage;

 export const getOrganizationNameByDefault = (organizations: Organization[]) =>
  organizations.find((org) => org.is_default)?.name;
diff --git a/site/src/pages/UsersPage/UsersPage.tsx b/site/src/pages/UsersPage/UsersPage.tsx
 import { useAuthenticated } from "contexts/auth/RequireAuth";
 import { usePaginatedQuery } from "hooks/usePaginatedQuery";
 import { useDashboard } from "modules/dashboard/useDashboard";
 import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
 import { pageTitle } from "utils/page";
 import { generateRandomString } from "utils/random";
 import { ResetPasswordDialog } from "./ResetPasswordDialog";
  const { entitlements, experiments, organizationId } = useDashboard();
  const [searchParams] = searchParamsResult;
  const isMultiOrg = experiments.includes("multi-organization");
  const { multiple_organizations: organizationsEnabled } =
    useFeatureVisibility();

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

  if (
    organizationsEnabled &&
    experiments.includes("multi-organization") &&
    location.pathname !== "/deployment/users"
  ) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,22 +3,36 @@ import Button from "@mui/material/Button";
		import { type FC, useEffect } from "react";
		import { Helmet } from "react-helmet-async";
		import { useQuery } from "react-query";
		import { Link as RouterLink, useParams } from "react-router-dom";
		import {
		Navigate,
		Link as RouterLink,
		useLocation,
		useParams,
		} from "react-router-dom";
		import { getErrorMessage } from "api/errors";
		import { groups } from "api/queries/groups";
		import { displayError } from "components/GlobalSnackbar/utils";
		import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader";
		import { useAuthenticated } from "contexts/auth/RequireAuth";
		import { useDashboard } from "modules/dashboard/useDashboard";
		import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
		import { pageTitle } from "utils/page";
		import GroupsPageView from "./GroupsPageView";
		import { useOrganizationSettings } from "../ManagementSettingsLayout";
		import { Organization } from "api/typesGenerated";

		export const GroupsPage: FC = () => {
		const { permissions } = useAuthenticated();
		const { createGroup: canCreateGroup } = permissions;
		const { template_rbac: isTemplateRBACEnabled } = useFeatureVisibility();
		const {
		multiple_organizations: organizationsEnabled,
		template_rbac: isTemplateRBACEnabled,
		} = useFeatureVisibility();
		const { experiments } = useDashboard();
		const location = useLocation();
		const { organization = "default" } = useParams() as { organization: string };
		const groupsQuery = useQuery(groups(organization));
		const { organizations } = useOrganizationSettings();

		useEffect(() => {
		if (groupsQuery.error) {
Expand All		@@ -28,6 +42,16 @@ export const GroupsPage: FC = () => {
		}
		}, [groupsQuery.error]);

		if (
		organizationsEnabled &&
		experiments.includes("multi-organization") &&
		location.pathname === "/deployment/groups"
		) {
		const defaultName =
		getOrganizationNameByDefault(organizations) ?? "default";
		return <Navigate to={`/organizations/${defaultName}/groups`} replace />;
		}

		return (
		<>
		<Helmet>
Expand DownExpand Up		@@ -62,3 +86,6 @@ export const GroupsPage: FC = () => {
		};

		export default GroupsPage;

		export const getOrganizationNameByDefault = (organizations: Organization[]) =>
		organizations.find((org) => org.is_default)?.name;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,6 +29,7 @@ import { isNonInitialPage } from "components/PaginationWidget/utils";
		import { useAuthenticated } from "contexts/auth/RequireAuth";
		import { usePaginatedQuery } from "hooks/usePaginatedQuery";
		import { useDashboard } from "modules/dashboard/useDashboard";
		import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
		import { pageTitle } from "utils/page";
		import { generateRandomString } from "utils/random";
		import { ResetPasswordDialog } from "./ResetPasswordDialog";
Expand All		@@ -43,6 +44,8 @@ const UsersPage: FC = () => {
		const { entitlements, experiments, organizationId } = useDashboard();
		const [searchParams] = searchParamsResult;
		const isMultiOrg = experiments.includes("multi-organization");
		const { multiple_organizations: organizationsEnabled } =
		useFeatureVisibility();

		const groupsByUserIdQuery = useQuery(groupsByUserId(organizationId));
		const authMethodsQuery = useQuery(authMethods());
Expand DownExpand Up		@@ -104,6 +107,7 @@ const UsersPage: FC = () => {
		groupsByUserIdQuery.isLoading;

		if (
		organizationsEnabled &&
		experiments.includes("multi-organization") &&
		location.pathname !== "/deployment/users"
		) {
Expand Down