99287d9eb4
* Save design updates for fixed round robin support * wip - added Host relation * DRY hostsFixed select * Changes to allow isFixed in the Availability page * Allow booking with fixed hosts * Replace users with hosts if hosts is set * Also prefer hosts over users here * Prevent duplicates when hosts is saved * Accidental slot duplication * Attempt at making isFixed optional * Sydney and Shiraz can live in harmony again * No fixed hosts causes every to be true.. * Make hosts undefinable * Small handleNewBooking fixes * Similar fix to the hosts to check for empty-ness * Default to isFixed false instead of true * Fix event type list avatars * Filter availableTimeSlots, collective ts's wont magically re-enable. * (Further) Fixes to getAggregateWorkingHours * Weird userId artifact that preceeds this branch, investigate later * On user delete, remove host, on event type delete, also remove host * Dynamic event types were incorrectly marked as isFixed=false * Fixed notFound error when there are no users (but hosts) * Fixes userIsOwner * Oops, fixed isFixed users being included correctly * Fixed Button styling on secondary darkmode * Create exclusivity in selectable options * fix: Location dropdown is overflowing #6376 (#6415) * add `menuPlacement` react-select's props to `getReactSelectProps` to avoid dropdown overflow on small screen. By default, set to "auto". * CALCOM-6362 - [CAL-728] App Sidebar. Child items aren't sized/spaced properly (#6424) * [CAL-728] App Sidebar. Child items aren't sized/spaced properly * fix: undo logo size Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> Co-authored-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> * Fixing colors (#6429) * Update website * Update console * Update yarn.lock * Uses disable instead of filtering to be more clear * Update EventTeamTab.tsx * Merge conflict cleanup * During test cases the dayjs() utcOffset is local time, this fixes that Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> Co-authored-by: Thomas Brodusch <3238312+thomasbrodusch@users.noreply.github.com> Co-authored-by: GitStart-Cal.com <121884634+gitstart-calcom@users.noreply.github.com> Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> Co-authored-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: zomars <zomars@me.com>
62 lines
2.4 KiB
TypeScript
62 lines
2.4 KiB
TypeScript
import { SchedulingType } from "@prisma/client";
|
|
|
|
import type { WorkingHours } from "@calcom/types/schedule";
|
|
|
|
/**
|
|
* This function gets team members working hours and busy slots,
|
|
* offsets them to UTC and intersects them for collective events.
|
|
**/
|
|
export const getAggregateWorkingHours = (
|
|
usersWorkingHoursAndBusySlots: (Omit<
|
|
Awaited<ReturnType<Awaited<typeof import("./getUserAvailability")>["getUserAvailability"]>>,
|
|
"currentSeats"
|
|
> & { user?: { isFixed?: boolean } })[],
|
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
schedulingType: SchedulingType | null
|
|
): WorkingHours[] => {
|
|
// during personal events, just flatMap.
|
|
if (!schedulingType) {
|
|
return usersWorkingHoursAndBusySlots.flatMap((s) => s.workingHours);
|
|
}
|
|
const looseHostWorkingHours = usersWorkingHoursAndBusySlots
|
|
.filter(({ user }) => schedulingType !== SchedulingType.COLLECTIVE && user?.isFixed !== true)
|
|
.flatMap((s) => s.workingHours);
|
|
|
|
const fixedHostSchedules = usersWorkingHoursAndBusySlots.filter(
|
|
({ user }) => schedulingType === SchedulingType.COLLECTIVE || user?.isFixed
|
|
);
|
|
// return early when there are no fixed hosts.
|
|
if (!fixedHostSchedules.length) {
|
|
return looseHostWorkingHours;
|
|
}
|
|
return fixedHostSchedules.reduce((currentWorkingHours: WorkingHours[], s) => {
|
|
const updatedWorkingHours: typeof currentWorkingHours = [];
|
|
|
|
s.workingHours.forEach((workingHour) => {
|
|
const sameDayWorkingHours = currentWorkingHours.filter((compare) =>
|
|
compare.days.find((day) => workingHour.days.includes(day))
|
|
);
|
|
if (!sameDayWorkingHours.length) {
|
|
updatedWorkingHours.push(workingHour); // the first day is always added.
|
|
return;
|
|
}
|
|
// days are overlapping when different users are involved, instead of adding we now need to subtract
|
|
updatedWorkingHours.push(
|
|
...sameDayWorkingHours.map((compare) => {
|
|
const intersect = workingHour.days.filter((day) => compare.days.includes(day));
|
|
const retVal: WorkingHours & { userId?: number | null } = {
|
|
days: intersect,
|
|
startTime: Math.max(workingHour.startTime, compare.startTime),
|
|
endTime: Math.min(workingHour.endTime, compare.endTime),
|
|
};
|
|
if (schedulingType !== SchedulingType.COLLECTIVE) {
|
|
retVal.userId = compare.userId;
|
|
}
|
|
return retVal;
|
|
})
|
|
);
|
|
});
|
|
return updatedWorkingHours;
|
|
}, looseHostWorkingHours);
|
|
};
|