diff --git a/web/src/components/message-item/index.tsx b/web/src/components/message-item/index.tsx
index 9e152c607..cc040c167 100644
--- a/web/src/components/message-item/index.tsx
+++ b/web/src/components/message-item/index.tsx
@@ -39,7 +39,7 @@ const MessageItem = ({
item,
reference,
loading = false,
- avatar = '',
+ avatar,
sendLoading = false,
clickDocumentButton,
index,
@@ -102,13 +102,7 @@ const MessageItem = ({
})}
>
{item.role === MessageType.User ? (
-
+
) : (
)}
diff --git a/web/src/pages/chat/utils.ts b/web/src/pages/chat/utils.ts
index a14300c47..820bd2ca5 100644
--- a/web/src/pages/chat/utils.ts
+++ b/web/src/pages/chat/utils.ts
@@ -1,5 +1,6 @@
import { MessageType } from '@/constants/chat';
import { IConversation, IReference } from '@/interfaces/database/chat';
+import { isEmpty } from 'lodash';
import { EmptyConversationId } from './constants';
import { IMessage } from './interface';
@@ -34,9 +35,9 @@ export const buildMessageItemReference = (
const referenceIndex = assistantMessages.findIndex(
(x) => x.id === message.id,
);
- const reference = message?.reference
+ const reference = !isEmpty(message?.reference)
? message?.reference
- : (conversation?.reference ?? {})[referenceIndex];
+ : (conversation?.reference ?? [])[referenceIndex];
- return reference;
+ return reference ?? { doc_aggs: [], chunks: [], total: 0 };
};
diff --git a/web/src/utils/chat.ts b/web/src/utils/chat.ts
index 1caf00179..498b337fc 100644
--- a/web/src/utils/chat.ts
+++ b/web/src/utils/chat.ts
@@ -1,6 +1,7 @@
import { EmptyConversationId, MessageType } from '@/constants/chat';
import { Message } from '@/interfaces/database/chat';
import { IMessage } from '@/pages/chat/interface';
+import { omit } from 'lodash';
import { v4 as uuid } from 'uuid';
export const isConversationIdExist = (conversationId: string) => {
@@ -27,7 +28,7 @@ export const getMessagePureId = (id?: string) => {
export const buildMessageListWithUuid = (messages?: Message[]) => {
return (
messages?.map((x: Message | IMessage) => ({
- ...x,
+ ...omit(x, 'reference'),
id: buildMessageUuid(x),
})) ?? []
);