From 9d42556551b79d4f8b5694ebf585ad1e3675a855 Mon Sep 17 00:00:00 2001 From: Denis Bykhov <80476319+BykhovDenis@users.noreply.github.com> Date: Tue, 7 Jun 2022 14:57:05 +0600 Subject: [PATCH] Tracker unassigned (#2024) --- .../src/components/EmployeePresenter.svelte | 28 ++++++++++++------- .../src/components/PersonContent.svelte | 4 +-- .../src/components/PersonPresenter.svelte | 4 +-- .../issues/AssigneePresenter.svelte | 2 +- .../src/components/issues/Board.svelte | 14 ++++++---- 5 files changed, 32 insertions(+), 20 deletions(-) diff --git a/plugins/contact-resources/src/components/EmployeePresenter.svelte b/plugins/contact-resources/src/components/EmployeePresenter.svelte index c2a77affda..5531ecb12e 100644 --- a/plugins/contact-resources/src/components/EmployeePresenter.svelte +++ b/plugins/contact-resources/src/components/EmployeePresenter.svelte @@ -6,7 +6,7 @@ import EmployeePreviewPopup from './EmployeePreviewPopup.svelte' import { WithLookup } from '@anticrm/core' - export let value: WithLookup + export let value: WithLookup | null | undefined export let shouldShowAvatar: boolean = true export let shouldShowName: boolean = true export let onEmployeeEdit: ((event: MouseEvent) => void) | undefined = undefined @@ -14,13 +14,15 @@ let container: HTMLElement const onEdit = () => { - showPopup( - EmployeePreviewPopup, - { - employeeId: value._id - }, - container - ) + if (value) { + showPopup( + EmployeePreviewPopup, + { + employeeId: value._id + }, + container + ) + } } $: handlePersonEdit = onEmployeeEdit ?? onEdit @@ -28,9 +30,15 @@
- +
- {#if value.$lookup?.statuses?.length} + {#if value?.$lookup?.statuses?.length}
diff --git a/plugins/contact-resources/src/components/PersonContent.svelte b/plugins/contact-resources/src/components/PersonContent.svelte index ade3da1ed1..3d2337a4e0 100644 --- a/plugins/contact-resources/src/components/PersonContent.svelte +++ b/plugins/contact-resources/src/components/PersonContent.svelte @@ -20,7 +20,7 @@ import { getPanelURI, Label, LabelAndProps, tooltip } from '@anticrm/ui' import view from '@anticrm/view' - export let value: Person | undefined + export let value: Person | undefined | null export let inline: boolean = false export let isInteractive = true export let shouldShowAvatar: boolean = true @@ -34,7 +34,7 @@ $: element = getElement(value, onEdit, shouldShowPlaceholder, isInteractive) const getElement = ( - person: Person | undefined, + person: Person | undefined | null, onEdit: Function | undefined, shouldShowEmpty: boolean, isInteractive: boolean diff --git a/plugins/contact-resources/src/components/PersonPresenter.svelte b/plugins/contact-resources/src/components/PersonPresenter.svelte index c0b0f5a9f0..f507c5dd40 100644 --- a/plugins/contact-resources/src/components/PersonPresenter.svelte +++ b/plugins/contact-resources/src/components/PersonPresenter.svelte @@ -17,7 +17,7 @@ import { IntlString } from '@anticrm/platform' import PersonContent from './PersonContent.svelte' - export let value: Person + export let value: Person | null | undefined export let inline = false export let isInteractive = true export let shouldShowAvatar = true @@ -34,7 +34,7 @@ showTooltip={tooltipLabels ? { label: value ? tooltipLabels.personLabel : tooltipLabels.placeholderLabel, - props: { value: formatName(value?.name) } + props: value ? { value: formatName(value.name) } : {} } : undefined} {value} diff --git a/plugins/tracker-resources/src/components/issues/AssigneePresenter.svelte b/plugins/tracker-resources/src/components/issues/AssigneePresenter.svelte index bad9451977..a0698f79d6 100644 --- a/plugins/tracker-resources/src/components/issues/AssigneePresenter.svelte +++ b/plugins/tracker-resources/src/components/issues/AssigneePresenter.svelte @@ -23,7 +23,7 @@ import { IntlString } from '@anticrm/platform' import tracker from '../../plugin' - export let value: Employee | null + export let value: Employee | null | undefined export let issueId: Ref export let defaultClass: Ref> | undefined = undefined export let currentSpace: Ref | undefined = undefined diff --git a/plugins/tracker-resources/src/components/issues/Board.svelte b/plugins/tracker-resources/src/components/issues/Board.svelte index 52f64c48ac..e102899a15 100644 --- a/plugins/tracker-resources/src/components/issues/Board.svelte +++ b/plugins/tracker-resources/src/components/issues/Board.svelte @@ -159,11 +159,15 @@ {object.title}
- {#if issue.$lookup?.assignee} -
- -
- {/if} +
+ +