Skip to content

Commit 75a7fba

Browse files
iceljciceljc
authored
Merge pull request #460 from iceljc/main
unify font
2 parents cddb13b + 81102b3 commit 75a7fba

3 files changed

Lines changed: 24 additions & 22 deletions

File tree

‎src/routes/VerticalLayout/Header.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
7979
<header
8080
id="page-topbar"
81-
class="fixed inset-x-0 top-0 z-[1002] h-[var(--header-height)] bg-white shadow-sm dark:bg-gray-800 font-script"
81+
class="fixed inset-x-0 top-0 z-[1002] h-[var(--header-height)] bg-white shadow-sm dark:bg-gray-800"
8282
>
8383
<div class="mx-auto flex h-full items-center justify-between pr-2">
8484
<div class="flex items-center">

‎src/routes/VerticalLayout/Sidebar.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@
277277
</script>
278278
279279
<div
280-
class="vertical-menu fixed bottom-0 left-0 top-[var(--header-height)] z-[1001] w-[var(--sidebar-width)] bg-[var(--sidebar-bg)] shadow-sm transition-[width,transform] duration-200 dark:bg-gray-800 font-averia"
280+
class="vertical-menu fixed bottom-0 left-0 top-[var(--header-height)] z-[1001] w-[var(--sidebar-width)] bg-[var(--sidebar-bg)] shadow-sm transition-[width,transform] duration-200 dark:bg-gray-800"
281281
>
282282
<div class="h-full" id="vertical-menu">
283283
<!--- Sidemenu -->

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

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
let isHandlingQueue = $state(false);
217217
let isStopStreamClicked = $state(false);
218218
219-
let isWaiting = $derived(isSendingMsg || isThinking || messageQueue.length > 0);
219+
let isWaiting = $derived(isSendingMsg || isThinking || isStreaming || messageQueue.length > 0);
220220
let loadEditor = true;
221221
let disableAction = $derived(!ADMIN_ROLES.includes(currentUser?.role || '')
222222
&& currentUser?.id !== conversationUser?.id
@@ -916,7 +916,7 @@
916916
return;
917917
}
918918
919-
if ((e.key === 'Enter' && (!!e.shiftKey || !!e.ctrlKey)) || e.key !== 'Enter' || !_.trim(text) || isSendingMsg || isThinking) {
919+
if ((e.key === 'Enter' && (!!e.shiftKey || !!e.ctrlKey)) || e.key !== 'Enter' || !_.trim(text) || isWaiting) {
920920
return;
921921
}
922922
@@ -962,7 +962,7 @@
962962
* @param {string} payload
963963
*/
964964
async function confirmSelectedOption(title, payload) {
965-
if (isSendingMsg || isThinking) return;
965+
if (isWaiting) return;
966966
967967
const postback = buildPostbackMessage(dialogs, payload || title, null);;
968968
await sendChatMessage(title, { postback: postback });
@@ -1137,6 +1137,7 @@
11371137
* @param {string} messageId
11381138
*/
11391139
function deleteMessage(e, messageId) {
1140+
if (isWaiting || disableAction) return;
11401141
handleDeleteMessage(messageId);
11411142
}
11421143
@@ -1153,6 +1154,7 @@
11531154
* @param {import('$conversationTypes').ChatResponseModel} message
11541155
*/
11551156
async function editMessage(message) {
1157+
if (isWaiting || disableAction) return;
11561158
truncateMsgId = message?.message_id;
11571159
editText = message?.text || '';
11581160
await tick();
@@ -1192,7 +1194,7 @@
11921194
11931195
/** @param {import('$conversationTypes').ChatResponseModel} message */
11941196
async function resendMessage(message) {
1195-
if (isSendingMsg || isThinking || disableAction) return;
1197+
if (isWaiting || disableAction) return;
11961198
const msgId = message?.message_id;
11971199
const msgText = message?.text || '';
11981200
if (!msgId || !msgText) return;
@@ -1387,6 +1389,7 @@
13871389
13881390
/** @param {import('$conversationTypes').ChatResponseModel} message */
13891391
async function openBotMsgEditor(message) {
1392+
if (isWaiting || disableAction) return;
13901393
let source = "text";
13911394
if (message.rich_content?.message?.text === message.text) {
13921395
source = "both";
@@ -1975,6 +1978,7 @@
19751978
data-bs-toggle="tooltip"
19761979
data-bs-placement="top"
19771980
title="Edit"
1981+
aria-disabled={isWaiting || disableAction}
19781982
onclick={() => editMessage(message)}
19791983
>
19801984
<i class="bx bxs-edit cb-text-primary"></i>
@@ -1988,7 +1992,7 @@
19881992
data-bs-toggle="tooltip"
19891993
data-bs-placement="top"
19901994
title="Resend"
1991-
aria-disabled={isSendingMsg || isThinking || disableAction}
1995+
aria-disabled={isWaiting || disableAction}
19921996
onclick={() => resendMessage(message)}
19931997
>
19941998
<i class="bx bx-redo cb-text-primary"></i>
@@ -2021,11 +2025,8 @@
20212025
data-bs-toggle="tooltip"
20222026
data-bs-placement="top"
20232027
title="Delete"
2024-
aria-disabled={isSendingMsg || isThinking || disableAction}
2025-
onclick={(e) => {
2026-
if (isSendingMsg || isThinking || disableAction) return;
2027-
deleteMessage(e, message.message_id);
2028-
}}
2028+
aria-disabled={isWaiting || disableAction}
2029+
onclick={(e) => deleteMessage(e, message.message_id)}
20292030
>
20302031
<i class="bx bx-trash cb-text-danger"></i>
20312032
</div>
@@ -2129,6 +2130,7 @@
21292130
data-bs-toggle="tooltip"
21302131
data-bs-placement="top"
21312132
title="Edit"
2133+
aria-disabled={isWaiting || disableAction}
21322134
onclick={() => openBotMsgEditor(message)}
21332135
>
21342136
<i class="bx bxs-edit cb-text-primary"></i>
@@ -2209,11 +2211,11 @@
22092211
{/if}
22102212
</ul>
22112213
2212-
<ChatFileGallery disabled={isSendingMsg || isThinking} />
2214+
<ChatFileGallery disabled={isWaiting} />
22132215
{#if !!lastBotMsg && !isSendingMsg && !isThinking}
22142216
<RichContent
22152217
message={lastBotMsg}
2216-
disabled={isSendingMsg || isThinking || disableAction}
2218+
disabled={isWaiting || disableAction}
22172219
onConfirm={(title, payload) => confirmSelectedOption(title, payload)}
22182220
/>
22192221
{/if}
@@ -2229,7 +2231,7 @@
22292231
class={`cb-btn cb-btn-round ${mode === TRAINING_MODE ? 'cb-btn-danger' : 'cb-btn-primary'} ${isListening ? 'cb-btn-listening' : ''}`}
22302232
aria-label="Start/stop listening"
22312233
aria-pressed={isListening}
2232-
disabled={isSendingMsg || isThinking || disableAction}
2234+
disabled={isWaiting || disableAction}
22332235
onclick={() => startListen()}
22342236
>
22352237
<i class="mdi mdi-{isListening ? 'microphone' : 'microphone-off'} cb-md-36"></i>
@@ -2242,7 +2244,7 @@
22422244
id={'chat-textarea'}
22432245
className={`${!isLite ? 'cb-textarea-more-util' : ''}`}
22442246
maxLength={maxTextLength}
2245-
disabled={isSendingMsg || isThinking || disableAction}
2247+
disabled={isWaiting || disableAction}
22462248
bind:text={text}
22472249
bind:loadUtils={loadChatUtils}
22482250
bind:options={chatUtilOptions}
@@ -2254,7 +2256,7 @@
22542256
<ChatFileUploader
22552257
accept={'.png,.jpg,.jpeg'}
22562258
containerClasses={'cb-util-uploader'}
2257-
disabled={isSendingMsg || isThinking || disableAction}
2259+
disabled={isWaiting || disableAction}
22582260
onfiledroped={() => refresh()}
22592261
>
22602262
<span>
@@ -2268,7 +2270,7 @@
22682270
<ChatFileUploader
22692271
accept={'.pdf,.xlsx,.xls,.csv'}
22702272
containerClasses={'cb-util-uploader'}
2271-
disabled={isSendingMsg || isThinking || disableAction}
2273+
disabled={isWaiting || disableAction}
22722274
onfiledroped={() => refresh()}
22732275
>
22742276
<span>
@@ -2282,7 +2284,7 @@
22822284
<ChatFileUploader
22832285
accept={'.wav,.mp3'}
22842286
containerClasses={'cb-util-uploader'}
2285-
disabled={isSendingMsg || isThinking || disableAction}
2287+
disabled={isWaiting || disableAction}
22862288
onfiledroped={() => refresh()}
22872289
>
22882290
<span>
@@ -2296,12 +2298,12 @@
22962298
</ChatTextArea>
22972299
<div class="cb-util-links">
22982300
<ChatBigMessage
2299-
disabled={isSendingMsg || isThinking || disableAction}
2301+
disabled={isWaiting || disableAction}
23002302
onclick={() => toggleBigMessageModal()}
23012303
/>
23022304
{#if PUBLIC_LIVECHAT_FILES_ENABLED === 'true'}
23032305
<ChatUtil
2304-
disabled={isSendingMsg || isThinking || disableAction}
2306+
disabled={isWaiting || disableAction}
23052307
onclick={() => loadChatUtils = true}
23062308
/>
23072309
{/if}
@@ -2323,7 +2325,7 @@
23232325
<button
23242326
type="submit"
23252327
class={`cb-btn cb-btn-round cb-btn-send ${mode === TRAINING_MODE ? 'cb-btn-danger' : 'cb-btn-primary'}`}
2326-
disabled={!_.trim(text) || isSendingMsg || isThinking || disableAction}
2328+
disabled={!_.trim(text) || isWaiting || disableAction}
23272329
onclick={() => sentTextMessage()}
23282330
>
23292331
<span class="cb-send-label">Send</span>

0 commit comments

Comments
 (0)