WEBDIENSTE/huly-platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2026-09-29 04:55:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Activity change attached fix (#2428)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov
2022-12-07 17:48:55 +06:00
committed by GitHub
parent 688434a0e6
commit 4ca2b97345
7 changed files with 201 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/activity-resources/src/components/TxView.svelte
+1 -1
View File
@@ -200,7 +200,7 @@
{#if viewlet === undefined && model.length > 0 && tx.updateTx}
{#each model as m, i}
{#await getValue(client, m, tx) then value}
{#if value.set === null}
{#if value.set === null || value.set === undefined}
<span class="lower"><Label label={activity.string.Unset} /> <Label label={m.label} /></span>
{:else if value.added.length}
<span class="lower" class:flex-grow={hasMessageType}>
plugins/activity-resources/src/components/utils.ts
+34 -23
View File
@@ -192,19 +192,28 @@ function getModifiedAttributes (tx: DisplayTx): any[] {
return [{}]
}
async function buildRemovedDoc (client: TxOperations, objectId: Ref<Doc>): Promise<Doc | undefined> {
const txes = await client.findAll(core.class.TxCUD, { objectId }, { sort: { modifiedOn: 1 } })
let doc: Doc
let createTx = txes.find((tx) => tx._class === core.class.TxCreateDoc)
if (createTx === undefined) {
const collectionTxes = txes.filter((tx) => tx._class === core.class.TxCollectionCUD) as Array<
TxCollectionCUD<Doc, AttachedDoc>
>
createTx = collectionTxes.find((p) => p.tx._class === core.class.TxCreateDoc)
}
async function buildRemovedDoc (
client: TxOperations,
objectId: Ref<Doc>,
_class: Ref<Class<Doc>>
): Promise<Doc | undefined> {
const isAttached = client.getHierarchy().isDerived(_class, core.class.AttachedDoc)
const txes = await client.findAll<TxCUD<Doc>>(
isAttached ? core.class.TxCollectionCUD : core.class.TxCUD,
isAttached
? { 'tx.objectId': objectId as Ref<AttachedDoc> }
: {
objectId
},
{ sort: { modifiedOn: 1 } }
)
const createTx = isAttached
? txes.find((tx) => (tx as TxCollectionCUD<Doc, AttachedDoc>).tx._class === core.class.TxCreateDoc)
: txes.find((tx) => tx._class === core.class.TxCreateDoc)
if (createTx === undefined) return
doc = TxProcessor.createDoc2Doc(createTx as TxCreateDoc<Doc>)
for (const tx of txes) {
let doc = TxProcessor.createDoc2Doc(createTx as TxCreateDoc<Doc>)
for (let tx of txes) {
tx = TxProcessor.extractTx(tx) as TxCUD<Doc>
if (tx._class === core.class.TxUpdateDoc) {
doc = TxProcessor.updateDoc2Doc(doc, tx as TxUpdateDoc<Doc>)
} else if (tx._class === core.class.TxMixin) {
@@ -216,7 +225,8 @@ async function buildRemovedDoc (client: TxOperations, objectId: Ref<Doc>): Promi
}
async function getAllRealValues (client: TxOperations, values: any[], _class: Ref<Class<Doc>>): Promise<any[]> {
if (!client.getHierarchy().isDerived(_class, core.class.Doc) || values.some((value) => typeof value !== 'string')) {
if (values.length === 0) return []
if (values.some((value) => typeof value !== 'string')) {
return values
}
const realValues = await client.findAll(_class, { _id: { $in: values } })
@@ -226,21 +236,22 @@ async function getAllRealValues (client: TxOperations, values: any[], _class: Re
...(await Promise.all(
values
.filter((value) => !realValuesIds.includes(value))
.map(async (value) => await buildRemovedDoc(client, value))
.map(async (value) => await buildRemovedDoc(client, value, _class))
))
].filter((v) => v != null)
}
export async function getValue (client: TxOperations, m: AttributeModel, tx: DisplayTx): Promise<any> {
function combineAttributes (attributes: any[], key: string, operator: string, arrayKey: string): any[] {
return Array.from(
new Set(
attributes.flatMap((attr) =>
Array.isArray(attr[operator]?.[key]?.[arrayKey]) ? attr[operator]?.[key]?.[arrayKey] : attr[operator]?.[key]
)
function combineAttributes (attributes: any[], key: string, operator: string, arrayKey: string): any[] {
return Array.from(
new Set(
attributes.flatMap((attr) =>
Array.isArray(attr[operator]?.[key]?.[arrayKey]) ? attr[operator]?.[key]?.[arrayKey] : attr[operator]?.[key]
)
).filter((v) => v != null)
}
)
).filter((v) => v != null)
}
export async function getValue (client: TxOperations, m: AttributeModel, tx: DisplayTx): Promise<any> {
const utxs = getModifiedAttributes(tx)
const value = {
set: utxs[0][m.key],