Skip to content

Commit 34e0155

Browse files
authored
Merge pull request #59 from iceljc/features/refine-content-log
add clear screen btn
2 parents 4cc66eb + 139ea4a commit 34e0155

File tree

6 files changed

+61
-17
lines changed

6 files changed

+61
-17
lines changed

src/lib/helpers/enums.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ const contentLogSource = {
2727
UserInput: "user input",
2828
Prompt: "prompt",
2929
FunctionCall: "function call",
30-
AgentResponse: "agent response"
30+
AgentResponse: "agent response",
31+
HardRule: "hard rule"
3132
};
3233
export const ContentLogSource = Object.freeze(contentLogSource);

src/lib/scss/custom/pages/_chat.scss

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,13 @@
312312
height: 100vh;
313313

314314
.padding-side {
315-
padding-left: 10px;
315+
padding-left: 20px;
316316
padding-right: 20px;
317+
318+
ul {
319+
padding-left: 2px !important;
320+
padding-right: 0px !important;
321+
}
317322
}
318323

319324
.log-background {
@@ -324,7 +329,8 @@
324329
margin-bottom: 10px;
325330
position: sticky;
326331
display: flex;
327-
justify-content: flex-end;
332+
// justify-content: flex-end;
333+
justify-content: space-between;
328334
}
329335

330336
.log-list {

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

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -332,13 +332,21 @@
332332
}
333333
}
334334
335+
function cleanContentLogScreen() {
336+
contentLogs = [];
337+
}
338+
335339
function toggleStateLog() {
336340
isLoadStateLog = !isLoadStateLog;
337341
if (!isLoadStateLog) {
338342
stateLogs = [];
339343
}
340344
}
341345
346+
function cleanStateLogScreen() {
347+
stateLogs = [];
348+
}
349+
342350
function toggleAddStateModal() {
343351
isOpenAddStateModal = !isOpenAddStateModal;
344352
}
@@ -427,8 +435,15 @@
427435
async function confirmEditMsg() {
428436
const isDeleted = truncateDialogs(truncateMsgId);
429437
if (!isDeleted) return;
430-
toggleEditMsgModal();
431-
await sendMessageToHub(params.agentId, params.conversationId, editText, truncateMsgId);
438+
439+
isSendingMsg = true;
440+
sendMessageToHub(params.agentId, params.conversationId, editText, truncateMsgId).then(() => {
441+
isSendingMsg = false;
442+
toggleEditMsgModal();
443+
}).catch(() => {
444+
isSendingMsg = false;
445+
toggleEditMsgModal();
446+
});
432447
}
433448
434449
/** @param {string} messageId */
@@ -467,7 +482,7 @@
467482
<Splitpanes>
468483
{#if isLoadStateLog}
469484
<Pane size={30} minSize={20} maxSize={50} >
470-
<StateLog stateLogs={stateLogs} closeWindow={toggleStateLog} />
485+
<StateLog stateLogs={stateLogs} closeWindow={toggleStateLog} cleanScreen={cleanStateLogScreen} />
471486
</Pane>
472487
{/if}
473488
<Pane minSize={20}>
@@ -669,7 +684,7 @@
669684
</Pane>
670685
{#if isLoadContentLog}
671686
<Pane size={30} minSize={20} maxSize={50}>
672-
<ContentLog contentLogs={contentLogs} closeWindow={toggleContentLog} />
687+
<ContentLog contentLogs={contentLogs} closeWindow={toggleContentLog} cleanScreen={cleanContentLogScreen} />
673688
</Pane>
674689
{/if}
675690
</Splitpanes>

src/routes/chat/[agentId]/[conversationId]/contentLogs/content-log-element.svelte

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@
99
1010
let logBackground = '';
1111
let is_collapsed = true;
12-
const excludedSources = [
13-
ContentLogSource.UserInput,
14-
ContentLogSource.FunctionCall,
15-
ContentLogSource.AgentResponse
12+
const includedSources = [
13+
ContentLogSource.Prompt
1614
];
1715
1816
$: {
@@ -22,6 +20,8 @@
2220
logBackground = 'bg-secondary';
2321
} else if (data.source === ContentLogSource.Prompt) {
2422
logBackground = 'bg-danger';
23+
} else if (data.source === ContentLogSource.HardRule) {
24+
logBackground = "bg-warning";
2525
}
2626
}
2727
@@ -37,10 +37,10 @@
3737
<b>{`[${data?.name?.length > 0 ? data?.name + ' ' : ''}${moment.utc(data?.created_at).local().format('hh:mm:ss.SSS A, MMM DD YYYY')}]`}</b>
3838
</div>
3939
<br>
40-
<div class="log-content" class:log-collapse={!excludedSources.includes(data.source) && !!is_collapsed}>
40+
<div class="log-content" class:log-collapse={includedSources.includes(data.source) && !!is_collapsed}>
4141
{@html replaceNewLine(data?.content)}
4242
</div>
43-
{#if !excludedSources.includes(data.source)}
43+
{#if includedSources.includes(data.source)}
4444
<Button class='toggle-btn' color="link" on:click={(e) => toggleText(e)}>
4545
{`${is_collapsed ? 'More +' : 'Less -'}`}
4646
</Button>

src/routes/chat/[agentId]/[conversationId]/contentLogs/content-log.svelte

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
/** @type {() => void} */
1313
export let closeWindow;
1414
15+
/** @type {() => void} */
16+
export let cleanScreen;
17+
1518
// @ts-ignore
1619
let scrollbar;
1720
/** @type {import('$types').ConversationContentLogModel[]} */
@@ -63,12 +66,20 @@
6366

6467
<div class="chat-log">
6568
<div class="card mb-0 log-background" style="height: 100%;">
66-
<div class="log-close-btn padding-side ">
69+
<div class="log-close-btn padding-side">
70+
<button
71+
type="button"
72+
class="btn btn-sm btn-secondary btn-rounded chat-send waves-effect waves-light"
73+
on:click={() => cleanScreen()}
74+
>
75+
<i class="bx bx-trash"></i>
76+
</button>
6777
<button
6878
type="button"
6979
class="btn btn-sm btn-secondary btn-rounded chat-send waves-effect waves-light"
7080
on:click={() => closeWindow()}
71-
><i class="mdi mdi-window-close"></i>
81+
>
82+
<i class="mdi mdi-window-close"></i>
7283
</button>
7384
</div>
7485
<div class="content-log-scrollbar log-list padding-side">

src/routes/chat/[agentId]/[conversationId]/stateLogs/state-log.svelte

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
/** @type {() => void} */
1313
export let closeWindow;
1414
15+
/** @type {() => void} */
16+
export let cleanScreen;
17+
1518
// @ts-ignore
1619
let scrollbar;
1720
/** @type {any[]} */
@@ -62,12 +65,20 @@
6265

6366
<div class="chat-log">
6467
<div class="card mb-0 log-background" style="height: 100%;">
65-
<div class="log-close-btn padding-side ">
68+
<div class="log-close-btn padding-side">
6669
<button
6770
type="button"
6871
class="btn btn-sm btn-secondary btn-rounded chat-send waves-effect waves-light"
6972
on:click={() => closeWindow()}
70-
><i class="mdi mdi-window-close"></i>
73+
>
74+
<i class="mdi mdi-window-close"></i>
75+
</button>
76+
<button
77+
type="button"
78+
class="btn btn-sm btn-secondary btn-rounded chat-send waves-effect waves-light"
79+
on:click={() => cleanScreen()}
80+
>
81+
<i class="bx bx-trash"></i>
7182
</button>
7283
</div>
7384
<div class="state-log-scrollbar log-list padding-side">

0 commit comments

Comments
 (0)