Skip to content

Commit 38ad1e1

Browse files
author
Jicheng Lu
committed
refine message gallery
1 parent c81ddd1 commit 38ad1e1

File tree

3 files changed

+19
-16
lines changed

3 files changed

+19
-16
lines changed

src/lib/common/MessageImageGallery.svelte

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,17 @@
22
import { onMount } from 'svelte';
33
import FileGallery from '$lib/common/FileGallery.svelte';
44
import { getUserStore } from '$lib/helpers/store';
5-
import { getConversationFiles } from '$lib/services/conversation-service';
65
import { PUBLIC_SERVICE_URL } from '$env/static/public';
7-
8-
/** @type {string} */
9-
export let conversationId;
10-
11-
/** @type {string} */
12-
export let messageId;
136
147
/** @type {string} */
158
export let galleryClasses = '';
169
1710
/** @type {string} */
1811
export let galleryStyles = '';
1912
13+
/** @type {() => Promise<any>} */
14+
export let fetchFiles = () => Promise.resolve([]);
15+
2016
/** @type {any[]} */
2117
let files = [];
2218
/** @type {string} */
@@ -25,7 +21,7 @@
2521
onMount(() => {
2622
const user = getUserStore();
2723
token = user.token;
28-
getConversationFiles(conversationId, messageId).then(data => {
24+
fetchFiles().then(data => {
2925
// @ts-ignore
3026
files = data?.filter(item => !!item.file_url)?.map(item => {
3127
return {

src/routes/chat/[agentId]/[conversationId]/chat-box.svelte

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@
55
DropdownMenu,
66
DropdownItem,
77
} from '@sveltestrap/sveltestrap';
8+
import {
9+
conversationStore,
10+
conversationUserStateStore,
11+
conversationUserMessageStore,
12+
conversationUserAttachmentStore
13+
} from '$lib/helpers/store.js';
14+
import {
15+
sendMessageToHub,
16+
GetDialogs,
17+
deleteConversationMessage,
18+
getConversationFiles
19+
} from '$lib/services/conversation-service.js';
820
import 'overlayscrollbars/overlayscrollbars.css';
921
import { OverlayScrollbars } from 'overlayscrollbars';
1022
import { page } from '$app/stores';
@@ -14,9 +26,7 @@
1426
import { BOT_SENDERS, USER_SENDERS } from '$lib/helpers/constants';
1527
import { signalr } from '$lib/services/signalr-service.js';
1628
import { webSpeech } from '$lib/services/web-speech.js';
17-
import { sendMessageToHub, GetDialogs, deleteConversationMessage } from '$lib/services/conversation-service.js';
1829
import { newConversation } from '$lib/services/conversation-service';
19-
import { conversationStore, conversationUserStateStore, conversationUserMessageStore, conversationUserAttachmentStore } from '$lib/helpers/store.js';
2030
import DialogModal from '$lib/common/DialogModal.svelte';
2131
import HeadTitle from '$lib/common/HeadTitle.svelte';
2232
import LoadingDots from '$lib/common/LoadingDots.svelte';
@@ -38,7 +48,6 @@
3848
import "sweetalert2/src/sweetalert2.scss";
3949
import moment from 'moment';
4050
41-
4251
const options = {
4352
scrollbars: {
4453
visibility: 'auto',
@@ -944,8 +953,7 @@
944953
{#if message.is_load_images}
945954
<MessageImageGallery
946955
galleryStyles={'justify-content: flex-end;'}
947-
conversationId={params.conversationId}
948-
messageId={message.message_id}
956+
fetchFiles={() => getConversationFiles(params.conversationId, message.message_id)}
949957
/>
950958
{/if}
951959
</div>

src/routes/page/conversation/[conversationId]/conv-dialogs.svelte

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script>
22
import { Card, CardBody, CardTitle, Col, Row } from '@sveltestrap/sveltestrap';
33
import Link from 'svelte-link/src/Link.svelte';
4-
import { GetDialogs } from '$lib/services/conversation-service.js';
4+
import { GetDialogs, getConversationFiles } from '$lib/services/conversation-service.js';
55
import { utcToLocal } from '$lib/helpers/datetime';
66
import { onMount } from 'svelte';
77
import { _ } from 'svelte-i18n'
@@ -91,8 +91,7 @@
9191
{#if dialog.is_load_images}
9292
<MessageImageGallery
9393
galleryClasses={'dialog-file-display'}
94-
conversationId={conversation.id}
95-
messageId={dialog.message_id}
94+
fetchFiles={() => getConversationFiles(conversation.id, dialog.message_id)}
9695
/>
9796
{/if}
9897
</div>

0 commit comments

Comments
 (0)