From 315d20480b7de320d29b9ae4b3852950cefff550 Mon Sep 17 00:00:00 2001 From: Andrey Sobolev Date: Tue, 1 Aug 2023 19:40:26 +0700 Subject: [PATCH] Fix workspace event (#3542) Signed-off-by: Andrey Sobolev --- models/core/src/index.ts | 13 ++++++++++++- models/core/src/tx.ts | 10 +++++++++- packages/core/src/operations.ts | 4 ++-- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/models/core/src/index.ts b/models/core/src/index.ts index dc4570a7d9..67c234b7f6 100644 --- a/models/core/src/index.ts +++ b/models/core/src/index.ts @@ -63,7 +63,17 @@ import { import { TAccount, TSpace } from './security' import { TStatus, TStatusCategory } from './status' import { TUserStatus } from './transient' -import { TTx, TTxApplyIf, TTxCUD, TTxCollectionCUD, TTxCreateDoc, TTxMixin, TTxRemoveDoc, TTxUpdateDoc } from './tx' +import { + TTx, + TTxApplyIf, + TTxCUD, + TTxCollectionCUD, + TTxCreateDoc, + TTxMixin, + TTxRemoveDoc, + TTxUpdateDoc, + TTxWorkspaceEvent +} from './tx' export { coreId } from '@hcengineering/core' export * from './core' @@ -89,6 +99,7 @@ export function createModel (builder: Builder): void { TTxUpdateDoc, TTxRemoveDoc, TTxApplyIf, + TTxWorkspaceEvent, TSpace, TAccount, TAttribute, diff --git a/models/core/src/tx.ts b/models/core/src/tx.ts index 51d0f794b9..67cb95d663 100644 --- a/models/core/src/tx.ts +++ b/models/core/src/tx.ts @@ -33,7 +33,9 @@ import { TxCUD, TxMixin, TxRemoveDoc, - TxUpdateDoc + TxUpdateDoc, + TxWorkspaceEvent, + WorkspaceEvent } from '@hcengineering/core' import { Hidden, Index, Model, Prop, TypeRef } from '@hcengineering/model' import core from './component' @@ -100,3 +102,9 @@ export class TTxApplyIf extends TTx implements TxApplyIf { notMatch!: DocumentClassQuery[] txes!: TxCUD[] } + +@Model(core.class.TxWorkspaceEvent, core.class.Doc) +export class TTxWorkspaceEvent extends TTx implements TxWorkspaceEvent { + event!: WorkspaceEvent + params!: any +} diff --git a/packages/core/src/operations.ts b/packages/core/src/operations.ts index e4793950f4..396d5a2b68 100644 --- a/packages/core/src/operations.ts +++ b/packages/core/src/operations.ts @@ -28,8 +28,8 @@ import { DocumentClassQuery, Tx, TxCUD, TxFactory, TxProcessor } from './tx' export class TxOperations implements Omit { readonly txFactory: TxFactory - constructor (readonly client: Client, readonly user: Ref) { - this.txFactory = new TxFactory(user) + constructor (readonly client: Client, readonly user: Ref, readonly isDerived: boolean = false) { + this.txFactory = new TxFactory(user, isDerived) } getHierarchy (): Hierarchy {