Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
open-webui
Commits
f9f3fe5e
Commit
f9f3fe5e
authored
Mar 02, 2024
by
Danny Liu
Browse files
refac delete logic
parent
6c70d0f7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
65 additions
and
77 deletions
+65
-77
src/lib/components/chat/Messages.svelte
src/lib/components/chat/Messages.svelte
+61
-73
src/routes/(app)/+page.svelte
src/routes/(app)/+page.svelte
+2
-2
src/routes/(app)/c/[id]/+page.svelte
src/routes/(app)/c/[id]/+page.svelte
+2
-2
No files found.
src/lib/components/chat/Messages.svelte
View file @
f9f3fe5e
...
@@ -223,32 +223,22 @@
...
@@ -223,32 +223,22 @@
}, 100);
}, 100);
};
};
// TODO: change delete behaviour
// const deleteMessageAndDescendants = async (messageId: string) => {
// if (history.messages[messageId]) {
// history.messages[messageId].deleted = true;
// for (const childId of history.messages[messageId].childrenIds) {
// await deleteMessageAndDescendants(childId);
// }
// }
// };
// const triggerDeleteMessageRecursive = async (messageId: string) => {
// await deleteMessageAndDescendants(messageId);
// await updateChatById(localStorage.token, chatId, { history });
// await chats.set(await getChatList(localStorage.token));
// };
const messageDeleteHandler = async (messageId) => {
const messageDeleteHandler = async (messageId) => {
if (history.messages[messageId]) {
const messageParentId = history.messages[messageId]?.parentId;
history.messages[messageId].deleted = true;
for (const childId of history.messages[messageId].childrenIds) {
if (messageParentId !== null) {
history.messages[childId].deleted = true;
history.messages[messageParentId].childrenIds = []
}
}
}
await updateChatById(localStorage.token, chatId, { history });
delete history.messages[messageId];
history.currentId = messageParentId;
await tick();
await updateChatById(localStorage.token, chatId, {
messages: messages,
history: history
});
};
};
</script>
</script>
...
@@ -258,7 +248,6 @@
...
@@ -258,7 +248,6 @@
<div class=" pb-10">
<div class=" pb-10">
{#key chatId}
{#key chatId}
{#each messages as message, messageIdx}
{#each messages as message, messageIdx}
{#if !message.deleted}
<div class=" w-full">
<div class=" w-full">
<div
<div
class="flex flex-col justify-between px-5 mb-3 {$settings?.fullScreenMode ?? null
class="flex flex-col justify-between px-5 mb-3 {$settings?.fullScreenMode ?? null
...
@@ -308,7 +297,6 @@
...
@@ -308,7 +297,6 @@
{/if}
{/if}
</div>
</div>
</div>
</div>
{/if}
{/each}
{/each}
{#if bottomPadding}
{#if bottomPadding}
...
...
src/routes/(app)/+page.svelte
View file @
f9f3fe5e
...
@@ -342,7 +342,7 @@
...
@@ -342,7 +342,7 @@
content
:
$
settings
.
system
content
:
$
settings
.
system
}
}
:
undefined
,
:
undefined
,
...
messages
.
filter
((
message
)
=>
!message.deleted)
...
messages
]
]
.
filter
((
message
)
=>
message
)
.
filter
((
message
)
=>
message
)
.
map
((
message
,
idx
,
arr
)
=>
({
.
map
((
message
,
idx
,
arr
)
=>
({
...
@@ -550,7 +550,7 @@
...
@@ -550,7 +550,7 @@
content
:
$
settings
.
system
content
:
$
settings
.
system
}
}
:
undefined
,
:
undefined
,
...
messages
.
filter
((
message
)
=>
!message.deleted)
...
messages
]
]
.
filter
((
message
)
=>
message
)
.
filter
((
message
)
=>
message
)
.
map
((
message
,
idx
,
arr
)
=>
({
.
map
((
message
,
idx
,
arr
)
=>
({
...
...
src/routes/(app)/c/[id]/+page.svelte
View file @
f9f3fe5e
...
@@ -355,7 +355,7 @@
...
@@ -355,7 +355,7 @@
content
:
$
settings
.
system
content
:
$
settings
.
system
}
}
:
undefined
,
:
undefined
,
...
messages
.
filter
((
message
)
=>
!message.deleted)
...
messages
]
]
.
filter
((
message
)
=>
message
)
.
filter
((
message
)
=>
message
)
.
map
((
message
,
idx
,
arr
)
=>
({
.
map
((
message
,
idx
,
arr
)
=>
({
...
@@ -563,7 +563,7 @@
...
@@ -563,7 +563,7 @@
content
:
$
settings
.
system
content
:
$
settings
.
system
}
}
:
undefined
,
:
undefined
,
...
messages
.
filter
((
message
)
=>
!message.deleted)
...
messages
]
]
.
filter
((
message
)
=>
message
)
.
filter
((
message
)
=>
message
)
.
map
((
message
,
idx
,
arr
)
=>
({
.
map
((
message
,
idx
,
arr
)
=>
({
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment