+1


![coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>](/assets/img/avatar_default.png)



![Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>](/assets/img/avatar_default.png)


Carina Wollendorfer
GitHub
Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
amit@cal.com <samit91848@gmail.com>
Amit Sharma
CarinaWolli
coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Udit Takkar
Benny Joo
cal.com
Morgan
44a3a9eabb
* feat: add 5 new workflow triggers for booking events
- Add BOOKING_REJECTED, BOOKING_REQUESTED, BOOKING_PAYMENT_INITIATED, BOOKING_PAID, BOOKING_NO_SHOW_UPDATED to WorkflowTriggerEvents enum
- Update workflow constants to include new trigger options
- Implement workflow trigger logic for booking rejected and requested events
- Add translations for new workflow triggers following {enum}_trigger format
- Generate updated Prisma types for new schema changes
Co-Authored-By: amit@cal.com <samit91848@gmail.com>
* fix: type check, remove as any
* feat: add workflow trigger for BOOKING_REQUESTED in handleNewBooking.ts
- Add WorkflowTriggerEvents import to handleNewBooking.ts
- Implement workflow trigger logic for BOOKING_REQUESTED in else block
- Filter workflows by BOOKING_REQUESTED trigger and call scheduleWorkflowReminders
- Use proper calendar event object construction without type casting
- Add error handling for workflow reminder scheduling
Co-Authored-By: amit@cal.com <samit91848@gmail.com>
* fix: resolve type errors in workflow trigger implementations
- Add proper database includes for user information in handleConfirmation.ts
- Fix ExtendedCalendarEvent type structure with correct hosts mapping
- Add missing properties to calendar event objects in handleMarkNoShow.ts
- Ensure all workflow triggers follow proper type patterns
Co-Authored-By: amit@cal.com <samit91848@gmail.com>
* feat: add workflow test configurations for new booking triggers
- Add workflow configurations for BOOKING_REQUESTED and BOOKING_PAYMENT_INITIATED in fresh-booking.test.ts
- Add workflow configuration for BOOKING_REJECTED in confirm.handler.test.ts
- Enable previously skipped confirm.handler.test.ts
- Remove workflow test assertions temporarily until triggers are fully functional
- Maintain webhook test coverage while adding workflow test infrastructure
Co-Authored-By: amit@cal.com <samit91848@gmail.com>
* fix: add missing mockSuccessfulVideoMeetingCreation import to confirm.handler.test.ts
- Import mockSuccessfulVideoMeetingCreation from bookingScenario utils
- Add mock call to BOOKING_REJECTED workflow test case
- Resolves ReferenceError that was causing unit test CI failure
Co-Authored-By: amit@cal.com <samit91848@gmail.com>
* add new triggers
* refactor: improve _scheduleWorkflowReminders readability and add missing booking trigger events
- Extract complex conditional logic into helper functions (isImmediateTrigger, isTimeBased, shouldProcessWorkflow)
- Add missing workflow trigger events with immediate execution logic
- Update test workflows to use different actions (EMAIL_ATTENDEE, SMS_ATTENDEE) for better differentiation
- Fix translation function mock in confirm.handler.test.ts using mockNoTranslations utility
- Maintain existing functionality while improving code maintainability
Co-Authored-By: amit@cal.com <samit91848@gmail.com>
* only show customt emplate for form triggers
* filter outside scheduleWorkflowReminder
* fix type check
* chore: add more tests
* test: add comprehensive unit tests for handleMarkNoShow with webhook and workflow coverage
- Create handleMarkNoShow.test.ts following confirm.handler.test.ts pattern
- Add expectBookingNoShowUpdatedWebhookToHaveBeenFired utility function
- Test both webhook and workflow triggers for BOOKING_NO_SHOW_UPDATED
- Cover attendee/host no-show scenarios, multiple attendees, and error cases
- All 6 unit tests pass with proper mocking of external dependencies
Co-Authored-By: amit@cal.com <samit91848@gmail.com>
* Revert "test: add comprehensive unit tests for handleMarkNoShow with webhook and workflow coverage"
This reverts commit 764299220279f0c012392dec24d3150246bfc4ad.
* fix: add new workflow triggers to api/v2
* update swagger docs
* fix: e2e
* fix type check
* fix tests, add test for before after events
* fix unit tests
* revert confirm.handler.test
* fix: unit tests
* dummy form variables
* add routing forms to active on dropdown
* add migration file
* Ui fixes for variables dropdown
* remove other translation keys
* review fixes
* allow routing forms for activeOn
* use repository function to get routing forms
* remove unnecessary code
* adjust logic in update handler
* add triggers to api v2
* remvoe unused file
* rename to getAcitveOnOptions handler
* remove routingFormOptions handler
* clean up getActiveOnOptions
* refactor WorkflowService
* remove logs
* remove unused
* fix: type check
* fix: missed before after events for recurring
* fix: calendarEvent handleMarkNoShow
* fix error message
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
* don't query disabled routing forms
* create tasker function
* add tasker code
* move isFormTrigger function
* small adjustments + todo comments
* remove email to host action for form triggers
* throw trpc error if email to host is added as step
* fix dialog on how to use form responses as variables
* remove add variable dropdown for form triggers
* remove form workfows in event workflows tab
* improvements for workflow logic on form submission
* review fixes
* base setup for seperate schedule functions (evt and form)
* add missing BOOKING_PAID workflow trigger
* fix pathname
* fix: test for BOOKING_REQUESTED
* fix activeOn ids
* pass hideBranding and smsReminderNumber
* adjustments to reminderScheduler
* create empty scheduelForForm functions
* pass locale and timezone with form user
* pass formData instead of responses
* pass timeFormat and locale
* reusable function for email sending and reminder creation
* implement scheduleEmailReminderForForm
* remove added editor field from merge conflict
* don't support cal.ai action with form triggers
* throw bad request if form trigger and cal.ai is combined
* add tests for scheduleFormWorkflows
* add form submission tests
* remove form response varibe info
* clean up workflow actions
* fixes for getting template options
* pass triggerType to getAllWorkflows
* move reusable logic to scheduleSMSReminder
* add formdata to param type
* type fixes for text reminder managers
* implement scheduleSMSReminderForForm
* fix import
* fix isAuthorizedToAddActiveOnIds
* disble whatsapp action
* implement triggerFormSubmittedNoEventWorkflow
* code clean up
* Merge branch 'devin/1755107037-add-workflow-triggers' into feat/routing-form-workflow-triggers
* fix type errors
* remove async from getSubmitterEmail
* fix type errors
* revert cal.ai changes
* fix type error
* add sublogger
* code clean up
* fix type errors
* remove label for attendee whatsapp action
* code clean up
* fixes saving teams on org workflows
* fix type error
* code improvements for activeOn ids
* Revert "code improvements for activeOn ids"
This reverts commit 0a3590a4e2ce541b17d63483ad86ed458795a6a3.
* improve variable name
* fix unit tests
* small fixes
* type fixes
* remove unused translation keys
* fix merge conflict issues
* code clean up
* remove SMS action support
* remove more SMS code
* add missing imports
* set custom template for form action
* type fixes
* fix tasker endpoint
* fix duplicate check
* fix workfows.test.ts
* use repository funciton to getHideBranding
* code clean up
* fix hasDuplicateSubmission
* code clean up
* select only needed properties
* remove repository functions
* Revert "remove repository functions"
This reverts commit 7aa47b1c59c9abd7f964ebf26f746934c53a44f4.
* add scheduleWorkflows function
* Revert "add scheduleWorkflows function"
This reverts commit fe5db4fe3b65e2743c95475d585300cab98beed7.
* move type to /types
* Revert "move type to /types"
This reverts commit 91e0152154594b3772a801a426260068a8ccea54.
* revert changes causing type errors
* remove import
* remove unused import
* Revert "remove unused import"
This reverts commit 1916768c875ea5d0ac5598ccb8f9c796c5622dc9.
* revert changed from attempt to fix type errors
* pass object to gt all workflows
* fix isAuthorized check
* trigger filtering
* remove form submitted no event booked code
* remove form submitted no event from schema
* remove more code
* remove test
* fixes
* add getSubmitterEmail function
* add missing workflow DTOs
* small fixes
* use activeOnWithChildren
* fix active on when switching trigger type
* remove add variable dropdown
* add getAllWorkflowsFromRoutingForm to WorkflowService
* fix error caused by undefined evt
* fix type error
* fix type error
* fix tests
* code clean up
* remove console.log
* remove template text form from triggers
* add routing form repoditory function
* fix bug with key
* add missing trigger in update-workflow.input.ts
* ForEvt and ForForm function for aiPhoneCallManager
* chore: add support for form workflows on api v2
* fixup! chore: add support for form workflows on api v2
* use only repository functions in update handler
* move all prisma queries from list.handler
* review suggestions
* chore: handle workflows api v2
* chore: handle workflows api v2, split in 2 endpoints
* fix workflow step creation
* remove connect agent and fixes types
* add type to workflow
* chore: use workflow type in apiv2 WorkflowsOutputService
* update worklfow type on update
* chore: use workflow type in apiv2 WorkflowsOutputService
* fix template body for torm trigger
* some UI fixes for email subject/body
* resetting email body when changing form triggers
* use type field to query workflows
* clean up all old active on values
* remove responseId from all funciton calls
* remove undefined from updateTemplate
* refactor: split routing form and event-type workflows code
* refactor: split routing form and event-type workflows code
* fix template text when adding action
* chore: don't rename WorkflowActivationDto to avoid ci blocking
* refine update schedule to use only allowed actions
* fix type error
* don't allow whatsapp action with form trigger
* fix type error
* return early if activeOn array is empty
* fix: from step type in BaseFormWorkflowStepDto
* fixup! fix: from step type in BaseFormWorkflowStepDto
* move all prisma calls to repository (service/workflows.ts)
* use FORM_TRIGGER_WORKFLOW_EVENTS for form queries
* use userRepository
* use FORM_TRIGGER_WORKFLOW_EVENTS in isFormTrigger
* code clean up
* code clean up
* add back trpc import
* fix agent repository functions
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: amit@cal.com <samit91848@gmail.com>
Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com>
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: Benny Joo <sldisek783@gmail.com>
Co-authored-by: cal.com <morgan@cal.com>
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
270 lines
9.6 KiB
TypeScript
270 lines
9.6 KiB
TypeScript
import { zodResolver } from "@hookform/resolvers/zod";
|
|
import { isValidPhoneNumber } from "libphonenumber-js";
|
|
import type { Dispatch, SetStateAction } from "react";
|
|
import { useState } from "react";
|
|
import { Controller, useForm } from "react-hook-form";
|
|
import { z } from "zod";
|
|
|
|
import { Dialog } from "@calcom/features/components/controlled-dialog";
|
|
import PhoneInput from "@calcom/features/components/phone-input";
|
|
import { SENDER_ID, SENDER_NAME } from "@calcom/lib/constants";
|
|
import { useLocale } from "@calcom/lib/hooks/useLocale";
|
|
import { WorkflowActions } from "@calcom/prisma/enums";
|
|
import { Button } from "@calcom/ui/components/button";
|
|
import { DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
|
|
import { EmailField } from "@calcom/ui/components/form";
|
|
import { Select } from "@calcom/ui/components/form";
|
|
import { CheckboxField } from "@calcom/ui/components/form";
|
|
import { Form } from "@calcom/ui/components/form";
|
|
import { Label } from "@calcom/ui/components/form";
|
|
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>>;
|
|
addAction: (
|
|
action: WorkflowActions,
|
|
sendTo?: string,
|
|
numberRequired?: boolean,
|
|
senderId?: string,
|
|
senderName?: string
|
|
) => void;
|
|
actionOptions: {
|
|
label: string;
|
|
value: WorkflowActions;
|
|
needsCredits: boolean;
|
|
creditsTeamId?: number;
|
|
isOrganization?: boolean;
|
|
}[];
|
|
}
|
|
|
|
interface ISelectActionOption {
|
|
label: string;
|
|
value: WorkflowActions;
|
|
}
|
|
|
|
type AddActionFormValues = {
|
|
action: WorkflowActions;
|
|
sendTo?: string;
|
|
numberRequired?: boolean;
|
|
senderId?: string;
|
|
senderName?: string;
|
|
};
|
|
|
|
export const AddActionDialog = (props: IAddActionDialog) => {
|
|
const { t } = useLocale();
|
|
const { isOpenDialog, setIsOpenDialog, addAction, actionOptions } = props;
|
|
const [isPhoneNumberNeeded, setIsPhoneNumberNeeded] = useState(false);
|
|
const [isSenderIdNeeded, setIsSenderIdNeeded] = useState(false);
|
|
const [isEmailAddressNeeded, setIsEmailAddressNeeded] = useState(false);
|
|
|
|
const formSchema = z.object({
|
|
action: z.enum(WORKFLOW_ACTIONS),
|
|
sendTo: z
|
|
.string()
|
|
.refine((val) => isValidPhoneNumber(val) || val.includes("@"))
|
|
.optional(),
|
|
numberRequired: z.boolean().optional(),
|
|
senderId: z
|
|
.string()
|
|
.refine((val) => onlyLettersNumbersSpaces(val))
|
|
.nullable(),
|
|
senderName: z.string().nullable(),
|
|
});
|
|
|
|
const form = useForm<AddActionFormValues>({
|
|
mode: "onSubmit",
|
|
defaultValues: {
|
|
action: WorkflowActions.EMAIL_HOST,
|
|
senderId: SENDER_ID,
|
|
senderName: SENDER_NAME,
|
|
},
|
|
resolver: zodResolver(formSchema),
|
|
});
|
|
|
|
const handleSelectAction = (newValue: ISelectActionOption | null) => {
|
|
if (newValue) {
|
|
form.setValue("action", newValue.value);
|
|
if (newValue.value === WorkflowActions.SMS_NUMBER) {
|
|
setIsPhoneNumberNeeded(true);
|
|
setIsSenderIdNeeded(true);
|
|
setIsEmailAddressNeeded(false);
|
|
form.resetField("senderId", { defaultValue: SENDER_ID });
|
|
} else if (newValue.value === WorkflowActions.EMAIL_ADDRESS) {
|
|
setIsEmailAddressNeeded(true);
|
|
setIsSenderIdNeeded(false);
|
|
setIsPhoneNumberNeeded(false);
|
|
} else if (newValue.value === WorkflowActions.SMS_ATTENDEE) {
|
|
setIsSenderIdNeeded(true);
|
|
setIsEmailAddressNeeded(false);
|
|
setIsPhoneNumberNeeded(false);
|
|
form.resetField("senderId", { defaultValue: SENDER_ID });
|
|
} else if (newValue.value === WorkflowActions.WHATSAPP_NUMBER) {
|
|
setIsSenderIdNeeded(false);
|
|
setIsPhoneNumberNeeded(true);
|
|
setIsEmailAddressNeeded(false);
|
|
} else {
|
|
setIsSenderIdNeeded(false);
|
|
setIsEmailAddressNeeded(false);
|
|
setIsPhoneNumberNeeded(false);
|
|
}
|
|
form.unregister("sendTo");
|
|
form.unregister("numberRequired");
|
|
form.clearErrors("action");
|
|
form.clearErrors("sendTo");
|
|
}
|
|
};
|
|
|
|
if (!actionOptions) return null;
|
|
|
|
const canRequirePhoneNumber = (workflowStep: string) => {
|
|
return (
|
|
WorkflowActions.SMS_ATTENDEE === workflowStep || WorkflowActions.WHATSAPP_ATTENDEE === workflowStep
|
|
);
|
|
};
|
|
|
|
const showSender = (action: string) => {
|
|
return (
|
|
!isSenderIdNeeded &&
|
|
!(WorkflowActions.WHATSAPP_NUMBER === action || WorkflowActions.WHATSAPP_ATTENDEE === action)
|
|
);
|
|
};
|
|
|
|
return (
|
|
<Dialog open={isOpenDialog} onOpenChange={setIsOpenDialog}>
|
|
<DialogContent enableOverflow type="creation" title={t("add_action")}>
|
|
<div className="-mt-3 space-x-3">
|
|
<Form
|
|
form={form}
|
|
handleSubmit={(values) => {
|
|
addAction(
|
|
values.action,
|
|
values.sendTo,
|
|
values.numberRequired,
|
|
values.senderId,
|
|
values.senderName
|
|
);
|
|
form.unregister("sendTo");
|
|
form.unregister("action");
|
|
form.unregister("numberRequired");
|
|
setIsOpenDialog(false);
|
|
setIsPhoneNumberNeeded(false);
|
|
setIsEmailAddressNeeded(false);
|
|
setIsSenderIdNeeded(false);
|
|
}}>
|
|
<div className="space-y-1">
|
|
<Label htmlFor="label">{t("action")}:</Label>
|
|
<Controller
|
|
name="action"
|
|
control={form.control}
|
|
render={() => {
|
|
return (
|
|
<Select
|
|
isSearchable={false}
|
|
className="text-sm"
|
|
menuPlacement="bottom"
|
|
defaultValue={actionOptions[0]}
|
|
onChange={handleSelectAction}
|
|
options={actionOptions}
|
|
/>
|
|
);
|
|
}}
|
|
/>
|
|
{form.formState.errors.action && (
|
|
<p className="mt-1 text-sm text-red-500">{form.formState.errors.action.message}</p>
|
|
)}
|
|
</div>
|
|
{isPhoneNumberNeeded && (
|
|
<div className="mt-5 space-y-1">
|
|
<Label htmlFor="sendTo">{t("phone_number")}</Label>
|
|
<div className="mb-5 mt-1">
|
|
<Controller
|
|
control={form.control}
|
|
name="sendTo"
|
|
render={({ field: { value, onChange } }) => (
|
|
<PhoneInput
|
|
className="rounded-md"
|
|
placeholder={t("enter_phone_number")}
|
|
id="sendTo"
|
|
required
|
|
value={value}
|
|
onChange={onChange}
|
|
/>
|
|
)}
|
|
/>
|
|
{form.formState.errors.sendTo && (
|
|
<p className="mt-1 text-sm text-red-500">{form.formState.errors.sendTo.message}</p>
|
|
)}
|
|
</div>
|
|
</div>
|
|
)}
|
|
{isEmailAddressNeeded && (
|
|
<div className="mt-5">
|
|
<EmailField required label={t("email_address")} {...form.register("sendTo")} />
|
|
</div>
|
|
)}
|
|
{isSenderIdNeeded && (
|
|
<>
|
|
<div className="mt-5">
|
|
<div className="flex items-center">
|
|
<Label>{t("sender_id")}</Label>
|
|
<Tooltip content={t("sender_id_info")}>
|
|
<span>
|
|
<Icon name="info" className="mb-2 ml-2 mr-1 mt-0.5 h-4 w-4 text-gray-500" />
|
|
</span>
|
|
</Tooltip>
|
|
</div>
|
|
<Input type="text" placeholder={SENDER_ID} maxLength={11} {...form.register(`senderId`)} />
|
|
</div>
|
|
{form.formState.errors && form.formState?.errors?.senderId && (
|
|
<p className="mt-1 text-xs text-red-500">{t("sender_id_error_message")}</p>
|
|
)}
|
|
</>
|
|
)}
|
|
{showSender(form.getValues("action")) && (
|
|
<div className="mt-5">
|
|
<Label>{t("sender_name")}</Label>
|
|
<Input type="text" placeholder={SENDER_NAME} {...form.register(`senderName`)} />
|
|
</div>
|
|
)}
|
|
{canRequirePhoneNumber(form.getValues("action")) && (
|
|
<div className="mt-5">
|
|
<Controller
|
|
name="numberRequired"
|
|
control={form.control}
|
|
render={() => (
|
|
<CheckboxField
|
|
defaultChecked={form.getValues("numberRequired") || false}
|
|
description={t("make_phone_number_required")}
|
|
onChange={(e) => form.setValue("numberRequired", e.target.checked)}
|
|
/>
|
|
)}
|
|
/>
|
|
</div>
|
|
)}
|
|
<DialogFooter showDivider className="mt-12">
|
|
<DialogClose
|
|
onClick={() => {
|
|
setIsOpenDialog(false);
|
|
form.unregister("sendTo");
|
|
form.unregister("action");
|
|
form.unregister("numberRequired");
|
|
setIsPhoneNumberNeeded(false);
|
|
setIsEmailAddressNeeded(false);
|
|
setIsSenderIdNeeded(false);
|
|
}}
|
|
/>
|
|
<Button type="submit">{t("add")}</Button>
|
|
</DialogFooter>
|
|
</Form>
|
|
</div>
|
|
</DialogContent>
|
|
</Dialog>
|
|
);
|
|
};
|