Skip to content

V1->V2 connect calendar #3961

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

Merged
alannnc merged 14 commits into from
Sep 6, 2022
Merged

V1->V2 connect calendar #3961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
408d50d
V1->V2 connect calendar
sean-brydon Aug 25, 2022
368e90b
Fix imports
sean-brydon Aug 25, 2022
9343f6a
Fix types
sean-brydon Aug 25, 2022
66d7f11
Merge branch 'main' into V2auto-connect-calendar-3582
PeerRich Aug 25, 2022
8d0d1ff
Merge branch 'main' into V2auto-connect-calendar-3582
PeerRich Aug 26, 2022
1c6b0d2
Merge branch 'main' into V2auto-connect-calendar-3582
PeerRich Sep 5, 2022
fec42a8
Merge branch 'main' of ssh://github.com/calcom/cal.com into V2auto-co…
alannnc Sep 6, 2022
36b7273
Implementing v1 NoCalendarConnectedAlert changes on v2 component
alannnc Sep 6, 2022
19ff704
Merge branch 'main' of ssh://github.com/calcom/cal.com into V2auto-co…
alannnc Sep 6, 2022
e952597
Merge branch 'main' into V2auto-connect-calendar-3582
kodiakhq[bot] Sep 6, 2022
dbae9aa
Merge branch 'main' into V2auto-connect-calendar-3582
kodiakhq[bot] Sep 6, 2022
c26c057
Merge branch 'main' into V2auto-connect-calendar-3582
kodiakhq[bot] Sep 6, 2022
0ff6ebd
Merge branch 'main' into V2auto-connect-calendar-3582
kodiakhq[bot] Sep 6, 2022
23dcd09
Merge branch 'main' into V2auto-connect-calendar-3582
kodiakhq[bot] Sep 6, 2022
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
5 changes: 5 additions & 0 deletions apps/web/pages/v2/event-types/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import EventTypeDescription from "@components/eventtype/EventTypeDescription";
import SkeletonLoader from "@components/eventtype/SkeletonLoader";
import Avatar from "@components/ui/Avatar";
import AvatarGroup from "@components/ui/AvatarGroup";
import NoCalendarConnectedAlert from "@components/ui/NoCalendarConnectedAlert";

import { TRPCClientError } from "@trpc/react";

Expand Down Expand Up @@ -551,6 +552,7 @@ const WithQuery = withQuery(["viewer.eventTypes"]);

const EventTypesPage = () => {
const { t } = useLocale();

return (
<div>
<Head>
Expand Down Expand Up @@ -581,6 +583,9 @@ const EventTypesPage = () => {
className="mb-4"
/>
)}

<NoCalendarConnectedAlert />

{data.eventTypeGroups.map((group, index) => (
<Fragment key={group.profile.slug}>
{/* hide list heading when there is only one (current user) */}
Expand Down
13 changes: 12 additions & 1 deletion packages/ui/v2/modules/event-types/DestinationCalendarSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import classNames from "classnames";
import React, { useEffect, useState } from "react";

import { useLocale } from "@calcom/lib/hooks/useLocale";
import { DestinationCalendar } from "@calcom/prisma/client";
import { trpc } from "@calcom/trpc/react";
import Select from "@calcom/ui/v2/core/form/Select";

Expand All @@ -10,6 +11,7 @@ interface Props {
isLoading?: boolean;
hidePlaceholder?: boolean;
/** The external Id of the connected calendar */
destinationCalendar?: DestinationCalendar | null;
value: string | undefined;
maxWidth?: number;
}
Expand All @@ -20,6 +22,7 @@ const DestinationCalendarSelector = ({
value,
hidePlaceholder,
maxWidth,
destinationCalendar,
}: Props): JSX.Element | null => {
const { t } = useLocale();
const query = trpc.useQuery(["viewer.connectedCalendars"]);
Expand Down Expand Up @@ -73,7 +76,15 @@ const DestinationCalendarSelector = ({
<div className="relative" title={`${t("select_destination_calendar")}: ${selectedOption?.label || ""}`}>
<Select
name="primarySelectedCalendar"
placeholder={!hidePlaceholder ? `${t("select_destination_calendar")}:` : undefined}
placeholder={
Copy link
Contributor

@alannnc alannnc Sep 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should stay as this change was made on v1 component

!hidePlaceholder ? (
`${t("select_destination_calendar")}`
) : (
<span>
{t("default_calendar_selected")} ({destinationCalendar?.externalId})
</span>
)
}
options={options}
styles={{
placeholder: (styles) => ({ ...styles, ...content(hidePlaceholder) }),
Expand Down