+18









sean-brydon
gitstart-calcom
Shivam Kalra
Peer Richelsen
alannnc
nicktrn
tedspare
Alex van Andel
mohammed gehad
Monto
Carina Wollendorfer
Udit Takkar
Udit Takkar
Hariom Balhara
Mehul
Crowdin Bot
GitStart-Cal.com
Leo Giovanetti
DexterStorey
Monto
Abhijeet Singh
Kamil B. Demirci
Denzil Samuel
Anik Dhabal Babu
Omar López
Sahil Padvi
Patel Divyesh
neo773
a2d1dbebba
* Add loading data and banner
* [WIP] hasEditPerms middleware
* fix: type error in booker (#11011)
* New Crowdin translations by Github Action
* refactor: removed redundant test (#10785)
Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
Co-authored-by: Shivam Kalra <shivamkalra98@gmail.com>
* feat: 2fa backup codes (#10600)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Delete add-PRs-to-project-reviewing-PRs.yml (#11008)
Co-authored-by: alannnc <alannnc@gmail.com>
* New Crowdin translations by Github Action
* fix: multiple duration when booking (#11032)
* fix: other reported issues (#11015)
* fix: weird margin top in avatar
* fix: pending users are shown on booking page
* fix: avatar and naming issues
* fix: toast alignment and removing unneeded titles
* missing changes from toast improvements
* feat: empty state for teams without event types
* Removing console.log
* feat: cal ai (#10992)
Co-authored-by: nicktrn <55853254+nicktrn@users.noreply.github.com>
Co-authored-by: tedspare <ted.spare@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
* New Crowdin translations by Github Action
* fix: meeting ended trigger for webhooks and zapier sometimes not working (#10946)
Co-authored-by: mohammed gehad <mohammed.gehad.1998@gmail.com>
Co-authored-by: Monto <138862352+monto7926@users.noreply.github.com>
Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
* feat: team admin: see connected apps of team members (#11036)
* added feature:team admin can see connected apps of members
* fixed the type error
* Update packages/lib/server/queries/teams/index.ts
* Minor fixes
---------
Co-authored-by: alannnc <alannnc@gmail.com>
* fix: lower case slugs in teams (#11026)
* fix: lower case slugs in teams
Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
* fix: use slugify
Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
---------
Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
* refactor: improvements on german translation (#10898)
* fix: fix-tablet-menu-not-centered-sidebar (#11020)
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
* chore: add Popover in storybook (#11021)
Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
Co-authored-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
* fix: Set mobile availability (#11027)
* chore: add ColorPicker in storybook (CALCOM-10760) (#10866)
Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
* feat: adds next cold start profiler (#11014)
* Handle disabling of ORGANIZATIONS_ENABLED flag (#11041)
* New Crowdin translations by Github Action
* styles:dark mode color fix (#11004)
* chore: sheet darkmode and improve responsive (#11047)
* fix: handle collective multiple host on destinationCalendar (#10967)
* fix: include app data and credentials from DB (#11048)
* include app data and credentials from DB
* Improve performance
* fix: Error when running storybook (#11037)
Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* fix: broken company profile link on team booking page (#10978)
* chore: add ErrorBoundary in storybook (CALCOM-10760) (#10872)
Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
* feat: sorting for workflow and routing forms (#10780)
Co-authored-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* resolve zod versions across child packages (#11052)
* fix: List storybook file is empty (fix-list) (#10965)
Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
* fix: admin org list without members (#11051)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* chore: add ToggleGroup in storybook (#10802)
Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
* fix: add metadata to stripe payment intent (#11053)
* fix: Logo storybook file with invalid icons (fix-logo) (#11018)
Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
* fix: Add controls for Select Field storybook file (#10936)
Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
* fix: Fix tooltip control on ButtonPlayground storybook file (fix-ButtonTooltip) (#10937)
Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
* fix: email embed – remove collapsible and permanently show times (#10996)
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Mehul <mehulzr@gmail.com>
* chore: add Timezone Select in storybook (CALCOM-10760) (#10966)
Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* chore: add Switch in storybook (CALCOM-10760) (#10804)
Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Sync packages
* fix: zod utils due to upgrade
* easy fix (#11054)
* fix sub quantity update stripe (#11057)
* v3.2.7
* Revert "feat: adds next cold start profiler (#11014)" (#11072)
This reverts commit 05631d093f.
* fix: Fixes username invite issue (#10998)
* Fixes username invite issue
* Ensure we only suggest email invites in org members
---------
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
* Fix sheet layout
* WIP permissions when userschedule doesnt match
* WIP get handler weird behaviour
* Update toast
* add disabled - handle membership overlap
* Handle permissions + perf improvments
* use input uid
* Remove Console.log
* Clean up
* Revert changes accidental
* Fix merge artifacts
* Remove dead code
* Remove code after return
* Update read permission check
* Revert avatar changes as fixed elsewhere
* Handle if user has not completed onboarding
* Disable button
* Update packages/lib/hasEditPermissionForUser.ts
* Correct Error throwing
* Update packages/features/timezone-buddy/components/AvailabilityEditSheet.tsx
* Fix type erro
* Add i18n
* Improve Spacing
* Update yarn.lock
---------
Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.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: Shivam Kalra <shivamkalra98@gmail.com>
Co-authored-by: nicktrn <55853254+nicktrn@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: Leo Giovanetti <hello@leog.me>
Co-authored-by: DexterStorey <36115192+DexterStorey@users.noreply.github.com>
Co-authored-by: tedspare <ted.spare@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Monto <138862352+montocoder@users.noreply.github.com>
Co-authored-by: mohammed gehad <mohammed.gehad.1998@gmail.com>
Co-authored-by: Monto <138862352+monto7926@users.noreply.github.com>
Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
Co-authored-by: Abhijeet Singh <asingh9829@gmail.com>
Co-authored-by: Kamil B. Demirci <kamil.demirci@indyaner.ch>
Co-authored-by: Denzil Samuel <71846487+samueldenzil@users.noreply.github.com>
Co-authored-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Sahil Padvi <71093044+Sahil25061999@users.noreply.github.com>
Co-authored-by: Patel Divyesh <pateldivyesh1323@gmail.com>
Co-authored-by: neo773 <62795688+neo773@users.noreply.github.com>
Co-authored-by: Mehul <mehulzr@gmail.com>
212 lines
7.5 KiB
TypeScript
212 lines
7.5 KiB
TypeScript
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 { Avatar, Button, ButtonGroup, DataTable } 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;
|
|
email: string;
|
|
timeZone: string;
|
|
role: MembershipRole;
|
|
defaultScheduleId: number | null;
|
|
dateRanges: DateRange[];
|
|
}
|
|
|
|
function UpgradeTeamTip() {
|
|
const { t } = useLocale();
|
|
|
|
return (
|
|
<UpgradeTip
|
|
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 { t } = useLocale();
|
|
const tableContainerRef = useRef<HTMLDivElement>(null);
|
|
const [browsingDate, setBrowsingDate] = useState(dayjs());
|
|
const [editSheetOpen, setEditSheetOpen] = useState(false);
|
|
const [selectedUser, setSelectedUser] = useState<SliderUser | null>(null);
|
|
|
|
const { data, isLoading, fetchNextPage, isFetching } = trpc.viewer.availability.listTeam.useInfiniteQuery(
|
|
{
|
|
limit: 10,
|
|
loggedInUsersTz: dayjs.tz.guess(),
|
|
startDate: browsingDate.startOf("day").toISOString(),
|
|
endDate: browsingDate.endOf("day").toISOString(),
|
|
},
|
|
{
|
|
getNextPageParam: (lastPage) => lastPage.nextCursor,
|
|
keepPreviousData: true,
|
|
}
|
|
);
|
|
|
|
const memorisedColumns = useMemo(() => {
|
|
const cols: ColumnDef<SliderUser>[] = [
|
|
{
|
|
id: "member",
|
|
accessorFn: (data) => data.email,
|
|
header: "Member",
|
|
cell: ({ row }) => {
|
|
const { username, email, timeZone } = row.original;
|
|
return (
|
|
<div className="max-w-64 flex flex-shrink-0 items-center gap-2 overflow-hidden">
|
|
<Avatar size="sm" alt={username || email} imageSrc={"/" + username + "/avatar.png"} />
|
|
<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">
|
|
<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("DD dddd MMM, YYYY")}</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">
|
|
<DataTable
|
|
tableContainerRef={tableContainerRef}
|
|
columns={memorisedColumns}
|
|
onRowMouseclick={(row) => {
|
|
setEditSheetOpen(true);
|
|
setSelectedUser(row.original);
|
|
}}
|
|
data={flatData}
|
|
isLoading={isLoading}
|
|
// 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>
|
|
);
|
|
}
|