From 0daac29984e9949661ba64047b6d12d649ff13f5 Mon Sep 17 00:00:00 2001
From: Kristina <kristin.fefelova@gmail.com>
Date: Fri, 10 May 2024 19:14:57 +0400
Subject: [PATCH] Remove extra user status (#5578)

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
---
 models/contact/src/index.ts                                | 2 +-
 .../activity-resources/src/components/BasePreview.svelte   | 7 ++-----
 .../src/components/chat/ChannelAside.svelte                | 1 +
 .../src/components/chat/create/CreateDirectChat.svelte     | 1 +
 .../contact-resources/src/components/AssigneeBox.svelte    | 2 ++
 .../src/components/EmployeePresenter.svelte                | 4 ++--
 .../src/components/PersonPresenter.svelte                  | 2 +-
 .../src/components/SelectUsersPopup.svelte                 | 2 ++
 plugins/contact-resources/src/components/UsersList.svelte  | 4 +++-
 .../src/components/issues/AssigneeEditor.svelte            | 2 ++
 10 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/models/contact/src/index.ts b/models/contact/src/index.ts
index f6859b0399..c0f4f1b760 100644
--- a/models/contact/src/index.ts
+++ b/models/contact/src/index.ts
@@ -446,7 +446,7 @@ export function createModel (builder: Builder): void {
       attachTo: contact.mixin.Employee,
       descriptor: view.viewlet.Table,
       config: [
-        '',
+        { key: '', props: { showStatus: true } },
         'city',
         'attachments',
         'modifiedOn',
diff --git a/plugins/activity-resources/src/components/BasePreview.svelte b/plugins/activity-resources/src/components/BasePreview.svelte
index 259dffe337..9f949569a1 100644
--- a/plugins/activity-resources/src/components/BasePreview.svelte
+++ b/plugins/activity-resources/src/components/BasePreview.svelte
@@ -15,7 +15,7 @@
 
 <script lang="ts">
   import { getClient, MessageViewer } from '@hcengineering/presentation'
-  import contact, { Person, type PersonAccount } from '@hcengineering/contact'
+  import { Person, type PersonAccount } from '@hcengineering/contact'
   import {
     Avatar,
     EmployeePresenter,
@@ -43,7 +43,6 @@
   export let header: IntlString | undefined = undefined
 
   const client = getClient()
-  const hierarchy = client.getHierarchy()
   const limit = 300
 
   let isActionsOpened = false
@@ -89,8 +88,6 @@
   } else {
     tooltipLabel = core.string.System
   }
-
-  $: showStatus = !!person && hierarchy.hasMixin(person, contact.mixin.Employee)
 </script>
 
 <!-- svelte-ignore a11y-no-static-element-interactions -->
@@ -118,7 +115,7 @@
           {#if headerObject}
             <Icon icon={headerIcon ?? classIcon(client, headerObject._class) ?? activity.icon.Activity} size="small" />
           {:else if person}
-            <Avatar size="card" avatar={person.avatar} name={person.name} {showStatus} {account} />
+            <Avatar size="card" avatar={person.avatar} name={person.name} />
           {:else}
             <SystemAvatar size="card" />
           {/if}
diff --git a/plugins/chunter-resources/src/components/chat/ChannelAside.svelte b/plugins/chunter-resources/src/components/chat/ChannelAside.svelte
index 1ead45d395..f8aa5caf0f 100644
--- a/plugins/chunter-resources/src/components/chat/ChannelAside.svelte
+++ b/plugins/chunter-resources/src/components/chat/ChannelAside.svelte
@@ -103,6 +103,7 @@
       {
         okLabel: presentation.string.Add,
         disableDeselectFor: disabledRemoveFor,
+        skipInactive: true,
         selected: members,
         showStatus: true
       },
diff --git a/plugins/chunter-resources/src/components/chat/create/CreateDirectChat.svelte b/plugins/chunter-resources/src/components/chat/create/CreateDirectChat.svelte
index 809adbd1df..01c00d94a8 100644
--- a/plugins/chunter-resources/src/components/chat/create/CreateDirectChat.svelte
+++ b/plugins/chunter-resources/src/components/chat/create/CreateDirectChat.svelte
@@ -115,6 +115,7 @@
       {
         okLabel: presentation.string.Next,
         skipCurrentAccount: false,
+        skipInactive: true,
         selected: employeeIds,
         showStatus: true
       },
diff --git a/plugins/contact-resources/src/components/AssigneeBox.svelte b/plugins/contact-resources/src/components/AssigneeBox.svelte
index a292f38472..88efc44e60 100644
--- a/plugins/contact-resources/src/components/AssigneeBox.svelte
+++ b/plugins/contact-resources/src/components/AssigneeBox.svelte
@@ -66,6 +66,7 @@
   export let shouldShowName: boolean = true
   export let id: string | undefined = undefined
   export let short: boolean = false
+  export let showStatus = false
 
   const icon = IconPerson
 
@@ -147,6 +148,7 @@
       shouldShowName={false}
       shouldShowPlaceholder
       onEmployeeEdit={_click}
+      {showStatus}
     />
   {:else}
     <Button
diff --git a/plugins/contact-resources/src/components/EmployeePresenter.svelte b/plugins/contact-resources/src/components/EmployeePresenter.svelte
index e339bdcb39..09784c02f2 100644
--- a/plugins/contact-resources/src/components/EmployeePresenter.svelte
+++ b/plugins/contact-resources/src/components/EmployeePresenter.svelte
@@ -22,7 +22,7 @@
   // export let element: HTMLElement | undefined = undefined
   export let noUnderline: boolean = false
   export let compact: boolean = false
-  export let showStatus: boolean = true
+  export let showStatus: boolean = false
 
   $: employeeValue = typeof value === 'string' ? $personByIdStore.get(value) : value
 
@@ -45,7 +45,7 @@
   {defaultName}
   {noUnderline}
   {compact}
-  {showStatus}
+  showStatus={showStatus && active}
   statusLabel={!active && shouldShowName && showStatus ? contact.string.Inactive : undefined}
   on:accent-color
 />
diff --git a/plugins/contact-resources/src/components/PersonPresenter.svelte b/plugins/contact-resources/src/components/PersonPresenter.svelte
index 4133f85d1c..8e8b438150 100644
--- a/plugins/contact-resources/src/components/PersonPresenter.svelte
+++ b/plugins/contact-resources/src/components/PersonPresenter.svelte
@@ -42,7 +42,7 @@
   export let maxWidth = ''
   export let compact = false
   export let type: ObjectPresenterType = 'link'
-  export let showStatus: boolean = true
+  export let showStatus: boolean = false
 
   const client = getClient()
   $: personValue = typeof value === 'string' ? $personByIdStore.get(value) : value
diff --git a/plugins/contact-resources/src/components/SelectUsersPopup.svelte b/plugins/contact-resources/src/components/SelectUsersPopup.svelte
index ac88587611..29a2bb38ee 100644
--- a/plugins/contact-resources/src/components/SelectUsersPopup.svelte
+++ b/plugins/contact-resources/src/components/SelectUsersPopup.svelte
@@ -33,6 +33,7 @@
   export let skipCurrentAccount = false
   export let disableDeselectFor: Ref<Employee>[] = []
   export let showStatus = true
+  export let skipInactive = false
 
   const dispatch = createEventDispatcher()
 
@@ -90,6 +91,7 @@
           {showStatus}
           {disableDeselectFor}
           {skipCurrentAccount}
+          {skipInactive}
           on:select={handleSelectionChanged}
         />
       </Scroller>
diff --git a/plugins/contact-resources/src/components/UsersList.svelte b/plugins/contact-resources/src/components/UsersList.svelte
index ea446af8f4..8c8b7ec93d 100644
--- a/plugins/contact-resources/src/components/UsersList.svelte
+++ b/plugins/contact-resources/src/components/UsersList.svelte
@@ -31,6 +31,7 @@
   export let skipCurrentAccount = false
   export let disableDeselectFor: Ref<Employee>[] = []
   export let showStatus = true
+  export let skipInactive = false
 
   const dispatch = createEventDispatcher()
   const query = createQuery()
@@ -54,7 +55,8 @@
           ? { $search: search }
           : { [searchField]: { $like: '%' + search + '%' } }
         : {}),
-      ...(skipCurrentAccount && currentPerson ? { _id: { $ne: currentPerson._id as Ref<Employee> } } : {})
+      ...(skipCurrentAccount && currentPerson ? { _id: { $ne: currentPerson._id as Ref<Employee> } } : {}),
+      ...(skipInactive ? { active: true } : {})
     },
     (result) => {
       result.sort((a, b) => {
diff --git a/plugins/tracker-resources/src/components/issues/AssigneeEditor.svelte b/plugins/tracker-resources/src/components/issues/AssigneeEditor.svelte
index fcc37d6981..e2fe58a818 100644
--- a/plugins/tracker-resources/src/components/issues/AssigneeEditor.svelte
+++ b/plugins/tracker-resources/src/components/issues/AssigneeEditor.svelte
@@ -40,6 +40,7 @@
   export let shrink: number = 0
   export let isAction: boolean = false
   export let readonly: boolean = false
+  export let showStatus = true
 
   $: _object =
     (typeof object !== 'string' ? object : undefined) ?? (typeof value !== 'string' ? value : undefined) ?? []
@@ -189,6 +190,7 @@
       {shrink}
       {readonly}
       {shouldShowName}
+      {showStatus}
       showNavigate={false}
       justify={'left'}
       showTooltip={{