Skip to content

fix(chunter): clear the other open chat input when a shared draft is sent #11121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MichaelUray wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(chunter): clear the other open chat input when a shared draft is sent #11121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 26 additions & 9 deletions plugins/chunter-resources/src/components/chat-message/ChatMessageInput.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import chunter, { ChatMessage, ChunterEvents, ThreadMessage } from '@hcengineering/chunter'
import { Class, Doc, generateId, getCurrentAccount, Ref, type CommitResult } from '@hcengineering/core'
import { createQuery, DraftController, draftsStore, getClient } from '@hcengineering/presentation'
import { EmptyMarkup, isEmptyMarkup } from '@hcengineering/text'
import { areEqualMarkups, EmptyMarkup, isEmptyMarkup } from '@hcengineering/text'
import { createEventDispatcher } from 'svelte'
import { getObjectId } from '@hcengineering/view-resources'
import { ThrottledCaller } from '@hcengineering/ui'
Expand Down Expand Up @@ -62,24 +62,41 @@
}

let inputRef: AttachmentRefInput
let currentMessage: MessageDraft = chatMessage ?? currentDraft ?? getDefault()
// Copy the stored draft: the object in draftsStore is shared with any other input showing the same draft, and
// onUpdate() below mutates currentMessage in place.
let currentMessage: MessageDraft = chatMessage ?? (currentDraft != null ? { ...currentDraft } : getDefault())
let _id = currentMessage._id
let inputContent = currentMessage.message

$: if (currentDraft != null) {
createdMessageQuery.query(_class, { _id, space: getSpace(object) }, (result: ChatMessage[]) => {
if (result.length > 0 && _id !== chatMessage?._id) {
// Ouch we have got comment with same id created already.
clear()
}
})
// The same draft (and message _id) can be open in several inputs at once, e.g. in the channel view and in the
// sidebar. Watch for the message being created to clear this input when it was sent from another one.
$: hasContent = !isEmptyMarkup(currentMessage.message) || (currentMessage.attachments ?? 0) > 0
$: if (currentDraft != null || (shouldSaveDraft && hasContent)) {
createdMessageQuery.query(_class, { _id, space: getSpace(object) }, onMessageCreated)
} else {
createdMessageQuery.unsubscribe()
}

function onMessageCreated (result: ChatMessage[]): void {
if (result.length === 0 || _id === chatMessage?._id) return
// Ouch we have got comment with same id created already.
const sent = result[0]
if (
areEqualMarkups(currentMessage.message, sent.message) &&
(currentMessage.attachments ?? 0) === (sent.attachments ?? 0)
) {
clear()
} else {
// Content added here after the message was sent elsewhere is kept as a new draft
_id = generateId()
currentMessage = { ...currentMessage, _id }
}
}

function clear (): void {
currentMessage = getDefault()
_id = currentMessage._id
inputContent = currentMessage.message
inputRef.removeDraft(false)
}

Expand Down