Skip to content

Commit c746fdc

Browse files
authored
ix disable cancelling persistence and rescheduling toggle (calcom#26131)
1 parent 76b53eb commit c746fdc

2 files changed

Lines changed: 8 additions & 9 deletions

File tree

packages/features/eventtypes/components/tabs/advanced/DisableReschedulingController.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ export default function DisableReschedulingController({
4444
);
4545
const radioGroupOnValueChangeRef = useRef<((val: string) => void) | null>(null);
4646

47-
const shouldShowRadioButtons =
47+
const [shouldShowRadioButtons, setShouldShowRadioButtons] = useState(
4848
disableRescheduling ||
4949
(currentMinimumRescheduleNotice !== null && currentMinimumRescheduleNotice > 0) ||
50-
eventType.disableRescheduling === true;
51-
50+
eventType.disableRescheduling === true || false
51+
);
5252
useEffect(() => {
5353
if (currentMinimumRescheduleNotice && currentMinimumRescheduleNotice > 0) {
5454
setMinimumRescheduleNoticeValue(currentMinimumRescheduleNotice);
@@ -93,10 +93,12 @@ export default function DisableReschedulingController({
9393
onChange(true);
9494
onDisableRescheduling(true);
9595
formMethods.setValue("minimumRescheduleNotice", null, { shouldDirty: true });
96+
setShouldShowRadioButtons(true);
9697
} else {
9798
onChange(false);
9899
onDisableRescheduling(false);
99100
formMethods.setValue("minimumRescheduleNotice", null, { shouldDirty: true });
101+
setShouldShowRadioButtons(false);
100102
}
101103
}}>
102104
{shouldShowRadioButtons && (

packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -541,8 +541,6 @@ export const EventAdvancedTab = ({
541541
multiplePrivateLinksLocked.disabled = true;
542542
}
543543

544-
const [disableCancelling, setDisableCancelling] = useState(eventType.disableCancelling || false);
545-
546544
const [disableRescheduling, setDisableRescheduling] = useState(eventType.disableRescheduling || false);
547545

548546
const [allowReschedulingCancelledBookings, setallowReschedulingCancelledBookings] = useState(
@@ -691,8 +689,8 @@ export const EventAdvancedTab = ({
691689
{!isPlatform && (
692690
<>
693691
<Controller
694-
name="disableCancelling"
695-
render={({ field: { onChange } }) => (
692+
name="disabledCancelling"
693+
render={({ field: { onChange, value } }) => (
696694
<SettingsToggle
697695
labelClassName="text-sm"
698696
toggleSwitchAtTheEnd={true}
@@ -707,9 +705,8 @@ export const EventAdvancedTab = ({
707705
href="https://cal.com/help/event-types/disable-canceling-rescheduling#disable-cancelling"
708706
/>
709707
}
710-
checked={disableCancelling}
708+
checked={value}
711709
onCheckedChange={(val) => {
712-
setDisableCancelling(val);
713710
onChange(val);
714711
}}
715712
/>

0 commit comments

Comments
 (0)