From c265bf64cf52e3b81c937463b03d9cac056e63fe Mon Sep 17 00:00:00 2001
From: Andrey Platov <andrey@hardcoreeng.com>
Date: Wed, 8 Sep 2021 17:36:04 +0200
Subject: [PATCH] userbox fixes and preserve candidate

Signed-off-by: Andrey Platov <andrey@hardcoreeng.com>
---
 packages/presentation/package.json                   |  3 ++-
 packages/presentation/src/components/UserBox.svelte  | 12 +++++++++++-
 .../src/components/CreateApplication.svelte          |  6 +++++-
 .../src/components/CreateApplicationPresenter.svelte |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/packages/presentation/package.json b/packages/presentation/package.json
index 7b53ca84d6..08765d25bc 100644
--- a/packages/presentation/package.json
+++ b/packages/presentation/package.json
@@ -24,6 +24,7 @@
     "@anticrm/query": "~0.6.1",
     "@anticrm/ui": "~0.6.0",
     "@anticrm/view": "~0.6.0",
-    "svelte": "^3.37.0"
+    "svelte": "^3.37.0",
+    "@anticrm/contact": "~0.6.0"
   }
 }
diff --git a/packages/presentation/src/components/UserBox.svelte b/packages/presentation/src/components/UserBox.svelte
index bc1de0bf9d..81deb25cf6 100644
--- a/packages/presentation/src/components/UserBox.svelte
+++ b/packages/presentation/src/components/UserBox.svelte
@@ -15,6 +15,7 @@
 <script lang="ts">
   import { onMount } from 'svelte'
   import type { IntlString } from '@anticrm/platform'
+  import { getClient } from '../utils'
 
   import { Label, showPopup } from '@anticrm/ui'
   import Avatar from './Avatar.svelte'
@@ -25,6 +26,8 @@
   import type { Ref, Class } from '@anticrm/core'
   import type { Person } from '@anticrm/contact'
 
+  import contact from '@anticrm/contact'
+
   export let _class: Ref<Class<Person>>
   export let title: IntlString
   export let caption: IntlString
@@ -34,6 +37,14 @@
   let selected: Person | undefined
   let btn: HTMLElement
 
+  const client = getClient()
+
+  async function updateSelected(value: Ref<Person>) {
+    selected = await client.findOne(contact.class.Person, { _id: value })
+  }
+
+  $: updateSelected(value)
+
   onMount(() => {
     if (btn && show) {
       btn.click()
@@ -50,7 +61,6 @@
     on:click|preventDefault={(ev) => {
       showPopup(UsersPopup, { _class, title, caption }, ev.target, (result) => {
         if (result) {
-          selected = result
           value = result._id
         }
       })
diff --git a/plugins/recruit-resources/src/components/CreateApplication.svelte b/plugins/recruit-resources/src/components/CreateApplication.svelte
index eb775c4d51..4201e1c5d5 100644
--- a/plugins/recruit-resources/src/components/CreateApplication.svelte
+++ b/plugins/recruit-resources/src/components/CreateApplication.svelte
@@ -32,6 +32,8 @@
   export let candidate: Ref<Person>
   export let employee: Ref<Employee>
 
+  export let preserveCandidate = false
+
   const dispatch = createEventDispatcher()
   const client = getClient()
 
@@ -55,7 +57,9 @@
       canSave={candidate !== undefined}
       on:close={() => { dispatch('close') }}>
   <Grid column={1} rowGap={1.75}>
-    <UserBox _class={recruit.class.Candidate} title='Candidate' caption='Candidates' bind:value={candidate} />
+    {#if !preserveCandidate}
+      <UserBox _class={recruit.class.Candidate} title='Candidate' caption='Candidates' bind:value={candidate} />
+    {/if}
     <UserBox _class={contact.class.Employee} title='Assigned recruiter' caption='Recruiters' bind:value={employee} />
   </Grid>
 </Card>
diff --git a/plugins/recruit-resources/src/components/CreateApplicationPresenter.svelte b/plugins/recruit-resources/src/components/CreateApplicationPresenter.svelte
index 133b0bbcda..c3b4f175b2 100644
--- a/plugins/recruit-resources/src/components/CreateApplicationPresenter.svelte
+++ b/plugins/recruit-resources/src/components/CreateApplicationPresenter.svelte
@@ -27,7 +27,7 @@
 </script>
 
 <div class="flex-center presenter-container" bind:this={button}
-  on:click={() => { showPopup(CreateApplication, { candidate: object._id }, button) }}
+  on:click={() => { showPopup(CreateApplication, { candidate: object._id, preserveCandidate: true }, button) }}
 >
   <Label label="Create Application" />
 </div>