@@ -31,6 +32,5 @@ const MembersView = () => {
);
};
-MembersView.getLayout = getLayout;
export default MembersView;
diff --git a/packages/features/ee/organizations/pages/settings/other-team-listing-view.tsx b/packages/features/ee/organizations/pages/settings/other-team-listing-view.tsx
index ea4fc7a39b7511..40d75f0a57ddf6 100644
--- a/packages/features/ee/organizations/pages/settings/other-team-listing-view.tsx
+++ b/packages/features/ee/organizations/pages/settings/other-team-listing-view.tsx
@@ -3,19 +3,18 @@
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { Meta } from "@calcom/ui";
-import { getLayout } from "../../../../settings/layouts/SettingsLayout";
import { OtherTeamsListing } from "./../components/OtherTeamsListing";
-const OtherTeamListingView = (): React.ReactElement => {
+const OtherTeamListingView = ({ isAppDir }: { isAppDir?: boolean }): React.ReactElement => {
const { t } = useLocale();
return (
<>
-
+ {!isAppDir ? (
+
+ ) : null}
);
};
-OtherTeamListingView.getLayout = getLayout;
-
export default OtherTeamListingView;
diff --git a/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx b/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx
index 3108552b1453a8..5636bc1068b818 100644
--- a/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx
+++ b/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx
@@ -14,7 +14,6 @@ import { trpc } from "@calcom/trpc/react";
import type { RouterOutputs } from "@calcom/trpc/react";
import { Meta, showToast, Button } from "@calcom/ui";
-import { getLayout } from "../../../../settings/layouts/SettingsLayout";
import MakeTeamPrivateSwitch from "../../../teams/components/MakeTeamPrivateSwitch";
import MemberListItem from "../components/MemberListItem";
@@ -60,7 +59,7 @@ function MembersList(props: MembersListProps) {
);
}
-const MembersView = () => {
+const MembersView = ({ isAppDir }: { isAppDir?: boolean }) => {
const { t, i18n } = useLocale();
const router = useRouter();
const params = useParamsWithFallback();
@@ -136,25 +135,27 @@ const MembersView = () => {
return (
<>
-
setShowMemberInvitationModal(true)}
- data-testid="new-member-button">
- {t("add")}
-
- ) : (
- <>
- )
- }
- />
+ {!isAppDir ? (
+
setShowMemberInvitationModal(true)}
+ data-testid="new-member-button">
+ {t("add")}
+
+ ) : (
+ <>
+ )
+ }
+ />
+ ) : null}
{!isPending && (
<>
@@ -246,6 +247,4 @@ const MembersView = () => {
);
};
-MembersView.getLayout = getLayout;
-
export default MembersView;
diff --git a/packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx b/packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx
index acd6b63af1a9a9..c030fa568e0ea2 100644
--- a/packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx
+++ b/packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx
@@ -38,7 +38,6 @@ import {
TextField,
} from "@calcom/ui";
-import { getLayout } from "../../../../settings/layouts/SettingsLayout";
import { subdomainSuffix } from "../../../organizations/lib/orgDomains";
const regex = new RegExp("^[a-zA-Z0-9-]*$");
@@ -55,7 +54,7 @@ const teamProfileFormSchema = z.object({
bio: z.string(),
});
-const OtherTeamProfileView = () => {
+const OtherTeamProfileView = ({ isAppDir }: { isAppDir?: boolean }) => {
const { t } = useLocale();
const router = useRouter();
const utils = trpc.useUtils();
@@ -170,7 +169,7 @@ const OtherTeamProfileView = () => {
return (
<>
-
+ {!isAppDir ?
: null}
{!isPending ? (
<>
{isAdmin ? (
@@ -369,6 +368,4 @@ const OtherTeamProfileView = () => {
);
};
-OtherTeamProfileView.getLayout = getLayout;
-
export default OtherTeamProfileView;
diff --git a/packages/features/ee/organizations/pages/settings/profile.tsx b/packages/features/ee/organizations/pages/settings/profile.tsx
index f30bf59ea36b34..e1fc469e3b651a 100644
--- a/packages/features/ee/organizations/pages/settings/profile.tsx
+++ b/packages/features/ee/organizations/pages/settings/profile.tsx
@@ -38,7 +38,6 @@ import {
// if I include this in the above barrel import, I get a runtime error that the component is not exported.
import { OrgBanner } from "@calcom/ui";
-import { getLayout } from "../../../../settings/layouts/SettingsLayout";
import { useOrgBranding } from "../../../organizations/context/provider";
const orgProfileFormSchema = z.object({
@@ -58,10 +57,18 @@ type FormValues = {
calVideoLogo: string | null;
};
-const SkeletonLoader = ({ title, description }: { title: string; description: string }) => {
+const SkeletonLoader = ({
+ title,
+ description,
+ isAppDir,
+}: {
+ title: string;
+ description: string;
+ isAppDir?: boolean;
+}) => {
return (
-
+ {!isAppDir ? : null}
@@ -77,7 +84,7 @@ const SkeletonLoader = ({ title, description }: { title: string; description: st
);
};
-const OrgProfileView = () => {
+const OrgProfileView = ({ isAppDir }: { isAppDir?: boolean }) => {
const { t } = useLocale();
const router = useRouter();
@@ -103,7 +110,9 @@ const OrgProfileView = () => {
);
if (isPending || !orgBranding || !currentOrganisation) {
- return
;
+ return (
+
+ );
}
const isOrgAdminOrOwner =
@@ -129,7 +138,9 @@ const OrgProfileView = () => {
return (
-
+ {!isAppDir ? (
+
+ ) : null}
<>
{isOrgAdminOrOwner ? (
<>
@@ -399,6 +410,4 @@ const OrgProfileForm = ({ defaultValues }: { defaultValues: FormValues }) => {
);
};
-OrgProfileView.getLayout = getLayout;
-
export default OrgProfileView;
diff --git a/packages/features/ee/sso/page/orgs-sso-view.tsx b/packages/features/ee/sso/page/orgs-sso-view.tsx
index 9d42e9e0f66232..35c45111878b6f 100644
--- a/packages/features/ee/sso/page/orgs-sso-view.tsx
+++ b/packages/features/ee/sso/page/orgs-sso-view.tsx
@@ -6,10 +6,9 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { MembershipRole } from "@calcom/prisma/enums";
import { AppSkeletonLoader as SkeletonLoader, Meta } from "@calcom/ui";
-import { getLayout } from "../../../settings/layouts/SettingsLayout";
import SSOConfiguration from "../components/SSOConfiguration";
-const SAMLSSO = () => {
+const SAMLSSO = ({ isAppDir }: { isAppDir?: boolean }) => {
const { t } = useLocale();
const { data, status } = useSession();
@@ -26,7 +25,9 @@ const SAMLSSO = () => {
return !!isAdminOrOwner ? (
-
+ {!isAppDir ? (
+
+ ) : null}
) : (
@@ -36,6 +37,4 @@ const SAMLSSO = () => {
);
};
-SAMLSSO.getLayout = getLayout;
-
export default SAMLSSO;
diff --git a/packages/features/ee/teams/pages/team-appearance-view.tsx b/packages/features/ee/teams/pages/team-appearance-view.tsx
index dbfc19dbc68f26..4997866dbd477a 100644
--- a/packages/features/ee/teams/pages/team-appearance-view.tsx
+++ b/packages/features/ee/teams/pages/team-appearance-view.tsx
@@ -17,16 +17,15 @@ import type { RouterOutputs } from "@calcom/trpc/react";
import { Button, Form, Meta, showToast, SettingsToggle } from "@calcom/ui";
import ThemeLabel from "../../../settings/ThemeLabel";
-import { getLayout } from "../../../settings/layouts/SettingsLayout";
type BrandColorsFormValues = {
brandColor: string;
darkBrandColor: string;
};
-type ProfileViewProps = { team: RouterOutputs["viewer"]["teams"]["getMinimal"] };
+type ProfileViewProps = { team: RouterOutputs["viewer"]["teams"]["getMinimal"] } & { isAppDir?: boolean };
-const ProfileView = ({ team }: ProfileViewProps) => {
+const ProfileView = ({ team, isAppDir }: ProfileViewProps) => {
const { t } = useLocale();
const utils = trpc.useUtils();
@@ -80,11 +79,13 @@ const ProfileView = ({ team }: ProfileViewProps) => {
return (
<>
-
+ {!isAppDir ? (
+
+ ) : null}
{isAdmin ? (
<>