From ec43f3f2c00811388eefc6152c59fa242c36b218 Mon Sep 17 00:00:00 2001
From: Hariom Balhara <hariombalhara@gmail.com>
Date: Tue, 23 May 2023 13:48:51 +0530
Subject: [PATCH] Forward query params from Team Profile page (#9057)

Co-authored-by: alannnc <alannnc@gmail.com>
---
 apps/web/components/team/screens/Team.tsx |  8 ++++++--
 apps/web/pages/team/[slug].tsx            | 16 ++++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/apps/web/components/team/screens/Team.tsx b/apps/web/components/team/screens/Team.tsx
index 5cbf3fe8ef..6503636861 100644
--- a/apps/web/components/team/screens/Team.tsx
+++ b/apps/web/components/team/screens/Team.tsx
@@ -1,4 +1,5 @@
 import Link from "next/link";
+import { useRouter } from "next/router";
 
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -14,11 +15,14 @@ type TeamTypeWithSafeHtml = Omit<TeamType, "members"> & { members: MemberType[]
 
 const Member = ({ member, teamName }: { member: MemberType; teamName: string | null }) => {
   const { t } = useLocale();
-
+  const router = useRouter();
   const isBioEmpty = !member.bio || !member.bio.replace("<p><br></p>", "").length;
 
+  // slug is a route parameter, we don't want to forward it to the next route
+  const { slug: _slug, ...queryParamsToForward } = router.query;
+
   return (
-    <Link key={member.id} href={`/${member.username}`}>
+    <Link key={member.id} href={{ pathname: `/${member.username}`, query: queryParamsToForward }}>
       <div className="sm:min-w-80 sm:max-w-80  bg-default hover:bg-muted border-subtle group flex min-h-full flex-col space-y-2 rounded-md border p-4 hover:cursor-pointer">
         <Avatar
           size="md"
diff --git a/apps/web/pages/team/[slug].tsx b/apps/web/pages/team/[slug].tsx
index 80f03d25b5..61270c1116 100644
--- a/apps/web/pages/team/[slug].tsx
+++ b/apps/web/pages/team/[slug].tsx
@@ -56,6 +56,9 @@ function TeamPage({ team, isUnpublished, markdownStrippedBio }: TeamPageProps) {
     );
   }
 
+  // slug is a route parameter, we don't want to forward it to the next route
+  const { slug: _slug, ...queryParamsToForward } = router.query;
+
   const EventTypes = () => (
     <ul className="border-subtle rounded-md border">
       {team.eventTypes.map((type, index) => (
@@ -67,7 +70,10 @@ function TeamPage({ team, isUnpublished, markdownStrippedBio }: TeamPageProps) {
           )}>
           <div className="px-6 py-4 ">
             <Link
-              href={`/team/${team.slug}/${type.slug}`}
+              href={{
+                pathname: `/team/${team.slug}/${type.slug}`,
+                query: queryParamsToForward,
+              }}
               onClick={async () => {
                 sdkActionManager?.fire("eventTypeSelected", {
                   eventType: type,
@@ -146,7 +152,13 @@ function TeamPage({ team, isUnpublished, markdownStrippedBio }: TeamPageProps) {
                     color="minimal"
                     EndIcon={ArrowRight}
                     className="dark:hover:bg-darkgray-200"
-                    href={`/team/${team.slug}?members=1`}
+                    href={{
+                      pathname: `/team/${team.slug}`,
+                      query: {
+                        members: "1",
+                        ...queryParamsToForward,
+                      },
+                    }}
                     shallow={true}>
                     {t("book_a_team_member")}
                   </Button>