Speedup isDerived and fix auto join channels doc state

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>

.vscode/launch.json

@@ -77,7 +77,7 @@
         "ACCOUNT_PORT": "3000",
         "FRONT_URL": "http://localhost:8080",
         "outputCapture": "std",
-        "SES_URL": "http://localhost:8091",
+        "SES_URL": "",
         "MINIO_ACCESS_KEY": "minioadmin",
         "MINIO_SECRET_KEY": "minioadmin",
         "MINIO_ENDPOINT": "localhost"

dev/docker-compose.yaml

@@ -62,8 +62,8 @@ services:
       - LAST_NAME_FIRST=true
       - ACCOUNTS_URL=http://localhost:3000
       - BRANDING_PATH=/var/cfg/branding.json
-      - INIT_SCRIPT_URL=https://raw.githubusercontent.com/hcengineering/init/main/script.yaml
-      - INIT_WORKSPACE=onboarding      
+      # - INIT_SCRIPT_URL=https://raw.githubusercontent.com/hcengineering/init/main/script.yaml
+      # - INIT_WORKSPACE=onboarding      
     restart: unless-stopped
   collaborator:
     image: hardcoreeng/collaborator

packages/core/src/hierarchy.ts

@@ -30,7 +30,7 @@ export class Hierarchy {
   private readonly attributes = new Map<Ref<Classifier>, Map<string, AnyAttribute>>()
   private readonly attributesById = new Map<Ref<AnyAttribute>, AnyAttribute>()
   private readonly descendants = new Map<Ref<Classifier>, Ref<Classifier>[]>()
-  private readonly ancestors = new Map<Ref<Classifier>, Ref<Classifier>[]>()
+  private readonly ancestors = new Map<Ref<Classifier>, { ordered: Ref<Classifier>[], set: Set<Ref<Classifier>> }>()
   private readonly proxies = new Map<Ref<Mixin<Doc>>, ProxyHandler<Doc>>()
 
   private readonly classifierProperties = new Map<Ref<Classifier>, Record<string, any>>()
@@ -166,7 +166,7 @@ export class Hierarchy {
     if (result === undefined) {
       throw new Error('ancestors not found: ' + _class)
     }
-    return result
+    return result.ordered
   }
 
   getClass<T extends Obj = Obj>(_class: Ref<Class<T>>): Class<T> {
@@ -301,17 +301,7 @@ export class Hierarchy {
    * It will iterate over parents.
    */
   isDerived<T extends Obj>(_class: Ref<Class<T>>, from: Ref<Class<T>>): boolean {
-    let cl: Ref<Class<T>> | undefined = _class
-    while (cl !== undefined) {
-      if (cl === from) return true
-
-      const cll = this.classifiers.get(cl)
-      if (cll === undefined || this.isInterface(cll)) {
-        return false
-      }
-      cl = (cll as Class<T>).extends
-    }
-    return false
+    return this.ancestors.get(_class)?.set?.has(from) ?? false
   }
 
   /**
@@ -398,15 +388,19 @@ export class Hierarchy {
         const list = this.ancestors.get(_class)
         if (list === undefined) {
           if (add) {
-            this.ancestors.set(_class, [classifier])
+            this.ancestors.set(_class, { ordered: [classifier], set: new Set([classifier]) })
           }
         } else {
           if (add) {
-            addIf(list, classifier)
+            if (!list.set.has(classifier)) {
+              list.ordered.push(classifier)
+              list.set.add(classifier)
+            }
           } else {
-            const pos = list.indexOf(classifier)
+            const pos = list.ordered.indexOf(classifier)
             if (pos !== -1) {
-              list.splice(pos, 1)
+              list.ordered.splice(pos, 1)
+              list.set.delete(classifier)
             }
           }
         }

server-plugins/contact-resources/src/index.ts

@@ -85,6 +85,8 @@ export async function OnSpaceTypeMembers (tx: Tx, control: TriggerControl): Prom
 export async function OnEmployeeCreate (tx: Tx, control: TriggerControl): Promise<Tx[]> {
   const mixinTx = tx as TxMixin<Person, Employee>
   if (mixinTx.attributes.active !== true) return []
+
+  // It could be no account yet.
   const acc = control.modelDb.getAccountByPersonId(mixinTx.objectId)
   if (acc.length === 0) return []
   const spaces = await control.findAll(core.class.Space, { autoJoin: true })
@@ -157,12 +159,24 @@ export async function OnPersonAccountCreate (tx: Tx, control: TriggerControl): P
 
   for (const space of spaces) {
     if (space.members.includes(acc._id)) continue
-    const pushTx = control.txFactory.createTxUpdateDoc(space._class, space.space, space._id, {
-      $push: {
-        members: acc._id
-      }
-    })
-    result.push(pushTx)
+    result.push(
+      control.txFactory.createTxUpdateDoc(space._class, space.space, space._id, {
+        $push: {
+          members: acc._id
+        }
+      })
+    )
+
+    // User should see auto join channels
+    result.push(
+      control.txFactory.createTxCreateDoc(notification.class.DocNotifyContext, space._id, {
+        user: acc._id,
+        objectId: space._id,
+        objectClass: space._class,
+        objectSpace: core.space.Space,
+        isPinned: false
+      })
+    )
   }
   return result
 }

server/account/src/operations.ts

@@ -1983,7 +1983,7 @@ async function createPersonAccount (
     client ??
     (await connect(getEndpoint(ctx, workspaceInfo, EndpointKind.Internal), getWorkspaceId(workspace, productId)))
   try {
-    const ops = new TxOperations(connection, core.account.System)
+    const ops = new TxOperations(connection, core.account.System).apply('create-person' + generateId())
 
     const name = combineName(account.first, account.last)
     // Check if PersonAccount is not exists
@@ -2033,6 +2033,7 @@ async function createPersonAccount (
         }
       }
     }
+    await ops.commit()
   } finally {
     if (client === undefined) {
       await connection.close()