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

Fix channels hide and return autohide (#6529)

Browse Source 
Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
This commit is contained in:
Kristina
2024-09-11 22:35:18 +07:00
committed by GitHub
parent 4e44f73314
commit 682e4b3011
16 changed files with 129 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server-plugins/notification-resources/src/index.ts
+8 -2
View File
@@ -716,6 +716,7 @@ async function createNotifyContext (
objectClass,
objectSpace,
isPinned: false,
hidden: false,
tx: tx?._id,
lastUpdateTimestamp: updateTimestamp,
lastViewedTimestamp: sender === receiver._id ? updateTimestamp : undefined
@@ -828,10 +829,11 @@ async function updateContextsTimestamp (
const res: Tx[] = []
for (const context of contexts) {
const account = getPersonAccountById(context.user, control) // accounts.find(({ _id }) => _id === context.user)
const account = getPersonAccountById(context.user, control)
const isViewed =
context.lastViewedTimestamp !== undefined && (context.lastUpdateTimestamp ?? 0) <= context.lastViewedTimestamp
const updateTx = control.txFactory.createTxUpdateDoc(context._class, context.space, context._id, {
hidden: false,
lastUpdateTimestamp: timestamp,
...(isViewed && modifiedBy === context.user
? {
@@ -1680,7 +1682,11 @@ async function updateCollaborators (
const info = toReceiverInfo(hierarchy, addedUser)
if (info === undefined) continue
const context = getDocNotifyContext(control, contexts, objectId, info._id)
if (context !== undefined) continue
if (context !== undefined) {
if (context.hidden) {
res.push(control.txFactory.createTxUpdateDoc(context._class, context.space, context._id, { hidden: false }))
}
}
await createNotifyContext(ctx, control, objectId, objectClass, objectSpace, info, tx.modifiedBy, undefined, tx)
}