Merge pull request #137 from iceljc/features/refine-chat-window

refine chat image upload
SciSharp · Jun 4, 2024 · 4feb1d7 · 4feb1d7
2 parents f958615 + fe8aae2
commit 4feb1d7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/src/lib/common/MessageImageGallery.svelte b/src/lib/common/MessageImageGallery.svelte
@@ -15,8 +15,6 @@
 
     /** @type {any[]} */
     let files = [];
-    /** @type {string} */
-    let token = "";
 
     onMount(() => {
         if (fetchFiles != null && fetchFiles != undefined) {

diff --git a/src/lib/helpers/utils/gallery.js b/src/lib/helpers/utils/gallery.js
@@ -1,4 +1,5 @@
 import { EditorType, ElementType } from '../enums';
+import { conversationUserAttachmentStore } from '../store';
 
 /**
  * @param {import('$types').ChatResponseModel?} message
@@ -9,4 +10,8 @@ export function loadFileGallery(message) {
     || message?.rich_content?.message?.elements?.find(x => x.type == ElementType.File)
     || message?.rich_content?.message?.quick_replies?.find(x => x.type == ElementType.File)
     || message?.rich_content?.message?.options?.find(x => x.type == ElementType.File);
+}
+
+export function loadLocalFiles() {
+    return conversationUserAttachmentStore.get()?.accepted_files?.length > 0;
 }
diff --git a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
@@ -36,7 +36,7 @@
 	import { utcToLocal } from '$lib/helpers/datetime';
 	import { replaceNewLine } from '$lib/helpers/http';
 	import { EditorType, SenderAction, UserRole } from '$lib/helpers/enums';
-	import { loadFileGallery } from '$lib/helpers/utils/gallery';
+	import { loadFileGallery, loadLocalFiles } from '$lib/helpers/utils/gallery';
 	import RichContent from './rich-content/rich-content.svelte';
 	import RcMessage from "./rich-content/rc-message.svelte";
 	import RcDisclaimer from './rich-content/rc-disclaimer.svelte';
@@ -125,14 +125,13 @@
 	let isFrame = false;
 	let loadEditor = false;
 	let loadTextEditor = false;
-	let loadFileEditor = false;
+	let loadFileEditor = true;
 	let autoScrollLog = false;
 	let disableAction = false;
 
 	$: {
 		const editor = lastBotMsg?.rich_content?.editor || '';
 		loadTextEditor = TEXT_EDITORS.includes(editor) || !Object.values(EditorType).includes(editor);
-		loadFileEditor = FILE_EDITORS.includes(editor);
 		loadEditor = !isSendingMsg && !isThinking && (loadTextEditor || loadFileEditor);
 	}
 
@@ -277,7 +276,7 @@
 			}
 
 			const prevMsg = dialogs[idx-1];
-			if (!!prevMsg && BOT_SENDERS.includes(prevMsg?.sender?.role || '')
+			if (!!!prevMsg || BOT_SENDERS.includes(prevMsg?.sender?.role || '')
 				&& loadFileGallery(prevMsg)) {
 				curMsg.is_load_images = true;
 			}
@@ -324,12 +323,8 @@
 	}
 
 	function getChatFiles() {
-		if (loadFileGallery(lastBotMsg)) {
-			const attachments = conversationUserAttachmentStore.get();
-			return attachments?.accepted_files || [];
-		}
-		
-		return [];
+		const attachments = conversationUserAttachmentStore.get();
+		return attachments?.accepted_files || [];
 	}
 
 
@@ -997,7 +992,7 @@
 											{#if !!message.post_action_disclaimer}
 												<RcDisclaimer content={message.post_action_disclaimer} />
 											{/if}
-											{#if message.is_load_images}
+											{#if message.is_load_images || USER_SENDERS.includes(message.sender?.role)}
 												<MessageImageGallery
 													galleryStyles={'justify-content: flex-end;'}
 													fetchFiles={() => getConversationFiles(params.conversationId, message.message_id)}
@@ -1056,9 +1051,7 @@
 								{/if}
 							</ul>
 
-							{#if loadFileGallery(lastBotMsg)}
-								<ChatImageGallery disabled={isSendingMsg || isThinking} />
-							{/if}
+							<ChatImageGallery disabled={isSendingMsg || isThinking} />
 							{#if !!lastBotMsg && !isSendingMsg && !isThinking}
 								<RichContent
 									message={lastBotMsg}
@@ -1092,7 +1085,7 @@
 									/>
 									{#if loadFileEditor}
 										<div class="chat-input-links">
-											<ChatImageUploader disabled={disableAction} />
+											<ChatImageUploader disabled={disableAction} onFileDrop={() => refresh()} />
 										</div>
 									{/if}
 								</div>

diff --git a/src/routes/chat/[agentId]/[conversationId]/chat-image/chat-image-uploader.svelte b/src/routes/chat/[agentId]/[conversationId]/chat-image/chat-image-uploader.svelte
@@ -7,6 +7,9 @@
     /** @type {boolean} */
     export let disabled = false;
 
+    /** @type {() => void} */
+    export let onFileDrop = () => {};
+
     /** @type {any[]} */
     let files = [];
 
@@ -40,6 +43,7 @@
         conversationUserAttachmentStore.put({
             accepted_files: newAttachments
         });
+        onFileDrop?.();
     }
 </script>
 

diff --git a/src/routes/page/conversation/[conversationId]/conv-dialogs.svelte b/src/routes/page/conversation/[conversationId]/conv-dialogs.svelte
@@ -32,7 +32,7 @@
             }
 
             const prevMsg = dialogs[idx-1];
-            if (!!prevMsg && BOT_SENDERS.includes(prevMsg?.sender?.role || '')
+            if (!!!prevMsg || BOT_SENDERS.includes(prevMsg?.sender?.role || '')
                 && loadFileGallery(prevMsg)) {
                 curMsg.is_load_images = true;
             }
@@ -88,7 +88,7 @@
                                 <p class="fw-bold">
                                     <Markdown text={dialog?.rich_content?.message?.text || dialog?.text} />
                                 </p>
-                                {#if dialog.is_load_images}
+                                {#if dialog.is_load_images || showInRight(dialog)}
                                 <MessageImageGallery
                                     galleryClasses={'dialog-file-display'}
                                     fetchFiles={() => getConversationFiles(conversation.id, dialog.message_id)}