highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-06-09 14:39:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

simplify unnecessary display logic (#2406)

Browse Source
This commit is contained in:
pablodanswer 2024-09-11 14:35:50 -07:00 committed by GitHub
parent 2c971cf774
commit d90c90dd92
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
web/src/app/chat/ChatPage.tsx
View File

@ -1965,21 +1965,16 @@ export function ChatPage({
const parentMessage = message.parentMessageId const parentMessage = message.parentMessageId
? messageMap.get(message.parentMessageId) ? messageMap.get(message.parentMessageId)
: null; : null;
if (
(currentSessionRegenerationState?.regenerating &&
message.messageId >
currentSessionRegenerationState?.finalMessageIndex!) ||
(currentSessionChatState == "loading" &&
((i >= messageHistory.length - 2 &&
message.type == "user") ||
(i >= messageHistory.length - 1 &&
!currentSessionRegenerationState?.regenerating)))
) {
return <></>;
}
if (message.type === "user") { if (message.type === "user") {
if (
(currentSessionChatState == "loading" &&
i == messageHistory.length - 1) ||
(currentSessionRegenerationState?.regenerating &&
message.messageId >=
currentSessionRegenerationState?.finalMessageIndex!)
) {
return <></>;
}
return ( return (
<div <div
id={`message-${message.messageId}`} id={`message-${message.messageId}`}
@ -2052,10 +2047,11 @@ export function ChatPage({
: null; : null;
if ( if (
currentSessionRegenerationState?.regenerating && (currentSessionChatState == "loading" &&
currentSessionChatState == "loading" && i > messageHistory.length - 1) ||
(i == messageHistory.length - 1 || (currentSessionRegenerationState?.regenerating &&
currentSessionRegenerationState?.regenerating) message.messageId >
currentSessionRegenerationState?.finalMessageIndex!)
) { ) {
return <></>; return <></>;
} }