-
Notifications
You must be signed in to change notification settings - Fork 6.8k
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.
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
feat: ooo-v2 #13621
feat: ooo-v2 #13621
Changes from all commits
6b68712
63ef710
0237870
618aea8
167c0d7
1d4847e
8e5f50f
87658f7
748b20f
6972b48
093b73a
ee59e90
e0edd25
def3134
9ad098d
edea4ed
2dd017e
16aee20
69c421c
2f8cd2f
0e5f300
2bef090
f08ea69
2514e83
5bbfb67
90209d8
9f6ad2f
59860d6
fddda72
1356213
107367d
43fca31
ba9616e
927d9e5
7b4199d
77f0ff2
1d835b6
ceb81b5
fe04a87
8863b41
bc775b1
0a7408b
cae9969
5d49954
426235d
9144bd0
a830cda
613c1a0
a78eb53
12876e8
31cbbed
6730173
005c84f
9ae3619
9ee16c8
a5b7caf
09ffa74
c04f8ec
981c497
ff98d89
286394e
a15edb6
ed386ca
9c5e177
df5833f
9384c45
394b802
142bb2c
1cf4ff3
3653255
5ec48e7
fedf00b
a2fca52
5e5bd1f
edf8380
e4a12ae
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,8 +43,8 @@ | |
...query | ||
} = useRouterQuery(); | ||
|
||
const isRedirect = searchParams?.get("redirected") === "true" || false; | ||
Check warning on line 46 in apps/web/modules/users/views/users-public-view.tsx GitHub Actions / ESLint Report Analysisapps/web/modules/users/views/users-public-view.tsx#L46
|
||
const fromUserNameRedirected = searchParams?.get("username") || ""; | ||
Check warning on line 47 in apps/web/modules/users/views/users-public-view.tsx GitHub Actions / ESLint Report Analysisapps/web/modules/users/views/users-public-view.tsx#L47
|
||
/* | ||
const telemetry = useTelemetry(); | ||
useEffect(() => { | ||
|
@@ -87,25 +87,6 @@ | |
isEmbed ? "border-booker border-booker-width bg-default rounded-md border" : "", | ||
"max-w-3xl px-4 py-24" | ||
)}> | ||
{isRedirect && ( | ||
<div className="mb-8 rounded-md bg-blue-100 p-4 dark:border dark:bg-transparent"> | ||
<h2 className="text-default mb-2 text-sm font-semibold dark:text-white"> | ||
{t("user_redirect_title", { | ||
username: fromUserNameRedirected, | ||
})}{" "} | ||
🏝️ | ||
</h2> | ||
<p className="text-default text-sm"> | ||
{t("user_redirect_description", { | ||
profile: { | ||
username: user.username, | ||
}, | ||
username: fromUserNameRedirected, | ||
})}{" "} | ||
😄 | ||
</p> | ||
</div> | ||
)} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No longer needed. |
||
<div className="mb-8 text-center"> | ||
<UserAvatar | ||
size="xl" | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,6 @@ import { type GetServerSidePropsContext } from "next"; | |
import { z } from "zod"; | ||
|
||
import { getServerSession } from "@calcom/features/auth/lib/getServerSession"; | ||
import { handleTypeRedirection } from "@calcom/features/booking-redirect/handle-type"; | ||
import { getBookingForReschedule, getBookingForSeatedEvent } from "@calcom/features/bookings/lib/get-booking"; | ||
import type { GetBookingType } from "@calcom/features/bookings/lib/get-booking"; | ||
import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains"; | ||
|
@@ -105,7 +104,7 @@ async function getUserPageProps(context: GetServerSidePropsContext) { | |
const username = usernames[0]; | ||
const { rescheduleUid, bookingUid } = context.query; | ||
const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(context.req, context.params?.orgSlug); | ||
let outOfOffice = false; | ||
|
||
const isOrgContext = currentOrgDomain && isValidOrgDomain; | ||
if (!isOrgContext) { | ||
const redirect = await getTemporaryOrgRedirect({ | ||
|
@@ -132,18 +131,6 @@ async function getUserPageProps(context: GetServerSidePropsContext) { | |
notFound: true, | ||
} as const; | ||
} | ||
// If user is found, quickly verify bookingRedirects | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Feature no longer needed. |
||
const result = await handleTypeRedirection({ | ||
userId: user.id, | ||
username, | ||
slug, | ||
}); | ||
if (result && result.outOfOffice) { | ||
outOfOffice = true; | ||
} | ||
if (result && result.redirect?.destination) { | ||
return result; | ||
} | ||
|
||
let booking: GetBookingType | null = null; | ||
if (rescheduleUid) { | ||
|
@@ -176,9 +163,9 @@ async function getUserPageProps(context: GetServerSidePropsContext) { | |
length: eventData.length, | ||
metadata: eventData.metadata, | ||
}, | ||
away: outOfOffice, | ||
user: username, | ||
slug, | ||
away: false, | ||
trpcState: ssr.dehydrate(), | ||
isBrandingHidden: user?.hideBranding, | ||
isSEOIndexable: user?.allowSEOIndexing, | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changes on this file are to remove previous feature of profile forwarding, no longer needed.