From 590124f66865e7d55db1d28c0f443bb62ab2c0fe Mon Sep 17 00:00:00 2001
From: Andrey Platov <andrey@hardcoreeng.com>
Date: Fri, 10 Sep 2021 17:54:13 +0200
Subject: [PATCH] accounts update

Signed-off-by: Andrey Platov <andrey@hardcoreeng.com>
---
 packages/core/src/utils.ts                    | 18 ++++++++++++++++-
 .../src/components/Backlink.svelte            | 20 +++++++++++++++++--
 .../src/components/WorkbenchApp.svelte        |  2 +-
 plugins/workbench-resources/src/utils.ts      |  8 --------
 4 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
index 46a511992b..eb6b3825eb 100644
--- a/packages/core/src/utils.ts
+++ b/packages/core/src/utils.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 
-import type { Doc, Ref } from './classes'
+import type { Doc, Ref, Account } from './classes'
 
 function toHex (value: number, chars: number): string {
   const result = value.toString(16)
@@ -43,3 +43,19 @@ function count (): string {
 export function generateId<T extends Doc> (): Ref<T> {
   return (timestamp() + random + count()) as Ref<T>
 }
+
+let currentAccount: Account
+
+/**
+ * @public
+ * @returns
+ */
+export function getCurrentAccount (): Account { return currentAccount }
+
+/**
+ * @public
+ * @param account -
+ */
+export function setCurrentAccount (account: Account): void {
+  currentAccount = account
+}
diff --git a/plugins/chunter-resources/src/components/Backlink.svelte b/plugins/chunter-resources/src/components/Backlink.svelte
index 37d0a9306e..5c68701faf 100644
--- a/plugins/chunter-resources/src/components/Backlink.svelte
+++ b/plugins/chunter-resources/src/components/Backlink.svelte
@@ -15,18 +15,34 @@
 
 <script lang="ts">
   import type { Comment } from '@anticrm/chunter'
-  import MessageViewer from '@anticrm/presentation/src/components/MessageViewer.svelte'
+  import { getClient } from '@anticrm/presentation'
+  import type { Ref } from '@anticrm/core'
 
+  import MessageViewer from '@anticrm/presentation/src/components/MessageViewer.svelte'
   import Avatar from '@anticrm/presentation/src/components/Avatar.svelte'
 
+  import contact, { Employee, EmployeeAccount } from '@anticrm/contact'
+
   export let comment: Comment
 
+  let employee: Employee | undefined
+
+  console.log('comment modified by', comment.modifiedBy)
+
+  const client = getClient()
+  client.findOne(contact.class.EmployeeAccount, { _id: comment.modifiedBy as Ref<EmployeeAccount> })
+    .then(account => client.findOne(contact.class.Employee, { _id: account?.employee }))
+    .then(result => {
+      console.log('comment', result)
+      employee = result
+    })
+
 </script>
 
 <div class="flex-nowrap">
   <div class="avatar"><Avatar size={'medium'} /></div>
   <div class="flex-col-stretch message">
-    <div class="header">Rosamund Chen<span>July 28th</span></div>
+    <div class="header">{#if employee}{employee.firstName} {employee.lastName}{/if}<span>July 28th</span></div>
     <div class="text"><MessageViewer message={comment.message} /></div>
   </div>
 </div>
diff --git a/plugins/workbench-resources/src/components/WorkbenchApp.svelte b/plugins/workbench-resources/src/components/WorkbenchApp.svelte
index 6a66c35b6f..eb8f7b6a0c 100644
--- a/plugins/workbench-resources/src/components/WorkbenchApp.svelte
+++ b/plugins/workbench-resources/src/components/WorkbenchApp.svelte
@@ -17,6 +17,7 @@
 
 import { getResource } from '@anticrm/platform'
 import type { Client } from '@anticrm/core'
+import { setCurrentAccount } from '@anticrm/core'
 import { navigate, Loading, fetchMetadataLocalStorage } from '@anticrm/ui'
 
 import client from '@anticrm/client'
@@ -24,7 +25,6 @@ import login from '@anticrm/login'
 import contact from '@anticrm/contact'
 
 import Workbench from './Workbench.svelte'
-import { setCurrentAccount } from '../utils'
 
 async function connect(): Promise<Client | undefined> {
   const token = fetchMetadataLocalStorage(login.metadata.LoginToken)
diff --git a/plugins/workbench-resources/src/utils.ts b/plugins/workbench-resources/src/utils.ts
index c362a4d2a4..8f898533fe 100644
--- a/plugins/workbench-resources/src/utils.ts
+++ b/plugins/workbench-resources/src/utils.ts
@@ -22,11 +22,3 @@ import type { EmployeeAccount } from '@anticrm/contact'
 export function classIcon(client: Client, _class: Ref<Class<Obj>>): Asset | undefined {
   return client.getHierarchy().getClass(_class).icon
 }
-
-let currentAccount: EmployeeAccount
-
-export function getCurrentAccount(): EmployeeAccount { return currentAccount }
-
-export function setCurrentAccount(account: EmployeeAccount): void { 
-  currentAccount = account 
-}