diff --git a/apps/web/ee/components/workflows/WorkflowDetailsPage.tsx b/apps/web/ee/components/workflows/WorkflowDetailsPage.tsx index 4641815922..51659d6762 100644 --- a/apps/web/ee/components/workflows/WorkflowDetailsPage.tsx +++ b/apps/web/ee/components/workflows/WorkflowDetailsPage.tsx @@ -1,6 +1,6 @@ import { WorkflowActions, WorkflowTemplates } from "@prisma/client"; import { useRouter } from "next/router"; -import { useState, useEffect, Dispatch, SetStateAction } from "react"; +import { useState, Dispatch, SetStateAction, useMemo } from "react"; import { Controller, UseFormReturn } from "react-hook-form"; import { useLocale } from "@calcom/lib/hooks/useLocale"; @@ -10,14 +10,14 @@ import { Button } from "@calcom/ui"; import { Form } from "@calcom/ui/form/fields"; import { AddActionDialog } from "@ee/components/workflows/AddActionDialog"; import WorkflowStepContainer from "@ee/components/workflows/WorkflowStepContainer"; -import { Option, FormValues } from "@ee/pages/workflows/[workflow]"; +import { FormValues } from "@ee/pages/workflows/[workflow]"; import { trpc } from "@lib/trpc"; -import MultiSelectCheckboxes from "@components/ui/form/MultiSelectCheckboxes"; +import MultiSelectCheckboxes, { Option } from "@components/ui/form/MultiSelectCheckboxes"; interface Props { - form: UseFormReturn; + form: UseFormReturn; workflowId: number; selectedEventTypes: Option[]; setSelectedEventTypes: Dispatch>; @@ -29,30 +29,31 @@ export default function WorkflowDetailsPage(props: Props) { const router = useRouter(); const utils = trpc.useContext(); - const [evenTypeOptions, setEventTypeOptions] = useState([]); const [isAddActionDialogOpen, setIsAddActionDialogOpen] = useState(false); const [reload, setReload] = useState(false); const [editCounter, setEditCounter] = useState(0); const { data, isLoading } = trpc.useQuery(["viewer.eventTypes"]); - useEffect(() => { - if (data) { - let options: Option[] = []; - data.eventTypeGroups.forEach((group) => { - const eventTypeOptions = group.eventTypes.map((eventType) => { - return { value: String(eventType.id), label: eventType.title }; - }); - options = [...options, ...eventTypeOptions]; - }); - setEventTypeOptions(options); - } - }, [isLoading]); + const eventTypeOptions = useMemo( + () => + data?.eventTypeGroups.reduce( + (options, group) => [ + ...options, + ...group.eventTypes.map((eventType) => ({ + value: String(eventType.id), + label: eventType.title, + })), + ], + [] as Option[] + ) || [], + [data] + ); const updateMutation = trpc.useMutation("viewer.workflows.update", { onSuccess: async ({ workflow }) => { if (workflow) { - await utils.setQueryData(["viewer.workflows.get", { id: +workflow.id }], workflow); + utils.setQueryData(["viewer.workflows.get", { id: +workflow.id }], workflow); showToast( t("workflow_updated_successfully", { @@ -74,7 +75,7 @@ export default function WorkflowDetailsPage(props: Props) { const addAction = (action: WorkflowActions, sendTo?: string) => { const steps = form.getValues("steps"); const id = - steps && steps.length > 0 + steps?.length > 0 ? steps.sort((a, b) => { return a.id - b.id; })[0].id - 1 @@ -130,7 +131,7 @@ export default function WorkflowDetailsPage(props: Props) { render={() => { return ( ; + form: UseFormReturn; reload?: boolean; setReload?: Dispatch>; editCounter: number; diff --git a/apps/web/ee/lib/workflows/reminders/emailReminderManager.ts b/apps/web/ee/lib/workflows/reminders/emailReminderManager.ts index 1d15d6254d..76bbb0a809 100644 --- a/apps/web/ee/lib/workflows/reminders/emailReminderManager.ts +++ b/apps/web/ee/lib/workflows/reminders/emailReminderManager.ts @@ -46,7 +46,10 @@ export const scheduleEmailReminder = async ( const scheduledDate = timeBefore.time && timeUnit ? dayjs(startTime).subtract(timeBefore.time, timeUnit) : null; - if (!process.env.SENDGRID_API_KEY || !process.env.SENDGRID_EMAIL) return; + if (!process.env.SENDGRID_API_KEY || !process.env.SENDGRID_EMAIL) { + console.error("Sendgrid credentials are missing from the .env file"); + return; + } const batchIdResponse = await client.request({ url: "/v3/mail/batch", diff --git a/apps/web/ee/lib/workflows/reminders/smsReminderManager.ts b/apps/web/ee/lib/workflows/reminders/smsReminderManager.ts index 78473f2ea4..62745da685 100644 --- a/apps/web/ee/lib/workflows/reminders/smsReminderManager.ts +++ b/apps/web/ee/lib/workflows/reminders/smsReminderManager.ts @@ -4,7 +4,7 @@ import { WorkflowTemplates, WorkflowActions, WorkflowMethods, -} from "@prisma/client/"; +} from "@prisma/client"; import dayjs from "@calcom/dayjs"; import prisma from "@calcom/prisma"; diff --git a/apps/web/ee/pages/workflows/[workflow].tsx b/apps/web/ee/pages/workflows/[workflow].tsx index 3365b37de2..7128dd08b9 100644 --- a/apps/web/ee/pages/workflows/[workflow].tsx +++ b/apps/web/ee/pages/workflows/[workflow].tsx @@ -24,11 +24,7 @@ import useMeQuery from "@lib/hooks/useMeQuery"; import { trpc } from "@lib/trpc"; import Shell from "@components/Shell"; - -export type Option = { - value: string; - label: string; -}; +import { Option } from "@components/ui/form/MultiSelectCheckboxes"; export type FormValues = { name: string; @@ -39,6 +35,30 @@ export type FormValues = { timeUnit?: TimeUnit; }; +const formSchema = z.object({ + name: z.string(), + activeOn: z.object({ value: z.string(), label: z.string() }).array(), + trigger: z.enum(WORKFLOW_TRIGGER_EVENTS), + time: z.number().gte(0).optional(), + timeUnit: z.enum(TIME_UNIT).optional(), + steps: z + .object({ + id: z.number(), + stepNumber: z.number(), + action: z.enum(WORKFLOW_ACTIONS), + workflowId: z.number(), + reminderBody: z.string().optional().nullable(), + emailSubject: z.string().optional().nullable(), + template: z.enum(WORKFLOW_TEMPLATES), + sendTo: z + .string() + .refine((val) => isValidPhoneNumber(val)) + .optional() + .nullable(), + }) + .array(), +}); + function WorkflowPage() { const { t } = useLocale(); const session = useSession(); @@ -50,30 +70,6 @@ function WorkflowPage() { const [selectedEventTypes, setSelectedEventTypes] = useState([]); const [isAllDataLoaded, setIsAllDataLoaded] = useState(false); - const formSchema = z.object({ - name: z.string(), - activeOn: z.object({ value: z.string(), label: z.string() }).array(), - trigger: z.enum(WORKFLOW_TRIGGER_EVENTS), - time: z.number().gte(0).optional(), - timeUnit: z.enum(TIME_UNIT).optional(), - steps: z - .object({ - id: z.number(), - stepNumber: z.number(), - action: z.enum(WORKFLOW_ACTIONS), - workflowId: z.number(), - reminderBody: z.string().optional().nullable(), - emailSubject: z.string().optional().nullable(), - template: z.enum(WORKFLOW_TEMPLATES), - sendTo: z - .string() - .refine((val) => isValidPhoneNumber(val)) - .optional() - .nullable(), - }) - .array(), - }); - const form = useForm({ resolver: zodResolver(formSchema), }); @@ -113,15 +109,12 @@ function WorkflowPage() { } }, [dataUpdatedAt]); - if (isLoading) { - return ; - } - return ( setEditIcon(false)}> {editIcon ? ( <> diff --git a/apps/web/ee/pages/workflows/index.tsx b/apps/web/ee/pages/workflows/index.tsx index d2fc642482..a324eb6b3d 100644 --- a/apps/web/ee/pages/workflows/index.tsx +++ b/apps/web/ee/pages/workflows/index.tsx @@ -26,7 +26,7 @@ function WorkflowsPage() { : <>}> + CTA={session.data?.hasValidLicense && !isFreeUser ? : <>}> {isLoading ? ( diff --git a/packages/emails/templates/workflow-reminder-email.ts b/packages/emails/templates/workflow-reminder-email.ts index b1565001ce..e9faa079a0 100644 --- a/packages/emails/templates/workflow-reminder-email.ts +++ b/packages/emails/templates/workflow-reminder-email.ts @@ -1,17 +1,5 @@ -import dayjs from "@calcom/dayjs"; -import localizedFormat from "dayjs/plugin/localizedFormat"; -import timezone from "dayjs/plugin/timezone"; -import toArray from "dayjs/plugin/toArray"; -import utc from "dayjs/plugin/utc"; - import BaseEmail from "./_base-email"; import { BookingInfo } from "@calcom/web/ee/lib/workflows/reminders/smsReminderManager"; - -dayjs.extend(utc); -dayjs.extend(timezone); -dayjs.extend(localizedFormat); -dayjs.extend(toArray); - export default class WorkflowReminderEmail extends BaseEmail { sendTo: string; body: string;