From a483e342d8516948e8242370f901cab61a258ba3 Mon Sep 17 00:00:00 2001
From: budaeva <irina.budaeva@xored.com>
Date: Wed, 11 May 2022 14:05:59 +0700
Subject: [PATCH] fix review issues (#1608)

Signed-off-by: budaeva <irina.budaeva@xored.com>
---
 models/contact/src/index.ts                      |  8 +++++---
 plugins/contact-assets/lang/en.json              |  3 ++-
 plugins/contact-assets/lang/ru.json              |  3 ++-
 .../components/EmployeeStatusDueDatePopup.svelte | 11 ++++++++---
 .../EmployeeStatusDueDatePresenter.svelte        | 10 ++++------
 .../components/EmployeeStatusPresenter.svelte    | 14 ++++++++++++--
 plugins/contact-resources/src/plugin.ts          |  3 ++-
 plugins/contact-resources/src/utils.ts           | 16 +++++++---------
 plugins/contact/src/index.ts                     |  4 +++-
 9 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/models/contact/src/index.ts b/models/contact/src/index.ts
index df71e8fc3a4..d61866421f4 100644
--- a/models/contact/src/index.ts
+++ b/models/contact/src/index.ts
@@ -39,7 +39,6 @@ import contact from './plugin'
 
 export const DOMAIN_CONTACT = 'contact' as Domain
 export const DOMAIN_CHANNEL = 'channel' as Domain
-export const DOMAIN_STATUS = 'status' as Domain
 
 @Model(contact.class.ChannelProvider, core.class.Doc, DOMAIN_MODEL)
 export class TChannelProvider extends TDoc implements ChannelProvider {
@@ -92,7 +91,7 @@ export class TPerson extends TContact implements Person {}
 @UX(contact.string.Organization, contact.icon.Company, undefined, 'name')
 export class TOrganization extends TContact implements Organization {}
 
-@Model(contact.class.Status, core.class.AttachedDoc, DOMAIN_STATUS)
+@Model(contact.class.Status, core.class.AttachedDoc, DOMAIN_CONTACT)
 export class TStatus extends TAttachedDoc implements Status {
   attachedTo!: Ref<Employee>;
   attachedToClass!: Ref<Class<Employee>>;
@@ -102,7 +101,10 @@ export class TStatus extends TAttachedDoc implements Status {
 
 @Model(contact.class.Employee, contact.class.Person)
 @UX(contact.string.Employee, contact.icon.Person)
-export class TEmployee extends TPerson implements Employee {}
+export class TEmployee extends TPerson implements Employee {
+  @Prop(Collection(contact.class.Status), contact.string.Status)
+  statuses?: number
+}
 
 @Model(contact.class.EmployeeAccount, core.class.Account)
 export class TEmployeeAccount extends TAccount implements EmployeeAccount {
diff --git a/plugins/contact-assets/lang/en.json b/plugins/contact-assets/lang/en.json
index 4fd6050727e..b15076c58cd 100644
--- a/plugins/contact-assets/lang/en.json
+++ b/plugins/contact-assets/lang/en.json
@@ -51,6 +51,7 @@
     "ClearStatus": "Clear status",
     "SaveStatus": "Save",
     "Cancel": "Cancel",
-    "StatusDueDate": "Due date"
+    "StatusDueDate": "Due date",
+    "NoExpire": "No expire"
   }
 }
\ No newline at end of file
diff --git a/plugins/contact-assets/lang/ru.json b/plugins/contact-assets/lang/ru.json
index d710a2ea1e9..780977adaf6 100644
--- a/plugins/contact-assets/lang/ru.json
+++ b/plugins/contact-assets/lang/ru.json
@@ -51,6 +51,7 @@
     "ClearStatus": "Очистить статус",
     "SaveStatus": "Сохранить",
     "Cancel": "Отмена",
-    "StatusDueDate": "Дата конца"
+    "StatusDueDate": "Дата конца",
+    "NoExpire": "Бессрочно"
   }
 }
\ No newline at end of file
diff --git a/plugins/contact-resources/src/components/EmployeeStatusDueDatePopup.svelte b/plugins/contact-resources/src/components/EmployeeStatusDueDatePopup.svelte
index 3306fa77197..4001e9c9b61 100644
--- a/plugins/contact-resources/src/components/EmployeeStatusDueDatePopup.svelte
+++ b/plugins/contact-resources/src/components/EmployeeStatusDueDatePopup.svelte
@@ -1,13 +1,18 @@
 <script lang="ts">
-  import { Icon, IconDPCalendarOver, IconDPCalendar } from '@anticrm/ui'
+  import { Icon, IconDPCalendarOver, IconDPCalendar, Label } from '@anticrm/ui'
+  import contact from '../plugin'
 
   export let isOverdue: boolean = false
-  export let formattedDate: string = ''
+  export let formattedDate: string | undefined
 </script>
 
 <div class="iconContainer">
   <Icon icon={isOverdue ? IconDPCalendarOver : IconDPCalendar} size={'full'} />
-  <div>{formattedDate}</div>
+  {#if formattedDate}
+    <div>{formattedDate}</div>
+  {:else}
+    <Label label={contact.string.NoExpire} />
+  {/if}
 </div>
 
 <style lang="scss">
diff --git a/plugins/contact-resources/src/components/EmployeeStatusDueDatePresenter.svelte b/plugins/contact-resources/src/components/EmployeeStatusDueDatePresenter.svelte
index 54f5f098f5b..983c19f566e 100644
--- a/plugins/contact-resources/src/components/EmployeeStatusDueDatePresenter.svelte
+++ b/plugins/contact-resources/src/components/EmployeeStatusDueDatePresenter.svelte
@@ -1,22 +1,20 @@
 <script lang="ts">
   import { Timestamp } from '@anticrm/core'
-  import { DatePresenter, Tooltip } from '@anticrm/ui'
+  import { DatePresenter, ticker, Tooltip } from '@anticrm/ui'
   import EmployeeStatusDueDatePopup from './EmployeeStatusDueDatePopup.svelte'
   import { formatDate } from '../utils'
 
   export let statusDueDate: Timestamp | undefined
 
-  $: today = new Date(Date.now())
-  $: dueDateMs = statusDueDate
-  $: isOverdue = dueDateMs !== undefined && dueDateMs !== null && dueDateMs < today.getTime()
-  $: formattedDate = formatDate(dueDateMs)
+  $: isOverdue = statusDueDate && statusDueDate < $ticker
+  $: formattedDate = statusDueDate && formatDate(statusDueDate)
 </script>
 
 <Tooltip
   direction={'top'}
   component={EmployeeStatusDueDatePopup}
   props={{
-    formattedDate: formattedDate,
+    formattedDate,
     isOverdue
   }}
 >
diff --git a/plugins/contact-resources/src/components/EmployeeStatusPresenter.svelte b/plugins/contact-resources/src/components/EmployeeStatusPresenter.svelte
index 82a9e34a359..5c3721c0dd7 100644
--- a/plugins/contact-resources/src/components/EmployeeStatusPresenter.svelte
+++ b/plugins/contact-resources/src/components/EmployeeStatusPresenter.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
   import { Employee, Status } from '@anticrm/contact'
   import { Ref } from '@anticrm/core'
+  import { Label } from '@anticrm/ui'
   import { createQuery, getClient } from '@anticrm/presentation'
   import contact from '../plugin'
   import { formatDate } from '../utils'
+
   export let employeeId: Ref<Employee>
   export let withTooltip: boolean = true
 
@@ -27,14 +29,22 @@
   {#if withTooltip}
     <div class="tooltip-container">
       <div class="tooltip">
-        {formatDate(status?.dueDate)}
+        {#if status?.dueDate}
+          <div>{formatDate(status?.dueDate)}</div>
+        {:else}
+          <Label label={contact.string.NoExpire} />
+        {/if}
       </div>
       <div>{status?.name}</div>
     </div>
   {:else}
     <div class="flex">
       <div class="pr-4">{status?.name}</div>
-      <div>{formatDate(status?.dueDate)}</div>
+      {#if status?.dueDate}
+        <div>{formatDate(status?.dueDate)}</div>
+      {:else}
+        <Label label={contact.string.NoExpire} />
+      {/if}
     </div>
   {/if}
 {/if}
diff --git a/plugins/contact-resources/src/plugin.ts b/plugins/contact-resources/src/plugin.ts
index 4a9b8e66986..31e81709a31 100644
--- a/plugins/contact-resources/src/plugin.ts
+++ b/plugins/contact-resources/src/plugin.ts
@@ -48,6 +48,7 @@ export default mergeIds(contactId, contact, {
     SaveStatus: '' as IntlString,
     Cancel: '' as IntlString,
     StatusDueDate: '' as IntlString,
-    StatusName: '' as IntlString
+    StatusName: '' as IntlString,
+    NoExpire: '' as IntlString
   }
 })
diff --git a/plugins/contact-resources/src/utils.ts b/plugins/contact-resources/src/utils.ts
index 51cbccde98b..6d3eee85b52 100644
--- a/plugins/contact-resources/src/utils.ts
+++ b/plugins/contact-resources/src/utils.ts
@@ -30,13 +30,11 @@ export async function getChannelProviders (): Promise<Map<Ref<ChannelProvider>,
   return map
 }
 
-export function formatDate (dueDateMs: Timestamp | undefined): string {
-  return dueDateMs === undefined || dueDateMs === null
-    ? 'no exp'
-    : new Date(dueDateMs).toLocaleString('default', {
-      month: 'short',
-      day: 'numeric',
-      hour: '2-digit',
-      minute: '2-digit'
-    })
+export function formatDate (dueDateMs: Timestamp): string {
+  return new Date(dueDateMs).toLocaleString('default', {
+    month: 'short',
+    day: 'numeric',
+    hour: '2-digit',
+    minute: '2-digit'
+  })
 }
diff --git a/plugins/contact/src/index.ts b/plugins/contact/src/index.ts
index 296be61d899..07d53641b7c 100644
--- a/plugins/contact/src/index.ts
+++ b/plugins/contact/src/index.ts
@@ -94,7 +94,9 @@ export interface Status extends AttachedDoc {
 /**
  * @public
  */
-export interface Employee extends Person {}
+export interface Employee extends Person {
+  statuses?: number
+}
 
 /**
  * @public