Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-18 09:20:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(Chat): correctly render when refreshing/visiting a conversation page (#1037)

Browse source
This commit is contained in:
Danny Avila 2023-10-10 15:04:44 -04:00 • committed by GitHub
parent b3aac97710
commit 495ac1b36d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/src/components/Nav/NewChat.tsx
View file

@ -1,14 +1,14 @@
import React from 'react'; import { useNavigate } from 'react-router-dom';
import { useLocalize, useConversation } from '~/hooks'; import { useLocalize, useConversation } from '~/hooks';
export default function NewChat() { export default function NewChat() {
const { newConversation } = useConversation(); const { newConversation } = useConversation();
const navigate = useNavigate();
const localize = useLocalize(); const localize = useLocalize();
const clickHandler = () => { const clickHandler = () => {
// dispatch(setInputValue(''));
// dispatch(setQuery(''));
newConversation(); newConversation();
navigate('/chat/new');
}; };
return ( return (

5
client/src/routes/Chat.tsx
View file

@ -27,7 +27,7 @@ export default function Chat() {
const navigate = useNavigate(); const navigate = useNavigate();
//disabled by default, we only enable it when messagesTree is null //disabled by default, we only enable it when messagesTree is null
const messagesQuery = useGetMessagesByConvoId(conversationId ?? '', { enabled: false }); const messagesQuery = useGetMessagesByConvoId(conversationId ?? '', { enabled: !messagesTree });
const getConversationMutation = useGetConversationByIdMutation(conversationId ?? ''); const getConversationMutation = useGetConversationByIdMutation(conversationId ?? '');
const { data: config } = useGetStartupConfig(); const { data: config } = useGetStartupConfig();
@ -89,7 +89,8 @@ export default function Chat() {
setShouldNavigate(false); setShouldNavigate(false);
} }
// conversationId (in url) should always follow conversation?.conversationId, unless conversation is null // conversationId (in url) should always follow conversation?.conversationId, unless conversation is null
else if (conversation?.conversationId !== conversationId) { // messagesTree is null when user navigates, but not on page refresh, so we need to navigate in this case
else if (conversation?.conversationId !== conversationId && !messagesTree) {
if (shouldNavigate) { if (shouldNavigate) {
navigate(`/chat/${conversation?.conversationId}`); navigate(`/chat/${conversation?.conversationId}`);
} else { } else {