WEBDIENSTE/huly-platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2026-09-27 20:14:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

UBERF-5017: show correct collaborators diff and dont send notification for collaborators changer (#4529)

Browse Source 
Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
This commit is contained in:
Kristina
2024-02-05 21:35:49 +07:00
committed by GitHub
parent 8c45af8d88
commit 5d945aedc1
3 changed files with 65 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server-plugins/notification-resources/src/index.ts
+19 -6
View File
@@ -681,12 +681,16 @@ async function updateCollaboratorsMixin (
activityMessages: ActivityMessage[],
originTx: TxCUD<Doc>
): Promise<Tx[]> {
const { hierarchy } = control
if (tx._class !== core.class.TxMixin) return []
if (originTx.space === core.space.DerivedTx) return []
if (!control.hierarchy.isDerived(tx.mixin, notification.mixin.Collaborators)) return []
if (!hierarchy.isDerived(tx.mixin, notification.mixin.Collaborators)) return []
const res: Tx[] = []
if (tx.attributes.collaborators !== undefined) {
const createTx = control.hierarchy.isDerived(tx.objectClass, core.class.AttachedDoc)
const createTx = hierarchy.isDerived(tx.objectClass, core.class.AttachedDoc)
? (
await control.findAll(core.class.TxCollectionCUD, {
'tx.objectId': tx.objectId,
@@ -701,12 +705,21 @@ async function updateCollaboratorsMixin (
const mixinTxes = await control.findAll(core.class.TxMixin, {
objectId: tx.objectId
})
const prevDoc = TxProcessor.buildDoc2Doc([createTx, ...mixinTxes].filter((t) => t._id !== tx._id)) as Collaborators
const prevDocMixin = control.hierarchy.as(prevDoc, notification.mixin.Collaborators)
const set = new Set(prevDocMixin?.collaborators ?? [])
const prevDoc = TxProcessor.buildDoc2Doc([createTx, ...mixinTxes].filter((t) => t._id !== tx._id)) as Doc
const newCollabs: Ref<Account>[] = []
let prevCollabs: Set<Ref<Account>>
if (hierarchy.hasMixin(prevDoc, notification.mixin.Collaborators)) {
const prevDocMixin = control.hierarchy.as(prevDoc, notification.mixin.Collaborators)
prevCollabs = new Set(prevDocMixin.collaborators ?? [])
} else {
const mixin = hierarchy.classHierarchyMixin(prevDoc._class, notification.mixin.ClassCollaborators)
prevCollabs = mixin !== undefined ? new Set(await getDocCollaborators(prevDoc, mixin, control)) : new Set()
}
for (const collab of tx.attributes.collaborators) {
if (!set.has(collab)) {
if (!prevCollabs.has(collab) && tx.modifiedBy !== collab) {
if (
await isAllowed(
control,
server-plugins/notification-resources/src/utils.ts
+1 -1
View File
@@ -117,9 +117,9 @@ export async function isShouldNotify (
)
const personAccount = await getPersonAccountById(user, control)
const modifiedAccount = await getPersonAccountById(tx.modifiedBy, control)
for (const type of types) {
const modifiedAccount = await getPersonAccountById(tx.modifiedBy, control)
if (
type.allowedForAuthor !== true &&
(tx.modifiedBy === user ||