From 6be0fd52e7482a948064d3c2dbffdd85e10e190c Mon Sep 17 00:00:00 2001
From: Nafees Nazik <84864519+G3root@users.noreply.github.com>
Date: Mon, 19 Dec 2022 20:08:33 +0530
Subject: [PATCH] fix: add a `returnTo` query param in new team url path
 (#5967)

* fix: remove optional from schema.

* schema success state is always true  because of the optional property.
 so we are getting undefined if returnTo query Param doesn't exist

* fix: add a return to query param

* nit: turn querySchema into an object

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Bailey Pumfleet <bailey@pumfleet.co.uk>
---
 apps/web/pages/teams/index.tsx                       |  2 +-
 .../ee/teams/components/CreateANewTeamForm.tsx       | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/web/pages/teams/index.tsx b/apps/web/pages/teams/index.tsx
index 6039f38883..bd93230b7c 100644
--- a/apps/web/pages/teams/index.tsx
+++ b/apps/web/pages/teams/index.tsx
@@ -14,7 +14,7 @@ function Teams() {
       heading={t("teams")}
       subtitle={t("create_manage_teams_collaborative")}
       CTA={
-        <Button type="button" href={`${WEBAPP_URL}/settings/teams/new`}>
+        <Button type="button" href={`${WEBAPP_URL}/settings/teams/new?returnTo=/teams`}>
           <Icon.FiPlus className="inline-block h-3.5 w-3.5 text-white group-hover:text-black ltr:mr-2 rtl:ml-2" />
           {t("new")}
         </Button>
diff --git a/packages/features/ee/teams/components/CreateANewTeamForm.tsx b/packages/features/ee/teams/components/CreateANewTeamForm.tsx
index a3479de4ae..e8f6353d61 100644
--- a/packages/features/ee/teams/components/CreateANewTeamForm.tsx
+++ b/packages/features/ee/teams/components/CreateANewTeamForm.tsx
@@ -9,17 +9,17 @@ import { Avatar, Button, Form, Icon, ImageUploader, TextField } from "@calcom/ui
 
 import { NewTeamFormValues } from "../lib/types";
 
-const querySchema = z.optional(z.string());
+const querySchema = z.object({
+  returnTo: z.string(),
+});
 
 export const CreateANewTeamForm = () => {
   const { t } = useLocale();
   const router = useRouter();
-  const {
-    query: { returnTo },
-  } = router;
-  const returnToParsed = querySchema.safeParse(returnTo);
 
-  const returnToParam = returnToParsed.success ? returnToParsed.data : "/settings/teams";
+  const returnToParsed = querySchema.safeParse(router.query);
+
+  const returnToParam = returnToParsed.success ? returnToParsed.data.returnTo : "/settings/teams";
 
   const newTeamFormMethods = useForm<NewTeamFormValues>();