diff --git a/packages/features/ee/workflows/lib/constants.ts b/packages/features/ee/workflows/lib/constants.ts
index c127b471353f33..1445a1de6b0f0f 100644
--- a/packages/features/ee/workflows/lib/constants.ts
+++ b/packages/features/ee/workflows/lib/constants.ts
@@ -6,6 +6,8 @@ export const WORKFLOW_TRIGGER_EVENTS = [
WorkflowTriggerEvents.NEW_EVENT,
WorkflowTriggerEvents.AFTER_EVENT,
WorkflowTriggerEvents.RESCHEDULE_EVENT,
+ WorkflowTriggerEvents.AFTER_HOSTS_CAL_VIDEO_NO_SHOW,
+ WorkflowTriggerEvents.AFTER_GUESTS_CAL_VIDEO_NO_SHOW,
] as const;
export const WORKFLOW_ACTIONS = [
diff --git a/packages/features/ee/workflows/lib/getOptions.ts b/packages/features/ee/workflows/lib/getOptions.ts
index f8d74275d652c6..d015eef14a86ed 100644
--- a/packages/features/ee/workflows/lib/getOptions.ts
+++ b/packages/features/ee/workflows/lib/getOptions.ts
@@ -1,6 +1,7 @@
import type { TFunction } from "next-i18next";
import type { WorkflowActions } from "@calcom/prisma/enums";
+import { WorkflowTriggerEvents } from "@calcom/prisma/enums";
import { isSMSOrWhatsappAction, isWhatsappAction, isEmailToAttendeeAction } from "./actionHelperFunctions";
import {
@@ -24,7 +25,14 @@ export function getWorkflowActionOptions(t: TFunction, isTeamsPlan?: boolean, is
}
export function getWorkflowTriggerOptions(t: TFunction) {
- return WORKFLOW_TRIGGER_EVENTS.map((triggerEvent) => {
+ // TODO: remove this after workflows are supported
+ const filterdWorkflowTriggerEvents = WORKFLOW_TRIGGER_EVENTS.filter(
+ (event) =>
+ event !== WorkflowTriggerEvents.AFTER_HOSTS_CAL_VIDEO_NO_SHOW &&
+ event !== WorkflowTriggerEvents.AFTER_GUESTS_CAL_VIDEO_NO_SHOW
+ );
+
+ return filterdWorkflowTriggerEvents.map((triggerEvent) => {
const triggerString = t(`${triggerEvent.toLowerCase()}_trigger`);
return { label: triggerString.charAt(0).toUpperCase() + triggerString.slice(1), value: triggerEvent };
diff --git a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
index 08c1f89e86e2a2..fbf65ee3a02aa9 100644
--- a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
+++ b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
@@ -1,9 +1,8 @@
-import dynamic from "next/dynamic";
import { useState } from "react";
import { Controller, useFormContext } from "react-hook-form";
import type { z } from "zod";
-import type { EventAdvancedWebWrapperProps } from "@calcom/atoms/event-types/wrappers/EventAdvancedWebWrapper";
+import { useAtomsContext, useIsPlatform } from "@calcom/atoms/monorepo";
import type { EventNameObjectType } from "@calcom/core/event";
import { getEventName } from "@calcom/core/event";
import getLocationsOptionsForSelect from "@calcom/features/bookings/lib/getLocationOptionsForSelect";
@@ -14,7 +13,7 @@ import {
allowDisablingHostConfirmationEmails,
} from "@calcom/features/ee/workflows/lib/allowDisablingStandardEmails";
import { MultiplePrivateLinksController } from "@calcom/features/eventtypes/components";
-import type { FormValues } from "@calcom/features/eventtypes/lib/types";
+import type { FormValues, EventTypeSetupProps } from "@calcom/features/eventtypes/lib/types";
import { FormBuilder } from "@calcom/features/form-builder/FormBuilder";
import type { fieldSchema } from "@calcom/features/form-builder/schema";
import type { EditableSchema } from "@calcom/features/form-builder/schema";
@@ -39,21 +38,26 @@ import {
SettingsToggle,
Switch,
TextField,
- showToast,
ColorPicker,
} from "@calcom/ui";
+import CustomEventTypeModal from "./CustomEventTypeModal";
import { DisableAllEmailsSetting } from "./DisableAllEmailsSetting";
import RequiresConfirmationController from "./RequiresConfirmationController";
type BookingField = z.infer
;
-const CustomEventTypeModal = dynamic(() => import("./CustomEventTypeModal"));
+export type EventAdvancedBaseProps = Pick & {
+ user?: Partial<
+ Pick
+ >;
+ isUserLoading?: boolean;
+ showToast: (message: string, variant: "success" | "warning" | "error") => void;
+};
-export type EventAdvancedTabProps = EventAdvancedWebWrapperProps & {
+export type EventAdvancedTabProps = EventAdvancedBaseProps & {
calendarsQueryData?: RouterOutputs["viewer"]["connectedCalendars"];
- user?: RouterOutputs["viewer"]["me"];
- isUserLoading?: boolean;
+ showBookerLayoutSelector: boolean;
};
export const EventAdvancedTab = ({
@@ -62,7 +66,11 @@ export const EventAdvancedTab = ({
calendarsQueryData,
user,
isUserLoading,
+ showToast,
+ showBookerLayoutSelector,
}: EventAdvancedTabProps) => {
+ const isPlatform = useIsPlatform();
+ const platformContext = useAtomsContext();
const formMethods = useFormContext();
const { t } = useLocale();
const [showEventNameTip, setShowEventNameTip] = useState(false);
@@ -169,7 +177,7 @@ export const EventAdvancedTab = ({
const displayDestinationCalendarSelector =
!!calendarsQueryData?.connectedCalendars?.length && (!team || isChildrenManagedEventType);
- const verifiedSecondaryEmails = [
+ let verifiedSecondaryEmails = [
{
label: user?.email || "",
value: -1,
@@ -178,6 +186,20 @@ export const EventAdvancedTab = ({
.filter((secondaryEmail) => !!secondaryEmail.emailVerified)
.map((secondaryEmail) => ({ label: secondaryEmail.email, value: secondaryEmail.id })),
];
+
+ const removePlatformClientIdFromEmail = (email: string, clientId: string) =>
+ email.replace(`+${clientId}`, "");
+
+ let userEmail = user?.email || "";
+
+ if (isPlatform && platformContext.clientId) {
+ verifiedSecondaryEmails = verifiedSecondaryEmails.map((email) => ({
+ ...email,
+ label: removePlatformClientIdFromEmail(email.label, platformContext.clientId),
+ }));
+ userEmail = removePlatformClientIdFromEmail(userEmail, platformContext.clientId);
+ }
+
const selectedSecondaryEmailId = formMethods.getValues("secondaryEmailId") || -1;
return (
@@ -257,7 +279,7 @@ export const EventAdvancedTab = ({
placeholder={
selectedSecondaryEmailId === -1 && (
- {t("default")} {user?.email || ""}
+ {t("default")} {userEmail}
)
}
@@ -275,13 +297,15 @@ export const EventAdvancedTab = ({
)}
);
}}
/>
+
+ {showTimeSection && (
+