Fix interrupted streaming message deletion
This commit is contained in:
@@ -1511,6 +1511,7 @@ class Odidere {
|
||||
this.currentController = new AbortController();
|
||||
|
||||
let streamingMessage = null;
|
||||
let done = false;
|
||||
|
||||
try {
|
||||
const hasNewInput =
|
||||
@@ -1638,8 +1639,7 @@ class Odidere {
|
||||
|
||||
// Handle errors sent mid-stream.
|
||||
if (event.error) {
|
||||
this.#renderError(event.error);
|
||||
continue;
|
||||
throw new Error(event.error);
|
||||
}
|
||||
|
||||
if (
|
||||
@@ -1786,11 +1786,17 @@ class Odidere {
|
||||
}
|
||||
}
|
||||
|
||||
done = true;
|
||||
this.#setLoadingState(false);
|
||||
} catch (e) {
|
||||
if (e.name === 'AbortError') {
|
||||
console.debug('request aborted');
|
||||
if (streamingMessage) {
|
||||
if (e.name !== 'AbortError') {
|
||||
console.error('failed to send request:', e);
|
||||
this.#renderError(`Error: ${e.message}`);
|
||||
}
|
||||
this.#setLoadingState(false);
|
||||
} finally {
|
||||
this.currentController = null;
|
||||
if (!done && streamingMessage) {
|
||||
const $msg = streamingMessage.$el;
|
||||
const $deleteBtn = document.createElement('button');
|
||||
$deleteBtn.type = 'button';
|
||||
@@ -1809,13 +1815,6 @@ class Odidere {
|
||||
$msg.querySelector('.message__actions-buttons').firstChild,
|
||||
);
|
||||
}
|
||||
return;
|
||||
}
|
||||
console.error('failed to send request:', e);
|
||||
this.#renderError(`Error: ${e.message}`);
|
||||
this.#setLoadingState(false);
|
||||
} finally {
|
||||
this.currentController = null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2735,6 +2734,11 @@ class Odidere {
|
||||
this.$tplErrorMessage.content.cloneNode(true).firstElementChild;
|
||||
$msg.querySelector('.message__content').textContent = message;
|
||||
|
||||
const $delete = $msg.querySelector('[data-action="delete"]');
|
||||
if ($delete) {
|
||||
$delete.addEventListener('click', () => $msg.remove());
|
||||
}
|
||||
|
||||
this.$chat.insertBefore($msg, this.$chatLoading);
|
||||
this.#scrollToBottom();
|
||||
}
|
||||
|
||||
@@ -95,6 +95,16 @@
|
||||
<div class="message__content"></div>
|
||||
<div class="message__actions">
|
||||
<svg class="message__icon" aria-hidden="true"><use href="/static/icons.svg#assistant"></use></svg>
|
||||
<div class="message__actions-buttons">
|
||||
<button
|
||||
type="button"
|
||||
class="message__action-btn message__action-btn--delete"
|
||||
data-action="delete"
|
||||
aria-label="Delete message"
|
||||
>
|
||||
<svg class="icon"><use href="/static/icons.svg#trash"></use></svg>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user