wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-14 04:08:19 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix private txes (#2544)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2023-01-25 22:45:24 +06:00 committed by GitHub
parent aebb215799
commit 0a5a753299
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/src/pipeline.ts
View File

@ -73,9 +73,9 @@ class TPipeline implements Pipeline {
} }
async tx (ctx: SessionContext, tx: Tx): Promise<[TxResult, Tx[], string | undefined]> { async tx (ctx: SessionContext, tx: Tx): Promise<[TxResult, Tx[], string | undefined]> {
const [session, resTx] = this.head === undefined ? [ctx, tx] : await this.head.tx(ctx, tx) const [session, resTx, target] = this.head === undefined ? [ctx, tx] : await this.head.tx(ctx, tx)
const res = await this.storage.tx(session, resTx) const res = await this.storage.tx(session, resTx)
return [...res, undefined] return [res[0], res[1], target]
} }
async close (): Promise<void> { async close (): Promise<void> {

4
server/middleware/src/configuration.ts
View File

@ -46,7 +46,6 @@ export class ConfigurationMiddleware extends BaseMiddleware implements Middlewar
} }
async tx (ctx: SessionContext, tx: Tx): Promise<TxMiddlewareResult> { async tx (ctx: SessionContext, tx: Tx): Promise<TxMiddlewareResult> {
let target: string | undefined
if (this.storage.hierarchy.isDerived(tx._class, core.class.TxCUD)) { if (this.storage.hierarchy.isDerived(tx._class, core.class.TxCUD)) {
const txCUD = tx as TxCUD<Doc> const txCUD = tx as TxCUD<Doc>
const domain = this.storage.hierarchy.getDomain(txCUD.objectClass) const domain = this.storage.hierarchy.getDomain(txCUD.objectClass)
@ -59,8 +58,7 @@ export class ConfigurationMiddleware extends BaseMiddleware implements Middlewar
} }
} }
} }
const res = await this.provideTx(ctx, tx) return await this.provideTx(ctx, tx)
return [res[0], res[1], res[2] ?? target]
} }
override async findAll<T extends Doc>( override async findAll<T extends Doc>(

3
server/middleware/src/modified.ts
View File

@ -41,7 +41,6 @@ export class ModifiedMiddleware extends BaseMiddleware implements Middleware {
const coltx = tx as TxCollectionCUD<Doc, AttachedDoc> const coltx = tx as TxCollectionCUD<Doc, AttachedDoc>
coltx.tx.modifiedOn = tx.modifiedOn coltx.tx.modifiedOn = tx.modifiedOn
} }
const res = await this.provideTx(ctx, tx) return await this.provideTx(ctx, tx)
return [res[0], res[1], res[2]]
} }
} }