+1








12466fb064
* Add profile table Copy to profile table Update schema Migrations * wip * Get switcher working * Add organization seeder * wip * Remove dead code * Fix unit tests * relevantProfile -> profile * cache bust * One more comment * Squash migrations * Copy to profile table * Update schema * Fix existing user invite flow * Add profile table * Copy to profile table * Update schema * Format * Add profile table Copy to profile table Update schema Migrations * Format * wip Get switcher working Add organization seeder wip Remove dead code Fix unit tests relevantProfile -> profile cache bust One more comment Squash migrations Copy to profile table Update schema Fix existing user invite flow Add profile table Copy to profile table Update schema chore: small improvements to signup (#13227) * removed features on mobile, better background color * nit * dark mode nits New Crowdin translations by Github Action fix: event reschedule workflow trigger (#13122) * fix event reschedule workflow trigger * uncomment previously failed test * review fix --------- Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> chore: added community support to help (#13213) refactor: Abstract `handleSeats` from `handleNewBooking` (#12062) * Refactor createBooking * Type fix * Abstract handleSeats * Create Invitee type * Create OrganizerUser type * Abstract addVideoCallDataToEvt * Abstract createLoggerWithEventDetails * Abstract `handleAppStatus` from handler * Create ReqAppsStatus type * Move `deleteMeeting` and `getCalendar` * Set parameters for `handleSeats` * Typescript refactor * Change function params from req * Type fix --------- Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: Erik <erik@erosemberg.com> fix: Dynamic group booking org-migration redirect (#13223) * fix: Dynamic group booking redirect * Fix flaky private team test test: Check availability tab and all your functions (teste2e-availability) (#12434) * add changes * add changes * add changes * add changes * Requested changes * Change way to grab element --------- Co-authored-by: gitstart-calcom <gitstart-calcom@users.noreply.github.com> Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> fix: Reschedule a cancelled booking (#13170) * fix: Reschedule a cancelled booking * canceled instead of cancelled --------- Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> v3.7.0 test: In Team Event type when location is Organizer Default App and U… (#12939) * test: In Team Event type when location is Organizer Default App and User Metadata is emoty * chore: use variable * fix: type error test: add test for invalid cal video (#13103) * test: add test for invalid cal video * chore: add confirm * chore: fix type error * chore: update code * test: add unit test * chore: type error * chore * chore: type * chore: fix test * chore --------- Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> chore: add error message for no availability (#13230) * chore: add error message for no default user availability * chore: check only availability * chore: change message * chore: add eventType fix: Team revert with members (#13228) refactor: Refactor seats logic (#12905) * Refactor createBooking * Type fix * Abstract handleSeats * Create Invitee type * Create OrganizerUser type * Abstract addVideoCallDataToEvt * Abstract createLoggerWithEventDetails * Abstract `handleAppStatus` from handler * Create ReqAppsStatus type * Move `deleteMeeting` and `getCalendar` * Set parameters for `handleSeats` * Typescript refactor * Change function params from req * Type fix * Move handleSeats * Abstract lastAttendeeDeleteBooking * Create function for rescheduling seated events * Fix imports on reschedule seats function * Fix imports * Import handleSeats function * Fix rescheduleUid type * Refactor owner reschedule to new time slot * Refactor combine two booking times together * Reschedule as an attendee * Refactor createNewSeat * Remove old handleSeats * Remove lastAttendeeDeleteBooking from handleNewBooking * Test for new attendee right params are passed * Unit test params for reschedule * Typo fix * Clean up * Create new seat test * Test when attendee already signs up for booking * Type fix * Test reschedule move attendee to existing booking * On reschedule create new booking * Test on last attendee cancel booking * Owner reschedule to new time slot * Owner rescheduling, merge two bookings together * Test: when merging more than available seats, then fail * Test: fail when event is full * Remove duplicate E2E tests * Clean up * Rename `addVideoCallDataToEvt` to `addVideoCallDataToEvent` * Refactor `calcAppsStatus` * Assign `evt` to resutl of `addVideoCallDataToEvent` * Use prisma.transaction when moving attendees * Clean create seat call * Use ErrorCode enum * Use attendeeRescheduledSeatedBooking function * Await function * Prevent double triggering of workflows * Use inviteeToAdd in createNewSeat * Remove unused error code * Remove old handleSeats file * Type fix * Type fix * Type fix * Type fix * Type fix * Type fix * Type fix * Type fix --------- Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Erik <erik@erosemberg.com> feat: Allow admins to filter bookings only by attendee emails (#13236) * chore: Allow admins to filter bookings only by attendee emails * Fix type error Fixed [CAL-2930] Org branding isnt centered in shell #13225 (#13237) Add profile table Copy to profile table Update schema Migrations Format * wip * Add profile relation everywhere * Fix schema * Fix invite handler * Add profileId during eventTypec reation * Get dashboard working with profile relatioon * Add workflow create repository * Add profileId to host * Add profileId to credential table * Add destinationCalendar repository * Add profileId to membership * Revert all profile related changes * Add acme and dunder * Fix membership profileId usgae * Various fixes * Some renaming * Fix failing tests * Debugging next-aut * Consolidate migrations * Testing fixes * Fix unit tests * Self review feedback * PR feedback * Fix orgMigration as well * Add profile schema and copy users to it * Remove migrations from here * Fix type issues * Fix type error after main merge * Remove movedFromUserId * Add missing migration file * Self review addressed * Joe's review addressed * Fix profile switcher --------- Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
229 lines
8.0 KiB
TypeScript
229 lines
8.0 KiB
TypeScript
import { keepPreviousData } from "@tanstack/react-query";
|
|
import type { ColumnDef } from "@tanstack/react-table";
|
|
import { ChevronLeftIcon, ChevronRightIcon } from "lucide-react";
|
|
import { useMemo, useRef, useCallback, useEffect, useState } from "react";
|
|
|
|
import dayjs from "@calcom/dayjs";
|
|
import { APP_NAME, WEBAPP_URL } from "@calcom/lib/constants";
|
|
import type { DateRange } from "@calcom/lib/date-ranges";
|
|
import { useLocale } from "@calcom/lib/hooks/useLocale";
|
|
import type { MembershipRole } from "@calcom/prisma/enums";
|
|
import { trpc } from "@calcom/trpc";
|
|
import type { UserProfile } from "@calcom/types/UserProfile";
|
|
import { Button, ButtonGroup, DataTable } from "@calcom/ui";
|
|
import { UserAvatar } from "@calcom/ui";
|
|
|
|
import { UpgradeTip } from "../../tips/UpgradeTip";
|
|
import { TBContext, createTimezoneBuddyStore } from "../store";
|
|
import { AvailabilityEditSheet } from "./AvailabilityEditSheet";
|
|
import { TimeDial } from "./TimeDial";
|
|
|
|
export interface SliderUser {
|
|
id: number;
|
|
username: string | null;
|
|
name: string | null;
|
|
organizationId: number;
|
|
avatarUrl: string | null;
|
|
email: string;
|
|
timeZone: string;
|
|
role: MembershipRole;
|
|
defaultScheduleId: number | null;
|
|
dateRanges: DateRange[];
|
|
profile: UserProfile;
|
|
}
|
|
|
|
function UpgradeTeamTip() {
|
|
const { t } = useLocale();
|
|
|
|
return (
|
|
<UpgradeTip
|
|
plan="team"
|
|
title={t("calcom_is_better_with_team", { appName: APP_NAME }) as string}
|
|
description="add_your_team_members"
|
|
background="/tips/teams"
|
|
features={[]}
|
|
buttons={
|
|
<div className="space-y-2 rtl:space-x-reverse sm:space-x-2">
|
|
<ButtonGroup>
|
|
<Button color="primary" href={`${WEBAPP_URL}/settings/teams/new`}>
|
|
{t("create_team")}
|
|
</Button>
|
|
<Button color="minimal" href="https://go.cal.com/teams-video" target="_blank">
|
|
{t("learn_more")}
|
|
</Button>
|
|
</ButtonGroup>
|
|
</div>
|
|
}>
|
|
<></>
|
|
</UpgradeTip>
|
|
);
|
|
}
|
|
|
|
export function AvailabilitySliderTable() {
|
|
const tableContainerRef = useRef<HTMLDivElement>(null);
|
|
const [browsingDate, setBrowsingDate] = useState(dayjs());
|
|
const [editSheetOpen, setEditSheetOpen] = useState(false);
|
|
const [selectedUser, setSelectedUser] = useState<SliderUser | null>(null);
|
|
|
|
const { data, isPending, fetchNextPage, isFetching } = trpc.viewer.availability.listTeam.useInfiniteQuery(
|
|
{
|
|
limit: 10,
|
|
loggedInUsersTz: dayjs.tz.guess() || "Europe/London",
|
|
startDate: browsingDate.startOf("day").toISOString(),
|
|
endDate: browsingDate.endOf("day").toISOString(),
|
|
},
|
|
{
|
|
getNextPageParam: (lastPage) => lastPage.nextCursor,
|
|
placeholderData: keepPreviousData,
|
|
}
|
|
);
|
|
|
|
const memorisedColumns = useMemo(() => {
|
|
const cols: ColumnDef<SliderUser>[] = [
|
|
{
|
|
id: "member",
|
|
accessorFn: (data) => data.email,
|
|
header: "Member",
|
|
cell: ({ row }) => {
|
|
const { username, email, timeZone, name, avatarUrl, profile } = row.original;
|
|
return (
|
|
<div className="max-w-64 flex flex-shrink-0 items-center gap-2 overflow-hidden">
|
|
<UserAvatar
|
|
size="sm"
|
|
user={{
|
|
username,
|
|
name,
|
|
avatarUrl,
|
|
profile,
|
|
}}
|
|
/>
|
|
<div className="">
|
|
<div className="text-emphasis max-w-64 truncate text-sm font-medium" title={email}>
|
|
{username || "No username"}
|
|
</div>
|
|
<div className="text-subtle text-xs leading-none">{timeZone}</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
},
|
|
},
|
|
{
|
|
id: "timezone",
|
|
accessorFn: (data) => data.timeZone,
|
|
header: "Timezone",
|
|
cell: ({ row }) => {
|
|
const { timeZone } = row.original;
|
|
const timeRaw = dayjs().tz(timeZone);
|
|
const time = timeRaw.format("HH:mm");
|
|
const utcOffsetInMinutes = timeRaw.utcOffset();
|
|
const hours = Math.abs(Math.floor(utcOffsetInMinutes / 60));
|
|
const minutes = Math.abs(utcOffsetInMinutes % 60);
|
|
const offsetFormatted = `${utcOffsetInMinutes < 0 ? "-" : "+"}${hours
|
|
.toString()
|
|
.padStart(2, "0")}:${minutes.toString().padStart(2, "0")}`;
|
|
|
|
return (
|
|
<div className="flex flex-col text-center">
|
|
<span className="text-default text-sm font-medium">{time}</span>
|
|
<span className="text-subtle text-xs leading-none">GMT {offsetFormatted}</span>
|
|
</div>
|
|
);
|
|
},
|
|
},
|
|
{
|
|
id: "slider",
|
|
header: () => {
|
|
return (
|
|
<div className="flex items-center space-x-2">
|
|
<ButtonGroup containerProps={{ className: "space-x-0" }}>
|
|
<Button
|
|
color="minimal"
|
|
variant="icon"
|
|
StartIcon={ChevronLeftIcon}
|
|
onClick={() => setBrowsingDate(browsingDate.subtract(1, "day"))}
|
|
/>
|
|
<Button
|
|
onClick={() => setBrowsingDate(browsingDate.add(1, "day"))}
|
|
color="minimal"
|
|
StartIcon={ChevronRightIcon}
|
|
variant="icon"
|
|
/>
|
|
</ButtonGroup>
|
|
<span>{browsingDate.format("LL")}</span>
|
|
</div>
|
|
);
|
|
},
|
|
cell: ({ row }) => {
|
|
const { timeZone, dateRanges } = row.original;
|
|
// return <pre>{JSON.stringify(dateRanges, null, 2)}</pre>;
|
|
return <TimeDial timezone={timeZone} dateRanges={dateRanges} />;
|
|
},
|
|
},
|
|
];
|
|
|
|
return cols;
|
|
}, [browsingDate]);
|
|
|
|
//we must flatten the array of arrays from the useInfiniteQuery hook
|
|
const flatData = useMemo(() => data?.pages?.flatMap((page) => page.rows) ?? [], [data]) as SliderUser[];
|
|
const totalDBRowCount = data?.pages?.[0]?.meta?.totalRowCount ?? 0;
|
|
const totalFetched = flatData.length;
|
|
|
|
//called on scroll and possibly on mount to fetch more data as the user scrolls and reaches bottom of table
|
|
const fetchMoreOnBottomReached = useCallback(
|
|
(containerRefElement?: HTMLDivElement | null) => {
|
|
if (containerRefElement) {
|
|
const { scrollHeight, scrollTop, clientHeight } = containerRefElement;
|
|
//once the user has scrolled within 300px of the bottom of the table, fetch more data if there is any
|
|
if (scrollHeight - scrollTop - clientHeight < 300 && !isFetching && totalFetched < totalDBRowCount) {
|
|
fetchNextPage();
|
|
}
|
|
}
|
|
},
|
|
[fetchNextPage, isFetching, totalFetched, totalDBRowCount]
|
|
);
|
|
|
|
useEffect(() => {
|
|
fetchMoreOnBottomReached(tableContainerRef.current);
|
|
}, [fetchMoreOnBottomReached]);
|
|
|
|
// This means they are not apart of any teams so we show the upgrade tip
|
|
if (!flatData.length) return <UpgradeTeamTip />;
|
|
|
|
return (
|
|
<TBContext.Provider
|
|
value={createTimezoneBuddyStore({
|
|
browsingDate: browsingDate.toDate(),
|
|
})}>
|
|
<>
|
|
<div className="relative -mx-2 w-[calc(100%+16px)] overflow-x-scroll px-2 lg:-mx-6 lg:w-[calc(100%+48px)] lg:px-6">
|
|
<DataTable
|
|
variant="compact"
|
|
searchKey="member"
|
|
tableContainerRef={tableContainerRef}
|
|
columns={memorisedColumns}
|
|
onRowMouseclick={(row) => {
|
|
setEditSheetOpen(true);
|
|
setSelectedUser(row.original);
|
|
}}
|
|
data={flatData}
|
|
isPending={isPending}
|
|
// tableOverlay={<HoverOverview />}
|
|
onScroll={(e) => fetchMoreOnBottomReached(e.target as HTMLDivElement)}
|
|
/>
|
|
</div>
|
|
{selectedUser && editSheetOpen ? (
|
|
<AvailabilityEditSheet
|
|
open={editSheetOpen}
|
|
onOpenChange={(e) => {
|
|
setEditSheetOpen(e);
|
|
setSelectedUser(null); // We need to clear the user here or else the sheet will not re-render when opening a new user
|
|
}}
|
|
selectedUser={selectedUser}
|
|
/>
|
|
) : null}
|
|
</>
|
|
</TBContext.Provider>
|
|
);
|
|
}
|