diff --git a/src/frontend/src/pages/CalendarPage/Components/EventModal.tsx b/src/frontend/src/pages/CalendarPage/Components/EventModal.tsx index fe81b42d7d..f5ff86a679 100644 --- a/src/frontend/src/pages/CalendarPage/Components/EventModal.tsx +++ b/src/frontend/src/pages/CalendarPage/Components/EventModal.tsx @@ -35,7 +35,7 @@ import { SlackMentionType } from 'shared'; import { useToast } from '../../../hooks/toasts.hooks'; -import { useAllMembers, useCurrentUser } from '../../../hooks/users.hooks'; +import { useAllMembers, useCurrentUser, useUserScheduleSettings } from '../../../hooks/users.hooks'; import { useAllWorkPackagesPreview } from '../../../hooks/work-packages.hooks'; import { useAllTeamPreviews } from '../../../hooks/teams.hooks'; import { userToAutocompleteOption } from '../../../utils/teams.utils'; @@ -231,6 +231,7 @@ const EventModal: React.FC = ({ const theme = useTheme(); const toast = useToast(); const user = useCurrentUser(); + const { data: scheduleSettings } = useUserScheduleSettings(user.userId); const [datePickerOpen, setDatePickerOpen] = useState(false); const [startTimePickerOpen, setStartTimePickerOpen] = useState(false); const [endTimePickerOpen, setEndTimePickerOpen] = useState(false); @@ -381,6 +382,16 @@ const EventModal: React.FC = ({ } }, [initialValues, users, teams]); + // When creating a new event, autofill personal zoom link from the user's schedule settings + // made it so it only fills when the field is empty, that way doesn't overwrite a link or anythingi me + useEffect(() => { + if (!open || isEditMode) return; + const personalZoomLink = scheduleSettings?.personalZoomLink; + if (personalZoomLink && !watch('zoomLink')) { + setValue('zoomLink', personalZoomLink); + } + }, [open, isEditMode, scheduleSettings, setValue, watch]); + const computedTitle = isEditMode ? 'Edit Event' : 'Add Event'; // Handle recurring dropdown toggle