hcengineering/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2024-11-22 21:50:34 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix "$lookup" when changing "attachedTo" (#2113)

Browse Source 
Signed-off-by: Sergei Ogorelkov <sergei.ogorelkov@xored.com>
This commit is contained in:
Sergei Ogorelkov 2022-06-22 12:56:26 +07:00 committed by GitHub
parent 2ea248a270
commit de99835dc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/query/src/index.ts
View File

@ -384,7 +384,7 @@ export class LiveQuery extends TxProcessor implements Client {
q.result = await q.result
}
let needCallback = false
needCallback = this.proccesLookupUpdateDoc(q.result, lookup, tx)
needCallback = await this.proccesLookupUpdateDoc(q.result, lookup, tx)
if (needCallback) {
if (q.options?.sort !== undefined) {
@ -394,17 +394,32 @@ export class LiveQuery extends TxProcessor implements Client {
}
}
private proccesLookupUpdateDoc (docs: Doc[], lookup: Lookup<Doc>, tx: TxUpdateDoc<Doc>): boolean {
private async proccesLookupUpdateDoc (docs: Doc[], lookup: Lookup<Doc>, tx: TxUpdateDoc<Doc>): Promise<boolean> {
let needCallback = false
const lookupWays = this.getLookupWays(lookup, tx.objectClass)
for (const lookupWay of lookupWays) {
const [objWay, key] = lookupWay
const [objWay, key, reverseLookupKey] = lookupWay
for (const resDoc of docs) {
const obj = getObjectValue(objWay, resDoc)
if (obj === undefined) continue
const value = getObjectValue('$lookup.' + key, obj)
if (Array.isArray(value)) {
const index = value.findIndex((p) => p._id === tx.objectId)
let index = value.findIndex((p) => p._id === tx.objectId)
if (this.client.getHierarchy().isDerived(tx.objectClass, core.class.AttachedDoc)) {
if (reverseLookupKey !== undefined) {
const reverseLookupValue = (tx.operations as any)[reverseLookupKey]
if (index !== -1 && reverseLookupValue !== undefined && reverseLookupValue !== obj._id) {
value.splice(index, 1)
index = -1
needCallback = true
} else if (index === -1 && reverseLookupValue === obj._id) {
const doc = await this.client.findOne(tx.objectClass, { _id: tx.objectId })
value.push(doc)
index = value.length - 1
needCallback = true
}
}
}
if (index !== -1) {
TxProcessor.updateDoc2Doc(value[index], tx)
needCallback = true
@ -618,14 +633,14 @@ export class LiveQuery extends TxProcessor implements Client {
let needCallback = false
const lookupWays = this.getLookupWays(lookup, doc._class)
for (const lookupWay of lookupWays) {
const [objWay, key] = lookupWay
const [objWay, key, reverseLookupKey] = lookupWay
for (const resDoc of docs) {
const obj = getObjectValue(objWay, resDoc)
if (obj === undefined) continue
const value = getObjectValue('$lookup.' + key, obj)
if (Array.isArray(value)) {
if (this.client.getHierarchy().isDerived(doc._class, core.class.AttachedDoc)) {
if ((doc as AttachedDoc).attachedTo === obj._id) {
if (reverseLookupKey !== undefined && (doc as any)[reverseLookupKey] === obj._id) {
value.push(doc)
needCallback = true
}
@ -714,15 +729,20 @@ export class LiveQuery extends TxProcessor implements Client {
}
}
private getLookupWays (lookup: Lookup<Doc>, _class: Ref<Class<Doc>>, parent: string = ''): [string, string][] {
const result: [string, string][] = []
private getLookupWays (
lookup: Lookup<Doc>,
_class: Ref<Class<Doc>>,
parent: string = ''
): [string, string, string?][] {
const result: [string, string, string?][] = []
const hierarchy = this.client.getHierarchy()
if (lookup._id !== undefined) {
for (const key in lookup._id) {
const value = (lookup._id as any)[key]
const clazz = hierarchy.isMixin(value) ? hierarchy.getBaseClass(value) : value
const [valueClass, reverseLookupKey] = Array.isArray(value) ? value : [value, 'attachedTo']
const clazz = hierarchy.isMixin(valueClass) ? hierarchy.getBaseClass(valueClass) : valueClass
if (hierarchy.isDerived(_class, clazz)) {
result.push([parent, key])
result.push([parent, key, reverseLookupKey])
}
}
}

2
plugins/tracker-resources/src/components/issues/edit/SubIssuesSelector.svelte
View File

@ -36,7 +36,6 @@
let doneStatus: Ref<Doc> | undefined
let countComplate: number = 0
$: hasSubIssues = issue.subIssues > 0
$: if (issue.$lookup?.subIssues !== undefined) {
subIssues = issue.$lookup.subIssues as Issue[]
subIssues.sort((a, b) => a.rank.localeCompare(b.rank))
@ -45,6 +44,7 @@
doneStatus = issueStatuses.find((s) => s.category === tracker.issueStatusCategory.Completed)?._id ?? undefined
if (doneStatus) countComplate = subIssues.filter((si) => si.status === doneStatus).length
}
$: hasSubIssues = (subIssues?.length ?? 0) > 0
function getIssueStatusIcon (issue: Issue) {
return issueStatuses?.find((s) => issue.status === s._id)?.$lookup?.category?.icon ?? null