Skip to content

Scheduling infrastructure for absolutely everyone.

perf: Remove circular dependencies - wip (#24586)

Volnei Munhozd82f87aa2a8d
diff --git a/packages/emails/lib/types/booking-redirect-types.ts b/packages/emails/lib/types/booking-redirect-types.ts
new file mode 100644
index 00000000000..ffa136d0cfa
--- /dev/null
+++ b/packages/emails/lib/types/booking-redirect-types.ts
@@ -0,0 +1,12 @@
+import type { TFunction } from "i18next";
+
+export interface IBookingRedirect {
+ language: TFunction;
+ fromEmail: string;
+ eventOwner: string;
+ toEmail: string;
+ toName: string;
+ oldDates?: string;
+ dates: string;
+ action: "add" | "update" | "cancel";
+}
diff --git a/packages/emails/lib/types/email-types.ts b/packages/emails/lib/types/email-types.ts
new file mode 100644
index 00000000000..f8e48dffaa6
--- /dev/null
+++ b/packages/emails/lib/types/email-types.ts
@@ -0,0 +1,23 @@
+import type { TFunction } from "i18next";
+
+export type OrganizationCreation = {
+ language: TFunction;
+ from: string;
+ to: string;
+ ownerNewUsername: string;
+ ownerOldUsername: string | null;
+ orgDomain: string;
+ orgName: string;
+ prevLink: string | null;
+ newLink: string;
+};
+
+export type EmailVerifyCode = {
+ language: TFunction;
+ user: {
+ name?: string | null;
+ email: string;
+ };
+ verificationEmailCode: string;
+ isVerifyingEmail?: boolean;
+};
diff --git a/packages/emails/lib/utils/date-formatting.ts b/packages/emails/lib/utils/date-formatting.ts
new file mode 100644
index 00000000000..3e6f1888cc3
--- /dev/null
+++ b/packages/emails/lib/utils/date-formatting.ts
@@ -0,0 +1,26 @@
+import dayjs from "@calcom/dayjs";
+import { TimeFormat } from "@calcom/lib/timeFormat";
+import type { CalendarEvent, Person } from "@calcom/types/Calendar";
+
+export function getFormattedDate(calEvent: CalendarEvent, attendee: Person): string {
+ const inviteeTimeFormat = calEvent.organizer.timeFormat || TimeFormat.TWELVE_HOUR;
+ const timezone = attendee.timeZone;
+ const locale = attendee.language.locale;
+ const t = attendee.language.translate;
+
+ const getFormattedRecipientTime = (time: string, format: string) => {
+ return dayjs(time).tz(timezone).locale(locale).format(format);
+ };
+
+ const getInviteeStart = (format: string) => {
+ return getFormattedRecipientTime(calEvent.startTime, format);
+ };
+
+ const getInviteeEnd = (format: string) => {
+ return getFormattedRecipientTime(calEvent.endTime, format);
+ };
+
+ return `${getInviteeStart(inviteeTimeFormat)} - ${getInviteeEnd(inviteeTimeFormat)}, ${t(
+ getInviteeStart("dddd").toLowerCase()
+ )}, ${t(getInviteeStart("MMMM").toLowerCase())} ${getInviteeStart("D, YYYY")}`;
+}
diff --git a/packages/emails/lib/utils/team-invite-utils.ts b/packages/emails/lib/utils/team-invite-utils.ts
new file mode 100644
index 00000000000..d9f8562cab6
--- /dev/null
+++ b/packages/emails/lib/utils/team-invite-utils.ts
@@ -0,0 +1,59 @@
+import type { TFunction } from "i18next";
+
+import { APP_NAME } from "@calcom/lib/constants";
+
+export type TeamInvite = {
+ language: TFunction;
+ from: string;
+ to: string;
+ teamName: string;
+ joinLink: string;
+ isCalcomMember: boolean;
+ /**
+ * We ideally should have a separate email for auto-join(when a user is automatically accepted into a team/org), but we don't have one yet.
+ */
+ isAutoJoin: boolean;
+ isOrg: boolean;
+ parentTeamName: string | undefined;
+ isExistingUserMovedToOrg: boolean;
+ prevLink: string | null;
+ newLink: string | null;
+};
+
+export function getTypeOfInvite(teamInviteEvent: TeamInvite) {
+ if (teamInviteEvent.isOrg) {
+ return "TO_ORG";
+ }
+
+ if (teamInviteEvent.parentTeamName) {
+ return "TO_SUBTEAM";
+ }
+
+ if (teamInviteEvent.isAutoJoin) {
+ throw new Error("Auto-join is not supported for regular teams");
+ }
+
+ return "TO_REGULAR_TEAM";
+}
+
+export const getSubject = (teamInviteEvent: TeamInvite) => {
+ const typeOfInvite = getTypeOfInvite(teamInviteEvent);
+ const type = teamInviteEvent.isAutoJoin ? "added" : "invited";
+ const variables = {
+ user: teamInviteEvent.from,
+ team: teamInviteEvent.teamName,
+ appName: APP_NAME,
+ parentTeamName: teamInviteEvent.parentTeamName,
+ entity: teamInviteEvent.language(teamInviteEvent.isOrg ? "organization" : "team").toLowerCase(),
+ };
+
+ if (typeOfInvite === "TO_ORG") {
+ return teamInviteEvent.language(`email_team_invite|subject|${type}_to_org`, variables);
+ }
+
+ if (typeOfInvite === "TO_SUBTEAM") {
+ return teamInviteEvent.language(`email_team_invite|subject|${type}_to_subteam`, variables);
+ }
+
+ return teamInviteEvent.language(`email_team_invite|subject|${type}_to_regular_team`, variables);
+};
diff --git a/packages/emails/src/templates/AttendeeRequestEmail.tsx b/packages/emails/src/templates/AttendeeRequestEmail.tsx
index 233a38c9bb2..bf6071c81f8 100644
--- a/packages/emails/src/templates/AttendeeRequestEmail.tsx
+++ b/packages/emails/src/templates/AttendeeRequestEmail.tsx
@@ -1,8 +1,8 @@
-import AttendeeScheduledEmailClass from "../../templates/attendee-rescheduled-email";
+import { getFormattedDate } from "../../lib/utils/date-formatting";
import { AttendeeScheduledEmail } from "./AttendeeScheduledEmail";
export const AttendeeRequestEmail = (props: React.ComponentProps<typeof AttendeeScheduledEmail>) => {
- const date = new AttendeeScheduledEmailClass(props.calEvent, props.attendee).getFormattedDate();
+ const date = getFormattedDate(props.calEvent, props.attendee);
return (
<AttendeeScheduledEmail
diff --git a/packages/emails/src/templates/BookingRedirectEmailNotification.tsx b/packages/emails/src/templates/BookingRedirectEmailNotification.tsx
index fb160c91d43..5296f1ee610 100644
--- a/packages/emails/src/templates/BookingRedirectEmailNotification.tsx
+++ b/packages/emails/src/templates/BookingRedirectEmailNotification.tsx
@@ -1,4 +1,4 @@
-import type { IBookingRedirect } from "../../templates/booking-redirect-notification";
+import type { IBookingRedirect } from "../../lib/types/booking-redirect-types";
import { BaseEmailHtml } from "../components";
export const BookingRedirectEmailNotification = (
diff --git a/packages/emails/src/templates/OrganizationCreationEmail.tsx b/packages/emails/src/templates/OrganizationCreationEmail.tsx
index 150b13ca8ff..5d0aef49190 100644
--- a/packages/emails/src/templates/OrganizationCreationEmail.tsx
+++ b/packages/emails/src/templates/OrganizationCreationEmail.tsx
@@ -1,7 +1,7 @@
import ServerTrans from "@calcom/lib/components/ServerTrans";
import { APP_NAME, WEBAPP_URL } from "@calcom/lib/constants";
-import type { OrganizationCreation } from "../../templates/organization-creation-email";
+import type { OrganizationCreation } from "../../lib/types/email-types";
import { V2BaseEmailHtml } from "../components";
export const OrganizationCreationEmail = (
diff --git a/packages/emails/src/templates/TeamInviteEmail.tsx b/packages/emails/src/templates/TeamInviteEmail.tsx
index c74083cfbb1..f3a560aa020 100644
--- a/packages/emails/src/templates/TeamInviteEmail.tsx
+++ b/packages/emails/src/templates/TeamInviteEmail.tsx
@@ -3,7 +3,7 @@ import type { TFunction } from "i18next";
import ServerTrans from "@calcom/lib/components/ServerTrans";
import { APP_NAME, WEBAPP_URL, IS_PRODUCTION } from "@calcom/lib/constants";
-import { getSubject, getTypeOfInvite } from "../../templates/team-invite-email";
+import { getSubject, getTypeOfInvite } from "../../lib/utils/team-invite-utils";
import { V2BaseEmailHtml, CallToAction } from "../components";
type TeamInvite = {
diff --git a/packages/emails/src/templates/VerifyEmailByCode.tsx b/packages/emails/src/templates/VerifyEmailByCode.tsx
index 74fe4a8003b..1def5f66460 100644
--- a/packages/emails/src/templates/VerifyEmailByCode.tsx
+++ b/packages/emails/src/templates/VerifyEmailByCode.tsx
@@ -1,6 +1,6 @@
import { APP_NAME, SENDER_NAME, SUPPORT_MAIL_ADDRESS } from "@calcom/lib/constants";
-import type { EmailVerifyCode } from "../../templates/attendee-verify-email";
+import type { EmailVerifyCode } from "../../lib/types/email-types";
import { BaseEmailHtml } from "../components";
export const VerifyEmailByCode = (
diff --git a/packages/emails/templates/account-verify-email.ts b/packages/emails/templates/account-verify-email.ts
index 57909dc90d7..ae7f5adc522 100644
--- a/packages/emails/templates/account-verify-email.ts
+++ b/packages/emails/templates/account-verify-email.ts
@@ -2,7 +2,7 @@ import type { TFunction } from "i18next";
import { APP_NAME, COMPANY_NAME, EMAIL_FROM_NAME } from "@calcom/lib/constants";
-import { renderEmail } from "../";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
export type EmailVerifyLink = {
diff --git a/packages/emails/templates/admin-organization-notification.ts b/packages/emails/templates/admin-organization-notification.ts
index 11f916d4061..b9044a31642 100644
--- a/packages/emails/templates/admin-organization-notification.ts
+++ b/packages/emails/templates/admin-organization-notification.ts
@@ -2,7 +2,7 @@ import type { TFunction } from "i18next";
import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
-import { renderEmail } from "../";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
export type OrganizationNotification = {
diff --git a/packages/emails/templates/attendee-add-guests-email.ts b/packages/emails/templates/attendee-add-guests-email.ts
index b2ef5dd2c62..211128f074f 100644
--- a/packages/emails/templates/attendee-add-guests-email.ts
+++ b/packages/emails/templates/attendee-add-guests-email.ts
@@ -1,7 +1,7 @@
import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
-import { renderEmail } from "../";
import generateIcsFile, { GenerateIcsRole } from "../lib/generateIcsFile";
+import renderEmail from "../src/renderEmail";
import AttendeeScheduledEmail from "./attendee-scheduled-email";
export default class AttendeeAddGuestsEmail extends AttendeeScheduledEmail {
diff --git a/packages/emails/templates/attendee-awaiting-payment-email.ts b/packages/emails/templates/attendee-awaiting-payment-email.ts
index 31888e59e2c..a6f0cd7420f 100644
--- a/packages/emails/templates/attendee-awaiting-payment-email.ts
+++ b/packages/emails/templates/attendee-awaiting-payment-email.ts
@@ -1,6 +1,6 @@
import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
-import { renderEmail } from "../";
+import renderEmail from "../src/renderEmail";
import AttendeeScheduledEmail from "./attendee-scheduled-email";
export default class AttendeeAwaitingPaymentEmail extends AttendeeScheduledEmail {
diff --git a/packages/emails/templates/attendee-cancelled-email.ts b/packages/emails/templates/attendee-cancelled-email.ts
index 7992eb4dc42..1a6308db9a6 100644
--- a/packages/emails/templates/attendee-cancelled-email.ts
+++ b/packages/emails/templates/attendee-cancelled-email.ts
@@ -1,8 +1,8 @@
import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
import type { CalendarEvent, Person } from "@calcom/types/Calendar";
-import { renderEmail } from "../";
import generateIcsFile, { GenerateIcsRole } from "../lib/generateIcsFile";
+import renderEmail from "../src/renderEmail";
import AttendeeScheduledEmail from "./attendee-scheduled-email";
export default class AttendeeCancelledEmail extends AttendeeScheduledEmail {
diff --git a/packages/emails/templates/attendee-cancelled-seat-email.ts b/packages/emails/templates/attendee-cancelled-seat-email.ts
index 590ce65d6e1..c316c8ff2c2 100644
--- a/packages/emails/templates/attendee-cancelled-seat-email.ts
+++ b/packages/emails/templates/attendee-cancelled-seat-email.ts
@@ -1,6 +1,6 @@
import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
-import { renderEmail } from "../";
+import renderEmail from "../src/renderEmail";
import AttendeeScheduledEmail from "./attendee-scheduled-email";
export default class AttendeeCancelledSeatEmail extends AttendeeScheduledEmail {
diff --git a/packages/emails/templates/attendee-daily-video-download-recording-email.ts b/packages/emails/templates/attendee-daily-video-download-recording-email.ts
index 7b54067333d..53bd079a426 100644
--- a/packages/emails/templates/attendee-daily-video-download-recording-email.ts
+++ b/packages/emails/templates/attendee-daily-video-download-recording-email.ts
@@ -5,7 +5,7 @@ import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
import { TimeFormat } from "@calcom/lib/timeFormat";
import type { CalendarEvent, Person } from "@calcom/types/Calendar";
-import { renderEmail } from "../";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
export default class AttendeeDailyVideoDownloadRecordingEmail extends BaseEmail {
diff --git a/packages/emails/templates/attendee-daily-video-download-transcript-email.ts b/packages/emails/templates/attendee-daily-video-download-transcript-email.ts
index b9033c099c1..a258fae3262 100644
--- a/packages/emails/templates/attendee-daily-video-download-transcript-email.ts
+++ b/packages/emails/templates/attendee-daily-video-download-transcript-email.ts
@@ -4,7 +4,7 @@ import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
import { TimeFormat } from "@calcom/lib/timeFormat";
import type { CalendarEvent, Person } from "@calcom/types/Calendar";
-import { renderEmail } from "../";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
export default class AttendeeDailyVideoDownloadTranscriptEmail extends BaseEmail {
diff --git a/packages/emails/templates/attendee-declined-email.ts b/packages/emails/templates/attendee-declined-email.ts
index 37dd9b28060..1527d196c81 100644
--- a/packages/emails/templates/attendee-declined-email.ts
+++ b/packages/emails/templates/attendee-declined-email.ts
@@ -1,7 +1,7 @@
import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
import type { CalendarEvent, Person } from "@calcom/types/Calendar";
-import { renderEmail } from "../";
+import renderEmail from "../src/renderEmail";
import AttendeeScheduledEmail from "./attendee-scheduled-email";
export default class AttendeeDeclinedEmail extends AttendeeScheduledEmail {
diff --git a/packages/emails/templates/attendee-location-change-email.ts b/packages/emails/templates/attendee-location-change-email.ts
index 5e20668a856..3323f4ab510 100644
--- a/packages/emails/templates/attendee-location-change-email.ts
+++ b/packages/emails/templates/attendee-location-change-email.ts
@@ -1,7 +1,7 @@
import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
-import { renderEmail } from "../";
import generateIcsFile, { GenerateIcsRole } from "../lib/generateIcsFile";
+import renderEmail from "../src/renderEmail";
import AttendeeScheduledEmail from "./attendee-scheduled-email";
export default class AttendeeLocationChangeEmail extends AttendeeScheduledEmail {
diff --git a/packages/emails/templates/attendee-request-email.ts b/packages/emails/templates/attendee-request-email.ts
index 6bef955e58d..b9fe9a0f322 100644
--- a/packages/emails/templates/attendee-request-email.ts
+++ b/packages/emails/templates/attendee-request-email.ts
@@ -2,7 +2,7 @@ import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
import type { CalendarEvent, Person } from "@calcom/types/Calendar";
-import { renderEmail } from "../";
+import renderEmail from "../src/renderEmail";
import AttendeeScheduledEmail from "./attendee-scheduled-email";
export default class AttendeeRequestEmail extends AttendeeScheduledEmail {
diff --git a/packages/emails/templates/attendee-rescheduled-email.ts b/packages/emails/templates/attendee-rescheduled-email.ts
index a8860de1635..242e0092370 100644
--- a/packages/emails/templates/attendee-rescheduled-email.ts
+++ b/packages/emails/templates/attendee-rescheduled-email.ts
@@ -1,8 +1,8 @@
import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
import type { CalendarEvent, Person } from "@calcom/types/Calendar";
-import { renderEmail } from "../";
import generateIcsFile, { GenerateIcsRole } from "../lib/generateIcsFile";
+import renderEmail from "../src/renderEmail";
import AttendeeScheduledEmail from "./attendee-scheduled-email";
export default class AttendeeRescheduledEmail extends AttendeeScheduledEmail {
diff --git a/packages/emails/templates/attendee-scheduled-email.ts b/packages/emails/templates/attendee-scheduled-email.ts
index 6f54588d274..5e87742131f 100644
--- a/packages/emails/templates/attendee-scheduled-email.ts
+++ b/packages/emails/templates/attendee-scheduled-email.ts
@@ -6,8 +6,8 @@ import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
import { TimeFormat } from "@calcom/lib/timeFormat";
import type { CalendarEvent, Person } from "@calcom/types/Calendar";
-import { renderEmail } from "../";
import generateIcsFile, { GenerateIcsRole } from "../lib/generateIcsFile";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
export default class AttendeeScheduledEmail extends BaseEmail {
diff --git a/packages/emails/templates/attendee-updated-email.ts b/packages/emails/templates/attendee-updated-email.ts
index 55458c4be20..16d608ee301 100644
--- a/packages/emails/templates/attendee-updated-email.ts
+++ b/packages/emails/templates/attendee-updated-email.ts
@@ -1,8 +1,8 @@
import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
import type { CalendarEvent, Person } from "@calcom/types/Calendar";
-import { renderEmail } from "../";
import generateIcsFile, { GenerateIcsRole } from "../lib/generateIcsFile";
+import renderEmail from "../src/renderEmail";
import AttendeeScheduledEmail from "./attendee-scheduled-email";
export default class AttendeeUpdatedEmail extends AttendeeScheduledEmail {
diff --git a/packages/emails/templates/attendee-verify-email.ts b/packages/emails/templates/attendee-verify-email.ts
index f362db3724f..be15cff0518 100644
--- a/packages/emails/templates/attendee-verify-email.ts
+++ b/packages/emails/templates/attendee-verify-email.ts
@@ -1,19 +1,10 @@
-import type { TFunction } from "i18next";
-
import { APP_NAME, COMPANY_NAME, EMAIL_FROM_NAME } from "@calcom/lib/constants";
-import { renderEmail } from "../";
+import type { EmailVerifyCode } from "../lib/types/email-types";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
-export type EmailVerifyCode = {
- language: TFunction;
- user: {
- name?: string | null;
- email: string;
- };
- verificationEmailCode: string;
- isVerifyingEmail?: boolean;
-};
+export type { EmailVerifyCode } from "../lib/types/email-types";
export default class AttendeeVerifyEmail extends BaseEmail {
verifyAccountInput: EmailVerifyCode;
diff --git a/packages/emails/templates/attendee-was-requested-to-reschedule-email.ts b/packages/emails/templates/attendee-was-requested-to-reschedule-email.ts
index ad427baceb4..33337ff8103 100644
--- a/packages/emails/templates/attendee-was-requested-to-reschedule-email.ts
+++ b/packages/emails/templates/attendee-was-requested-to-reschedule-email.ts
@@ -2,8 +2,8 @@ import { getManageLink } from "@calcom/lib/CalEventParser";
import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
import type { CalendarEvent } from "@calcom/types/Calendar";
-import { renderEmail } from "..";
import generateIcsFile, { GenerateIcsRole } from "../lib/generateIcsFile";
+import renderEmail from "../src/renderEmail";
import OrganizerScheduledEmail from "./organizer-scheduled-email";
export default class AttendeeWasRequestedToRescheduleEmail extends OrganizerScheduledEmail {
diff --git a/packages/emails/templates/booking-redirect-notification.ts b/packages/emails/templates/booking-redirect-notification.ts
index 25375da3bba..23d01f51148 100644
--- a/packages/emails/templates/booking-redirect-notification.ts
+++ b/packages/emails/templates/booking-redirect-notification.ts
@@ -1,20 +1,10 @@
-import type { TFunction } from "i18next";
-
import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
-import { renderEmail } from "..";
+import type { IBookingRedirect } from "../lib/types/booking-redirect-types";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
-export interface IBookingRedirect {
- language: TFunction;
- fromEmail: string;
- eventOwner: string;
- toEmail: string;
- toName: string;
- oldDates?: string;
- dates: string;
- action: "add" | "update" | "cancel";
-}
+export type { IBookingRedirect } from "../lib/types/booking-redirect-types";
export default class BookingRedirectNotification extends BaseEmail {
bookingRedirect: IBookingRedirect;
diff --git a/packages/emails/templates/broken-integration-email.ts b/packages/emails/templates/broken-integration-email.ts
index 801844cbf5f..a3a8e1715aa 100644
--- a/packages/emails/templates/broken-integration-email.ts
+++ b/packages/emails/templates/broken-integration-email.ts
@@ -5,7 +5,7 @@ import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
import { TimeFormat } from "@calcom/lib/timeFormat";
import type { CalendarEvent } from "@calcom/types/Calendar";
-import { renderEmail } from "..";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
export default class BrokenIntegrationEmail extends BaseEmail {
diff --git a/packages/emails/templates/change-account-email-verify.ts b/packages/emails/templates/change-account-email-verify.ts
index ae792fc2737..7aa26082c40 100644
--- a/packages/emails/templates/change-account-email-verify.ts
+++ b/packages/emails/templates/change-account-email-verify.ts
@@ -2,7 +2,7 @@ import type { TFunction } from "i18next";
import { APP_NAME, COMPANY_NAME, EMAIL_FROM_NAME } from "@calcom/lib/constants";
-import { renderEmail } from "../";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
export type ChangeOfEmailVerifyLink = {
diff --git a/packages/emails/templates/credit-balance-limit-reached-email.ts b/packages/emails/templates/credit-balance-limit-reached-email.ts
index c437aedbcba..356a32d54cc 100644
--- a/packages/emails/templates/credit-balance-limit-reached-email.ts
+++ b/packages/emails/templates/credit-balance-limit-reached-email.ts
@@ -2,7 +2,7 @@ import type { TFunction } from "i18next";
import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
-import { renderEmail } from "..";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
export default class CreditBalanceLimitReachedEmail extends BaseEmail {
diff --git a/packages/emails/templates/credit-balance-low-warning-email.ts b/packages/emails/templates/credit-balance-low-warning-email.ts
index bc9c9f34357..ef069ef9e4f 100644
--- a/packages/emails/templates/credit-balance-low-warning-email.ts
+++ b/packages/emails/templates/credit-balance-low-warning-email.ts
@@ -2,7 +2,7 @@ import type { TFunction } from "i18next";
import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
-import { renderEmail } from "..";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
export default class CreditBalanceLowWarningEmail extends BaseEmail {
diff --git a/packages/emails/templates/disabled-app-email.ts b/packages/emails/templates/disabled-app-email.ts
index a6510db62bb..1df6a6fde2d 100644
--- a/packages/emails/templates/disabled-app-email.ts
+++ b/packages/emails/templates/disabled-app-email.ts
@@ -2,7 +2,7 @@ import type { TFunction } from "i18next";
import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
-import { renderEmail } from "..";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
export default class DisabledAppEmail extends BaseEmail {
diff --git a/packages/emails/templates/feedback-email.ts b/packages/emails/templates/feedback-email.ts
index 591a3807180..9a6c28a7a55 100644
--- a/packages/emails/templates/feedback-email.ts
+++ b/packages/emails/templates/feedback-email.ts
@@ -1,6 +1,6 @@
import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
-import { renderEmail } from "../";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
export interface Feedback {
diff --git a/packages/emails/templates/forgot-password-email.ts b/packages/emails/templates/forgot-password-email.ts
index 909b8c50f20..bf6979814df 100644
--- a/packages/emails/templates/forgot-password-email.ts
+++ b/packages/emails/templates/forgot-password-email.ts
@@ -2,7 +2,7 @@ import type { TFunction } from "i18next";
import { APP_NAME, EMAIL_FROM_NAME } from "@calcom/lib/constants";
-import { renderEmail } from "../";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
export type PasswordReset = {
diff --git a/packages/emails/templates/monthly-digest-email.ts b/packages/emails/templates/monthly-digest-email.ts
index 2eaaf4d27a1..105760e55dd 100644
--- a/packages/emails/templates/monthly-digest-email.ts
+++ b/packages/emails/templates/monthly-digest-email.ts
@@ -1,6 +1,6 @@
import { APP_NAME, EMAIL_FROM_NAME } from "@calcom/lib/constants";
-import { renderEmail } from "../";
+import renderEmail from "../src/renderEmail";
import type { MonthlyDigestEmailData } from "../src/templates/MonthlyDigestEmail";
import BaseEmail from "./_base-email";
diff --git a/packages/emails/templates/no-show-fee-charged-email.ts b/packages/emails/templates/no-show-fee-charged-email.ts
index 9e2e42f56ed..6f3adfe1a65 100644
--- a/packages/emails/templates/no-show-fee-charged-email.ts
+++ b/packages/emails/templates/no-show-fee-charged-email.ts
@@ -1,6 +1,6 @@
import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
-import { renderEmail } from "../";
+import renderEmail from "../src/renderEmail";
import AttendeeScheduledEmail from "./attendee-scheduled-email";
export default class NoShowFeeChargedEmail extends AttendeeScheduledEmail {
diff --git a/packages/emails/templates/org-auto-join-invite.ts b/packages/emails/templates/org-auto-join-invite.ts
index 9615dff07ee..ae75ecb5f83 100644
--- a/packages/emails/templates/org-auto-join-invite.ts
+++ b/packages/emails/templates/org-auto-join-invite.ts
@@ -2,7 +2,7 @@ import type { TFunction } from "i18next";
import { APP_NAME, EMAIL_FROM_NAME } from "@calcom/lib/constants";
-import { renderEmail } from "..";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
export type OrgAutoInvite = {
diff --git a/packages/emails/templates/organization-creation-email.ts b/packages/emails/templates/organization-creation-email.ts
index bcc7a5d859a..2560547a774 100644
--- a/packages/emails/templates/organization-creation-email.ts
+++ b/packages/emails/templates/organization-creation-email.ts
@@ -1,21 +1,10 @@
-import type { TFunction } from "i18next";
-
import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
-import { renderEmail } from "../";
+import type { OrganizationCreation } from "../lib/types/email-types";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
-export type OrganizationCreation = {
- language: TFunction;
- from: string;
- to: string;
- ownerNewUsername: string;
- ownerOldUsername: string | null;
- orgDomain: string;
- orgName: string;
- prevLink: string | null;
- newLink: string;
-};
+export type { OrganizationCreation } from "../lib/types/email-types";
export default class OrganizationCreationEmail extends BaseEmail {
organizationCreationEvent: OrganizationCreation;
diff --git a/packages/emails/templates/organizer-add-guests-email.ts b/packages/emails/templates/organizer-add-guests-email.ts
index 551a63988f8..ba734ffbb22 100644
--- a/packages/emails/templates/organizer-add-guests-email.ts
+++ b/packages/emails/templates/organizer-add-guests-email.ts
@@ -1,8 +1,8 @@
import { APP_NAME } from "@calcom/lib/constants";
import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
-import { renderEmail } from "../";
import generateIcsFile, { GenerateIcsRole } from "../lib/generateIcsFile";
+import renderEmail from "../src/renderEmail";
import OrganizerScheduledEmail from "./organizer-scheduled-email";
export default class OrganizerAddGuestsEmail extends OrganizerScheduledEmail {
diff --git a/packages/emails/templates/organizer-attendee-cancelled-seat-email.ts b/packages/emails/templates/organizer-attendee-cancelled-seat-email.ts
index 4ff6020d28e..e1292eab762 100644
--- a/packages/emails/templates/organizer-attendee-cancelled-seat-email.ts
+++ b/packages/emails/templates/organizer-attendee-cancelled-seat-email.ts
@@ -1,6 +1,6 @@
import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
-import { renderEmail } from "../";
+import renderEmail from "../src/renderEmail";
import OrganizerScheduledEmail from "./organizer-scheduled-email";
export default class OrganizerCancelledEmail extends OrganizerScheduledEmail {
diff --git a/packages/emails/templates/organizer-cancelled-email.ts b/packages/emails/templates/organizer-cancelled-email.ts
index 9a102d6bb88..82765b0dde9 100644
--- a/packages/emails/templates/organizer-cancelled-email.ts
+++ b/packages/emails/templates/organizer-cancelled-email.ts
@@ -1,8 +1,8 @@
import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
import type { CalendarEvent, Person } from "@calcom/types/Calendar";
-import { renderEmail } from "../";
import generateIcsFile, { GenerateIcsRole } from "../lib/generateIcsFile";
+import renderEmail from "../src/renderEmail";
import OrganizerScheduledEmail from "./organizer-scheduled-email";
import type { Reassigned } from "./organizer-scheduled-email";
diff --git a/packages/emails/templates/organizer-daily-video-download-recording-email.ts b/packages/emails/templates/organizer-daily-video-download-recording-email.ts
index e8db532ee6a..d3009c14da6 100644
--- a/packages/emails/templates/organizer-daily-video-download-recording-email.ts
+++ b/packages/emails/templates/organizer-daily-video-download-recording-email.ts
@@ -5,7 +5,7 @@ import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
import { TimeFormat } from "@calcom/lib/timeFormat";
import type { CalendarEvent } from "@calcom/types/Calendar";
-import { renderEmail } from "../";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
export default class OrganizerDailyVideoDownloadRecordingEmail extends BaseEmail {
diff --git a/packages/emails/templates/organizer-daily-video-download-transcript-email.ts b/packages/emails/templates/organizer-daily-video-download-transcript-email.ts
index c17b0290321..c2648b81534 100644
--- a/packages/emails/templates/organizer-daily-video-download-transcript-email.ts
+++ b/packages/emails/templates/organizer-daily-video-download-transcript-email.ts
@@ -5,7 +5,7 @@ import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
import { TimeFormat } from "@calcom/lib/timeFormat";
import type { CalendarEvent } from "@calcom/types/Calendar";
-import { renderEmail } from "..";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
export default class OrganizerDailyVideoDownloadTranscriptEmail extends BaseEmail {
diff --git a/packages/emails/templates/organizer-location-change-email.ts b/packages/emails/templates/organizer-location-change-email.ts
index 47245878012..6acdbec6d65 100644
--- a/packages/emails/templates/organizer-location-change-email.ts
+++ b/packages/emails/templates/organizer-location-change-email.ts
@@ -1,8 +1,8 @@
import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
-import { renderEmail } from "../";
import generateIcsFile, { GenerateIcsRole } from "../lib/generateIcsFile";
+import renderEmail from "../src/renderEmail";
import OrganizerScheduledEmail from "./organizer-scheduled-email";
export default class OrganizerLocationChangeEmail extends OrganizerScheduledEmail {
diff --git a/packages/emails/templates/organizer-payment-refund-failed-email.ts b/packages/emails/templates/organizer-payment-refund-failed-email.ts
index 5100e4f8f28..2ac7115fc9e 100644
--- a/packages/emails/templates/organizer-payment-refund-failed-email.ts
+++ b/packages/emails/templates/organizer-payment-refund-failed-email.ts
@@ -1,6 +1,6 @@
import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
-import { renderEmail } from "../";
+import renderEmail from "../src/renderEmail";
import OrganizerScheduledEmail from "./organizer-scheduled-email";
export default class OrganizerPaymentRefundFailedEmail extends OrganizerScheduledEmail {
diff --git a/packages/emails/templates/organizer-reassigned-email.ts b/packages/emails/templates/organizer-reassigned-email.ts
index e24c0277fb4..8548c695637 100644
--- a/packages/emails/templates/organizer-reassigned-email.ts
+++ b/packages/emails/templates/organizer-reassigned-email.ts
@@ -1,8 +1,8 @@
import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
import type { CalendarEvent, Person } from "@calcom/types/Calendar";
-import { renderEmail } from "../";
import generateIcsFile, { GenerateIcsRole } from "../lib/generateIcsFile";
+import renderEmail from "../src/renderEmail";
import OrganizerScheduledEmail from "./organizer-scheduled-email";
import type { Reassigned } from "./organizer-scheduled-email";
diff --git a/packages/emails/templates/organizer-request-email.ts b/packages/emails/templates/organizer-request-email.ts
index d17040035c1..32fe187547e 100644
--- a/packages/emails/templates/organizer-request-email.ts
+++ b/packages/emails/templates/organizer-request-email.ts
@@ -3,7 +3,7 @@ import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
import type { CalendarEvent, Person } from "@calcom/types/Calendar";
-import { renderEmail } from "../";
+import renderEmail from "../src/renderEmail";
import OrganizerScheduledEmail from "./organizer-scheduled-email";
/**
diff --git a/packages/emails/templates/organizer-request-reminder-email.ts b/packages/emails/templates/organizer-request-reminder-email.ts
index 12f48d38150..9ce8fba3856 100644
--- a/packages/emails/templates/organizer-request-reminder-email.ts
+++ b/packages/emails/templates/organizer-request-reminder-email.ts
@@ -1,7 +1,7 @@
import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
-import { renderEmail } from "../";
+import renderEmail from "../src/renderEmail";
import OrganizerRequestEmail from "./organizer-request-email";
export default class OrganizerRequestReminderEmail extends OrganizerRequestEmail {
diff --git a/packages/emails/templates/organizer-requested-to-reschedule-email.ts b/packages/emails/templates/organizer-requested-to-reschedule-email.ts
index 72089be4272..24a9121bb74 100644
--- a/packages/emails/templates/organizer-requested-to-reschedule-email.ts
+++ b/packages/emails/templates/organizer-requested-to-reschedule-email.ts
@@ -1,8 +1,8 @@
import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
import type { CalendarEvent } from "@calcom/types/Calendar";
-import { renderEmail } from "..";
import generateIcsFile, { GenerateIcsRole } from "../lib/generateIcsFile";
+import renderEmail from "../src/renderEmail";
import OrganizerScheduledEmail from "./organizer-scheduled-email";
export default class OrganizerRequestedToRescheduleEmail extends OrganizerScheduledEmail {
diff --git a/packages/emails/templates/organizer-rescheduled-email.ts b/packages/emails/templates/organizer-rescheduled-email.ts
index 6456cd3e5b7..301267032b6 100644
--- a/packages/emails/templates/organizer-rescheduled-email.ts
+++ b/packages/emails/templates/organizer-rescheduled-email.ts
@@ -2,8 +2,8 @@ import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
import type { CalendarEvent, Person } from "@calcom/types/Calendar";
-import { renderEmail } from "../";
import generateIcsFile, { GenerateIcsRole } from "../lib/generateIcsFile";
+import renderEmail from "../src/renderEmail";
import OrganizerScheduledEmail from "./organizer-scheduled-email";
export default class OrganizerRescheduledEmail extends OrganizerScheduledEmail {
diff --git a/packages/emails/templates/organizer-scheduled-email.ts b/packages/emails/templates/organizer-scheduled-email.ts
index 88f201e0300..8a67638c7e4 100644
--- a/packages/emails/templates/organizer-scheduled-email.ts
+++ b/packages/emails/templates/organizer-scheduled-email.ts
@@ -7,9 +7,9 @@ import { getReplyToHeader } from "@calcom/lib/getReplyToHeader";
import { TimeFormat } from "@calcom/lib/timeFormat";
import type { CalendarEvent, Person } from "@calcom/types/Calendar";
-import { renderEmail } from "../";
import generateIcsFile from "../lib/generateIcsFile";
import { GenerateIcsRole } from "../lib/generateIcsFile";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
export type Reassigned = { name: string | null; email: string; reason?: string; byUser?: string };
diff --git a/packages/emails/templates/slug-replacement-email.ts b/packages/emails/templates/slug-replacement-email.ts
index 053aacd144e..369f0169d59 100644
--- a/packages/emails/templates/slug-replacement-email.ts
+++ b/packages/emails/templates/slug-replacement-email.ts
@@ -2,7 +2,7 @@ import type { TFunction } from "i18next";
import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
-import { renderEmail } from "..";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
export default class SlugReplacementEmail extends BaseEmail {
diff --git a/packages/emails/templates/team-invite-email.ts b/packages/emails/templates/team-invite-email.ts
index 52f0130eb6e..575948b9b61 100644
--- a/packages/emails/templates/team-invite-email.ts
+++ b/packages/emails/templates/team-invite-email.ts
@@ -1,65 +1,10 @@
-import type { TFunction } from "i18next";
+import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
-import { APP_NAME, EMAIL_FROM_NAME } from "@calcom/lib/constants";
-
-import { renderEmail } from "../";
+import { getSubject, type TeamInvite } from "../lib/utils/team-invite-utils";
+import renderEmail from "../src/renderEmail";
import BaseEmail from "./_base-email";
-export type TeamInvite = {
- language: TFunction;
- from: string;
- to: string;
- teamName: string;
- joinLink: string;
- isCalcomMember: boolean;
- /**
- * We ideally should have a separate email for auto-join(when a user is automatically accepted into a team/org), but we don't have one yet.
- */
- isAutoJoin: boolean;
- isOrg: boolean;
- parentTeamName: string | undefined;
- isExistingUserMovedToOrg: boolean;
- prevLink: string | null;
- newLink: string | null;
-};
-
-export function getTypeOfInvite(teamInviteEvent: TeamInvite) {
- if (teamInviteEvent.isOrg) {
- return "TO_ORG";
- }
-
- if (teamInviteEvent.parentTeamName) {
- return "TO_SUBTEAM";
- }
-
- if (teamInviteEvent.isAutoJoin) {
- throw new Error("Auto-join is not supported for regular teams");
- }
-
- return "TO_REGULAR_TEAM";
-}
-
-export const getSubject = (teamInviteEvent: TeamInvite) => {
- const typeOfInvite = getTypeOfInvite(teamInviteEvent);
- const type = teamInviteEvent.isAutoJoin ? "added" : "invited";
- const variables = {
- user: teamInviteEvent.from,
- team: teamInviteEvent.teamName,
- appName: APP_NAME,
- parentTeamName: teamInviteEvent.parentTeamName,
- entity: teamInviteEvent.language(teamInviteEvent.isOrg ? "organization" : "team").toLowerCase(),
- };
-
- if (typeOfInvite === "TO_ORG") {
- return teamInviteEvent.language(`email_team_invite|subject|${type}_to_org`, variables);
- }
-
- if (typeOfInvite === "TO_SUBTEAM") {
- return teamInviteEvent.language(`email_team_invite|subject|${type}_to_subteam`, variables);
- }
-
- return teamInviteEvent.language(`email_team_invite|subject|${type}_to_regular_team`, variables);
-};
+export { getSubject, getTypeOfInvite, type TeamInvite } from "../lib/utils/team-invite-utils";
export default class TeamInviteEmail extends BaseEmail {
teamInviteEvent: TeamInvite;
diff --git a/packages/trpc/server/routers/apps/routing-forms/_router.ts b/packages/trpc/server/routers/apps/routing-forms/_router.ts
index 9f8e219ae35..9e4731bed44 100644
--- a/packages/trpc/server/routers/apps/routing-forms/_router.ts
+++ b/packages/trpc/server/routers/apps/routing-forms/_router.ts
@@ -8,10 +8,11 @@ import { ZFormMutationInputSchema } from "./formMutation.schema";
import { ZFormQueryInputSchema } from "./formQuery.schema";
import { ZGetAttributesForTeamInputSchema } from "./getAttributesForTeam.schema";
import { ZGetIncompleteBookingSettingsInputSchema } from "./getIncompleteBookingSettings.schema";
+import { ZFormByResponseIdInputSchema } from "./getResponseWithFormFields.schema";
import { forms } from "./procedures/forms";
import { ZSaveIncompleteBookingSettingsInputSchema } from "./saveIncompleteBookingSettings.schema";
-// eslint-disable-next-line @typescript-eslint/ban-types
+// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
const UNSTABLE_HANDLER_CACHE: Record<string, Function> = {};
// TODO: Move getHandler and UNSTABLE_HANDLER_CACHE to a common utils file making sure that there is no name collision across routes
@@ -24,7 +25,7 @@ const UNSTABLE_HANDLER_CACHE: Record<string, Function> = {};
*/
const getHandler = async <
T extends {
- // eslint-disable-next-line @typescript-eslint/ban-types
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
default: Function;
}
>(
@@ -45,10 +46,6 @@ const getHandler = async <
return UNSTABLE_HANDLER_CACHE[nameInCache] as unknown as T["default"];
};
-export const ZFormByResponseIdInputSchema = z.object({
- formResponseId: z.number(),
-});
-
export type TFormQueryInputSchema = z.infer<typeof ZFormQueryInputSchema>;
const appRoutingForms = router({
diff --git a/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.handler.ts b/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.handler.ts
index 0359b2a2e55..d5e9e6ebfd5 100644
--- a/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.handler.ts
+++ b/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.handler.ts
@@ -10,7 +10,7 @@ import type { TrpcSessionUser } from "@calcom/trpc/server/types";
import { TRPCError } from "@trpc/server";
-import type { ZFormByResponseIdInputSchema } from "./_router";
+import type { ZFormByResponseIdInputSchema } from "./getResponseWithFormFields.schema";
type GetResponseWithFormFieldsOptions = {
ctx: {
diff --git a/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.schema.ts b/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.schema.ts
new file mode 100644
index 00000000000..0dd9b05ebb2
--- /dev/null
+++ b/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.schema.ts
@@ -0,0 +1,5 @@
+import { z } from "zod";
+
+export const ZFormByResponseIdInputSchema = z.object({
+ formResponseId: z.number(),
+});
diff --git a/packages/types/Calendar.d.ts b/packages/types/Calendar.d.ts
index f4344dae239..2b7d9eda655 100644
--- a/packages/types/Calendar.d.ts
+++ b/packages/types/Calendar.d.ts
@@ -6,7 +6,6 @@ import type { Frequency } from "rrule";
import type z from "zod";
import type { bookingResponse } from "@calcom/features/bookings/lib/getBookingResponsesSchema";
-import type { Calendar } from "@calcom/features/calendars/weeklyview";
import type { TimeFormat } from "@calcom/lib/timeFormat";
import type {
BookingSeat,
@@ -66,7 +65,6 @@ export type EventBusyDetails = EventBusyDate & {
userId?: number | null;
};
-export type CalendarServiceType = typeof Calendar;
export type AdditionalInfo = Record<string, unknown> & { calWarnings?: string[] };
export type NewCalendarEventType = {
@@ -104,9 +102,9 @@ export type CalendarEventType = {
isNegative: boolean;
};
organizer: string;
- attendees: any[][];
+ attendees: unknown[][];
recurrenceId: Time;
- timezone: any;
+ timezone: string | object;
};
export type BatchResponse = {
@@ -314,7 +312,7 @@ export interface Calendar {
/**
* @see [How to inference class type that implements an interface](https://stackoverflow.com/a/64765554/6297100)
*/
-type Class<I, Args extends any[] = any[]> = new (...args: Args) => I;
+type Class<I, Args extends unknown[] = unknown[]> = new (...args: Args) => I;
export type CalendarClass = Class<Calendar, [CredentialForCalendarService]>;