wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-23 16:56:07 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

TSK-1443 fix tags presenter (#3136)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2023-05-04 16:14:55 +06:00 committed by GitHub
parent 4801b20d8b
commit e719dc14ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
models/tracker/src/index.ts
View File

@ -546,9 +546,9 @@ export function createModel (builder: Builder): void {
{ key: '', presenter: tracker.component.SubIssuesSelector, props: {} }, { key: '', presenter: tracker.component.SubIssuesSelector, props: {} },
{ key: '', presenter: view.component.GrowPresenter, props: { type: 'grow' } }, { key: '', presenter: view.component.GrowPresenter, props: { type: 'grow' } },
{ {
key: '$lookup.labels', key: 'labels',
presenter: tags.component.LabelsPresenter, presenter: tags.component.LabelsPresenter,
props: { kind: 'list', full: false, lookupField: 'labels', listProps: { optional: true, compression: true } } props: { kind: 'list', full: false, listProps: { optional: true, compression: true } }
}, },
{ {
key: '', key: '',

16
plugins/tags-resources/src/components/LabelsPresenter.svelte
View File

@ -3,11 +3,12 @@
import { createQuery } from '@hcengineering/presentation' import { createQuery } from '@hcengineering/presentation'
import type { TagReference } from '@hcengineering/tags' import type { TagReference } from '@hcengineering/tags'
import tags from '@hcengineering/tags' import tags from '@hcengineering/tags'
import { getEventPopupPositionElement, showPopup, resizeObserver } from '@hcengineering/ui' import { getEventPopupPositionElement, resizeObserver, showPopup } from '@hcengineering/ui'
import { afterUpdate, createEventDispatcher } from 'svelte'
import TagReferencePresenter from './TagReferencePresenter.svelte' import TagReferencePresenter from './TagReferencePresenter.svelte'
import TagsEditorPopup from './TagsEditorPopup.svelte' import TagsEditorPopup from './TagsEditorPopup.svelte'
import { createEventDispatcher, afterUpdate } from 'svelte'
export let value: number
export let object: WithLookup<Doc> export let object: WithLookup<Doc>
export let full: boolean export let full: boolean
export let ckeckFilled: boolean = false export let ckeckFilled: boolean = false
@ -16,21 +17,24 @@
export let action: (evt: MouseEvent) => Promise<void> | void = async () => {} export let action: (evt: MouseEvent) => Promise<void> | void = async () => {}
export let compression: boolean = false export let compression: boolean = false
export let lookupField: string | undefined
const dispatch = createEventDispatcher() const dispatch = createEventDispatcher()
let items: TagReference[] = [] let items: TagReference[] = []
const query = createQuery() const query = createQuery()
$: if (lookupField === undefined) { $: update(object, value)
function update (object: WithLookup<Doc>, value: number) {
if (value > 0) {
query.query(tags.class.TagReference, { attachedTo: object._id }, (result) => { query.query(tags.class.TagReference, { attachedTo: object._id }, (result) => {
items = result items = result
}) })
} else { } else {
query.unsubscribe() query.unsubscribe()
items = (object.$lookup as any)[lookupField] items = []
} }
}
async function tagsHandler (evt: MouseEvent): Promise<void> { async function tagsHandler (evt: MouseEvent): Promise<void> {
showPopup(TagsEditorPopup, { object }, getEventPopupPositionElement(evt)) showPopup(TagsEditorPopup, { object }, getEventPopupPositionElement(evt))
} }

2
plugins/tags-resources/src/components/TagReferencePresenter.svelte
View File

@ -17,7 +17,6 @@
import type { TagReference } from '@hcengineering/tags' import type { TagReference } from '@hcengineering/tags'
import { getPlatformColor, Icon, IconClose, resizeObserver } from '@hcengineering/ui' import { getPlatformColor, Icon, IconClose, resizeObserver } from '@hcengineering/ui'
import { createEventDispatcher } from 'svelte' import { createEventDispatcher } from 'svelte'
import { tagLevel } from '../utils'
import TagItem from './TagItem.svelte' import TagItem from './TagItem.svelte'
export let value: TagReference export let value: TagReference
@ -28,7 +27,6 @@
export let inline: boolean = false export let inline: boolean = false
const dispatch = createEventDispatcher() const dispatch = createEventDispatcher()
$: tagIcon = tagLevel[(((value?.weight ?? 0) % 3) + 1) as 1 | 2 | 3]
</script> </script>
{#if value} {#if value}

2
plugins/tracker-resources/src/components/issues/KanbanView.svelte
View File

@ -408,7 +408,7 @@
> >
<Component <Component
is={tags.component.LabelsPresenter} is={tags.component.LabelsPresenter}
props={{ object: issue, ckeckFilled: fullFilled[issueId], lookupField: 'labels', kind: 'kanban' }} props={{ value: issue.labels, object: issue, ckeckFilled: fullFilled[issueId], kind: 'kanban' }}
on:change={(res) => { on:change={(res) => {
if (res.detail.full) fullFilled[issueId] = true if (res.detail.full) fullFilled[issueId] = true
}} }}