Fix removed cards (#8694)
Some checks are pending
CI / build (push) Waiting to run
CI / svelte-check (push) Blocked by required conditions
CI / formatting (push) Blocked by required conditions
CI / test (push) Blocked by required conditions
CI / uitest (push) Waiting to run
CI / uitest-pg (push) Waiting to run
CI / uitest-qms (push) Waiting to run
CI / uitest-workspaces (push) Waiting to run
CI / docker-build (push) Blocked by required conditions
CI / dist-build (push) Blocked by required conditions

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2025-04-24 13:30:43 +05:00 committed by GitHub
parent 180f62c37a
commit 43264cf996
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 4 deletions

View File

@ -459,6 +459,17 @@ function getLastTxTime (txes: Tx[]): number {
}
function compareTxes (a: Tx, b: Tx): number {
const result = a._id.localeCompare(b._id)
return result !== 0 ? result : a.modifiedOn - b.modifiedOn
const result = a.modifiedOn - b.modifiedOn
if (result !== 0) {
return result
}
if (a._class !== b._class) {
if (a._class === core.class.TxCreateDoc) {
return -1
}
if (b._class === core.class.TxCreateDoc) {
return 1
}
}
return a._id.localeCompare(b._id)
}

View File

@ -35,8 +35,8 @@
const result: MasterTag[] = []
const desc = hierarchy.getDescendants(_class)
for (const clazz of desc) {
const cls = hierarchy.getClass(clazz)
if (cls.extends === _class && cls._class === card.class.MasterTag) {
const cls = hierarchy.getClass(clazz) as MasterTag
if (cls.extends === _class && cls._class === card.class.MasterTag && cls.removed !== true) {
result.push(cls)
}
}