Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Feb 27, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} />
Expand Down
2 changes: 2 additions & 0 deletions plugins/contact-resources/src/components/EmployeePresenter.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -42,6 +43,7 @@
{accent}
{defaultName}
{noUnderline}
{compact}
statusLabel={!active && shouldShowName ? contact.string.Inactive : undefined}
on:accent-color
/>
3 changes: 2 additions & 1 deletion plugins/contact-resources/src/components/PersonContent.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
export let colorInherit: boolean = false
export let accent: boolean = false
export let maxWidth = ''
export let compact = false

const client = getClient()

Expand All @@ -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}
Expand Down
2 changes: 2 additions & 0 deletions plugins/contact-resources/src/components/PersonPresenter.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -92,6 +93,7 @@
{colorInherit}
{accent}
{maxWidth}
{compact}
on:accent-color
/>
{/if}
Loading