commonscomputer/cal.diy
5
0 Fork 0
Code Issues Pull Requests Actions 2.0k Packages Projects Releases Wiki Activity

revert: "feat: Ability to set a locked timezone for event type (#20425)" (#21066)

Browse Source 
This reverts commit 03240709dc.
This commit is contained in:
Keith Williams authored and GitHub committed 2025-05-01 21:51:20 +00:00
1 parent d9b3f8657f
commit 08d232a816
19 files changed
+11 -65
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

apps/web/server/lib/[user]/getServerSideProps.ts
-1
View File
@@ -59,7 +59,6 @@ type UserPageProps = {
| "length"
| "hidden"
| "lockTimeZoneToggleOnBookingPage"
| "lockedTimeZone"
| "requiresConfirmation"
| "canSendCalVideoTranscriptionEmails"
| "requiresBookerEmailVerification"
apps/web/test/lib/handleChildrenEventTypes.test.ts
-12
View File
@@ -111,7 +111,6 @@ describe("handleChildrenEventTypes", () => {
timeZone,
requiresBookerEmailVerification,
lockTimeZoneToggleOnBookingPage,
lockedTimeZone,
useEventTypeDestinationCalendarEmail,
secondaryEmailId,
autoTranslateDescriptionEnabled,
@@ -137,7 +136,6 @@ describe("handleChildrenEventTypes", () => {
parentId: 1,
users: { connect: [{ id: 4 }] },
lockTimeZoneToggleOnBookingPage: false,
lockedTimeZone: "Europe/London",
requiresBookerEmailVerification: false,
instantMeetingScheduleId: undefined,
bookingLimits: undefined,
@@ -170,7 +168,6 @@ describe("handleChildrenEventTypes", () => {
scheduleId,
requiresBookerEmailVerification,
lockTimeZoneToggleOnBookingPage,
lockedTimeZone,
useEventTypeDestinationCalendarEmail,
secondaryEmailId,
...evType
@@ -201,7 +198,6 @@ describe("handleChildrenEventTypes", () => {
locations: [],
scheduleId: null,
lockTimeZoneToggleOnBookingPage: false,
lockedTimeZone: "Europe/London",
requiresBookerEmailVerification: false,
hashedLink: {
deleteMany: {},
@@ -276,7 +272,6 @@ describe("handleChildrenEventTypes", () => {
timeZone,
requiresBookerEmailVerification,
lockTimeZoneToggleOnBookingPage,
lockedTimeZone,
useEventTypeDestinationCalendarEmail,
secondaryEmailId,
autoTranslateDescriptionEnabled,
@@ -309,7 +304,6 @@ describe("handleChildrenEventTypes", () => {
customReplyToEmail: null,
instantMeetingScheduleId: undefined,
lockTimeZoneToggleOnBookingPage: false,
lockedTimeZone: "Europe/London",
requiresBookerEmailVerification: false,
userId: 4,
workflows: undefined,
@@ -336,7 +330,6 @@ describe("handleChildrenEventTypes", () => {
userId,
requiresBookerEmailVerification,
lockTimeZoneToggleOnBookingPage,
lockedTimeZone,
useEventTypeDestinationCalendarEmail,
secondaryEmailId,
...evType
@@ -370,7 +363,6 @@ describe("handleChildrenEventTypes", () => {
deleteMany: {},
},
lockTimeZoneToggleOnBookingPage: false,
lockedTimeZone: "Europe/London",
requiresBookerEmailVerification: false,
instantMeetingScheduleId: undefined,
},
@@ -401,7 +393,6 @@ describe("handleChildrenEventTypes", () => {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
requiresBookerEmailVerification,
lockTimeZoneToggleOnBookingPage,
lockedTimeZone,
useEventTypeDestinationCalendarEmail,
secondaryEmailId,
autoTranslateDescriptionEnabled,
@@ -427,7 +418,6 @@ describe("handleChildrenEventTypes", () => {
schedulingType: SchedulingType.MANAGED,
requiresBookerEmailVerification: false,
lockTimeZoneToggleOnBookingPage: false,
lockedTimeZone: "Europe/London",
useEventTypeDestinationCalendarEmail: false,
workflows: [],
parentId: 1,
@@ -462,7 +452,6 @@ describe("handleChildrenEventTypes", () => {
instantMeetingScheduleId: undefined,
locations: [],
lockTimeZoneToggleOnBookingPage: false,
lockedTimeZone: "Europe/London",
requiresBookerEmailVerification: false,
parentId: 1,
userId: 5,
@@ -489,7 +478,6 @@ describe("handleChildrenEventTypes", () => {
customReplyToEmail: null,
rrSegmentQueryValue: undefined,
lockTimeZoneToggleOnBookingPage: false,
lockedTimeZone: "Europe/London",
requiresBookerEmailVerification: false,
hashedLink: {
deleteMany: {},
docs/platform/guides/teams-setup.mdx
+1 -1
View File
@@ -245,4 +245,4 @@ export default function TeamEvent(){
</Step>
</Steps>
</Steps>
packages/features/bookings/Booker/components/EventMeta.tsx
+5 -5
View File
@@ -13,6 +13,7 @@ import { useTimePreferences } from "@calcom/features/bookings/lib";
import type { BookerEvent } from "@calcom/features/bookings/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { markdownToSafeHTMLClient } from "@calcom/lib/markdownToSafeHTMLClient";
import { CURRENT_TIMEZONE } from "@calcom/lib/timezoneConstants";
import type { EventTypeTranslation } from "@calcom/prisma/client";
import { EventTypeAutoTranslatedField } from "@calcom/prisma/enums";
@@ -56,7 +57,6 @@ export const EventMeta = ({
event?: Pick<
BookerEvent,
| "lockTimeZoneToggleOnBookingPage"
| "lockedTimeZone"
| "schedule"
| "seatsPerTimeSlot"
| "subsetOfUsers"
@@ -109,9 +109,9 @@ export const EventMeta = ({
);
useEffect(() => {
//In case the event has lockTimeZone enabled ,set the timezone to event's locked timezone
if (event && event?.lockTimeZoneToggleOnBookingPage && event?.lockedTimeZone) {
setTimezone(event?.lockedTimeZone);
//In case the event has lockTimeZone enabled ,set the timezone to event's attached availability timezone
if (event && event?.lockTimeZoneToggleOnBookingPage && event?.schedule?.timeZone) {
setTimezone(event.schedule?.timeZone);
}
}, [event, setTimezone]);
@@ -225,7 +225,7 @@ export const EventMeta = ({
indicatorsContainer: () => "ml-auto",
container: () => "max-w-full",
}}
value={event.lockTimeZoneToggleOnBookingPage ? event.lockedTimeZone : timezone}
value={event.lockTimeZoneToggleOnBookingPage ? CURRENT_TIMEZONE : timezone}
onChange={({ value }) => {
setTimezone(value);
setBookerStoreTimezone(value);
packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts
-1
View File
@@ -58,7 +58,6 @@ export const getEventTypesFromDB = async (eventTypeId: number) => {
periodDays: true,
periodCountCalendarDays: true,
lockTimeZoneToggleOnBookingPage: true,
lockedTimeZone: true,
requiresConfirmation: true,
requiresConfirmationForFreeEmail: true,
requiresBookerEmailVerification: true,
packages/features/bookings/types.ts
-1
View File
@@ -46,7 +46,6 @@ export type BookerEvent = Pick<
| "price"
| "currency"
| "lockTimeZoneToggleOnBookingPage"
| "lockedTimeZone"
| "schedule"
| "seatsPerTimeSlot"
| "title"
packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
+2 -28
View File
@@ -12,7 +12,6 @@ import {
} from "@calcom/atoms/selected-calendars/wrappers/SelectedCalendarsSettingsWebWrapper";
import getLocationsOptionsForSelect from "@calcom/features/bookings/lib/getLocationOptionsForSelect";
import DestinationCalendarSelector from "@calcom/features/calendars/DestinationCalendarSelector";
import { TimezoneSelect } from "@calcom/features/components/timezone-select";
import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
import {
allowDisablingAttendeeConfirmationEmails,
@@ -1003,8 +1002,7 @@ export const EventAdvancedTab = ({
toggleSwitchAtTheEnd={true}
switchContainerClassName={classNames(
"border-subtle rounded-lg border py-6 px-4 sm:px-6",
customClassNames?.timezoneLock?.container,
formMethods.getValues("lockTimeZoneToggleOnBookingPage") && "rounded-b-none"
customClassNames?.timezoneLock?.container
)}
title={t("lock_timezone_toggle_on_booking_page")}
{...lockTimeZoneToggleOnBookingPageLocked}
@@ -1012,31 +1010,7 @@ export const EventAdvancedTab = ({
checked={value}
onCheckedChange={(e) => onChange(e)}
data-testid="lock-timezone-toggle"
childrenClassName="lg:ml-0">
<div className="border-subtle flex flex-col gap-6 rounded-b-lg border border-t-0 p-6">
<div>
<Controller
name="lockedTimeZone"
control={formMethods.control}
render={({ field: { value } }) => (
<>
<Label className="text-default mb-2 block text-sm font-medium">
<>{t("timezone")}</>
</Label>
<TimezoneSelect
id="lockedTimeZone"
value={value}
onChange={(event) => {
if (event)
formMethods.setValue("lockedTimeZone", event.value, { shouldDirty: true });
}}
/>
</>
)}
/>
</div>
</div>
</SettingsToggle>
/>
)}
/>
<Controller
packages/features/eventtypes/lib/getPublicEvent.ts
-1
View File
@@ -67,7 +67,6 @@ const getPublicEventSelect = (fetchAllUsers: boolean) => {
disableGuests: true,
metadata: true,
lockTimeZoneToggleOnBookingPage: true,
lockedTimeZone: true,
requiresConfirmation: true,
autoTranslateDescriptionEnabled: true,
fieldTranslations: {
packages/features/eventtypes/lib/types.ts
-1
View File
@@ -80,7 +80,6 @@ export type FormValues = {
description: string;
disableGuests: boolean;
lockTimeZoneToggleOnBookingPage: boolean;
lockedTimeZone: string;
requiresConfirmation: boolean;
requiresConfirmationWillBlockSlot: boolean;
requiresConfirmationForFreeEmail: boolean;
packages/lib/defaultEvents.ts
-1
View File
@@ -100,7 +100,6 @@ const commons = {
destinationCalendar: null,
team: null,
lockTimeZoneToggleOnBookingPage: false,
lockedTimeZone: "Europe/London",
requiresConfirmation: false,
requiresConfirmationForFreeEmail: false,
requiresBookerEmailVerification: false,
packages/lib/event-types/getEventTypesPublic.ts
+3 -3
View File
@@ -35,14 +35,14 @@ const getEventTypesWithHiddenFromDB = async (userId: number) => {
const eventTypes = await prisma.$queryRaw<RawEventType[]>`
SELECT data."id", data."title", data."description", data."length", data."schedulingType"::text,
data."recurringEvent", data."slug", data."hidden", data."price", data."currency",
data."lockTimeZoneToggleOnBookingPage", data."lockedTimeZone", data."requiresConfirmation", data."requiresBookerEmailVerification",
data."lockTimeZoneToggleOnBookingPage", data."requiresConfirmation", data."requiresBookerEmailVerification",
data."metadata", data."canSendCalVideoTranscriptionEmails"
FROM (
SELECT "EventType"."id", "EventType"."title", "EventType"."description",
"EventType"."position", "EventType"."length", "EventType"."schedulingType"::text,
"EventType"."recurringEvent", "EventType"."slug", "EventType"."hidden",
"EventType"."price", "EventType"."currency",
"EventType"."lockTimeZoneToggleOnBookingPage", "EventType"."lockedTimeZone", "EventType"."requiresConfirmation",
"EventType"."lockTimeZoneToggleOnBookingPage", "EventType"."requiresConfirmation",
"EventType"."requiresBookerEmailVerification", "EventType"."metadata",
"EventType"."canSendCalVideoTranscriptionEmails"
FROM "EventType"
@@ -52,7 +52,7 @@ const getEventTypesWithHiddenFromDB = async (userId: number) => {
"EventType"."position", "EventType"."length", "EventType"."schedulingType"::text,
"EventType"."recurringEvent", "EventType"."slug", "EventType"."hidden",
"EventType"."price", "EventType"."currency",
"EventType"."lockTimeZoneToggleOnBookingPage", "EventType"."lockedTimeZone", "EventType"."requiresConfirmation",
"EventType"."lockTimeZoneToggleOnBookingPage", "EventType"."requiresConfirmation",
"EventType"."requiresBookerEmailVerification", "EventType"."metadata",
"EventType"."canSendCalVideoTranscriptionEmails"
FROM "EventType"
packages/lib/server/eventTypeSelect.ts
-1
View File
@@ -28,7 +28,6 @@ export const eventTypeSelect = Prisma.validator<Prisma.EventTypeSelect>()({
periodDays: true,
periodCountCalendarDays: true,
lockTimeZoneToggleOnBookingPage: true,
lockedTimeZone: true,
requiresBookerEmailVerification: true,
disableGuests: true,
disableCancelling: true,
packages/lib/server/repository/eventType.ts
-1
View File
@@ -487,7 +487,6 @@ export class EventTypeRepository {
periodEndDate: true,
periodCountCalendarDays: true,
lockTimeZoneToggleOnBookingPage: true,
lockedTimeZone: true,
requiresConfirmation: true,
requiresConfirmationForFreeEmail: true,
canSendCalVideoTranscriptionEmails: true,
packages/lib/test/builder.ts
-1
View File
@@ -111,7 +111,6 @@ export const buildEventType = (eventType?: Partial<EventType>): EventType => {
periodCountCalendarDays: null,
recurringEvent: null,
lockTimeZoneToggleOnBookingPage: false,
lockedTimeZone: "Europe/London",
requiresConfirmation: false,
requiresConfirmationForFreeEmail: false,
requiresConfirmationWillBlockSlot: false,
packages/platform/atoms/event-types/hooks/useEventTypeForm.ts
-1
View File
@@ -53,7 +53,6 @@ export const useEventTypeForm = ({
seatsShowAttendees: eventType.seatsShowAttendees,
seatsShowAvailabilityCount: eventType.seatsShowAvailabilityCount,
lockTimeZoneToggleOnBookingPage: eventType.lockTimeZoneToggleOnBookingPage,
lockedTimeZone: eventType.lockedTimeZone,
locations: eventType.locations || [],
destinationCalendar: eventType.destinationCalendar,
recurringEvent: eventType.recurringEvent || null,
packages/prisma/migrations/20250328085029_event_locked_timezone/migration.sql
-2
View File
@@ -1,2 +0,0 @@
-- AlterTable
ALTER TABLE "EventType" ADD COLUMN "lockedTimeZone" TEXT NOT NULL DEFAULT 'Europe/London';
packages/prisma/schema.prisma
-1
View File
@@ -108,7 +108,6 @@ model EventType {
periodDays Int?
periodCountCalendarDays Boolean?
lockTimeZoneToggleOnBookingPage Boolean @default(false)
lockedTimeZone String @default("Europe/London")
requiresConfirmation Boolean @default(false)
requiresConfirmationWillBlockSlot Boolean @default(false)
requiresConfirmationForFreeEmail Boolean @default(false)
packages/prisma/selects/event-types.ts
-2
View File
@@ -12,7 +12,6 @@ export const baseEventTypeSelect = Prisma.validator<Prisma.EventTypeSelect>()({
price: true,
currency: true,
lockTimeZoneToggleOnBookingPage: true,
lockedTimeZone: true,
requiresConfirmation: true,
requiresBookerEmailVerification: true,
canSendCalVideoTranscriptionEmails: true,
@@ -32,7 +31,6 @@ export const bookEventTypeSelect = Prisma.validator<Prisma.EventTypeSelect>()({
periodEndDate: true,
recurringEvent: true,
lockTimeZoneToggleOnBookingPage: true,
lockedTimeZone: true,
requiresConfirmation: true,
canSendCalVideoTranscriptionEmails: true,
requiresBookerEmailVerification: true,
packages/prisma/zod-utils.ts
-1
View File
@@ -660,7 +660,6 @@ export const allManagedEventTypeProps: { [k in keyof Omit<Prisma.EventTypeSelect
bookingFields: true,
durationLimits: true,
lockTimeZoneToggleOnBookingPage: true,
lockedTimeZone: true,
requiresBookerEmailVerification: true,
assignAllTeamMembers: true,
isRRWeightsEnabled: true,