mirror of https://github.com/buster-so/buster.git
check for same page navigation
This commit is contained in:
parent
9e6e4fa608
commit
00caf1fe0a
|
@ -6,9 +6,7 @@ import { ReportEditorSkeleton } from './ReportEditorSkeleton';
|
||||||
|
|
||||||
const DynamicReportEditorBase = lazy(() =>
|
const DynamicReportEditorBase = lazy(() =>
|
||||||
import('@/components/ui/report/ReportEditor').then((mod) => {
|
import('@/components/ui/report/ReportEditor').then((mod) => {
|
||||||
return {
|
return { default: mod.ReportEditor };
|
||||||
default: mod.ReportEditor,
|
|
||||||
};
|
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -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 { useEffect, useLayoutEffect, useRef, useState } from 'react';
|
||||||
import type { BusterChatResponseMessage_file } from '@/api/asset_interfaces/chat';
|
import type { BusterChatResponseMessage_file } from '@/api/asset_interfaces/chat';
|
||||||
import { useGetChatMessageMemoized } from '@/api/buster_rest/chats';
|
import { useGetChatMessageMemoized } from '@/api/buster_rest/chats';
|
||||||
|
@ -10,6 +10,7 @@ import {
|
||||||
useGetChatMessageIsFinishedReasoning,
|
useGetChatMessageIsFinishedReasoning,
|
||||||
useGetChatMessageLastReasoningMessageId,
|
useGetChatMessageLastReasoningMessageId,
|
||||||
} from '@/context/Chats/useGetChatMessage';
|
} from '@/context/Chats/useGetChatMessage';
|
||||||
|
import { useBuildLocation } from '@/context/Routes/useRouteBuilder';
|
||||||
import { useWindowFocus } from '@/hooks/useWindowFocus';
|
import { useWindowFocus } from '@/hooks/useWindowFocus';
|
||||||
import { assetParamsToRoute } from '@/lib/assets/assetParamsToRoute';
|
import { assetParamsToRoute } from '@/lib/assets/assetParamsToRoute';
|
||||||
|
|
||||||
|
@ -21,6 +22,8 @@ export const useAutoRedirectStreaming = ({
|
||||||
chatId: string | undefined;
|
chatId: string | undefined;
|
||||||
}) => {
|
}) => {
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
const location = useLocation();
|
||||||
|
const buildLocation = useBuildLocation();
|
||||||
const getChatMessageMemoized = useGetChatMessageMemoized();
|
const getChatMessageMemoized = useGetChatMessageMemoized();
|
||||||
const versionChanged = useIsVersionChanged();
|
const versionChanged = useIsVersionChanged();
|
||||||
const isStreamFinished = useGetChatMessageCompleted({ messageId: lastMessageId });
|
const isStreamFinished = useGetChatMessageCompleted({ messageId: lastMessageId });
|
||||||
|
@ -67,8 +70,11 @@ export const useAutoRedirectStreaming = ({
|
||||||
chatId,
|
chatId,
|
||||||
versionNumber: firstFile.version_number,
|
versionNumber: firstFile.version_number,
|
||||||
});
|
});
|
||||||
|
const builtLocation = buildLocation(linkProps);
|
||||||
navigate({ ...linkProps, replace: true, reloadDocument: versionChanged });
|
const isOnSamePage = builtLocation.pathname === location.pathname;
|
||||||
|
if (!isOnSamePage) {
|
||||||
|
navigate({ ...linkProps, replace: true, reloadDocument: versionChanged });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
previousIsCompletedStream.current = true;
|
previousIsCompletedStream.current = true;
|
||||||
|
|
Loading…
Reference in New Issue