From ea20fa9f3580e05cd83d9968417303c3d41f7a02 Mon Sep 17 00:00:00 2001 From: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Date: Tue, 4 Jul 2023 23:12:51 +0100 Subject: [PATCH] Adds LicenseRequired (#9883) Co-authored-by: Alex van Andel --- apps/web/pages/settings/organizations/new/index.tsx | 5 +++-- .../ee/organizations/pages/settings/appearance.tsx | 6 ++++-- .../features/ee/organizations/pages/settings/general.tsx | 9 ++++++++- .../features/ee/organizations/pages/settings/members.tsx | 5 +++-- .../features/ee/organizations/pages/settings/profile.tsx | 5 +++-- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/apps/web/pages/settings/organizations/new/index.tsx b/apps/web/pages/settings/organizations/new/index.tsx index 132c1f85da..f82c3b1dff 100644 --- a/apps/web/pages/settings/organizations/new/index.tsx +++ b/apps/web/pages/settings/organizations/new/index.tsx @@ -1,3 +1,4 @@ +import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired"; import { CreateANewOrganizationForm } from "@calcom/features/ee/organizations/components"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { WizardLayout, Meta } from "@calcom/ui"; @@ -7,10 +8,10 @@ import PageWrapper from "@components/PageWrapper"; const CreateNewOrganizationPage = () => { const { t } = useLocale(); return ( - <> + - + ); }; const LayoutWrapper = (page: React.ReactElement) => { diff --git a/packages/features/ee/organizations/pages/settings/appearance.tsx b/packages/features/ee/organizations/pages/settings/appearance.tsx index d447bc77f8..f83663d6ae 100644 --- a/packages/features/ee/organizations/pages/settings/appearance.tsx +++ b/packages/features/ee/organizations/pages/settings/appearance.tsx @@ -1,6 +1,8 @@ import { useRouter } from "next/router"; import { Controller, useForm } from "react-hook-form"; +import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired"; + import { useLocale } from "@calcom/lib/hooks/useLocale"; import { MembershipRole } from "@calcom/prisma/enums"; import { trpc } from "@calcom/trpc/react"; @@ -87,7 +89,7 @@ const OrgAppearanceView = () => { return ; } return ( - <> + {isAdmin ? (
{ {t("only_owner_change")} )} - + ); }; diff --git a/packages/features/ee/organizations/pages/settings/general.tsx b/packages/features/ee/organizations/pages/settings/general.tsx index 7a876561bd..f6d7b6c613 100644 --- a/packages/features/ee/organizations/pages/settings/general.tsx +++ b/packages/features/ee/organizations/pages/settings/general.tsx @@ -1,6 +1,7 @@ import { useRouter } from "next/router"; import { Controller, useForm } from "react-hook-form"; +import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired"; import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { nameOfDay } from "@calcom/lib/weekday"; @@ -61,7 +62,13 @@ const OrgGeneralView = () => { currentOrg.user.role === MembershipRole.OWNER || currentOrg.user.role === MembershipRole.ADMIN; return ( - + + + ); }; diff --git a/packages/features/ee/organizations/pages/settings/members.tsx b/packages/features/ee/organizations/pages/settings/members.tsx index b352c8156b..681cde27ab 100644 --- a/packages/features/ee/organizations/pages/settings/members.tsx +++ b/packages/features/ee/organizations/pages/settings/members.tsx @@ -1,6 +1,7 @@ import { useRouter } from "next/router"; import { useState } from "react"; +import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired"; import MemberInvitationModal from "@calcom/features/ee/teams/components/MemberInvitationModal"; import MemberListItem from "@calcom/features/ee/teams/components/MemberListItem"; import TeamInviteList from "@calcom/features/ee/teams/components/TeamInviteList"; @@ -103,7 +104,7 @@ const MembersView = () => { team && (team.membership.role === MembershipRole.OWNER || team.membership.role === MembershipRole.ADMIN); return ( - <> + { )} )} - + ); }; MembersView.getLayout = getLayout; diff --git a/packages/features/ee/organizations/pages/settings/profile.tsx b/packages/features/ee/organizations/pages/settings/profile.tsx index 8640a81c85..ea697a5c93 100644 --- a/packages/features/ee/organizations/pages/settings/profile.tsx +++ b/packages/features/ee/organizations/pages/settings/profile.tsx @@ -6,6 +6,7 @@ import { useState, useLayoutEffect } from "react"; import { Controller, useForm } from "react-hook-form"; import { z } from "zod"; +import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired"; import { useOrgBrandingValues } from "@calcom/features/ee/organizations/hooks"; import { subdomainSuffix } from "@calcom/features/ee/organizations/lib/orgDomains"; import { WEBAPP_URL } from "@calcom/lib/constants"; @@ -106,7 +107,7 @@ const OrgProfileView = () => { } return ( - <> + {!isLoading && ( <> @@ -246,7 +247,7 @@ const OrgProfileView = () => { {/* LEAVE ORG should go above here ^ */} )} - + ); };