From c8ca6616daea4d0b383483e6f6cb80494c0396d6 Mon Sep 17 00:00:00 2001 From: Ignat Remizov Date: Tue, 19 May 2026 21:06:24 +0300 Subject: [PATCH] fix(tracker): allow clearing issue assignees Add an explicit no-assignee path to the issue assignee picker so users can remove an assignee without the popup fallback assigning the current user again. Changes: - Add a selectable No assignee row to the contact assignee popup and keep it available when deselection is allowed. - Preserve undefined as the cancel/no-selection result while dispatching null for an intentional clear-assignee action. - Translate null assignee updates in the tracker assignee editor into a $unset operation so the issue assignee field is removed from persistence. - Keep normal user selection behavior unchanged for person rows and multi-issue assignee updates. Validation: - git diff --check Signed-off-by: Ignat Remizov --- .../src/components/DocPopup.svelte | 27 +++ .../src/components/AssigneePopup.svelte | 182 ++++++++++++++---- .../components/issues/AssigneeEditor.svelte | 15 +- 3 files changed, 181 insertions(+), 43 deletions(-) diff --git a/packages/presentation/src/components/DocPopup.svelte b/packages/presentation/src/components/DocPopup.svelte index 9568beeb814..fa803031ced 100644 --- a/packages/presentation/src/components/DocPopup.svelte +++ b/packages/presentation/src/components/DocPopup.svelte @@ -24,6 +24,7 @@ IconAdd, IconCheck, IconSearch, + Label, ListView, Spinner, Submenu, @@ -128,6 +129,13 @@ } } + function clearSelection (): void { + if (multiSelect) return + + selected = undefined + dispatch(closeAfterSelect ? 'close' : 'update', undefined) + } + function onKeydown (key: KeyboardEvent): void { if (key.code === 'ArrowUp') { key.stopPropagation() @@ -259,6 +267,25 @@ {:else if !embedded}
{/if} + {#if allowDeselect && selected && !multiSelect} + +
+ {/if}
diff --git a/plugins/contact-resources/src/components/AssigneePopup.svelte b/plugins/contact-resources/src/components/AssigneePopup.svelte index e42966b12a2..15efca32a70 100644 --- a/plugins/contact-resources/src/components/AssigneePopup.svelte +++ b/plugins/contact-resources/src/components/AssigneePopup.svelte @@ -38,7 +38,7 @@ import UserInfo from './UserInfo.svelte' export let options: FindOptions | undefined = undefined - export let selected: Ref | undefined + export let selected: Ref | undefined | null export let docQuery: DocumentQuery | undefined = undefined export let categories: AssigneeCategory[] | undefined = undefined export let allowDeselect = true @@ -133,10 +133,51 @@ let selection = 0 let list: ListView + $: deselectItemCount = allowDeselect ? 1 : 0 + $: listCount = contacts.length + deselectItemCount + + function isDeselectItem (item: number): boolean { + return allowDeselect && item === 0 + } + + function getContactByItem (item: number): Contact | undefined { + return contacts[item - deselectItemCount] + } + + function shouldShowCategory (item: number, obj: Contact): boolean { + if (!showCategories) return false + + const category = categorizedPersons.get(obj._id) + if (category === undefined) return false + + const contactIndex = item - deselectItemCount + if (contactIndex === 0) return true + + const prev = contacts[contactIndex - 1] + return prev !== undefined && categorizedPersons.get(prev._id) !== category + } + async function handleSelection (evt: Event | undefined, selection: number): Promise { - const person = contacts[selection] - selected = allowDeselect && person?._id === selected ? undefined : person?._id - dispatch('close', selected !== undefined ? person : undefined) + if (isDeselectItem(selection)) { + selected = undefined + dispatch('close', null) + return + } + + const person = getContactByItem(selection) + if (person === undefined) { + dispatch('close', undefined) + return + } + + if (allowDeselect && person._id === selected) { + selected = undefined + dispatch('close', null) + return + } + + selected = person._id + dispatch('close', person) } function onKeydown (key: KeyboardEvent): void { @@ -158,9 +199,6 @@ } const manager = createFocusManager() - function toAny (obj: any): any { - return obj - } @@ -191,49 +229,99 @@
- + - {#if showCategories} - {@const obj = toAny(contacts[item])} - {@const category = categorizedPersons.get(obj._id)} - - {#if category !== undefined && (item === 0 || (item > 0 && categorizedPersons.get(toAny(contacts[item - 1])._id) !== categorizedPersons.get(obj._id)))} - - {#if item > 0}
{/if} -
- - -
+ {#if showCategories && !isDeselectItem(item)} + {@const obj = getContactByItem(item)} + {#if obj !== undefined} + {@const category = categorizedPersons.get(obj._id)} + + {#if category !== undefined && shouldShowCategory(item, obj)} + + {#if item > 0}
{/if} +
+ + +
+ {/if} {/if} {/if} - {@const obj = contacts[item]} - + {:else} + {@const obj = getContactByItem(item)} + {#if obj !== undefined} + {/if} - + {/if}
@@ -249,4 +337,22 @@ border-radius: 0.25rem; box-shadow: none; } + + .no-assignee-avatar { + display: flex; + align-items: center; + justify-content: center; + width: 1.75rem; + height: 1.75rem; + flex: 0 0 1.75rem; + color: var(--theme-caption-color); + background-color: var(--theme-button-hovered); + border: 1px solid var(--button-border-color); + border-radius: 0.375rem; + } + + .no-assignee-avatar svg { + width: 1.125rem; + height: 1.125rem; + } diff --git a/plugins/tracker-resources/src/components/issues/AssigneeEditor.svelte b/plugins/tracker-resources/src/components/issues/AssigneeEditor.svelte index 4ad078a9551..dc8f1122a13 100644 --- a/plugins/tracker-resources/src/components/issues/AssigneeEditor.svelte +++ b/plugins/tracker-resources/src/components/issues/AssigneeEditor.svelte @@ -16,7 +16,7 @@ import contact, { Employee, Person } from '@hcengineering/contact' import { AssigneeBox, AssigneePopup, employeeRefByAccountUuidStore } from '@hcengineering/contact-resources' import { AssigneeCategory } from '@hcengineering/contact-resources/src/assignee' - import { Doc, DocumentQuery, notEmpty, Ref, Space } from '@hcengineering/core' + import { Doc, DocumentQuery, DocumentUpdate, notEmpty, Ref, Space } from '@hcengineering/core' import { RuleApplyResult, getClient, getDocRules } from '@hcengineering/presentation' import { Component, Issue, TrackerEvents } from '@hcengineering/tracker' import { ButtonKind, ButtonSize, IconSize, TooltipAlignment } from '@hcengineering/ui' @@ -53,23 +53,28 @@ const dispatch = createEventDispatcher() let progress = false + function getAssigneeUpdate (newAssignee: Ref | null): DocumentUpdate { + return newAssignee === null ? { $unset: { assignee: true } } : { assignee: newAssignee } + } + const handleAssigneeChanged = async (newAssignee: Ref | undefined | null) => { if (newAssignee === undefined || (!Array.isArray(_object) && _object?.assignee === newAssignee)) { return } progress = true + const assigneeUpdate = getAssigneeUpdate(newAssignee) const ops = client.apply() if (Array.isArray(_object)) { for (const p of _object) { if ('_class' in p) { Analytics.handleEvent(TrackerEvents.IssueSetAssignee, { issue: p.identifier ?? p._id }) - await ops.update(p, { assignee: newAssignee }) + await ops.update(p, assigneeUpdate) } } } else { if ('_class' in _object) { Analytics.handleEvent(TrackerEvents.IssueSetAssignee, { issue: _object.identifier ?? _object._id }) - await ops.update(_object, { assignee: newAssignee }) + await ops.update(_object, assigneeUpdate) } } @@ -163,7 +168,7 @@ icon={contact.icon.Person} selected={sel} allowDeselect={true} - titleDeselect={undefined} + titleDeselect={tracker.string.NoAssignee} loading={progress} on:close={(evt) => { const result = evt.detail @@ -183,7 +188,7 @@ placeholder={tracker.string.Assignee} value={sel} {categories} - titleDeselect={tracker.string.Unassigned} + titleDeselect={tracker.string.NoAssignee} {size} {kind} {avatarSize}