@@ -3,26 +3,21 @@ import Button from "@mui/material/Button";
33import { type FC , useEffect } from "react" ;
44import { Helmet } from "react-helmet-async" ;
55import { useQuery } from "react-query" ;
6- import { Link as RouterLink , useLocation , useParams } from "react-router-dom" ;
6+ import { Link as RouterLink , useParams } from "react-router-dom" ;
77import { getErrorMessage } from "api/errors" ;
88import { organizationRoles } from "api/queries/roles" ;
99import { displayError } from "components/GlobalSnackbar/utils" ;
1010import { PageHeader , PageHeaderTitle } from "components/PageHeader/PageHeader" ;
1111import { useAuthenticated } from "contexts/auth/RequireAuth" ;
12- import { useDashboard } from "modules/dashboard/useDashboard" ;
1312import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility" ;
1413import { pageTitle } from "utils/page" ;
1514import CustomRolesPageView from "./CustomRolesPageView" ;
1615
1716export const CustomRolesPage :FC = ( ) => {
1817const { permissions} = useAuthenticated ( ) ;
1918const { assignOrgRole :canAssignOrgRole } = permissions ;
20- const {
21- multiple_organizations :organizationsEnabled ,
22- custom_roles :isCustomRolesEnabled ,
23- } = useFeatureVisibility ( ) ;
24- const { experiments} = useDashboard ( ) ;
25- const location = useLocation ( ) ;
19+ const { custom_roles :isCustomRolesEnabled } = useFeatureVisibility ( ) ;
20+
2621const { organization= "default" } = useParams ( ) as { organization :string } ;
2722const organizationRolesQuery = useQuery ( organizationRoles ( organization ) ) ;
2823const filteredRoleData = organizationRolesQuery . data ?. filter (
@@ -40,16 +35,6 @@ export const CustomRolesPage: FC = () => {
4035}
4136} , [ organizationRolesQuery . error ] ) ;
4237
43- // if (
44- // organizationsEnabled &&
45- // experiments.includes("multi-organization") &&
46- // location.pathname === "/deployment/groups"
47- // ) {
48- // const defaultName =
49- // getOrganizationNameByDefault(organizations) ?? "default";
50- // return <Navigate to={`/organizations/${defaultName}/groups` } replace />;
51- // }
52-
5338return (
5439< >
5540< Helmet >