fix: on new chat doesnt create new chat room

mrevanzak · Jun 30, 2024 · 6ad77fa · 6ad77fa
1 parent 6589559
commit 6ad77fa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/apps/web/src/app/(app)/@user/card.tsx b/apps/web/src/app/(app)/@user/card.tsx
@@ -21,7 +21,7 @@ export function ChatCard() {
 
   const { data } = api.chat.show.useQuery(
     { id: searchParams.get("id") ?? "" },
-    { enabled: searchParams.has("id") },
+    { enabled: searchParams.has("id") && !searchParams.has("new") },
   );
   const initialMessages = data?.messages as Message[] | undefined;
 
@@ -35,7 +35,7 @@ export function ChatCard() {
           onFinish={() => utils.chat.get.invalidate()}
           initialMessages={initialMessages}
           placeholder={"/ : " + t("chooseTopic")}
-          id={data?.id}
+          id={searchParams.get("id") ?? undefined}
         />
       </CardContent>
       <CardFooter>

diff --git a/apps/web/src/components/sidebar/sidebar-user.tsx b/apps/web/src/components/sidebar/sidebar-user.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useState } from "react";
-import { useRouter } from "next/navigation";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
 import { Drawer, DrawerContent, DrawerTrigger } from "@/components/drawer";
 import { HistoryList } from "@/components/history-list";
 import { api } from "@/trpc/react";
@@ -59,6 +59,7 @@ function Content() {
 export function SidebarUser() {
   const [open, setOpen] = useState(false);
   const router = useRouter();
+  const searchParams = useSearchParams();
   const isMobile = useMediaQuery("(max-width: 768px)");
 
   const t = useTranslations("Home.history");
@@ -114,7 +115,9 @@ export function SidebarUser() {
             className="relative min-w-10 justify-start overflow-clip px-0 transition-all group-data-[open=true]:min-w-20 group-data-[open=false]:-translate-x-3.5"
             onClick={() => {
               setOpen(false);
-              router.push("/");
+              searchParams.has("id")
+                ? router.push("/")
+                : router.push(`/?id=${crypto.randomUUID()}&new`);
             }}
           >
             <FaPlus className="translate-x-3/4 transition-all" />

diff --git a/packages/ui/src/chat.tsx b/packages/ui/src/chat.tsx
@@ -63,7 +63,7 @@ export function Chat({
     sendExtraMessageFields: true,
     onFinish,
     initialMessages,
-    id,
+    id: chatId,
   });
   const chatContainerRef = useChatScroll(messages);