From 00caf1fe0ab04a9d2ec04d329cb580c75edc515c Mon Sep 17 00:00:00 2001
From: Nate Kelley <nate@buster.so>
Date: Sat, 27 Sep 2025 19:13:49 -0600
Subject: [PATCH] check for same page navigation

---
 .../src/components/ui/report/DynamicReportEditor.tsx |  4 +---
 .../ChatLayoutContext/useAutoRedirectStreaming.ts    | 12 +++++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/web/src/components/ui/report/DynamicReportEditor.tsx b/apps/web/src/components/ui/report/DynamicReportEditor.tsx
index c0668aef7..40e72c9ea 100644
--- a/apps/web/src/components/ui/report/DynamicReportEditor.tsx
+++ b/apps/web/src/components/ui/report/DynamicReportEditor.tsx
@@ -6,9 +6,7 @@ import { ReportEditorSkeleton } from './ReportEditorSkeleton';
 
 const DynamicReportEditorBase = lazy(() =>
   import('@/components/ui/report/ReportEditor').then((mod) => {
-    return {
-      default: mod.ReportEditor,
-    };
+    return { default: mod.ReportEditor };
   })
 );
 
diff --git a/apps/web/src/layouts/ChatLayout/ChatLayoutContext/useAutoRedirectStreaming.ts b/apps/web/src/layouts/ChatLayout/ChatLayoutContext/useAutoRedirectStreaming.ts
index 4fdd12f7c..1fc10c6c7 100644
--- a/apps/web/src/layouts/ChatLayout/ChatLayoutContext/useAutoRedirectStreaming.ts
+++ b/apps/web/src/layouts/ChatLayout/ChatLayoutContext/useAutoRedirectStreaming.ts
@@ -1,4 +1,4 @@
-import { useNavigate } from '@tanstack/react-router';
+import { useLocation, useNavigate } from '@tanstack/react-router';
 import { useEffect, useLayoutEffect, useRef, useState } from 'react';
 import type { BusterChatResponseMessage_file } from '@/api/asset_interfaces/chat';
 import { useGetChatMessageMemoized } from '@/api/buster_rest/chats';
@@ -10,6 +10,7 @@ import {
   useGetChatMessageIsFinishedReasoning,
   useGetChatMessageLastReasoningMessageId,
 } from '@/context/Chats/useGetChatMessage';
+import { useBuildLocation } from '@/context/Routes/useRouteBuilder';
 import { useWindowFocus } from '@/hooks/useWindowFocus';
 import { assetParamsToRoute } from '@/lib/assets/assetParamsToRoute';
 
@@ -21,6 +22,8 @@ export const useAutoRedirectStreaming = ({
   chatId: string | undefined;
 }) => {
   const navigate = useNavigate();
+  const location = useLocation();
+  const buildLocation = useBuildLocation();
   const getChatMessageMemoized = useGetChatMessageMemoized();
   const versionChanged = useIsVersionChanged();
   const isStreamFinished = useGetChatMessageCompleted({ messageId: lastMessageId });
@@ -67,8 +70,11 @@ export const useAutoRedirectStreaming = ({
           chatId,
           versionNumber: firstFile.version_number,
         });
-
-        navigate({ ...linkProps, replace: true, reloadDocument: versionChanged });
+        const builtLocation = buildLocation(linkProps);
+        const isOnSamePage = builtLocation.pathname === location.pathname;
+        if (!isOnSamePage) {
+          navigate({ ...linkProps, replace: true, reloadDocument: versionChanged });
+        }
       }
 
       previousIsCompletedStream.current = true;