Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: "Add an Override" calendar starts with the day specified in general settings #14663

Merged
merged 9 commits into from May 6, 2024
Merged

feat: "Add an Override" calendar starts with the day specified in general settings #14663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
26dd6b9
feat: Add an Override calendar starts with the day specified in gener…
shaik-zeeshan Apr 19, 2024
eb1ec75
fix: types not matching
shaik-zeeshan Apr 19, 2024
fc5db91
Merge branch 'calcom:main' into main
shaik-zeeshan Apr 19, 2024
7dd19ac
Merge branch 'calcom:main' into main
shaik-zeeshan Apr 20, 2024
a7964f0
Merge branch 'main' into main
shaik-zeeshan Apr 25, 2024
9773765
Merge branch 'main' into main
shaik-zeeshan Apr 26, 2024
accd4ca
fix: update edit calendar to use user's weekStart
shaik-zeeshan Apr 26, 2024
afe8edb
fix: weekstart defaults to 0 when not provided
shaik-zeeshan Apr 26, 2024
431d596
Merge branch 'main' into main
joeauyeung May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/features/schedules/components/DateOverrideInputDialog.tsx
View file
Open in desktop
Expand Up @@ -28,13 +28,15 @@ const DateOverrideForm = ({
excludedDates,
onChange,
userTimeFormat,
weekStart,
}: {
workingHours?: WorkingHours[];
onChange: (newValue: TimeRange[]) => void;
excludedDates: string[];
value?: TimeRange[];
onClose?: () => void;
userTimeFormat: number | null;
weekStart: 0 | 1 | 2 | 3 | 4 | 5 | 6;
}) => {
const [browsingDate, setBrowsingDate] = useState<Dayjs>();
const { t, i18n, isLocaleReady } = useLocale();
Expand Down Expand Up @@ -142,7 +144,7 @@ const DateOverrideForm = ({
<DialogHeader title={t("date_overrides_dialog_title")} />
<DatePicker
excludedDates={excludedDates}
weekStart={0}
weekStart={weekStart}
selected={selectedDates}
onChange={(day) => {
if (day) onDateChange(day);
Expand Down Expand Up @@ -204,6 +206,7 @@ const DateOverrideInputDialog = ({
Trigger,
excludedDates = [],
userTimeFormat,
weekStart = 0,
...passThroughProps
}: {
workingHours: WorkingHours[];
Expand All @@ -212,6 +215,7 @@ const DateOverrideInputDialog = ({
onChange: (newValue: TimeRange[]) => void;
value?: TimeRange[];
userTimeFormat: number | null;
weekStart?: 0 | 1 | 2 | 3 | 4 | 5 | 6;
}) => {
const [open, setOpen] = useState(false);
return (
Expand All @@ -221,6 +225,7 @@ const DateOverrideInputDialog = ({
<DialogContent enableOverflow={true} size="md" className="p-0">
<DateOverrideForm
excludedDates={excludedDates}
weekStart={weekStart}
{...passThroughProps}
onClose={() => setOpen(false)}
userTimeFormat={userTimeFormat}
Expand Down
3 changes: 3 additions & 0 deletions packages/features/schedules/components/DateOverrideList.tsx
View file
Open in desktop
Expand Up @@ -19,6 +19,7 @@ const DateOverrideList = ({
hour12,
replace,
fields,
weekStart = 0,
}: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
replace: any;
Expand All @@ -28,6 +29,7 @@ const DateOverrideList = ({
userTimeFormat: number | null;
hour12: boolean;
travelSchedules?: RouterOutputs["viewer"]["getTravelSchedules"];
weekStart?: 0 | 1 | 2 | 3 | 4 | 5 | 6;
}) => {
const { t, i18n } = useLocale();

Expand Down Expand Up @@ -87,6 +89,7 @@ const DateOverrideList = ({
excludedDates={excludedDates}
workingHours={workingHours}
value={item.ranges}
weekStart={weekStart}
onChange={(ranges) => {
// update has very weird side-effects with sorting.
replace([...fields.filter((currentItem) => currentItem.id !== item.id), { ranges }]);
Expand Down
9 changes: 9 additions & 0 deletions packages/platform/atoms/availability/AvailabilitySettings.tsx
View file
Open in desktop
Expand Up @@ -146,10 +146,12 @@ const DateOverride = ({
workingHours,
userTimeFormat,
travelSchedules,
weekStart,
}: {
workingHours: WorkingHours[];
userTimeFormat: number | null;
travelSchedules?: RouterOutputs["viewer"]["getTravelSchedules"];
weekStart: 0 | 1 | 2 | 3 | 4 | 5 | 6;
}) => {
const { append, replace, fields } = useFieldArray<AvailabilityFormValues, "dateOverrides">({
name: "dateOverrides",
Expand All @@ -172,6 +174,7 @@ const DateOverride = ({
excludedDates={excludedDates}
replace={replace}
fields={fields}
weekStart={weekStart}
workingHours={workingHours}
userTimeFormat={userTimeFormat}
hour12={Boolean(userTimeFormat === 12)}
Expand All @@ -182,6 +185,7 @@ const DateOverride = ({
excludedDates={excludedDates}
onChange={(ranges) => ranges.forEach((range) => append({ ranges: [range] }))}
userTimeFormat={userTimeFormat}
weekStart={weekStart}
Trigger={
<Button color="secondary" StartIcon="plus" data-testid="add-override">
{t("add_an_override")}
Expand Down Expand Up @@ -487,6 +491,11 @@ export function AvailabilitySettings({
workingHours={schedule.workingHours}
userTimeFormat={timeFormat}
travelSchedules={travelSchedules}
weekStart={
["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"].indexOf(
weekStart
) as 0 | 1 | 2 | 3 | 4 | 5 | 6
}
/>
)}
</div>
Expand Down