From 0d7857fe99b0f9dbdfd01994701f4c5cb80fff03 Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Tue, 1 Mar 2022 16:14:30 +0700
Subject: [PATCH] Direct open Candidate from Candidates (#1076)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 packages/core/src/hierarchy.ts                            | 5 +++++
 .../src/components/PersonPresenter.svelte                 | 3 ++-
 plugins/view-resources/src/components/EditDoc.svelte      | 8 ++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/hierarchy.ts b/packages/core/src/hierarchy.ts
index 0c47c03301..4c2debda13 100644
--- a/packages/core/src/hierarchy.ts
+++ b/packages/core/src/hierarchy.ts
@@ -59,6 +59,11 @@ export class Hierarchy {
     return _mixinClass(doc)
   }
 
+  static mixinOrClass<D extends Doc, M extends D>(doc: D): Ref<Mixin<M> | Class<Doc>> {
+    const m = _mixinClass(doc)
+    return m ?? doc._class
+  }
+
   hasMixin<D extends Doc, M extends D>(doc: D, mixin: Ref<Mixin<M>>): boolean {
     const d = Hierarchy.toDoc(doc)
     return typeof (d as any)[mixin] === 'object'
diff --git a/plugins/contact-resources/src/components/PersonPresenter.svelte b/plugins/contact-resources/src/components/PersonPresenter.svelte
index 3c13d62df4..8753215b5e 100644
--- a/plugins/contact-resources/src/components/PersonPresenter.svelte
+++ b/plugins/contact-resources/src/components/PersonPresenter.svelte
@@ -15,6 +15,7 @@
 -->
 <script lang="ts">
   import { formatName, Person } from '@anticrm/contact'
+  import { Hierarchy } from '@anticrm/core'
   import { Avatar } from '@anticrm/presentation'
   import { showPanel } from '@anticrm/ui'
   import view from '@anticrm/view'
@@ -23,7 +24,7 @@
   export let inline: boolean = false
 
   async function onClick () {
-    showPanel(view.component.EditDoc, value._id, value._class, 'full')
+    showPanel(view.component.EditDoc, value._id, Hierarchy.mixinOrClass(value), 'full')
   }
 </script>
 
diff --git a/plugins/view-resources/src/components/EditDoc.svelte b/plugins/view-resources/src/components/EditDoc.svelte
index c3429c2067..2574862173 100644
--- a/plugins/view-resources/src/components/EditDoc.svelte
+++ b/plugins/view-resources/src/components/EditDoc.svelte
@@ -15,7 +15,8 @@
 -->
 <script lang="ts">
   import contact, { formatName } from '@anticrm/contact'
-  import core, { Class, ClassifierKind, Doc, Mixin, Obj, Ref } from '@anticrm/core'
+  import core, { Class, ClassifierKind, Doc, Hierarchy, Mixin, Obj, Ref } from '@anticrm/core'
+  import notification from '@anticrm/notification'
   import { Panel } from '@anticrm/panel'
   import { Asset, getResource, translate } from '@anticrm/platform'
   import {
@@ -27,9 +28,8 @@
   } from '@anticrm/presentation'
   import { AnyComponent, Component, Label } from '@anticrm/ui'
   import view from '@anticrm/view'
-  import { createEventDispatcher, afterUpdate, onDestroy  } from 'svelte'
+  import { createEventDispatcher, onDestroy } from 'svelte'
   import { getCollectionCounter, getMixinStyle } from '../utils'
-  import notification from '@anticrm/notification'
 
   export let _id: Ref<Doc>
   export let _class: Ref<Class<Doc>>
@@ -81,7 +81,7 @@
 
   $: if (object && prevSelected !== object._class) {
     prevSelected = object._class
-    selectedClass = objectClass._id
+    selectedClass = Hierarchy.mixinOrClass(object)
   
     parentClass = getParentClass(object._class)
     mixins = getMixins()