ishangsf/DeepCodeGeniusWeb-vscode
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #156 from covespace/147-error-message-mixed-in-reply

Browse Source 
Enhancement: Display error messages in ChatPanel using Alert component
This commit is contained in:
Rankin Zheng 2023-06-05 22:19:47 +08:00 committed by GitHub
commit 95c35a0830
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/ChatPanel/index.tsx
View File

@ -1,10 +1,10 @@
import * as React from 'react'; import * as React from 'react';
import { useState, useEffect, useRef } from 'react'; import { useState, useEffect, useRef } from 'react';
import { Center, Container, Stack, px } from '@mantine/core'; import { Alert, Center, Container, Stack, px } from '@mantine/core';
import { ScrollArea } from '@mantine/core'; import { ScrollArea } from '@mantine/core';
import { Button } from '@mantine/core'; import { Button } from '@mantine/core';
import { useListState, useResizeObserver, useTimeout, useViewportSize } from '@mantine/hooks'; import { useListState, useResizeObserver, useTimeout, useViewportSize } from '@mantine/hooks';
import { IconPlayerStop, IconRotateDot } from '@tabler/icons-react'; import { IconAlertCircle, IconPlayerStop, IconRotateDot } from '@tabler/icons-react';
import messageUtil from '../../util/MessageUtil'; import messageUtil from '../../util/MessageUtil';
import InputMessage from './InputMessage'; import InputMessage from './InputMessage';
@ -17,7 +17,7 @@ const chatPanel = () => {
const [currentMessage, setCurrentMessage] = useState(''); const [currentMessage, setCurrentMessage] = useState('');
const [generating, setGenerating] = useState(false); const [generating, setGenerating] = useState(false);
const [responsed, setResponsed] = useState(false); const [responsed, setResponsed] = useState(false);
const [hasError, setHasError] = useState(false); const [hasError, setHasError] = useState('');
const { height, width } = useViewportSize(); const { height, width } = useViewportSize();
const [scrollPosition, onScrollPositionChange] = useState({ x: 0, y: 0 }); const [scrollPosition, onScrollPositionChange] = useState({ x: 0, y: 0 });
const [stopScrolling, setStopScrolling] = useState(false); const [stopScrolling, setStopScrolling] = useState(false);
@ -42,11 +42,10 @@ const chatPanel = () => {
setResponsed(true); setResponsed(true);
}); });
messageUtil.registerHandler('receiveMessage', (message: { text: string; isError: boolean }) => { messageUtil.registerHandler('receiveMessage', (message: { text: string; isError: boolean }) => {
setCurrentMessage(message.text);
setGenerating(false); setGenerating(false);
setResponsed(true); setResponsed(true);
if (message.isError) { if (message.isError) {
setHasError(true); setHasError(message.text);
} }
}); });
messageUtil.registerHandler('loadHistoryMessages', (message: { command: string; entries: [{ hash: '', user: '', date: '', request: '', response: '', context: [{ content: '', role: '' }] }] }) => { messageUtil.registerHandler('loadHistoryMessages', (message: { command: string; entries: [{ hash: '', user: '', date: '', request: '', response: '', context: [{ content: '', role: '' }] }] }) => {
@ -121,7 +120,7 @@ const chatPanel = () => {
command: 'regeneration' command: 'regeneration'
}); });
messageHandlers.pop(); messageHandlers.pop();
setHasError(false); setHasError('');
setGenerating(true); setGenerating(true);
setResponsed(false); setResponsed(false);
setCurrentMessage(''); setCurrentMessage('');
@ -182,6 +181,11 @@ const chatPanel = () => {
// onScrollPositionChange={onScrollPositionChange} // onScrollPositionChange={onScrollPositionChange}
viewportRef={scrollViewport}> viewportRef={scrollViewport}>
<MessageContainer width={chatContainerRect.width} generating={generating} messages={messages} responsed={responsed} /> <MessageContainer width={chatContainerRect.width} generating={generating} messages={messages} responsed={responsed} />
{hasError &&
<Alert w={chatContainerRect.width} mb={20} color="red" variant="filled">
{hasError}
</Alert>
}
</ScrollArea> </ScrollArea>
<Stack <Stack
spacing={5} spacing={5}