diff --git a/apps/web/modules/availability/[schedule]/schedule-view.tsx b/apps/web/modules/availability/[schedule]/schedule-view.tsx index fc5a8abad0..bbc69bc9ac 100644 --- a/apps/web/modules/availability/[schedule]/schedule-view.tsx +++ b/apps/web/modules/availability/[schedule]/schedule-view.tsx @@ -57,6 +57,7 @@ export const AvailabilitySettingsWebWrapper = ({ bulkUpdateDefaultAvailabilityMutation.mutate( { eventTypeIds, + selectedDefaultScheduleId: scheduleData?.id, }, { onSuccess: () => { diff --git a/packages/trpc/server/routers/viewer/availability/schedule/bulkUpdateDefaultAvailability.handler.ts b/packages/trpc/server/routers/viewer/availability/schedule/bulkUpdateDefaultAvailability.handler.ts index 6ee101e28e..21da679247 100644 --- a/packages/trpc/server/routers/viewer/availability/schedule/bulkUpdateDefaultAvailability.handler.ts +++ b/packages/trpc/server/routers/viewer/availability/schedule/bulkUpdateDefaultAvailability.handler.ts @@ -16,10 +16,10 @@ export const bulkUpdateToDefaultAvailabilityHandler = async ({ ctx, input, }: BulkUpdateToDefaultAvailabilityOptions) => { - const { eventTypeIds } = input; + const { eventTypeIds, selectedDefaultScheduleId } = input; const defaultScheduleId = ctx.user.defaultScheduleId; - if (!defaultScheduleId) { + if (!selectedDefaultScheduleId && !defaultScheduleId) { throw new TRPCError({ code: "BAD_REQUEST", message: "Default schedule not set", @@ -34,7 +34,7 @@ export const bulkUpdateToDefaultAvailabilityHandler = async ({ userId: ctx.user.id, }, data: { - scheduleId: defaultScheduleId, + scheduleId: selectedDefaultScheduleId || defaultScheduleId, }, }); }; diff --git a/packages/trpc/server/routers/viewer/availability/schedule/bulkUpdateDefaultAvailability.schema.ts b/packages/trpc/server/routers/viewer/availability/schedule/bulkUpdateDefaultAvailability.schema.ts index 52374c1d65..ca3f65c1f5 100644 --- a/packages/trpc/server/routers/viewer/availability/schedule/bulkUpdateDefaultAvailability.schema.ts +++ b/packages/trpc/server/routers/viewer/availability/schedule/bulkUpdateDefaultAvailability.schema.ts @@ -2,6 +2,7 @@ import { z } from "zod"; export const ZBulkUpdateToDefaultAvailabilityInputSchema = z.object({ eventTypeIds: z.array(z.number()), + selectedDefaultScheduleId: z.number().nullable().optional(), }); export type TBulkUpdateToDefaultAvailabilityInputSchema = z.infer<