Fix removed cards (#8694)

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>

packages/core/src/client.ts

@@ -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)
 }

plugins/card-resources/src/components/navigator/TagHierarchy.svelte

@@ -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)
       }
     }