Skip to content

Scheduling infrastructure for absolutely everyone.

refactor: Move trpc-dependent components from features to web [1] (#25859)

Benny Joo8afe87ff75b9
diff --git a/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDir.tsx b/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDir.tsx
index 7ec25f0ef59..8c09fb5bb53 100644
--- a/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDir.tsx
+++ b/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDir.tsx
@@ -1,7 +1,7 @@
import { ShellMainAppDirBackButton } from "app/(use-page-wrapper)/(main-nav)/ShellMainAppDirBackButton";
import classNames from "classnames";
-import type { LayoutProps } from "@calcom/features/shell/Shell";
+import type { LayoutProps } from "~/shell/Shell";
// Copied from `ShellMain` but with a different `ShellMainAppDirBackButton` import
// for client/server component separation
diff --git a/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDirBackButton.tsx b/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDirBackButton.tsx
index c1c78baa916..24475525d5d 100644
--- a/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDirBackButton.tsx
+++ b/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDirBackButton.tsx
@@ -2,9 +2,10 @@
import { useRouter } from "next/navigation";
-import type { LayoutProps } from "@calcom/features/shell/Shell";
import { Button } from "@calcom/ui/components/button";
+import type { LayoutProps } from "~/shell/Shell";
+
export const ShellMainAppDirBackButton = ({ backPath }: { backPath: LayoutProps["backPath"] }) => {
const router = useRouter();
return (
diff --git a/apps/web/app/(use-page-wrapper)/(main-nav)/availability/page.tsx b/apps/web/app/(use-page-wrapper)/(main-nav)/availability/page.tsx
index 703ec3b4926..f82d9bc7cde 100644
--- a/apps/web/app/(use-page-wrapper)/(main-nav)/availability/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/(main-nav)/availability/page.tsx
@@ -8,10 +8,10 @@ import { redirect } from "next/navigation";
import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
import { getOrganizationRepository } from "@calcom/features/ee/organizations/di/OrganizationRepository.container";
import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
-import { AvailabilitySliderTable } from "@calcom/features/timezone-buddy/components/AvailabilitySliderTable";
import { getScheduleListItemData } from "@calcom/lib/schedules/transformers/getScheduleListItemData";
import { MembershipRole } from "@calcom/prisma/enums";
import { availabilityRouter } from "@calcom/trpc/server/routers/viewer/availability/_router";
+import { AvailabilitySliderTable } from "@calcom/web/modules/timezone-buddy/components/AvailabilitySliderTable";
import { buildLegacyRequest } from "@lib/buildLegacyCtx";
@@ -64,8 +64,8 @@ const Page = async ({ searchParams: _searchParams }: PageProps) => {
const organizationRepository = getOrganizationRepository();
const isOrgPrivate = organizationId
? await organizationRepository.checkIfPrivate({
- orgId: organizationId,
- })
+ orgId: organizationId,
+ })
: false;
const permissionService = new PermissionCheckService();
@@ -80,9 +80,7 @@ const Page = async ({ searchParams: _searchParams }: PageProps) => {
<ShellMainAppDir
heading={t("availability")}
subtitle={t("configure_availability")}
- CTA={
- <AvailabilityCTA canViewTeamAvailability={canViewTeamAvailability} />
- }>
+ CTA={<AvailabilityCTA canViewTeamAvailability={canViewTeamAvailability} />}>
{searchParams?.type === "team" && canViewTeamAvailability ? (
<AvailabilitySliderTable isOrg={!!organizationId} />
) : (
diff --git a/apps/web/app/(use-page-wrapper)/(main-nav)/layout.tsx b/apps/web/app/(use-page-wrapper)/(main-nav)/layout.tsx
index b32accc62a8..b63dc289c9b 100644
--- a/apps/web/app/(use-page-wrapper)/(main-nav)/layout.tsx
+++ b/apps/web/app/(use-page-wrapper)/(main-nav)/layout.tsx
@@ -3,10 +3,11 @@ import { cookies, headers } from "next/headers";
import React from "react";
import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
-import Shell from "@calcom/features/shell/Shell";
import { buildLegacyRequest } from "@lib/buildLegacyCtx";
+import Shell from "~/shell/Shell";
+
const Layout = async ({ children }: { children: React.ReactNode }) => {
const session = await getServerSession({ req: buildLegacyRequest(await headers(), await cookies()) });
if (session?.user?.id) SentrySetUser({ id: session.user.id });
diff --git a/apps/web/app/(use-page-wrapper)/(main-nav)/teams/server-page.tsx b/apps/web/app/(use-page-wrapper)/(main-nav)/teams/server-page.tsx
index dfd12eee5cc..f37447c20b8 100644
--- a/apps/web/app/(use-page-wrapper)/(main-nav)/teams/server-page.tsx
+++ b/apps/web/app/(use-page-wrapper)/(main-nav)/teams/server-page.tsx
@@ -2,7 +2,6 @@ import type { SearchParams } from "app/_types";
import type { Session } from "next-auth";
import { unstable_cache } from "next/cache";
-import { TeamsListing } from "@calcom/features/ee/teams/components/TeamsListing";
import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
import { TeamService } from "@calcom/features/ee/teams/services/teamService";
import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
@@ -10,6 +9,8 @@ import { ErrorWithCode } from "@calcom/lib/errors";
import prisma from "@calcom/prisma";
import { MembershipRole } from "@calcom/prisma/enums";
+import { TeamsListing } from "~/ee/teams/components/TeamsListing";
+
import { TeamsCTA } from "./CTA";
const getCachedTeams = unstable_cache(
diff --git a/apps/web/app/(use-page-wrapper)/(main-nav)/teams/skeleton.tsx b/apps/web/app/(use-page-wrapper)/(main-nav)/teams/skeleton.tsx
index c66a5c0d514..757da4ada52 100644
--- a/apps/web/app/(use-page-wrapper)/(main-nav)/teams/skeleton.tsx
+++ b/apps/web/app/(use-page-wrapper)/(main-nav)/teams/skeleton.tsx
@@ -3,9 +3,10 @@
import { ShellMainAppDir } from "app/(use-page-wrapper)/(main-nav)/ShellMainAppDir";
import { TeamsCTA } from "app/(use-page-wrapper)/(main-nav)/teams/CTA";
-import SkeletonLoaderTeamList from "@calcom/features/ee/teams/components/SkeletonloaderTeamList";
import { useLocale } from "@calcom/lib/hooks/useLocale";
+import SkeletonLoaderTeamList from "~/ee/teams/components/SkeletonloaderTeamList";
+
export const TeamsListSkeleton = () => {
const { t } = useLocale();
return (
diff --git a/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx b/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx
index d19c52a5970..a186fde67b2 100644
--- a/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx
+++ b/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx
@@ -1,21 +1,16 @@
"use client";
import { useAutoAnimate } from "@formkit/auto-animate/react";
+import posthog from "posthog-js";
import { useEffect, useState } from "react";
import { useFormContext } from "react-hook-form";
-import posthog from "posthog-js";
import { isFallbackRoute } from "@calcom/app-store/routing-forms/lib/isFallbackRoute";
import type { RoutingFormWithResponseCount } from "@calcom/app-store/routing-forms/types/types";
-import { useHasPaidPlan } from "@calcom/features/billing/hooks/useHasPaidPlan";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
-import SkeletonLoaderTeamList from "@calcom/features/ee/teams/components/SkeletonloaderTeamList";
-import { CreateButtonWithTeamsList } from "@calcom/features/ee/teams/components/createButton/CreateButtonWithTeamsList";
import { FilterResults } from "@calcom/features/filters/components/FilterResults";
import { TeamsFilter } from "@calcom/features/filters/components/TeamsFilter";
import { getTeamsFiltersFromQuery } from "@calcom/features/filters/lib/getTeamsFiltersFromQuery";
-import { ShellMain } from "@calcom/features/shell/Shell";
-import { UpgradeTip } from "@calcom/features/tips";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
@@ -39,6 +34,12 @@ import {
FormActionsProvider,
} from "@calcom/web/components/apps/routing-forms/FormActions";
+import { useHasPaidPlan } from "~/billing/hooks/useHasPaidPlan";
+import SkeletonLoaderTeamList from "~/ee/teams/components/SkeletonloaderTeamList";
+import { CreateButtonWithTeamsList } from "~/ee/teams/components/createButton/CreateButtonWithTeamsList";
+import { ShellMain } from "~/shell/Shell";
+import { UpgradeTip } from "~/shell/UpgradeTip";
+
function NewFormButton({ setNewFormDialogState }: { setNewFormDialogState: SetNewFormDialogState }) {
const { t } = useLocale();
return (
diff --git a/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/layout.tsx b/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/layout.tsx
index 8954344d817..ae63d68cb7b 100644
--- a/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/layout.tsx
+++ b/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/layout.tsx
@@ -3,10 +3,11 @@ import { redirect } from "next/navigation";
import type { ReactNode } from "react";
import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
-import Shell from "@calcom/features/shell/Shell";
import { buildLegacyRequest } from "@lib/buildLegacyCtx";
+import Shell from "~/shell/Shell";
+
import FormProvider from "../[...pages]/FormProvider";
export default async function Layout({ children }: { children: ReactNode }) {
diff --git a/apps/web/app/(use-page-wrapper)/availability/[schedule]/skeleton.tsx b/apps/web/app/(use-page-wrapper)/availability/[schedule]/skeleton.tsx
index e49bbde8876..126be373232 100644
--- a/apps/web/app/(use-page-wrapper)/availability/[schedule]/skeleton.tsx
+++ b/apps/web/app/(use-page-wrapper)/availability/[schedule]/skeleton.tsx
@@ -1,8 +1,9 @@
"use client";
-import Shell from "@calcom/features/shell/Shell";
import { SkeletonText, SkeletonContainer, SkeletonButton } from "@calcom/ui/components/skeleton";
+import Shell from "~/shell/Shell";
+
export function AvailabilityScheduleSkeleton() {
return (
<Shell withoutMain={true}>
@@ -106,7 +107,7 @@ export function AvailabilityScheduleSkeleton() {
</div>
{/* Sidebar - only visible on desktop */}
- <div className="min-w-40 col-span-3 hidden stack-y-2 md:block lg:col-span-1 xl:w-[25%]">
+ <div className="min-w-40 stack-y-2 col-span-3 hidden md:block lg:col-span-1 xl:w-[25%]">
<div className="xl:max-w-80 w-full pr-4 sm:ml-0 sm:mr-36 sm:p-0">
<div>
<SkeletonText className="mb-1 h-4 w-24 text-sm" /> {/* Timezone */}
diff --git a/apps/web/app/(use-page-wrapper)/event-types/[type]/error.tsx b/apps/web/app/(use-page-wrapper)/event-types/[type]/error.tsx
index 0951beed674..d3ce75e67be 100644
--- a/apps/web/app/(use-page-wrapper)/event-types/[type]/error.tsx
+++ b/apps/web/app/(use-page-wrapper)/event-types/[type]/error.tsx
@@ -1,9 +1,10 @@
"use client";
-import Shell from "@calcom/features/shell/Shell";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { Alert } from "@calcom/ui/components/alert";
+import Shell from "~/shell/Shell";
+
export default function Error() {
const { t } = useLocale();
return (
diff --git a/apps/web/app/(use-page-wrapper)/event-types/[type]/skeleton.tsx b/apps/web/app/(use-page-wrapper)/event-types/[type]/skeleton.tsx
index 57e7f4304f0..9575f41fa50 100644
--- a/apps/web/app/(use-page-wrapper)/event-types/[type]/skeleton.tsx
+++ b/apps/web/app/(use-page-wrapper)/event-types/[type]/skeleton.tsx
@@ -1,6 +1,5 @@
"use client";
-import Shell from "@calcom/features/shell/Shell";
import {
SkeletonButton,
SkeletonContainer,
@@ -8,6 +7,8 @@ import {
SkeletonAvatar,
} from "@calcom/ui/components/skeleton";
+import Shell from "~/shell/Shell";
+
export const EventTypeEditPageSkeleton = () => {
const backButtonSkeleton = (
<div className="bg-default sticky top-0 z-10 mb-0 flex items-center py-2 md:mb-9 md:mt-0">
@@ -33,7 +34,7 @@ export const EventTypeEditPageSkeleton = () => {
<div className="flex flex-col xl:flex-row xl:space-x-6">
<div className="hidden xl:block">
<div className="primary-navigation w-64 shrink-0">
- <div className="flex flex-col stack-y-1">
+ <div className="stack-y-1 flex flex-col">
{/* Tab navigation items */}
{Array.from({ length: 8 }).map((_, index) => (
<div
@@ -58,14 +59,14 @@ export const EventTypeEditPageSkeleton = () => {
<SkeletonText className="h-8 w-full max-w-md" />
</div>
- <div className="mb-6 stack-y-6">
+ <div className="stack-y-6 mb-6">
{/* Form fields */}
- <div className="flex flex-col stack-y-2">
+ <div className="stack-y-2 flex flex-col">
<SkeletonText className="h-4 w-32" />
<SkeletonText className="h-10 w-full" />
</div>
- <div className="flex flex-col stack-y-2">
+ <div className="stack-y-2 flex flex-col">
<SkeletonText className="h-4 w-40" />
<div className="flex items-center">
<SkeletonText className="h-10 w-full" />
@@ -73,12 +74,12 @@ export const EventTypeEditPageSkeleton = () => {
</div>
</div>
- <div className="flex flex-col stack-y-2">
+ <div className="stack-y-2 flex flex-col">
<SkeletonText className="h-4 w-36" />
<SkeletonText className="h-24 w-full" />
</div>
- <div className="flex flex-col stack-y-2">
+ <div className="stack-y-2 flex flex-col">
<SkeletonText className="h-4 w-28" />
<div className="flex items-center">
<SkeletonText className="h-10 w-full" />
@@ -86,7 +87,7 @@ export const EventTypeEditPageSkeleton = () => {
</div>
</div>
- <div className="flex flex-col stack-y-2">
+ <div className="stack-y-2 flex flex-col">
<SkeletonText className="h-4 w-32" />
<SkeletonText className="h-10 w-full" />
</div>
diff --git a/apps/web/app/(use-page-wrapper)/insights/UpgradeTipWrapper.tsx b/apps/web/app/(use-page-wrapper)/insights/UpgradeTipWrapper.tsx
index dec69eb3c0b..ab8d9dc1e0c 100644
--- a/apps/web/app/(use-page-wrapper)/insights/UpgradeTipWrapper.tsx
+++ b/apps/web/app/(use-page-wrapper)/insights/UpgradeTipWrapper.tsx
@@ -2,13 +2,14 @@
import { useSession } from "next-auth/react";
-import { UpgradeTip } from "@calcom/features/tips";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { Button } from "@calcom/ui/components/button";
import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
import { Icon } from "@calcom/ui/components/icon";
+import { UpgradeTip } from "~/shell/UpgradeTip";
+
export default function UpgradeTipWrapper({ children }: { children: React.ReactNode }) {
const { t } = useLocale();
const session = useSession();
diff --git a/apps/web/app/(use-page-wrapper)/insights/layout.tsx b/apps/web/app/(use-page-wrapper)/insights/layout.tsx
index 6eea6cf4220..174cf18396a 100644
--- a/apps/web/app/(use-page-wrapper)/insights/layout.tsx
+++ b/apps/web/app/(use-page-wrapper)/insights/layout.tsx
@@ -2,7 +2,8 @@ import { ShellMainAppDir } from "app/(use-page-wrapper)/(main-nav)/ShellMainAppD
import { getTranslate } from "app/_utils";
import { CTA_CONTAINER_CLASS_NAME } from "@calcom/features/data-table/lib/utils";
-import Shell from "@calcom/features/shell/Shell";
+
+import Shell from "~/shell/Shell";
import UpgradeTipWrapper from "./UpgradeTipWrapper";
diff --git a/apps/web/app/(use-page-wrapper)/refer/page.tsx b/apps/web/app/(use-page-wrapper)/refer/page.tsx
index aa869f4fd08..69cadcc96b3 100644
--- a/apps/web/app/(use-page-wrapper)/refer/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/refer/page.tsx
@@ -1,9 +1,10 @@
import { getTranslate } from "app/_utils";
import type { Metadata } from "next";
-import Shell from "@calcom/features/shell/Shell";
import { IS_DUB_REFERRALS_ENABLED } from "@calcom/lib/constants";
+import Shell from "~/shell/Shell";
+
import { DubReferralsPage } from "./DubReferralsPage";
export const metadata: Metadata = {
diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/AdminLayoutAppDirClient.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/AdminLayoutAppDirClient.tsx
index 8a652a29e8e..3424dc2d548 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/AdminLayoutAppDirClient.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/AdminLayoutAppDirClient.tsx
@@ -4,10 +4,11 @@ import { usePathname } from "next/navigation";
import type { ComponentProps } from "react";
import React from "react";
-import type Shell from "@calcom/features/shell/Shell";
import type { UserPermissionRole } from "@calcom/prisma/enums";
import { ErrorBoundary } from "@calcom/ui/components/errorBoundary";
+import type Shell from "~/shell/Shell";
+
export type AdminLayoutProps = {
children: React.ReactNode;
userRole: UserPermissionRole | "INACTIVE_ADMIN" | undefined;
@@ -18,7 +19,7 @@ export default function AdminLayoutAppDirClient({ children }: AdminLayoutProps)
const isAppsPage = pathname?.startsWith("/settings/admin/apps");
return (
<div className="divide-subtle bg-default mx-auto flex max-w-4xl flex-row divide-y">
- <div className={isAppsPage ? "min-w-0" : "flex flex-1 *:flex-1"}>
+ <div className={isAppsPage ? "min-w-0" : "*:flex-1 flex flex-1"}>
<ErrorBoundary>{children}</ErrorBoundary>
</div>
</div>
diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx
index e4f8941d356..6e00831484a 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx
@@ -3,7 +3,7 @@ import { _generateMetadata, getTranslate } from "app/_utils";
import { z } from "zod";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
-import { OrgForm } from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgEditPage";
+import { OrgForm } from "~/ee/organizations/admin/AdminOrgEditPage";
import { getOrganizationRepository } from "@calcom/features/ee/organizations/di/OrganizationRepository.container";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/page.tsx
index e47c0d6ade9..2ca70168968 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/page.tsx
@@ -2,7 +2,7 @@ import { _generateMetadata } from "app/_utils";
import { getTranslate } from "app/_utils";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
-import AdminOrgTable from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgPage";
+import AdminOrgTable from "~/ee/organizations/admin/AdminOrgPage";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
export const generateMetadata = async () =>
diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/workspace-platforms/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/workspace-platforms/page.tsx
index 9f313ca07a8..d92600e0301 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/workspace-platforms/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/workspace-platforms/page.tsx
@@ -1,7 +1,7 @@
import { _generateMetadata, getTranslate } from "app/_utils";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
-import WorkspacePlatformsPage from "@calcom/features/ee/organizations/pages/settings/admin/WorkspacePlatformPage";
+import WorkspacePlatformsPage from "~/ee/organizations/admin/WorkspacePlatformPage";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
export const generateMetadata = async () =>
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx
index 4754719f555..ac36a331646 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx
@@ -13,7 +13,6 @@ import { useOrgBranding } from "@calcom/features/ee/organizations/context/provid
import type { OrganizationBranding } from "@calcom/features/ee/organizations/context/provider";
import type { TeamFeatures } from "@calcom/features/flags/config";
import { useIsFeatureEnabledForTeam } from "@calcom/features/flags/hooks/useIsFeatureEnabledForTeam";
-import Shell from "@calcom/features/shell/Shell";
import { HOSTED_CAL_FEATURES, IS_CALCOM, WEBAPP_URL } from "@calcom/lib/constants";
import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
@@ -30,6 +29,8 @@ import type { VerticalTabItemProps } from "@calcom/ui/components/navigation";
import { VerticalTabItem } from "@calcom/ui/components/navigation";
import { Skeleton } from "@calcom/ui/components/skeleton";
+import Shell from "~/shell/Shell";
+
const getTabs = (orgBranding: OrganizationBranding | null) => {
const tabs: VerticalTabItemProps[] = [
{
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/(with-loader)/loading.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/(with-loader)/loading.tsx
index 14f36df7ddc..7c41229d618 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/(with-loader)/loading.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/(with-loader)/loading.tsx
@@ -1,4 +1,4 @@
-import { SkeletonLoader } from "@calcom/features/webhooks/pages/webhooks-skeleton";
+import { SkeletonLoader } from "~/webhooks/views/webhooks-skeleton";
export default function Loading() {
return <SkeletonLoader />;
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/(with-loader)/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/(with-loader)/page.tsx
index 4626d80c511..918192b6503 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/(with-loader)/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/(with-loader)/page.tsx
@@ -4,12 +4,13 @@ import { cookies, headers } from "next/headers";
import { redirect } from "next/navigation";
import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
-import WebhooksView from "@calcom/features/webhooks/pages/webhooks-view";
import { APP_NAME } from "@calcom/lib/constants";
import { webhookRouter } from "@calcom/trpc/server/routers/viewer/webhook/_router";
import { buildLegacyRequest } from "@lib/buildLegacyCtx";
+import WebhooksView from "~/webhooks/views/webhooks-view";
+
export const generateMetadata = async () =>
await _generateMetadata(
(t) => t("webhooks"),
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/[id]/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/[id]/page.tsx
index 6953ea0ab57..7d25e5fdd4c 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/[id]/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/[id]/page.tsx
@@ -2,9 +2,10 @@ import type { PageProps } from "app/_types";
import { _generateMetadata } from "app/_utils";
import { WebhookRepository } from "@calcom/features/webhooks/lib/repository/WebhookRepository";
-import { EditWebhookView } from "@calcom/features/webhooks/pages/webhook-edit-view";
import { APP_NAME } from "@calcom/lib/constants";
+import { EditWebhookView } from "~/webhooks/views/webhook-edit-view";
+
export const generateMetadata = async ({ params }: { params: Promise<{ id: string }> }) =>
await _generateMetadata(
(t) => t("webhooks"),
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/loading.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/loading.tsx
index 8d9abaffc52..75482db52b8 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/loading.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/loading.tsx
@@ -1,4 +1,4 @@
-import { SkeletonLoader } from "@calcom/features/webhooks/pages/webhook-new-skeleton";
+import { SkeletonLoader } from "~/webhooks/views/webhook-new-skeleton";
export default function Loading() {
return <SkeletonLoader />;
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/page.tsx
index 5376fccfc3f..3e949c6e5d1 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/page.tsx
@@ -1,11 +1,12 @@
import { createRouterCaller } from "app/_trpc/context";
import { _generateMetadata } from "app/_utils";
-import { NewWebhookView } from "@calcom/features/webhooks/pages/webhook-new-view";
import { APP_NAME } from "@calcom/lib/constants";
import { appsRouter } from "@calcom/trpc/server/routers/viewer/apps/_router";
import { webhookRouter } from "@calcom/trpc/server/routers/viewer/webhook/_router";
+import { NewWebhookView } from "~/webhooks/views/webhook-new-view";
+
export const generateMetadata = async () =>
await _generateMetadata(
(t) => t("webhooks"),
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/[id]/edit/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/[id]/edit/page.tsx
index 224c6a160e4..b96a7f6ecb7 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/[id]/edit/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/[id]/edit/page.tsx
@@ -1,7 +1,7 @@
import { _generateMetadata } from "app/_utils";
-import OrgAttributesEditPage from "@calcom/ee/organizations/pages/settings/attributes/attributes-edit-view";
import { MembershipRole } from "@calcom/prisma/enums";
+import OrgAttributesEditPage from "@calcom/web/modules/ee/organizations/attributes/attributes-edit-view";
import { validateUserHasOrgPerms } from "../../../../actions/validateUserHasOrgPerms";
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/create/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/create/page.tsx
index d503230653c..e89eacf7904 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/create/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/create/page.tsx
@@ -1,6 +1,6 @@
import { _generateMetadata } from "app/_utils";
-import OrgAttributesCreatePage from "@calcom/ee/organizations/pages/settings/attributes/attributes-create-view";
+import OrgAttributesCreatePage from "@calcom/web/modules/ee/organizations/attributes/attributes-create-view";
import { MembershipRole } from "@calcom/prisma/enums";
import { validateUserHasOrgPerms } from "../../../actions/validateUserHasOrgPerms";
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/page.tsx
index a260fb36acd..f1990e8618a 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/page.tsx
@@ -1,12 +1,13 @@
import { _generateMetadata, getTranslate } from "app/_utils";
import { redirect } from "next/navigation";
-import OrgSettingsAttributesPage from "@calcom/ee/organizations/pages/settings/attributes/attributes-list-view";
import { Resource } from "@calcom/features/pbac/domain/types/permission-registry";
import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permissions";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
import { MembershipRole } from "@calcom/prisma/enums";
+import OrgSettingsAttributesPage from "~/ee/organizations/attributes/attributes-list-view";
+
import { validateUserHasOrg } from "../../actions/validateUserHasOrg";
export const generateMetadata = async () =>
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/delegation-credential/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/delegation-credential/page.tsx
index a6ebd3e48c4..6277ae93e58 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/delegation-credential/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/delegation-credential/page.tsx
@@ -1,6 +1,6 @@
import { _generateMetadata, getTranslate } from "app/_utils";
-import DelegationCredentialList from "@calcom/features/ee/organizations/pages/settings/delegationCredential";
+import DelegationCredentialList from "~/ee/organizations/delegationCredential";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
import { MembershipRole } from "@calcom/prisma/enums";
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/guest-notifications/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/guest-notifications/page.tsx
index f6cbc55a7c9..c318dd9d7cf 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/guest-notifications/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/guest-notifications/page.tsx
@@ -1,7 +1,7 @@
import { _generateMetadata, getTranslate } from "app/_utils";
import { redirect } from "next/navigation";
-import GuestNotificationsView from "@calcom/features/ee/organizations/pages/settings/guest-notifications";
+import GuestNotificationsView from "~/ee/organizations/guest-notifications";
import { Resource } from "@calcom/features/pbac/domain/types/permission-registry";
import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permissions";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx
index 641e9be469d..29f78083c88 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx
@@ -1,7 +1,7 @@
import { _generateMetadata, getTranslate } from "app/_utils";
import { redirect } from "next/navigation";
-import PrivacyView from "@calcom/features/ee/organizations/pages/settings/privacy";
+import PrivacyView from "~/ee/organizations/privacy";
import { Resource } from "@calcom/features/pbac/domain/types/permission-registry";
import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permissions";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/admin-api/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/admin-api/page.tsx
index d430d574326..e223d0af22d 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/admin-api/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/admin-api/page.tsx
@@ -1,8 +1,9 @@
import { getTranslate, _generateMetadata } from "app/_utils";
-import { AdminAPIView } from "@calcom/features/ee/organizations/pages/settings/admin-api";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
+import { AdminAPIView } from "~/ee/organizations/admin-api";
+
import { validateUserHasOrg } from "../actions/validateUserHasOrg";
export const generateMetadata = async () =>
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/general/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/general/page.tsx
index acde25d13d6..73dd47dcd78 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/general/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/general/page.tsx
@@ -1,6 +1,6 @@
import { _generateMetadata, getTranslate } from "app/_utils";
-import LegacyPage from "@calcom/features/ee/organizations/pages/settings/general";
+import LegacyPage from "~/ee/organizations/general";
import { Resource } from "@calcom/features/pbac/domain/types/permission-registry";
import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permissions";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/profile/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/profile/page.tsx
index 56a8914f99c..866e621e633 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/profile/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/profile/page.tsx
@@ -1,7 +1,7 @@
import { _generateMetadata, getTranslate } from "app/_utils";
import { redirect } from "next/navigation";
-import LegacyPage from "@calcom/features/ee/organizations/pages/settings/profile";
+import LegacyPage from "~/ee/organizations/profile";
import { Resource } from "@calcom/features/pbac/domain/types/permission-registry";
import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permissions";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/(main-page)/skeleton.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/(main-page)/skeleton.tsx
index 358f9da2bb3..2de59028baf 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/(main-page)/skeleton.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/(main-page)/skeleton.tsx
@@ -1,9 +1,10 @@
"use client";
-import SkeletonLoaderTeamList from "@calcom/features/ee/teams/components/SkeletonloaderTeamList";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
import { useLocale } from "@calcom/lib/hooks/useLocale";
+import SkeletonLoaderTeamList from "~/ee/teams/components/SkeletonloaderTeamList";
+
export function SkeletonLoader() {
const { t } = useLocale();
return (
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx
index e2a460cea69..c788e2988ab 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx
@@ -1,8 +1,9 @@
import { _generateMetadata, getTranslate } from "app/_utils";
-import LegacyPage from "@calcom/features/ee/teams/pages/team-appearance-view";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
+import LegacyPage from "~/ee/teams/views/team-appearance-view";
+
import { validateUserHasOrg } from "../../../../actions/validateUserHasOrg";
export const generateMetadata = async ({ params }: { params: Promise<{ id: string }> }) =>
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/members/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/members/page.tsx
index e47bbf78d19..e3573a72853 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/members/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/members/page.tsx
@@ -2,7 +2,7 @@ import { _generateMetadata, getTranslate } from "app/_utils";
import LegacyPage, {
TeamMembersCTA,
-} from "@calcom/features/ee/organizations/pages/settings/other-team-members-view";
+} from "~/ee/organizations/other-team-members-view";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
import { validateUserHasOrg } from "../../../../actions/validateUserHasOrg";
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/profile/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/profile/page.tsx
index 1eaef435ef2..8e0214389be 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/profile/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/profile/page.tsx
@@ -1,6 +1,6 @@
import { _generateMetadata, getTranslate } from "app/_utils";
-import LegacyPage from "@calcom/features/ee/organizations/pages/settings/other-team-profile-view";
+import LegacyPage from "~/ee/organizations/other-team-profile-view";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
import { validateUserHasOrg } from "../../../../actions/validateUserHasOrg";
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/appearance/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/appearance/page.tsx
index 7e341c954f3..a88ae44ce96 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/appearance/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/appearance/page.tsx
@@ -1,8 +1,9 @@
import { _generateMetadata, getTranslate } from "app/_utils";
-import LegacyPage from "@calcom/features/ee/teams/pages/team-appearance-view";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
+import LegacyPage from "~/ee/teams/views/team-appearance-view";
+
export const generateMetadata = async ({ params }: { params: Promise<{ id: string }> }) =>
await _generateMetadata(
(t) => t("booking_appearance"),
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/members/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/members/page.tsx
index 3cf44ce444e..965db9892a9 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/members/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/members/page.tsx
@@ -11,11 +11,10 @@ import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
import { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository";
import { prisma } from "@calcom/prisma";
import { viewerTeamsRouter } from "@calcom/trpc/server/routers/viewer/teams/_router";
+import { TeamMembersView } from "@calcom/web/modules/ee/teams/views/team-members-view";
import { buildLegacyRequest } from "@lib/buildLegacyCtx";
-import { TeamMembersView } from "~/teams/team-members-view";
-
export const generateMetadata = async ({ params }: { params: Promise<{ id: string }> }) =>
await _generateMetadata(
(t) => t("team_members"),
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/profile/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/profile/page.tsx
index 5f375e33e94..3f0a773871b 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/profile/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/profile/page.tsx
@@ -1,7 +1,7 @@
import { _generateMetadata, getTranslate } from "app/_utils";
-import LegacyPage from "@calcom/features/ee/teams/pages/team-profile-view";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
+import LegacyPage from "@calcom/web/modules/ee/teams/views/team-profile-view";
export const generateMetadata = async ({ params }: { params: Promise<{ id: string }> }) =>
await _generateMetadata(
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/settings/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/settings/page.tsx
index 4248d74740e..6f3e2afb35d 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/settings/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/settings/page.tsx
@@ -1,7 +1,7 @@
import { _generateMetadata, getTranslate } from "app/_utils";
-import TeamSettingsView from "@calcom/features/ee/teams/pages/team-settings-view";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
+import TeamSettingsView from "@calcom/web/modules/ee/teams/views/team-settings-view";
export const generateMetadata = async ({ params }: { params: Promise<{ id: string }> }) =>
await _generateMetadata(
diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-admin-only)/appearance/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-admin-only)/appearance/page.tsx
index 25872bcae6f..6e58e193f4c 100644
--- a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-admin-only)/appearance/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-admin-only)/appearance/page.tsx
@@ -1,6 +1,6 @@
import { _generateMetadata } from "app/_utils";
-import Page from "@calcom/features/ee/organizations/pages/settings/appearance";
+import Page from "~/ee/organizations/appearance";
export const generateMetadata = async () =>
await _generateMetadata(
diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/layout.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/layout.tsx
index 7403ef82cdf..eef834cf8b7 100644
--- a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/layout.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/layout.tsx
@@ -1,7 +1,8 @@
import { getTranslate } from "app/_utils";
import { CTA_CONTAINER_CLASS_NAME } from "@calcom/features/data-table/lib/utils";
-import Shell from "@calcom/features/shell/Shell";
+
+import Shell from "~/shell/Shell";
export default async function Layout({ children }: { children: React.ReactNode }) {
const t = await getTranslate();
diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/loading.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/loading.tsx
index 489822d2d6e..58084f89a3c 100644
--- a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/loading.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/loading.tsx
@@ -1,4 +1,4 @@
-import { UserListTableSkeleton } from "@calcom/features/users/components/UserTable/UserListTableSkeleton";
+import { UserListTableSkeleton } from "@calcom/web/modules/users/components/UserTable/UserListTableSkeleton";
export default function Loading() {
return <UserListTableSkeleton />;
diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/loading.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/loading.tsx
index 489822d2d6e..58084f89a3c 100644
--- a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/loading.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/loading.tsx
@@ -1,4 +1,4 @@
-import { UserListTableSkeleton } from "@calcom/features/users/components/UserTable/UserListTableSkeleton";
+import { UserListTableSkeleton } from "@calcom/web/modules/users/components/UserTable/UserListTableSkeleton";
export default function Loading() {
return <UserListTableSkeleton />;
diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/new/about/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/new/about/page.tsx
index 4ca32d74327..7ccfa20ee86 100644
--- a/apps/web/app/(use-page-wrapper)/settings/organizations/new/about/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/new/about/page.tsx
@@ -1,6 +1,6 @@
import { _generateMetadata } from "app/_utils";
-import LegacyPage, { LayoutWrapper } from "~/settings/organizations/new/about-view";
+import LegacyPage, { LayoutWrapper } from "~/ee/organizations/new/about-view";
export const generateMetadata = async () =>
await _generateMetadata(
diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/new/add-teams/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/new/add-teams/page.tsx
index 4894d1d695b..d10245f1ae7 100644
--- a/apps/web/app/(use-page-wrapper)/settings/organizations/new/add-teams/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/new/add-teams/page.tsx
@@ -1,6 +1,6 @@
import { _generateMetadata } from "app/_utils";
-import LegacyPage, { LayoutWrapper } from "~/settings/organizations/new/add-teams-view";
+import LegacyPage, { LayoutWrapper } from "~/ee/organizations/new/add-teams-view";
export const generateMetadata = async () =>
await _generateMetadata(
diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/new/handover/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/new/handover/page.tsx
index d78cb8ff1c7..b6ace5e0121 100644
--- a/apps/web/app/(use-page-wrapper)/settings/organizations/new/handover/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/new/handover/page.tsx
@@ -1,6 +1,6 @@
import { _generateMetadata } from "app/_utils";
-import LegacyPage, { LayoutWrapper } from "~/settings/organizations/new/onboarding-handover";
+import LegacyPage, { LayoutWrapper } from "~/ee/organizations/new/onboarding-handover";
export const generateMetadata = async () =>
await _generateMetadata(
diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/new/onboard-members/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/new/onboard-members/page.tsx
index d4903f8c044..fb35b9386a4 100644
--- a/apps/web/app/(use-page-wrapper)/settings/organizations/new/onboard-members/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/new/onboard-members/page.tsx
@@ -1,6 +1,6 @@
import { _generateMetadata } from "app/_utils";
-import LegacyPage, { LayoutWrapper } from "~/settings/organizations/new/onboard-members-view";
+import LegacyPage, { LayoutWrapper } from "~/ee/organizations/new/onboard-members-view";
export const generateMetadata = async () =>
await _generateMetadata(
diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/new/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/new/page.tsx
index e00cbee1432..380d92ed316 100644
--- a/apps/web/app/(use-page-wrapper)/settings/organizations/new/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/new/page.tsx
@@ -2,7 +2,7 @@ import { _generateMetadata } from "app/_utils";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
-import LegacyPage, { LayoutWrapper } from "~/settings/organizations/new/create-new-view";
+import LegacyPage, { LayoutWrapper } from "~/ee/organizations/new/create-new-view";
export const generateMetadata = async () =>
await _generateMetadata(
diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/new/resume/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/new/resume/page.tsx
index 3f4153df16f..275e47321ab 100644
--- a/apps/web/app/(use-page-wrapper)/settings/organizations/new/resume/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/new/resume/page.tsx
@@ -1,6 +1,6 @@
import { _generateMetadata } from "app/_utils";
-import ResumeOnboardingPage, { LayoutWrapper } from "~/settings/organizations/new/resume-view";
+import ResumeOnboardingPage, { LayoutWrapper } from "~/ee/organizations/new/resume-view";
export const generateMetadata = async () =>
await _generateMetadata(
diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/new/status/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/new/status/page.tsx
index 8d46b820525..f3b1c10f746 100644
--- a/apps/web/app/(use-page-wrapper)/settings/organizations/new/status/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/new/status/page.tsx
@@ -1,6 +1,6 @@
import { _generateMetadata } from "app/_utils";
-import LegacyPage, { LayoutWrapper } from "~/settings/organizations/new/payment-status-view";
+import LegacyPage, { LayoutWrapper } from "~/ee/organizations/new/payment-status-view";
export const generateMetadata = async () =>
await _generateMetadata(
diff --git a/apps/web/app/(use-page-wrapper)/settings/platform/members/layout.tsx b/apps/web/app/(use-page-wrapper)/settings/platform/members/layout.tsx
index 76a42b69f98..94dc169f9f8 100644
--- a/apps/web/app/(use-page-wrapper)/settings/platform/members/layout.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/platform/members/layout.tsx
@@ -1,9 +1,10 @@
import { getTranslate } from "app/_utils";
import { CTA_CONTAINER_CLASS_NAME } from "@calcom/features/data-table/lib/utils";
-import Shell from "@calcom/features/shell/Shell";
import { Button } from "@calcom/ui/components/button";
+import Shell from "~/shell/Shell";
+
export default async function Layout({ children }: { children: React.ReactNode }) {
const t = await getTranslate();
diff --git a/apps/web/app/(use-page-wrapper)/settings/platform/members/loading.tsx b/apps/web/app/(use-page-wrapper)/settings/platform/members/loading.tsx
index 489822d2d6e..58084f89a3c 100644
--- a/apps/web/app/(use-page-wrapper)/settings/platform/members/loading.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/platform/members/loading.tsx
@@ -1,4 +1,4 @@
-import { UserListTableSkeleton } from "@calcom/features/users/components/UserTable/UserListTableSkeleton";
+import { UserListTableSkeleton } from "@calcom/web/modules/users/components/UserTable/UserListTableSkeleton";
export default function Loading() {
return <UserListTableSkeleton />;
diff --git a/apps/web/app/(use-page-wrapper)/workflows/[workflow]/page.tsx b/apps/web/app/(use-page-wrapper)/workflows/[workflow]/page.tsx
index 0c2fd9147ac..9ef814bb49e 100644
--- a/apps/web/app/(use-page-wrapper)/workflows/[workflow]/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/workflows/[workflow]/page.tsx
@@ -4,7 +4,7 @@ import { z } from "zod";
// import { cookies, headers } from "next/headers";
// import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
// import { buildLegacyRequest } from "@lib/buildLegacyCtx";
-import LegacyPage from "@calcom/features/ee/workflows/pages/workflow";
+import LegacyPage from "@calcom/web/modules/ee/workflows/views/WorkflowPage";
const querySchema = z.object({
workflow: z
diff --git a/apps/web/app/(use-page-wrapper)/workflows/page.tsx b/apps/web/app/(use-page-wrapper)/workflows/page.tsx
index 1601dee104d..ec79c0151c5 100644
--- a/apps/web/app/(use-page-wrapper)/workflows/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/workflows/page.tsx
@@ -3,7 +3,7 @@
// import { buildLegacyRequest } from "@lib/buildLegacyCtx";
// import { getTeamsFiltersFromQuery } from "@calcom/features/filters/lib/getTeamsFiltersFromQuery";
// import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
-import LegacyPage from "@calcom/features/ee/workflows/pages/index";
+import LegacyPage from "@calcom/web/modules/ee/workflows/views/WorkflowsPage";
const Page = async () => {
// const session = await getServerSession({ req: buildLegacyRequest(await headers(), await cookies()) });
diff --git a/apps/web/app/api/support/conversation/route.ts b/apps/web/app/api/support/conversation/route.ts
index 3718f5cc141..c1bfed2cf58 100644
--- a/apps/web/app/api/support/conversation/route.ts
+++ b/apps/web/app/api/support/conversation/route.ts
@@ -4,14 +4,14 @@ import { NextResponse } from "next/server";
import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
import { BillingPlanService } from "@calcom/features/ee/billing/domain/billing-plans";
-import type { Contact } from "@calcom/features/ee/support/lib/intercom/intercom";
-import { intercom } from "@calcom/features/ee/support/lib/intercom/intercom";
import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
import { WEBAPP_URL, WEBSITE_URL } from "@calcom/lib/constants";
import logger from "@calcom/lib/logger";
import { safeStringify } from "@calcom/lib/safeStringify";
import { prisma } from "@calcom/prisma";
+import type { Contact } from "@calcom/web/modules/ee/support/lib/intercom/intercom";
+import { intercom } from "@calcom/web/modules/ee/support/lib/intercom/intercom";
import { buildLegacyRequest } from "@lib/buildLegacyCtx";
diff --git a/apps/web/components/EnterprisePage.tsx b/apps/web/components/EnterprisePage.tsx
index 13bd1527796..9a7b247eb2c 100644
--- a/apps/web/components/EnterprisePage.tsx
+++ b/apps/web/components/EnterprisePage.tsx
@@ -1,12 +1,13 @@
"use client";
-import Shell from "@calcom/features/shell/Shell";
-import { UpgradeTip } from "@calcom/features/tips";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { Button } from "@calcom/ui/components/button";
import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
import { Icon } from "@calcom/ui/components/icon";
+import Shell from "~/shell/Shell";
+import { UpgradeTip } from "~/shell/UpgradeTip";
+
export default function EnterprisePage() {
const { t } = useLocale();
diff --git a/apps/web/components/apps/App.tsx b/apps/web/components/apps/App.tsx
index 33f4f2028cf..ef36f2a2a76 100644
--- a/apps/web/components/apps/App.tsx
+++ b/apps/web/components/apps/App.tsx
@@ -1,7 +1,8 @@
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
-import Shell from "@calcom/features/shell/Shell";
import { useLocale } from "@calcom/lib/hooks/useLocale";
+import Shell from "~/shell/Shell";
+
import type { AppPageProps } from "./AppPage";
import { AppPage } from "./AppPage";
diff --git a/apps/web/components/apps/installation/EventTypeConferencingAppSettings.tsx b/apps/web/components/apps/installation/EventTypeConferencingAppSettings.tsx
index 4214e51884d..4354f43049e 100644
--- a/apps/web/components/apps/installation/EventTypeConferencingAppSettings.tsx
+++ b/apps/web/components/apps/installation/EventTypeConferencingAppSettings.tsx
@@ -2,11 +2,6 @@ import { useMemo } from "react";
import { useFormContext } from "react-hook-form";
import type { UseFormGetValues, UseFormSetValue, Control, FormState } from "react-hook-form";
-import type {
- TLocationOptions,
- TEventTypeLocation,
-} from "@calcom/features/eventtypes/components/locations/Locations";
-import Locations from "@calcom/features/eventtypes/components/locations/Locations";
import type { LocationFormValues } from "@calcom/features/eventtypes/lib/types";
import type { SingleValueLocationOption } from "@calcom/features/form/components/LocationSelect";
import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -20,6 +15,8 @@ import { QueryCell } from "@lib/QueryCell";
import type { TFormType } from "@components/apps/installation/ConfigureStepCard";
import type { TEventType } from "~/apps/installation/[[...step]]/step-view";
+import Locations from "~/event-types/components/locations/Locations";
+import type { TLocationOptions, TEventTypeLocation } from "~/event-types/components/locations/Locations";
const LocationsWrapper = ({
eventType,
diff --git a/apps/web/components/apps/layouts/AppsLayout.tsx b/apps/web/components/apps/layouts/AppsLayout.tsx
index 3ba1c1a35ca..0a89da77103 100644
--- a/apps/web/components/apps/layouts/AppsLayout.tsx
+++ b/apps/web/components/apps/layouts/AppsLayout.tsx
@@ -2,10 +2,11 @@ import { useRouter } from "next/navigation";
import type { ComponentProps } from "react";
import React from "react";
-import Shell from "@calcom/features/shell/Shell";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import Shell from "~/shell/Shell";
+
type AppsLayoutProps = {
children: React.ReactNode;
isAdmin: boolean;
diff --git a/apps/web/components/apps/layouts/InstalledAppsLayout.tsx b/apps/web/components/apps/layouts/InstalledAppsLayout.tsx
index cb8ff9b5c32..24f9de5e9c4 100644
--- a/apps/web/components/apps/layouts/InstalledAppsLayout.tsx
+++ b/apps/web/components/apps/layouts/InstalledAppsLayout.tsx
@@ -2,7 +2,8 @@ import type { ComponentProps } from "react";
import React from "react";
import AppCategoryNavigation from "@calcom/app-store/_components/AppCategoryNavigation";
-import Shell from "@calcom/features/shell/Shell";
+
+import Shell from "~/shell/Shell";
export default function InstalledAppsLayout({
children,
diff --git a/apps/web/components/apps/routing-forms/TestFormDialog.test.tsx b/apps/web/components/apps/routing-forms/TestFormDialog.test.tsx
index be21fbd2390..9c4b7e69185 100644
--- a/apps/web/components/apps/routing-forms/TestFormDialog.test.tsx
+++ b/apps/web/components/apps/routing-forms/TestFormDialog.test.tsx
@@ -60,7 +60,7 @@ function mockEventTypeRedirectUrlMatchingRoute() {
/**
* fixes the error due to Formbricks
*/
-vi.mock("@calcom/features/shell/Shell", () => ({
+vi.mock("@calcom/web/modules/shell/Shell", () => ({
ShellMain: vi.fn(),
}));
diff --git a/apps/web/components/booking/__tests__/CancelBooking.cancellationFee.test.tsx b/apps/web/components/booking/__tests__/CancelBooking.cancellationFee.test.tsx
index 2c4e4a04150..d61226b6837 100644
--- a/apps/web/components/booking/__tests__/CancelBooking.cancellationFee.test.tsx
+++ b/apps/web/components/booking/__tests__/CancelBooking.cancellationFee.test.tsx
@@ -10,7 +10,7 @@ beforeAll(() => {
Element.prototype.scrollIntoView = vi.fn();
});
-vi.mock("@calcom/trpc", () => ({
+vi.mock("@calcom/trpc/react", () => ({
trpc: {
viewer: {
bookings: {
diff --git a/apps/web/components/booking/actions/BookingActionsDropdown.tsx b/apps/web/components/booking/actions/BookingActionsDropdown.tsx
index e08f0906411..5d3b3fc331d 100644
--- a/apps/web/components/booking/actions/BookingActionsDropdown.tsx
+++ b/apps/web/components/booking/actions/BookingActionsDropdown.tsx
@@ -2,7 +2,7 @@ import { useState } from "react";
import type { z } from "zod";
import { MeetingSessionDetailsDialog } from "@calcom/features/ee/video/MeetingSessionDetailsDialog";
-import ViewRecordingsDialog from "@calcom/features/ee/video/ViewRecordingsDialog";
+import ViewRecordingsDialog from "~/ee/video/ViewRecordingsDialog";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { bookingMetadataSchema } from "@calcom/prisma/zod-utils";
import { trpc } from "@calcom/trpc/react";
diff --git a/apps/web/lib/app-providers-app-dir.tsx b/apps/web/lib/app-providers-app-dir.tsx
index 6bdddf12898..e26329f39ca 100644
--- a/apps/web/lib/app-providers-app-dir.tsx
+++ b/apps/web/lib/app-providers-app-dir.tsx
@@ -10,10 +10,10 @@ import { NuqsAdapter } from "nuqs/adapters/next/app";
import DynamicPostHogProvider from "@calcom/features/ee/event-tracking/lib/posthog/providerDynamic";
import DynamicPostHogPageView from "@calcom/features/ee/event-tracking/lib/posthog/web/pageViewDynamic";
import { OrgBrandingProvider } from "@calcom/features/ee/organizations/context/provider";
-import DynamicHelpscoutProvider from "@calcom/features/ee/support/lib/helpscout/providerDynamic";
-import DynamicIntercomProvider from "@calcom/features/ee/support/lib/intercom/providerDynamic";
import { FeatureProvider } from "@calcom/features/flags/context/provider";
import { useFlags } from "@calcom/features/flags/hooks";
+import DynamicHelpscoutProvider from "@calcom/web/modules/ee/support/lib/helpscout/providerDynamic";
+import DynamicIntercomProvider from "@calcom/web/modules/ee/support/lib/intercom/providerDynamic";
import useIsBookingPage from "@lib/hooks/useIsBookingPage";
import useIsThemeSupported from "@lib/hooks/useIsThemeSupported";
diff --git a/apps/web/lib/app-providers.tsx b/apps/web/lib/app-providers.tsx
index 1a9f3eb0758..a870a7c9f68 100644
--- a/apps/web/lib/app-providers.tsx
+++ b/apps/web/lib/app-providers.tsx
@@ -20,10 +20,10 @@ import type { PropsWithChildren, ReactNode } from "react";
import { useEffect } from "react";
import { OrgBrandingProvider } from "@calcom/features/ee/organizations/context/provider";
-import DynamicHelpscoutProvider from "@calcom/features/ee/support/lib/helpscout/providerDynamic";
-import DynamicIntercomProvider from "@calcom/features/ee/support/lib/intercom/providerDynamic";
import { FeatureProvider } from "@calcom/features/flags/context/provider";
import { useFlags } from "@calcom/features/flags/hooks";
+import DynamicHelpscoutProvider from "@calcom/web/modules/ee/support/lib/helpscout/providerDynamic";
+import DynamicIntercomProvider from "@calcom/web/modules/ee/support/lib/intercom/providerDynamic";
import useIsBookingPage from "@lib/hooks/useIsBookingPage";
import { useNuqsParams } from "@lib/hooks/useNuqsParams";
diff --git a/apps/web/modules/apps/categories/[category]/category-view.tsx b/apps/web/modules/apps/categories/[category]/category-view.tsx
index 7631b0ee2a5..ff79f2596ed 100644
--- a/apps/web/modules/apps/categories/[category]/category-view.tsx
+++ b/apps/web/modules/apps/categories/[category]/category-view.tsx
@@ -3,12 +3,13 @@
import Link from "next/link";
import { AppCard } from "@calcom/features/apps/components/AppCard";
-import Shell from "@calcom/features/shell/Shell";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { SkeletonText } from "@calcom/ui/components/skeleton";
import type { CategoryDataProps } from "@lib/apps/categories/[category]/getStaticProps";
+import Shell from "~/shell/Shell";
+
export default function Apps({ apps, category }: CategoryDataProps) {
const { t, isLocaleReady } = useLocale();
diff --git a/apps/web/modules/apps/categories/categories-view.tsx b/apps/web/modules/apps/categories/categories-view.tsx
index c73b4e2e73a..d7d89e0fc87 100644
--- a/apps/web/modules/apps/categories/categories-view.tsx
+++ b/apps/web/modules/apps/categories/categories-view.tsx
@@ -2,7 +2,6 @@
import Link from "next/link";
-import Shell from "@calcom/features/shell/Shell";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
import { Icon } from "@calcom/ui/components/icon";
@@ -10,6 +9,8 @@ import { SkeletonText } from "@calcom/ui/components/skeleton";
import type { getServerSideProps } from "@lib/apps/categories/getServerSideProps";
+import Shell from "~/shell/Shell";
+
export type PageProps = inferSSRProps<typeof getServerSideProps>;
export default function Apps({ categories }: PageProps) {
diff --git a/apps/web/modules/billing/components/UpgradeTeamsBadgeWebWrapper.tsx b/apps/web/modules/billing/components/UpgradeTeamsBadgeWebWrapper.tsx
new file mode 100644
index 00000000000..bf76cae45cd
--- /dev/null
+++ b/apps/web/modules/billing/components/UpgradeTeamsBadgeWebWrapper.tsx
@@ -0,0 +1,18 @@
+"use client";
+
+import { UpgradeTeamsBadge as UpgradeTeamsBadgeBase } from "@calcom/ui/components/badge";
+import { useHasPaidPlan, useHasActiveTeamPlan } from "@calcom/web/modules/billing/hooks/useHasPaidPlan";
+
+export function UpgradeTeamsBadgeWebWrapper({ checkForActiveStatus }: { checkForActiveStatus?: boolean }) {
+ const { hasPaidPlan } = useHasPaidPlan();
+ const { hasActiveTeamPlan, isTrial } = useHasActiveTeamPlan();
+
+ return (
+ <UpgradeTeamsBadgeBase
+ checkForActiveStatus={checkForActiveStatus}
+ hasPaidPlan={hasPaidPlan}
+ hasActiveTeamPlan={hasActiveTeamPlan}
+ isTrial={isTrial}
+ />
+ );
+}
diff --git a/packages/features/billing/hooks/useHasPaidPlan.ts b/apps/web/modules/billing/hooks/useHasPaidPlan.ts
similarity index 100%
rename from packages/features/billing/hooks/useHasPaidPlan.ts
rename to apps/web/modules/billing/hooks/useHasPaidPlan.ts
diff --git a/apps/web/modules/bookings/components/BookingCalendarView.tsx b/apps/web/modules/bookings/components/BookingCalendarView.tsx
index 0ed86bb0faf..1bea45ffcc9 100644
--- a/apps/web/modules/bookings/components/BookingCalendarView.tsx
+++ b/apps/web/modules/bookings/components/BookingCalendarView.tsx
@@ -6,8 +6,8 @@ import dayjs from "@calcom/dayjs";
import { useTimePreferences } from "@calcom/features/bookings/lib";
import { Calendar } from "@calcom/features/calendars/weeklyview";
import type { CalendarEvent } from "@calcom/features/calendars/weeklyview/types/events";
-import { useBanners } from "@calcom/features/shell/banners/useBanners";
import { useGetTheme } from "@calcom/lib/hooks/useTheme";
+import { useBanners } from "@calcom/web/modules/shell/banners/useBanners";
import { useBookingDetailsSheetStore } from "../store/bookingDetailsSheetStore";
import type { BookingOutput } from "../types";
diff --git a/packages/features/bookings/UnconfirmedBookingBadge.tsx b/apps/web/modules/bookings/components/UnconfirmedBookingBadge.tsx
similarity index 97%
rename from packages/features/bookings/UnconfirmedBookingBadge.tsx
rename to apps/web/modules/bookings/components/UnconfirmedBookingBadge.tsx
index c55320e8169..29df3635cc0 100644
--- a/packages/features/bookings/UnconfirmedBookingBadge.tsx
+++ b/apps/web/modules/bookings/components/UnconfirmedBookingBadge.tsx
@@ -1,3 +1,5 @@
+"use client";
+
import Link from "next/link";
import { useLocale } from "@calcom/lib/hooks/useLocale";
diff --git a/apps/web/modules/ee/LICENSE b/apps/web/modules/ee/LICENSE
new file mode 100644
index 00000000000..a8c67447583
--- /dev/null
+++ b/apps/web/modules/ee/LICENSE
@@ -0,0 +1,42 @@
+The Cal.com Commercial License (the “Commercial License”)
+Copyright (c) 2020-present Cal.com, Inc
+
+With regard to the Cal.com Software:
+
+This software and associated documentation files (the "Software") may only be
+used in production, if you (and any entity that you represent) have agreed to,
+and are in compliance with, the Cal.com Subscription Terms available
+at https://cal.com/terms, or other agreements governing
+the use of the Software, as mutually agreed by you and Cal.com, Inc ("Cal.com"),
+and otherwise have a valid Cal.com Enterprise Edition subscription ("Commercial Subscription")
+for the correct number of hosts as defined in the "Commercial Terms ("Hosts"). Subject to the foregoing sentence,
+you are free to modify this Software and publish patches to the Software. You agree
+that Cal.com and/or its licensors (as applicable) retain all right, title and interest in
+and to all such modifications and/or patches, and all such modifications and/or
+patches may only be used, copied, modified, displayed, distributed, or otherwise
+exploited with a valid Commercial Subscription for the correct number of hosts.
+Notwithstanding the foregoing, you may copy and modify the Software for development
+and testing purposes, without requiring a subscription. You agree that Cal.com and/or
+its licensors (as applicable) retain all right, title and interest in and to all such
+modifications. You are not granted any other rights beyond what is expressly stated herein.
+Subject to the foregoing, it is forbidden to copy, merge, publish, distribute, sublicense,
+and/or sell the Software.
+
+This Commercial License applies only to the part of this Software that is not distributed under
+the AGPLv3 license. Any part of this Software distributed under the MIT license or which
+is served client-side as an image, font, cascading stylesheet (CSS), file which produces
+or is compiled, arranged, augmented, or combined into client-side JavaScript, in whole or
+in part, is copyrighted under the AGPLv3 license. The full text of this Commercial License shall
+be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+For all third party components incorporated into the Cal.com Software, those
+components are licensed under the original license provided by the owner of the
+applicable component.
diff --git a/packages/features/ee/organizations/pages/settings/admin-api.tsx b/apps/web/modules/ee/organizations/admin-api.tsx
similarity index 97%
rename from packages/features/ee/organizations/pages/settings/admin-api.tsx
rename to apps/web/modules/ee/organizations/admin-api.tsx
index 43ae635c551..16f4bc59d40 100644
--- a/packages/features/ee/organizations/pages/settings/admin-api.tsx
+++ b/apps/web/modules/ee/organizations/admin-api.tsx
@@ -1,12 +1,13 @@
"use client";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
-import { UpgradeTip } from "@calcom/features/tips";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { Button } from "@calcom/ui/components/button";
import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
import { Icon } from "@calcom/ui/components/icon";
+import { UpgradeTip } from "~/shell/UpgradeTip";
+
export const AdminAPIView = () => {
const { t } = useLocale();
diff --git a/packages/features/ee/organizations/pages/settings/admin/AdminOrgEditPage.tsx b/apps/web/modules/ee/organizations/admin/AdminOrgEditPage.tsx
similarity index 100%
rename from packages/features/ee/organizations/pages/settings/admin/AdminOrgEditPage.tsx
rename to apps/web/modules/ee/organizations/admin/AdminOrgEditPage.tsx
diff --git a/packages/features/ee/organizations/pages/settings/admin/AdminOrgPage.tsx b/apps/web/modules/ee/organizations/admin/AdminOrgPage.tsx
similarity index 98%
rename from packages/features/ee/organizations/pages/settings/admin/AdminOrgPage.tsx
rename to apps/web/modules/ee/organizations/admin/AdminOrgPage.tsx
index 5b98a031c77..85ef95c4809 100644
--- a/packages/features/ee/organizations/pages/settings/admin/AdminOrgPage.tsx
+++ b/apps/web/modules/ee/organizations/admin/AdminOrgPage.tsx
@@ -3,6 +3,7 @@
import { useState } from "react";
import { Dialog } from "@calcom/features/components/controlled-dialog";
+import { subdomainSuffix } from "@calcom/features/ee/organizations/lib/orgDomains";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import { Badge } from "@calcom/ui/components/badge";
@@ -10,8 +11,6 @@ import { ConfirmationDialogContent } from "@calcom/ui/components/dialog";
import { DropdownActions, Table } from "@calcom/ui/components/table";
import { showToast } from "@calcom/ui/components/toast";
-import { subdomainSuffix } from "../../../../organizations/lib/orgDomains";
-
const { Body, Cell, ColumnTitle, Header, Row } = Table;
export function AdminOrgTable() {
@@ -251,7 +250,7 @@ const DeleteOrgDialog = ({
cancelBtnText={t("cancel")}
variety="danger"
onConfirm={onConfirm}>
- <ul className="ml-4 mt-5 list-disc stack-y-2">
+ <ul className="stack-y-2 ml-4 mt-5 list-disc">
<li>{t("admin_delete_organization_description_1")}</li>
<li>{t("admin_delete_organization_description_2")}</li>
<li>{t("admin_delete_organization_description_3")}</li>
diff --git a/packages/features/ee/organizations/pages/settings/admin/WorkspacePlatformPage.tsx b/apps/web/modules/ee/organizations/admin/WorkspacePlatformPage.tsx
similarity index 99%
rename from packages/features/ee/organizations/pages/settings/admin/WorkspacePlatformPage.tsx
rename to apps/web/modules/ee/organizations/admin/WorkspacePlatformPage.tsx
index 63ec6724ca6..e0045315581 100644
--- a/packages/features/ee/organizations/pages/settings/admin/WorkspacePlatformPage.tsx
+++ b/apps/web/modules/ee/organizations/admin/WorkspacePlatformPage.tsx
@@ -137,7 +137,7 @@ function EmptyState({ onAdd }: Pick<Props, "onAdd">) {
const { t } = useLocale();
return (
- <div className="flex flex-col items-center justify-center stack-y-4 py-10">
+ <div className="stack-y-4 flex flex-col items-center justify-center py-10">
<p className="text-gray-500">{t("no_workspace_platforms")}</p>
<Button color="secondary" onClick={onAdd}>
{t("add")}
diff --git a/packages/features/ee/organizations/pages/settings/appearance.tsx b/apps/web/modules/ee/organizations/appearance.tsx
similarity index 100%
rename from packages/features/ee/organizations/pages/settings/appearance.tsx
rename to apps/web/modules/ee/organizations/appearance.tsx
diff --git a/packages/features/ee/organizations/pages/settings/attributes/AttributesForm.tsx b/apps/web/modules/ee/organizations/attributes/AttributesForm.tsx
similarity index 100%
rename from packages/features/ee/organizations/pages/settings/attributes/AttributesForm.tsx
rename to apps/web/modules/ee/organizations/attributes/AttributesForm.tsx
diff --git a/packages/features/ee/organizations/pages/settings/attributes/DeleteAttributeModal.tsx b/apps/web/modules/ee/organizations/attributes/DeleteAttributeModal.tsx
similarity index 100%
rename from packages/features/ee/organizations/pages/settings/attributes/DeleteAttributeModal.tsx
rename to apps/web/modules/ee/organizations/attributes/DeleteAttributeModal.tsx
diff --git a/packages/features/ee/organizations/pages/settings/attributes/ListSkeleton.tsx b/apps/web/modules/ee/organizations/attributes/ListSkeleton.tsx
similarity index 100%
rename from packages/features/ee/organizations/pages/settings/attributes/ListSkeleton.tsx
rename to apps/web/modules/ee/organizations/attributes/ListSkeleton.tsx
diff --git a/packages/features/ee/organizations/pages/settings/attributes/__tests__/AttributeForm.test.ts b/apps/web/modules/ee/organizations/attributes/__tests__/AttributeForm.test.ts
similarity index 97%
rename from packages/features/ee/organizations/pages/settings/attributes/__tests__/AttributeForm.test.ts
rename to apps/web/modules/ee/organizations/attributes/__tests__/AttributeForm.test.ts
index 7df9ba7396c..3f2ce95224d 100644
--- a/packages/features/ee/organizations/pages/settings/attributes/__tests__/AttributeForm.test.ts
+++ b/apps/web/modules/ee/organizations/attributes/__tests__/AttributeForm.test.ts
@@ -1,6 +1,5 @@
import { describe, it, expect } from "vitest";
-import "../../../../../../../ui/components/test-setup";
import { getGroupOptionUpdate } from "../AttributesForm";
describe("getGroupOptionUpdate", () => {
diff --git a/packages/features/ee/organizations/pages/settings/attributes/__tests__/AttributeForm.test.tsx b/apps/web/modules/ee/organizations/attributes/__tests__/AttributeForm.test.tsx
similarity index 96%
rename from packages/features/ee/organizations/pages/settings/attributes/__tests__/AttributeForm.test.tsx
rename to apps/web/modules/ee/organizations/attributes/__tests__/AttributeForm.test.tsx
index 916e7bf9757..e15faa255a6 100644
--- a/packages/features/ee/organizations/pages/settings/attributes/__tests__/AttributeForm.test.tsx
+++ b/apps/web/modules/ee/organizations/attributes/__tests__/AttributeForm.test.tsx
@@ -10,20 +10,23 @@ import { Button } from "@calcom/ui/components/button";
import { AttributeForm } from "../AttributesForm";
vi.mock("@calcom/lib/hooks/useLocale", () => ({
- useLocale: vi.fn(() => ({
+ useLocale: () => ({
t: (key: string) => key,
- })),
+ }),
+}));
+
+vi.mock("@calcom/lib/hooks/useCompatSearchParams", () => ({
+ useCompatSearchParams: () => new URLSearchParams(),
}));
vi.mock("next/navigation", async (importOriginal) => {
const actual = await importOriginal<typeof import("next/navigation")>();
return {
...actual,
- useRouter: vi.fn(() => ({
- push: vi.fn(() => {
- return;
- }),
- })),
+ useRouter: () => ({
+ push: vi.fn(),
+ }),
+ usePathname: () => "/settings/organizations/attributes",
};
});
diff --git a/packages/features/ee/organizations/pages/settings/attributes/attributes-create-view.tsx b/apps/web/modules/ee/organizations/attributes/attributes-create-view.tsx
similarity index 100%
rename from packages/features/ee/organizations/pages/settings/attributes/attributes-create-view.tsx
rename to apps/web/modules/ee/organizations/attributes/attributes-create-view.tsx
diff --git a/packages/features/ee/organizations/pages/settings/attributes/attributes-edit-view.tsx b/apps/web/modules/ee/organizations/attributes/attributes-edit-view.tsx
similarity index 100%
rename from packages/features/ee/organizations/pages/settings/attributes/attributes-edit-view.tsx
rename to apps/web/modules/ee/organizations/attributes/attributes-edit-view.tsx
diff --git a/packages/features/ee/organizations/pages/settings/attributes/attributes-list-view.tsx b/apps/web/modules/ee/organizations/attributes/attributes-list-view.tsx
similarity index 100%
rename from packages/features/ee/organizations/pages/settings/attributes/attributes-list-view.tsx
rename to apps/web/modules/ee/organizations/attributes/attributes-list-view.tsx
diff --git a/packages/features/ee/organizations/pages/settings/delegationCredential.tsx b/apps/web/modules/ee/organizations/delegationCredential.tsx
similarity index 99%
rename from packages/features/ee/organizations/pages/settings/delegationCredential.tsx
rename to apps/web/modules/ee/organizations/delegationCredential.tsx
index a05777b84e1..a66c6fededb 100644
--- a/packages/features/ee/organizations/pages/settings/delegationCredential.tsx
+++ b/apps/web/modules/ee/organizations/delegationCredential.tsx
@@ -403,7 +403,7 @@ function DelegationCredentialList() {
return (
<div>
- {!!delegations?.length ? (
+ {delegations?.length ? (
<>
<ul className="stack-y-2 [&>*:last-child]:rounded-b-xl">
{delegations.map(
diff --git a/packages/features/ee/organizations/pages/settings/general.tsx b/apps/web/modules/ee/organizations/general.tsx
similarity index 92%
rename from packages/features/ee/organizations/pages/settings/general.tsx
rename to apps/web/modules/ee/organizations/general.tsx
index 7de1e1418d1..8fbbe163da0 100644
--- a/packages/features/ee/organizations/pages/settings/general.tsx
+++ b/apps/web/modules/ee/organizations/general.tsx
@@ -7,6 +7,10 @@ import { Controller, useForm } from "react-hook-form";
import { TimezoneSelect } from "@calcom/features/components/timezone-select";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
+import { DisableAutofillOnBookingPageSwitch } from "@calcom/features/ee/organizations/pages/components/DisableAutofillOnBookingPageSwitch";
+import { DisablePhoneOnlySMSNotificationsSwitch } from "@calcom/features/ee/organizations/pages/components/DisablePhoneOnlySMSNotificationsSwitch";
+import { LockEventTypeSwitch } from "@calcom/features/ee/organizations/pages/components/LockEventTypeSwitch";
+import { NoSlotsNotificationSwitch } from "@calcom/features/ee/organizations/pages/components/NoSlotsNotificationSwitch";
import SectionBottomActions from "@calcom/features/settings/SectionBottomActions";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { nameOfDay } from "@calcom/lib/weekday";
@@ -20,15 +24,10 @@ import { Select } from "@calcom/ui/components/form";
import { SkeletonButton, SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
import { showToast } from "@calcom/ui/components/toast";
-import { DisableAutofillOnBookingPageSwitch } from "../components/DisableAutofillOnBookingPageSwitch";
-import { DisablePhoneOnlySMSNotificationsSwitch } from "../components/DisablePhoneOnlySMSNotificationsSwitch";
-import { LockEventTypeSwitch } from "../components/LockEventTypeSwitch";
-import { NoSlotsNotificationSwitch } from "../components/NoSlotsNotificationSwitch";
-
const SkeletonLoader = () => {
return (
<SkeletonContainer>
- <div className="mb-8 mt-6 stack-y-6">
+ <div className="stack-y-6 mb-8 mt-6">
<SkeletonText className="h-8 w-full" />
<SkeletonText className="h-8 w-full" />
<SkeletonText className="h-8 w-full" />
diff --git a/packages/features/ee/organizations/pages/settings/guest-notifications.tsx b/apps/web/modules/ee/organizations/guest-notifications.tsx
similarity index 95%
rename from packages/features/ee/organizations/pages/settings/guest-notifications.tsx
rename to apps/web/modules/ee/organizations/guest-notifications.tsx
index 64ae6508f86..8d33443b807 100644
--- a/packages/features/ee/organizations/pages/settings/guest-notifications.tsx
+++ b/apps/web/modules/ee/organizations/guest-notifications.tsx
@@ -4,7 +4,7 @@ import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequir
import { trpc } from "@calcom/trpc/react";
import { SkeletonContainer, SkeletonText, SkeletonButton } from "@calcom/ui/components/skeleton";
-import DisableGuestBookingEmailsSetting from "../components/DisableGuestBookingEmailsSetting";
+import DisableGuestBookingEmailsSetting from "@calcom/features/ee/organizations/pages/components/DisableGuestBookingEmailsSetting";
const SkeletonLoader = () => {
return (
diff --git a/apps/web/modules/settings/organizations/new/_components/AddNewTeamsForm.tsx b/apps/web/modules/ee/organizations/new/_components/AddNewTeamsForm.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/new/_components/AddNewTeamsForm.tsx
rename to apps/web/modules/ee/organizations/new/_components/AddNewTeamsForm.tsx
diff --git a/apps/web/modules/settings/organizations/new/_components/OnboardMembersView.tsx b/apps/web/modules/ee/organizations/new/_components/OnboardMembersView.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/new/_components/OnboardMembersView.tsx
rename to apps/web/modules/ee/organizations/new/_components/OnboardMembersView.tsx
diff --git a/apps/web/modules/settings/organizations/new/_components/OrganizationWizardLayout.tsx b/apps/web/modules/ee/organizations/new/_components/OrganizationWizardLayout.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/new/_components/OrganizationWizardLayout.tsx
rename to apps/web/modules/ee/organizations/new/_components/OrganizationWizardLayout.tsx
diff --git a/apps/web/modules/settings/organizations/new/_components/PaymentStatusView.tsx b/apps/web/modules/ee/organizations/new/_components/PaymentStatusView.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/new/_components/PaymentStatusView.tsx
rename to apps/web/modules/ee/organizations/new/_components/PaymentStatusView.tsx
diff --git a/apps/web/modules/settings/organizations/new/about-view.tsx b/apps/web/modules/ee/organizations/new/about-view.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/new/about-view.tsx
rename to apps/web/modules/ee/organizations/new/about-view.tsx
diff --git a/apps/web/modules/settings/organizations/new/add-teams-view.tsx b/apps/web/modules/ee/organizations/new/add-teams-view.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/new/add-teams-view.tsx
rename to apps/web/modules/ee/organizations/new/add-teams-view.tsx
diff --git a/apps/web/modules/settings/organizations/new/create-new-view.tsx b/apps/web/modules/ee/organizations/new/create-new-view.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/new/create-new-view.tsx
rename to apps/web/modules/ee/organizations/new/create-new-view.tsx
diff --git a/apps/web/modules/settings/organizations/new/flow.mermaid b/apps/web/modules/ee/organizations/new/flow.mermaid
similarity index 100%
rename from apps/web/modules/settings/organizations/new/flow.mermaid
rename to apps/web/modules/ee/organizations/new/flow.mermaid
diff --git a/apps/web/modules/settings/organizations/new/onboard-members-view.tsx b/apps/web/modules/ee/organizations/new/onboard-members-view.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/new/onboard-members-view.tsx
rename to apps/web/modules/ee/organizations/new/onboard-members-view.tsx
diff --git a/apps/web/modules/settings/organizations/new/onboarding-handover.tsx b/apps/web/modules/ee/organizations/new/onboarding-handover.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/new/onboarding-handover.tsx
rename to apps/web/modules/ee/organizations/new/onboarding-handover.tsx
diff --git a/apps/web/modules/settings/organizations/new/payment-status-view.tsx b/apps/web/modules/ee/organizations/new/payment-status-view.tsx
similarity index 77%
rename from apps/web/modules/settings/organizations/new/payment-status-view.tsx
rename to apps/web/modules/ee/organizations/new/payment-status-view.tsx
index 4fb5c57d111..0d26f3aab65 100644
--- a/apps/web/modules/settings/organizations/new/payment-status-view.tsx
+++ b/apps/web/modules/ee/organizations/new/payment-status-view.tsx
@@ -1,6 +1,6 @@
"use client";
-import PaymentStatusView from "~/settings/organizations/new/_components/PaymentStatusView";
+import PaymentStatusView from "~/ee/organizations/new/_components/PaymentStatusView";
import { OrganizationWizardLayout } from "./_components/OrganizationWizardLayout";
diff --git a/apps/web/modules/settings/organizations/new/resume-view.tsx b/apps/web/modules/ee/organizations/new/resume-view.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/new/resume-view.tsx
rename to apps/web/modules/ee/organizations/new/resume-view.tsx
diff --git a/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx b/apps/web/modules/ee/organizations/other-team-members-view.tsx
similarity index 96%
rename from packages/features/ee/organizations/pages/settings/other-team-members-view.tsx
rename to apps/web/modules/ee/organizations/other-team-members-view.tsx
index 7107f59d9c0..c9d5a7bba3c 100644
--- a/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx
+++ b/apps/web/modules/ee/organizations/other-team-members-view.tsx
@@ -6,8 +6,8 @@ import { useSession } from "next-auth/react";
import { useRouter } from "next/navigation";
import { useState, useEffect } from "react";
-import MemberInvitationModal from "@calcom/ee/teams/components/MemberInvitationModal";
import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
+import MemberListItem from "@calcom/features/ee/organizations/pages/components/MemberListItem";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
import { CreationSource } from "@calcom/prisma/enums";
@@ -17,8 +17,8 @@ import { Button } from "@calcom/ui/components/button";
import { showToast } from "@calcom/ui/components/toast";
import { revalidateTeamsList } from "@calcom/web/app/(use-page-wrapper)/(main-nav)/teams/actions";
-import MakeTeamPrivateSwitch from "../../../teams/components/MakeTeamPrivateSwitch";
-import MemberListItem from "../components/MemberListItem";
+import MakeTeamPrivateSwitch from "~/ee/teams/components/MakeTeamPrivateSwitch";
+import MemberInvitationModal from "~/ee/teams/components/MemberInvitationModal";
type Members = RouterOutputs["viewer"]["organizations"]["listOtherTeamMembers"]["rows"];
type Team = RouterOutputs["viewer"]["organizations"]["getOtherTeam"];
diff --git a/packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx b/apps/web/modules/ee/organizations/other-team-profile-view.tsx
similarity index 98%
rename from packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx
rename to apps/web/modules/ee/organizations/other-team-profile-view.tsx
index 16e45dda7d4..12ba8ff1636 100644
--- a/packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx
+++ b/apps/web/modules/ee/organizations/other-team-profile-view.tsx
@@ -8,6 +8,7 @@ import { Controller, useForm } from "react-hook-form";
import { z } from "zod";
import { Dialog } from "@calcom/features/components/controlled-dialog";
+import { subdomainSuffix } from "@calcom/features/ee/organizations/lib/orgDomains";
import { trackFormbricksAction } from "@calcom/features/formbricks/formbricks-client";
import { IS_TEAM_BILLING_ENABLED_CLIENT, WEBAPP_URL } from "@calcom/lib/constants";
import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
@@ -32,8 +33,6 @@ import { SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton"
import { showToast } from "@calcom/ui/components/toast";
import { revalidateTeamDataCache } from "@calcom/web/app/(booking-page-wrapper)/team/[slug]/[type]/actions";
-import { subdomainSuffix } from "../../../organizations/lib/orgDomains";
-
const regex = new RegExp("^[a-zA-Z0-9-]*$");
const teamProfileFormSchema = z.object({
@@ -267,7 +266,7 @@ const OtherTeamProfileView = () => {
<Label className="text-emphasis mt-5">{t("about")}</Label>
<div
className=" text-subtle wrap-break-word text-sm [&_a]:text-blue-500 [&_a]:underline [&_a]:hover:text-blue-600"
- // eslint-disable-next-line react/no-danger
+
dangerouslySetInnerHTML={{ __html: markdownToSafeHTML(team.bio) }}
/>
</>
diff --git a/packages/features/ee/organizations/pages/settings/privacy.tsx b/apps/web/modules/ee/organizations/privacy.tsx
similarity index 89%
rename from packages/features/ee/organizations/pages/settings/privacy.tsx
rename to apps/web/modules/ee/organizations/privacy.tsx
index ca029baab2f..62caa7f807d 100644
--- a/packages/features/ee/organizations/pages/settings/privacy.tsx
+++ b/apps/web/modules/ee/organizations/privacy.tsx
@@ -5,13 +5,12 @@ import { usePathname } from "next/navigation";
import { DataTableProvider } from "@calcom/features/data-table";
import { useSegments } from "@calcom/features/data-table/hooks/useSegments";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
-import MakeTeamPrivateSwitch from "@calcom/features/ee/teams/components/MakeTeamPrivateSwitch";
+import OrgAutoJoinSetting from "@calcom/features/ee/organizations/pages/components/OrgAutoJoinSetting";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { BlocklistTable } from "~/settings/organizations/privacy/blocklist-table";
-
-import OrgAutoJoinSetting from "../components/OrgAutoJoinSetting";
+import { BlocklistTable } from "~/ee/organizations/privacy/blocklist-table";
+import MakeTeamPrivateSwitch from "~/ee/teams/components/MakeTeamPrivateSwitch";
const PrivacyView = ({
permissions,
diff --git a/apps/web/modules/settings/organizations/privacy/blocklist-table.tsx b/apps/web/modules/ee/organizations/privacy/blocklist-table.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/privacy/blocklist-table.tsx
rename to apps/web/modules/ee/organizations/privacy/blocklist-table.tsx
diff --git a/apps/web/modules/settings/organizations/privacy/components/PendingReportsBadge.tsx b/apps/web/modules/ee/organizations/privacy/components/PendingReportsBadge.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/privacy/components/PendingReportsBadge.tsx
rename to apps/web/modules/ee/organizations/privacy/components/PendingReportsBadge.tsx
diff --git a/apps/web/modules/settings/organizations/privacy/components/blocked-entries-columns.tsx b/apps/web/modules/ee/organizations/privacy/components/blocked-entries-columns.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/privacy/components/blocked-entries-columns.tsx
rename to apps/web/modules/ee/organizations/privacy/components/blocked-entries-columns.tsx
diff --git a/apps/web/modules/settings/organizations/privacy/components/blocked-entries-table.tsx b/apps/web/modules/ee/organizations/privacy/components/blocked-entries-table.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/privacy/components/blocked-entries-table.tsx
rename to apps/web/modules/ee/organizations/privacy/components/blocked-entries-table.tsx
diff --git a/apps/web/modules/settings/organizations/privacy/components/blocklist-entry-details-sheet.tsx b/apps/web/modules/ee/organizations/privacy/components/blocklist-entry-details-sheet.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/privacy/components/blocklist-entry-details-sheet.tsx
rename to apps/web/modules/ee/organizations/privacy/components/blocklist-entry-details-sheet.tsx
diff --git a/apps/web/modules/settings/organizations/privacy/components/booking-report-entry-details-modal.tsx b/apps/web/modules/ee/organizations/privacy/components/booking-report-entry-details-modal.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/privacy/components/booking-report-entry-details-modal.tsx
rename to apps/web/modules/ee/organizations/privacy/components/booking-report-entry-details-modal.tsx
diff --git a/apps/web/modules/settings/organizations/privacy/components/create-blocklist-entry-modal.tsx b/apps/web/modules/ee/organizations/privacy/components/create-blocklist-entry-modal.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/privacy/components/create-blocklist-entry-modal.tsx
rename to apps/web/modules/ee/organizations/privacy/components/create-blocklist-entry-modal.tsx
diff --git a/apps/web/modules/settings/organizations/privacy/components/pending-reports-columns.tsx b/apps/web/modules/ee/organizations/privacy/components/pending-reports-columns.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/privacy/components/pending-reports-columns.tsx
rename to apps/web/modules/ee/organizations/privacy/components/pending-reports-columns.tsx
diff --git a/apps/web/modules/settings/organizations/privacy/components/pending-reports-table.tsx b/apps/web/modules/ee/organizations/privacy/components/pending-reports-table.tsx
similarity index 100%
rename from apps/web/modules/settings/organizations/privacy/components/pending-reports-table.tsx
rename to apps/web/modules/ee/organizations/privacy/components/pending-reports-table.tsx
diff --git a/packages/features/ee/organizations/pages/settings/profile.tsx b/apps/web/modules/ee/organizations/profile.tsx
similarity index 98%
rename from packages/features/ee/organizations/pages/settings/profile.tsx
rename to apps/web/modules/ee/organizations/profile.tsx
index ec84ac03d0d..0cb3433a6c2 100644
--- a/packages/features/ee/organizations/pages/settings/profile.tsx
+++ b/apps/web/modules/ee/organizations/profile.tsx
@@ -7,8 +7,8 @@ import { Controller, useForm } from "react-hook-form";
import { z } from "zod";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
+import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
import { subdomainSuffix } from "@calcom/features/ee/organizations/lib/orgDomains";
-import OrgAppearanceViewWrapper from "@calcom/features/ee/organizations/pages/settings/appearance";
import SectionBottomActions from "@calcom/features/settings/SectionBottomActions";
import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -37,7 +37,7 @@ import {
import { showToast } from "@calcom/ui/components/toast";
import { Tooltip } from "@calcom/ui/components/tooltip";
-import { useOrgBranding } from "../../../organizations/context/provider";
+import OrgAppearanceViewWrapper from "./appearance";
const orgProfileFormSchema = z.object({
name: z.string(),
@@ -150,7 +150,7 @@ const OrgProfileView = ({
<Label className="text-emphasis mt-5">{t("about")}</Label>
<div
className=" text-subtle wrap-break-word text-sm [&_a]:text-blue-500 [&_a]:underline [&_a]:hover:text-blue-600"
- // eslint-disable-next-line react/no-danger
+
dangerouslySetInnerHTML={{
__html: markdownToSafeHTML(currentOrganisation.bio || ""),
}}
diff --git a/packages/features/ee/support/components/ContactMenuItem.tsx b/apps/web/modules/ee/support/components/ContactMenuItem.tsx
similarity index 82%
rename from packages/features/ee/support/components/ContactMenuItem.tsx
rename to apps/web/modules/ee/support/components/ContactMenuItem.tsx
index 02c7e83a22c..8feb0d507e1 100644
--- a/packages/features/ee/support/components/ContactMenuItem.tsx
+++ b/apps/web/modules/ee/support/components/ContactMenuItem.tsx
@@ -1,8 +1,9 @@
-import { useHasPaidPlan } from "@calcom/features/billing/hooks/useHasPaidPlan";
import { JOIN_COMMUNITY } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { UpgradeTeamsBadge } from "@calcom/ui/components/badge";
import { Icon } from "@calcom/ui/components/icon";
+import { useHasPaidPlan } from "@calcom/web/modules/billing/hooks/useHasPaidPlan";
+
+import { UpgradeTeamsBadgeWebWrapper } from "~/billing/components/UpgradeTeamsBadgeWebWrapper";
import FreshChatMenuItem from "../lib/freshchat/FreshChatMenuItem";
import HelpscoutMenuItem from "../lib/helpscout/HelpscoutMenuItem";
@@ -27,13 +28,14 @@ export default function ContactMenuItem(props: ContactMenuItem) {
) : (
<div className=" hover:text-emphasis text-default flex w-full cursor-not-allowed justify-between px-5 py-2 pr-4 text-sm font-medium">
{t("premium_support")}
- <UpgradeTeamsBadge />
+ <UpgradeTeamsBadgeWebWrapper />
</div>
)}
<a
href={JOIN_COMMUNITY}
target="_blank"
- className="hover:bg-subtle hover:text-emphasis text-default flex w-full px-5 py-2 pr-4 text-sm font-medium transition">
+ className="hover:bg-subtle hover:text-emphasis text-default flex w-full px-5 py-2 pr-4 text-sm font-medium transition"
+ rel="noreferrer">
{t("community_support")}{" "}
<Icon
name="external-link"
diff --git a/packages/features/ee/support/components/IntercomContactForm.tsx b/apps/web/modules/ee/support/components/IntercomContactForm.tsx
similarity index 100%
rename from packages/features/ee/support/components/IntercomContactForm.tsx
rename to apps/web/modules/ee/support/components/IntercomContactForm.tsx
diff --git a/packages/features/ee/support/lib/freshchat/FreshChatMenuItem.tsx b/apps/web/modules/ee/support/lib/freshchat/FreshChatMenuItem.tsx
similarity index 100%
rename from packages/features/ee/support/lib/freshchat/FreshChatMenuItem.tsx
rename to apps/web/modules/ee/support/lib/freshchat/FreshChatMenuItem.tsx
diff --git a/packages/features/ee/support/lib/freshchat/FreshChatProvider.tsx b/apps/web/modules/ee/support/lib/freshchat/FreshChatProvider.tsx
similarity index 100%
rename from packages/features/ee/support/lib/freshchat/FreshChatProvider.tsx
rename to apps/web/modules/ee/support/lib/freshchat/FreshChatProvider.tsx
diff --git a/packages/features/ee/support/lib/freshchat/FreshChatScript.tsx b/apps/web/modules/ee/support/lib/freshchat/FreshChatScript.tsx
similarity index 89%
rename from packages/features/ee/support/lib/freshchat/FreshChatScript.tsx
rename to apps/web/modules/ee/support/lib/freshchat/FreshChatScript.tsx
index cea44925c6b..d723386744f 100644
--- a/packages/features/ee/support/lib/freshchat/FreshChatScript.tsx
+++ b/apps/web/modules/ee/support/lib/freshchat/FreshChatScript.tsx
@@ -11,9 +11,9 @@ declare global {
}
}
-// eslint-disable-next-line turbo/no-undeclared-env-vars
+
const host = process.env.NEXT_PUBLIC_FRESHCHAT_HOST;
-// eslint-disable-next-line turbo/no-undeclared-env-vars
+
const token = process.env.NEXT_PUBLIC_FRESHCHAT_TOKEN;
export const isFreshChatEnabled =
diff --git a/packages/features/ee/support/lib/helpscout/HelpscoutMenuItem.tsx b/apps/web/modules/ee/support/lib/helpscout/HelpscoutMenuItem.tsx
similarity index 94%
rename from packages/features/ee/support/lib/helpscout/HelpscoutMenuItem.tsx
rename to apps/web/modules/ee/support/lib/helpscout/HelpscoutMenuItem.tsx
index 545ed1b2dda..d113a6d0154 100644
--- a/packages/features/ee/support/lib/helpscout/HelpscoutMenuItem.tsx
+++ b/apps/web/modules/ee/support/lib/helpscout/HelpscoutMenuItem.tsx
@@ -20,7 +20,7 @@ export default function HelpscoutMenuItem(props: HelpscoutMenuItemProps) {
onHelpItemSelect();
}
- // eslint-disable-next-line turbo/no-undeclared-env-vars
+
if (!process.env.NEXT_PUBLIC_HELPSCOUT_KEY) return null;
return (
diff --git a/packages/features/ee/support/lib/helpscout/provider.tsx b/apps/web/modules/ee/support/lib/helpscout/provider.tsx
similarity index 100%
rename from packages/features/ee/support/lib/helpscout/provider.tsx
rename to apps/web/modules/ee/support/lib/helpscout/provider.tsx
diff --git a/packages/features/ee/support/lib/helpscout/providerDynamic.tsx b/apps/web/modules/ee/support/lib/helpscout/providerDynamic.tsx
similarity index 100%
rename from packages/features/ee/support/lib/helpscout/providerDynamic.tsx
rename to apps/web/modules/ee/support/lib/helpscout/providerDynamic.tsx
diff --git a/packages/features/ee/support/lib/intercom/intercom.ts b/apps/web/modules/ee/support/lib/intercom/intercom.ts
similarity index 100%
rename from packages/features/ee/support/lib/intercom/intercom.ts
rename to apps/web/modules/ee/support/lib/intercom/intercom.ts
diff --git a/packages/features/ee/support/lib/intercom/provider.tsx b/apps/web/modules/ee/support/lib/intercom/provider.tsx
similarity index 90%
rename from packages/features/ee/support/lib/intercom/provider.tsx
rename to apps/web/modules/ee/support/lib/intercom/provider.tsx
index 0acf58161c3..523717e3d84 100644
--- a/packages/features/ee/support/lib/intercom/provider.tsx
+++ b/apps/web/modules/ee/support/lib/intercom/provider.tsx
@@ -5,11 +5,12 @@ import { usePathname, useRouter, useSearchParams } from "next/navigation";
import { useEffect, type FC } from "react";
import { IntercomProvider } from "react-use-intercom";
-import { useBootIntercom } from "@calcom/ee/support/lib/intercom/useIntercom";
-import useHasPaidPlan from "@calcom/features/billing/hooks/useHasPaidPlan";
-import { IntercomContactForm } from "@calcom/features/ee/support/components/IntercomContactForm";
import { useFlagMap } from "@calcom/features/flags/context/provider";
import useMediaQuery from "@calcom/lib/hooks/useMediaQuery";
+import { useHasPaidPlan } from "@calcom/web/modules/billing/hooks/useHasPaidPlan";
+import { useBootIntercom } from "@calcom/web/modules/ee/support/lib/intercom/useIntercom";
+
+import { IntercomContactForm } from "~/ee/support/components/IntercomContactForm";
declare global {
interface Window {
diff --git a/packages/features/ee/support/lib/intercom/providerDynamic.tsx b/apps/web/modules/ee/support/lib/intercom/providerDynamic.tsx
similarity index 100%
rename from packages/features/ee/support/lib/intercom/providerDynamic.tsx
rename to apps/web/modules/ee/support/lib/intercom/providerDynamic.tsx
diff --git a/packages/features/ee/support/lib/intercom/useIntercom.ts b/apps/web/modules/ee/support/lib/intercom/useIntercom.ts
similarity index 97%
rename from packages/features/ee/support/lib/intercom/useIntercom.ts
rename to apps/web/modules/ee/support/lib/intercom/useIntercom.ts
index 41b83da9c8a..e60cfc9e23f 100644
--- a/packages/features/ee/support/lib/intercom/useIntercom.ts
+++ b/apps/web/modules/ee/support/lib/intercom/useIntercom.ts
@@ -5,12 +5,12 @@ import { useIntercom as useIntercomLib } from "react-use-intercom";
import { z } from "zod";
import dayjs from "@calcom/dayjs";
-import { useHasTeamPlan, useHasPaidPlan } from "@calcom/features/billing/hooks/useHasPaidPlan";
import { useFlagMap } from "@calcom/features/flags/context/provider";
import { WEBAPP_URL, WEBSITE_URL } from "@calcom/lib/constants";
import useMediaQuery from "@calcom/lib/hooks/useMediaQuery";
import { localStorage } from "@calcom/lib/webstorage";
import { trpc } from "@calcom/trpc/react";
+import { useHasTeamPlan, useHasPaidPlan } from "@calcom/web/modules/billing/hooks/useHasPaidPlan";
export const isInterComEnabled = z.string().min(1).safeParse(process.env.NEXT_PUBLIC_INTERCOM_APP_ID).success;
@@ -181,6 +181,7 @@ export const useBootIntercom = () => {
};
window.dispatchEvent(new Event("support:ready"));
}
+ // eslint-disable-next-line react-hooks/exhaustive-deps
}, [user, statsData, hasPaidPlan, isTieredSupportEnabled]);
};
diff --git a/packages/features/ee/support/lib/zendesk/ZendeskMenuItem.tsx b/apps/web/modules/ee/support/lib/zendesk/ZendeskMenuItem.tsx
similarity index 94%
rename from packages/features/ee/support/lib/zendesk/ZendeskMenuItem.tsx
rename to apps/web/modules/ee/support/lib/zendesk/ZendeskMenuItem.tsx
index 9d16a4d5889..0c96adbefff 100644
--- a/packages/features/ee/support/lib/zendesk/ZendeskMenuItem.tsx
+++ b/apps/web/modules/ee/support/lib/zendesk/ZendeskMenuItem.tsx
@@ -3,7 +3,7 @@ import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-// eslint-disable-next-line turbo/no-undeclared-env-vars
+
const ZENDESK_KEY = process.env.NEXT_PUBLIC_ZENDESK_KEY;
interface ZendeskMenuItemProps {
diff --git a/packages/features/ee/teams/components/AddNewTeamMembers.tsx b/apps/web/modules/ee/teams/components/AddNewTeamMembers.tsx
similarity index 97%
rename from packages/features/ee/teams/components/AddNewTeamMembers.tsx
rename to apps/web/modules/ee/teams/components/AddNewTeamMembers.tsx
index f447510a1d3..a30dd845059 100644
--- a/packages/features/ee/teams/components/AddNewTeamMembers.tsx
+++ b/apps/web/modules/ee/teams/components/AddNewTeamMembers.tsx
@@ -3,13 +3,11 @@
import { keepPreviousData } from "@tanstack/react-query";
import { useSession } from "next-auth/react";
import { useRouter } from "next/navigation";
-import { useState, useMemo } from "react";
import posthog from "posthog-js";
+import { useState, useMemo } from "react";
import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
-import InviteLinkSettingsModal from "@calcom/features/ee/teams/components/InviteLinkSettingsModal";
-import { MemberInvitationModalWithoutMembers } from "@calcom/features/ee/teams/components/MemberInvitationModal";
import { APP_NAME } from "@calcom/lib/constants";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -22,6 +20,9 @@ import { Badge } from "@calcom/ui/components/badge";
import { Button } from "@calcom/ui/components/button";
import { SkeletonButton, SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
import { showToast } from "@calcom/ui/components/toast";
+import InviteLinkSettingsModal from "@calcom/web/modules/ee/teams/components/InviteLinkSettingsModal";
+
+import { MemberInvitationModalWithoutMembers } from "~/ee/teams/components/MemberInvitationModal";
type TeamMember = RouterOutputs["viewer"]["teams"]["listMembers"]["members"][number];
diff --git a/packages/features/ee/teams/components/CreateANewTeamForm.tsx b/apps/web/modules/ee/teams/components/CreateANewTeamForm.tsx
similarity index 95%
rename from packages/features/ee/teams/components/CreateANewTeamForm.tsx
rename to apps/web/modules/ee/teams/components/CreateANewTeamForm.tsx
index 097a5950b02..00a880a4c28 100644
--- a/packages/features/ee/teams/components/CreateANewTeamForm.tsx
+++ b/apps/web/modules/ee/teams/components/CreateANewTeamForm.tsx
@@ -1,9 +1,12 @@
"use client";
+import posthog from "posthog-js";
import { useState } from "react";
import { Controller, useForm } from "react-hook-form";
-import posthog from "posthog-js";
+import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
+import { subdomainSuffix } from "@calcom/features/ee/organizations/lib/orgDomains";
+import type { NewTeamFormValues } from "@calcom/features/ee/teams/lib/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import slugify from "@calcom/lib/slugify";
import type { RouterOutputs } from "@calcom/trpc/react";
@@ -16,10 +19,6 @@ import { TextField } from "@calcom/ui/components/form";
import { revalidateEventTypesList } from "@calcom/web/app/(use-page-wrapper)/(main-nav)/event-types/actions";
import { revalidateTeamsList } from "@calcom/web/app/(use-page-wrapper)/(main-nav)/teams/actions";
-import { useOrgBranding } from "../../organizations/context/provider";
-import { subdomainSuffix } from "../../organizations/lib/orgDomains";
-import type { NewTeamFormValues } from "../lib/types";
-
interface CreateANewTeamFormProps {
onCancel: () => void;
submitLabel: string;
@@ -107,7 +106,7 @@ export const CreateANewTeamForm = (props: CreateANewTeamFormProps) => {
defaultValue=""
rules={{
required: t("must_enter_team_name"),
- validate: (value) => value.trim().length > 0 || t("must_enter_team_name")
+ validate: (value) => value.trim().length > 0 || t("must_enter_team_name"),
}}
render={({ field: { value } }) => (
<>
diff --git a/packages/features/ee/teams/components/DeleteBulkTeamMembers.tsx b/apps/web/modules/ee/teams/components/DeleteBulkTeamMembers.tsx
similarity index 100%
rename from packages/features/ee/teams/components/DeleteBulkTeamMembers.tsx
rename to apps/web/modules/ee/teams/components/DeleteBulkTeamMembers.tsx
diff --git a/packages/features/ee/teams/components/DisableTeamImpersonation.tsx b/apps/web/modules/ee/teams/components/DisableTeamImpersonation.tsx
similarity index 100%
rename from packages/features/ee/teams/components/DisableTeamImpersonation.tsx
rename to apps/web/modules/ee/teams/components/DisableTeamImpersonation.tsx
diff --git a/packages/features/ee/teams/components/EditMemberSheet.test.tsx b/apps/web/modules/ee/teams/components/EditMemberSheet.test.tsx
similarity index 93%
rename from packages/features/ee/teams/components/EditMemberSheet.test.tsx
rename to apps/web/modules/ee/teams/components/EditMemberSheet.test.tsx
index 77f8e480db0..0a7cbb653e5 100644
--- a/packages/features/ee/teams/components/EditMemberSheet.test.tsx
+++ b/apps/web/modules/ee/teams/components/EditMemberSheet.test.tsx
@@ -2,10 +2,10 @@ import { render } from "@testing-library/react";
import React, { type ReactNode } from "react";
import { vi } from "vitest";
-import type { MemberPermissions } from "@calcom/features/users/components/UserTable/types";
import { MembershipRole } from "@calcom/prisma/enums";
+import { EditMemberSheet } from "@calcom/web/modules/ee/teams/components/EditMemberSheet";
+import type { MemberPermissions } from "@calcom/web/modules/users/components/UserTable/types";
-import { EditMemberSheet } from "./EditMemberSheet";
import type { State, User } from "./MemberList";
// Mock dependencies
@@ -71,8 +71,15 @@ vi.mock("@calcom/trpc/react", () => ({
const mockSetEditMode = vi.fn();
const mockSetMutationLoading = vi.fn();
-vi.mock("@calcom/features/users/components/UserTable/EditSheet/store", () => ({
- useEditMode: vi.fn((selector) => {
+vi.mock("@calcom/web/modules/users/components/UserTable/EditSheet/store", () => ({
+ useEditMode: (
+ selector: (state: {
+ editMode: boolean;
+ setEditMode: typeof mockSetEditMode;
+ mutationLoading: boolean;
+ setMutationLoading: typeof mockSetMutationLoading;
+ }) => unknown
+ ) => {
const state = {
editMode: false,
setEditMode: mockSetEditMode,
@@ -83,12 +90,12 @@ vi.mock("@calcom/features/users/components/UserTable/EditSheet/store", () => ({
return selector(state);
}
return state;
- }),
+ },
}));
// Mock SheetFooterControls to verify props
let capturedProps: { canChangeMemberRole?: boolean; canEditAttributesForUser?: boolean }[] = [];
-vi.mock("@calcom/features/users/components/UserTable/EditSheet/SheetFooterControls", () => ({
+vi.mock("@calcom/web/modules/users/components/UserTable/EditSheet/SheetFooterControls", () => ({
SheetFooterControls: (props: { canChangeMemberRole?: boolean; canEditAttributesForUser?: boolean }) => {
capturedProps.push(props);
return React.createElement("div", { "data-testid": "sheet-footer-controls" }, "SheetFooterControls");
@@ -124,7 +131,7 @@ vi.mock("@calcom/ui/components/skeleton", () => ({
Loader: () => React.createElement("div", { "data-testid": "loader" }, "Loading..."),
}));
-vi.mock("@calcom/features/users/components/UserTable/EditSheet/DisplayInfo", () => ({
+vi.mock("@calcom/web/modules/users/components/UserTable/EditSheet/DisplayInfo", () => ({
DisplayInfo: () => <div data-testid="display-info">DisplayInfo</div>,
}));
diff --git a/packages/features/ee/teams/components/EditMemberSheet.tsx b/apps/web/modules/ee/teams/components/EditMemberSheet.tsx
similarity index 95%
rename from packages/features/ee/teams/components/EditMemberSheet.tsx
rename to apps/web/modules/ee/teams/components/EditMemberSheet.tsx
index 8a3e10e1e07..d8be9d9ffc8 100644
--- a/packages/features/ee/teams/components/EditMemberSheet.tsx
+++ b/apps/web/modules/ee/teams/components/EditMemberSheet.tsx
@@ -5,10 +5,6 @@ import { useForm } from "react-hook-form";
import { z } from "zod";
import { shallow } from "zustand/shallow";
-import { DisplayInfo } from "@calcom/features/users/components/UserTable/EditSheet/DisplayInfo";
-import { SheetFooterControls } from "@calcom/features/users/components/UserTable/EditSheet/SheetFooterControls";
-import { useEditMode } from "@calcom/features/users/components/UserTable/EditSheet/store";
-import type { MemberPermissions } from "@calcom/features/users/components/UserTable/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { MembershipRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
@@ -20,6 +16,10 @@ import { Sheet, SheetContent, SheetFooter, SheetHeader, SheetBody } from "@calco
import { Skeleton, Loader } from "@calcom/ui/components/skeleton";
import { showToast } from "@calcom/ui/components/toast";
import { Tooltip } from "@calcom/ui/components/tooltip";
+import { DisplayInfo } from "@calcom/web/modules/users/components/UserTable/EditSheet/DisplayInfo";
+import { SheetFooterControls } from "@calcom/web/modules/users/components/UserTable/EditSheet/SheetFooterControls";
+import { useEditMode } from "@calcom/web/modules/users/components/UserTable/EditSheet/store";
+import type { MemberPermissions } from "@calcom/web/modules/users/components/UserTable/types";
import { updateRoleInCache, getUpdatedUser } from "./MemberChangeRoleModal";
import type { Action, State, User } from "./MemberList";
@@ -61,7 +61,7 @@ export function EditMemberSheet({
const bookerUrl = selectedUser.bookerUrl;
const utils = trpc.useUtils();
const bookerUrlWithoutProtocol = bookerUrl.replace(/^https?:\/\//, "");
- const bookingLink = !!selectedUser.username ? `${bookerUrlWithoutProtocol}/${selectedUser.username}` : "";
+ const bookingLink = selectedUser.username ? `${bookerUrlWithoutProtocol}/${selectedUser.username}` : "";
// Load custom roles for the team
const { data: customRoles, isPending: isLoadingRoles } = trpc.viewer.pbac.getTeamRoles.useQuery(
diff --git a/packages/features/ee/teams/components/EventTypesList.tsx b/apps/web/modules/ee/teams/components/EventTypesList.tsx
similarity index 100%
rename from packages/features/ee/teams/components/EventTypesList.tsx
rename to apps/web/modules/ee/teams/components/EventTypesList.tsx
diff --git a/packages/features/ee/teams/components/GoogleWorkspaceInviteButton.tsx b/apps/web/modules/ee/teams/components/GoogleWorkspaceInviteButton.tsx
similarity index 100%
rename from packages/features/ee/teams/components/GoogleWorkspaceInviteButton.tsx
rename to apps/web/modules/ee/teams/components/GoogleWorkspaceInviteButton.tsx
index 876607f5efc..b67d1c93736 100644
--- a/packages/features/ee/teams/components/GoogleWorkspaceInviteButton.tsx
+++ b/apps/web/modules/ee/teams/components/GoogleWorkspaceInviteButton.tsx
@@ -5,9 +5,9 @@ import { useFlagMap } from "@calcom/features/flags/context/provider";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
import { trpc } from "@calcom/trpc/react";
+import { Button } from "@calcom/ui/components/button";
import { showToast } from "@calcom/ui/components/toast";
import { Tooltip } from "@calcom/ui/components/tooltip";
-import { Button } from "@calcom/ui/components/button";
const GoogleIcon = () => (
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/packages/features/ee/teams/components/InternalNotePresetsView.tsx b/apps/web/modules/ee/teams/components/InternalNotePresetsView.tsx
similarity index 100%
rename from packages/features/ee/teams/components/InternalNotePresetsView.tsx
rename to apps/web/modules/ee/teams/components/InternalNotePresetsView.tsx
diff --git a/packages/features/ee/teams/components/InviteLinkSettingsModal.tsx b/apps/web/modules/ee/teams/components/InviteLinkSettingsModal.tsx
similarity index 100%
rename from packages/features/ee/teams/components/InviteLinkSettingsModal.tsx
rename to apps/web/modules/ee/teams/components/InviteLinkSettingsModal.tsx
diff --git a/packages/features/ee/teams/components/MakeTeamPrivateSwitch.tsx b/apps/web/modules/ee/teams/components/MakeTeamPrivateSwitch.tsx
similarity index 100%
rename from packages/features/ee/teams/components/MakeTeamPrivateSwitch.tsx
rename to apps/web/modules/ee/teams/components/MakeTeamPrivateSwitch.tsx
diff --git a/packages/features/ee/teams/components/MemberChangeRoleModal.tsx b/apps/web/modules/ee/teams/components/MemberChangeRoleModal.tsx
similarity index 96%
rename from packages/features/ee/teams/components/MemberChangeRoleModal.tsx
rename to apps/web/modules/ee/teams/components/MemberChangeRoleModal.tsx
index 8b8411201fb..5c99c121126 100644
--- a/packages/features/ee/teams/components/MemberChangeRoleModal.tsx
+++ b/apps/web/modules/ee/teams/components/MemberChangeRoleModal.tsx
@@ -8,8 +8,7 @@ import { trpc } from "@calcom/trpc/react";
import { Button } from "@calcom/ui/components/button";
import { DialogContent, DialogFooter } from "@calcom/ui/components/dialog";
import { Select } from "@calcom/ui/components/form";
-
-import type { User } from "./MemberList";
+import type { User } from "@calcom/web/modules/ee/teams/components/MemberList";
type MembershipRoleOption = {
label: string;
@@ -158,9 +157,7 @@ export default function MemberChangeRoleModal(props: {
<>
<div className="mb-4 sm:flex sm:items-start">
<div className="text-center sm:text-left">
- <h3
- className="text-emphasis !font-cal text-semibold text-xl font-medium"
- id="modal-title">
+ <h3 className="text-emphasis !font-cal text-semibold text-xl font-medium" id="modal-title">
{t("change_member_role")}
</h3>
</div>
diff --git a/packages/features/ee/teams/components/MemberInvitationModal.tsx b/apps/web/modules/ee/teams/components/MemberInvitationModal.tsx
similarity index 98%
rename from packages/features/ee/teams/components/MemberInvitationModal.tsx
rename to apps/web/modules/ee/teams/components/MemberInvitationModal.tsx
index ab162630e72..531635316a9 100644
--- a/packages/features/ee/teams/components/MemberInvitationModal.tsx
+++ b/apps/web/modules/ee/teams/components/MemberInvitationModal.tsx
@@ -1,12 +1,13 @@
import { useSession } from "next-auth/react";
+import posthog from "posthog-js";
import type { FormEvent } from "react";
import { useMemo, useRef, useState } from "react";
import { Controller, useForm } from "react-hook-form";
-import posthog from "posthog-js";
import TeamInviteFromOrg from "@calcom/ee/organizations/components/TeamInviteFromOrg";
import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
import { Dialog } from "@calcom/features/components/controlled-dialog";
+import type { PendingMember } from "@calcom/features/ee/teams/lib/types";
import ServerTrans from "@calcom/lib/components/ServerTrans";
import { IS_TEAM_BILLING_ENABLED_CLIENT, MAX_NB_INVITES } from "@calcom/lib/constants";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
@@ -29,7 +30,6 @@ import { Icon } from "@calcom/ui/components/icon";
import { showToast } from "@calcom/ui/components/toast";
import { revalidateTeamsList } from "@calcom/web/app/(use-page-wrapper)/(main-nav)/teams/actions";
-import type { PendingMember } from "../lib/types";
import { GoogleWorkspaceInviteButton } from "./GoogleWorkspaceInviteButton";
type MemberInvitationModalProps = {
@@ -236,7 +236,12 @@ export default function MemberInvitationModal(props: MemberInvitationModalProps)
/>
</div>
- <Form form={newMemberFormMethods} handleSubmit={(values) => { props.onSubmit(values, resetFields); posthog.capture("teams_modal_invite_members_button_clicked") }}>
+ <Form
+ form={newMemberFormMethods}
+ handleSubmit={(values) => {
+ props.onSubmit(values, resetFields);
+ posthog.capture("teams_modal_invite_members_button_clicked");
+ }}>
<div className="mb-10 mt-6 space-y-6">
{/* Individual Invite */}
{modalImportMode === "INDIVIDUAL" && (
diff --git a/packages/features/ee/teams/components/MemberList.tsx b/apps/web/modules/ee/teams/components/MemberList.tsx
similarity index 98%
rename from packages/features/ee/teams/components/MemberList.tsx
rename to apps/web/modules/ee/teams/components/MemberList.tsx
index 2efe7dc5dfe..33b7f7e238b 100644
--- a/packages/features/ee/teams/components/MemberList.tsx
+++ b/apps/web/modules/ee/teams/components/MemberList.tsx
@@ -10,10 +10,10 @@ import {
} from "@tanstack/react-table";
import classNames from "classnames";
import { useSession } from "next-auth/react";
-import posthog from "posthog-js";
import { signIn } from "next-auth/react";
import { usePathname } from "next/navigation";
import { useQueryState, parseAsBoolean } from "nuqs";
+import posthog from "posthog-js";
import { useMemo, useReducer, useRef, useState } from "react";
import type { Dispatch, SetStateAction } from "react";
@@ -30,8 +30,6 @@ import {
convertFacetedValuesToMap,
} from "@calcom/features/data-table";
import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
-import { DynamicLink } from "@calcom/features/users/components/UserTable/BulkActions/DynamicLink";
-import type { MemberPermissions } from "@calcom/features/users/components/UserTable/types";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -59,11 +57,13 @@ import {
import { Checkbox } from "@calcom/ui/components/form";
import { showToast } from "@calcom/ui/components/toast";
import { Tooltip } from "@calcom/ui/components/tooltip";
+import TeamAvailabilityModal from "@calcom/web/modules/ee/teams/components/TeamAvailabilityModal";
+import { DynamicLink } from "@calcom/web/modules/users/components/UserTable/BulkActions/DynamicLink";
+import type { MemberPermissions } from "@calcom/web/modules/users/components/UserTable/types";
import DeleteBulkTeamMembers from "./DeleteBulkTeamMembers";
import { EditMemberSheet } from "./EditMemberSheet";
import { EventTypesList } from "./EventTypesList";
-import TeamAvailabilityModal from "./TeamAvailabilityModal";
interface Props {
team: NonNullable<RouterOutputs["viewer"]["teams"]["get"]>;
@@ -727,7 +727,10 @@ function MemberListContent(props: Props) {
type="button"
color="primary"
StartIcon="plus"
- onClick={() => { props.setShowMemberInvitationModal(true); posthog.capture("teams_add_new_members_button_clicked") }}
+ onClick={() => {
+ props.setShowMemberInvitationModal(true);
+ posthog.capture("teams_add_new_members_button_clicked");
+ }}
data-testid="new-member-button">
{t("add")}
</DataTableToolbar.CTA>
diff --git a/packages/features/ee/teams/components/RoundRobinResetInterval.tsx b/apps/web/modules/ee/teams/components/RoundRobinResetInterval.tsx
similarity index 100%
rename from packages/features/ee/teams/components/RoundRobinResetInterval.tsx
rename to apps/web/modules/ee/teams/components/RoundRobinResetInterval.tsx
diff --git a/packages/features/ee/teams/components/RoundRobinSettings.tsx b/apps/web/modules/ee/teams/components/RoundRobinSettings.tsx
similarity index 100%
rename from packages/features/ee/teams/components/RoundRobinSettings.tsx
rename to apps/web/modules/ee/teams/components/RoundRobinSettings.tsx
diff --git a/packages/features/ee/teams/components/RoundRobinTimestampBasis.tsx b/apps/web/modules/ee/teams/components/RoundRobinTimestampBasis.tsx
similarity index 100%
rename from packages/features/ee/teams/components/RoundRobinTimestampBasis.tsx
rename to apps/web/modules/ee/teams/components/RoundRobinTimestampBasis.tsx
diff --git a/packages/features/ee/teams/components/SkeletonLoaderAvailabilityTimes.tsx b/apps/web/modules/ee/teams/components/SkeletonLoaderAvailabilityTimes.tsx
similarity index 100%
rename from packages/features/ee/teams/components/SkeletonLoaderAvailabilityTimes.tsx
rename to apps/web/modules/ee/teams/components/SkeletonLoaderAvailabilityTimes.tsx
diff --git a/packages/features/ee/teams/components/SkeletonloaderTeamList.tsx b/apps/web/modules/ee/teams/components/SkeletonloaderTeamList.tsx
similarity index 100%
rename from packages/features/ee/teams/components/SkeletonloaderTeamList.tsx
rename to apps/web/modules/ee/teams/components/SkeletonloaderTeamList.tsx
diff --git a/packages/features/ee/teams/components/TeamAvailabilityModal.tsx b/apps/web/modules/ee/teams/components/TeamAvailabilityModal.tsx
similarity index 100%
rename from packages/features/ee/teams/components/TeamAvailabilityModal.tsx
rename to apps/web/modules/ee/teams/components/TeamAvailabilityModal.tsx
diff --git a/packages/features/ee/teams/components/TeamAvailabilityTimes.tsx b/apps/web/modules/ee/teams/components/TeamAvailabilityTimes.tsx
similarity index 100%
rename from packages/features/ee/teams/components/TeamAvailabilityTimes.tsx
rename to apps/web/modules/ee/teams/components/TeamAvailabilityTimes.tsx
diff --git a/packages/features/ee/teams/components/TeamEventTypeForm.tsx b/apps/web/modules/ee/teams/components/TeamEventTypeForm.tsx
similarity index 100%
rename from packages/features/ee/teams/components/TeamEventTypeForm.tsx
rename to apps/web/modules/ee/teams/components/TeamEventTypeForm.tsx
diff --git a/packages/features/ee/teams/components/TeamInviteList.tsx b/apps/web/modules/ee/teams/components/TeamInviteList.tsx
similarity index 100%
rename from packages/features/ee/teams/components/TeamInviteList.tsx
rename to apps/web/modules/ee/teams/components/TeamInviteList.tsx
diff --git a/packages/features/ee/teams/components/TeamInviteListItem.tsx b/apps/web/modules/ee/teams/components/TeamInviteListItem.tsx
similarity index 100%
rename from packages/features/ee/teams/components/TeamInviteListItem.tsx
rename to apps/web/modules/ee/teams/components/TeamInviteListItem.tsx
diff --git a/packages/features/ee/teams/components/TeamList.tsx b/apps/web/modules/ee/teams/components/TeamList.tsx
similarity index 100%
rename from packages/features/ee/teams/components/TeamList.tsx
rename to apps/web/modules/ee/teams/components/TeamList.tsx
diff --git a/packages/features/ee/teams/components/TeamListItem.tsx b/apps/web/modules/ee/teams/components/TeamListItem.tsx
similarity index 97%
rename from packages/features/ee/teams/components/TeamListItem.tsx
rename to apps/web/modules/ee/teams/components/TeamListItem.tsx
index b67e216ef65..0bb594525ec 100644
--- a/packages/features/ee/teams/components/TeamListItem.tsx
+++ b/apps/web/modules/ee/teams/components/TeamListItem.tsx
@@ -2,8 +2,6 @@ import Link from "next/link";
import { useRouter } from "next/navigation";
import { useState } from "react";
-import InviteLinkSettingsModal from "@calcom/ee/teams/components/InviteLinkSettingsModal";
-import { MemberInvitationModalWithoutMembers } from "@calcom/ee/teams/components/MemberInvitationModal";
import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
import { Dialog } from "@calcom/features/components/controlled-dialog";
import { getTeamUrlSync } from "@calcom/features/ee/organizations/lib/getTeamUrlSync";
@@ -32,6 +30,9 @@ import { showToast } from "@calcom/ui/components/toast";
import { Tooltip } from "@calcom/ui/components/tooltip";
import { revalidateTeamsList } from "@calcom/web/app/(use-page-wrapper)/(main-nav)/teams/actions";
+import { MemberInvitationModalWithoutMembers } from "~/ee/teams/components/MemberInvitationModal";
+
+import InviteLinkSettingsModal from "./InviteLinkSettingsModal";
import { TeamRole } from "./TeamPill";
interface Props {
@@ -134,7 +135,11 @@ export default function TeamListItem(props: Props) {
}}
/>
)}
- <div className={classNames("flex items-center justify-between", !isInvitee && "hover:bg-cal-muted group")}>
+ <div
+ className={classNames(
+ "flex items-center justify-between",
+ !isInvitee && "hover:bg-cal-muted group"
+ )}>
{!isInvitee ? (
team.slug ? (
<Link
diff --git a/packages/features/ee/teams/components/TeamPill.tsx b/apps/web/modules/ee/teams/components/TeamPill.tsx
similarity index 100%
rename from packages/features/ee/teams/components/TeamPill.tsx
rename to apps/web/modules/ee/teams/components/TeamPill.tsx
diff --git a/packages/features/ee/teams/components/TeamsListing.tsx b/apps/web/modules/ee/teams/components/TeamsListing.tsx
similarity index 97%
rename from packages/features/ee/teams/components/TeamsListing.tsx
rename to apps/web/modules/ee/teams/components/TeamsListing.tsx
index cb09138825f..063243e9730 100644
--- a/packages/features/ee/teams/components/TeamsListing.tsx
+++ b/apps/web/modules/ee/teams/components/TeamsListing.tsx
@@ -3,7 +3,6 @@
import { useRouter, useSearchParams } from "next/navigation";
import { useEffect, useMemo } from "react";
-import SkeletonLoaderTeamList from "@calcom/features/ee/teams/components/SkeletonloaderTeamList";
import { APP_NAME, WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
@@ -14,7 +13,9 @@ import { Label } from "@calcom/ui/components/form";
import { Icon } from "@calcom/ui/components/icon";
import { showToast } from "@calcom/ui/components/toast";
-import { UpgradeTip } from "../../../tips";
+import SkeletonLoaderTeamList from "~/ee/teams/components/SkeletonloaderTeamList";
+import { UpgradeTip } from "~/shell/UpgradeTip";
+
import TeamList from "./TeamList";
type TeamsListingProps = {
diff --git a/packages/features/ee/teams/components/TeamsUpgradeBanner.tsx b/apps/web/modules/ee/teams/components/TeamsUpgradeBanner.tsx
similarity index 100%
rename from packages/features/ee/teams/components/TeamsUpgradeBanner.tsx
rename to apps/web/modules/ee/teams/components/TeamsUpgradeBanner.tsx
diff --git a/packages/features/ee/teams/components/createButton/CreateButton.tsx b/apps/web/modules/ee/teams/components/createButton/CreateButton.tsx
similarity index 98%
rename from packages/features/ee/teams/components/createButton/CreateButton.tsx
rename to apps/web/modules/ee/teams/components/createButton/CreateButton.tsx
index f1c92a936d0..a2170e2dca1 100644
--- a/packages/features/ee/teams/components/createButton/CreateButton.tsx
+++ b/apps/web/modules/ee/teams/components/createButton/CreateButton.tsx
@@ -81,7 +81,7 @@ export function CreateButton(props: CreateBtnProps) {
<Button
size="sm"
onClick={() =>
- !!CreateDialog
+ CreateDialog
? openModal(options[0])
: createFunction
? createFunction(options[0].teamId || undefined)
@@ -118,7 +118,7 @@ export function CreateButton(props: CreateBtnProps) {
data-testid={`option${option.teamId ? "-team" : ""}-${idx}`}
CustomStartIcon={<Avatar alt={option.label || ""} imageSrc={option.image} size="sm" />}
onClick={() =>
- !!CreateDialog
+ CreateDialog
? openModal(option)
: createFunction
? createFunction(option.teamId || undefined, option.platform)
diff --git a/packages/features/ee/teams/components/createButton/CreateButtonWithTeamsList.tsx b/apps/web/modules/ee/teams/components/createButton/CreateButtonWithTeamsList.tsx
similarity index 100%
rename from packages/features/ee/teams/components/createButton/CreateButtonWithTeamsList.tsx
rename to apps/web/modules/ee/teams/components/createButton/CreateButtonWithTeamsList.tsx
diff --git a/packages/features/ee/teams/components/createButton/create-button-with-teams-list.test.tsx b/apps/web/modules/ee/teams/components/createButton/create-button-with-teams-list.test.tsx
similarity index 100%
rename from packages/features/ee/teams/components/createButton/create-button-with-teams-list.test.tsx
rename to apps/web/modules/ee/teams/components/createButton/create-button-with-teams-list.test.tsx
diff --git a/packages/features/ee/teams/components/createButton/index.ts b/apps/web/modules/ee/teams/components/createButton/index.ts
similarity index 100%
rename from packages/features/ee/teams/components/createButton/index.ts
rename to apps/web/modules/ee/teams/components/createButton/index.ts
diff --git a/packages/features/ee/teams/pages/team-appearance-view.tsx b/apps/web/modules/ee/teams/views/team-appearance-view.tsx
similarity index 99%
rename from packages/features/ee/teams/pages/team-appearance-view.tsx
rename to apps/web/modules/ee/teams/views/team-appearance-view.tsx
index 38816971303..6e03bee5177 100644
--- a/packages/features/ee/teams/pages/team-appearance-view.tsx
+++ b/apps/web/modules/ee/teams/views/team-appearance-view.tsx
@@ -8,6 +8,7 @@ import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
import BrandColorsForm from "@calcom/features/ee/components/BrandColorsForm";
import { AppearanceSkeletonLoader } from "@calcom/features/ee/components/CommonSkeletonLoaders";
import SectionBottomActions from "@calcom/features/settings/SectionBottomActions";
+import ThemeLabel from "@calcom/features/settings/ThemeLabel";
import { APP_NAME } from "@calcom/lib/constants";
import { DEFAULT_LIGHT_BRAND_COLOR, DEFAULT_DARK_BRAND_COLOR } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -20,8 +21,6 @@ import { SettingsToggle } from "@calcom/ui/components/form";
import { showToast } from "@calcom/ui/components/toast";
import { revalidateTeamDataCache } from "@calcom/web/app/(booking-page-wrapper)/team/[slug]/[type]/actions";
-import ThemeLabel from "../../../settings/ThemeLabel";
-
type BrandColorsFormValues = {
brandColor: string;
darkBrandColor: string;
diff --git a/apps/web/modules/teams/team-members-view.tsx b/apps/web/modules/ee/teams/views/team-members-view.tsx
similarity index 89%
rename from apps/web/modules/teams/team-members-view.tsx
rename to apps/web/modules/ee/teams/views/team-members-view.tsx
index 74e437e0bc2..69b34ec8079 100644
--- a/apps/web/modules/teams/team-members-view.tsx
+++ b/apps/web/modules/ee/teams/views/team-members-view.tsx
@@ -3,11 +3,13 @@
import { useState } from "react";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
-import { MemberInvitationModalWithoutMembers } from "@calcom/features/ee/teams/components/MemberInvitationModal";
-import MemberList from "@calcom/features/ee/teams/components/MemberList";
-import type { MemberPermissions } from "@calcom/features/users/components/UserTable/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
+import type { MemberPermissions } from "@calcom/web/modules/users/components/UserTable/types";
+
+import { MemberInvitationModalWithoutMembers } from "~/ee/teams/components/MemberInvitationModal";
+
+import MemberList from "../components/MemberList";
interface TeamMembersViewProps {
team: NonNullable<RouterOutputs["viewer"]["teams"]["get"]>;
diff --git a/packages/features/ee/teams/pages/team-profile-view.tsx b/apps/web/modules/ee/teams/views/team-profile-view.tsx
similarity index 100%
rename from packages/features/ee/teams/pages/team-profile-view.tsx
rename to apps/web/modules/ee/teams/views/team-profile-view.tsx
diff --git a/packages/features/ee/teams/pages/team-settings-view.tsx b/apps/web/modules/ee/teams/views/team-settings-view.tsx
similarity index 98%
rename from packages/features/ee/teams/pages/team-settings-view.tsx
rename to apps/web/modules/ee/teams/views/team-settings-view.tsx
index c8ca1eaa686..9f330660bc9 100644
--- a/packages/features/ee/teams/pages/team-settings-view.tsx
+++ b/apps/web/modules/ee/teams/views/team-settings-view.tsx
@@ -7,7 +7,6 @@ import { useForm, Controller } from "react-hook-form";
import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
import { AppearanceSkeletonLoader } from "@calcom/features/ee/components/CommonSkeletonLoaders";
-import { IntervalLimitsManager } from "@calcom/features/eventtypes/components/tabs/limits/EventLimitsTab";
import SectionBottomActions from "@calcom/features/settings/SectionBottomActions";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
@@ -22,6 +21,7 @@ import { SettingsToggle } from "@calcom/ui/components/form";
import { CheckboxField } from "@calcom/ui/components/form";
import { showToast } from "@calcom/ui/components/toast";
import { revalidateTeamDataCache } from "@calcom/web/app/(booking-page-wrapper)/team/[slug]/[type]/actions";
+import { IntervalLimitsManager } from "@calcom/web/modules/event-types/components/tabs/limits/EventLimitsTab";
import DisableTeamImpersonation from "../components/DisableTeamImpersonation";
import { default as InternalNotePresetsView } from "../components/InternalNotePresetsView";
diff --git a/packages/features/ee/video/ViewRecordingsDialog.tsx b/apps/web/modules/ee/video/ViewRecordingsDialog.tsx
similarity index 98%
rename from packages/features/ee/video/ViewRecordingsDialog.tsx
rename to apps/web/modules/ee/video/ViewRecordingsDialog.tsx
index ad1203fe6ac..0e57bf1dd76 100644
--- a/packages/features/ee/video/ViewRecordingsDialog.tsx
+++ b/apps/web/modules/ee/video/ViewRecordingsDialog.tsx
@@ -4,7 +4,6 @@ import { useRouter } from "next/navigation";
import { Suspense, useEffect, useState } from "react";
import dayjs from "@calcom/dayjs";
-import { useHasTeamPlan } from "@calcom/features/billing/hooks/useHasPaidPlan";
import { Dialog } from "@calcom/features/components/controlled-dialog";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -14,6 +13,7 @@ import { trpc } from "@calcom/trpc/react";
import type { PartialReference } from "@calcom/types/EventManager";
import { Button } from "@calcom/ui/components/button";
import { DialogContent, DialogFooter, DialogHeader, DialogClose } from "@calcom/ui/components/dialog";
+import { useHasTeamPlan } from "@calcom/web/modules/billing/hooks/useHasPaidPlan";
import RecordingListSkeleton from "./components/RecordingListSkeleton";
diff --git a/packages/features/ee/video/components/RecordingListItemSkeleton.tsx b/apps/web/modules/ee/video/components/RecordingListItemSkeleton.tsx
similarity index 100%
rename from packages/features/ee/video/components/RecordingListItemSkeleton.tsx
rename to apps/web/modules/ee/video/components/RecordingListItemSkeleton.tsx
diff --git a/packages/features/ee/video/components/RecordingListSkeleton.tsx b/apps/web/modules/ee/video/components/RecordingListSkeleton.tsx
similarity index 100%
rename from packages/features/ee/video/components/RecordingListSkeleton.tsx
rename to apps/web/modules/ee/video/components/RecordingListSkeleton.tsx
diff --git a/packages/features/ee/workflows/components/AddActionDialog.tsx b/apps/web/modules/ee/workflows/components/AddActionDialog.tsx
similarity index 96%
rename from packages/features/ee/workflows/components/AddActionDialog.tsx
rename to apps/web/modules/ee/workflows/components/AddActionDialog.tsx
index 15a57cce2ff..b878f83ea38 100644
--- a/packages/features/ee/workflows/components/AddActionDialog.tsx
+++ b/apps/web/modules/ee/workflows/components/AddActionDialog.tsx
@@ -7,6 +7,8 @@ import { z } from "zod";
import { Dialog } from "@calcom/features/components/controlled-dialog";
import PhoneInput from "@calcom/features/components/phone-input";
+import { WORKFLOW_ACTIONS } from "@calcom/features/ee/workflows/lib/constants";
+import { onlyLettersNumbersSpaces } from "@calcom/features/ee/workflows/lib/schema";
import { SENDER_ID, SENDER_NAME } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { WorkflowActions } from "@calcom/prisma/enums";
@@ -21,9 +23,6 @@ import { Input } from "@calcom/ui/components/form";
import { Icon } from "@calcom/ui/components/icon";
import { Tooltip } from "@calcom/ui/components/tooltip";
-import { WORKFLOW_ACTIONS } from "../lib/constants";
-import { onlyLettersNumbersSpaces } from "../lib/schema";
-
interface IAddActionDialog {
isOpenDialog: boolean;
setIsOpenDialog: Dispatch<SetStateAction<boolean>>;
@@ -41,6 +40,11 @@ interface IAddActionDialog {
creditsTeamId?: number;
isOrganization?: boolean;
needsTeamsUpgrade?: boolean;
+ upgradeTeamsBadgeProps?: {
+ hasPaidPlan?: boolean;
+ hasActiveTeamPlan?: boolean;
+ isTrial?: boolean;
+ };
}[];
}
@@ -175,6 +179,7 @@ export const AddActionDialog = (props: IAddActionDialog) => {
label: option.label,
value: option.value,
needsTeamsUpgrade: option.needsTeamsUpgrade,
+ upgradeTeamsBadgeProps: option.upgradeTeamsBadgeProps,
}))}
isOptionDisabled={(option: {
label: string;
@@ -190,7 +195,7 @@ export const AddActionDialog = (props: IAddActionDialog) => {
)}
</div>
{isPhoneNumberNeeded && (
- <div className="mt-5 stack-y-1">
+ <div className="stack-y-1 mt-5">
<Label htmlFor="sendTo">{t("phone_number")}</Label>
<div className="mb-5 mt-1">
<Controller
diff --git a/packages/features/ee/workflows/components/CallDetailsSheet.tsx b/apps/web/modules/ee/workflows/components/CallDetailsSheet.tsx
similarity index 90%
rename from packages/features/ee/workflows/components/CallDetailsSheet.tsx
rename to apps/web/modules/ee/workflows/components/CallDetailsSheet.tsx
index 45ae6b57188..ac85f76a8fa 100644
--- a/packages/features/ee/workflows/components/CallDetailsSheet.tsx
+++ b/apps/web/modules/ee/workflows/components/CallDetailsSheet.tsx
@@ -1,5 +1,6 @@
import type { Dispatch } from "react";
+import type { CallDetailsAction, CallDetailsState } from "@calcom/features/ee/workflows/lib/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { Badge } from "@calcom/ui/components/badge";
import { Button } from "@calcom/ui/components/button";
@@ -13,8 +14,6 @@ import {
SheetClose,
} from "@calcom/ui/components/sheet";
-import type { CallDetailsAction, CallDetailsState } from "./types";
-
interface CallDetailsSheetProps {
state: CallDetailsState;
dispatch: Dispatch<CallDetailsAction>;
@@ -59,7 +58,7 @@ export function CallDetailsSheet({ state, dispatch }: CallDetailsSheetProps) {
</div>
</SheetHeader>
- <SheetBody className="flex flex-col stack-y-6 p-4">
+ <SheetBody className="stack-y-6 flex flex-col p-4">
{/* Call Information */}
<div className="stack-y-3">
<h3 className="text-emphasis text-base font-semibold">{t("call_information")}</h3>
@@ -67,20 +66,28 @@ export function CallDetailsSheet({ state, dispatch }: CallDetailsSheetProps) {
<div>
<p className="text-subtle text-sm">{t("start_time")}</p>
<p className="text-default text-sm font-medium">
- {selectedCall.start_timestamp ? formatTimestamp(selectedCall.start_timestamp) : t("unknown")}
+ {selectedCall.start_timestamp
+ ? formatTimestamp(selectedCall.start_timestamp)
+ : t("unknown")}
</p>
</div>
<div>
<p className="text-subtle text-sm">{t("duration")}</p>
- <p className="text-default text-sm font-medium">{selectedCall.duration_ms ? formatDuration(selectedCall.duration_ms) : t("unknown")}</p>
+ <p className="text-default text-sm font-medium">
+ {selectedCall.duration_ms ? formatDuration(selectedCall.duration_ms) : t("unknown")}
+ </p>
</div>
<div>
<p className="text-subtle text-sm">{t("from")}</p>
- <p className="text-default text-sm font-medium">{"from_number" in selectedCall ? selectedCall.from_number || t("unknown") : t("unknown")}</p>
+ <p className="text-default text-sm font-medium">
+ {"from_number" in selectedCall ? selectedCall.from_number || t("unknown") : t("unknown")}
+ </p>
</div>
<div>
<p className="text-subtle text-sm">{t("to")}</p>
- <p className="text-default text-sm font-medium">{"to_number" in selectedCall ? selectedCall.to_number || t("unknown") : t("unknown")}</p>
+ <p className="text-default text-sm font-medium">
+ {"to_number" in selectedCall ? selectedCall.to_number || t("unknown") : t("unknown")}
+ </p>
</div>
<div>
<p className="text-subtle text-sm">{t("sentiment")}</p>
@@ -128,7 +135,7 @@ export function CallDetailsSheet({ state, dispatch }: CallDetailsSheetProps) {
{/* Transcription */}
<div className="stack-y-3">
<h3 className="text-emphasis text-base font-semibold">{t("transcription")}</h3>
- <div className="border-subtle max-h-96 stack-y-3 overflow-y-auto rounded-md border p-4">
+ <div className="border-subtle stack-y-3 max-h-96 overflow-y-auto rounded-md border p-4">
{selectedCall.transcript ? (
selectedCall.transcript
.split("\n")
diff --git a/packages/features/ee/workflows/components/DeleteDialog.tsx b/apps/web/modules/ee/workflows/components/DeleteDialog.tsx
similarity index 100%
rename from packages/features/ee/workflows/components/DeleteDialog.tsx
rename to apps/web/modules/ee/workflows/components/DeleteDialog.tsx
diff --git a/packages/features/ee/workflows/components/EmptyScreen.tsx b/apps/web/modules/ee/workflows/components/EmptyScreen.tsx
similarity index 96%
rename from packages/features/ee/workflows/components/EmptyScreen.tsx
rename to apps/web/modules/ee/workflows/components/EmptyScreen.tsx
index 3a4fdd02223..3d11c3a52c5 100644
--- a/packages/features/ee/workflows/components/EmptyScreen.tsx
+++ b/apps/web/modules/ee/workflows/components/EmptyScreen.tsx
@@ -1,10 +1,11 @@
-import { CreateButtonWithTeamsList } from "@calcom/features/ee/teams/components/createButton/CreateButtonWithTeamsList";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import cn from "@calcom/ui/classNames";
import { EmptyScreen as ClassicEmptyScreen } from "@calcom/ui/components/empty-screen";
import { Icon } from "@calcom/ui/components/icon";
import type { IconName } from "@calcom/ui/components/icon";
+import { CreateButtonWithTeamsList } from "~/ee/teams/components/createButton/CreateButtonWithTeamsList";
+
import { WorkflowCreationDialog, useWorkflowCreation } from "./WorkflowCreationDialog";
type WorkflowExampleType = {
@@ -119,7 +120,7 @@ export default function EmptyScreen(props: { isFilteredView: boolean }) {
</div>
<div className="max-w-[420px] text-center">
<h2 className="text-semibold font-cal mt-6 text-xl dark:text-gray-300">{t("workflows")}</h2>
- <p className="text-default mt-3 line-clamp-2 text-sm font-normal leading-6 dark:text-gray-300">
+ <p className="text-default line-clamp-2 mt-3 text-sm font-normal leading-6 dark:text-gray-300">
{t("no_workflows_description")}
</p>
<div className="mt-8 ">
diff --git a/packages/features/ee/workflows/components/SkeletonLoaderEdit.tsx b/apps/web/modules/ee/workflows/components/SkeletonLoaderEdit.tsx
similarity index 100%
rename from packages/features/ee/workflows/components/SkeletonLoaderEdit.tsx
rename to apps/web/modules/ee/workflows/components/SkeletonLoaderEdit.tsx
diff --git a/packages/features/ee/workflows/components/SkeletonLoaderEventWorkflowsTab.tsx b/apps/web/modules/ee/workflows/components/SkeletonLoaderEventWorkflowsTab.tsx
similarity index 100%
rename from packages/features/ee/workflows/components/SkeletonLoaderEventWorkflowsTab.tsx
rename to apps/web/modules/ee/workflows/components/SkeletonLoaderEventWorkflowsTab.tsx
diff --git a/packages/features/ee/workflows/components/SkeletonLoaderList.tsx b/apps/web/modules/ee/workflows/components/SkeletonLoaderList.tsx
similarity index 100%
rename from packages/features/ee/workflows/components/SkeletonLoaderList.tsx
rename to apps/web/modules/ee/workflows/components/SkeletonLoaderList.tsx
diff --git a/packages/features/ee/workflows/components/TestPhoneCallDialog.tsx b/apps/web/modules/ee/workflows/components/TestPhoneCallDialog.tsx
similarity index 94%
rename from packages/features/ee/workflows/components/TestPhoneCallDialog.tsx
rename to apps/web/modules/ee/workflows/components/TestPhoneCallDialog.tsx
index 83ca2892cf0..6164c99b7ed 100644
--- a/packages/features/ee/workflows/components/TestPhoneCallDialog.tsx
+++ b/apps/web/modules/ee/workflows/components/TestPhoneCallDialog.tsx
@@ -3,6 +3,8 @@ import type { UseFormReturn } from "react-hook-form";
import { Dialog } from "@calcom/features/components/controlled-dialog";
import PhoneInput from "@calcom/features/components/phone-input";
+import { getEventTypeIdForCalAiTest } from "@calcom/features/ee/workflows/lib/actionHelperFunctions";
+import type { FormValues } from "@calcom/features/ee/workflows/lib/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import { Button } from "@calcom/ui/components/button";
@@ -11,9 +13,6 @@ import { Label } from "@calcom/ui/components/form";
import { Icon } from "@calcom/ui/components/icon";
import { showToast } from "@calcom/ui/components/toast";
-import { getEventTypeIdForCalAiTest } from "../lib/actionHelperFunctions";
-import type { FormValues } from "../pages/workflow";
-
interface TestPhoneCallDialogProps {
open: boolean;
onOpenChange: (open: boolean) => void;
diff --git a/packages/features/ee/workflows/components/TimeTimeUnitInput.tsx b/apps/web/modules/ee/workflows/components/TimeTimeUnitInput.tsx
similarity index 100%
rename from packages/features/ee/workflows/components/TimeTimeUnitInput.tsx
rename to apps/web/modules/ee/workflows/components/TimeTimeUnitInput.tsx
diff --git a/packages/features/ee/workflows/components/VoiceSelectionDialog.tsx b/apps/web/modules/ee/workflows/components/VoiceSelectionDialog.tsx
similarity index 98%
rename from packages/features/ee/workflows/components/VoiceSelectionDialog.tsx
rename to apps/web/modules/ee/workflows/components/VoiceSelectionDialog.tsx
index 01c508a2a0a..129a99e4a47 100644
--- a/packages/features/ee/workflows/components/VoiceSelectionDialog.tsx
+++ b/apps/web/modules/ee/workflows/components/VoiceSelectionDialog.tsx
@@ -4,6 +4,7 @@ import { useMemo, useState } from "react";
import { DataTableProvider, DataTableWrapper } from "@calcom/features/data-table";
import { useSegments } from "@calcom/features/data-table/hooks/useSegments";
+import { useVoicePreview } from "@calcom/features/ee/workflows/hooks/useVoicePreview";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import { Button } from "@calcom/ui/components/button";
@@ -11,8 +12,6 @@ import { Dialog, DialogContent, DialogHeader } from "@calcom/ui/components/dialo
import { Icon } from "@calcom/ui/components/icon";
import { showToast } from "@calcom/ui/components/toast";
-import { useVoicePreview } from "../hooks/useVoicePreview";
-
type Voice = {
voice_id: string;
voice_name: string;
diff --git a/packages/features/ee/workflows/components/WebCallDialog.tsx b/apps/web/modules/ee/workflows/components/WebCallDialog.tsx
similarity index 98%
rename from packages/features/ee/workflows/components/WebCallDialog.tsx
rename to apps/web/modules/ee/workflows/components/WebCallDialog.tsx
index 9f96e0f6c19..1c2e0f7c49f 100644
--- a/packages/features/ee/workflows/components/WebCallDialog.tsx
+++ b/apps/web/modules/ee/workflows/components/WebCallDialog.tsx
@@ -4,6 +4,8 @@ import type { UseFormReturn } from "react-hook-form";
import type { RetellWebClient } from "retell-client-js-sdk";
import { Dialog } from "@calcom/features/components/controlled-dialog";
+import { getEventTypeIdForCalAiTest } from "@calcom/features/ee/workflows/lib/actionHelperFunctions";
+import type { FormValues } from "@calcom/features/ee/workflows/lib/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import { Alert } from "@calcom/ui/components/alert";
@@ -13,9 +15,6 @@ import { Icon } from "@calcom/ui/components/icon";
import { showToast } from "@calcom/ui/components/toast";
import { Tooltip } from "@calcom/ui/components/tooltip";
-import { getEventTypeIdForCalAiTest } from "../lib/actionHelperFunctions";
-import type { FormValues } from "../pages/workflow";
-
interface WebCallDialogProps {
open: boolean;
onOpenChange: (open: boolean) => void;
@@ -402,7 +401,7 @@ export function WebCallDialog({
)}
</div>
- <div className="h-60 stack-y-3 overflow-y-auto p-2">
+ <div className="stack-y-3 h-60 overflow-y-auto p-2">
{transcript.length === 0 ? (
<div className="flex h-40 items-center justify-center text-center">
<div>
diff --git a/packages/features/ee/workflows/components/WorkflowCreationDialog.tsx b/apps/web/modules/ee/workflows/components/WorkflowCreationDialog.tsx
similarity index 100%
rename from packages/features/ee/workflows/components/WorkflowCreationDialog.tsx
rename to apps/web/modules/ee/workflows/components/WorkflowCreationDialog.tsx
diff --git a/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx b/apps/web/modules/ee/workflows/components/WorkflowDetailsPage.tsx
similarity index 89%
rename from packages/features/ee/workflows/components/WorkflowDetailsPage.tsx
rename to apps/web/modules/ee/workflows/components/WorkflowDetailsPage.tsx
index 3844c1d3f4f..1221bbcfe9b 100644
--- a/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx
+++ b/apps/web/modules/ee/workflows/components/WorkflowDetailsPage.tsx
@@ -3,7 +3,15 @@ import type { Dispatch, SetStateAction } from "react";
import { useState, useEffect } from "react";
import type { UseFormReturn } from "react-hook-form";
-import { useHasActiveTeamPlan } from "@calcom/features/billing/hooks/useHasPaidPlan";
+import { useAgentsData } from "@calcom/features/ee/workflows/hooks/useAgentsData";
+import {
+ isCalAIAction,
+ isSMSAction,
+ isFormTrigger,
+} from "@calcom/features/ee/workflows/lib/actionHelperFunctions";
+import { ALLOWED_FORM_WORKFLOW_ACTIONS } from "@calcom/features/ee/workflows/lib/constants";
+import emailReminderTemplate from "@calcom/features/ee/workflows/lib/reminders/templates/emailReminderTemplate";
+import type { FormValues } from "@calcom/features/ee/workflows/lib/types";
import type { WorkflowPermissions } from "@calcom/features/workflows/repositories/WorkflowPermissionsRepository";
import { SENDER_ID, SENDER_NAME, SCANNING_WORKFLOW_STEPS } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -15,12 +23,8 @@ import { Button } from "@calcom/ui/components/button";
import { FormCard, FormCardBody } from "@calcom/ui/components/card";
import type { MultiSelectCheckboxesOptionType as Option } from "@calcom/ui/components/form";
import { Icon } from "@calcom/ui/components/icon";
+import { useHasPaidPlan, useHasActiveTeamPlan } from "@calcom/web/modules/billing/hooks/useHasPaidPlan";
-import { useAgentsData } from "../hooks/useAgentsData";
-import { isCalAIAction, isSMSAction, isFormTrigger, isWhatsappAction } from "../lib/actionHelperFunctions";
-import { ALLOWED_FORM_WORKFLOW_ACTIONS } from "../lib/constants";
-import emailReminderTemplate from "../lib/reminders/templates/emailReminderTemplate";
-import type { FormValues } from "../pages/workflow";
import { AddActionDialog } from "./AddActionDialog";
import WorkflowStepContainer from "./WorkflowStepContainer";
@@ -53,7 +57,8 @@ export default function WorkflowDetailsPage(props: Props) {
permissions,
} = props;
const { t, i18n } = useLocale();
- const { hasActiveTeamPlan } = useHasActiveTeamPlan();
+ const { hasPaidPlan } = useHasPaidPlan();
+ const { hasActiveTeamPlan, isTrial } = useHasActiveTeamPlan();
const [isAddActionDialogOpen, setIsAddActionDialogOpen] = useState(false);
const [isDeleteStepDialogOpen, setIsDeleteStepDialogOpen] = useState(false);
@@ -104,6 +109,9 @@ export default function WorkflowDetailsPage(props: Props) {
isOrganization: isOrg,
isCalAi: isCalAIAction(option.value),
needsTeamsUpgrade,
+ upgradeTeamsBadgeProps: needsTeamsUpgrade
+ ? { hasPaidPlan, hasActiveTeamPlan, isTrial }
+ : undefined,
};
})
: [];
@@ -115,6 +123,7 @@ export default function WorkflowDetailsPage(props: Props) {
setSelectedOptions(newOptions);
form.setValue("activeOn", newOptions);
}
+ // eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally only run when eventTypeId changes
}, [eventTypeId]);
const addAction = (
@@ -183,11 +192,11 @@ export default function WorkflowDetailsPage(props: Props) {
<>
<div>
<FormCard
- className="mb-0 border-muted"
+ className="border-muted mb-0"
collapsible={false}
label={
- <div className="flex gap-2 items-center pt-1 pb-2">
- <div className="p-1 ml-1 rounded-lg border border-subtle text-subtle">
+ <div className="flex items-center gap-2 pt-1 pb-2">
+ <div className="border-subtle text-subtle ml-1 rounded-lg border p-1">
<Icon name="zap" size="16" />
</div>
<div className="text-sm font-medium leading-none">{t("trigger")}</div>
@@ -225,11 +234,11 @@ export default function WorkflowDetailsPage(props: Props) {
<div key={index}>
<FormCard
key={step.id}
- className="mb-0 bg-cal-muted border-muted"
+ className="bg-cal-muted border-muted mb-0"
collapsible={false}
label={
- <div className="flex gap-2 items-center pt-1 pb-2">
- <div className="p-1 rounded-lg border border-subtle text-subtle">
+ <div className="flex items-center gap-2 pt-1 pb-2">
+ <div className="border-subtle text-subtle rounded-lg border p-1">
<Icon name="arrow-right" size="16" />
</div>
<div className="text-sm font-medium leading-none">{t("action")}</div>
diff --git a/packages/features/ee/workflows/components/WorkflowListPage.tsx b/apps/web/modules/ee/workflows/components/WorkflowListPage.tsx
similarity index 98%
rename from packages/features/ee/workflows/components/WorkflowListPage.tsx
rename to apps/web/modules/ee/workflows/components/WorkflowListPage.tsx
index bef97e6180a..2f286e388df 100644
--- a/packages/features/ee/workflows/components/WorkflowListPage.tsx
+++ b/apps/web/modules/ee/workflows/components/WorkflowListPage.tsx
@@ -3,6 +3,8 @@ import Link from "next/link";
import { useRouter } from "next/navigation";
import { useState } from "react";
+import { getActionIcon } from "@calcom/features/ee/workflows/lib/getActionIcon";
+import type { WorkflowListType } from "@calcom/features/ee/workflows/lib/types";
import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
@@ -22,8 +24,6 @@ import {
import { Icon } from "@calcom/ui/components/icon";
import { Tooltip } from "@calcom/ui/components/tooltip";
-import { getActionIcon } from "../lib/getActionIcon";
-import { type WorkflowListType } from "../lib/types";
import { DeleteDialog } from "./DeleteDialog";
/** @deprecated Use WorkflowListType from ../lib/types instead */
diff --git a/packages/features/ee/workflows/components/WorkflowStepContainer.tsx b/apps/web/modules/ee/workflows/components/WorkflowStepContainer.tsx
similarity index 96%
rename from packages/features/ee/workflows/components/WorkflowStepContainer.tsx
rename to apps/web/modules/ee/workflows/components/WorkflowStepContainer.tsx
index 0eb4432dfa2..a819772cf3a 100644
--- a/packages/features/ee/workflows/components/WorkflowStepContainer.tsx
+++ b/apps/web/modules/ee/workflows/components/WorkflowStepContainer.tsx
@@ -6,10 +6,28 @@ import type { UseFormReturn } from "react-hook-form";
import { Controller, useWatch } from "react-hook-form";
import "react-phone-number-input/style.css";
-import { useHasActiveTeamPlan } from "@calcom/features/billing/hooks/useHasPaidPlan";
import type { RetellAgentWithDetails } from "@calcom/features/calAIPhone/providers/retellAI";
import { Dialog } from "@calcom/features/components/controlled-dialog";
import PhoneInput from "@calcom/features/components/phone-input";
+import {
+ isSMSAction,
+ isWhatsappAction,
+ getTemplateBodyForAction,
+ shouldScheduleEmailReminder,
+ isSMSOrWhatsappAction,
+ isCalAIAction,
+ isFormTrigger,
+ hasCalAIAction,
+} from "@calcom/features/ee/workflows/lib/actionHelperFunctions";
+import { DYNAMIC_TEXT_VARIABLES } from "@calcom/features/ee/workflows/lib/constants";
+import {
+ getWorkflowTemplateOptions,
+ getWorkflowTriggerOptions,
+} from "@calcom/features/ee/workflows/lib/getOptions";
+import emailRatingTemplate from "@calcom/features/ee/workflows/lib/reminders/templates/emailRatingTemplate";
+import emailReminderTemplate from "@calcom/features/ee/workflows/lib/reminders/templates/emailReminderTemplate";
+import type { FormValues } from "@calcom/features/ee/workflows/lib/types";
+import "@calcom/features/ee/workflows/style/styles.css";
import { SENDER_ID, SENDER_NAME } from "@calcom/lib/constants";
import { formatPhoneNumber } from "@calcom/lib/formatPhoneNumber";
import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -52,23 +70,8 @@ import type { MultiSelectCheckboxesOptionType as Option } from "@calcom/ui/compo
import { Icon } from "@calcom/ui/components/icon";
import { SkeletonText } from "@calcom/ui/components/skeleton";
import { showToast } from "@calcom/ui/components/toast";
+import { useHasPaidPlan, useHasActiveTeamPlan } from "@calcom/web/modules/billing/hooks/useHasPaidPlan";
-import {
- isSMSAction,
- isWhatsappAction,
- getTemplateBodyForAction,
- shouldScheduleEmailReminder,
- isSMSOrWhatsappAction,
- isCalAIAction,
- isFormTrigger,
- hasCalAIAction,
-} from "../lib/actionHelperFunctions";
-import { DYNAMIC_TEXT_VARIABLES } from "../lib/constants";
-import { getWorkflowTemplateOptions, getWorkflowTriggerOptions } from "../lib/getOptions";
-import emailRatingTemplate from "../lib/reminders/templates/emailRatingTemplate";
-import emailReminderTemplate from "../lib/reminders/templates/emailReminderTemplate";
-import type { FormValues } from "../pages/workflow";
-import "../style/styles.css";
import { TestPhoneCallDialog } from "./TestPhoneCallDialog";
import { TimeTimeUnitInput } from "./TimeTimeUnitInput";
import { WebCallDialog } from "./WebCallDialog";
@@ -201,7 +204,9 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
(team) => team.accepted && (team.role === MembershipRole.ADMIN || team.role === MembershipRole.OWNER)
)?.id;
- const { hasActiveTeamPlan } = useHasActiveTeamPlan();
+ const { hasPaidPlan } = useHasPaidPlan();
+ const { hasActiveTeamPlan, isTrial } = useHasActiveTeamPlan();
+ const planState = { hasPaidPlan, hasActiveTeamPlan, isTrial };
const { data: _verifiedEmails } = trpc.viewer.workflows.getVerifiedEmails.useQuery({ teamId });
@@ -373,8 +378,8 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
handleCreateAgent,
]);
- const triggerOptions = getWorkflowTriggerOptions(t, hasActiveTeamPlan);
- const templateOptions = getWorkflowTemplateOptions(t, step?.action, hasActiveTeamPlan, trigger);
+ const triggerOptions = getWorkflowTriggerOptions(t, planState);
+ const templateOptions = getWorkflowTemplateOptions(t, step?.action, planState, trigger);
const steps = useWatch({
control: form.control,
@@ -409,7 +414,9 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
const [numberVerified, setNumberVerified] = useState(getNumberVerificationStatus());
const [emailVerified, setEmailVerified] = useState(getEmailVerificationStatus());
+ // eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally only run when verifiedNumbers.length changes
useEffect(() => setNumberVerified(getNumberVerificationStatus()), [verifiedNumbers.length]);
+ // eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally only run when verifiedEmails.length changes
useEffect(() => setEmailVerified(getEmailVerificationStatus()), [verifiedEmails.length]);
const addVariableEmailSubject = (variable: string) => {
@@ -590,6 +597,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
label: option.label,
value: option.value,
needsTeamsUpgrade: option.needsTeamsUpgrade,
+ upgradeTeamsBadgeProps: option.upgradeTeamsBadgeProps,
}))}
isOptionDisabled={(option: { label: string; value: string; needsTeamsUpgrade?: boolean }) =>
!!option.needsTeamsUpgrade
@@ -1286,13 +1294,19 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
}}
defaultValue={selectedTemplate}
value={selectedTemplate}
- options={templateOptions.map((option) => ({
- label: option.label,
- value: option.value,
- needsTeamsUpgrade:
+ options={templateOptions.map((option) => {
+ const needsTeamsUpgrade =
option.needsTeamsUpgrade &&
- !isSMSAction(form.getValues(`steps.${step.stepNumber - 1}.action`)),
- }))}
+ !isSMSAction(form.getValues(`steps.${step.stepNumber - 1}.action`));
+ return {
+ label: option.label,
+ value: option.value,
+ needsTeamsUpgrade,
+ upgradeTeamsBadgeProps: needsTeamsUpgrade
+ ? option.upgradeTeamsBadgeProps
+ : undefined,
+ };
+ })}
isOptionDisabled={(option: {
label: string;
value: string;
@@ -1541,7 +1555,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
<div className="test-sm text-emphasis col-span-7">{t("company_size")}</div>
<div className="test-sm text-default col-span-5 w-full">{t("variable")}</div>
- <div className="test-sm text-emphasis col-span-7 wrap-break-word">
+ <div className="test-sm text-emphasis wrap-break-word col-span-7">
{" "}
{`{${t("company_size")
.replace(/[^a-zA-Z0-9 ]/g, "")
@@ -1559,7 +1573,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
</div>
<div className="test-sm text-emphasis col-span-7">{t("what_help_needed")}</div>
<div className="test-sm text-default col-span-5">{t("variable")}</div>
- <div className="test-sm text-emphasis col-span-7 wrap-break-word">
+ <div className="test-sm text-emphasis wrap-break-word col-span-7">
{" "}
{`{${t("what_help_needed")
.replace(/[^a-zA-Z0-9 ]/g, "")
@@ -1706,7 +1720,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
<Icon name="info" className="text-attention mt-0.5 h-4 w-4" />
<div className="stack-y-2">
<p className="text-attention text-sm font-medium">{t("this_action_will_also")}</p>
- <ul className="text-attention list-inside list-disc stack-y-1 text-sm">
+ <ul className="text-attention stack-y-1 list-inside list-disc text-sm">
{relevantPhoneNumbers.some(
(phone) => phone.subscriptionStatus === PhoneNumberSubscriptionStatus.ACTIVE
) && <li>{t("cancel_your_phone_number_subscription")}</li>}
@@ -1716,10 +1730,10 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
</div>
</div>
{relevantPhoneNumbers.map((phone) => (
- <div key={phone.phoneNumber} className="p-3 rounded-lg bg-cal-muted">
- <div className="flex gap-2 items-center">
- <Icon name="phone" className="w-4 h-4 text-emphasis" />
- <span className="text-sm font-medium text-emphasis">
+ <div key={phone.phoneNumber} className="bg-cal-muted rounded-lg p-3">
+ <div className="flex items-center gap-2">
+ <Icon name="phone" className="text-emphasis h-4 w-4" />
+ <span className="text-emphasis text-sm font-medium">
{formatPhoneNumber(phone.phoneNumber)}
</span>
{phone.subscriptionStatus === PhoneNumberSubscriptionStatus.ACTIVE && (
diff --git a/packages/features/ee/workflows/components/agent-configuration/AgentConfigurationSheet.tsx b/apps/web/modules/ee/workflows/components/agent-configuration/AgentConfigurationSheet.tsx
similarity index 98%
rename from packages/features/ee/workflows/components/agent-configuration/AgentConfigurationSheet.tsx
rename to apps/web/modules/ee/workflows/components/agent-configuration/AgentConfigurationSheet.tsx
index ea59c6525dd..c730d96d54b 100644
--- a/packages/features/ee/workflows/components/agent-configuration/AgentConfigurationSheet.tsx
+++ b/apps/web/modules/ee/workflows/components/agent-configuration/AgentConfigurationSheet.tsx
@@ -2,6 +2,8 @@ import { useState } from "react";
import type { UseFormReturn } from "react-hook-form";
import type { Language } from "@calcom/features/calAIPhone/providers/retellAI/types";
+import { restorePromptComplexity } from "@calcom/features/calAIPhone/providers/retellAI/utils/promptUtils";
+import type { FormValues } from "@calcom/features/ee/workflows/lib/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
@@ -25,14 +27,12 @@ import {
} from "@calcom/ui/components/sheet";
import { showToast } from "@calcom/ui/components/toast";
-import type { FormValues } from "../../pages/workflow";
import { WebCallDialog } from "../WebCallDialog";
import { IncomingCallsTab } from "./components/tabs/IncomingCallsTab";
import { OutgoingCallsTab } from "./components/tabs/OutgoingCallsTab";
import { PhoneNumberTab } from "./components/tabs/PhoneNumberTab";
import { useAgentForms } from "./hooks/useAgentForms";
import type { AgentFormValues } from "./types/schemas";
-import { restorePromptComplexity } from "./utils/promptUtils";
type AgentConfigurationSheetProps = {
open: boolean;
diff --git a/packages/features/ee/workflows/components/agent-configuration/components/dialogs/BuyNumberDialog.tsx b/apps/web/modules/ee/workflows/components/agent-configuration/components/dialogs/BuyNumberDialog.tsx
similarity index 99%
rename from packages/features/ee/workflows/components/agent-configuration/components/dialogs/BuyNumberDialog.tsx
rename to apps/web/modules/ee/workflows/components/agent-configuration/components/dialogs/BuyNumberDialog.tsx
index faa50f7a6be..20352310c04 100644
--- a/packages/features/ee/workflows/components/agent-configuration/components/dialogs/BuyNumberDialog.tsx
+++ b/apps/web/modules/ee/workflows/components/agent-configuration/components/dialogs/BuyNumberDialog.tsx
@@ -1,3 +1,5 @@
+"use client";
+
import posthog from "posthog-js";
import { CAL_AI_PHONE_NUMBER_MONTHLY_PRICE } from "@calcom/lib/constants";
diff --git a/packages/features/ee/workflows/components/agent-configuration/components/dialogs/ConfirmationDialogs.tsx b/apps/web/modules/ee/workflows/components/agent-configuration/components/dialogs/ConfirmationDialogs.tsx
similarity index 99%
rename from packages/features/ee/workflows/components/agent-configuration/components/dialogs/ConfirmationDialogs.tsx
rename to apps/web/modules/ee/workflows/components/agent-configuration/components/dialogs/ConfirmationDialogs.tsx
index 455598c6c7a..8599247c8f7 100644
--- a/packages/features/ee/workflows/components/agent-configuration/components/dialogs/ConfirmationDialogs.tsx
+++ b/apps/web/modules/ee/workflows/components/agent-configuration/components/dialogs/ConfirmationDialogs.tsx
@@ -1,3 +1,5 @@
+"use client";
+
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import { ConfirmationDialogContent } from "@calcom/ui/components/dialog";
diff --git a/packages/features/ee/workflows/components/agent-configuration/components/dialogs/ImportNumberDialog.tsx b/apps/web/modules/ee/workflows/components/agent-configuration/components/dialogs/ImportNumberDialog.tsx
similarity index 99%
rename from packages/features/ee/workflows/components/agent-configuration/components/dialogs/ImportNumberDialog.tsx
rename to apps/web/modules/ee/workflows/components/agent-configuration/components/dialogs/ImportNumberDialog.tsx
index 0dac114a034..3abebcfe012 100644
--- a/packages/features/ee/workflows/components/agent-configuration/components/dialogs/ImportNumberDialog.tsx
+++ b/apps/web/modules/ee/workflows/components/agent-configuration/components/dialogs/ImportNumberDialog.tsx
@@ -1,3 +1,5 @@
+"use client";
+
import { Controller } from "react-hook-form";
import type { UseFormReturn } from "react-hook-form";
diff --git a/packages/features/ee/workflows/components/agent-configuration/components/forms/AgentConfigForm.tsx b/apps/web/modules/ee/workflows/components/agent-configuration/components/forms/AgentConfigForm.tsx
similarity index 98%
rename from packages/features/ee/workflows/components/agent-configuration/components/forms/AgentConfigForm.tsx
rename to apps/web/modules/ee/workflows/components/agent-configuration/components/forms/AgentConfigForm.tsx
index b20155db146..df877bd924f 100644
--- a/packages/features/ee/workflows/components/agent-configuration/components/forms/AgentConfigForm.tsx
+++ b/apps/web/modules/ee/workflows/components/agent-configuration/components/forms/AgentConfigForm.tsx
@@ -1,11 +1,13 @@
+"use client";
+
import { useRef } from "react";
import type { UseFormReturn } from "react-hook-form";
+import { DYNAMIC_TEXT_VARIABLES } from "@calcom/features/ee/workflows/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { AddVariablesDropdown } from "@calcom/ui/components/editor";
import { Input, Label, TextArea } from "@calcom/ui/components/form";
-import { DYNAMIC_TEXT_VARIABLES } from "../../../../lib/constants";
import type { AgentFormValues } from "../../types/schemas";
import { LanguageSelector } from "./LanguageSelector";
import { VoiceSelector } from "./VoiceSelector";
diff --git a/packages/features/ee/workflows/components/agent-configuration/components/forms/LanguageSelector.tsx b/apps/web/modules/ee/workflows/components/agent-configuration/components/forms/LanguageSelector.tsx
similarity index 98%
rename from packages/features/ee/workflows/components/agent-configuration/components/forms/LanguageSelector.tsx
rename to apps/web/modules/ee/workflows/components/agent-configuration/components/forms/LanguageSelector.tsx
index 0171903472d..850f2654848 100644
--- a/packages/features/ee/workflows/components/agent-configuration/components/forms/LanguageSelector.tsx
+++ b/apps/web/modules/ee/workflows/components/agent-configuration/components/forms/LanguageSelector.tsx
@@ -1,3 +1,5 @@
+"use client";
+
import { Controller } from "react-hook-form";
import type { Control } from "react-hook-form";
diff --git a/packages/features/ee/workflows/components/agent-configuration/components/forms/VoiceSelector.tsx b/apps/web/modules/ee/workflows/components/agent-configuration/components/forms/VoiceSelector.tsx
similarity index 98%
rename from packages/features/ee/workflows/components/agent-configuration/components/forms/VoiceSelector.tsx
rename to apps/web/modules/ee/workflows/components/agent-configuration/components/forms/VoiceSelector.tsx
index 7c2fbd1922d..f01306d39b0 100644
--- a/packages/features/ee/workflows/components/agent-configuration/components/forms/VoiceSelector.tsx
+++ b/apps/web/modules/ee/workflows/components/agent-configuration/components/forms/VoiceSelector.tsx
@@ -1,3 +1,5 @@
+"use client";
+
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { Button } from "@calcom/ui/components/button";
import { Label } from "@calcom/ui/components/form";
diff --git a/packages/features/ee/workflows/components/agent-configuration/components/tabs/IncomingCallsTab.tsx b/apps/web/modules/ee/workflows/components/agent-configuration/components/tabs/IncomingCallsTab.tsx
similarity index 85%
rename from packages/features/ee/workflows/components/agent-configuration/components/tabs/IncomingCallsTab.tsx
rename to apps/web/modules/ee/workflows/components/agent-configuration/components/tabs/IncomingCallsTab.tsx
index 11d0e2a5d2e..238f32e4e93 100644
--- a/packages/features/ee/workflows/components/agent-configuration/components/tabs/IncomingCallsTab.tsx
+++ b/apps/web/modules/ee/workflows/components/agent-configuration/components/tabs/IncomingCallsTab.tsx
@@ -1,6 +1,9 @@
+"use client";
+
import { useState } from "react";
import type { UseFormReturn } from "react-hook-form";
+import type { FormValues } from "@calcom/features/ee/workflows/lib/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { PhoneNumberSubscriptionStatus } from "@calcom/prisma/enums";
import type { RouterOutputs } from "@calcom/trpc/react";
@@ -11,7 +14,6 @@ import type { MultiSelectCheckboxesOptionType as Option } from "@calcom/ui/compo
import { Icon } from "@calcom/ui/components/icon";
import { showToast } from "@calcom/ui/components/toast";
-import type { FormValues } from "../../../../pages/workflow";
import { VoiceSelectionDialog } from "../../../VoiceSelectionDialog";
import type { AgentFormValues } from "../../types/schemas";
import { AgentConfigForm } from "../forms/AgentConfigForm";
@@ -86,14 +88,14 @@ export function IncomingCallsTab({
if (!hasActivePhoneNumbers) {
return (
- <div className="p-8 rounded-xl border border-subtle">
- <div className="flex flex-col items-center stack-y-6 text-center">
- <div className="flex justify-center items-center w-16 h-16 rounded-lg bg-cal-muted">
- <Icon name="info" className="w-8 h-8 text-subtle" />
+ <div className="border-subtle rounded-xl border p-8">
+ <div className="stack-y-6 flex flex-col items-center text-center">
+ <div className="bg-cal-muted flex h-16 w-16 items-center justify-center rounded-lg">
+ <Icon name="info" className="text-subtle h-8 w-8" />
</div>
<div className="stack-y-2">
- <h3 className="text-lg font-semibold text-emphasis">{t("setup_incoming_agent")}</h3>
- <p className="text-sm text-subtle">{t("connect_a_phone_number_first")}</p>
+ <h3 className="text-emphasis text-lg font-semibold">{t("setup_incoming_agent")}</h3>
+ <p className="text-subtle text-sm">{t("connect_a_phone_number_first")}</p>
</div>
</div>
</div>
@@ -102,14 +104,14 @@ export function IncomingCallsTab({
if (!inboundAgentId) {
return (
- <div className="p-8 rounded-xl border border-subtle">
- <div className="flex flex-col items-center stack-y-6 text-center">
- <div className="flex justify-center items-center w-16 h-16 rounded-lg bg-cal-muted">
- <Icon name="phone-incoming" className="w-8 h-8 text-subtle" />
+ <div className="border-subtle rounded-xl border p-8">
+ <div className="stack-y-6 flex flex-col items-center text-center">
+ <div className="bg-cal-muted flex h-16 w-16 items-center justify-center rounded-lg">
+ <Icon name="phone-incoming" className="text-subtle h-8 w-8" />
</div>
<div className="stack-y-2">
- <h3 className="text-lg font-semibold text-emphasis">{t("setup_inbound_agent")}</h3>
- <p className="text-sm text-subtle">{t("setup_inbound_agent_for_incoming_calls")}</p>
+ <h3 className="text-emphasis text-lg font-semibold">{t("setup_inbound_agent")}</h3>
+ <p className="text-subtle text-sm">{t("setup_inbound_agent_for_incoming_calls")}</p>
</div>
<Button
onClick={() => {
@@ -147,7 +149,7 @@ export function IncomingCallsTab({
return (
<div className="stack-y-4">
<div>
- <Label className="block mb-1 text-sm font-medium text-emphasis">{t("event_type")}</Label>
+ <Label className="text-emphasis mb-1 block text-sm font-medium">{t("event_type")}</Label>
<p className="text-subtle mb-1.5 text-xs">{t("select_event_type_for_inbound_calls")}</p>
<Select
isSearchable={false}
diff --git a/packages/features/ee/workflows/components/agent-configuration/components/tabs/OutgoingCallsTab.tsx b/apps/web/modules/ee/workflows/components/agent-configuration/components/tabs/OutgoingCallsTab.tsx
similarity index 99%
rename from packages/features/ee/workflows/components/agent-configuration/components/tabs/OutgoingCallsTab.tsx
rename to apps/web/modules/ee/workflows/components/agent-configuration/components/tabs/OutgoingCallsTab.tsx
index 637ac725b54..41697f76d32 100644
--- a/packages/features/ee/workflows/components/agent-configuration/components/tabs/OutgoingCallsTab.tsx
+++ b/apps/web/modules/ee/workflows/components/agent-configuration/components/tabs/OutgoingCallsTab.tsx
@@ -1,3 +1,5 @@
+"use client";
+
import { useState } from "react";
import { Controller } from "react-hook-form";
import type { UseFormReturn } from "react-hook-form";
diff --git a/packages/features/ee/workflows/components/agent-configuration/components/tabs/PhoneNumberTab.tsx b/apps/web/modules/ee/workflows/components/agent-configuration/components/tabs/PhoneNumberTab.tsx
similarity index 97%
rename from packages/features/ee/workflows/components/agent-configuration/components/tabs/PhoneNumberTab.tsx
rename to apps/web/modules/ee/workflows/components/agent-configuration/components/tabs/PhoneNumberTab.tsx
index 4801165baa0..480f5729705 100644
--- a/packages/features/ee/workflows/components/agent-configuration/components/tabs/PhoneNumberTab.tsx
+++ b/apps/web/modules/ee/workflows/components/agent-configuration/components/tabs/PhoneNumberTab.tsx
@@ -1,7 +1,10 @@
+"use client";
+
import posthog from "posthog-js";
import { useState } from "react";
import type { UseFormReturn } from "react-hook-form";
+import type { FormValues } from "@calcom/features/ee/workflows/lib/types";
import { CAL_AI_PHONE_NUMBER_MONTHLY_PRICE } from "@calcom/lib/constants";
import { formatPhoneNumber } from "@calcom/lib/formatPhoneNumber";
import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -19,10 +22,9 @@ import {
} from "@calcom/ui/components/dropdown";
import { Icon } from "@calcom/ui/components/icon";
import { showToast } from "@calcom/ui/components/toast";
+import { WebCallDialog } from "@calcom/web/modules/ee/workflows/components/WebCallDialog";
-import type { FormValues } from "../../../../pages/workflow";
import { TestPhoneCallDialog } from "../../../TestPhoneCallDialog";
-import { WebCallDialog } from "../../../WebCallDialog";
import { usePhoneNumberActions } from "../../hooks/usePhoneNumberActions";
import { BuyNumberDialog } from "../dialogs/BuyNumberDialog";
import { ConfirmationDialogs } from "../dialogs/ConfirmationDialogs";
@@ -125,7 +127,7 @@ export function PhoneNumberTab({
return (
<>
- <div className="relative stack-y-2">
+ <div className="stack-y-2 relative">
{updateAgentMutation.isPending && (
<div className="absolute inset-0 z-10 flex items-center justify-center rounded-lg bg-white/50">
<div className="flex items-center gap-2 text-sm text-gray-600">
@@ -275,7 +277,7 @@ export function PhoneNumberTab({
return (
<>
<div className="border-subtle rounded-xl border p-8">
- <div className="flex flex-col items-center stack-y-6 text-center">
+ <div className="stack-y-6 flex flex-col items-center text-center">
<div className="bg-cal-muted flex h-16 w-16 items-center justify-center rounded-lg">
<Icon name="phone" className="text-subtle h-8 w-8" />
</div>
diff --git a/packages/features/ee/workflows/components/agent-configuration/hooks/useAgentForms.ts b/apps/web/modules/ee/workflows/components/agent-configuration/hooks/useAgentForms.ts
similarity index 95%
rename from packages/features/ee/workflows/components/agent-configuration/hooks/useAgentForms.ts
rename to apps/web/modules/ee/workflows/components/agent-configuration/hooks/useAgentForms.ts
index 388d39eca7d..5a4b07fc62a 100644
--- a/packages/features/ee/workflows/components/agent-configuration/hooks/useAgentForms.ts
+++ b/apps/web/modules/ee/workflows/components/agent-configuration/hooks/useAgentForms.ts
@@ -2,11 +2,11 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { useEffect } from "react";
import { useForm } from "react-hook-form";
+import { cleanPromptForDisplay } from "@calcom/features/calAIPhone/providers/retellAI/utils/promptUtils";
import type { RouterOutputs } from "@calcom/trpc/react";
import type { AgentFormValues } from "../types/schemas";
import { agentSchema } from "../types/schemas";
-import { cleanPromptForDisplay } from "../utils/promptUtils";
interface UseAgentFormsProps {
agentData?: RouterOutputs["viewer"]["aiVoiceAgent"]["get"];
diff --git a/packages/features/ee/workflows/components/agent-configuration/hooks/usePhoneNumberActions.ts b/apps/web/modules/ee/workflows/components/agent-configuration/hooks/usePhoneNumberActions.ts
similarity index 100%
rename from packages/features/ee/workflows/components/agent-configuration/hooks/usePhoneNumberActions.ts
rename to apps/web/modules/ee/workflows/components/agent-configuration/hooks/usePhoneNumberActions.ts
diff --git a/packages/features/ee/workflows/components/agent-configuration/types/schemas.ts b/apps/web/modules/ee/workflows/components/agent-configuration/types/schemas.ts
similarity index 100%
rename from packages/features/ee/workflows/components/agent-configuration/types/schemas.ts
rename to apps/web/modules/ee/workflows/components/agent-configuration/types/schemas.ts
diff --git a/packages/features/ee/workflows/components/agent-configuration/utils/constants.ts b/apps/web/modules/ee/workflows/components/agent-configuration/utils/constants.ts
similarity index 100%
rename from packages/features/ee/workflows/components/agent-configuration/utils/constants.ts
rename to apps/web/modules/ee/workflows/components/agent-configuration/utils/constants.ts
diff --git a/packages/features/ee/workflows/pages/workflow.tsx b/apps/web/modules/ee/workflows/views/WorkflowPage.tsx
similarity index 96%
rename from packages/features/ee/workflows/pages/workflow.tsx
rename to apps/web/modules/ee/workflows/views/WorkflowPage.tsx
index 25a838d41cb..c6879135497 100644
--- a/packages/features/ee/workflows/pages/workflow.tsx
+++ b/apps/web/modules/ee/workflows/views/WorkflowPage.tsx
@@ -7,13 +7,24 @@ import { useEffect, useState } from "react";
import { useForm, useWatch } from "react-hook-form";
import { Toaster } from "sonner";
+import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
+import {
+ isSMSAction,
+ isSMSOrWhatsappAction,
+ isCalAIAction,
+ isFormTrigger,
+} from "@calcom/features/ee/workflows/lib/actionHelperFunctions";
+import { formSchema } from "@calcom/features/ee/workflows/lib/schema";
+import type { FormValues } from "@calcom/features/ee/workflows/lib/types";
+import {
+ getTranslatedText,
+ translateVariablesToEnglish,
+} from "@calcom/features/ee/workflows/lib/variableTranslations";
import type { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
import type { WorkflowPermissions } from "@calcom/features/workflows/repositories/WorkflowPermissionsRepository";
import { SENDER_ID } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { HttpError } from "@calcom/lib/http-error";
-import type { WorkflowStep } from "@calcom/prisma/client";
-import type { TimeUnit, WorkflowTriggerEvents } from "@calcom/prisma/enums";
import { WorkflowActions } from "@calcom/prisma/enums";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
@@ -27,32 +38,9 @@ import { Icon } from "@calcom/ui/components/icon";
import { showToast } from "@calcom/ui/components/toast";
import { Tooltip } from "@calcom/ui/components/tooltip";
-import LicenseRequired from "../../common/components/LicenseRequired";
import { DeleteDialog } from "../components/DeleteDialog";
import SkeletonLoader from "../components/SkeletonLoaderEdit";
import WorkflowDetailsPage from "../components/WorkflowDetailsPage";
-import {
- isSMSAction,
- isSMSOrWhatsappAction,
- isCalAIAction,
- isFormTrigger,
-} from "../lib/actionHelperFunctions";
-import { formSchema } from "../lib/schema";
-import { getTranslatedText, translateVariablesToEnglish } from "../lib/variableTranslations";
-
-export type FormValues = {
- name: string;
- activeOn: Option[];
- steps: (WorkflowStep & {
- senderName: string | null;
- agentId?: string | null;
- inboundAgentId?: string | null;
- })[];
- trigger: WorkflowTriggerEvents;
- time?: number;
- timeUnit?: TimeUnit;
- selectAll: boolean;
-};
type PageProps = {
workflow: number;
diff --git a/packages/features/ee/workflows/pages/index.tsx b/apps/web/modules/ee/workflows/views/WorkflowsPage.tsx
similarity index 87%
rename from packages/features/ee/workflows/pages/index.tsx
rename to apps/web/modules/ee/workflows/views/WorkflowsPage.tsx
index cd9b87dc25b..837bdd461f4 100644
--- a/packages/features/ee/workflows/pages/index.tsx
+++ b/apps/web/modules/ee/workflows/views/WorkflowsPage.tsx
@@ -5,9 +5,11 @@ import { useRouter } from "next/navigation";
import type { Dispatch, SetStateAction } from "react";
import { useState } from "react";
-import { CreateButtonWithTeamsList } from "@calcom/features/ee/teams/components/createButton/CreateButtonWithTeamsList";
+import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
import type { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
-import Shell, { ShellMain } from "@calcom/features/shell/Shell";
+import { FilterResults } from "@calcom/features/filters/components/FilterResults";
+import { TeamsFilter } from "@calcom/features/filters/components/TeamsFilter";
+import { getTeamsFiltersFromQuery } from "@calcom/features/filters/lib/getTeamsFiltersFromQuery";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
@@ -15,15 +17,16 @@ import { trpc } from "@calcom/trpc/react";
import classNames from "@calcom/ui/classNames";
import { Avatar } from "@calcom/ui/components/avatar";
import { AnimatedPopover } from "@calcom/ui/components/popover";
+import Shell, { ShellMain } from "@calcom/web/modules/shell/Shell";
+import EmptyScreen from "@calcom/web/modules/ee/workflows/components/EmptyScreen";
+import SkeletonLoader from "@calcom/web/modules/ee/workflows/components/SkeletonLoaderList";
+import {
+ WorkflowCreationDialog,
+ useWorkflowCreation,
+} from "@calcom/web/modules/ee/workflows/components/WorkflowCreationDialog";
+import WorkflowList from "@calcom/web/modules/ee/workflows/components/WorkflowListPage";
-import { FilterResults } from "../../../filters/components/FilterResults";
-import { TeamsFilter } from "../../../filters/components/TeamsFilter";
-import { getTeamsFiltersFromQuery } from "../../../filters/lib/getTeamsFiltersFromQuery";
-import LicenseRequired from "../../common/components/LicenseRequired";
-import EmptyScreen from "../components/EmptyScreen";
-import SkeletonLoader from "../components/SkeletonLoaderList";
-import { WorkflowCreationDialog, useWorkflowCreation } from "../components/WorkflowCreationDialog";
-import WorkflowList from "../components/WorkflowListPage";
+import { CreateButtonWithTeamsList } from "~/ee/teams/components/createButton/CreateButtonWithTeamsList";
type PageProps = {
filteredList?: Awaited<ReturnType<typeof WorkflowRepository.getFilteredList>>;
@@ -32,6 +35,7 @@ type PageProps = {
function WorkflowsPage({ filteredList }: PageProps) {
const { t } = useLocale();
const session = useSession();
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars -- router is kept for future use
const router = useRouter();
const routerQuery = useRouterQuery();
const filters = getTeamsFiltersFromQuery(routerQuery);
@@ -73,7 +77,7 @@ function WorkflowsPage({ filteredList }: PageProps) {
}>
<>
{filteredWorkflows?.totalCount ? (
- <div className="flex mb-2">
+ <div className="mb-2 flex">
<TeamsFilter />
<div className="mb-4 ml-auto">
<CreateButtonWithTeamsList
@@ -105,6 +109,7 @@ function WorkflowsPage({ filteredList }: PageProps) {
);
}
+// eslint-disable-next-line @typescript-eslint/no-unused-vars -- Filter component is kept for future use
const Filter = (props: {
profiles: {
readOnly?: boolean | undefined;
diff --git a/packages/features/eventtypes/components/CreateEventTypeDialog.tsx b/apps/web/modules/event-types/components/CreateEventTypeDialog.tsx
similarity index 96%
rename from packages/features/eventtypes/components/CreateEventTypeDialog.tsx
rename to apps/web/modules/event-types/components/CreateEventTypeDialog.tsx
index d6bd5017d25..08defa76e96 100644
--- a/packages/features/eventtypes/components/CreateEventTypeDialog.tsx
+++ b/apps/web/modules/event-types/components/CreateEventTypeDialog.tsx
@@ -4,7 +4,7 @@ import { z } from "zod";
import { Dialog } from "@calcom/features/components/controlled-dialog";
import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
-import { TeamEventTypeForm } from "@calcom/features/ee/teams/components/TeamEventTypeForm";
+import CreateEventTypeForm from "@calcom/features/eventtypes/components/CreateEventTypeForm";
import { useCreateEventType } from "@calcom/features/eventtypes/hooks/useCreateEventType";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { useTypedQuery } from "@calcom/lib/hooks/useTypedQuery";
@@ -15,8 +15,7 @@ import { trpc } from "@calcom/trpc/react";
import { Button } from "@calcom/ui/components/button";
import { DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
import { showToast } from "@calcom/ui/components/toast";
-
-import CreateEventTypeForm from "./CreateEventTypeForm";
+import { TeamEventTypeForm } from "@calcom/web/modules/ee/teams/components/TeamEventTypeForm";
// this describes the uniform data needed to create a new event type on Profile or Team
export interface EventTypeParent {
diff --git a/packages/features/eventtypes/components/locations/CalVideoSettings.tsx b/apps/web/modules/event-types/components/locations/CalVideoSettings.tsx
similarity index 96%
rename from packages/features/eventtypes/components/locations/CalVideoSettings.tsx
rename to apps/web/modules/event-types/components/locations/CalVideoSettings.tsx
index a7acb11f62b..cfdb65a3522 100644
--- a/packages/features/eventtypes/components/locations/CalVideoSettings.tsx
+++ b/apps/web/modules/event-types/components/locations/CalVideoSettings.tsx
@@ -4,18 +4,17 @@ import { useState } from "react";
import { useFormContext, Controller } from "react-hook-form";
import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
-import { useHasTeamPlan } from "@calcom/features/billing/hooks/useHasPaidPlan";
import type { FormValues } from "@calcom/features/eventtypes/lib/types";
import type { CalVideoSettings as CalVideoSettingsType } from "@calcom/features/eventtypes/lib/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import classNames from "@calcom/ui/classNames";
-import { UpgradeTeamsBadge } from "@calcom/ui/components/badge";
import { TextField } from "@calcom/ui/components/form";
import { SettingsToggle } from "@calcom/ui/components/form";
import { Icon } from "@calcom/ui/components/icon";
import { Tooltip } from "@calcom/ui/components/tooltip";
-
-import LocationSettingsContainer from "./LocationSettingsContainer";
+import { UpgradeTeamsBadgeWebWrapper as UpgradeTeamsBadge } from "@calcom/web/modules/billing/components/UpgradeTeamsBadgeWebWrapper";
+import { useHasTeamPlan } from "@calcom/web/modules/billing/hooks/useHasPaidPlan";
+import LocationSettingsContainer from "@calcom/web/modules/event-types/components/locations/LocationSettingsContainer";
const CalVideoSettings = ({ calVideoSettings }: { calVideoSettings?: CalVideoSettingsType }) => {
const { t } = useLocale();
diff --git a/packages/features/eventtypes/components/locations/DefaultLocationSettings.tsx b/apps/web/modules/event-types/components/locations/DefaultLocationSettings.tsx
similarity index 97%
rename from packages/features/eventtypes/components/locations/DefaultLocationSettings.tsx
rename to apps/web/modules/event-types/components/locations/DefaultLocationSettings.tsx
index 4cfd3452f29..0b21a47b468 100644
--- a/packages/features/eventtypes/components/locations/DefaultLocationSettings.tsx
+++ b/apps/web/modules/event-types/components/locations/DefaultLocationSettings.tsx
@@ -2,6 +2,7 @@ import { ErrorMessage } from "@hookform/error-message";
import { useFieldArray, useFormContext } from "react-hook-form";
import { getEventLocationType } from "@calcom/app-store/locations";
+import type { LocationCustomClassNames } from "@calcom/features/eventtypes/components/locations/types";
import type { LocationFormValues, FormValues } from "@calcom/features/eventtypes/lib/types";
import CheckboxField from "@calcom/features/form/components/CheckboxField";
import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -10,7 +11,6 @@ import { TextField } from "@calcom/ui/components/form";
import LocationInput from "./LocationInput";
import LocationOptionContainer from "./LocationSettingsContainer";
-import type { LocationCustomClassNames } from "./types";
const DefaultLocationSettings = ({
field,
diff --git a/packages/features/eventtypes/components/locations/LocationInput.tsx b/apps/web/modules/event-types/components/locations/LocationInput.tsx
similarity index 100%
rename from packages/features/eventtypes/components/locations/LocationInput.tsx
rename to apps/web/modules/event-types/components/locations/LocationInput.tsx
diff --git a/packages/features/eventtypes/components/locations/LocationSettingsContainer.tsx b/apps/web/modules/event-types/components/locations/LocationSettingsContainer.tsx
similarity index 100%
rename from packages/features/eventtypes/components/locations/LocationSettingsContainer.tsx
rename to apps/web/modules/event-types/components/locations/LocationSettingsContainer.tsx
diff --git a/packages/features/eventtypes/components/locations/Locations.tsx b/apps/web/modules/event-types/components/locations/Locations.tsx
similarity index 99%
rename from packages/features/eventtypes/components/locations/Locations.tsx
rename to apps/web/modules/event-types/components/locations/Locations.tsx
index 70ad47f0f5d..5907be54ff4 100644
--- a/packages/features/eventtypes/components/locations/Locations.tsx
+++ b/apps/web/modules/event-types/components/locations/Locations.tsx
@@ -8,6 +8,7 @@ import type { UseFormGetValues, UseFormSetValue, Control, FormState } from "reac
import type { EventLocationType } from "@calcom/app-store/locations";
import { getEventLocationType, MeetLocationType } from "@calcom/app-store/locations";
import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
+import type { LocationCustomClassNames } from "@calcom/features/eventtypes/components/locations/types";
import type { LocationFormValues, EventTypeSetupProps } from "@calcom/features/eventtypes/lib/types";
import CheckboxField from "@calcom/features/form/components/CheckboxField";
import type { SingleValueLocationOption } from "@calcom/features/form/components/LocationSelect";
@@ -23,7 +24,6 @@ import { showToast } from "@calcom/ui/components/toast";
import CalVideoSettings from "./CalVideoSettings";
import DefaultLocationSettings from "./DefaultLocationSettings";
import LocationInput from "./LocationInput";
-import type { LocationCustomClassNames } from "./types";
export type TEventTypeLocation = Pick<EventTypeSetupProps["eventType"], "locations" | "calVideoSettings">;
export type TLocationOptions = Pick<EventTypeSetupProps, "locationOptions">["locationOptions"];
@@ -264,7 +264,7 @@ const Locations: React.FC<LocationsProps> = ({
customClassNames={customClassNames}
/>
) : eventLocationType?.organizerInputType ? (
- <div className="mt-2 stack-y-2">
+ <div className="stack-y-2 mt-2">
<div className="w-full">
<div className="flex gap-2">
<div className="flex items-center justify-center">
diff --git a/apps/web/modules/event-types/components/locations/types.ts b/apps/web/modules/event-types/components/locations/types.ts
new file mode 100644
index 00000000000..0241bcc1727
--- /dev/null
+++ b/apps/web/modules/event-types/components/locations/types.ts
@@ -0,0 +1,25 @@
+import type { LocationSelectCustomClassNames } from "@calcom/features/form/components/LocationSelect";
+
+export type LocationCustomClassNames = {
+ container?: string;
+ locationSelect?: LocationSelectCustomClassNames;
+ removeLocationButton?: string;
+ removeLocationIcon?: string;
+ addLocationButton?: string;
+ organizerContactInput?: {
+ errorMessage?: string;
+ locationInput?: LocationInputCustomClassNames;
+ publicDisplayCheckbox?: CheckboxClassNames;
+ };
+};
+
+export type LocationInputCustomClassNames = {
+ addressInput?: string;
+ phoneInput?: string;
+};
+
+export type CheckboxClassNames = {
+ container?: string;
+ label?: string;
+ checkbox?: string;
+};
diff --git a/packages/features/eventtypes/components/tabs/advanced/CustomEventTypeModal.tsx b/apps/web/modules/event-types/components/tabs/advanced/CustomEventTypeModal.tsx
similarity index 100%
rename from packages/features/eventtypes/components/tabs/advanced/CustomEventTypeModal.tsx
rename to apps/web/modules/event-types/components/tabs/advanced/CustomEventTypeModal.tsx
diff --git a/packages/features/eventtypes/components/tabs/advanced/DisableAllEmailsSetting.tsx b/apps/web/modules/event-types/components/tabs/advanced/DisableAllEmailsSetting.tsx
similarity index 100%
rename from packages/features/eventtypes/components/tabs/advanced/DisableAllEmailsSetting.tsx
rename to apps/web/modules/event-types/components/tabs/advanced/DisableAllEmailsSetting.tsx
diff --git a/packages/features/eventtypes/components/tabs/advanced/DisableReschedulingController.tsx b/apps/web/modules/event-types/components/tabs/advanced/DisableReschedulingController.tsx
similarity index 100%
rename from packages/features/eventtypes/components/tabs/advanced/DisableReschedulingController.tsx
rename to apps/web/modules/event-types/components/tabs/advanced/DisableReschedulingController.tsx
diff --git a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx b/apps/web/modules/event-types/components/tabs/advanced/EventAdvancedTab.tsx
similarity index 99%
rename from packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
rename to apps/web/modules/event-types/components/tabs/advanced/EventAdvancedTab.tsx
index 832ee524bed..a056833ce38 100644
--- a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
+++ b/apps/web/modules/event-types/components/tabs/advanced/EventAdvancedTab.tsx
@@ -21,6 +21,7 @@ import {
allowDisablingHostConfirmationEmails,
} from "@calcom/features/ee/workflows/lib/allowDisablingStandardEmails";
import { MultiplePrivateLinksController } from "@calcom/features/eventtypes/components";
+import AddVerifiedEmail from "@calcom/features/eventtypes/components/AddVerifiedEmail";
import { LearnMoreLink } from "@calcom/features/eventtypes/components/LearnMoreLink";
import type { EventNameObjectType } from "@calcom/features/eventtypes/lib/eventNaming";
import { getEventName } from "@calcom/features/eventtypes/lib/eventNaming";
@@ -64,7 +65,6 @@ import {
} from "@calcom/ui/components/form";
import { Icon } from "@calcom/ui/components/icon";
-import AddVerifiedEmail from "../../AddVerifiedEmail";
import type { CustomEventTypeModalClassNames } from "./CustomEventTypeModal";
import CustomEventTypeModal from "./CustomEventTypeModal";
import type { EmailNotificationToggleCustomClassNames } from "./DisableAllEmailsSetting";
diff --git a/packages/features/eventtypes/components/tabs/advanced/RequiresConfirmationController.tsx b/apps/web/modules/event-types/components/tabs/advanced/RequiresConfirmationController.tsx
similarity index 100%
rename from packages/features/eventtypes/components/tabs/advanced/RequiresConfirmationController.tsx
rename to apps/web/modules/event-types/components/tabs/advanced/RequiresConfirmationController.tsx
diff --git a/packages/features/eventtypes/components/tabs/ai/AIEventController.tsx b/apps/web/modules/event-types/components/tabs/ai/AIEventController.tsx
similarity index 100%
rename from packages/features/eventtypes/components/tabs/ai/AIEventController.tsx
rename to apps/web/modules/event-types/components/tabs/ai/AIEventController.tsx
diff --git a/packages/features/eventtypes/components/tabs/ai/EventAITab.tsx b/apps/web/modules/event-types/components/tabs/ai/EventAITab.tsx
similarity index 100%
rename from packages/features/eventtypes/components/tabs/ai/EventAITab.tsx
rename to apps/web/modules/event-types/components/tabs/ai/EventAITab.tsx
diff --git a/packages/features/eventtypes/components/tabs/apps/EventAppsTab.tsx b/apps/web/modules/event-types/components/tabs/apps/EventAppsTab.tsx
similarity index 100%
rename from packages/features/eventtypes/components/tabs/apps/EventAppsTab.tsx
rename to apps/web/modules/event-types/components/tabs/apps/EventAppsTab.tsx
diff --git a/packages/features/eventtypes/components/tabs/assignment/EventTeamAssignmentTab.tsx b/apps/web/modules/event-types/components/tabs/assignment/EventTeamAssignmentTab.tsx
similarity index 99%
rename from packages/features/eventtypes/components/tabs/assignment/EventTeamAssignmentTab.tsx
rename to apps/web/modules/event-types/components/tabs/assignment/EventTeamAssignmentTab.tsx
index 54021d3e033..e02e528317b 100644
--- a/packages/features/eventtypes/components/tabs/assignment/EventTeamAssignmentTab.tsx
+++ b/apps/web/modules/event-types/components/tabs/assignment/EventTeamAssignmentTab.tsx
@@ -13,8 +13,10 @@ import AddMembersWithSwitch, {
import AssignAllTeamMembers from "@calcom/features/eventtypes/components/AssignAllTeamMembers";
import type { ChildrenEventTypeSelectCustomClassNames } from "@calcom/features/eventtypes/components/ChildrenEventTypeSelect";
import ChildrenEventTypeSelect from "@calcom/features/eventtypes/components/ChildrenEventTypeSelect";
+import { EditWeightsForAllTeamMembers } from "@calcom/features/eventtypes/components/EditWeightsForAllTeamMembers";
import { sortHosts } from "@calcom/features/eventtypes/components/HostEditDialogs";
import { LearnMoreLink } from "@calcom/features/eventtypes/components/LearnMoreLink";
+import WeightDescription from "@calcom/features/eventtypes/components/WeightDescription";
import type {
FormValues,
TeamMember,
@@ -35,9 +37,6 @@ import { Icon } from "@calcom/ui/components/icon";
import { RadioAreaGroup as RadioArea } from "@calcom/ui/components/radio";
import { Tooltip } from "@calcom/ui/components/tooltip";
-import { EditWeightsForAllTeamMembers } from "../../EditWeightsForAllTeamMembers";
-import WeightDescription from "../../WeightDescription";
-
export type EventTeamAssignmentTabCustomClassNames = {
assignmentType?: {
container?: string;
diff --git a/packages/features/eventtypes/components/tabs/availability/EventAvailabilityTab.tsx b/apps/web/modules/event-types/components/tabs/availability/EventAvailabilityTab.tsx
similarity index 100%
rename from packages/features/eventtypes/components/tabs/availability/EventAvailabilityTab.tsx
rename to apps/web/modules/event-types/components/tabs/availability/EventAvailabilityTab.tsx
diff --git a/packages/features/eventtypes/components/tabs/instant/EventInstantTab.tsx b/apps/web/modules/event-types/components/tabs/instant/EventInstantTab.tsx
similarity index 100%
rename from packages/features/eventtypes/components/tabs/instant/EventInstantTab.tsx
rename to apps/web/modules/event-types/components/tabs/instant/EventInstantTab.tsx
diff --git a/packages/features/eventtypes/components/tabs/instant/InstantEventController.tsx b/apps/web/modules/event-types/components/tabs/instant/InstantEventController.tsx
similarity index 98%
rename from packages/features/eventtypes/components/tabs/instant/InstantEventController.tsx
rename to apps/web/modules/event-types/components/tabs/instant/InstantEventController.tsx
index 40baf7b7208..223add91e57 100644
--- a/packages/features/eventtypes/components/tabs/instant/InstantEventController.tsx
+++ b/apps/web/modules/event-types/components/tabs/instant/InstantEventController.tsx
@@ -8,9 +8,6 @@ import { Dialog } from "@calcom/features/components/controlled-dialog";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
import type { EventTypeSetup, FormValues, AvailabilityOption } from "@calcom/features/eventtypes/lib/types";
-import { WebhookForm } from "@calcom/features/webhooks/components";
-import type { TWebhook, WebhookFormSubmitData } from "@calcom/features/webhooks/components/WebhookForm";
-import WebhookListItem from "@calcom/features/webhooks/components/WebhookListItem";
import { subscriberUrlReserved } from "@calcom/features/webhooks/lib/subscriberUrlReserved";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { WebhookTriggerEvents } from "@calcom/prisma/enums";
@@ -27,6 +24,10 @@ import { Select } from "@calcom/ui/components/form";
import { SettingsToggle } from "@calcom/ui/components/form";
import { showToast } from "@calcom/ui/components/toast";
+import { WebhookForm } from "~/webhooks/components";
+import type { TWebhook, WebhookFormSubmitData } from "~/webhooks/components/WebhookForm";
+import WebhookListItem from "~/webhooks/components/WebhookListItem";
+
type InstantEventControllerProps = {
eventType: EventTypeSetup;
paymentEnabled: boolean;
diff --git a/packages/features/eventtypes/components/tabs/limits/EventLimitsTab.tsx b/apps/web/modules/event-types/components/tabs/limits/EventLimitsTab.tsx
similarity index 100%
rename from packages/features/eventtypes/components/tabs/limits/EventLimitsTab.tsx
rename to apps/web/modules/event-types/components/tabs/limits/EventLimitsTab.tsx
diff --git a/packages/features/eventtypes/components/tabs/limits/MaxActiveBookingsPerBookerController.tsx b/apps/web/modules/event-types/components/tabs/limits/MaxActiveBookingsPerBookerController.tsx
similarity index 100%
rename from packages/features/eventtypes/components/tabs/limits/MaxActiveBookingsPerBookerController.tsx
rename to apps/web/modules/event-types/components/tabs/limits/MaxActiveBookingsPerBookerController.tsx
diff --git a/packages/features/eventtypes/components/tabs/recurring/EventRecurringTab.tsx b/apps/web/modules/event-types/components/tabs/recurring/EventRecurringTab.tsx
similarity index 100%
rename from packages/features/eventtypes/components/tabs/recurring/EventRecurringTab.tsx
rename to apps/web/modules/event-types/components/tabs/recurring/EventRecurringTab.tsx
diff --git a/packages/features/eventtypes/components/tabs/recurring/RecurringEventController.tsx b/apps/web/modules/event-types/components/tabs/recurring/RecurringEventController.tsx
similarity index 100%
rename from packages/features/eventtypes/components/tabs/recurring/RecurringEventController.tsx
rename to apps/web/modules/event-types/components/tabs/recurring/RecurringEventController.tsx
diff --git a/packages/features/eventtypes/components/tabs/setup/EventSetupTab.tsx b/apps/web/modules/event-types/components/tabs/setup/EventSetupTab.tsx
similarity index 98%
rename from packages/features/eventtypes/components/tabs/setup/EventSetupTab.tsx
rename to apps/web/modules/event-types/components/tabs/setup/EventSetupTab.tsx
index 2f842d39f14..f8395f97b31 100644
--- a/packages/features/eventtypes/components/tabs/setup/EventSetupTab.tsx
+++ b/apps/web/modules/event-types/components/tabs/setup/EventSetupTab.tsx
@@ -5,6 +5,7 @@ import type { MultiValue } from "react-select";
import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
+import type { LocationCustomClassNames } from "@calcom/features/eventtypes/components/locations/types";
import type {
EventTypeSetupProps,
InputClassNames,
@@ -26,8 +27,7 @@ import { Select } from "@calcom/ui/components/form";
import { SettingsToggle } from "@calcom/ui/components/form";
import { Skeleton } from "@calcom/ui/components/skeleton";
-import Locations from "../../locations/Locations";
-import type { LocationCustomClassNames } from "../../locations/types";
+import Locations from "@calcom/web/modules/event-types/components/locations/Locations";
export type EventSetupTabCustomClassNames = {
wrapper?: string;
@@ -169,7 +169,7 @@ export const EventSetupTab = (
className={classNames("pl-0", customClassNames?.titleSection?.urlInput?.input)}
addOnLeading={
isPlatform ? undefined : (
- <span className="max-w-24 md:max-w-56 inline-block overflow-hidden text-ellipsis whitespace-nowrap min-w-0">
+ <span className="max-w-24 md:max-w-56 inline-block min-w-0 overflow-hidden text-ellipsis whitespace-nowrap">
{urlPrefix}/
{!isManagedEventType
? team
@@ -212,7 +212,7 @@ export const EventSetupTab = (
isSearchable={false}
isDisabled={lengthLockedProps.disabled}
className={classNames(
- "h-auto min-h-[36px]! text-sm",
+ "min-h-[36px]! h-auto text-sm",
customClassNames?.durationSection?.multipleDuration?.availableDurationsSelect?.select
)}
innerClassNames={
diff --git a/packages/features/eventtypes/components/tabs/webhooks/EventWebhooksTab.tsx b/apps/web/modules/event-types/components/tabs/webhooks/EventWebhooksTab.tsx
similarity index 96%
rename from packages/features/eventtypes/components/tabs/webhooks/EventWebhooksTab.tsx
rename to apps/web/modules/event-types/components/tabs/webhooks/EventWebhooksTab.tsx
index 79896dc83c5..b844c3870fd 100644
--- a/packages/features/eventtypes/components/tabs/webhooks/EventWebhooksTab.tsx
+++ b/apps/web/modules/event-types/components/tabs/webhooks/EventWebhooksTab.tsx
@@ -5,9 +5,6 @@ import { useFormContext } from "react-hook-form";
import { Dialog } from "@calcom/features/components/controlled-dialog";
import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
import type { FormValues, EventTypeSetupProps } from "@calcom/features/eventtypes/lib/types";
-import { WebhookForm } from "@calcom/features/webhooks/components";
-import EventTypeWebhookListItem from "@calcom/features/webhooks/components/EventTypeWebhookListItem";
-import type { TWebhook, WebhookFormSubmitData } from "@calcom/features/webhooks/components/WebhookForm";
import { subscriberUrlReserved } from "@calcom/features/webhooks/lib/subscriberUrlReserved";
import ServerTrans from "@calcom/lib/components/ServerTrans";
import { APP_NAME } from "@calcom/lib/constants";
@@ -20,6 +17,10 @@ import { EmptyScreen } from "@calcom/ui/components/empty-screen";
import { showToast } from "@calcom/ui/components/toast";
import { revalidateEventTypeEditPage } from "@calcom/web/app/(use-page-wrapper)/event-types/[type]/actions";
+import { WebhookForm } from "~/webhooks/components";
+import EventTypeWebhookListItem from "~/webhooks/components/EventTypeWebhookListItem";
+import type { TWebhook, WebhookFormSubmitData } from "~/webhooks/components/WebhookForm";
+
export const EventWebhooksTab = ({ eventType }: Pick<EventTypeSetupProps, "eventType">) => {
const { t } = useLocale();
@@ -149,7 +150,7 @@ export const EventWebhooksTab = ({ eventType }: Pick<EventTypeSetupProps, "event
<div className="flex justify-between">
<div>
<div className="text-default text-sm font-semibold">{t("webhooks")}</div>
- <p className="text-subtle max-w-[280px] wrap-break-word text-sm sm:max-w-[500px]">
+ <p className="text-subtle wrap-break-word max-w-[280px] text-sm sm:max-w-[500px]">
{t("add_webhook_description", { appName: APP_NAME })}
</p>
</div>
diff --git a/packages/features/eventtypes/components/tabs/workflows/EventWorkfowsTab.tsx b/apps/web/modules/event-types/components/tabs/workflows/EventWorkflowsTab.tsx
similarity index 98%
rename from packages/features/eventtypes/components/tabs/workflows/EventWorkfowsTab.tsx
rename to apps/web/modules/event-types/components/tabs/workflows/EventWorkflowsTab.tsx
index 7741d31fa08..d9823e66f99 100644
--- a/packages/features/eventtypes/components/tabs/workflows/EventWorkfowsTab.tsx
+++ b/apps/web/modules/event-types/components/tabs/workflows/EventWorkflowsTab.tsx
@@ -5,8 +5,6 @@ import { useFormContext } from "react-hook-form";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
-import SkeletonLoader from "@calcom/features/ee/workflows/components/SkeletonLoaderEventWorkflowsTab";
-import type { WorkflowType } from "@calcom/features/ee/workflows/components/WorkflowListPage";
import { getActionIcon } from "@calcom/features/ee/workflows/lib/getActionIcon";
import type { FormValues } from "@calcom/features/eventtypes/lib/types";
import ServerTrans from "@calcom/lib/components/ServerTrans";
@@ -25,6 +23,9 @@ import { showToast } from "@calcom/ui/components/toast";
import { Tooltip } from "@calcom/ui/components/tooltip";
import { revalidateEventTypeEditPage } from "@calcom/web/app/(use-page-wrapper)/event-types/[type]/actions";
+import SkeletonLoader from "~/ee/workflows/components/SkeletonLoaderEventWorkflowsTab";
+import type { WorkflowType } from "~/ee/workflows/components/WorkflowListPage";
+
type PartialWorkflowType = Pick<
WorkflowType,
"name" | "activeOn" | "isOrg" | "steps" | "id" | "readOnly" | "permissions"
diff --git a/apps/web/modules/event-types/views/event-types-listing-view.tsx b/apps/web/modules/event-types/views/event-types-listing-view.tsx
index f296fa1fe25..364e4e8b94f 100644
--- a/apps/web/modules/event-types/views/event-types-listing-view.tsx
+++ b/apps/web/modules/event-types/views/event-types-listing-view.tsx
@@ -9,13 +9,8 @@ import { z } from "zod";
import { Dialog } from "@calcom/features/components/controlled-dialog";
import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
-import { CreateButton } from "@calcom/features/ee/teams/components/createButton/CreateButton";
import { EventTypeEmbedButton, EventTypeEmbedDialog } from "@calcom/features/embed/EventTypeEmbed";
import { EventTypeDescription } from "@calcom/features/eventtypes/components";
-import {
- CreateEventTypeDialog,
- type ProfileOption,
-} from "@calcom/features/eventtypes/components/CreateEventTypeDialog";
import { DuplicateDialog } from "@calcom/features/eventtypes/components/DuplicateDialog";
import { InfiniteSkeletonLoader } from "@calcom/features/eventtypes/components/SkeletonLoader";
import { APP_NAME, WEBSITE_URL } from "@calcom/lib/constants";
@@ -59,6 +54,11 @@ import { HorizontalTabs } from "@calcom/ui/components/navigation";
import { Skeleton } from "@calcom/ui/components/skeleton";
import { showToast } from "@calcom/ui/components/toast";
import { Tooltip } from "@calcom/ui/components/tooltip";
+import { CreateButton } from "@calcom/web/modules/ee/teams/components/createButton/CreateButton";
+import {
+ CreateEventTypeDialog,
+ type ProfileOption,
+} from "@calcom/web/modules/event-types/components/CreateEventTypeDialog";
import { TRPCClientError } from "@trpc/client";
@@ -912,8 +912,7 @@ const EmptyEventTypeList = ({
buttonRaw={
<Button
href={`?dialog=new&eventPage=${group.profile.slug}&teamId=${group.teamId}`}
- variant="button"
- >
+ variant="button">
{t("create")}
</Button>
}
diff --git a/apps/web/modules/insights/insights-call-history-view.tsx b/apps/web/modules/insights/insights-call-history-view.tsx
index 0b16d449ecf..6acdcc5d95f 100644
--- a/apps/web/modules/insights/insights-call-history-view.tsx
+++ b/apps/web/modules/insights/insights-call-history-view.tsx
@@ -15,14 +15,14 @@ import {
} from "@calcom/features/data-table";
import { useSegments } from "@calcom/features/data-table/hooks/useSegments";
import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
-import { CallDetailsSheet } from "@calcom/features/ee/workflows/components/CallDetailsSheet";
-import type { CallDetailsState, CallDetailsAction } from "@calcom/features/ee/workflows/components/types";
+import type { CallDetailsState, CallDetailsAction } from "@calcom/features/ee/workflows/lib/types";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import type { RouterOutputs } from "@calcom/trpc/react";
import { Badge } from "@calcom/ui/components/badge";
import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { CallDetailsSheet } from "@calcom/web/modules/ee/workflows/components/CallDetailsSheet";
type CallHistoryRow = {
id: string;
@@ -312,12 +312,12 @@ function CallHistoryContent({ org: _org }: CallHistoryProps) {
</>
}
EmptyView={
- <EmptyScreen
- Icon="phone"
- headline={searchTerm ? t("no_result_found_for", { searchTerm }) : t("no_call_history")}
- description={t("no_call_history_description")}
- className="mb-16"
- />
+ <EmptyScreen
+ Icon="phone"
+ headline={searchTerm ? t("no_result_found_for", { searchTerm }) : t("no_call_history")}
+ description={t("no_call_history_description")}
+ className="mb-16"
+ />
}
/>
diff --git a/apps/web/modules/members/members-view.tsx b/apps/web/modules/members/members-view.tsx
index 874bfc300cd..d2d88e5fd44 100644
--- a/apps/web/modules/members/members-view.tsx
+++ b/apps/web/modules/members/members-view.tsx
@@ -2,10 +2,10 @@
import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
-import { UserListTable } from "@calcom/features/users/components/UserTable/UserListTable";
-import type { UserListTableProps } from "@calcom/features/users/components/UserTable/UserListTable";
-import type { MemberPermissions } from "@calcom/features/users/components/UserTable/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { UserListTable } from "@calcom/web/modules/users/components/UserTable/UserListTable";
+import type { UserListTableProps } from "@calcom/web/modules/users/components/UserTable/UserListTable";
+import type { MemberPermissions } from "@calcom/web/modules/users/components/UserTable/types";
export const MembersView = (props: UserListTableProps & { permissions?: MemberPermissions }) => {
const { t } = useLocale();
diff --git a/apps/web/modules/more/more-page-view.tsx b/apps/web/modules/more/more-page-view.tsx
index e2978e8af40..e1c26ff66f9 100644
--- a/apps/web/modules/more/more-page-view.tsx
+++ b/apps/web/modules/more/more-page-view.tsx
@@ -1,9 +1,10 @@
"use client";
-import Shell from "@calcom/features/shell/Shell";
-import { MobileNavigationMoreItems } from "@calcom/features/shell/navigation/Navigation";
import { useLocale } from "@calcom/lib/hooks/useLocale";
+import Shell from "~/shell/Shell";
+import { MobileNavigationMoreItems } from "~/shell/navigation/Navigation";
+
export default function MorePage() {
const { t } = useLocale();
return (
diff --git a/apps/web/modules/onboarding/getting-started/onboarding-view.tsx b/apps/web/modules/onboarding/getting-started/onboarding-view.tsx
index ab39c3db598..cef646d033b 100644
--- a/apps/web/modules/onboarding/getting-started/onboarding-view.tsx
+++ b/apps/web/modules/onboarding/getting-started/onboarding-view.tsx
@@ -5,7 +5,6 @@ import { useRouter } from "next/navigation";
import posthog from "posthog-js";
import { useEffect, useRef, useTransition } from "react";
-import { useTeamInvites } from "@calcom/features/billing/hooks/useHasPaidPlan";
import { isCompanyEmail } from "@calcom/features/ee/organizations/lib/utils";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import classNames from "@calcom/ui/classNames";
@@ -13,6 +12,7 @@ import { Badge } from "@calcom/ui/components/badge";
import { Button } from "@calcom/ui/components/button";
import { type IconName } from "@calcom/ui/components/icon";
import { RadioAreaGroup } from "@calcom/ui/components/radio";
+import { useTeamInvites } from "@calcom/web/modules/billing/hooks/useHasPaidPlan";
import { OnboardingCard } from "../components/OnboardingCard";
import { OnboardingLayout } from "../components/OnboardingLayout";
@@ -35,6 +35,7 @@ export const OnboardingView = ({ userEmail }: OnboardingViewProps) => {
// Reset onboarding data when visiting this page, but preserve the selected plan
useEffect(() => {
resetOnboardingPreservingPlan();
+ // eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
// If user has pending team invites, redirect them directly to personal onboarding
diff --git a/apps/web/modules/onboarding/hooks/useSubmitPersonalOnboarding.ts b/apps/web/modules/onboarding/hooks/useSubmitPersonalOnboarding.ts
index 4ca790b87ca..d6c79f02fe1 100644
--- a/apps/web/modules/onboarding/hooks/useSubmitPersonalOnboarding.ts
+++ b/apps/web/modules/onboarding/hooks/useSubmitPersonalOnboarding.ts
@@ -1,10 +1,10 @@
import { useRouter } from "next/navigation";
-import { setShowWelcomeToCalcomModalFlag } from "@calcom/features/shell/hooks/useWelcomeToCalcomModal";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { sessionStorage } from "@calcom/lib/webstorage";
import { trpc } from "@calcom/trpc/react";
import { showToast } from "@calcom/ui/components/toast";
+import { setShowWelcomeToCalcomModalFlag } from "@calcom/web/modules/shell/hooks/useWelcomeToCalcomModal";
const ORG_MODAL_STORAGE_KEY = "showNewOrgModal";
@@ -59,7 +59,7 @@ export const useSubmitPersonalOnboarding = () => {
// Check if org modal flag is set - if so, don't show personal modal
// Organization onboarding takes precedence
const hasOrgModalFlag = sessionStorage.getItem(ORG_MODAL_STORAGE_KEY) === "true";
-
+
if (!hasOrgModalFlag) {
// Only set personal modal flag if org modal flag is not set
setShowWelcomeToCalcomModalFlag();
diff --git a/apps/web/modules/settings/billing/components/BillingCredits.tsx b/apps/web/modules/settings/billing/components/BillingCredits.tsx
index 99befa80df8..3abc6a015b4 100644
--- a/apps/web/modules/settings/billing/components/BillingCredits.tsx
+++ b/apps/web/modules/settings/billing/components/BillingCredits.tsx
@@ -8,7 +8,6 @@ import { useForm } from "react-hook-form";
import dayjs from "@calcom/dayjs";
import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
-import { MemberInvitationModalWithoutMembers } from "@calcom/features/ee/teams/components/MemberInvitationModal";
import ServerTrans from "@calcom/lib/components/ServerTrans";
import { IS_SMS_CREDITS_ENABLED } from "@calcom/lib/constants";
import { downloadAsCsv } from "@calcom/lib/csvUtils";
@@ -24,6 +23,8 @@ import { ProgressBar } from "@calcom/ui/components/progress-bar";
import { showToast } from "@calcom/ui/components/toast";
import { Tooltip } from "@calcom/ui/components/tooltip";
+import { MemberInvitationModalWithoutMembers } from "~/ee/teams/components/MemberInvitationModal";
+
import { BillingCreditsSkeleton } from "./BillingCreditsSkeleton";
type MonthOption = {
diff --git a/apps/web/modules/settings/my-account/appearance-view.tsx b/apps/web/modules/settings/my-account/appearance-view.tsx
index de9ac9d96ef..2fe78310783 100644
--- a/apps/web/modules/settings/my-account/appearance-view.tsx
+++ b/apps/web/modules/settings/my-account/appearance-view.tsx
@@ -22,12 +22,13 @@ import type { userMetadata } from "@calcom/prisma/zod-utils";
import { trpc } from "@calcom/trpc/react";
import type { RouterOutputs } from "@calcom/trpc/react";
import { Alert } from "@calcom/ui/components/alert";
-import { UpgradeTeamsBadge } from "@calcom/ui/components/badge";
import { Button } from "@calcom/ui/components/button";
import { SettingsToggle, ColorPicker, Form } from "@calcom/ui/components/form";
import { showToast } from "@calcom/ui/components/toast";
import { useCalcomTheme } from "@calcom/ui/styles";
+import { UpgradeTeamsBadgeWebWrapper } from "~/billing/components/UpgradeTeamsBadgeWebWrapper";
+
const useBrandColors = (
currentTheme: string | null,
{
@@ -393,7 +394,7 @@ const AppearanceView = ({
disabled={!hasPaidPlan || mutation?.isPending}
description={t("removes_cal_branding", { appName: APP_NAME })}
checked={hasPaidPlan ? hideBrandingValue : false}
- Badge={<UpgradeTeamsBadge />}
+ Badge={<UpgradeTeamsBadgeWebWrapper />}
onCheckedChange={(checked) => {
setHideBrandingValue(checked);
mutation.mutate({ hideBranding: checked });
diff --git a/apps/web/modules/settings/my-account/holidays-view.tsx b/apps/web/modules/settings/my-account/holidays-view.tsx
index 52063da3fb1..b946fe7a8cd 100644
--- a/apps/web/modules/settings/my-account/holidays-view.tsx
+++ b/apps/web/modules/settings/my-account/holidays-view.tsx
@@ -4,7 +4,6 @@ import { memo, useMemo, useCallback } from "react";
import dayjs from "@calcom/dayjs";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
-import { OutOfOfficeToggleGroup } from "@calcom/features/settings/outOfOffice/OutOfOfficeToggleGroup";
import { getHolidayEmoji } from "@calcom/lib/holidays/getHolidayEmoji";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
@@ -17,6 +16,8 @@ import { Icon } from "@calcom/ui/components/icon";
import { SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
import { showToast } from "@calcom/ui/components/toast";
+import { OutOfOfficeToggleGroup } from "~/settings/outOfOffice/OutOfOfficeToggleGroup";
+
function HolidaysCTA() {
const { t } = useLocale();
return (
diff --git a/apps/web/modules/settings/my-account/out-of-office-view.tsx b/apps/web/modules/settings/my-account/out-of-office-view.tsx
index 7e6ec2a3545..415be11d597 100644
--- a/apps/web/modules/settings/my-account/out-of-office-view.tsx
+++ b/apps/web/modules/settings/my-account/out-of-office-view.tsx
@@ -4,11 +4,13 @@ import { useEffect, useState } from "react";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
-import { CreateOrEditOutOfOfficeEntryModal } from "@calcom/features/settings/outOfOffice/CreateOrEditOutOfOfficeModal";
-import type { BookingRedirectForm } from "@calcom/features/settings/outOfOffice/CreateOrEditOutOfOfficeModal";
+import type { BookingRedirectForm } from "~/settings/outOfOffice/types";
+
+import { CreateOrEditOutOfOfficeEntryModal } from "~/settings/outOfOffice/CreateOrEditOutOfOfficeModal";
+import OutOfOfficeEntriesList from "~/settings/outOfOffice/OutOfOfficeEntriesList";
+import { OutOfOfficeTab } from "~/settings/outOfOffice/OutOfOfficeToggleGroup";
+
import { HolidaysView } from "./holidays-view";
-import OutOfOfficeEntriesList from "@calcom/features/settings/outOfOffice/OutOfOfficeEntriesList";
-import { OutOfOfficeTab } from "@calcom/features/settings/outOfOffice/OutOfOfficeToggleGroup";
export default function OutOfOfficeView() {
const [openModal, setOpenModal] = useState(false);
diff --git a/apps/web/modules/settings/my-account/profile-view.tsx b/apps/web/modules/settings/my-account/profile-view.tsx
index d588896a895..dbce2bf6109 100644
--- a/apps/web/modules/settings/my-account/profile-view.tsx
+++ b/apps/web/modules/settings/my-account/profile-view.tsx
@@ -15,7 +15,6 @@ import { Dialog } from "@calcom/features/components/controlled-dialog";
import { isCompanyEmail } from "@calcom/features/ee/organizations/lib/utils";
import SectionBottomActions from "@calcom/features/settings/SectionBottomActions";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
-import { DisplayInfo } from "@calcom/features/users/components/UserTable/EditSheet/DisplayInfo";
import { APP_NAME, FULL_NAME_LENGTH_MAX_LIMIT } from "@calcom/lib/constants";
import { emailSchema } from "@calcom/lib/emailSchema";
import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
@@ -38,6 +37,7 @@ import { TextField } from "@calcom/ui/components/form";
import { Icon } from "@calcom/ui/components/icon";
import { ImageUploader } from "@calcom/ui/components/image-uploader";
import { showToast } from "@calcom/ui/components/toast";
+import { DisplayInfo } from "@calcom/web/modules/users/components/UserTable/EditSheet/DisplayInfo";
import TwoFactor from "@components/auth/TwoFactor";
import CustomEmailTextField from "@components/settings/CustomEmailTextField";
@@ -719,7 +719,7 @@ const ProfileForm = ({
{usersAttributes && usersAttributes?.length > 0 && (
<div className="mt-6 flex flex-col">
<Label>{t("attributes")}</Label>
- <div className="flex flex-col stack-y-4">
+ <div className="stack-y-4 flex flex-col">
{usersAttributes.map((attribute, index) => (
<>
<DisplayInfo
diff --git a/packages/features/settings/outOfOffice/CreateNewOutOfOfficeEntryButton.tsx b/apps/web/modules/settings/outOfOffice/CreateNewOutOfOfficeEntryButton.tsx
similarity index 100%
rename from packages/features/settings/outOfOffice/CreateNewOutOfOfficeEntryButton.tsx
rename to apps/web/modules/settings/outOfOffice/CreateNewOutOfOfficeEntryButton.tsx
diff --git a/packages/features/settings/outOfOffice/CreateOrEditOutOfOfficeModal.tsx b/apps/web/modules/settings/outOfOffice/CreateOrEditOutOfOfficeModal.tsx
similarity index 97%
rename from packages/features/settings/outOfOffice/CreateOrEditOutOfOfficeModal.tsx
rename to apps/web/modules/settings/outOfOffice/CreateOrEditOutOfOfficeModal.tsx
index 2e63292860b..6a18a7d03a5 100644
--- a/packages/features/settings/outOfOffice/CreateOrEditOutOfOfficeModal.tsx
+++ b/apps/web/modules/settings/outOfOffice/CreateOrEditOutOfOfficeModal.tsx
@@ -2,7 +2,6 @@ import { useMemo, useState } from "react";
import { Controller, useForm } from "react-hook-form";
import dayjs from "@calcom/dayjs";
-import { useHasTeamPlan } from "@calcom/features/billing/hooks/useHasPaidPlan";
import { Dialog } from "@calcom/features/components/controlled-dialog";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useDebounce } from "@calcom/lib/hooks/useDebounce";
@@ -12,7 +11,6 @@ import { trpc } from "@calcom/trpc/react";
import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
import classNames from "@calcom/ui/classNames";
import { Alert } from "@calcom/ui/components/alert";
-import { UpgradeTeamsBadge } from "@calcom/ui/components/badge";
import { Button } from "@calcom/ui/components/button";
import { DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/components/dialog";
import { DateRangePicker, TextArea, Input, Checkbox } from "@calcom/ui/components/form";
@@ -20,23 +18,13 @@ import { Label } from "@calcom/ui/components/form";
import { Select } from "@calcom/ui/components/form";
import { Switch } from "@calcom/ui/components/form";
import { showToast } from "@calcom/ui/components/toast";
+import { useHasTeamPlan } from "@calcom/web/modules/billing/hooks/useHasPaidPlan";
-import { OutOfOfficeTab } from "./OutOfOfficeToggleGroup";
+import { UpgradeTeamsBadgeWebWrapper as UpgradeTeamsBadge } from "~/billing/components/UpgradeTeamsBadgeWebWrapper";
+import { OutOfOfficeTab } from "~/settings/outOfOffice/OutOfOfficeToggleGroup";
-export type BookingRedirectForm = {
- dateRange: { startDate: Date; endDate: Date };
- startDateOffset: number;
- endDateOffset: number;
- toTeamUserId: number | null;
- reasonId: number;
- notes?: string;
- showNotePublicly?: boolean;
- uuid?: string | null;
- forUserId: number | null;
- forUserName?: string;
- forUserAvatar?: string;
- toUserName?: string;
-};
+export type { BookingRedirectForm } from "~/settings/outOfOffice/types";
+import type { BookingRedirectForm } from "~/settings/outOfOffice/types";
type Option = { value: number; label: string };
diff --git a/packages/features/settings/outOfOffice/OutOfOfficeEntriesList.tsx b/apps/web/modules/settings/outOfOffice/OutOfOfficeEntriesList.tsx
similarity index 99%
rename from packages/features/settings/outOfOffice/OutOfOfficeEntriesList.tsx
rename to apps/web/modules/settings/outOfOffice/OutOfOfficeEntriesList.tsx
index eeccf852a1c..306b1d83df7 100644
--- a/packages/features/settings/outOfOffice/OutOfOfficeEntriesList.tsx
+++ b/apps/web/modules/settings/outOfOffice/OutOfOfficeEntriesList.tsx
@@ -38,7 +38,7 @@ import { showToast } from "@calcom/ui/components/toast";
import { Tooltip } from "@calcom/ui/components/tooltip";
import CreateNewOutOfOfficeEntryButton from "./CreateNewOutOfOfficeEntryButton";
-import type { BookingRedirectForm } from "./CreateOrEditOutOfOfficeModal";
+import type { BookingRedirectForm } from "./types";
import { OutOfOfficeTab, OutOfOfficeToggleGroup } from "./OutOfOfficeToggleGroup";
interface OutOfOfficeEntry {
diff --git a/packages/features/settings/outOfOffice/OutOfOfficeToggleGroup.tsx b/apps/web/modules/settings/outOfOffice/OutOfOfficeToggleGroup.tsx
similarity index 100%
rename from packages/features/settings/outOfOffice/OutOfOfficeToggleGroup.tsx
rename to apps/web/modules/settings/outOfOffice/OutOfOfficeToggleGroup.tsx
diff --git a/apps/web/modules/settings/outOfOffice/types.ts b/apps/web/modules/settings/outOfOffice/types.ts
new file mode 100644
index 00000000000..6640f6dd6ac
--- /dev/null
+++ b/apps/web/modules/settings/outOfOffice/types.ts
@@ -0,0 +1,14 @@
+export type BookingRedirectForm = {
+ dateRange: { startDate: Date; endDate: Date };
+ startDateOffset: number;
+ endDateOffset: number;
+ toTeamUserId: number | null;
+ reasonId: number;
+ notes?: string;
+ showNotePublicly?: boolean;
+ uuid?: string | null;
+ forUserId: number | null;
+ forUserName?: string;
+ forUserAvatar?: string;
+ toUserName?: string;
+};
diff --git a/apps/web/modules/settings/platform/billing/billing-view.tsx b/apps/web/modules/settings/platform/billing/billing-view.tsx
index 4cf4ff062a0..68dd9d6712a 100644
--- a/apps/web/modules/settings/platform/billing/billing-view.tsx
+++ b/apps/web/modules/settings/platform/billing/billing-view.tsx
@@ -3,7 +3,6 @@
import { usePathname } from "next/navigation";
import { Dialog } from "@calcom/features/components/controlled-dialog";
-import Shell from "@calcom/features/shell/Shell";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { Button } from "@calcom/ui/components/button";
@@ -17,6 +16,7 @@ import NoPlatformPlan from "@components/settings/platform/dashboard/NoPlatformPl
import { useGetUserAttributes } from "@components/settings/platform/hooks/useGetUserAttributes";
import { CtaRow } from "~/settings/billing/billing-view";
+import Shell from "~/shell/Shell";
declare global {
interface Window {
@@ -89,7 +89,7 @@ export default function PlatformBillingUpgrade() {
subtitle={t("manage_billing_description")}
isPlatformUser={true}>
<>
- <div className="border-subtle stack-y-6 rounded-lg border px-6 py-8 text-sm sm:stack-y-8">
+ <div className="border-subtle stack-y-6 sm:stack-y-8 rounded-lg border px-6 py-8 text-sm">
<CtaRow
title={t("view_and_manage_billing_details")}
description={t("view_and_edit_billing_details")}>
diff --git a/apps/web/modules/settings/platform/managed-users/managed-users-view.tsx b/apps/web/modules/settings/platform/managed-users/managed-users-view.tsx
index fe2ae6757d4..3809eaa20a0 100644
--- a/apps/web/modules/settings/platform/managed-users/managed-users-view.tsx
+++ b/apps/web/modules/settings/platform/managed-users/managed-users-view.tsx
@@ -2,15 +2,16 @@
import { useMemo, useState } from "react";
-import Shell from "@calcom/features/shell/Shell";
-import { PlatformManagedUsersTable } from "@calcom/features/users/components/UserTable/PlatformManagedUsersTable";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { Label } from "@calcom/ui/components/form";
import { Select } from "@calcom/ui/components/form";
import { Skeleton, SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
+import { PlatformManagedUsersTable } from "@calcom/web/modules/users/components/UserTable/PlatformManagedUsersTable";
import { useOAuthClients } from "@lib/hooks/settings/platform/oauth-clients/useOAuthClients";
+import Shell from "~/shell/Shell";
+
type OAuthClientOption = { label: string; value: string };
const ManagedUsersView = () => {
diff --git a/apps/web/modules/settings/platform/oauth-clients/[clientId]/edit/edit-view.tsx b/apps/web/modules/settings/platform/oauth-clients/[clientId]/edit/edit-view.tsx
index 45f53673ade..64531c187a6 100644
--- a/apps/web/modules/settings/platform/oauth-clients/[clientId]/edit/edit-view.tsx
+++ b/apps/web/modules/settings/platform/oauth-clients/[clientId]/edit/edit-view.tsx
@@ -3,7 +3,6 @@
import { useParams } from "next/navigation";
import { useRouter } from "next/navigation";
-import Shell from "@calcom/features/shell/Shell";
import { ErrorCode } from "@calcom/lib/errorCodes";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { PERMISSIONS_GROUPED_MAP } from "@calcom/platform-constants";
@@ -17,6 +16,8 @@ import { useGetUserAttributes } from "@components/settings/platform/hooks/useGet
import type { FormValues } from "@components/settings/platform/oauth-clients/oauth-client-form";
import { OAuthClientForm as EditOAuthClientForm } from "@components/settings/platform/oauth-clients/oauth-client-form";
+import Shell from "~/shell/Shell";
+
export default function EditOAuthClient() {
const { t } = useLocale();
const router = useRouter();
@@ -81,7 +82,7 @@ export default function EditOAuthClient() {
</p>
</div>
</div>
- {(!Boolean(clientId) || (isFetched && !data)) && <p>{t("oauth_client_not_found")}</p>}
+ {(!clientId || (isFetched && !data)) && <p>{t("oauth_client_not_found")}</p>}
{isFetched && !!data && (
<EditOAuthClientForm
defaultValues={{
diff --git a/apps/web/modules/settings/platform/oauth-clients/[clientId]/edit/edit-webhooks-view.tsx b/apps/web/modules/settings/platform/oauth-clients/[clientId]/edit/edit-webhooks-view.tsx
index 0856b2f89dc..4c38aa4e055 100644
--- a/apps/web/modules/settings/platform/oauth-clients/[clientId]/edit/edit-webhooks-view.tsx
+++ b/apps/web/modules/settings/platform/oauth-clients/[clientId]/edit/edit-webhooks-view.tsx
@@ -3,10 +3,8 @@
import { useParams } from "next/navigation";
import { useRouter } from "next/navigation";
-import Shell from "@calcom/features/shell/Shell";
-import { WebhookForm } from "@calcom/features/webhooks/components";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
import { DEFAULT_WEBHOOK_VERSION } from "@calcom/features/webhooks/lib/interface/IWebhookRepository";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
import { WebhookTriggerEvents } from "@calcom/prisma/enums";
import { showToast } from "@calcom/ui/components/toast";
@@ -19,6 +17,9 @@ import {
import NoPlatformPlan from "@components/settings/platform/dashboard/NoPlatformPlan";
import { useGetUserAttributes } from "@components/settings/platform/hooks/useGetUserAttributes";
+import Shell from "~/shell/Shell";
+import { WebhookForm } from "~/webhooks/components";
+
export default function EditOAuthClientWebhooks() {
const { t } = useLocale();
const router = useRouter();
diff --git a/apps/web/modules/settings/platform/oauth-clients/create-new-view.tsx b/apps/web/modules/settings/platform/oauth-clients/create-new-view.tsx
index 47c64fd95f6..9e8e672ff01 100644
--- a/apps/web/modules/settings/platform/oauth-clients/create-new-view.tsx
+++ b/apps/web/modules/settings/platform/oauth-clients/create-new-view.tsx
@@ -2,7 +2,6 @@
import { useRouter } from "next/navigation";
-import Shell from "@calcom/features/shell/Shell";
import { ErrorCode } from "@calcom/lib/errorCodes";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { PERMISSION_MAP } from "@calcom/platform-constants";
@@ -16,6 +15,8 @@ import { useGetUserAttributes } from "@components/settings/platform/hooks/useGet
import type { FormValues } from "@components/settings/platform/oauth-clients/oauth-client-form";
import { OAuthClientForm } from "@components/settings/platform/oauth-clients/oauth-client-form";
+import Shell from "~/shell/Shell";
+
export default function CreateOAuthClient() {
const router = useRouter();
const { t } = useLocale();
diff --git a/apps/web/modules/settings/platform/plans/platform-plans-view.tsx b/apps/web/modules/settings/platform/plans/platform-plans-view.tsx
index 77605eea083..56cc4caeae6 100644
--- a/apps/web/modules/settings/platform/plans/platform-plans-view.tsx
+++ b/apps/web/modules/settings/platform/plans/platform-plans-view.tsx
@@ -1,12 +1,13 @@
"use client";
-import Shell from "@calcom/features/shell/Shell";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import NoPlatformPlan from "@components/settings/platform/dashboard/NoPlatformPlan";
import { useGetUserAttributes } from "@components/settings/platform/hooks/useGetUserAttributes";
import { PlatformPricing } from "@components/settings/platform/pricing/platform-pricing";
+import Shell from "~/shell/Shell";
+
export default function PlatformPlans() {
const { t } = useLocale();
const { isUserLoading, isUserBillingDataLoading, isPlatformUser, isPaidUser, userBillingData, userOrgId } =
diff --git a/apps/web/modules/settings/platform/platform-view.tsx b/apps/web/modules/settings/platform/platform-view.tsx
index 42702ad14d0..684b861100b 100644
--- a/apps/web/modules/settings/platform/platform-view.tsx
+++ b/apps/web/modules/settings/platform/platform-view.tsx
@@ -4,7 +4,6 @@ import { QueryClientProvider, QueryClient } from "@tanstack/react-query";
import { usePathname } from "next/navigation";
import { useState, useEffect, useCallback } from "react";
-import Shell from "@calcom/features/shell/Shell";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { showToast } from "@calcom/ui/components/toast";
@@ -18,6 +17,8 @@ import { OAuthClientsList } from "@components/settings/platform/dashboard/oauth-
import { useGetUserAttributes } from "@components/settings/platform/hooks/useGetUserAttributes";
import { PlatformPricing } from "@components/settings/platform/pricing/platform-pricing";
+import Shell from "~/shell/Shell";
+
const queryClient = new QueryClient();
export default function Platform() {
diff --git a/apps/web/modules/settings/teams/[id]/event-types-view.tsx b/apps/web/modules/settings/teams/[id]/event-types-view.tsx
index c06a3afbcce..8cc7edab705 100644
--- a/apps/web/modules/settings/teams/[id]/event-types-view.tsx
+++ b/apps/web/modules/settings/teams/[id]/event-types-view.tsx
@@ -3,7 +3,6 @@
import { useRouter } from "next/navigation";
import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
-import { TeamEventTypeForm } from "@calcom/features/ee/teams/components/TeamEventTypeForm";
import { useCreateEventType } from "@calcom/features/eventtypes/hooks/useCreateEventType";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -11,6 +10,7 @@ import { trpc } from "@calcom/trpc/react";
import { Button } from "@calcom/ui/components/button";
import { WizardLayout } from "@calcom/ui/components/layout";
import { showToast } from "@calcom/ui/components/toast";
+import { TeamEventTypeForm } from "@calcom/web/modules/ee/teams/components/TeamEventTypeForm";
type CreateTeamEventTypeProps = {
permissions: { canCreateEventType: boolean };
diff --git a/apps/web/modules/settings/teams/[id]/onboard-members-view.tsx b/apps/web/modules/settings/teams/[id]/onboard-members-view.tsx
index b06e6bf9c22..665eff9d739 100644
--- a/apps/web/modules/settings/teams/[id]/onboard-members-view.tsx
+++ b/apps/web/modules/settings/teams/[id]/onboard-members-view.tsx
@@ -1,7 +1,7 @@
"use client";
-import AddNewTeamMembers from "@calcom/features/ee/teams/components/AddNewTeamMembers";
import { WizardLayout } from "@calcom/ui/components/layout";
+import AddNewTeamMembers from "@calcom/web/modules/ee/teams/components/AddNewTeamMembers";
export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => (
<WizardLayout currentStep={2} maxSteps={3}>
diff --git a/apps/web/modules/settings/teams/new/create-new-team-view.tsx b/apps/web/modules/settings/teams/new/create-new-team-view.tsx
index 065cc08afd0..0b84fcf2a57 100644
--- a/apps/web/modules/settings/teams/new/create-new-team-view.tsx
+++ b/apps/web/modules/settings/teams/new/create-new-team-view.tsx
@@ -4,12 +4,12 @@ import { useRouter } from "next/navigation";
import React from "react";
import { z } from "zod";
-import { CreateANewTeamForm } from "@calcom/features/ee/teams/components";
import { HOSTED_CAL_FEATURES } from "@calcom/lib/constants";
import { getSafeRedirectUrl } from "@calcom/lib/getSafeRedirectUrl";
import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
import type { RouterOutputs } from "@calcom/trpc/react";
import { WizardLayout } from "@calcom/ui/components/layout";
+import { CreateANewTeamForm } from "@calcom/web/modules/ee/teams/components/CreateANewTeamForm";
const querySchema = z.object({
returnTo: z.string().optional(),
diff --git a/packages/features/shell/DynamicModals.tsx b/apps/web/modules/shell/DynamicModals.tsx
similarity index 100%
rename from packages/features/shell/DynamicModals.tsx
rename to apps/web/modules/shell/DynamicModals.tsx
diff --git a/packages/features/kbar/Kbar.tsx b/apps/web/modules/shell/Kbar.tsx
similarity index 96%
rename from packages/features/kbar/Kbar.tsx
rename to apps/web/modules/shell/Kbar.tsx
index e4aa2c7dcd9..c4f22f01346 100644
--- a/packages/features/kbar/Kbar.tsx
+++ b/apps/web/modules/shell/Kbar.tsx
@@ -14,14 +14,13 @@ import { useRouter } from "next/navigation";
import { useMemo, useState } from "react";
import { appStoreMetadata } from "@calcom/app-store/appStoreMetaData";
+import { MintlifyChat } from "@calcom/features/mintlify-chat/MintlifyChat";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { isMac } from "@calcom/lib/isMac";
import { trpc } from "@calcom/trpc/react";
import { Icon } from "@calcom/ui/components/icon";
import { Tooltip } from "@calcom/ui/components/tooltip";
-import { MintlifyChat } from "../mintlify-chat/MintlifyChat";
-
type shortcutArrayType = {
shortcuts?: string[];
};
@@ -249,18 +248,17 @@ export const KBarContent = () => {
const [inputText, setInputText] = useState("");
const [aiResponse, setAiResponse] = useState("");
const showAiChat =
- process.env.NEXT_PUBLIC_ENABLE_MINTLIFY_CHAT === "true" &&
- !!process.env.NEXT_PUBLIC_CHAT_API_URL;
+ process.env.NEXT_PUBLIC_ENABLE_MINTLIFY_CHAT === "true" && !!process.env.NEXT_PUBLIC_CHAT_API_URL;
return (
<KBarPortal>
<KBarPositioner className="overflow-scroll">
- <KBarAnimator className="bg-default z-10 w-full max-w-(--breakpoint-sm) overflow-hidden rounded-md shadow-lg">
+ <KBarAnimator className="bg-default max-w-(--breakpoint-sm) z-10 w-full overflow-hidden rounded-md shadow-lg">
<div className="border-subtle flex items-center justify-center border-b">
<Icon name="search" className="text-default mx-3 h-4 w-4" />
<KBarSearch
defaultPlaceholder={t("kbar_search_placeholder")}
- className="bg-default placeholder:text-subtle text-default w-full rounded-sm py-2.5 focus-visible:outline-none px-0 border-0 focus:ring-0"
+ className="bg-default placeholder:text-subtle text-default w-full rounded-sm border-0 py-2.5 px-0 focus:ring-0 focus-visible:outline-none"
value={inputText}
onChange={(e) => {
setInputText(e.currentTarget.value.trim());
diff --git a/packages/features/shell/Shell.tsx b/apps/web/modules/shell/Shell.tsx
similarity index 99%
rename from packages/features/shell/Shell.tsx
rename to apps/web/modules/shell/Shell.tsx
index 345c4eb1187..25221d8d122 100644
--- a/packages/features/shell/Shell.tsx
+++ b/apps/web/modules/shell/Shell.tsx
@@ -9,7 +9,6 @@ import { Toaster } from "sonner";
import { useRedirectToLoginIfUnauthenticated } from "@calcom/features/auth/lib/hooks/useRedirectToLoginIfUnauthenticated";
import { useRedirectToOnboardingIfNeeded } from "@calcom/features/auth/lib/hooks/useRedirectToOnboardingIfNeeded";
import { useFormbricks } from "@calcom/features/formbricks/formbricks-client";
-import { KBarContent, KBarRoot } from "@calcom/features/kbar/Kbar";
import TimezoneChangeDialog from "@calcom/features/settings/TimezoneChangeDialog";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import classNames from "@calcom/ui/classNames";
@@ -18,6 +17,7 @@ import { ErrorBoundary } from "@calcom/ui/components/errorBoundary";
import { SkeletonText } from "@calcom/ui/components/skeleton";
import { DynamicModals } from "./DynamicModals";
+import { KBarContent, KBarRoot } from "./Kbar";
import { SideBarContainer } from "./SideBar";
import { TopNavContainer } from "./TopNav";
import { BannerContainer } from "./banners/LayoutBanner";
diff --git a/packages/features/shell/SideBar.tsx b/apps/web/modules/shell/SideBar.tsx
similarity index 94%
rename from packages/features/shell/SideBar.tsx
rename to apps/web/modules/shell/SideBar.tsx
index 51d14a0fd83..e8df86c3a5c 100644
--- a/packages/features/shell/SideBar.tsx
+++ b/apps/web/modules/shell/SideBar.tsx
@@ -18,14 +18,14 @@ import { Logo } from "@calcom/ui/components/logo";
import { SkeletonText } from "@calcom/ui/components/skeleton";
import { Tooltip } from "@calcom/ui/components/tooltip";
-import { KBarTrigger } from "../kbar/Kbar";
+import { KBarTrigger } from "./Kbar";
import { Navigation } from "./navigation/Navigation";
import { useBottomNavItems } from "./useBottomNavItems";
import { ProfileDropdown } from "./user-dropdown/ProfileDropdown";
import { UserDropdown } from "./user-dropdown/UserDropdown";
// need to import without ssr to prevent hydration errors
-const Tips = dynamic(() => import("@calcom/features/tips").then((mod) => mod.Tips), {
+const Tips = dynamic(() => import("./Tips").then((mod) => mod.default), {
ssr: false,
});
@@ -112,19 +112,13 @@ export function SideBar({ bannersHeight, user }: SideBarProps) {
color="minimal"
onClick={() => window.history.back()}
className="todesktop:block hover:text-emphasis text-subtle group hidden text-sm font-medium">
- <Icon
- name="arrow-left"
- className="group-hover:text-emphasis text-subtle h-4 w-4 shrink-0"
- />
+ <Icon name="arrow-left" className="group-hover:text-emphasis text-subtle h-4 w-4 shrink-0" />
</button>
<button
color="minimal"
onClick={() => window.history.forward()}
className="todesktop:block hover:text-emphasis text-subtle group hidden text-sm font-medium">
- <Icon
- name="arrow-right"
- className="group-hover:text-emphasis text-subtle h-4 w-4 shrink-0"
- />
+ <Icon name="arrow-right" className="group-hover:text-emphasis text-subtle h-4 w-4 shrink-0" />
</button>
{!!user?.org && (
<div data-testid="user-dropdown-trigger" className="flex items-center">
diff --git a/packages/features/shell/TeamInviteBadge.tsx b/apps/web/modules/shell/TeamInviteBadge.tsx
similarity index 82%
rename from packages/features/shell/TeamInviteBadge.tsx
rename to apps/web/modules/shell/TeamInviteBadge.tsx
index dcbec3f99fe..50c080cdce8 100644
--- a/packages/features/shell/TeamInviteBadge.tsx
+++ b/apps/web/modules/shell/TeamInviteBadge.tsx
@@ -1,6 +1,6 @@
-import { useTeamInvites } from "@calcom/features/billing/hooks/useHasPaidPlan";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { Badge } from "@calcom/ui/components/badge";
+import { useTeamInvites } from "@calcom/web/modules/billing/hooks/useHasPaidPlan";
export function TeamInviteBadge() {
const { isPending, listInvites } = useTeamInvites();
diff --git a/packages/features/tips/Tips.tsx b/apps/web/modules/shell/Tips.tsx
similarity index 91%
rename from packages/features/tips/Tips.tsx
rename to apps/web/modules/shell/Tips.tsx
index fc899fdf945..a087c63ecc2 100644
--- a/packages/features/tips/Tips.tsx
+++ b/apps/web/modules/shell/Tips.tsx
@@ -1,13 +1,13 @@
-
import shuffle from "lodash/shuffle";
-import { useState, memo } from "react";
import posthog from "posthog-js";
+import { useState, memo } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { localStorage } from "@calcom/lib/webstorage";
import { Card } from "@calcom/ui/components/card";
-import { GatedFeatures } from "@calcom/features/shell/stores/gatedFeaturesStore";
-import { useGatedFeaturesStore } from "@calcom/features/shell/stores/gatedFeaturesStore";
+
+import { GatedFeatures } from "./stores/gatedFeaturesStore";
+import { useGatedFeaturesStore } from "./stores/gatedFeaturesStore";
type Tip = {
id: number;
@@ -242,9 +242,9 @@ function Tips() {
mediaLinkOnClick={
isTopTip
? () => {
- posthog.capture("tip_video_clicked", tip);
- if (tip.onClick) tip.onClick();
- }
+ posthog.capture("tip_video_clicked", tip);
+ if (tip.onClick) tip.onClick();
+ }
: undefined
}
title={t(tip.title)}
@@ -252,24 +252,24 @@ function Tips() {
learnMore={
isTopTip
? {
- href: tip.href,
- text: t("learn_more"),
- onClick: () => {
- posthog.capture("tip_learn_more_clicked", tip);
- if (tip.onClick) tip.onClick();
+ href: tip.href,
+ text: t("learn_more"),
+ onClick: () => {
+ posthog.capture("tip_learn_more_clicked", tip);
+ if (tip.onClick) tip.onClick();
+ },
}
- }
: undefined
}
actionButton={
isTopTip
? {
- onClick: () => {
- posthog.capture("tip_dismiss_clicked", tip);
- handleRemoveItem(tip.id);
- },
- child: t("dismiss"),
- }
+ onClick: () => {
+ posthog.capture("tip_dismiss_clicked", tip);
+ handleRemoveItem(tip.id);
+ },
+ child: t("dismiss"),
+ }
: undefined
}
containerProps={{
diff --git a/packages/features/shell/TopNav.tsx b/apps/web/modules/shell/TopNav.tsx
similarity index 96%
rename from packages/features/shell/TopNav.tsx
rename to apps/web/modules/shell/TopNav.tsx
index 53fff2e424d..5e7930ebb8a 100644
--- a/packages/features/shell/TopNav.tsx
+++ b/apps/web/modules/shell/TopNav.tsx
@@ -2,11 +2,11 @@ import { useSession } from "next-auth/react";
import Link from "next/link";
import { useIsEmbed } from "@calcom/embed-core/embed-iframe";
-import { KBarTrigger } from "@calcom/features/kbar/Kbar";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { Icon } from "@calcom/ui/components/icon";
import { Logo } from "@calcom/ui/components/logo";
+import { KBarTrigger } from "./Kbar";
import { UserDropdown } from "./user-dropdown/UserDropdown";
export function TopNavContainer() {
diff --git a/packages/features/tips/UpgradeTip.tsx b/apps/web/modules/shell/UpgradeTip.tsx
similarity index 96%
rename from packages/features/tips/UpgradeTip.tsx
rename to apps/web/modules/shell/UpgradeTip.tsx
index d0ab6c90516..87a34353f97 100644
--- a/packages/features/tips/UpgradeTip.tsx
+++ b/apps/web/modules/shell/UpgradeTip.tsx
@@ -1,9 +1,9 @@
import type { ReactNode } from "react";
-import { useHasTeamPlan } from "@calcom/features/billing/hooks/useHasPaidPlan";
import { useGetTheme } from "@calcom/lib/hooks/useTheme";
import { trpc } from "@calcom/trpc/react";
import classNames from "@calcom/ui/classNames";
+import { useHasTeamPlan } from "@calcom/web/modules/billing/hooks/useHasPaidPlan";
export function UpgradeTip({
title,
diff --git a/packages/features/shell/banners/LayoutBanner.tsx b/apps/web/modules/shell/banners/LayoutBanner.tsx
similarity index 89%
rename from packages/features/shell/banners/LayoutBanner.tsx
rename to apps/web/modules/shell/banners/LayoutBanner.tsx
index 6c9539a228f..a782a59a32b 100644
--- a/packages/features/shell/banners/LayoutBanner.tsx
+++ b/apps/web/modules/shell/banners/LayoutBanner.tsx
@@ -5,20 +5,23 @@ import {
OrgUpgradeBanner,
type OrgUpgradeBannerProps,
} from "@calcom/features/ee/organizations/components/OrgUpgradeBanner";
-import { TeamsUpgradeBanner, type TeamsUpgradeBannerProps } from "@calcom/features/ee/teams/components";
+import {
+ TeamsUpgradeBanner,
+ type TeamsUpgradeBannerProps,
+} from "@calcom/web/modules/ee/teams/components/TeamsUpgradeBanner";
import AdminPasswordBanner, {
type AdminPasswordBannerProps,
-} from "@calcom/features/users/components/AdminPasswordBanner";
+} from "@calcom/web/modules/users/components/AdminPasswordBanner";
import CalendarCredentialBanner, {
type CalendarCredentialBannerProps,
-} from "@calcom/features/users/components/CalendarCredentialBanner";
+} from "@calcom/web/modules/users/components/CalendarCredentialBanner";
import {
InvalidAppCredentialBanners,
type InvalidAppCredentialBannersProps,
-} from "@calcom/features/users/components/InvalidAppCredentialsBanner";
+} from "@calcom/web/modules/users/components/InvalidAppCredentialsBanner";
import VerifyEmailBanner, {
type VerifyEmailBannerProps,
-} from "@calcom/features/users/components/VerifyEmailBanner";
+} from "@calcom/web/modules/users/components/VerifyEmailBanner";
type BannerTypeProps = {
teamUpgradeBanner: TeamsUpgradeBannerProps;
diff --git a/packages/features/shell/banners/useBanners.ts b/apps/web/modules/shell/banners/useBanners.ts
similarity index 100%
rename from packages/features/shell/banners/useBanners.ts
rename to apps/web/modules/shell/banners/useBanners.ts
diff --git a/packages/features/shell/components/GatedFeaturesModal.tsx b/apps/web/modules/shell/components/GatedFeaturesModal.tsx
similarity index 100%
rename from packages/features/shell/components/GatedFeaturesModal.tsx
rename to apps/web/modules/shell/components/GatedFeaturesModal.tsx
diff --git a/packages/features/shell/components/WelcomeToCalcomModal.tsx b/apps/web/modules/shell/components/WelcomeToCalcomModal.tsx
similarity index 100%
rename from packages/features/shell/components/WelcomeToCalcomModal.tsx
rename to apps/web/modules/shell/components/WelcomeToCalcomModal.tsx
diff --git a/packages/features/shell/hooks/useWelcomeToCalcomModal.ts b/apps/web/modules/shell/hooks/useWelcomeToCalcomModal.ts
similarity index 100%
rename from packages/features/shell/hooks/useWelcomeToCalcomModal.ts
rename to apps/web/modules/shell/hooks/useWelcomeToCalcomModal.ts
diff --git a/packages/features/shell/navigation/Navigation.tsx b/apps/web/modules/shell/navigation/Navigation.tsx
similarity index 94%
rename from packages/features/shell/navigation/Navigation.tsx
rename to apps/web/modules/shell/navigation/Navigation.tsx
index 20091813c8f..6d918fd3a4e 100644
--- a/packages/features/shell/navigation/Navigation.tsx
+++ b/apps/web/modules/shell/navigation/Navigation.tsx
@@ -2,34 +2,25 @@ import { useSession } from "next-auth/react";
import { useMemo } from "react";
import { useIsEmbed } from "@calcom/embed-core/embed-iframe";
-import UnconfirmedBookingBadge from "@calcom/features/bookings/UnconfirmedBookingBadge";
-import { useHasPaidPlan } from "@calcom/features/billing/hooks/useHasPaidPlan";
import {
useOrgBranding,
type OrganizationBranding,
} from "@calcom/features/ee/organizations/context/provider";
-import { KBarTrigger } from "@calcom/features/kbar/Kbar";
import classNames from "@calcom/ui/classNames";
+import { useHasPaidPlan } from "@calcom/web/modules/billing/hooks/useHasPaidPlan";
+import UnconfirmedBookingBadge from "../../bookings/components/UnconfirmedBookingBadge";
+import { KBarTrigger } from "../Kbar";
import { TeamInviteBadge } from "../TeamInviteBadge";
import type { NavigationItemType } from "./NavigationItem";
import { NavigationItem, MobileNavigationItem, MobileNavigationMoreItem } from "./NavigationItem";
export const MORE_SEPARATOR_NAME = "more";
-const preserveBookingsQueryParams = ({
- prevPathname,
- nextPathname,
-}: {
- prevPathname: string | null;
- nextPathname: string;
-}) => Boolean(prevPathname?.startsWith("/bookings/")) && nextPathname.startsWith("/bookings/");
-
const getNavigationItems = (
orgBranding: OrganizationBranding,
hasInsightsAccess: boolean
): NavigationItemType[] => [
-
{
name: "event_types_page_title",
href: "/event-types",
diff --git a/packages/features/shell/navigation/NavigationItem.tsx b/apps/web/modules/shell/navigation/NavigationItem.tsx
similarity index 100%
rename from packages/features/shell/navigation/NavigationItem.tsx
rename to apps/web/modules/shell/navigation/NavigationItem.tsx
diff --git a/packages/features/shell/navigation/useShouldDisplayNavigationItem.ts b/apps/web/modules/shell/navigation/useShouldDisplayNavigationItem.ts
similarity index 100%
rename from packages/features/shell/navigation/useShouldDisplayNavigationItem.ts
rename to apps/web/modules/shell/navigation/useShouldDisplayNavigationItem.ts
diff --git a/packages/features/shell/stores/gatedFeaturesStore.ts b/apps/web/modules/shell/stores/gatedFeaturesStore.ts
similarity index 100%
rename from packages/features/shell/stores/gatedFeaturesStore.ts
rename to apps/web/modules/shell/stores/gatedFeaturesStore.ts
diff --git a/packages/features/shell/useAppTheme.ts b/apps/web/modules/shell/useAppTheme.ts
similarity index 100%
rename from packages/features/shell/useAppTheme.ts
rename to apps/web/modules/shell/useAppTheme.ts
diff --git a/packages/features/shell/useBottomNavItems.ts b/apps/web/modules/shell/useBottomNavItems.ts
similarity index 73%
rename from packages/features/shell/useBottomNavItems.ts
rename to apps/web/modules/shell/useBottomNavItems.ts
index 489c77db336..25d1be103fa 100644
--- a/packages/features/shell/useBottomNavItems.ts
+++ b/apps/web/modules/shell/useBottomNavItems.ts
@@ -1,11 +1,11 @@
import type { User as UserAuth } from "next-auth";
import posthog from "posthog-js";
-import { useHasActiveTeamPlanAsOwner } from "@calcom/features/billing/hooks/useHasPaidPlan";
import { IS_DUB_REFERRALS_ENABLED } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import { showToast } from "@calcom/ui/components/toast";
+import { useHasActiveTeamPlanAsOwner } from "@calcom/web/modules/billing/hooks/useHasPaidPlan";
import { type NavigationItemType } from "./navigation/NavigationItem";
@@ -38,15 +38,15 @@ export function useBottomNavItems({
// Render above to prevent layout shift as much as possible
isTrial
? {
- name: "skip_trial",
- href: "",
- isLoading: skipTeamTrialsMutation.isPending,
- icon: "clock",
- onClick: (e: { preventDefault: () => void }) => {
- e.preventDefault();
- skipTeamTrialsMutation.mutate({});
- },
- }
+ name: "skip_trial",
+ href: "",
+ isLoading: skipTeamTrialsMutation.isPending,
+ icon: "clock",
+ onClick: (e: { preventDefault: () => void }) => {
+ e.preventDefault();
+ skipTeamTrialsMutation.mutate({});
+ },
+ }
: null,
{
name: "view_public_page",
@@ -66,21 +66,21 @@ export function useBottomNavItems({
},
IS_DUB_REFERRALS_ENABLED
? {
- name: "referral_text",
- href: "/refer",
- icon: "gift",
- onClick: () => {
- posthog.capture("refer_and_earn_clicked")
+ name: "referral_text",
+ href: "/refer",
+ icon: "gift",
+ onClick: () => {
+ posthog.capture("refer_and_earn_clicked");
+ },
}
- }
: null,
isAdmin
? {
- name: "impersonation",
- href: "/settings/admin/impersonation",
- icon: "lock",
- }
+ name: "impersonation",
+ href: "/settings/admin/impersonation",
+ icon: "lock",
+ }
: null,
{
name: "settings",
diff --git a/packages/features/shell/user-dropdown/ProfileDropdown.tsx b/apps/web/modules/shell/user-dropdown/ProfileDropdown.tsx
similarity index 100%
rename from packages/features/shell/user-dropdown/ProfileDropdown.tsx
rename to apps/web/modules/shell/user-dropdown/ProfileDropdown.tsx
diff --git a/packages/features/shell/user-dropdown/UserDropdown.tsx b/apps/web/modules/shell/user-dropdown/UserDropdown.tsx
similarity index 98%
rename from packages/features/shell/user-dropdown/UserDropdown.tsx
rename to apps/web/modules/shell/user-dropdown/UserDropdown.tsx
index a2debbf6c69..a83386c3d80 100644
--- a/packages/features/shell/user-dropdown/UserDropdown.tsx
+++ b/apps/web/modules/shell/user-dropdown/UserDropdown.tsx
@@ -20,8 +20,7 @@ import {
import { Icon } from "@calcom/ui/components/icon";
// TODO (Platform): we shouldnt be importing from web here
import { useGetUserAttributes } from "@calcom/web/components/settings/platform/hooks/useGetUserAttributes";
-
-import FreshChatProvider from "../../ee/support/lib/freshchat/FreshChatProvider";
+import FreshChatProvider from "@calcom/web/modules/ee/support/lib/freshchat/FreshChatProvider";
declare global {
interface Window {
diff --git a/apps/web/modules/test-setup.ts b/apps/web/modules/test-setup.ts
index 8b057660576..32e2d4438b9 100644
--- a/apps/web/modules/test-setup.ts
+++ b/apps/web/modules/test-setup.ts
@@ -1,7 +1,11 @@
+import matchers from "@testing-library/jest-dom/matchers";
import React from "react";
-import { vi, afterEach } from "vitest";
+import ResizeObserver from "resize-observer-polyfill";
+import { vi, afterEach, expect } from "vitest";
global.React = React;
+global.ResizeObserver = ResizeObserver;
+expect.extend(matchers);
afterEach(() => {
vi.resetAllMocks();
@@ -90,10 +94,8 @@ vi.mock("@calcom/lib/hooks/useCompatSearchParams", () => {
vi.mock("@calcom/lib/hooks/useLocale", () => {
return {
- useLocale: vi.fn().mockReturnValue({
- t: vi.fn().mockImplementation((text: string) => {
- return text;
- }),
+ useLocale: () => ({
+ t: (text: string) => text,
i18n: {
language: "en",
},
@@ -168,6 +170,7 @@ vi.mock("@calcom/ui/components/unpublished-entity", () => ({
vi.mock("@calcom/ui/components/avatar", () => ({
UserAvatar: vi.fn(),
+ Avatar: () => null,
}));
vi.mock("@calcom/web/components/PageWrapper", () => ({
diff --git a/packages/features/timezone-buddy/components/AvailabilityEditSheet.tsx b/apps/web/modules/timezone-buddy/components/AvailabilityEditSheet.tsx
similarity index 100%
rename from packages/features/timezone-buddy/components/AvailabilityEditSheet.tsx
rename to apps/web/modules/timezone-buddy/components/AvailabilityEditSheet.tsx
diff --git a/packages/features/timezone-buddy/components/AvailabilitySliderTable.tsx b/apps/web/modules/timezone-buddy/components/AvailabilitySliderTable.tsx
similarity index 99%
rename from packages/features/timezone-buddy/components/AvailabilitySliderTable.tsx
rename to apps/web/modules/timezone-buddy/components/AvailabilitySliderTable.tsx
index 767aad9ca47..effc2a404fd 100644
--- a/packages/features/timezone-buddy/components/AvailabilitySliderTable.tsx
+++ b/apps/web/modules/timezone-buddy/components/AvailabilitySliderTable.tsx
@@ -21,7 +21,8 @@ import { UserAvatar } from "@calcom/ui/components/avatar";
import { Button } from "@calcom/ui/components/button";
import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
-import { UpgradeTip } from "../../tips/UpgradeTip";
+import { UpgradeTip } from "~/shell/UpgradeTip";
+
import { createTimezoneBuddyStore, TBContext } from "../store";
import { AvailabilityEditSheet } from "./AvailabilityEditSheet";
import { CellHighlightContainer } from "./CellHighlightContainer";
diff --git a/packages/features/timezone-buddy/components/CellHighlightContainer.tsx b/apps/web/modules/timezone-buddy/components/CellHighlightContainer.tsx
similarity index 100%
rename from packages/features/timezone-buddy/components/CellHighlightContainer.tsx
rename to apps/web/modules/timezone-buddy/components/CellHighlightContainer.tsx
diff --git a/packages/features/timezone-buddy/components/HoverOverview.tsx b/apps/web/modules/timezone-buddy/components/HoverOverview.tsx
similarity index 100%
rename from packages/features/timezone-buddy/components/HoverOverview.tsx
rename to apps/web/modules/timezone-buddy/components/HoverOverview.tsx
diff --git a/packages/features/timezone-buddy/components/TimeDial.tsx b/apps/web/modules/timezone-buddy/components/TimeDial.tsx
similarity index 100%
rename from packages/features/timezone-buddy/components/TimeDial.tsx
rename to apps/web/modules/timezone-buddy/components/TimeDial.tsx
diff --git a/packages/features/timezone-buddy/constants.ts b/apps/web/modules/timezone-buddy/constants.ts
similarity index 100%
rename from packages/features/timezone-buddy/constants.ts
rename to apps/web/modules/timezone-buddy/constants.ts
diff --git a/packages/features/timezone-buddy/store.ts b/apps/web/modules/timezone-buddy/store.ts
similarity index 100%
rename from packages/features/timezone-buddy/store.ts
rename to apps/web/modules/timezone-buddy/store.ts
diff --git a/apps/web/modules/upgrade/upgrade-view.tsx b/apps/web/modules/upgrade/upgrade-view.tsx
index e6d2745d436..5fde2729f5c 100644
--- a/apps/web/modules/upgrade/upgrade-view.tsx
+++ b/apps/web/modules/upgrade/upgrade-view.tsx
@@ -2,7 +2,6 @@
import { useRouter } from "next/navigation";
-import Shell from "@calcom/features/shell/Shell";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
@@ -10,6 +9,8 @@ import { Button } from "@calcom/ui/components/button";
import { EmptyScreen } from "@calcom/ui/components/empty-screen";
import { showToast } from "@calcom/ui/components/toast";
+import Shell from "~/shell/Shell";
+
export type OrgUpgradeBannerProps = {
data: RouterOutputs["viewer"]["me"]["getUserTopBanners"]["orgUpgradeBanner"];
};
diff --git a/packages/features/users/components/AdminPasswordBanner.tsx b/apps/web/modules/users/components/AdminPasswordBanner.tsx
similarity index 100%
rename from packages/features/users/components/AdminPasswordBanner.tsx
rename to apps/web/modules/users/components/AdminPasswordBanner.tsx
diff --git a/packages/features/users/components/CalendarCredentialBanner.tsx b/apps/web/modules/users/components/CalendarCredentialBanner.tsx
similarity index 100%
rename from packages/features/users/components/CalendarCredentialBanner.tsx
rename to apps/web/modules/users/components/CalendarCredentialBanner.tsx
diff --git a/packages/features/users/components/InvalidAppCredentialsBanner.tsx b/apps/web/modules/users/components/InvalidAppCredentialsBanner.tsx
similarity index 92%
rename from packages/features/users/components/InvalidAppCredentialsBanner.tsx
rename to apps/web/modules/users/components/InvalidAppCredentialsBanner.tsx
index 3a8ec7c880b..9b43854803a 100644
--- a/packages/features/users/components/InvalidAppCredentialsBanner.tsx
+++ b/apps/web/modules/users/components/InvalidAppCredentialsBanner.tsx
@@ -1,11 +1,10 @@
import { useRouter } from "next/navigation";
+import { type InvalidAppCredentialBannerProps } from "@calcom/features/users/types/invalidAppCredentials";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { type RouterOutputs } from "@calcom/trpc/react";
import { TopBanner } from "@calcom/ui/components/top-banner";
-import { type InvalidAppCredentialBannerProps } from "../types/invalidAppCredentials";
-
export type InvalidAppCredentialBannersProps = {
data: RouterOutputs["viewer"]["me"]["getUserTopBanners"]["invalidAppCredentialBanners"];
};
diff --git a/packages/features/users/components/UserTable/BulkActions/DeleteBulkUsers.tsx b/apps/web/modules/users/components/UserTable/BulkActions/DeleteBulkUsers.tsx
similarity index 100%
rename from packages/features/users/components/UserTable/BulkActions/DeleteBulkUsers.tsx
rename to apps/web/modules/users/components/UserTable/BulkActions/DeleteBulkUsers.tsx
diff --git a/packages/features/users/components/UserTable/BulkActions/DynamicLink.tsx b/apps/web/modules/users/components/UserTable/BulkActions/DynamicLink.tsx
similarity index 100%
rename from packages/features/users/components/UserTable/BulkActions/DynamicLink.tsx
rename to apps/web/modules/users/components/UserTable/BulkActions/DynamicLink.tsx
diff --git a/packages/features/users/components/UserTable/BulkActions/EventTypesList.tsx b/apps/web/modules/users/components/UserTable/BulkActions/EventTypesList.tsx
similarity index 100%
rename from packages/features/users/components/UserTable/BulkActions/EventTypesList.tsx
rename to apps/web/modules/users/components/UserTable/BulkActions/EventTypesList.tsx
diff --git a/packages/features/users/components/UserTable/BulkActions/MassAssignAttributes.tsx b/apps/web/modules/users/components/UserTable/BulkActions/MassAssignAttributes.tsx
similarity index 100%
rename from packages/features/users/components/UserTable/BulkActions/MassAssignAttributes.tsx
rename to apps/web/modules/users/components/UserTable/BulkActions/MassAssignAttributes.tsx
diff --git a/packages/features/users/components/UserTable/BulkActions/TeamList.tsx b/apps/web/modules/users/components/UserTable/BulkActions/TeamList.tsx
similarity index 100%
rename from packages/features/users/components/UserTable/BulkActions/TeamList.tsx
rename to apps/web/modules/users/components/UserTable/BulkActions/TeamList.tsx
diff --git a/packages/features/users/components/UserTable/ChangeUserRoleModal.tsx b/apps/web/modules/users/components/UserTable/ChangeUserRoleModal.tsx
similarity index 88%
rename from packages/features/users/components/UserTable/ChangeUserRoleModal.tsx
rename to apps/web/modules/users/components/UserTable/ChangeUserRoleModal.tsx
index d3d223e3ec3..54447709b40 100644
--- a/packages/features/users/components/UserTable/ChangeUserRoleModal.tsx
+++ b/apps/web/modules/users/components/UserTable/ChangeUserRoleModal.tsx
@@ -1,7 +1,7 @@
import { useSession } from "next-auth/react";
import type { Dispatch } from "react";
-import MemberChangeRoleModal from "@calcom/features/ee/teams/components/MemberChangeRoleModal";
+import MemberChangeRoleModal from "@calcom/web/modules/ee/teams/components/MemberChangeRoleModal";
import type { UserTableAction, UserTableState } from "./types";
diff --git a/packages/features/users/components/UserTable/DeleteMemberModal.tsx b/apps/web/modules/users/components/UserTable/DeleteMemberModal.tsx
similarity index 100%
rename from packages/features/users/components/UserTable/DeleteMemberModal.tsx
rename to apps/web/modules/users/components/UserTable/DeleteMemberModal.tsx
diff --git a/packages/features/users/components/UserTable/EditSheet/DisplayInfo.tsx b/apps/web/modules/users/components/UserTable/EditSheet/DisplayInfo.tsx
similarity index 100%
rename from packages/features/users/components/UserTable/EditSheet/DisplayInfo.tsx
rename to apps/web/modules/users/components/UserTable/EditSheet/DisplayInfo.tsx
diff --git a/packages/features/users/components/UserTable/EditSheet/EditUserForm.tsx b/apps/web/modules/users/components/UserTable/EditSheet/EditUserForm.tsx
similarity index 100%
rename from packages/features/users/components/UserTable/EditSheet/EditUserForm.tsx
rename to apps/web/modules/users/components/UserTable/EditSheet/EditUserForm.tsx
diff --git a/packages/features/users/components/UserTable/EditSheet/EditUserSheet.tsx b/apps/web/modules/users/components/UserTable/EditSheet/EditUserSheet.tsx
similarity index 100%
rename from packages/features/users/components/UserTable/EditSheet/EditUserSheet.tsx
rename to apps/web/modules/users/components/UserTable/EditSheet/EditUserSheet.tsx
diff --git a/packages/features/users/components/UserTable/EditSheet/OrganizationBanner.tsx b/apps/web/modules/users/components/UserTable/EditSheet/OrganizationBanner.tsx
similarity index 100%
rename from packages/features/users/components/UserTable/EditSheet/OrganizationBanner.tsx
rename to apps/web/modules/users/components/UserTable/EditSheet/OrganizationBanner.tsx
diff --git a/packages/features/users/components/UserTable/EditSheet/SheetFooterControls.tsx b/apps/web/modules/users/components/UserTable/EditSheet/SheetFooterControls.tsx
similarity index 100%
rename from packages/features/users/components/UserTable/EditSheet/SheetFooterControls.tsx
rename to apps/web/modules/users/components/UserTable/EditSheet/SheetFooterControls.tsx
diff --git a/packages/features/users/components/UserTable/EditSheet/store.ts b/apps/web/modules/users/components/UserTable/EditSheet/store.ts
similarity index 100%
rename from packages/features/users/components/UserTable/EditSheet/store.ts
rename to apps/web/modules/users/components/UserTable/EditSheet/store.ts
diff --git a/packages/features/users/components/UserTable/ImpersonationMemberModal.tsx b/apps/web/modules/users/components/UserTable/ImpersonationMemberModal.tsx
similarity index 100%
rename from packages/features/users/components/UserTable/ImpersonationMemberModal.tsx
rename to apps/web/modules/users/components/UserTable/ImpersonationMemberModal.tsx
diff --git a/packages/features/users/components/UserTable/InviteMemberModal.tsx b/apps/web/modules/users/components/UserTable/InviteMemberModal.tsx
similarity index 96%
rename from packages/features/users/components/UserTable/InviteMemberModal.tsx
rename to apps/web/modules/users/components/UserTable/InviteMemberModal.tsx
index 931e84429b5..6c96dcc1266 100644
--- a/packages/features/users/components/UserTable/InviteMemberModal.tsx
+++ b/apps/web/modules/users/components/UserTable/InviteMemberModal.tsx
@@ -1,13 +1,14 @@
import { useSession } from "next-auth/react";
import type { Dispatch } from "react";
-import MemberInvitationModal from "@calcom/features/ee/teams/components/MemberInvitationModal";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { CreationSource } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
import { showToast } from "@calcom/ui/components/toast";
import usePlatformMe from "@calcom/web/components/settings/platform/hooks/usePlatformMe";
+import MemberInvitationModal from "~/ee/teams/components/MemberInvitationModal";
+
import type { UserTableAction } from "./types";
interface Props {
diff --git a/packages/features/users/components/UserTable/PlatformManagedUsersTable.tsx b/apps/web/modules/users/components/UserTable/PlatformManagedUsersTable.tsx
similarity index 100%
rename from packages/features/users/components/UserTable/PlatformManagedUsersTable.tsx
rename to apps/web/modules/users/components/UserTable/PlatformManagedUsersTable.tsx
diff --git a/packages/features/users/components/UserTable/UserListTable.tsx b/apps/web/modules/users/components/UserTable/UserListTable.tsx
similarity index 100%
rename from packages/features/users/components/UserTable/UserListTable.tsx
rename to apps/web/modules/users/components/UserTable/UserListTable.tsx
diff --git a/packages/features/users/components/UserTable/UserListTableSkeleton.tsx b/apps/web/modules/users/components/UserTable/UserListTableSkeleton.tsx
similarity index 100%
rename from packages/features/users/components/UserTable/UserListTableSkeleton.tsx
rename to apps/web/modules/users/components/UserTable/UserListTableSkeleton.tsx
diff --git a/packages/features/users/components/UserTable/UserTableActions.tsx b/apps/web/modules/users/components/UserTable/UserTableActions.tsx
similarity index 100%
rename from packages/features/users/components/UserTable/UserTableActions.tsx
rename to apps/web/modules/users/components/UserTable/UserTableActions.tsx
diff --git a/packages/features/users/components/UserTable/types.ts b/apps/web/modules/users/components/UserTable/types.ts
similarity index 100%
rename from packages/features/users/components/UserTable/types.ts
rename to apps/web/modules/users/components/UserTable/types.ts
diff --git a/packages/features/users/components/VerifyEmailBanner.tsx b/apps/web/modules/users/components/VerifyEmailBanner.tsx
similarity index 93%
rename from packages/features/users/components/VerifyEmailBanner.tsx
rename to apps/web/modules/users/components/VerifyEmailBanner.tsx
index f75d73be49e..e74180c098a 100644
--- a/packages/features/users/components/VerifyEmailBanner.tsx
+++ b/apps/web/modules/users/components/VerifyEmailBanner.tsx
@@ -1,10 +1,9 @@
+import { useFlagMap } from "@calcom/features/flags/context/provider";
import { APP_NAME } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { TopBanner } from "@calcom/ui/components/top-banner";
import { showToast } from "@calcom/ui/components/toast";
-
-import { useFlagMap } from "../../flags/context/provider";
+import { TopBanner } from "@calcom/ui/components/top-banner";
export type VerifyEmailBannerProps = {
data: boolean;
diff --git a/packages/features/webhooks/components/CreateNewWebhookButton.tsx b/apps/web/modules/webhooks/components/CreateNewWebhookButton.tsx
similarity index 88%
rename from packages/features/webhooks/components/CreateNewWebhookButton.tsx
rename to apps/web/modules/webhooks/components/CreateNewWebhookButton.tsx
index f01f856c429..7ab2a5de6f5 100644
--- a/packages/features/webhooks/components/CreateNewWebhookButton.tsx
+++ b/apps/web/modules/webhooks/components/CreateNewWebhookButton.tsx
@@ -2,10 +2,11 @@
import { useRouter } from "next/navigation";
-import { CreateButtonWithTeamsList } from "@calcom/features/ee/teams/components/createButton/CreateButtonWithTeamsList";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { MembershipRole } from "@calcom/prisma/enums";
+import { CreateButtonWithTeamsList } from "~/ee/teams/components/createButton/CreateButtonWithTeamsList";
+
export const CreateNewWebhookButton = () => {
const router = useRouter();
const { t } = useLocale();
diff --git a/packages/features/webhooks/components/EventTypeWebhookListItem.tsx b/apps/web/modules/webhooks/components/EventTypeWebhookListItem.tsx
similarity index 100%
rename from packages/features/webhooks/components/EventTypeWebhookListItem.tsx
rename to apps/web/modules/webhooks/components/EventTypeWebhookListItem.tsx
diff --git a/packages/features/webhooks/components/WebhookForm.tsx b/apps/web/modules/webhooks/components/WebhookForm.tsx
similarity index 56%
rename from packages/features/webhooks/components/WebhookForm.tsx
rename to apps/web/modules/webhooks/components/WebhookForm.tsx
index af490d90821..879ccd56742 100644
--- a/packages/features/webhooks/components/WebhookForm.tsx
+++ b/apps/web/modules/webhooks/components/WebhookForm.tsx
@@ -3,12 +3,12 @@
import { useEffect, useState } from "react";
import { Controller, useForm } from "react-hook-form";
-import { TimeTimeUnitInput } from "@calcom/features/ee/workflows/components/TimeTimeUnitInput";
+import SectionBottomActions from "@calcom/features/settings/SectionBottomActions";
+import customTemplate, { hasTemplateIntegration } from "@calcom/features/webhooks/lib/integrationTemplate";
+import { WebhookVersion } from "@calcom/features/webhooks/lib/interface/IWebhookRepository";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { TimeUnit, WebhookTriggerEvents } from "@calcom/prisma/enums";
-
-import { WebhookVersion } from "../lib/interface/IWebhookRepository";
import type { RouterOutputs } from "@calcom/trpc/react";
import { Button } from "@calcom/ui/components/button";
import { Select } from "@calcom/ui/components/form";
@@ -19,8 +19,8 @@ import { Label } from "@calcom/ui/components/form";
import { TextField } from "@calcom/ui/components/form";
import { Switch } from "@calcom/ui/components/form";
-import SectionBottomActions from "../../settings/SectionBottomActions";
-import customTemplate, { hasTemplateIntegration } from "../lib/integrationTemplate";
+import { TimeTimeUnitInput } from "~/ee/workflows/components/TimeTimeUnitInput";
+
import WebhookTestDisclosure from "./WebhookTestDisclosure";
export type TWebhook = RouterOutputs["viewer"]["webhook"]["list"][number];
@@ -365,264 +365,264 @@ const WebhookForm = (props: {
const formContent = (
<Form
- form={formMethods}
- handleSubmit={(values) => props.onSubmit({ ...values, changeSecret, newSecret })}>
- <div className="border-subtle border p-6">
- <Controller
- name="subscriberUrl"
- control={formMethods.control}
- render={({ field: { value } }) => (
- <>
- <TextField
- name="subscriberUrl"
- label={t("subscriber_url")}
- labelClassName="font-medium text-emphasis font-sm"
- value={value}
- required
- type="url"
- onChange={(e) => {
- formMethods.setValue("subscriberUrl", e?.target.value, { shouldDirty: true });
- if (hasTemplateIntegration({ url: e.target.value })) {
- setUseCustomTemplate(true);
- formMethods.setValue("payloadTemplate", customTemplate({ url: e.target.value }), {
+ form={formMethods}
+ handleSubmit={(values) => props.onSubmit({ ...values, changeSecret, newSecret })}>
+ <div className="border-subtle border p-6">
+ <Controller
+ name="subscriberUrl"
+ control={formMethods.control}
+ render={({ field: { value } }) => (
+ <>
+ <TextField
+ name="subscriberUrl"
+ label={t("subscriber_url")}
+ labelClassName="font-medium text-emphasis font-sm"
+ value={value}
+ required
+ type="url"
+ onChange={(e) => {
+ formMethods.setValue("subscriberUrl", e?.target.value, { shouldDirty: true });
+ if (hasTemplateIntegration({ url: e.target.value })) {
+ setUseCustomTemplate(true);
+ formMethods.setValue("payloadTemplate", customTemplate({ url: e.target.value }), {
+ shouldDirty: true,
+ });
+ }
+ }}
+ />
+ </>
+ )}
+ />
+ <Controller
+ name="active"
+ control={formMethods.control}
+ render={({ field: { value } }) => (
+ <div className="font-sm text-emphasis mt-6 font-medium">
+ <Switch
+ label={t("enable_webhook")}
+ checked={value}
+ // defaultChecked={props?.webhook?.active ? props?.webhook?.active : true}
+ onCheckedChange={(value) => {
+ formMethods.setValue("active", value, { shouldDirty: true });
+ }}
+ />
+ </div>
+ )}
+ />
+ <Controller
+ name="eventTriggers"
+ control={formMethods.control}
+ render={({ field: { onChange, value } }) => {
+ const selectValue = translatedTriggerOptions.filter((option) => value.includes(option.value));
+ return (
+ <div className="mt-6">
+ <Label className="font-sm text-emphasis font-medium">
+ <>{t("event_triggers")}</>
+ </Label>
+ <Select
+ grow
+ options={translatedTriggerOptions}
+ isMulti
+ styles={{
+ indicatorsContainer: (base) =>
+ Object.assign({}, base, {
+ alignItems: "flex-start",
+ }),
+ }}
+ value={selectValue}
+ onChange={(event) => {
+ onChange(event.map((selection) => selection.value));
+ const noShowWebhookTriggerExists = !!event.find(
+ (trigger) =>
+ trigger.value === WebhookTriggerEvents.AFTER_HOSTS_CAL_VIDEO_NO_SHOW ||
+ trigger.value === WebhookTriggerEvents.AFTER_GUESTS_CAL_VIDEO_NO_SHOW
+ );
+
+ if (noShowWebhookTriggerExists) {
+ formMethods.setValue("time", props.webhook?.time ?? 5, { shouldDirty: true });
+ formMethods.setValue("timeUnit", props.webhook?.timeUnit ?? TimeUnit.MINUTE, {
shouldDirty: true,
});
+ } else {
+ formMethods.setValue("time", undefined, { shouldDirty: true });
+ formMethods.setValue("timeUnit", undefined, { shouldDirty: true });
}
}}
/>
- </>
- )}
- />
- <Controller
- name="active"
- control={formMethods.control}
- render={({ field: { value } }) => (
- <div className="font-sm text-emphasis mt-6 font-medium">
- <Switch
- label={t("enable_webhook")}
- checked={value}
- // defaultChecked={props?.webhook?.active ? props?.webhook?.active : true}
- onCheckedChange={(value) => {
- formMethods.setValue("active", value, { shouldDirty: true });
- }}
- />
</div>
- )}
- />
- <Controller
- name="eventTriggers"
- control={formMethods.control}
- render={({ field: { onChange, value } }) => {
- const selectValue = translatedTriggerOptions.filter((option) => value.includes(option.value));
- return (
- <div className="mt-6">
- <Label className="font-sm text-emphasis font-medium">
- <>{t("event_triggers")}</>
- </Label>
- <Select
- grow
- options={translatedTriggerOptions}
- isMulti
- styles={{
- indicatorsContainer: (base) =>
- Object.assign({}, base, {
- alignItems: "flex-start",
- }),
- }}
- value={selectValue}
- onChange={(event) => {
- onChange(event.map((selection) => selection.value));
- const noShowWebhookTriggerExists = !!event.find(
- (trigger) =>
- trigger.value === WebhookTriggerEvents.AFTER_HOSTS_CAL_VIDEO_NO_SHOW ||
- trigger.value === WebhookTriggerEvents.AFTER_GUESTS_CAL_VIDEO_NO_SHOW
- );
-
- if (noShowWebhookTriggerExists) {
- formMethods.setValue("time", props.webhook?.time ?? 5, { shouldDirty: true });
- formMethods.setValue("timeUnit", props.webhook?.timeUnit ?? TimeUnit.MINUTE, {
- shouldDirty: true,
- });
- } else {
- formMethods.setValue("time", undefined, { shouldDirty: true });
- formMethods.setValue("timeUnit", undefined, { shouldDirty: true });
- }
- }}
- />
- </div>
- );
- }}
- />
-
- {showTimeSection && (
- <div className="mt-5">
- <Label>{t("how_long_after_user_no_show_minutes")}</Label>
- <TimeTimeUnitInput disabled={false} defaultTime={5} />
- </div>
- )}
-
- <Controller
- name="secret"
- control={formMethods.control}
- render={({ field: { value } }) => (
- <div className="mt-6">
- {!!hasSecretKey && !changeSecret && (
- <>
- <Label className="font-sm text-emphasis font-medium">Secret</Label>
- <div className="bg-default stack-y-0 rounded-md border-0 border-neutral-200 sm:mx-0 md:border">
- <div className="text-emphasis rounded-sm border-b p-2 text-sm">
- {t("forgotten_secret_description")}
- </div>
- <div className="p-2">
- <Button
- color="secondary"
- type="button"
- onClick={() => {
- setChangeSecret(true);
- }}>
- {t("change_secret")}
- </Button>
- </div>
+ );
+ }}
+ />
+
+ {showTimeSection && (
+ <div className="mt-5">
+ <Label>{t("how_long_after_user_no_show_minutes")}</Label>
+ <TimeTimeUnitInput disabled={false} defaultTime={5} />
+ </div>
+ )}
+
+ <Controller
+ name="secret"
+ control={formMethods.control}
+ render={({ field: { value } }) => (
+ <div className="mt-6">
+ {!!hasSecretKey && !changeSecret && (
+ <>
+ <Label className="font-sm text-emphasis font-medium">Secret</Label>
+ <div className="bg-default stack-y-0 rounded-md border-0 border-neutral-200 sm:mx-0 md:border">
+ <div className="text-emphasis rounded-sm border-b p-2 text-sm">
+ {t("forgotten_secret_description")}
+ </div>
+ <div className="p-2">
+ <Button
+ color="secondary"
+ type="button"
+ onClick={() => {
+ setChangeSecret(true);
+ }}>
+ {t("change_secret")}
+ </Button>
</div>
- </>
- )}
- {!!hasSecretKey && changeSecret && (
- <>
- <TextField
- autoComplete="off"
- label={t("secret")}
- labelClassName="font-medium text-emphasis font-sm"
- {...formMethods.register("secret")}
- value={newSecret}
- onChange={(event) => setNewSecret(event.currentTarget.value)}
- type="text"
- placeholder={t("leave_blank_to_remove_secret")}
- />
- <Button
- color="secondary"
- type="button"
- className="py-1 text-xs"
- onClick={() => {
- setChangeSecret(false);
- }}>
- {t("cancel")}
- </Button>
- </>
- )}
- {!hasSecretKey && (
+ </div>
+ </>
+ )}
+ {!!hasSecretKey && changeSecret && (
+ <>
<TextField
- name="secret"
+ autoComplete="off"
label={t("secret")}
labelClassName="font-medium text-emphasis font-sm"
- value={value ?? ""}
- onChange={(e) => {
- formMethods.setValue("secret", e?.target.value, { shouldDirty: true });
- }}
+ {...formMethods.register("secret")}
+ value={newSecret}
+ onChange={(event) => setNewSecret(event.currentTarget.value)}
+ type="text"
+ placeholder={t("leave_blank_to_remove_secret")}
/>
- )}
+ <Button
+ color="secondary"
+ type="button"
+ className="py-1 text-xs"
+ onClick={() => {
+ setChangeSecret(false);
+ }}>
+ {t("cancel")}
+ </Button>
+ </>
+ )}
+ {!hasSecretKey && (
+ <TextField
+ name="secret"
+ label={t("secret")}
+ labelClassName="font-medium text-emphasis font-sm"
+ value={value ?? ""}
+ onChange={(e) => {
+ formMethods.setValue("secret", e?.target.value, { shouldDirty: true });
+ }}
+ />
+ )}
+ </div>
+ )}
+ />
+
+ <Controller
+ name="payloadTemplate"
+ control={formMethods.control}
+ render={({ field: { value } }) => (
+ <>
+ <Label className="font-sm text-emphasis mt-6">
+ <>{t("payload_template")}</>
+ </Label>
+ <div className="mb-2">
+ <ToggleGroup
+ onValueChange={(val) => {
+ if (val === "default") {
+ setUseCustomTemplate(false);
+ formMethods.setValue("payloadTemplate", undefined, { shouldDirty: true });
+ } else {
+ setUseCustomTemplate(true);
+ }
+ }}
+ value={useCustomTemplate ? "custom" : "default"}
+ options={[
+ { value: "default", label: t("default") },
+ { value: "custom", label: t("custom") },
+ ]}
+ isFullWidth={true}
+ />
</div>
- )}
- />
-
- <Controller
- name="payloadTemplate"
- control={formMethods.control}
- render={({ field: { value } }) => (
- <>
- <Label className="font-sm text-emphasis mt-6">
- <>{t("payload_template")}</>
- </Label>
- <div className="mb-2">
- <ToggleGroup
- onValueChange={(val) => {
- if (val === "default") {
- setUseCustomTemplate(false);
- formMethods.setValue("payloadTemplate", undefined, { shouldDirty: true });
- } else {
- setUseCustomTemplate(true);
- }
- }}
- value={useCustomTemplate ? "custom" : "default"}
- options={[
- { value: "default", label: t("default") },
- { value: "custom", label: t("custom") },
- ]}
- isFullWidth={true}
+ {useCustomTemplate && (
+ <div className="stack-y-3">
+ <TextArea
+ name="customPayloadTemplate"
+ rows={8}
+ value={value || ""}
+ placeholder={`{\n\n}`}
+ onChange={(e) =>
+ formMethods.setValue("payloadTemplate", e?.target.value, { shouldDirty: true })
+ }
/>
- </div>
- {useCustomTemplate && (
- <div className="stack-y-3">
- <TextArea
- name="customPayloadTemplate"
- rows={8}
- value={value || ""}
- placeholder={`{\n\n}`}
- onChange={(e) =>
- formMethods.setValue("payloadTemplate", e?.target.value, { shouldDirty: true })
- }
- />
-
- <Button type="button" color="secondary" onClick={() => setShowVariables(!showVariables)}>
- {showVariables ? t("webhook_hide_variables") : t("webhook_show_variable")}
- </Button>
-
- {showVariables && (
- <div className="border-muted max-h-80 overflow-y-auto rounded-md border p-3">
- {webhookVariables.map(({ category, variables }) => (
- <div key={category} className="mb-4">
- <h4 className="mb-2 text-sm font-medium">{category}</h4>
- <div className="stack-y-2">
- {variables.map(({ name, variable, description }) => (
- <div
- key={name}
- className="hover:bg-cal-muted cursor-pointer rounded p-2 text-sm transition-colors"
- onClick={() => {
- const currentValue = formMethods.getValues("payloadTemplate") || "{}";
- const updatedValue = insertVariableIntoTemplate(
- currentValue,
- name,
- variable
- );
- formMethods.setValue("payloadTemplate", updatedValue, {
- shouldDirty: true,
- });
- }}>
- <div className="text-emphasis font-mono">{variable}</div>
- <div className="text-muted mt-1 text-xs">{description}</div>
- </div>
- ))}
- </div>
+
+ <Button type="button" color="secondary" onClick={() => setShowVariables(!showVariables)}>
+ {showVariables ? t("webhook_hide_variables") : t("webhook_show_variable")}
+ </Button>
+
+ {showVariables && (
+ <div className="border-muted max-h-80 overflow-y-auto rounded-md border p-3">
+ {webhookVariables.map(({ category, variables }) => (
+ <div key={category} className="mb-4">
+ <h4 className="mb-2 text-sm font-medium">{category}</h4>
+ <div className="stack-y-2">
+ {variables.map(({ name, variable, description }) => (
+ <div
+ key={name}
+ className="hover:bg-cal-muted cursor-pointer rounded p-2 text-sm transition-colors"
+ onClick={() => {
+ const currentValue = formMethods.getValues("payloadTemplate") || "{}";
+ const updatedValue = insertVariableIntoTemplate(
+ currentValue,
+ name,
+ variable
+ );
+ formMethods.setValue("payloadTemplate", updatedValue, {
+ shouldDirty: true,
+ });
+ }}>
+ <div className="text-emphasis font-mono">{variable}</div>
+ <div className="text-muted mt-1 text-xs">{description}</div>
+ </div>
+ ))}
</div>
- ))}
- </div>
- )}
- </div>
- )}
- </>
- )}
- />
- </div>
- <SectionBottomActions align="end">
- <Button
- type="button"
- color="minimal"
- onClick={props.onCancel}
- {...(!props.onCancel ? { href: `${WEBAPP_URL}/settings/developer/webhooks` } : {})}>
- {t("cancel")}
- </Button>
- <Button
- type="submit"
- data-testid="create_webhook"
- disabled={!canSubmit}
- loading={formMethods.formState.isSubmitting}>
- {props?.webhook?.id ? t("save") : t("create_webhook")}
- </Button>
- </SectionBottomActions>
-
- <div className="mb-4 mt-6 rounded-md">
- <WebhookTestDisclosure />
- </div>
- </Form>
+ </div>
+ ))}
+ </div>
+ )}
+ </div>
+ )}
+ </>
+ )}
+ />
+ </div>
+ <SectionBottomActions align="end">
+ <Button
+ type="button"
+ color="minimal"
+ onClick={props.onCancel}
+ {...(!props.onCancel ? { href: `${WEBAPP_URL}/settings/developer/webhooks` } : {})}>
+ {t("cancel")}
+ </Button>
+ <Button
+ type="submit"
+ data-testid="create_webhook"
+ disabled={!canSubmit}
+ loading={formMethods.formState.isSubmitting}>
+ {props?.webhook?.id ? t("save") : t("create_webhook")}
+ </Button>
+ </SectionBottomActions>
+
+ <div className="mb-4 mt-6 rounded-md">
+ <WebhookTestDisclosure />
+ </div>
+ </Form>
);
// If headerWrapper is provided, wrap the form content with it
diff --git a/packages/features/webhooks/components/WebhookListItem.tsx b/apps/web/modules/webhooks/components/WebhookListItem.tsx
similarity index 98%
rename from packages/features/webhooks/components/WebhookListItem.tsx
rename to apps/web/modules/webhooks/components/WebhookListItem.tsx
index 554e514445b..2079caff79e 100644
--- a/packages/features/webhooks/components/WebhookListItem.tsx
+++ b/apps/web/modules/webhooks/components/WebhookListItem.tsx
@@ -2,10 +2,9 @@
import Link from "next/link";
+import { getWebhookVersionLabel, getWebhookVersionDocsUrl } from "@calcom/features/webhooks/lib/constants";
+import type { Webhook } from "@calcom/features/webhooks/lib/dto/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-
-import type { Webhook } from "../lib/dto/types";
-import { getWebhookVersionLabel, getWebhookVersionDocsUrl } from "../lib/constants";
import { trpc } from "@calcom/trpc/react";
import classNames from "@calcom/ui/classNames";
import { Badge } from "@calcom/ui/components/badge";
@@ -22,7 +21,6 @@ import { Switch } from "@calcom/ui/components/form";
import { Icon } from "@calcom/ui/components/icon";
import { showToast } from "@calcom/ui/components/toast";
import { Tooltip } from "@calcom/ui/components/tooltip";
-
import { revalidateEventTypeEditPage } from "@calcom/web/app/(use-page-wrapper)/event-types/[type]/actions";
import { revalidateWebhooksList } from "@calcom/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/(with-loader)/actions";
diff --git a/packages/features/webhooks/components/WebhookListItemSkeleton.tsx b/apps/web/modules/webhooks/components/WebhookListItemSkeleton.tsx
similarity index 100%
rename from packages/features/webhooks/components/WebhookListItemSkeleton.tsx
rename to apps/web/modules/webhooks/components/WebhookListItemSkeleton.tsx
diff --git a/packages/features/webhooks/components/WebhookListSkeleton.tsx b/apps/web/modules/webhooks/components/WebhookListSkeleton.tsx
similarity index 100%
rename from packages/features/webhooks/components/WebhookListSkeleton.tsx
rename to apps/web/modules/webhooks/components/WebhookListSkeleton.tsx
diff --git a/packages/features/webhooks/components/WebhookTestDisclosure.tsx b/apps/web/modules/webhooks/components/WebhookTestDisclosure.tsx
similarity index 100%
rename from packages/features/webhooks/components/WebhookTestDisclosure.tsx
rename to apps/web/modules/webhooks/components/WebhookTestDisclosure.tsx
diff --git a/packages/features/webhooks/components/index.ts b/apps/web/modules/webhooks/components/index.ts
similarity index 100%
rename from packages/features/webhooks/components/index.ts
rename to apps/web/modules/webhooks/components/index.ts
diff --git a/packages/features/webhooks/pages/webhook-edit-view.tsx b/apps/web/modules/webhooks/views/webhook-edit-view.tsx
similarity index 93%
rename from packages/features/webhooks/pages/webhook-edit-view.tsx
rename to apps/web/modules/webhooks/views/webhook-edit-view.tsx
index e73b118a0da..490d16a5785 100644
--- a/packages/features/webhooks/pages/webhook-edit-view.tsx
+++ b/apps/web/modules/webhooks/views/webhook-edit-view.tsx
@@ -4,12 +4,16 @@ import Link from "next/link";
import { useRouter } from "next/navigation";
import SettingsHeaderWithBackButton from "@calcom/features/settings/appDir/SettingsHeaderWithBackButton";
+import {
+ WEBHOOK_VERSION_OPTIONS,
+ getWebhookVersionLabel,
+ getWebhookVersionDocsUrl,
+} from "@calcom/features/webhooks/lib/constants";
+import type { WebhookVersion } from "@calcom/features/webhooks/lib/interface/IWebhookRepository";
+import { subscriberUrlReserved } from "@calcom/features/webhooks/lib/subscriberUrlReserved";
import { APP_NAME } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { WebhookTriggerEvents } from "@calcom/prisma/enums";
-
-import type { WebhookVersion } from "../lib/interface/IWebhookRepository";
-import { WEBHOOK_VERSION_OPTIONS, getWebhookVersionLabel, getWebhookVersionDocsUrl } from "../lib/constants";
import { trpc } from "@calcom/trpc/react";
import { Select } from "@calcom/ui/components/form";
import { Icon } from "@calcom/ui/components/icon";
@@ -20,7 +24,6 @@ import { revalidateWebhooksList } from "@calcom/web/app/(use-page-wrapper)/setti
import type { WebhookFormSubmitData } from "../components/WebhookForm";
import WebhookForm from "../components/WebhookForm";
-import { subscriberUrlReserved } from "../lib/subscriberUrlReserved";
type WebhookProps = {
id: string;
diff --git a/packages/features/webhooks/pages/webhook-new-skeleton.tsx b/apps/web/modules/webhooks/views/webhook-new-skeleton.tsx
similarity index 100%
rename from packages/features/webhooks/pages/webhook-new-skeleton.tsx
rename to apps/web/modules/webhooks/views/webhook-new-skeleton.tsx
diff --git a/packages/features/webhooks/pages/webhook-new-view.tsx b/apps/web/modules/webhooks/views/webhook-new-view.tsx
similarity index 95%
rename from packages/features/webhooks/pages/webhook-new-view.tsx
rename to apps/web/modules/webhooks/views/webhook-new-view.tsx
index 9141d311fad..bccf105eb19 100644
--- a/packages/features/webhooks/pages/webhook-new-view.tsx
+++ b/apps/web/modules/webhooks/views/webhook-new-view.tsx
@@ -5,10 +5,15 @@ import Link from "next/link";
import { useRouter } from "next/navigation";
import SettingsHeaderWithBackButton from "@calcom/features/settings/appDir/SettingsHeaderWithBackButton";
+import {
+ WEBHOOK_VERSION_OPTIONS,
+ getWebhookVersionLabel,
+ getWebhookVersionDocsUrl,
+} from "@calcom/features/webhooks/lib/constants";
+import { subscriberUrlReserved } from "@calcom/features/webhooks/lib/subscriberUrlReserved";
import { APP_NAME } from "@calcom/lib/constants";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { WEBHOOK_VERSION_OPTIONS, getWebhookVersionLabel, getWebhookVersionDocsUrl } from "../lib/constants";
import { trpc } from "@calcom/trpc/react";
import type { RouterOutputs } from "@calcom/trpc/react";
import { Select } from "@calcom/ui/components/form";
@@ -19,7 +24,6 @@ import { revalidateWebhooksList } from "@calcom/web/app/(use-page-wrapper)/setti
import type { WebhookFormSubmitData } from "../components/WebhookForm";
import WebhookForm from "../components/WebhookForm";
-import { subscriberUrlReserved } from "../lib/subscriberUrlReserved";
type Props = {
webhooks: RouterOutputs["viewer"]["webhook"]["list"];
diff --git a/packages/features/webhooks/pages/webhooks-skeleton.tsx b/apps/web/modules/webhooks/views/webhooks-skeleton.tsx
similarity index 100%
rename from packages/features/webhooks/pages/webhooks-skeleton.tsx
rename to apps/web/modules/webhooks/views/webhooks-skeleton.tsx
diff --git a/packages/features/webhooks/pages/webhooks-view.tsx b/apps/web/modules/webhooks/views/webhooks-view.tsx
similarity index 100%
rename from packages/features/webhooks/pages/webhooks-view.tsx
rename to apps/web/modules/webhooks/views/webhooks-view.tsx
diff --git a/apps/web/test/lib/generateCsv.test.ts b/apps/web/test/lib/generateCsv.test.ts
index 5b259d24ad8..0d712299c82 100644
--- a/apps/web/test/lib/generateCsv.test.ts
+++ b/apps/web/test/lib/generateCsv.test.ts
@@ -1,12 +1,12 @@
import type { Table } from "@tanstack/react-table";
import { describe, it, expect, vi } from "vitest";
-import type { UserTableUser } from "@calcom/features/users/components/UserTable/types";
import {
generateCsvRawForMembersTable,
generateHeaderFromReactTable,
} from "@calcom/features/users/lib/UserListTableUtils";
import { MembershipRole } from "@calcom/prisma/enums";
+import type { UserTableUser } from "@calcom/web/modules/users/components/UserTable/types";
function createMockTable(data: UserTableUser[]): Table<UserTableUser> {
return {
diff --git a/companion/app/(tabs)/(event-types)/index.tsx b/companion/app/(tabs)/(event-types)/index.tsx
index 0533e6c46de..d4a8bf653c2 100644
--- a/companion/app/(tabs)/(event-types)/index.tsx
+++ b/companion/app/(tabs)/(event-types)/index.tsx
@@ -1,4 +1,26 @@
+import { EmptyScreen } from "../../../components/EmptyScreen";
+import { FullScreenModal } from "../../../components/FullScreenModal";
+import { Header } from "../../../components/Header";
+import { LoadingSpinner } from "../../../components/LoadingSpinner";
+import { EventTypeListItem } from "../../../components/event-type-list-item/EventTypeListItem";
+import {
+ useEventTypes,
+ useCreateEventType,
+ useDeleteEventType,
+ useDuplicateEventType,
+ useUsername,
+} from "../../../hooks";
+import { CalComAPIService, EventType } from "../../../services/calcom";
+import { showErrorAlert } from "../../../utils/alerts";
+import { openInAppBrowser } from "../../../utils/browser";
+import { getEventDuration } from "../../../utils/getEventDuration";
+import { offlineAwareRefresh } from "../../../utils/network";
+import { normalizeMarkdown } from "../../../utils/normalizeMarkdown";
+import { shadows } from "../../../utils/shadows";
+import { slugify } from "../../../utils/slugify";
import { Ionicons } from "@expo/vector-icons";
+import * as Clipboard from "expo-clipboard";
+import { isLiquidGlassAvailable } from "expo-glass-effect";
import { Stack, useRouter } from "expo-router";
import React, { useState, useMemo, Activity } from "react";
import {
@@ -13,29 +35,6 @@ import {
Alert,
Platform,
} from "react-native";
-import * as Clipboard from "expo-clipboard";
-
-import { CalComAPIService, EventType } from "../../../services/calcom";
-import { Header } from "../../../components/Header";
-import { FullScreenModal } from "../../../components/FullScreenModal";
-import { LoadingSpinner } from "../../../components/LoadingSpinner";
-import { EmptyScreen } from "../../../components/EmptyScreen";
-import { slugify } from "../../../utils/slugify";
-import { showErrorAlert } from "../../../utils/alerts";
-import { shadows } from "../../../utils/shadows";
-import { EventTypeListItem } from "../../../components/event-type-list-item/EventTypeListItem";
-import { offlineAwareRefresh } from "../../../utils/network";
-import { openInAppBrowser } from "../../../utils/browser";
-import {
- useEventTypes,
- useCreateEventType,
- useDeleteEventType,
- useDuplicateEventType,
- useUsername,
-} from "../../../hooks";
-import { getEventDuration } from "../../../utils/getEventDuration";
-import { normalizeMarkdown } from "../../../utils/normalizeMarkdown";
-import { isLiquidGlassAvailable } from "expo-glass-effect";
export default function EventTypes() {
const router = useRouter();
diff --git a/companion/app/(tabs)/more.tsx b/companion/app/(tabs)/more.tsx
index 71032856e43..1dd53358081 100644
--- a/companion/app/(tabs)/more.tsx
+++ b/companion/app/(tabs)/more.tsx
@@ -1,12 +1,12 @@
-import React, { useState } from "react";
-import { View, Text, TouchableOpacity, ScrollView, Alert, Platform } from "react-native";
-import { Ionicons } from "@expo/vector-icons";
-import { useRouter } from "expo-router";
import { Header } from "../../components/Header";
import { LogoutConfirmModal } from "../../components/LogoutConfirmModal";
import { useAuth } from "../../contexts/AuthContext";
import { showErrorAlert } from "../../utils/alerts";
import { openInAppBrowser } from "../../utils/browser";
+import { Ionicons } from "@expo/vector-icons";
+import { useRouter } from "expo-router";
+import React, { useState } from "react";
+import { View, Text, TouchableOpacity, ScrollView, Alert, Platform } from "react-native";
interface MoreMenuItem {
name: string;
diff --git a/companion/app/event-type-detail.tsx b/companion/app/event-type-detail.tsx
index 9fe8dd4dcb7..b626401db0a 100644
--- a/companion/app/event-type-detail.tsx
+++ b/companion/app/event-type-detail.tsx
@@ -1,4 +1,36 @@
+import { AdvancedTab } from "../components/event-type-detail/tabs/AdvancedTab";
+import { AvailabilityTab } from "../components/event-type-detail/tabs/AvailabilityTab";
+import { BasicsTab } from "../components/event-type-detail/tabs/BasicsTab";
+import { LimitsTab } from "../components/event-type-detail/tabs/LimitsTab";
+import { RecurringTab } from "../components/event-type-detail/tabs/RecurringTab";
+import {
+ formatDuration,
+ truncateTitle,
+ formatAppIdToDisplayName,
+} from "../components/event-type-detail/utils";
+import {
+ buildPartialUpdatePayload,
+ hasChanges,
+} from "../components/event-type-detail/utils/buildPartialUpdatePayload";
+import { CalComAPIService, Schedule, ConferencingOption, EventType } from "../services/calcom";
+import { LocationItem, LocationOptionGroup } from "../types/locations";
+import { showErrorAlert } from "../utils/alerts";
+import { openInAppBrowser } from "../utils/browser";
+import {
+ parseBufferTime,
+ parseMinimumNotice,
+ parseFrequencyUnit,
+ parseSlotInterval,
+} from "../utils/eventTypeParsers";
+import {
+ mapApiLocationToItem,
+ mapItemToApiLocation,
+ buildLocationOptions,
+ validateLocationItem,
+} from "../utils/locationHelpers";
+import { slugify } from "../utils/slugify";
import { Ionicons } from "@expo/vector-icons";
+import * as Clipboard from "expo-clipboard";
import { GlassView, isLiquidGlassAvailable } from "expo-glass-effect";
import { useRouter, useLocalSearchParams, Stack } from "expo-router";
import React, { useState, useEffect } from "react";
@@ -15,41 +47,8 @@ import {
Image,
Platform,
} from "react-native";
-import * as Clipboard from "expo-clipboard";
import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { CalComAPIService, Schedule, ConferencingOption, EventType } from "../services/calcom";
-import { showErrorAlert } from "../utils/alerts";
-import { openInAppBrowser } from "../utils/browser";
-import { LocationItem, LocationOptionGroup } from "../types/locations";
-import {
- mapApiLocationToItem,
- mapItemToApiLocation,
- buildLocationOptions,
- validateLocationItem,
-} from "../utils/locationHelpers";
-import {
- parseBufferTime,
- parseMinimumNotice,
- parseFrequencyUnit,
- parseSlotInterval,
-} from "../utils/eventTypeParsers";
-import { slugify } from "../utils/slugify";
-import { BasicsTab } from "../components/event-type-detail/tabs/BasicsTab";
-import { AvailabilityTab } from "../components/event-type-detail/tabs/AvailabilityTab";
-import { LimitsTab } from "../components/event-type-detail/tabs/LimitsTab";
-import { AdvancedTab } from "../components/event-type-detail/tabs/AdvancedTab";
-import { RecurringTab } from "../components/event-type-detail/tabs/RecurringTab";
-import {
- formatDuration,
- truncateTitle,
- formatAppIdToDisplayName,
-} from "../components/event-type-detail/utils";
-import {
- buildPartialUpdatePayload,
- hasChanges,
-} from "../components/event-type-detail/utils/buildPartialUpdatePayload";
-
const tabs = [
{ id: "basics", label: "Basics", icon: "link" },
{ id: "availability", label: "Availability", icon: "calendar" },
@@ -1048,7 +1047,9 @@ export default function EventTypeDetail() {
</Text>
<TouchableOpacity
- className={`min-w-[60px] items-center rounded-[10px] bg-black px-2 py-2 md:px-4 ${saving ? "opacity-60" : ""}`}
+ className={`min-w-[60px] items-center rounded-[10px] bg-black px-2 py-2 md:px-4 ${
+ saving ? "opacity-60" : ""
+ }`}
onPress={handleSave}
disabled={saving}
>
@@ -1093,7 +1094,9 @@ export default function EventTypeDetail() {
color={activeTab === tab.id ? "#007AFF" : "#666"}
/>
<Text
- className={`text-base font-medium ${activeTab === tab.id ? "font-semibold text-[#007AFF]" : "text-[#666]"}`}
+ className={`text-base font-medium ${
+ activeTab === tab.id ? "font-semibold text-[#007AFF]" : "text-[#666]"
+ }`}
>
{tab.label}
</Text>
@@ -1137,7 +1140,9 @@ export default function EventTypeDetail() {
color={activeTab === tab.id ? "#007AFF" : "#666"}
/>
<Text
- className={`text-base font-medium ${activeTab === tab.id ? "font-semibold text-[#007AFF]" : "text-[#666]"}`}
+ className={`text-base font-medium ${
+ activeTab === tab.id ? "font-semibold text-[#007AFF]" : "text-[#666]"
+ }`}
>
{tab.label}
</Text>
@@ -1209,7 +1214,9 @@ export default function EventTypeDetail() {
onPress={() => toggleDurationSelection(duration)}
>
<Text
- className={`text-base text-[#333] ${selectedDurations.includes(duration) ? "font-semibold" : ""}`}
+ className={`text-base text-[#333] ${
+ selectedDurations.includes(duration) ? "font-semibold" : ""
+ }`}
>
{duration}
</Text>
@@ -1256,7 +1263,9 @@ export default function EventTypeDetail() {
}}
>
<Text
- className={`text-base text-[#333] ${defaultDuration === duration ? "font-semibold" : ""}`}
+ className={`text-base text-[#333] ${
+ defaultDuration === duration ? "font-semibold" : ""
+ }`}
>
{duration}
</Text>
@@ -1298,7 +1307,9 @@ export default function EventTypeDetail() {
>
<View className="flex-1 flex-row items-center justify-between">
<Text
- className={`text-base text-[#333] ${selectedSchedule?.id === schedule.id ? "font-semibold" : ""}`}
+ className={`text-base text-[#333] ${
+ selectedSchedule?.id === schedule.id ? "font-semibold" : ""
+ }`}
>
{schedule.name}
</Text>
@@ -1364,7 +1375,12 @@ export default function EventTypeDetail() {
}}
>
<Text
- className={`text-base text-[#333] ${selectedTimezone === tz || (selectedScheduleDetails?.timeZone === tz && !selectedTimezone) ? "font-semibold" : ""}`}
+ className={`text-base text-[#333] ${
+ selectedTimezone === tz ||
+ (selectedScheduleDetails?.timeZone === tz && !selectedTimezone)
+ ? "font-semibold"
+ : ""
+ }`}
>
{tz}
</Text>
@@ -1406,7 +1422,9 @@ export default function EventTypeDetail() {
}}
>
<Text
- className={`text-base text-[#333] ${beforeEventBuffer === option ? "font-semibold" : ""}`}
+ className={`text-base text-[#333] ${
+ beforeEventBuffer === option ? "font-semibold" : ""
+ }`}
>
{option}
</Text>
@@ -1446,7 +1464,9 @@ export default function EventTypeDetail() {
}}
>
<Text
- className={`text-base text-[#333] ${afterEventBuffer === option ? "font-semibold" : ""}`}
+ className={`text-base text-[#333] ${
+ afterEventBuffer === option ? "font-semibold" : ""
+ }`}
>
{option}
</Text>
@@ -1486,7 +1506,9 @@ export default function EventTypeDetail() {
}}
>
<Text
- className={`text-base text-[#333] ${minimumNoticeUnit === option ? "font-semibold" : ""}`}
+ className={`text-base text-[#333] ${
+ minimumNoticeUnit === option ? "font-semibold" : ""
+ }`}
>
{option}
</Text>
@@ -1618,7 +1640,9 @@ export default function EventTypeDetail() {
}}
>
<Text
- className={`text-base text-[#333] ${slotInterval === option ? "font-semibold" : ""}`}
+ className={`text-base text-[#333] ${
+ slotInterval === option ? "font-semibold" : ""
+ }`}
>
{option}
</Text>
@@ -1658,7 +1682,9 @@ export default function EventTypeDetail() {
}}
>
<Text
- className={`text-base capitalize text-[#333] ${recurringFrequency === option ? "font-semibold" : ""}`}
+ className={`text-base capitalize text-[#333] ${
+ recurringFrequency === option ? "font-semibold" : ""
+ }`}
>
{option === "weekly" ? "week" : option === "monthly" ? "month" : "year"}
</Text>
diff --git a/companion/components/AuthTokenProvider.tsx b/companion/components/AuthTokenProvider.tsx
index 28e77e4f493..f2249454596 100644
--- a/companion/components/AuthTokenProvider.tsx
+++ b/companion/components/AuthTokenProvider.tsx
@@ -1,6 +1,6 @@
-import { useEffect } from "react";
import { useAuth } from "../contexts/AuthContext";
import { CalComAPIService } from "../services/calcom";
+import { useEffect } from "react";
export function AuthTokenProvider({ children }: { children: React.ReactNode }) {
const { accessToken, isAuthenticated, isWebSession } = useAuth();
diff --git a/companion/components/Header.tsx b/companion/components/Header.tsx
index 2064949a966..b7a4f5af454 100644
--- a/companion/components/Header.tsx
+++ b/companion/components/Header.tsx
@@ -1,4 +1,9 @@
+import { CalComAPIService, UserProfile } from "../services/calcom";
+import { openInAppBrowser } from "../utils/browser";
+import { CalComLogo } from "./CalComLogo";
+import { FullScreenModal } from "./FullScreenModal";
import { Ionicons } from "@expo/vector-icons";
+import * as Clipboard from "expo-clipboard";
import { useRouter } from "expo-router";
import React, { useState, useEffect } from "react";
import {
@@ -11,12 +16,7 @@ import {
ActionSheetIOS,
Alert,
} from "react-native";
-import * as Clipboard from "expo-clipboard";
import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { CalComAPIService, UserProfile } from "../services/calcom";
-import { CalComLogo } from "./CalComLogo";
-import { FullScreenModal } from "./FullScreenModal";
-import { openInAppBrowser } from "../utils/browser";
export function Header() {
const router = useRouter();
diff --git a/companion/components/event-type-detail/tabs/AvailabilityTab.tsx b/companion/components/event-type-detail/tabs/AvailabilityTab.tsx
index 75961b0869a..873a0a757eb 100644
--- a/companion/components/event-type-detail/tabs/AvailabilityTab.tsx
+++ b/companion/components/event-type-detail/tabs/AvailabilityTab.tsx
@@ -44,8 +44,8 @@ export function AvailabilityTab(props: AvailabilityTabProps) {
{props.schedulesLoading
? "Loading schedules..."
: props.selectedSchedule
- ? props.selectedSchedule.name
- : "Select schedule"}
+ ? props.selectedSchedule.name
+ : "Select schedule"}
</Text>
<Ionicons name="chevron-down" size={20} color="#8E8E93" />
</TouchableOpacity>
diff --git a/companion/contexts/AuthContext.tsx b/companion/contexts/AuthContext.tsx
index e6e273bd414..e5ebcb464c8 100644
--- a/companion/contexts/AuthContext.tsx
+++ b/companion/contexts/AuthContext.tsx
@@ -1,12 +1,12 @@
-import React, { createContext, useContext, useState, useEffect, ReactNode } from "react";
-import { WebAuthService } from "../services/webAuth";
import { CalComAPIService } from "../services/calcom";
import {
createCalComOAuthService,
OAuthTokens,
CalComOAuthService,
} from "../services/oauthService";
+import { WebAuthService } from "../services/webAuth";
import { secureStorage } from "../utils/storage";
+import React, { createContext, useContext, useState, useEffect, ReactNode } from "react";
interface AuthContextType {
isAuthenticated: boolean;
diff --git a/companion/extension/entrypoints/content.ts b/companion/extension/entrypoints/content.ts
index 69951a2d800..0c025a8ff58 100644
--- a/companion/extension/entrypoints/content.ts
+++ b/companion/extension/entrypoints/content.ts
@@ -1536,8 +1536,8 @@ export default defineContentScript({
${datesHTML}
<div style="margin-top: 13px;">
<a href="https://cal.com/${username}/${eventType.slug}?cal.tz=${encodeURIComponent(
- timezone
- )}" style="text-decoration: none; cursor: pointer; color: #0B57D0; font-size: 14px;">
+ timezone
+ )}" style="text-decoration: none; cursor: pointer; color: #0B57D0; font-size: 14px;">
See all available times →
</a>
</div>
@@ -2458,8 +2458,8 @@ export default defineContentScript({
<div style="font-size: 13px; color: #666; margin-top: 4px;">${
parsedData.slots.length
} time slot${parsedData.slots.length > 1 ? "s" : ""} • ${
- parsedData.detectedDuration
- }min each</div>
+ parsedData.detectedDuration
+ }min each</div>
</div>
<button class="close-menu" style="background: none; border: none; cursor: pointer; font-size: 28px; color: #666; line-height: 1; padding: 0; width: 32px; height: 32px; display: flex; align-items: center; justify-content: center; border-radius: 50%; transition: background 0.2s ease;">×</button>
`;
diff --git a/companion/hooks/useBookingActions.ts b/companion/hooks/useBookingActions.ts
index 703f28d7264..ca4233e1ef9 100644
--- a/companion/hooks/useBookingActions.ts
+++ b/companion/hooks/useBookingActions.ts
@@ -1,8 +1,8 @@
-import { useState } from "react";
-import { Alert } from "react-native";
-import type { useRouter } from "expo-router";
import type { Booking } from "../services/calcom";
import { showErrorAlert } from "../utils/alerts";
+import type { useRouter } from "expo-router";
+import { useState } from "react";
+import { Alert } from "react-native";
interface UseBookingActionsParams {
router: ReturnType<typeof useRouter>;
diff --git a/companion/hooks/useBookings.ts b/companion/hooks/useBookings.ts
index c074187f06b..9fee0be6b4f 100644
--- a/companion/hooks/useBookings.ts
+++ b/companion/hooks/useBookings.ts
@@ -8,10 +8,9 @@
* - Optimistic updates for mutations
* - Cache invalidation on mutations
*/
-
-import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
-import { CalComAPIService, Booking } from "../services/calcom";
import { CACHE_CONFIG, queryKeys } from "../config/cache.config";
+import { CalComAPIService, Booking } from "../services/calcom";
+import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
/**
* Filter options for fetching bookings
diff --git a/companion/hooks/useEventTypes.ts b/companion/hooks/useEventTypes.ts
index 08f2fee9e00..60b1b695e01 100644
--- a/companion/hooks/useEventTypes.ts
+++ b/companion/hooks/useEventTypes.ts
@@ -8,10 +8,9 @@
* - Optimistic updates for mutations
* - Cache invalidation on create/update/delete
*/
-
-import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
-import { CalComAPIService, EventType, CreateEventTypeInput } from "../services/calcom";
import { CACHE_CONFIG, queryKeys } from "../config/cache.config";
+import { CalComAPIService, EventType, CreateEventTypeInput } from "../services/calcom";
+import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
/**
* Hook to fetch all event types
diff --git a/companion/hooks/useSchedules.ts b/companion/hooks/useSchedules.ts
index f73a401cf9f..e614dcab310 100644
--- a/companion/hooks/useSchedules.ts
+++ b/companion/hooks/useSchedules.ts
@@ -8,10 +8,9 @@
* - Optimistic updates for mutations
* - Cache invalidation on create/update/delete
*/
-
-import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
-import { CalComAPIService, Schedule } from "../services/calcom";
import { CACHE_CONFIG, queryKeys } from "../config/cache.config";
+import { CalComAPIService, Schedule } from "../services/calcom";
+import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
/**
* Sort schedules: default first, then alphabetically by name
diff --git a/companion/hooks/useUserProfile.ts b/companion/hooks/useUserProfile.ts
index 3934edf7510..a7b6005e5b9 100644
--- a/companion/hooks/useUserProfile.ts
+++ b/companion/hooks/useUserProfile.ts
@@ -6,10 +6,9 @@
* - Automatic caching with configurable stale times
* - Profile update mutations with cache invalidation
*/
-
-import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
-import { CalComAPIService, UserProfile } from "../services/calcom";
import { CACHE_CONFIG, queryKeys } from "../config/cache.config";
+import { CalComAPIService, UserProfile } from "../services/calcom";
+import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
/**
* User profile update input type
diff --git a/companion/utils/browser.ts b/companion/utils/browser.ts
index eecfddff973..80a99a5bf6a 100644
--- a/companion/utils/browser.ts
+++ b/companion/utils/browser.ts
@@ -4,9 +4,8 @@
* Centralized utility for opening links in the in-app browser.
* Configured for session sharing with Safari/Chrome to maintain login state.
*/
-
-import * as WebBrowser from "expo-web-browser";
import { showErrorAlert } from "./alerts";
+import * as WebBrowser from "expo-web-browser";
/**
* Configuration options for in-app browser
diff --git a/packages/features/calAIPhone/providers/retellAI/services/AgentService.ts b/packages/features/calAIPhone/providers/retellAI/services/AgentService.ts
index e4dbeb0354d..0156189a8c1 100644
--- a/packages/features/calAIPhone/providers/retellAI/services/AgentService.ts
+++ b/packages/features/calAIPhone/providers/retellAI/services/AgentService.ts
@@ -2,7 +2,6 @@ import { isValidPhoneNumber } from "libphonenumber-js/max";
import { v4 as uuidv4 } from "uuid";
import { PrismaApiKeyRepository } from "@calcom/features/ee/api-keys/repositories/PrismaApiKeyRepository";
-import { replaceEventTypePlaceholders } from "@calcom/features/ee/workflows/components/agent-configuration/utils/promptUtils";
import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
import { RETELL_AI_TEST_MODE, RETELL_AI_TEST_EVENT_TYPE_MAP } from "@calcom/lib/constants";
import { timeZoneSchema } from "@calcom/lib/dayjs/timeZone.schema";
@@ -22,6 +21,7 @@ import type { PhoneNumberRepositoryInterface } from "../../interfaces/PhoneNumbe
import { RetellAIServiceMapper } from "../RetellAIServiceMapper";
import type { RetellAIRepository, Language } from "../types";
import { getLlmId } from "../types";
+import { replaceEventTypePlaceholders } from "../utils/promptUtils";
type Dependencies = {
retellRepository: RetellAIRepository;
diff --git a/packages/features/ee/workflows/components/agent-configuration/utils/promptUtils.ts b/packages/features/calAIPhone/providers/retellAI/utils/promptUtils.ts
similarity index 100%
rename from packages/features/ee/workflows/components/agent-configuration/utils/promptUtils.ts
rename to packages/features/calAIPhone/providers/retellAI/utils/promptUtils.ts
diff --git a/packages/features/ee/dsync/components/CreateTeamDialog.tsx b/packages/features/ee/dsync/components/CreateTeamDialog.tsx
index dc794856382..4f4eec3adeb 100644
--- a/packages/features/ee/dsync/components/CreateTeamDialog.tsx
+++ b/packages/features/ee/dsync/components/CreateTeamDialog.tsx
@@ -1,9 +1,9 @@
import { Dialog } from "@calcom/features/components/controlled-dialog";
-import { CreateANewTeamForm } from "@calcom/features/ee/teams/components";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import { DialogContent } from "@calcom/ui/components/dialog";
import { revalidateTeamsList } from "@calcom/web/app/(use-page-wrapper)/(main-nav)/teams/actions";
+import { CreateANewTeamForm } from "@calcom/web/modules/ee/teams/components/CreateANewTeamForm";
interface CreateTeamDialogProps {
open: boolean;
diff --git a/packages/features/ee/organizations/components/index.ts b/packages/features/ee/organizations/components/index.ts
index eb8816ad496..39fbcb47351 100644
--- a/packages/features/ee/organizations/components/index.ts
+++ b/packages/features/ee/organizations/components/index.ts
@@ -1,4 +1,3 @@
export { CreateANewOrganizationForm } from "./CreateANewOrganizationForm";
export { AboutOrganizationForm } from "./AboutOrganizationForm";
-export { AddNewTeamsForm } from "@calcom/web/modules/settings/organizations/new/_components/AddNewTeamsForm";
export { AdminOnboardingHandover } from "./AdminOnboardingHandover";
diff --git a/packages/features/ee/organizations/pages/components/MemberListItem.tsx b/packages/features/ee/organizations/pages/components/MemberListItem.tsx
index d2770d301e1..a483a17edcb 100644
--- a/packages/features/ee/organizations/pages/components/MemberListItem.tsx
+++ b/packages/features/ee/organizations/pages/components/MemberListItem.tsx
@@ -1,6 +1,5 @@
import classNames from "classnames";
-import TeamPill, { TeamRole } from "@calcom/ee/teams/components/TeamPill";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
import { UserAvatar } from "@calcom/ui/components/avatar";
@@ -14,6 +13,7 @@ import {
DropdownMenuTrigger,
} from "@calcom/ui/components/dropdown";
import { Tooltip } from "@calcom/ui/components/tooltip";
+import TeamPill, { TeamRole } from "@calcom/web/modules/ee/teams/components/TeamPill";
interface Props {
member: RouterOutputs["viewer"]["organizations"]["listOtherTeamMembers"]["rows"][number];
diff --git a/packages/features/ee/platform/pages/settings/members.tsx b/packages/features/ee/platform/pages/settings/members.tsx
index 9a97c897694..04e88f647a5 100644
--- a/packages/features/ee/platform/pages/settings/members.tsx
+++ b/packages/features/ee/platform/pages/settings/members.tsx
@@ -1,12 +1,12 @@
"use client";
import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
-import { UserListTable } from "@calcom/features/users/components/UserTable/UserListTable";
-import type { UserListTableProps } from "@calcom/features/users/components/UserTable/UserListTable";
-import { UserListTableSkeleton } from "@calcom/features/users/components/UserTable/UserListTableSkeleton";
import NoPlatformPlan from "@calcom/web/components/settings/platform/dashboard/NoPlatformPlan";
import { useGetUserAttributes } from "@calcom/web/components/settings/platform/hooks/useGetUserAttributes";
import { PlatformPricing } from "@calcom/web/components/settings/platform/pricing/platform-pricing/index";
+import { UserListTable } from "@calcom/web/modules/users/components/UserTable/UserListTable";
+import type { UserListTableProps } from "@calcom/web/modules/users/components/UserTable/UserListTable";
+import { UserListTableSkeleton } from "@calcom/web/modules/users/components/UserTable/UserListTableSkeleton";
const PlatformMembersView = (props: Omit<UserListTableProps, "facetedTeamValues" | "attributes">) => {
const { isUserLoading, isUserBillingDataLoading, isPlatformUser, isPaidUser, userBillingData, userOrgId } =
diff --git a/packages/features/ee/teams/components/index.ts b/packages/features/ee/teams/components/index.ts
deleted file mode 100644
index 4ba43769b02..00000000000
--- a/packages/features/ee/teams/components/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { CreateANewTeamForm } from "./CreateANewTeamForm";
-export { TeamsListing } from "./TeamsListing";
-export { TeamsUpgradeBanner, type TeamsUpgradeBannerProps } from "./TeamsUpgradeBanner";
diff --git a/packages/features/ee/teams/pages/team-members-view.tsx b/packages/features/ee/teams/pages/team-members-view.tsx
deleted file mode 100644
index 935a10c3b96..00000000000
--- a/packages/features/ee/teams/pages/team-members-view.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-"use client";
-
-import { useSession } from "next-auth/react";
-import { useRouter } from "next/navigation";
-import { useEffect, useState } from "react";
-
-import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
-import { trpc } from "@calcom/trpc/react";
-
-import InviteLinkSettingsModal from "../components/InviteLinkSettingsModal";
-import { MemberInvitationModalWithoutMembers } from "../components/MemberInvitationModal";
-import MemberList from "../components/MemberList";
-import TeamInviteList from "../components/TeamInviteList";
-
-const MembersView = () => {
- const { t } = useLocale();
- const [showMemberInvitationModal, setShowMemberInvitationModal] = useState(false);
- const [showInviteLinkSettingsModal, setInviteLinkSettingsModal] = useState(false);
- const router = useRouter();
- const session = useSession();
- const org = session?.data?.user.org;
- const params = useParamsWithFallback();
-
- const teamId = Number(params.id);
-
- const {
- data: team,
- isPending: isTeamsLoading,
- error: teamError,
- } = trpc.viewer.teams.get.useQuery(
- { teamId },
- {
- enabled: !!teamId,
- }
- );
- useEffect(
- function refactorMeWithoutEffect() {
- if (teamError) {
- router.replace("/teams");
- }
- },
- [teamError]
- );
-
- const isPending = isTeamsLoading;
-
- const isInviteOpen = !team?.membership.accepted;
-
- const isAdmin = team && checkAdminOrOwner(team.membership.role);
-
- const isOrgAdminOrOwner = checkAdminOrOwner(org?.role);
-
- const hideInvitationModal = () => {
- setShowMemberInvitationModal(false);
- };
-
- return (
- <>
- {!isPending && (
- <>
- <div>
- {team && (
- <>
- {isInviteOpen && (
- <TeamInviteList
- teams={[
- {
- id: team.id,
- accepted: team.membership.accepted || false,
- name: team.name,
- slug: team.slug,
- role: team.membership.role,
- },
- ]}
- />
- )}
- </>
- )}
-
- {((team?.isPrivate && isAdmin) || !team?.isPrivate || isOrgAdminOrOwner) && team && (
- <div className="mb-6">
- <MemberList
- team={team}
- isOrgAdminOrOwner={isOrgAdminOrOwner}
- setShowMemberInvitationModal={setShowMemberInvitationModal}
- />
- </div>
- )}
- {showMemberInvitationModal && team && team.id && (
- <MemberInvitationModalWithoutMembers
- hideInvitationModal={hideInvitationModal}
- showMemberInvitationModal={showMemberInvitationModal}
- teamId={team.id}
- token={team.inviteToken?.token}
- onSettingsOpen={() => setInviteLinkSettingsModal(true)}
- />
- )}
-
- {showInviteLinkSettingsModal && team?.inviteToken && team.id && (
- <InviteLinkSettingsModal
- isOpen={showInviteLinkSettingsModal}
- teamId={team.id}
- token={team.inviteToken.token}
- expiresInDays={team.inviteToken.expiresInDays || undefined}
- onExit={() => {
- setInviteLinkSettingsModal(false);
- setShowMemberInvitationModal(true);
- }}
- />
- )}
- </div>
- </>
- )}
- </>
- );
-};
-
-export default MembersView;
diff --git a/packages/features/ee/workflows/components/types.ts b/packages/features/ee/workflows/components/types.ts
deleted file mode 100644
index d523ef1ddb9..00000000000
--- a/packages/features/ee/workflows/components/types.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import type { RouterOutputs } from "@calcom/trpc/react";
-
-export type CallData = RouterOutputs["viewer"]["aiVoiceAgent"]["listCalls"]["calls"][number];
-
-export type CallDetailsPayload = {
- showModal: boolean;
- selectedCall?: CallData;
-};
-
-export type CallDetailsState = {
- callDetailsSheet: CallDetailsPayload;
-};
-
-export type CallDetailsAction =
- | {
- type: "OPEN_CALL_DETAILS";
- payload: CallDetailsPayload;
- }
- | {
- type: "CLOSE_MODAL";
- };
\ No newline at end of file
diff --git a/packages/features/ee/workflows/hooks/useAgentsData.ts b/packages/features/ee/workflows/hooks/useAgentsData.ts
index ef1dee2846e..d4ff025e154 100644
--- a/packages/features/ee/workflows/hooks/useAgentsData.ts
+++ b/packages/features/ee/workflows/hooks/useAgentsData.ts
@@ -2,11 +2,10 @@ import { useMemo } from "react";
import type { UseFormReturn } from "react-hook-form";
import { useWatch } from "react-hook-form";
+import type { FormValues } from "@calcom/features/ee/workflows/lib/types";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
-import type { FormValues } from "../pages/workflow";
-
type AgentData = RouterOutputs["viewer"]["aiVoiceAgent"]["get"];
interface AgentQuery {
diff --git a/packages/features/ee/workflows/lib/getOptions.ts b/packages/features/ee/workflows/lib/getOptions.ts
index 2d27560cd70..22063ccf3ad 100644
--- a/packages/features/ee/workflows/lib/getOptions.ts
+++ b/packages/features/ee/workflows/lib/getOptions.ts
@@ -31,7 +31,14 @@ export function getWorkflowActionOptions(t: TFunction, isOrgsPlan?: boolean) {
});
}
-export function getWorkflowTriggerOptions(t: TFunction, hasPaidPlan: boolean = false) {
+type PlanState = {
+ hasPaidPlan?: boolean;
+ hasActiveTeamPlan?: boolean;
+ isTrial?: boolean;
+};
+
+export function getWorkflowTriggerOptions(t: TFunction, planState: PlanState = {}) {
+ const { hasPaidPlan = false, hasActiveTeamPlan, isTrial } = planState;
// TODO: remove this after workflows are supported
const filterdWorkflowTriggerEvents = WORKFLOW_TRIGGER_EVENTS.filter(
(event) =>
@@ -44,37 +51,42 @@ export function getWorkflowTriggerOptions(t: TFunction, hasPaidPlan: boolean = f
const isFormSubmittedTrigger =
triggerEvent === WorkflowTriggerEvents.FORM_SUBMITTED ||
triggerEvent === WorkflowTriggerEvents.FORM_SUBMITTED_NO_EVENT;
+ const needsTeamsUpgrade = !hasPaidPlan && isFormSubmittedTrigger;
return {
label: triggerString.charAt(0).toUpperCase() + triggerString.slice(1),
value: triggerEvent,
- needsTeamsUpgrade: !hasPaidPlan && isFormSubmittedTrigger,
+ needsTeamsUpgrade,
+ upgradeTeamsBadgeProps: needsTeamsUpgrade ? { hasPaidPlan, hasActiveTeamPlan, isTrial } : undefined,
};
});
}
function convertToTemplateOptions(
t: TFunction,
- hasPaidPlan: boolean,
+ planState: PlanState,
templates: readonly WorkflowTemplates[]
) {
+ const { hasPaidPlan = false, hasActiveTeamPlan, isTrial } = planState;
return templates.map((template) => {
+ const needsTeamsUpgrade = !hasPaidPlan && template === WorkflowTemplates.CUSTOM;
return {
label: t(`${template.toLowerCase()}`),
value: template,
- needsTeamsUpgrade: !hasPaidPlan && template === WorkflowTemplates.CUSTOM,
- } as { label: string; value: any; needsTeamsUpgrade: boolean };
+ needsTeamsUpgrade,
+ upgradeTeamsBadgeProps: needsTeamsUpgrade ? { hasPaidPlan, hasActiveTeamPlan, isTrial } : undefined,
+ } as { label: string; value: WorkflowTemplates; needsTeamsUpgrade: boolean; upgradeTeamsBadgeProps?: PlanState };
});
}
export function getWorkflowTemplateOptions(
t: TFunction,
action: WorkflowActions | undefined,
- hasPaidPlan: boolean,
+ planState: PlanState,
trigger: WorkflowTriggerEvents
) {
if (isFormTrigger(trigger)) {
- return convertToTemplateOptions(t, hasPaidPlan, [WorkflowTemplates.CUSTOM]);
+ return convertToTemplateOptions(t, planState, [WorkflowTemplates.CUSTOM]);
}
const TEMPLATES =
@@ -84,5 +96,5 @@ export function getWorkflowTemplateOptions(
? ATTENDEE_WORKFLOW_TEMPLATES
: BASIC_WORKFLOW_TEMPLATES;
- return convertToTemplateOptions(t, hasPaidPlan, TEMPLATES);
+ return convertToTemplateOptions(t, planState, TEMPLATES);
}
diff --git a/packages/features/ee/workflows/lib/types.ts b/packages/features/ee/workflows/lib/types.ts
index eac7297072c..f3f6b6161ba 100644
--- a/packages/features/ee/workflows/lib/types.ts
+++ b/packages/features/ee/workflows/lib/types.ts
@@ -1,10 +1,18 @@
+import type { Retell } from "retell-sdk";
+
import type { FORM_SUBMITTED_WEBHOOK_RESPONSES } from "@calcom/app-store/routing-forms/lib/formSubmissionUtils";
import type { WorkflowPermissions } from "@calcom/features/workflows/repositories/WorkflowPermissionsRepository";
import type { TimeFormat } from "@calcom/lib/timeFormat";
-import type { Membership, Prisma, Workflow as PrismaWorkflow } from "@calcom/prisma/client";
+import type {
+ Prisma,
+ Membership,
+ Workflow as PrismaWorkflow,
+ WorkflowStep as PrismaWorkflowStep,
+} from "@calcom/prisma/client";
import type { TimeUnit, WorkflowTemplates, WorkflowTriggerEvents } from "@calcom/prisma/enums";
import { WorkflowActions } from "@calcom/prisma/enums";
import type { CalEventResponses, RecurringEvent } from "@calcom/types/Calendar";
+import type { MultiSelectCheckboxesOptionType as Option } from "@calcom/ui/components/form";
export type Workflow = {
id: number;
@@ -124,3 +132,37 @@ export type WorkflowListType = PrismaWorkflow & {
permissions?: WorkflowPermissions;
isOrg?: boolean;
};
+
+export type FormValues = {
+ name: string;
+ activeOn: Option[];
+ steps: (PrismaWorkflowStep & {
+ senderName: string | null;
+ agentId?: string | null;
+ inboundAgentId?: string | null;
+ })[];
+ trigger: WorkflowTriggerEvents;
+ time?: number;
+ timeUnit?: TimeUnit;
+ selectAll: boolean;
+};
+
+export type CallData = Retell.WebCallResponse | Retell.PhoneCallResponse;
+
+export type CallDetailsPayload = {
+ showModal: boolean;
+ selectedCall?: CallData;
+};
+
+export type CallDetailsState = {
+ callDetailsSheet: CallDetailsPayload;
+};
+
+export type CallDetailsAction =
+ | {
+ type: "OPEN_CALL_DETAILS";
+ payload: CallDetailsPayload;
+ }
+ | {
+ type: "CLOSE_MODAL";
+ };
diff --git a/packages/features/ee/workflows/pages/call-history.tsx b/packages/features/ee/workflows/pages/call-history.tsx
deleted file mode 100644
index e5218ecfd65..00000000000
--- a/packages/features/ee/workflows/pages/call-history.tsx
+++ /dev/null
@@ -1,329 +0,0 @@
-"use client";
-
-import { getCoreRowModel, getSortedRowModel, useReactTable, type ColumnDef } from "@tanstack/react-table";
-import { usePathname } from "next/navigation";
-import { useMemo, useState, useReducer } from "react";
-
-import {
- DataTableProvider,
- DataTableWrapper,
- DataTableToolbar,
- DataTableFilters,
- useColumnFilters,
- ColumnFilterType,
- convertFacetedValuesToMap,
- useDataTable,
-} from "@calcom/features/data-table";
-import { useSegments } from "@calcom/features/data-table/hooks/useSegments";
-import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
-import { WEBAPP_URL } from "@calcom/lib/constants";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { trpc } from "@calcom/trpc/react";
-import type { RouterOutputs } from "@calcom/trpc/react";
-import { Badge } from "@calcom/ui/components/badge";
-
-import { CallDetailsSheet } from "../components/CallDetailsSheet";
-import type { CallDetailsState, CallDetailsAction } from "../components/types";
-
-type CallHistoryRow = {
- id: string;
- time: string;
- duration: number;
- channelType: "web_call" | "phone_call";
- sessionId: string;
- endReason: string;
- sessionStatus: "completed" | "ongoing" | "failed";
- userSentiment: "positive" | "neutral" | "negative";
- from: string;
- to: string;
- callCreated: boolean;
- inVoicemail: boolean;
-};
-
-export type CallHistoryProps = {
- org?: RouterOutputs["viewer"]["organizations"]["listCurrent"];
-};
-
-const initialState: CallDetailsState = {
- callDetailsSheet: {
- showModal: false,
- },
-};
-
-function reducer(state: CallDetailsState, action: CallDetailsAction): CallDetailsState {
- switch (action.type) {
- case "OPEN_CALL_DETAILS":
- return { ...state, callDetailsSheet: action.payload };
- case "CLOSE_MODAL":
- return {
- ...state,
- callDetailsSheet: { showModal: false },
- };
- default:
- return state;
- }
-}
-
-function CallHistoryTable(props: CallHistoryProps) {
- const pathname = usePathname();
- if (!pathname) return null;
- return (
- <DataTableProvider tableIdentifier={pathname} useSegments={useSegments} defaultPageSize={25}>
- <CallHistoryContent {...props} />
- </DataTableProvider>
- );
-}
-
-function CallHistoryContent({ org: _org }: CallHistoryProps) {
- const orgBranding = useOrgBranding();
- const _domain = orgBranding?.fullDomain ?? WEBAPP_URL;
- const { t } = useLocale();
- const [rowSelection, setRowSelection] = useState({});
- const [state, dispatch] = useReducer(reducer, initialState);
-
- const _columnFilters = useColumnFilters();
- const { limit, offset, searchTerm: _searchTerm } = useDataTable();
-
- // Fetch calls data from API
- const {
- data: callsData,
- isPending: isLoadingCalls,
- error: _callsError,
- } = trpc.viewer.aiVoiceAgent.listCalls.useQuery({
- limit,
- offset,
- filters: {},
- });
-
- const callHistoryData: CallHistoryRow[] = useMemo(() => {
- if (!callsData?.calls) return [];
-
- return callsData.calls.map((call) => ({
- id: call.call_id || call.id || Math.random().toString(),
- time: call.start_timestamp ? new Date(call.start_timestamp).toISOString() : new Date().toISOString(),
- duration: Math.round((call.duration_ms || 0) / 1000),
- channelType: (call.call_type || "phone_call") as "web_call" | "phone_call",
- sessionId: call.call_id || call.id || "unknown",
- endReason: call.disconnection_reason || "Unknown",
- sessionStatus:
- call.call_status === "ended" ? "completed" : call.call_status === "ongoing" ? "ongoing" : "failed",
- userSentiment:
- call.call_analysis?.user_sentiment?.toLowerCase() === "positive"
- ? "positive"
- : call.call_analysis?.user_sentiment?.toLowerCase() === "negative"
- ? "negative"
- : "neutral",
- from: call.from_number || "Unknown",
- to: call.to_number || "Unknown",
- callCreated: call.call_created ?? true,
- inVoicemail: call.in_voicemail ?? false,
- }));
- }, [callsData?.calls]);
-
- const columns = useMemo<ColumnDef<CallHistoryRow>[]>(
- () => [
- {
- id: "time",
- accessorKey: "time",
- header: t("time_header"),
- size: 150,
- cell: ({ row }) => {
- const date = new Date(row.original.time);
- return (
- <div className="text-sm">
- <div>{date.toLocaleDateString()}</div>
- <div className="text-subtle">{date.toLocaleTimeString()}</div>
- </div>
- );
- },
- },
- {
- id: "duration",
- accessorKey: "duration",
- header: t("duration"),
- size: 140,
- cell: ({ row }) => {
- const seconds = row.original.duration;
- const minutes = Math.floor(seconds / 60);
- const remainingSeconds = seconds % 60;
- return <span>{`${minutes}:${remainingSeconds.toString().padStart(2, "0")}`}</span>;
- },
- },
- {
- id: "channelType",
- accessorKey: "channelType",
- header: t("channel_type"),
- size: 160,
- meta: {
- filter: { type: ColumnFilterType.MULTI_SELECT },
- },
- cell: ({ row }) => <span>{row.original.channelType}</span>,
- },
- {
- id: "sessionId",
- accessorKey: "sessionId",
- header: t("session_id"),
- size: 210,
- cell: ({ row }) => <code className="text-xs">{row.original.sessionId}</code>,
- },
- {
- id: "endReason",
- accessorKey: "endReason",
- header: t("end_reason"),
- size: 180,
- },
- {
- id: "sessionStatus",
- accessorKey: "sessionStatus",
- header: t("session_status"),
- size: 200,
- meta: {
- filter: { type: ColumnFilterType.MULTI_SELECT },
- },
- cell: ({ row }) => {
- const status = row.original.sessionStatus;
- const variant = status === "completed" ? "green" : status === "ongoing" ? "blue" : "red";
- return <Badge variant={variant}>{status}</Badge>;
- },
- },
- {
- id: "userSentiment",
- accessorKey: "userSentiment",
- header: t("user_sentiment"),
- size: 200,
- meta: {
- filter: { type: ColumnFilterType.MULTI_SELECT },
- },
- cell: ({ row }) => {
- const sentiment = row.original.userSentiment;
- const variant = sentiment === "positive" ? "green" : sentiment === "negative" ? "red" : "gray";
- return <Badge variant={variant}>{sentiment}</Badge>;
- },
- },
- {
- id: "from",
- accessorKey: "from",
- header: t("from_header"),
- size: 140,
- },
- {
- id: "to",
- accessorKey: "to",
- header: t("to"),
- size: 140,
- },
- {
- id: "callCreated",
- accessorKey: "callCreated",
- header: t("call_created"),
- size: 200,
- cell: ({ row }) => {
- const created = row.original.callCreated;
- const variant = created ? "green" : "red";
- return <Badge variant={variant}>{created ? t("successful") : t("unsuccessful")}</Badge>;
- },
- },
- {
- id: "inVoicemail",
- accessorKey: "inVoicemail",
- header: t("voicemail"),
- size: 150,
- cell: ({ row }) => {
- const inVoicemail = row.original.inVoicemail;
- const variant = inVoicemail ? "blue" : "gray";
- return <Badge variant={variant}>{inVoicemail ? t("yes") : t("no")}</Badge>;
- },
- },
- ],
- [t]
- );
-
- const table = useReactTable({
- data: callHistoryData,
- columns,
- enableRowSelection: false,
- manualPagination: true,
- state: {
- rowSelection,
- },
- initialState: {
- columnPinning: {
- left: ["time"],
- },
- },
- getCoreRowModel: getCoreRowModel(),
- getSortedRowModel: getSortedRowModel(),
- onRowSelectionChange: setRowSelection,
- getRowId: (row) => row.id,
- getFacetedUniqueValues: (_, columnId) => () => {
- switch (columnId) {
- case "channelType":
- return convertFacetedValuesToMap([
- { label: "Web Call", value: "web_call" },
- { label: "Phone Call", value: "phone_call" },
- ]);
- case "sessionStatus":
- return convertFacetedValuesToMap([
- { label: "Completed", value: "completed" },
- { label: "Ongoing", value: "ongoing" },
- { label: "Failed", value: "failed" },
- ]);
- case "userSentiment":
- return convertFacetedValuesToMap([
- { label: "Positive", value: "positive" },
- { label: "Neutral", value: "neutral" },
- { label: "Negative", value: "negative" },
- ]);
- default:
- return new Map();
- }
- },
- });
-
- return (
- <>
- <DataTableWrapper<CallHistoryRow>
- testId="call-history-data-table"
- table={table}
- isPending={isLoadingCalls}
- totalRowCount={callsData?.totalCount || 0}
- paginationMode="standard"
- rowClassName="cursor-pointer hover:bg-subtle"
- onRowMouseclick={(row) => {
- const callIndex = callHistoryData.findIndex((call) => call.id === row.original.id);
- if (callIndex !== -1 && callsData?.calls?.[callIndex]) {
- dispatch({
- type: "OPEN_CALL_DETAILS",
- payload: {
- showModal: true,
- selectedCall: callsData.calls[callIndex],
- },
- });
- }
- }}
- ToolbarLeft={
- <>
- <DataTableToolbar.SearchBar />
- <DataTableFilters.ColumnVisibilityButton table={table} />
- <DataTableFilters.FilterBar table={table} />
- </>
- }
- ToolbarRight={
- <>
- <DataTableFilters.ClearFiltersButton />
- </>
- }
- />
-
- {state.callDetailsSheet.showModal && <CallDetailsSheet state={state} dispatch={dispatch} />}
- </>
- );
-}
-
-function CallHistoryPage() {
- const { data: org } = trpc.viewer.organizations.listCurrent.useQuery();
-
- return <CallHistoryTable org={org} />;
-}
-
-export default CallHistoryPage;
diff --git a/packages/features/ee/workflows/repositories/WorkflowRepository.ts b/packages/features/ee/workflows/repositories/WorkflowRepository.ts
index 4eeea447bb2..dbe97d4c7fe 100644
--- a/packages/features/ee/workflows/repositories/WorkflowRepository.ts
+++ b/packages/features/ee/workflows/repositories/WorkflowRepository.ts
@@ -1,10 +1,10 @@
import { z } from "zod";
-import type { WorkflowListType as WorkflowType } from "@calcom/ee/workflows/lib/types";
import { FORM_TRIGGER_WORKFLOW_EVENTS } from "@calcom/ee/workflows/lib/constants";
import { deleteScheduledAIPhoneCall } from "@calcom/ee/workflows/lib/reminders/aiPhoneCallManager";
import { deleteScheduledEmailReminder } from "@calcom/ee/workflows/lib/reminders/emailReminderManager";
import { deleteScheduledSMSReminder } from "@calcom/ee/workflows/lib/reminders/smsReminderManager";
+import type { WorkflowListType as WorkflowType } from "@calcom/ee/workflows/lib/types";
import type { WorkflowStep } from "@calcom/ee/workflows/lib/types";
import { hasFilter } from "@calcom/features/filters/lib/hasFilter";
import { HttpError } from "@calcom/lib/http-error";
diff --git a/packages/features/eventtypes/components/EventTypeLayout.tsx b/packages/features/eventtypes/components/EventTypeLayout.tsx
index 82d6e025349..a6d67cb47f8 100644
--- a/packages/features/eventtypes/components/EventTypeLayout.tsx
+++ b/packages/features/eventtypes/components/EventTypeLayout.tsx
@@ -5,7 +5,6 @@ import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hook
import { EventTypeEmbedButton, EventTypeEmbedDialog } from "@calcom/features/embed/EventTypeEmbed";
import type { FormValues } from "@calcom/features/eventtypes/lib/types";
import type { EventTypeSetupProps } from "@calcom/features/eventtypes/lib/types";
-import WebShell from "@calcom/features/shell/Shell";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { SchedulingType } from "@calcom/prisma/enums";
import classNames from "@calcom/ui/classNames";
@@ -28,6 +27,7 @@ import type { VerticalTabItemProps } from "@calcom/ui/components/navigation";
import { Skeleton } from "@calcom/ui/components/skeleton";
import { showToast } from "@calcom/ui/components/toast";
import { Tooltip } from "@calcom/ui/components/tooltip";
+import WebShell from "@calcom/web/modules/shell/Shell";
import { Shell as PlatformShell } from "../../../platform/atoms/src/components/ui/shell";
import { DeleteDialog } from "./dialogs/DeleteDialog";
@@ -276,11 +276,12 @@ function EventTypeSingleLayout({
</Button>
</div>
}>
- <Suspense fallback={
- <div className="flex h-64 items-center justify-center">
- <Icon name="loader" className="h-5 w-5 animate-spin" />
- </div>
- }>
+ <Suspense
+ fallback={
+ <div className="flex h-64 items-center justify-center">
+ <Icon name="loader" className="h-5 w-5 animate-spin" />
+ </div>
+ }>
<div className="flex flex-col xl:flex-row xl:space-x-6">
<div className="hidden xl:block">
<VerticalTabs
diff --git a/packages/features/eventtypes/components/__tests__/AddMembersWithSwitch.test.tsx b/packages/features/eventtypes/components/__tests__/AddMembersWithSwitch.test.tsx
index 80dcb19032c..981d8085ddf 100644
--- a/packages/features/eventtypes/components/__tests__/AddMembersWithSwitch.test.tsx
+++ b/packages/features/eventtypes/components/__tests__/AddMembersWithSwitch.test.tsx
@@ -39,7 +39,7 @@ const mockTeamMembers: TeamMember[] = [
];
// Mock trpc
-vi.mock("@calcom/trpc", () => ({
+vi.mock("@calcom/trpc/react", () => ({
trpc: {
useUtils: () => ({
viewer: {
diff --git a/packages/features/eventtypes/components/index.ts b/packages/features/eventtypes/components/index.ts
index b777134e838..060c579d70b 100644
--- a/packages/features/eventtypes/components/index.ts
+++ b/packages/features/eventtypes/components/index.ts
@@ -1,7 +1,6 @@
import dynamic from "next/dynamic";
export { default as CheckedTeamSelect } from "./CheckedTeamSelect";
-export { CreateEventTypeDialog } from "./CreateEventTypeDialog";
export { default as EventTypeDescription } from "./EventTypeDescription";
export { LearnMoreLink } from "./LearnMoreLink";
export { MultiplePrivateLinksController } from "./MultiplePrivateLinksController";
diff --git a/packages/features/pbac/lib/team-member-permissions.ts b/packages/features/pbac/lib/team-member-permissions.ts
index ad27cdf2766..11baf62bd14 100644
--- a/packages/features/pbac/lib/team-member-permissions.ts
+++ b/packages/features/pbac/lib/team-member-permissions.ts
@@ -1,5 +1,5 @@
-import type { MemberPermissions } from "@calcom/features/users/components/UserTable/types";
import { MembershipRole } from "@calcom/prisma/enums";
+import type { MemberPermissions } from "@calcom/web/modules/users/components/UserTable/types";
import { Resource, CustomAction } from "../domain/types/permission-registry";
import { getSpecificPermissions } from "./resource-permissions";
diff --git a/packages/features/tips/index.ts b/packages/features/tips/index.ts
deleted file mode 100644
index f981162890d..00000000000
--- a/packages/features/tips/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as Tips } from "./Tips";
-export { UpgradeTip } from "./UpgradeTip";
diff --git a/packages/features/users/lib/UserListTableUtils.ts b/packages/features/users/lib/UserListTableUtils.ts
index 3fed627466b..27cc0f43965 100644
--- a/packages/features/users/lib/UserListTableUtils.ts
+++ b/packages/features/users/lib/UserListTableUtils.ts
@@ -1,7 +1,7 @@
import type { Table } from "@tanstack/react-table";
-import type { UserTableUser } from "@calcom/features/users/components/UserTable/types";
import { sanitizeValue } from "@calcom/lib/csvUtils";
+import type { UserTableUser } from "@calcom/web/modules/users/components/UserTable/types";
export const generateHeaderFromReactTable = (table: Table<UserTableUser>): string[] | null => {
const headerGroups = table.getHeaderGroups();
diff --git a/packages/platform/atoms/availability/AvailabilitySettings.tsx b/packages/platform/atoms/availability/AvailabilitySettings.tsx
index d867001818a..e561b0a1a29 100644
--- a/packages/platform/atoms/availability/AvailabilitySettings.tsx
+++ b/packages/platform/atoms/availability/AvailabilitySettings.tsx
@@ -26,7 +26,6 @@ import DateOverrideList from "@calcom/features/schedules/components/DateOverride
import WebSchedule, {
ScheduleComponent as PlatformSchedule,
} from "@calcom/features/schedules/components/Schedule";
-import WebShell from "@calcom/features/shell/Shell";
import { availabilityAsString } from "@calcom/lib/availability";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { sortAvailabilityStrings } from "@calcom/lib/weekstart";
@@ -43,6 +42,7 @@ import { Switch } from "@calcom/ui/components/form";
import { Icon } from "@calcom/ui/components/icon";
import { SkeletonText, SelectSkeletonLoader, Skeleton } from "@calcom/ui/components/skeleton";
import { Tooltip } from "@calcom/ui/components/tooltip";
+import WebShell from "@calcom/web/modules/shell/Shell";
import { Shell as PlatformShell } from "../src/components/ui/shell";
import { cn } from "../src/lib/utils";
diff --git a/packages/platform/atoms/event-types/wrappers/CreateEventTypePlatformWrapper.tsx b/packages/platform/atoms/event-types/wrappers/CreateEventTypePlatformWrapper.tsx
index 2dcd2f6376d..51f550043c7 100644
--- a/packages/platform/atoms/event-types/wrappers/CreateEventTypePlatformWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/CreateEventTypePlatformWrapper.tsx
@@ -1,11 +1,11 @@
import { AtomsWrapper } from "@/components/atoms-wrapper";
-import { TeamEventTypeForm } from "@calcom/features/ee/teams/components/TeamEventTypeForm";
import CreateEventTypeForm from "@calcom/features/eventtypes/components/CreateEventTypeForm";
import { useCreateEventTypeForm } from "@calcom/features/eventtypes/hooks/useCreateEventType";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { EventType } from "@calcom/prisma/client";
import { Button } from "@calcom/ui/components/button";
+import { TeamEventTypeForm } from "@calcom/web/modules/ee/teams/components/TeamEventTypeForm";
import { useCreateEventType } from "../../hooks/event-types/private/useCreateEventType";
import { useCreateTeamEventType } from "../../hooks/event-types/private/useCreateTeamEventType";
diff --git a/packages/platform/atoms/event-types/wrappers/EventAdvancedPlatformWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventAdvancedPlatformWrapper.tsx
index 3968da73971..b292cbfeb79 100644
--- a/packages/platform/atoms/event-types/wrappers/EventAdvancedPlatformWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/EventAdvancedPlatformWrapper.tsx
@@ -1,5 +1,5 @@
-import type { EventAdvancedBaseProps } from "@calcom/features/eventtypes/components/tabs/advanced/EventAdvancedTab";
-import { EventAdvancedTab } from "@calcom/features/eventtypes/components/tabs/advanced/EventAdvancedTab";
+import type { EventAdvancedBaseProps } from "@calcom/web/modules/event-types/components/tabs/advanced/EventAdvancedTab";
+import { EventAdvancedTab } from "@calcom/web/modules/event-types/components/tabs/advanced/EventAdvancedTab";
import { useConnectedCalendars } from "../../hooks/useConnectedCalendars";
import { useGetVerifiedEmails } from "../hooks/useGetVerifiedEmails";
diff --git a/packages/platform/atoms/event-types/wrappers/EventAdvancedWebWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventAdvancedWebWrapper.tsx
index e262bcdf597..99b51bfad3c 100644
--- a/packages/platform/atoms/event-types/wrappers/EventAdvancedWebWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/EventAdvancedWebWrapper.tsx
@@ -1,7 +1,7 @@
-import type { EventAdvancedBaseProps } from "@calcom/features/eventtypes/components/tabs/advanced/EventAdvancedTab";
-import { EventAdvancedTab } from "@calcom/features/eventtypes/components/tabs/advanced/EventAdvancedTab";
import { localeOptions } from "@calcom/lib/i18n";
import { trpc } from "@calcom/trpc/react";
+import type { EventAdvancedBaseProps } from "@calcom/web/modules/event-types/components/tabs/advanced/EventAdvancedTab";
+import { EventAdvancedTab } from "@calcom/web/modules/event-types/components/tabs/advanced/EventAdvancedTab";
const EventAdvancedWebWrapper = ({ ...props }: EventAdvancedBaseProps) => {
const connectedCalendarsQuery = trpc.viewer.calendars.connectedCalendars.useQuery();
diff --git a/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabPlatformWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabPlatformWrapper.tsx
index dd2098bdb34..e5066c1c8f9 100644
--- a/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabPlatformWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabPlatformWrapper.tsx
@@ -1,10 +1,10 @@
import { useFormContext } from "react-hook-form";
-import type { EventAvailabilityTabCustomClassNames } from "@calcom/features/eventtypes/components/tabs/availability/EventAvailabilityTab";
-import { EventAvailabilityTab } from "@calcom/features/eventtypes/components/tabs/availability/EventAvailabilityTab";
-import type { ScheduleQueryData } from "@calcom/features/eventtypes/components/tabs/availability/EventAvailabilityTab";
import type { EventTypeSetup, FormValues } from "@calcom/features/eventtypes/lib/types";
import type { User } from "@calcom/prisma/client";
+import type { EventAvailabilityTabCustomClassNames } from "@calcom/web/modules/event-types/components/tabs/availability/EventAvailabilityTab";
+import { EventAvailabilityTab } from "@calcom/web/modules/event-types/components/tabs/availability/EventAvailabilityTab";
+import type { ScheduleQueryData } from "@calcom/web/modules/event-types/components/tabs/availability/EventAvailabilityTab";
import { useAtomSchedule } from "../../hooks/schedules/useAtomSchedule";
import { useSchedules } from "../../hooks/schedules/useSchedules";
diff --git a/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabWebWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabWebWrapper.tsx
index 2880680abc3..56d215a90b9 100644
--- a/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabWebWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabWebWrapper.tsx
@@ -2,11 +2,11 @@ import { useFormContext } from "react-hook-form";
import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
import type { TeamMembers } from "@calcom/features/eventtypes/components/EventType";
-import { EventAvailabilityTab } from "@calcom/features/eventtypes/components/tabs/availability/EventAvailabilityTab";
import type { EventTypeSetup, FormValues } from "@calcom/features/eventtypes/lib/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
+import { EventAvailabilityTab } from "@calcom/web/modules/event-types/components/tabs/availability/EventAvailabilityTab";
export type EventAvailabilityTabWebWrapperProps = {
eventType: EventTypeSetup;
diff --git a/packages/platform/atoms/event-types/wrappers/EventLimitsTabPlatformWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventLimitsTabPlatformWrapper.tsx
index 940333ebc3e..5bedadeda94 100644
--- a/packages/platform/atoms/event-types/wrappers/EventLimitsTabPlatformWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/EventLimitsTabPlatformWrapper.tsx
@@ -1,5 +1,5 @@
-import { EventLimitsTab } from "@calcom/features/eventtypes/components/tabs/limits/EventLimitsTab";
-import type { EventLimitsTabProps } from "@calcom/features/eventtypes/components/tabs/limits/EventLimitsTab";
+import { EventLimitsTab } from "@calcom/web/modules/event-types/components/tabs/limits/EventLimitsTab";
+import type { EventLimitsTabProps } from "@calcom/web/modules/event-types/components/tabs/limits/EventLimitsTab";
const EventLimitsTabPlatformWrapper = (props: EventLimitsTabProps) => {
return <EventLimitsTab {...props} />;
diff --git a/packages/platform/atoms/event-types/wrappers/EventLimitsTabWebWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventLimitsTabWebWrapper.tsx
index 70607aeb38f..91f9ee42716 100644
--- a/packages/platform/atoms/event-types/wrappers/EventLimitsTabWebWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/EventLimitsTabWebWrapper.tsx
@@ -1,5 +1,5 @@
-import { EventLimitsTab } from "@calcom/features/eventtypes/components/tabs/limits/EventLimitsTab";
-import type { EventLimitsTabProps } from "@calcom/features/eventtypes/components/tabs/limits/EventLimitsTab";
+import { EventLimitsTab } from "@calcom/web/modules/event-types/components/tabs/limits/EventLimitsTab";
+import type { EventLimitsTabProps } from "@calcom/web/modules/event-types/components/tabs/limits/EventLimitsTab";
const EventLimitsTabWebWrapper = (props: EventLimitsTabProps) => {
return <EventLimitsTab {...props} />;
diff --git a/packages/platform/atoms/event-types/wrappers/EventRecurringTabPlatformWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventRecurringTabPlatformWrapper.tsx
index d14f94dd03c..c9f4a73576c 100644
--- a/packages/platform/atoms/event-types/wrappers/EventRecurringTabPlatformWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/EventRecurringTabPlatformWrapper.tsx
@@ -1,5 +1,5 @@
-import type { EventRecurringTabProps } from "@calcom/features/eventtypes/components/tabs/recurring/EventRecurringTab";
-import { EventRecurringTab } from "@calcom/features/eventtypes/components/tabs/recurring/EventRecurringTab";
+import type { EventRecurringTabProps } from "@calcom/web/modules/event-types/components/tabs/recurring/EventRecurringTab";
+import { EventRecurringTab } from "@calcom/web/modules/event-types/components/tabs/recurring/EventRecurringTab";
const EventRecurringTabPlatformWrapper = (props: EventRecurringTabProps) => {
return <EventRecurringTab {...props} />;
diff --git a/packages/platform/atoms/event-types/wrappers/EventRecurringWebWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventRecurringWebWrapper.tsx
index 846fa748694..37f3c286334 100644
--- a/packages/platform/atoms/event-types/wrappers/EventRecurringWebWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/EventRecurringWebWrapper.tsx
@@ -1,5 +1,5 @@
-import type { EventRecurringTabProps } from "@calcom/features/eventtypes/components/tabs/recurring/EventRecurringTab";
-import { EventRecurringTab } from "@calcom/features/eventtypes/components/tabs/recurring/EventRecurringTab";
+import type { EventRecurringTabProps } from "@calcom/web/modules/event-types/components/tabs/recurring/EventRecurringTab";
+import { EventRecurringTab } from "@calcom/web/modules/event-types/components/tabs/recurring/EventRecurringTab";
const EventRecurringWebWrapper = (props: EventRecurringTabProps) => {
return <EventRecurringTab {...props} />;
diff --git a/packages/platform/atoms/event-types/wrappers/EventSetupTabPlatformWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventSetupTabPlatformWrapper.tsx
index e15b1964961..795ab7aef1e 100644
--- a/packages/platform/atoms/event-types/wrappers/EventSetupTabPlatformWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/EventSetupTabPlatformWrapper.tsx
@@ -1,7 +1,7 @@
import React from "react";
-import type { EventSetupTabProps } from "@calcom/features/eventtypes/components/tabs/setup/EventSetupTab";
-import { EventSetupTab } from "@calcom/features/eventtypes/components/tabs/setup/EventSetupTab";
+import type { EventSetupTabProps } from "@calcom/web/modules/event-types/components/tabs/setup/EventSetupTab";
+import { EventSetupTab } from "@calcom/web/modules/event-types/components/tabs/setup/EventSetupTab";
const EventSetupTabPlatformWrapper = (props: EventSetupTabProps) => {
return <EventSetupTab {...props} urlPrefix="" hasOrgBranding={false} />;
diff --git a/packages/platform/atoms/event-types/wrappers/EventSetupTabWebWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventSetupTabWebWrapper.tsx
index fb9452a7134..26b507d333d 100644
--- a/packages/platform/atoms/event-types/wrappers/EventSetupTabWebWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/EventSetupTabWebWrapper.tsx
@@ -1,10 +1,10 @@
import { useSession } from "next-auth/react";
import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
-import type { EventSetupTabProps } from "@calcom/features/eventtypes/components/tabs/setup/EventSetupTab";
-import { EventSetupTab } from "@calcom/features/eventtypes/components/tabs/setup/EventSetupTab";
import { WEBSITE_URL } from "@calcom/lib/constants";
import { localeOptions } from "@calcom/lib/i18n";
+import type { EventSetupTabProps } from "@calcom/web/modules/event-types/components/tabs/setup/EventSetupTab";
+import { EventSetupTab } from "@calcom/web/modules/event-types/components/tabs/setup/EventSetupTab";
const EventSetupTabWebWrapper = (props: EventSetupTabProps) => {
const orgBranding = useOrgBranding();
diff --git a/packages/platform/atoms/event-types/wrappers/EventTeamAssignmentTabPlatformWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventTeamAssignmentTabPlatformWrapper.tsx
index 887cb6f6fcb..c7c08aa6f1b 100644
--- a/packages/platform/atoms/event-types/wrappers/EventTeamAssignmentTabPlatformWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/EventTeamAssignmentTabPlatformWrapper.tsx
@@ -1,7 +1,7 @@
import {
EventTeamAssignmentTab,
type EventTeamAssignmentTabBaseProps,
-} from "@calcom/features/eventtypes/components/tabs/assignment/EventTeamAssignmentTab";
+} from "@calcom/web/modules/event-types/components/tabs/assignment/EventTeamAssignmentTab";
const EventTeamAssignmentTabPlatformWrapper = (
props: Omit<EventTeamAssignmentTabBaseProps, "isSegmentApplicable">
diff --git a/packages/platform/atoms/event-types/wrappers/EventTeamAssignmentTabWebWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventTeamAssignmentTabWebWrapper.tsx
index 5ce33984fbc..e28d863979c 100644
--- a/packages/platform/atoms/event-types/wrappers/EventTeamAssignmentTabWebWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/EventTeamAssignmentTabWebWrapper.tsx
@@ -1,7 +1,7 @@
import {
EventTeamAssignmentTab,
type EventTeamAssignmentTabBaseProps,
-} from "@calcom/features/eventtypes/components/tabs/assignment/EventTeamAssignmentTab";
+} from "@calcom/web/modules/event-types/components/tabs/assignment/EventTeamAssignmentTab";
const EventTeamAssignmentTabWebWrapper = (
props: Omit<EventTeamAssignmentTabBaseProps, "isSegmentApplicable">
diff --git a/packages/platform/atoms/event-types/wrappers/EventTypePlatformWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventTypePlatformWrapper.tsx
index fc9fa644383..0667ff14137 100644
--- a/packages/platform/atoms/event-types/wrappers/EventTypePlatformWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/EventTypePlatformWrapper.tsx
@@ -7,12 +7,6 @@ import { BookerStoreProvider } from "@calcom/features/bookings/Booker/BookerStor
import type { ChildrenEventType } from "@calcom/features/eventtypes/components/ChildrenEventTypeSelect";
import { EventType as EventTypeComponent } from "@calcom/features/eventtypes/components/EventType";
import ManagedEventTypeDialog from "@calcom/features/eventtypes/components/dialogs/ManagedEventDialog";
-import type { EventAdvancedTabCustomClassNames } from "@calcom/features/eventtypes/components/tabs/advanced/EventAdvancedTab";
-import type { EventTeamAssignmentTabCustomClassNames } from "@calcom/features/eventtypes/components/tabs/assignment/EventTeamAssignmentTab";
-import type { EventAvailabilityTabCustomClassNames } from "@calcom/features/eventtypes/components/tabs/availability/EventAvailabilityTab";
-import type { EventLimitsTabCustomClassNames } from "@calcom/features/eventtypes/components/tabs/limits/EventLimitsTab";
-import type { EventRecurringTabCustomClassNames } from "@calcom/features/eventtypes/components/tabs/recurring/RecurringEventController";
-import type { EventSetupTabCustomClassNames } from "@calcom/features/eventtypes/components/tabs/setup/EventSetupTab";
import type {
EventTypeSetupProps,
FormValues,
@@ -20,6 +14,12 @@ import type {
} from "@calcom/features/eventtypes/lib/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { SchedulingType } from "@calcom/prisma/enums";
+import type { EventAdvancedTabCustomClassNames } from "@calcom/web/modules/event-types/components/tabs/advanced/EventAdvancedTab";
+import type { EventTeamAssignmentTabCustomClassNames } from "@calcom/web/modules/event-types/components/tabs/assignment/EventTeamAssignmentTab";
+import type { EventAvailabilityTabCustomClassNames } from "@calcom/web/modules/event-types/components/tabs/availability/EventAvailabilityTab";
+import type { EventLimitsTabCustomClassNames } from "@calcom/web/modules/event-types/components/tabs/limits/EventLimitsTab";
+import type { EventRecurringTabCustomClassNames } from "@calcom/web/modules/event-types/components/tabs/recurring/RecurringEventController";
+import type { EventSetupTabCustomClassNames } from "@calcom/web/modules/event-types/components/tabs/setup/EventSetupTab";
import { useDeleteEventTypeById } from "../../hooks/event-types/private/useDeleteEventTypeById";
import { useDeleteTeamEventTypeById } from "../../hooks/event-types/private/useDeleteTeamEventTypeById";
diff --git a/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx
index 2c95bfa5f7e..b02403ae1c7 100644
--- a/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx
@@ -52,7 +52,8 @@ const AssignmentWarningDialog = dynamic(
() => import("@calcom/features/eventtypes/components/dialogs/AssignmentWarningDialog")
);
-const EventSetupTab = dynamic(() =>
+const EventSetupTab = dynamic(
+ () =>
// import web wrapper when it's ready
import("./EventSetupTabWebWrapper").then((mod) => mod),
{ loading: () => null }
@@ -76,7 +77,7 @@ const EventAdvancedTab = dynamic(() =>
);
const EventInstantTab = dynamic(() =>
- import("@calcom/features/eventtypes/components/tabs/instant/EventInstantTab").then(
+ import("@calcom/web/modules/event-types/components/tabs/instant/EventInstantTab").then(
(mod) => mod.EventInstantTab
)
);
@@ -87,21 +88,21 @@ const EventRecurringTab = dynamic(() =>
);
const EventAppsTab = dynamic(() =>
- import("@calcom/features/eventtypes/components/tabs/apps/EventAppsTab").then((mod) => mod.EventAppsTab)
+ import("@calcom/web/modules/event-types/components/tabs/apps/EventAppsTab").then((mod) => mod.EventAppsTab)
);
const EventWorkflowsTab = dynamic(
- () => import("@calcom/features/eventtypes/components/tabs/workflows/EventWorkfowsTab")
+ () => import("@calcom/web/modules/event-types/components/tabs/workflows/EventWorkflowsTab")
);
const EventWebhooksTab = dynamic(() =>
- import("@calcom/features/eventtypes/components/tabs/webhooks/EventWebhooksTab").then(
+ import("@calcom/web/modules/event-types/components/tabs/webhooks/EventWebhooksTab").then(
(mod) => mod.EventWebhooksTab
)
);
const EventAITab = dynamic(() =>
- import("@calcom/features/eventtypes/components/tabs/ai/EventAITab").then((mod) => mod.EventAITab)
+ import("@calcom/web/modules/event-types/components/tabs/ai/EventAITab").then((mod) => mod.EventAITab)
);
export type EventTypeWebWrapperProps = {
diff --git a/packages/platform/atoms/src/components/ui/shell.tsx b/packages/platform/atoms/src/components/ui/shell.tsx
index d65dfa17c9b..601952a25f0 100644
--- a/packages/platform/atoms/src/components/ui/shell.tsx
+++ b/packages/platform/atoms/src/components/ui/shell.tsx
@@ -1,4 +1,4 @@
-import type { LayoutProps } from "@calcom/features/shell/Shell";
+import type { LayoutProps } from "@calcom/web/modules/shell/Shell";
import { cn } from "../../lib/utils";
diff --git a/packages/platform/atoms/tsconfig.json b/packages/platform/atoms/tsconfig.json
index f7cc9faa79d..2f5bd6c8c0b 100644
--- a/packages/platform/atoms/tsconfig.json
+++ b/packages/platform/atoms/tsconfig.json
@@ -53,7 +53,6 @@
"../../features/ee/payments",
"../../features/ee/round-robin",
"../../features/ee/billing",
- "../../features/shell",
"../../features/components",
"../../features/form-builder",
"../../features/data-table",
diff --git a/packages/trpc/server/routers/viewer/aiVoiceAgent/updateInboundAgentEventType.handler.ts b/packages/trpc/server/routers/viewer/aiVoiceAgent/updateInboundAgentEventType.handler.ts
index fe7013f98e8..19ed9a9b5da 100644
--- a/packages/trpc/server/routers/viewer/aiVoiceAgent/updateInboundAgentEventType.handler.ts
+++ b/packages/trpc/server/routers/viewer/aiVoiceAgent/updateInboundAgentEventType.handler.ts
@@ -1,6 +1,6 @@
import { createDefaultAIPhoneServiceProvider } from "@calcom/features/calAIPhone";
+import { replaceEventTypePlaceholders } from "@calcom/features/calAIPhone/providers/retellAI/utils/promptUtils";
import { PrismaAgentRepository } from "@calcom/features/calAIPhone/repositories/PrismaAgentRepository";
-import { replaceEventTypePlaceholders } from "@calcom/features/ee/workflows/components/agent-configuration/utils/promptUtils";
import logger from "@calcom/lib/logger";
import prisma from "@calcom/prisma";
diff --git a/packages/ui/components/badge/UpgradeTeamsBadge.tsx b/packages/ui/components/badge/UpgradeTeamsBadge.tsx
index eda2742d2e0..2abe038ad2c 100644
--- a/packages/ui/components/badge/UpgradeTeamsBadge.tsx
+++ b/packages/ui/components/badge/UpgradeTeamsBadge.tsx
@@ -1,19 +1,24 @@
import Link from "next/link";
-import { useHasPaidPlan, useHasActiveTeamPlan } from "@calcom/features/billing/hooks/useHasPaidPlan";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { Tooltip } from "../tooltip";
import { Badge } from "./Badge";
+export type UpgradeTeamsBadgeProps = {
+ checkForActiveStatus?: boolean;
+ hasPaidPlan?: boolean;
+ hasActiveTeamPlan?: boolean;
+ isTrial?: boolean;
+};
+
export const UpgradeTeamsBadge = function UpgradeTeamsBadge({
checkForActiveStatus,
-}: {
- checkForActiveStatus?: boolean;
-}) {
+ hasPaidPlan = false,
+ hasActiveTeamPlan = false,
+ isTrial = false,
+}: UpgradeTeamsBadgeProps) {
const { t } = useLocale();
- const { hasPaidPlan } = useHasPaidPlan();
- const { hasActiveTeamPlan, isTrial } = useHasActiveTeamPlan();
if (hasPaidPlan) {
if (!checkForActiveStatus || hasActiveTeamPlan) return null;
diff --git a/packages/ui/components/form/select/components.tsx b/packages/ui/components/form/select/components.tsx
index 4afb76c8231..8c82c1f0abc 100644
--- a/packages/ui/components/form/select/components.tsx
+++ b/packages/ui/components/form/select/components.tsx
@@ -35,6 +35,11 @@ type ExtendedOption = {
isCalAi?: boolean;
creditsTeamId?: number;
isOrganization?: boolean;
+ upgradeTeamsBadgeProps?: {
+ hasPaidPlan?: boolean;
+ hasActiveTeamPlan?: boolean;
+ isTrial?: boolean;
+ };
};
export const OptionComponent = <
@@ -59,7 +64,10 @@ export const OptionComponent = <
{props.label || <>&nbsp;</>}
</span>
{(props.data as unknown as ExtendedOption).needsTeamsUpgrade ? (
- <UpgradeTeamsBadge checkForActiveStatus={true} />
+ <UpgradeTeamsBadge
+ checkForActiveStatus={true}
+ {...(props.data as unknown as ExtendedOption).upgradeTeamsBadgeProps}
+ />
) : (props.data as unknown as ExtendedOption).needsCredits ? (
<CreditsBadge
teamId={(props.data as unknown as ExtendedOption).creditsTeamId}