WEBDIENSTE/huly-platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2026-09-29 13:05:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix ungrouping in inbox (#4448)

Browse Source 
Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
This commit is contained in:
Kristina
2024-01-25 23:44:12 +07:00
committed by GitHub
parent d6869b9186
commit 5d9ef96f69
5 changed files with 111 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server-plugins/activity-resources/src/index.ts
+12 -3
View File
@@ -29,7 +29,11 @@ import core, {
import { ActivityControl, DocObjectCache } from '@hcengineering/server-activity'
import type { TriggerControl } from '@hcengineering/server-core'
import activity, { ActivityMessage, DocUpdateMessage, Reaction } from '@hcengineering/activity'
import { createCollabDocInfo, removeDocInboxNotifications } from '@hcengineering/server-notification-resources'
import {
createCollabDocInfo,
createCollaboratorNotifications,
removeDocInboxNotifications
} from '@hcengineering/server-notification-resources'
import { getDocUpdateAction, getTxAttributesUpdates } from './utils'
@@ -98,7 +102,7 @@ export async function createReactionNotifications (
const docUpdateMessage = TxProcessor.createDoc2Doc(messageTx.tx as TxCreateDoc<DocUpdateMessage>)
res = res.concat(
await createCollabDocInfo([user], control, tx.tx, tx, parentMessage, docUpdateMessage, true, false, false)
await createCollabDocInfo([user], control, tx.tx, tx, parentMessage, [docUpdateMessage], true, false, false)
)
return res
@@ -271,7 +275,12 @@ async function ActivityMessagesHandler (tx: TxCUD<Doc>, control: TriggerControl)
return []
}
return await generateDocUpdateMessages(tx, control)
const txes = await generateDocUpdateMessages(tx, control)
const messages = txes.map((messageTx) => TxProcessor.createDoc2Doc(messageTx.tx as TxCreateDoc<DocUpdateMessage>))
const notificationTxes = await createCollaboratorNotifications(tx, control, messages)
return [...txes, ...notificationTxes]
}
async function OnDocRemoved (originTx: TxCUD<Doc>, control: TriggerControl): Promise<Tx[]> {