diff --git a/apps/web/components/auth/layouts/AdminLayout.tsx b/apps/web/components/auth/layouts/AdminLayout.tsx deleted file mode 100644 index 6c32d31bc3..0000000000 --- a/apps/web/components/auth/layouts/AdminLayout.tsx +++ /dev/null @@ -1,40 +0,0 @@ -"use client"; - -import { useSession } from "next-auth/react"; -import { usePathname, useRouter } from "next/navigation"; -import type { ComponentProps } from "react"; -import React, { useEffect } from "react"; - -import SettingsLayout from "@calcom/features/settings/layouts/SettingsLayout"; -import type Shell from "@calcom/features/shell/Shell"; -import { UserPermissionRole } from "@calcom/prisma/enums"; -import { ErrorBoundary } from "@calcom/ui"; - -export default function AdminLayout({ - children, - ...rest -}: { children: React.ReactNode } & ComponentProps) { - const pathname = usePathname(); - const session = useSession(); - const router = useRouter(); - - // Force redirect on component level - useEffect(() => { - if (session.data && session.data.user.role !== UserPermissionRole.ADMIN) { - router.replace("/settings/my-account/profile"); - } - }, [session, router]); - - const isAppsPage = pathname?.startsWith("/settings/admin/apps"); - return ( - -
-
*]:flex-1"}> - {children} -
-
-
- ); -} - -export const getLayout = (page: React.ReactElement) => {page}; diff --git a/packages/features/ee/sso/page/teams-sso-view.tsx b/packages/features/ee/sso/page/teams-sso-view.tsx deleted file mode 100644 index 118d78d612..0000000000 --- a/packages/features/ee/sso/page/teams-sso-view.tsx +++ /dev/null @@ -1,66 +0,0 @@ -"use client"; - -import { useRouter } from "next/navigation"; -import { useEffect } from "react"; - -import { HOSTED_CAL_FEATURES } from "@calcom/lib/constants"; -import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback"; -import { trpc } from "@calcom/trpc/react"; -import { AppSkeletonLoader as SkeletonLoader, Meta } from "@calcom/ui"; - -import { getLayout } from "../../../settings/layouts/SettingsLayout"; -import SSOConfiguration from "../components/SSOConfiguration"; - -const SAMLSSO = () => { - const params = useParamsWithFallback(); - const { t } = useLocale(); - const router = useRouter(); - - const teamId = Number(params.id); - - const { - data: team, - isPending, - error, - } = trpc.viewer.teams.get.useQuery( - { teamId }, - { - enabled: !!teamId, - } - ); - - useEffect(() => { - if (!HOSTED_CAL_FEATURES) { - router.push("/404"); - } - }, []); - - useEffect( - function refactorMeWithoutEffect() { - if (error) { - router.replace("/teams"); - } - }, - [error] - ); - if (isPending) { - return ; - } - - if (!team) { - router.push("/404"); - return; - } - - return ( -
- - -
- ); -}; - -SAMLSSO.getLayout = getLayout; - -export default SAMLSSO; diff --git a/packages/features/ee/users/pages/users-listing-view.tsx b/packages/features/ee/users/pages/users-listing-view.tsx index ee9fd5038e..78bd586281 100644 --- a/packages/features/ee/users/pages/users-listing-view.tsx +++ b/packages/features/ee/users/pages/users-listing-view.tsx @@ -2,7 +2,6 @@ import NoSSR from "@calcom/core/components/NoSSR"; -import { getLayout } from "../../../settings/layouts/SettingsLayout"; import { UsersTable } from "../components/UsersTable"; const DeploymentUsersListPage = () => { @@ -15,6 +14,4 @@ const DeploymentUsersListPage = () => { ); }; -DeploymentUsersListPage.getLayout = getLayout; - export default DeploymentUsersListPage;