- {isInvitee && (
+ {isInvitee ? (
<>
@@ -133,25 +134,26 @@ export default function TeamListItem(props: Props) {
- )}
- {!isInvitee && (
+ ) : (
-
- {
- navigator.clipboard.writeText(
- process.env.NEXT_PUBLIC_WEBSITE_URL + "/team/" + team.slug
- );
- showToast(t("link_copied"), "success");
- }}
- size="icon"
- StartIcon={Icon.FiLink}
- combined
- />
-
+ {team.slug && (
+
+ {
+ navigator.clipboard.writeText(
+ process.env.NEXT_PUBLIC_WEBSITE_URL + "/team/" + team.slug
+ );
+ showToast(t("link_copied"), "success");
+ }}
+ size="icon"
+ StartIcon={Icon.FiLink}
+ combined
+ />
+
+ )}
-
- {t("preview_team") as string}
-
-
+ {!team.slug &&
+
+ {t("preview_team") as string}
+
+
+ )}
@@ -241,3 +246,29 @@ export default function TeamListItem(props: Props) {
);
}
+
+const TeamPublishButton = ({ teamId }: { teamId: number }) => {
+ const { t } = useLocale();
+ const router = useRouter();
+ const publishTeamMutation = trpc.useMutation("viewer.teams.publish", {
+ onSuccess(data) {
+ router.push(data.url);
+ },
+ onError: (error) => {
+ showToast(error.message, "error");
+ },
+ });
+
+ return (
+
+ {
+ publishTeamMutation.mutate({ teamId });
+ }}
+ StartIcon={Icon.FiGlobe}>
+ {t("team_publish")}
+
+
+ );
+};
diff --git a/packages/features/ee/teams/components/TeamsListing.tsx b/packages/features/ee/teams/components/TeamsListing.tsx
new file mode 100644
index 0000000000..007fbc30a1
--- /dev/null
+++ b/packages/features/ee/teams/components/TeamsListing.tsx
@@ -0,0 +1,52 @@
+import { useState } from "react";
+
+import { WEBAPP_URL } from "@calcom/lib/constants";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { trpc } from "@calcom/trpc/react";
+import { Icon } from "@calcom/ui/Icon";
+import { Button } from "@calcom/ui/components/button";
+import { Alert } from "@calcom/ui/v2/core/Alert";
+import EmptyScreen from "@calcom/ui/v2/core/EmptyScreen";
+
+import SkeletonLoaderTeamList from "./SkeletonloaderTeamList";
+import TeamList from "./TeamList";
+
+export function TeamsListing() {
+ const { t } = useLocale();
+ const [errorMessage, setErrorMessage] = useState("");
+
+ const { data, isLoading } = trpc.useQuery(["viewer.teams.list"], {
+ onError: (e) => {
+ setErrorMessage(e.message);
+ },
+ });
+
+ const teams = data?.filter((m) => m.accepted) || [];
+ const invites = data?.filter((m) => !m.accepted) || [];
+
+ return (
+ <>
+ {!!errorMessage &&
+
{t("open_invitations")}
+
+ {t("create_team")}
+
+ }
+ />
+ )}
+ {teams.length > 0 && (null);
- const utils = trpc.useContext();
- const { data } = trpc.useQuery(["viewer.teams.getTeamSeats", { teamId: props.teamId }], {
- onError: (err) => {
- setErrorMessage(err.message);
- },
- });
- const mutation = trpc.useMutation(["viewer.teams.upgradeTeam"], {
- onSuccess: (data) => {
- // if the user does not already have a Stripe subscription, this wi
- if (data?.url) {
- window.location.href = data.url;
- }
- if (data?.success) {
- utils.invalidateQueries(["viewer.teams.get"]);
- showToast(t("team_upgraded_successfully"), "success");
- }
- },
- onError: (err) => {
- setErrorMessage(err.message);
- },
- });
-
- function upgrade() {
- setErrorMessage(null);
- mutation.mutate({ teamId: props.teamId });
- }
-
- return (
-
-
- Upgrade Now
-
- upgrade()}>
- {t("changed_team_billing_info")}test
- {data && (
-
- {t("team_upgrade_seats_details", {
- memberCount: data.totalMembers,
- unpaidCount: data.missingSeats,
- seatPrice: 12,
- totalCost: (data.totalMembers - data.freeSeats) * 12 + 12,
- })}
-
- )}
- {errorMessage && (
-
-
- );
-}
diff --git a/packages/features/ee/teams/components/index.ts b/packages/features/ee/teams/components/index.ts
new file mode 100644
index 0000000000..cf5f5dcf68
--- /dev/null
+++ b/packages/features/ee/teams/components/index.ts
@@ -0,0 +1,2 @@
+export { CreateANewTeamForm } from "./CreateANewTeamForm";
+export { TeamsListing } from "./TeamsListing";
diff --git a/packages/features/ee/teams/components/v2/AddNewTeamMembers.tsx b/packages/features/ee/teams/components/v2/AddNewTeamMembers.tsx
deleted file mode 100644
index ae4387137e..0000000000
--- a/packages/features/ee/teams/components/v2/AddNewTeamMembers.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import { Suspense, useState } from "react";
-
-import MemberInvitationModal from "@calcom/features/ee/teams/components/MemberInvitationModal";
-import { classNames } from "@calcom/lib";
-import { WEBAPP_URL } from "@calcom/lib/constants";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { trpc } from "@calcom/trpc/react";
-import { Icon } from "@calcom/ui";
-import { Avatar } from "@calcom/ui/components/avatar";
-import { Badge } from "@calcom/ui/components/badge";
-import { Button } from "@calcom/ui/components/button";
-import { SkeletonContainer, SkeletonText } from "@calcom/ui/v2/core/skeleton";
-
-const AddNewTeamMemberSkeleton = () => {
- return (
-
-
-
- );
-};
-
-const AddNewTeamMembers = (props: { teamId: number }) => {
- const { t } = useLocale();
- const utils = trpc.useContext();
-
- const { data: team, isLoading } = trpc.useQuery(["viewer.teams.get", { teamId: props.teamId }]);
- const removeMemberMutation = trpc.useMutation("viewer.teams.removeMember", {
- onSuccess() {
- utils.invalidateQueries(["viewer.teams.get", { teamId: props.teamId }]);
- utils.invalidateQueries(["viewer.teams.list"]);
- },
- });
-
- const [memberInviteModal, setMemberInviteModal] = useState(false);
-
- if (isLoading) return
- {team?.members.map((member, index) => (
-
-
-
-
-
-
{member?.name || t("team_member")}
- {/* Assume that the first member of the team is the creator */}
- {index === 0 &&
{t("you")} }
- {!member.accepted &&
{t("pending")} }
- {member.role === "MEMBER" &&
{t("member")} }
- {member.role === "ADMIN" &&
{t("admin")} }
-
- {member.username ? (
-
{`${WEBAPP_URL}/${member?.username}`}
- ) : (
-
{t("not_on_cal")}
- )}
-
-
removeMemberMutation.mutate({ teamId: props.teamId, memberId: member.id })}
- />
- )}
-
- ))}
-
-
- setMemberInviteModal(true)}
- className="mt-6 w-full justify-center">
- {t("add_team_member")}
-
-
-
- {team && (
- setMemberInviteModal(false)}
- team={team}
- currentMember={team?.membership.role}
- />
- )}
-
-
- {t("finish")}
-
-
-
- );
-};
-
-export default AddNewTeamMembers;
diff --git a/packages/features/ee/teams/components/v2/CreateNewTeam.tsx b/packages/features/ee/teams/components/v2/CreateNewTeam.tsx
deleted file mode 100644
index c3f2c781d2..0000000000
--- a/packages/features/ee/teams/components/v2/CreateNewTeam.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import { useForm, Controller } from "react-hook-form";
-
-import { WEBAPP_URL } from "@calcom/lib/constants";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import slugify from "@calcom/lib/slugify";
-import { trpc } from "@calcom/trpc/react";
-import { Icon } from "@calcom/ui";
-import { Button, Avatar } from "@calcom/ui/components";
-import { Form, TextField } from "@calcom/ui/components/form";
-import ImageUploader from "@calcom/ui/v2/core/ImageUploader";
-
-const CreateANewTeamForm = (props: { nextStep: () => void; setTeamId: (teamId: number) => void }) => {
- const { t } = useLocale();
- const utils = trpc.useContext();
-
- const createTeamMutation = trpc.useMutation("viewer.teams.create", {
- onSuccess(data) {
- utils.invalidateQueries(["viewer.teams.list"]);
- props.setTeamId(data.id);
- props.nextStep();
- },
- });
-
- const formMethods = useForm();
-
- return (
-
- );
-};
-
-export default CreateANewTeamForm;
diff --git a/packages/features/ee/teams/lib/payments.ts b/packages/features/ee/teams/lib/payments.ts
new file mode 100644
index 0000000000..0d915a35ba
--- /dev/null
+++ b/packages/features/ee/teams/lib/payments.ts
@@ -0,0 +1,52 @@
+import { getStripeCustomerIdFromUserId } from "@calcom/app-store/stripepayment/lib/customer";
+import stripe from "@calcom/app-store/stripepayment/lib/server";
+import { WEBAPP_URL } from "@calcom/lib/constants";
+import prisma from "@calcom/prisma";
+import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
+
+export const purchaseTeamSubscription = async (input: { teamId: number; seats: number; userId: number }) => {
+ const { teamId, seats, userId } = input;
+ const customer = await getStripeCustomerIdFromUserId(userId);
+ return await stripe.checkout.sessions.create({
+ customer,
+ mode: "subscription",
+ success_url: `${WEBAPP_URL}/api/teams/${teamId}/upgrade?session_id={CHECKOUT_SESSION_ID}`,
+ cancel_url: `${WEBAPP_URL}/settings/profile`,
+ locale: "en",
+ line_items: [
+ {
+ /** We only need to set the base price and we can upsell it directly on Stripe's checkout */
+ price: process.env.STRIPE_TEAM_MONTHLY_PRICE_ID,
+ quantity: seats,
+ },
+ ],
+ metadata: {
+ teamId,
+ },
+ payment_method_types: ["card"],
+ subscription_data: {
+ metadata: {
+ teamId,
+ },
+ },
+ });
+};
+
+export const cancelTeamSubscriptionFromStripe = async (teamId: number) => {
+ try {
+ const team = await prisma.team.findUniqueOrThrow({
+ where: { id: teamId },
+ select: { metadata: true },
+ });
+ const metadata = teamMetadataSchema.parse(team.metadata);
+ if (!metadata?.subscriptionId)
+ throw Error(
+ `Couldn't cancelTeamSubscriptionFromStripe, Team id: ${teamId} didn't have a subscriptionId`
+ );
+ return await stripe.subscriptions.cancel(metadata.subscriptionId);
+ } catch (error) {
+ let message = "Unknown error on cancelTeamSubscriptionFromStripe";
+ if (error instanceof Error) message = error.message;
+ console.error(message);
+ }
+};
diff --git a/packages/features/ee/teams/lib/types.ts b/packages/features/ee/teams/lib/types.ts
new file mode 100644
index 0000000000..0f87289108
--- /dev/null
+++ b/packages/features/ee/teams/lib/types.ts
@@ -0,0 +1,18 @@
+import { MembershipRole } from "@prisma/client";
+
+export interface NewTeamFormValues {
+ name: string;
+ slug: string;
+ temporarySlug: string;
+ logo: string;
+}
+
+export interface PendingMember {
+ name: string | null;
+ email: string;
+ id?: number;
+ username: string | null;
+ role: MembershipRole;
+ avatar: string | null;
+ sendInviteEmail?: boolean;
+}
diff --git a/packages/features/ee/teams/pages/team-billing-view.tsx b/packages/features/ee/teams/pages/team-billing-view.tsx
new file mode 100644
index 0000000000..49d0f0daf9
--- /dev/null
+++ b/packages/features/ee/teams/pages/team-billing-view.tsx
@@ -0,0 +1,35 @@
+import { useRouter } from "next/router";
+
+import { WEBAPP_URL } from "@calcom/lib/constants";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Button, Icon } from "@calcom/ui";
+import Meta from "@calcom/ui/v2/core/Meta";
+import { getLayout } from "@calcom/ui/v2/core/layouts/SettingsLayout";
+
+const BillingView = () => {
+ const { t } = useLocale();
+ const router = useRouter();
+ const returnTo = router.asPath;
+ const billingHref = `/api/integrations/stripepayment/portal?returnTo=${WEBAPP_URL}${returnTo}`;
+
+ return (
+ <>
+
+
+
{t("billing_manage_details_title")}
+
{t("billing_manage_details_description")}
+
+
+
+ {t("billing_portal")}
+
+
+
- {t("hidden_team_owner_message")}
- {t("upgrade_to_flexible_pro_message")} setShowMemberInvitationModal(false)}
+ onSubmit={(values) => {
+ inviteMemberMutation.mutate({
+ teamId,
+ language: i18n.language,
+ role: values.role.value,
+ usernameOrEmail: values.emailOrUsername,
+ sendEmailInvitation: values.sendInviteEmail,
+ });
+ }}
/>
)}
diff --git a/packages/features/ee/teams/pages/team-profile-view.tsx b/packages/features/ee/teams/pages/team-profile-view.tsx
index 9592cc6d44..b412bcc167 100644
--- a/packages/features/ee/teams/pages/team-profile-view.tsx
+++ b/packages/features/ee/teams/pages/team-profile-view.tsx
@@ -10,12 +10,14 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import objectKeys from "@calcom/lib/objectKeys";
import { trpc } from "@calcom/trpc/react";
import { Icon } from "@calcom/ui";
-import { Avatar, Button, Label, TextArea, Form, TextField } from "@calcom/ui/components";
-import { Dialog, DialogTrigger, LinkIconButton, showToast } from "@calcom/ui/v2/core";
+import { Avatar, Button, Form, Label, TextArea, TextField } from "@calcom/ui/components";
import ConfirmationDialogContent from "@calcom/ui/v2/core/ConfirmationDialogContent";
+import { Dialog, DialogTrigger } from "@calcom/ui/v2/core/Dialog";
import ImageUploader from "@calcom/ui/v2/core/ImageUploader";
+import LinkIconButton from "@calcom/ui/v2/core/LinkIconButton";
import Meta from "@calcom/ui/v2/core/Meta";
import { getLayout } from "@calcom/ui/v2/core/layouts/SettingsLayout";
+import showToast from "@calcom/ui/v2/core/notifications";
interface TeamProfileValues {
name: string;
@@ -65,8 +67,8 @@ const ProfileView = () => {
async onSuccess() {
await utils.invalidateQueries(["viewer.teams.get"]);
await utils.invalidateQueries(["viewer.teams.list"]);
- router.push(`/settings`);
- showToast(t("your_team_updated_successfully"), "success");
+ showToast(t("your_team_disbanded_successfully"), "success");
+ router.push(`${WEBAPP_URL}/teams`);
},
});
diff --git a/packages/lib/constants.ts b/packages/lib/constants.ts
index dee3306f43..911a6be2e1 100644
--- a/packages/lib/constants.ts
+++ b/packages/lib/constants.ts
@@ -36,3 +36,10 @@ export const DEVELOPER_DOCS = "https://developer.cal.com";
export const SEO_IMG_DEFAULT = `${WEBSITE_URL}/og-image.png`;
export const SEO_IMG_OGIMG = `${CAL_URL}/api/social/og/image`;
export const SEO_IMG_OGIMG_VIDEO = `${WEBSITE_URL}/video-og-image.png`;
+export const IS_STRIPE_ENABLED = !!(
+ process.env.STRIPE_CLIENT_ID &&
+ process.env.NEXT_PUBLIC_STRIPE_PUBLIC_KEY &&
+ process.env.STRIPE_PRIVATE_KEY
+);
+/** Self hosted shouldn't checkout when creating teams */
+export const IS_TEAM_BILLING_ENABLED = IS_STRIPE_ENABLED && !IS_SELF_HOSTED;
diff --git a/packages/lib/server/queries/teams/index.ts b/packages/lib/server/queries/teams/index.ts
index 12f8dcf41c..1206dad55b 100644
--- a/packages/lib/server/queries/teams/index.ts
+++ b/packages/lib/server/queries/teams/index.ts
@@ -3,8 +3,10 @@ import { Prisma, UserPlan } from "@prisma/client";
import prisma, { baseEventTypeSelect } from "@calcom/prisma";
import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
+import { WEBAPP_URL } from "../../../constants";
+
export type TeamWithMembers = Awaited>;
-export async function getTeamWithMembers(id?: number, slug?: string) {
+export async function getTeamWithMembers(id?: number, slug?: string, userId?: number) {
const userSelect = Prisma.validator()({
username: true,
email: true,
@@ -22,6 +24,9 @@ export async function getTeamWithMembers(id?: number, slug?: string) {
hideBranding: true,
members: {
select: {
+ accepted: true,
+ role: true,
+ disableImpersonation: true,
user: {
select: userSelect,
},
@@ -41,26 +46,26 @@ export async function getTeamWithMembers(id?: number, slug?: string) {
},
});
- const team = await prisma.team.findUnique({
- where: id ? { id } : { slug },
+ const where: Prisma.TeamFindFirstArgs["where"] = {};
+
+ if (userId) where.members = { some: { userId } };
+ if (id) where.id = id;
+ if (slug) where.slug = slug;
+
+ const team = await prisma.team.findFirst({
+ where,
select: teamSelect,
});
if (!team) return null;
- const memberships = await prisma.membership.findMany({
- where: {
- teamId: team.id,
- },
- });
-
const members = team.members.map((obj) => {
- const membership = memberships.find((membership) => obj.user.id === membership.userId);
return {
...obj.user,
isMissingSeat: obj.user.plan === UserPlan.FREE,
- role: membership?.role,
- accepted: membership?.accepted,
- disableImpersonation: membership?.disableImpersonation,
+ role: obj.role,
+ accepted: obj.accepted,
+ disableImpersonation: obj.disableImpersonation,
+ avatar: `${WEBAPP_URL}/${obj.user.username}/avatar.png`,
};
});
diff --git a/packages/prisma/migrations/20221107201132_add_team_subscription_cols/migration.sql b/packages/prisma/migrations/20221107201132_add_team_subscription_cols/migration.sql
new file mode 100644
index 0000000000..ada911fd8c
--- /dev/null
+++ b/packages/prisma/migrations/20221107201132_add_team_subscription_cols/migration.sql
@@ -0,0 +1,4 @@
+-- AlterTable
+ALTER TABLE "Team" ADD COLUMN "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ADD COLUMN "metadata" JSONB,
+ALTER COLUMN "slug" DROP NOT NULL;
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index 8c96334d96..9dda13a96b 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -202,12 +202,15 @@ model Team {
/// @zod.min(1)
name String
/// @zod.min(1)
- slug String @unique
+ slug String? @unique
logo String?
bio String?
hideBranding Boolean @default(false)
members Membership[]
eventTypes EventType[]
+ createdAt DateTime @default(now())
+ /// @zod.custom(imports.teamMetadataSchema)
+ metadata Json?
}
enum MembershipRole {
diff --git a/packages/prisma/seed.ts b/packages/prisma/seed.ts
index 59ec94a1f7..3db8dda2c2 100644
--- a/packages/prisma/seed.ts
+++ b/packages/prisma/seed.ts
@@ -574,6 +574,7 @@ async function main() {
],
},
},
+ createdAt: new Date(),
},
[
{
diff --git a/packages/prisma/zod-utils.ts b/packages/prisma/zod-utils.ts
index a041f5b051..c5bf4f005a 100644
--- a/packages/prisma/zod-utils.ts
+++ b/packages/prisma/zod-utils.ts
@@ -199,6 +199,16 @@ export const userMetadata = z
})
.nullable();
+export const teamMetadataSchema = z
+ .object({
+ requestedSlug: z.string(),
+ paymentId: z.string(),
+ subscriptionId: z.string().nullable(),
+ subscriptionItemId: z.string().nullable(),
+ })
+ .partial()
+ .nullable();
+
/**
* Ensures that it is a valid HTTP URL
* It automatically avoids
diff --git a/packages/trpc/server/routers/viewer/teams.tsx b/packages/trpc/server/routers/viewer/teams.tsx
index bf0104c675..ce343452f9 100644
--- a/packages/trpc/server/routers/viewer/teams.tsx
+++ b/packages/trpc/server/routers/viewer/teams.tsx
@@ -2,19 +2,16 @@ import { MembershipRole, Prisma, UserPlan } from "@prisma/client";
import { randomBytes } from "crypto";
import { z } from "zod";
-import {
- addSeat,
- downgradeTeamMembers,
- ensureSubscriptionQuantityCorrectness,
- getTeamSeatStats,
- removeSeat,
- upgradeTeam,
-} from "@calcom/app-store/stripepayment/lib/team-billing";
+import { addSeat, getRequestedSlugError, removeSeat } from "@calcom/app-store/stripepayment/lib/team-billing";
import { getUserAvailability } from "@calcom/core/getUserAvailability";
import { sendTeamInviteEmail } from "@calcom/emails";
-import { HOSTED_CAL_FEATURES, WEBAPP_URL } from "@calcom/lib/constants";
+import {
+ cancelTeamSubscriptionFromStripe,
+ purchaseTeamSubscription,
+} from "@calcom/features/ee/teams/lib/payments";
+import { HOSTED_CAL_FEATURES, IS_TEAM_BILLING_ENABLED, WEBAPP_URL } from "@calcom/lib/constants";
import { getTranslation } from "@calcom/lib/server/i18n";
-import { getTeamWithMembers, isTeamAdmin, isTeamOwner, isTeamMember } from "@calcom/lib/server/queries/teams";
+import { getTeamWithMembers, isTeamAdmin, isTeamMember, isTeamOwner } from "@calcom/lib/server/queries/teams";
import slugify from "@calcom/lib/slugify";
import {
closeComDeleteTeam,
@@ -23,6 +20,7 @@ import {
closeComUpsertTeamUser,
} from "@calcom/lib/sync/SyncServiceManager";
import { availabilityUserSelect } from "@calcom/prisma";
+import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
import { TRPCError } from "@trpc/server";
@@ -35,9 +33,9 @@ export const viewerTeamsRouter = createProtectedRouter()
teamId: z.number(),
}),
async resolve({ ctx, input }) {
- const team = await getTeamWithMembers(input.teamId);
- if (!team?.members.find((m) => m.id === ctx.user.id)) {
- throw new TRPCError({ code: "UNAUTHORIZED", message: "You are not a member of this team." });
+ const team = await getTeamWithMembers(input.teamId, undefined, ctx.user.id);
+ if (!team) {
+ throw new TRPCError({ code: "NOT_FOUND", message: "Team not found." });
}
const membership = team?.members.find((membership) => membership.id === ctx.user.id);
@@ -59,59 +57,52 @@ export const viewerTeamsRouter = createProtectedRouter()
where: {
userId: ctx.user.id,
},
+ include: {
+ team: true,
+ },
orderBy: { role: "desc" },
});
- const teams = await ctx.prisma.team.findMany({
- where: {
- id: {
- in: memberships.map((membership) => membership.teamId),
- },
- },
- });
- return memberships.map((membership) => ({
+ return memberships.map(({ team, ...membership }) => ({
role: membership.role,
accepted: membership.accepted,
- ...teams.find((team) => team.id === membership.teamId),
+ ...team,
}));
},
})
.mutation("create", {
input: z.object({
name: z.string(),
- slug: z.string().optional().nullable(),
- logo: z.string().optional().nullable(),
+ slug: z.string().transform((val) => slugify(val.trim())),
+ logo: z
+ .string()
+ .optional()
+ .nullable()
+ .transform((v) => v || null),
}),
async resolve({ ctx, input }) {
- if (ctx.user.plan === "FREE") {
- throw new TRPCError({ code: "UNAUTHORIZED", message: "You need a team plan." });
- }
+ const { slug, name, logo } = input;
- const slug = input.slug || slugify(input.name);
-
- const nameCollisions = await ctx.prisma.team.count({
- where: {
- OR: [{ name: input.name }, { slug: slug }],
- },
+ const nameCollisions = await ctx.prisma.team.findFirst({
+ where: { OR: [{ name }, { slug }] },
});
- if (nameCollisions > 0)
- throw new TRPCError({ code: "BAD_REQUEST", message: "Team name already taken." });
+ if (nameCollisions) throw new TRPCError({ code: "BAD_REQUEST", message: "Team name already taken." });
const createTeam = await ctx.prisma.team.create({
data: {
- name: input.name,
- slug: slug,
- logo: input.logo || null,
- },
- });
-
- await ctx.prisma.membership.create({
- data: {
- teamId: createTeam.id,
- userId: ctx.user.id,
- role: MembershipRole.OWNER,
- accepted: true,
+ name,
+ logo,
+ members: {
+ create: {
+ userId: ctx.user.id,
+ role: MembershipRole.OWNER,
+ accepted: true,
+ },
+ },
+ metadata: {
+ requestedSlug: slug,
+ },
},
});
@@ -149,17 +140,31 @@ export const viewerTeamsRouter = createProtectedRouter()
},
});
+ if (!prevTeam) throw new TRPCError({ code: "NOT_FOUND", message: "Team not found." });
+
+ const data: Prisma.TeamUpdateArgs["data"] = {
+ name: input.name,
+ logo: input.logo,
+ bio: input.bio,
+ hideBranding: input.hideBranding,
+ };
+
+ if (
+ input.slug &&
+ IS_TEAM_BILLING_ENABLED &&
+ /** If the team doesn't have a slug we can assume that it hasn't been published yet. */ !prevTeam.slug
+ ) {
+ throw new TRPCError({
+ code: "FORBIDDEN",
+ message: "You cannot change the slug until you publish your team",
+ });
+ } else {
+ data.slug = input.slug;
+ }
+
const updatedTeam = await ctx.prisma.team.update({
- where: {
- id: input.id,
- },
- data: {
- name: input.name,
- slug: input.slug,
- logo: input.logo,
- bio: input.bio,
- hideBranding: input.hideBranding,
- },
+ where: { id: input.id },
+ data,
});
// Sync Services: Close.com
@@ -173,9 +178,7 @@ export const viewerTeamsRouter = createProtectedRouter()
async resolve({ ctx, input }) {
if (!(await isTeamOwner(ctx.user?.id, input.teamId))) throw new TRPCError({ code: "UNAUTHORIZED" });
- if (process.env.STRIPE_PRIVATE_KEY) {
- await downgradeTeamMembers(input.teamId);
- }
+ if (IS_TEAM_BILLING_ENABLED) await cancelTeamSubscriptionFromStripe(input.teamId);
// delete all memberships
await ctx.prisma.membership.deleteMany({
@@ -487,32 +490,6 @@ export const viewerTeamsRouter = createProtectedRouter()
);
},
})
- .mutation("upgradeTeam", {
- input: z.object({
- teamId: z.number(),
- }),
- async resolve({ ctx, input }) {
- if (!HOSTED_CAL_FEATURES)
- throw new TRPCError({ code: "FORBIDDEN", message: "Team billing is not enabled" });
- return await upgradeTeam(ctx.user.id, input.teamId);
- },
- })
- .query("getTeamSeats", {
- input: z.object({
- teamId: z.number(),
- }),
- async resolve({ input }) {
- return await getTeamSeatStats(input.teamId);
- },
- })
- .mutation("ensureSubscriptionQuantityCorrectness", {
- input: z.object({
- teamId: z.number(),
- }),
- async resolve({ ctx, input }) {
- return await ensureSubscriptionQuantityCorrectness(ctx.user.id, input.teamId);
- },
- })
.query("getMembershipbyUser", {
input: z.object({
teamId: z.number(),
@@ -562,4 +539,72 @@ export const viewerTeamsRouter = createProtectedRouter()
},
});
},
+ })
+ .query("validateTeamSlug", {
+ input: z.object({
+ slug: z.string(),
+ }),
+ async resolve({ ctx, input }) {
+ const team = await ctx.prisma.team.findFirst({
+ where: {
+ slug: input.slug,
+ },
+ });
+
+ return !team;
+ },
+ })
+ .mutation("publish", {
+ input: z.object({
+ teamId: z.number(),
+ }),
+ async resolve({ ctx, input }) {
+ if (!(await isTeamAdmin(ctx.user.id, input.teamId))) throw new TRPCError({ code: "UNAUTHORIZED" });
+ const { teamId: id } = input;
+
+ const prevTeam = await ctx.prisma.team.findFirst({ where: { id }, include: { members: true } });
+
+ if (!prevTeam) throw new TRPCError({ code: "NOT_FOUND", message: "Team not found." });
+
+ const metadata = teamMetadataSchema.safeParse(prevTeam.metadata);
+
+ if (!metadata.success || !metadata.data?.requestedSlug)
+ throw new TRPCError({ code: "BAD_REQUEST", message: "Can't publish team without `requestedSlug`" });
+
+ // if payment needed, responed with checkout url
+ if (IS_TEAM_BILLING_ENABLED) {
+ const checkoutSession = await purchaseTeamSubscription({
+ teamId: prevTeam.id,
+ seats: prevTeam.members.length,
+ userId: ctx.user.id,
+ });
+ if (!checkoutSession.url)
+ throw new TRPCError({
+ code: "INTERNAL_SERVER_ERROR",
+ message: "Failed retrieving a checkout session URL.",
+ });
+ return { url: checkoutSession.url };
+ }
+
+ const { requestedSlug, ...newMetadata } = metadata.data;
+ let updatedTeam: Awaited>;
+
+ try {
+ updatedTeam = await ctx.prisma.team.update({
+ where: { id },
+ data: {
+ slug: requestedSlug,
+ metadata: { ...newMetadata },
+ },
+ });
+ } catch (error) {
+ const { message } = getRequestedSlugError(error, requestedSlug);
+ throw new TRPCError({ code: "INTERNAL_SERVER_ERROR", message });
+ }
+
+ // Sync Services: Close.com
+ closeComUpdateTeam(prevTeam, updatedTeam);
+
+ return { url: `${WEBAPP_URL}/settings/teams/${updatedTeam.id}/profile` };
+ },
});
diff --git a/packages/ui/v2/core/Dialog.tsx b/packages/ui/v2/core/Dialog.tsx
index 5015cdf121..37ba6329fa 100644
--- a/packages/ui/v2/core/Dialog.tsx
+++ b/packages/ui/v2/core/Dialog.tsx
@@ -80,7 +80,7 @@ type DialogContentProps = React.ComponentProps(
- ({ children, title, Icon, actionProps, ...props }, forwardedRef) => {
+ ({ children, title, Icon, actionProps, useOwnActionButtons, ...props }, forwardedRef) => {
const { t } = useLocale();
return (
@@ -122,7 +122,7 @@ export const DialogContent = React.forwardRef
)}
- {!props.useOwnActionButtons && (
+ {!useOwnActionButtons && (
diff --git a/apps/web/components/getting-started/components/StepCard.tsx b/packages/ui/v2/core/StepCard.tsx
similarity index 100%
rename from apps/web/components/getting-started/components/StepCard.tsx
rename to packages/ui/v2/core/StepCard.tsx
diff --git a/apps/web/components/getting-started/components/Steps.tsx b/packages/ui/v2/core/Steps.tsx
similarity index 100%
rename from apps/web/components/getting-started/components/Steps.tsx
rename to packages/ui/v2/core/Steps.tsx
diff --git a/packages/ui/v2/core/layouts/SettingsLayout.tsx b/packages/ui/v2/core/layouts/SettingsLayout.tsx
index a0fe60a024..0a35c1bed6 100644
--- a/packages/ui/v2/core/layouts/SettingsLayout.tsx
+++ b/packages/ui/v2/core/layouts/SettingsLayout.tsx
@@ -1,6 +1,7 @@
import { MembershipRole, UserPermissionRole } from "@prisma/client";
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@radix-ui/react-collapsible";
import { useSession } from "next-auth/react";
+import Link from "next/link";
import { useRouter } from "next/router";
import React, { ComponentProps, useEffect, useState } from "react";
@@ -158,12 +159,16 @@ const SettingsSidebarContainer = ({ className = "" }) => {
) : (
-
- {tab && tab.icon && (
-
- )}
-
{t(tab.name)}
-
+
+
+
+ {tab && tab.icon && (
+
+ )}
+
{t(tab.name)}
+
+
{teams &&
teamMenuState &&
teams.map((team, index: number) => {
@@ -243,6 +248,12 @@ const SettingsSidebarContainer = ({ className = "" }) => {
textClassNames="px-3 text-gray-900 font-medium text-sm"
disableChevron
/>
+
{HOSTED_CAL_FEATURES && (
{
+ setMeta({
+ title: window.document.title,
+ subtitle: window.document.querySelector('meta[name="description"]')?.getAttribute("content") || "",
+ });
+ }, [router.asPath]);
+
+ return (
+
+ );
+}
+
+export const getLayout = (page: React.ReactElement) => {page} ;
diff --git a/turbo.json b/turbo.json
index 87631ad877..67b087399d 100644
--- a/turbo.json
+++ b/turbo.json
@@ -39,6 +39,7 @@
"$STRIPE_PRO_PLAN_PRODUCT_ID",
"$STRIPE_PREMIUM_PLAN_PRODUCT_ID",
"$STRIPE_FREE_PLAN_PRODUCT_ID",
+ "$STRIPE_TEAM_MONTHLY_PRICE_ID",
"$NEXT_PUBLIC_STRIPE_PUBLIC_KEY",
"$NEXT_PUBLIC_WEBAPP_URL",
"$NEXT_PUBLIC_WEBSITE_URL"