wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-15 12:55:59 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fix chunter replies (#2759)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2023-03-17 12:10:51 +06:00 committed by GitHub
parent 6f670a7ba2
commit aee24facdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/chunter/src/index.ts
View File

@ -115,6 +115,8 @@ export class TMessage extends TChunterMessage implements Message {
@Prop(ArrOf(TypeRef(contact.class.Employee)), chunter.string.Replies)
replies?: Ref<Employee>[]
repliesCount?: number
@Prop(TypeTimestamp(), chunter.string.LastReply)
lastReply?: Timestamp
}

2
plugins/chunter-resources/src/components/Thread.svelte
View File

@ -141,7 +141,7 @@
{
attachedTo: _id,
attachedToClass: chunter.class.Message,
collection: 'replies',
collection: 'repliesCount',
content: message,
createBy: me,
createOn: 0,

2
plugins/chunter-resources/src/components/ThreadView.svelte
View File

@ -139,7 +139,7 @@
currentSpace,
_id,
chunter.class.Message,
'replies',
'repliesCount',
{
content: message,
createBy: me,

1
plugins/chunter/src/index.ts
View File

@ -67,6 +67,7 @@ export interface Message extends ChunterMessage {
attachedTo: Ref<Space>
attachedToClass: Ref<Class<Space>>
replies?: Ref<Employee>[]
repliesCount?: number
lastReply?: Timestamp
}

48
server-plugins/chunter-resources/src/index.ts
View File

@ -95,8 +95,9 @@ export async function CommentRemove (
*/
export async function CommentCreate (tx: Tx, control: TriggerControl): Promise<Tx[]> {
const hierarchy = control.hierarchy
if (tx._class !== core.class.TxCreateDoc) return []
const doc = TxProcessor.createDoc2Doc(tx as TxCreateDoc<Doc>)
const actualTx = TxProcessor.extractTx(tx)
if (actualTx._class !== core.class.TxCreateDoc) return []
const doc = TxProcessor.createDoc2Doc(actualTx as TxCreateDoc<Doc>)
if (!hierarchy.isDerived(doc._class, chunter.class.ThreadMessage)) {
return []
}
@ -134,28 +135,15 @@ export async function CommentCreate (tx: Tx, control: TriggerControl): Promise<T
*/
export async function CommentDelete (tx: Tx, control: TriggerControl): Promise<Tx[]> {
const hierarchy = control.hierarchy
if (tx._class !== core.class.TxRemoveDoc) return []
const rmTx = tx as TxRemoveDoc<ThreadMessage>
const rmTx = TxProcessor.extractTx(tx) as TxRemoveDoc<ThreadMessage>
if (!hierarchy.isDerived(rmTx.objectClass, chunter.class.ThreadMessage)) {
return []
}
const createTx = (
await control.findAll(
core.class.TxCreateDoc,
{
objectId: rmTx.objectId
},
{ limit: 1 }
)
)[0]
if (createTx === undefined) {
const comment = control.removedMap.get(rmTx.objectId) as ThreadMessage
if (comment === undefined) {
return []
}
const comment = TxProcessor.createDoc2Doc(createTx as TxCreateDoc<ThreadMessage>)
const comments = await control.findAll(chunter.class.ThreadMessage, {
attachedTo: comment.attachedTo
})
@ -177,8 +165,9 @@ export async function CommentDelete (tx: Tx, control: TriggerControl): Promise<T
*/
export async function MessageCreate (tx: Tx, control: TriggerControl): Promise<Tx[]> {
const hierarchy = control.hierarchy
if (tx._class !== core.class.TxCreateDoc) return []
const doc = TxProcessor.createDoc2Doc(tx as TxCreateDoc<Doc>)
const actualTx = TxProcessor.extractTx(tx)
if (actualTx._class !== core.class.TxCreateDoc) return []
const doc = TxProcessor.createDoc2Doc(actualTx as TxCreateDoc<Doc>)
if (!hierarchy.isDerived(doc._class, chunter.class.Message)) {
return []
}
@ -209,28 +198,19 @@ export async function MessageCreate (tx: Tx, control: TriggerControl): Promise<T
*/
export async function MessageDelete (tx: Tx, control: TriggerControl): Promise<Tx[]> {
const hierarchy = control.hierarchy
if (tx._class !== core.class.TxCollectionCUD) return []
const rmTx = (tx as TxCollectionCUD<ChunterSpace, Message>).tx
const rmTx = TxProcessor.extractTx(tx) as TxCollectionCUD<ChunterSpace, Message>
if (rmTx._class !== core.class.TxRemoveDoc) return []
if (!hierarchy.isDerived(rmTx.objectClass, chunter.class.Message)) {
return []
}
const createTx = (
await control.findAll(
core.class.TxCreateDoc,
{
objectId: rmTx.objectId
},
{ limit: 1 }
)
)[0]
if (createTx === undefined) {
const message = control.removedMap.get(rmTx.objectId) as Message
if (message === undefined) {
return []
}
const message = TxProcessor.createDoc2Doc(createTx as TxCreateDoc<Message>)
const channel = (
await control.findAll(
chunter.class.ChunterSpace,