UBERF-5630: fix inactive employee status in activity (#4782)

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
hcengineering · Feb 27, 2024 · 7875ca7 · 7875ca7
1 parent 7e8f153
commit 7875ca7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte b/plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte
@@ -151,7 +151,7 @@
       <div class="flex-col ml-2 w-full clear-mins message-content">
         <div class="header clear-mins">
           {#if person}
-            <EmployeePresenter value={person} shouldShowAvatar={false} />
+            <EmployeePresenter value={person} shouldShowAvatar={false} compact />
           {:else}
             <div class="strong">
               <Label label={core.string.System} />

diff --git a/plugins/contact-resources/src/components/EmployeePresenter.svelte b/plugins/contact-resources/src/components/EmployeePresenter.svelte
@@ -21,6 +21,7 @@
   export let defaultName: IntlString | undefined = ui.string.NotSelected
   // export let element: HTMLElement | undefined = undefined
   export let noUnderline: boolean = false
+  export let compact = false
 
   $: employeeValue = typeof value === 'string' ? $personByIdStore.get(value) : value
 
@@ -42,6 +43,7 @@
   {accent}
   {defaultName}
   {noUnderline}
+  {compact}
   statusLabel={!active && shouldShowName ? contact.string.Inactive : undefined}
   on:accent-color
 />
diff --git a/plugins/contact-resources/src/components/PersonContent.svelte b/plugins/contact-resources/src/components/PersonContent.svelte
@@ -46,6 +46,7 @@
   export let colorInherit: boolean = false
   export let accent: boolean = false
   export let maxWidth = ''
+  export let compact = false
 
   const client = getClient()
 
@@ -71,7 +72,7 @@
 
 {#if value}
   {#if statusLabel}
-    <div class="inline-flex items-center clear-mins w-full">
+    <div class="inline-flex items-center clear-mins" class:w-full={!compact}>
       <PersonElement
         {value}
         {name}

diff --git a/plugins/contact-resources/src/components/PersonPresenter.svelte b/plugins/contact-resources/src/components/PersonPresenter.svelte
@@ -39,6 +39,7 @@
   export let colorInherit: boolean = false
   export let accent: boolean = false
   export let maxWidth = ''
+  export let compact = false
 
   const client = getClient()
   $: personValue = typeof value === 'string' ? $personByIdStore.get(value) : value
@@ -92,6 +93,7 @@
     {colorInherit}
     {accent}
     {maxWidth}
+    {compact}
     on:accent-color
   />
 {/if}