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

fix: multiple calendars atom tooltip #16883

Merged
merged 1 commit into from
Sep 30, 2024
Merged

fix: multiple calendars atom tooltip #16883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions packages/platform/atoms/connect/OAuthConnect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export const OAuthConnect: FC<
StartIcon="calendar-days"
color="primary"
disabled={isClickable ? false : isChecking}
tooltip={tooltip ? tooltip : <ConnectedCalendarsTooltip />}
tooltip={tooltip ? tooltip : <ConnectedCalendarsTooltip calendarInstance={calendar} />}
tooltipSide={tooltipSide}
tooltipOffset={10}
className={cn("", !isDisabled && "cursor-pointer", className)}
Expand Down Expand Up @@ -101,7 +101,11 @@ export const OAuthConnect: FC<
);
};

export const ConnectedCalendarsTooltip = () => {
export const ConnectedCalendarsTooltip = ({
calendarInstance,
}: {
calendarInstance: (typeof CALENDARS)[number];
}) => {
const { data: connectedCalendars, isLoading: isConnectedCalendarsLoading } = useConnectedCalendars({});

if (isConnectedCalendarsLoading)
Expand All @@ -111,16 +115,18 @@ export const ConnectedCalendarsTooltip = () => {

return (
<div className="bg-subtle flex flex-col rounded-md border border-gray-300">
{connectedCalendars?.connectedCalendars.map((calendar, index, arr) => {
return (
<>
<div key={calendar.primary?.externalId} className="bg-transparent px-4 py-2 text-black">
{calendar.primary?.name} - {calendar.primary?.email}
</div>
{arr.length - 1 !== index && <hr className="w-[90%] self-center" />}
</>
);
})}
{connectedCalendars?.connectedCalendars
.filter((calendar) => calendar.integration.slug === `${calendarInstance}-calendar`)
.map((calendar, index, arr) => {
return (
<>
<div key={calendar.primary?.externalId} className="bg-transparent px-4 py-2 text-black">
{calendar.primary?.name} - {calendar.primary?.email}
</div>
{arr.length - 1 !== index && <hr className="w-[90%] self-center" />}
</>
);
})}
</div>
);
};
2 changes: 1 addition & 1 deletion packages/platform/atoms/connect/apple/AppleConnect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const AppleConnect: FC<Partial<Omit<OAuthConnectProps, "redir">>> = ({
StartIcon="calendar-days"
color="primary"
disabled={isClickable ? false : isChecking}
tooltip={tooltip ? tooltip : <ConnectedCalendarsTooltip />}
tooltip={tooltip ? tooltip : <ConnectedCalendarsTooltip calendarInstance="apple" />}
tooltipSide={tooltipSide}
tooltipOffset={10}
className={cn("", !isDisabled && "cursor-pointer", className)}
Expand Down
Loading