WEBDIENSTE/huly-platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2026-08-17 18:05:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix card viewlet setting for associations (#10761)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov
2026-04-13 20:39:50 +07:00
committed by GitHub
parent 59c794b1f6
commit 772c4782c8
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/card-resources/src/components/settings/view/ViewSetting.svelte
+14 -19
View File
@@ -19,7 +19,7 @@
import { Asset, getEmbeddedLabel, IntlString } from '@hcengineering/platform' import { Asset, getEmbeddedLabel, IntlString } from '@hcengineering/platform'
import { getAttributePresenterClass, getClient, hasResource } from '@hcengineering/presentation' import { getAttributePresenterClass, getClient, hasResource } from '@hcengineering/presentation'
import { resizeObserver } from '@hcengineering/ui' import { resizeObserver } from '@hcengineering/ui'
import view, { BuildModelKey, Viewlet, ViewletPreference } from '@hcengineering/view' import view, { BuildModelKey, Viewlet } from '@hcengineering/view'
import { import {
buildConfigLookup, buildConfigLookup,
canResolveAttribute, canResolveAttribute,
@@ -34,7 +34,7 @@
const client = getClient() const client = getClient()
const hierarchy = client.getHierarchy() const hierarchy = client.getHierarchy()
$: citems = getConfig(viewlet, undefined) $: citems = getConfig(viewlet)
interface Config { interface Config {
value: string | BuildModelKey | undefined value: string | BuildModelKey | undefined
@@ -232,7 +232,7 @@
return false return false
} }
function getConfig (viewlet: Viewlet, preference: ViewletPreference | undefined): Config[] { function getConfig (viewlet: Viewlet): Config[] {
const result = getBaseConfig(viewlet) const result = getBaseConfig(viewlet)
if (viewlet.configOptions?.strict !== true) { if (viewlet.configOptions?.strict !== true) {
const allAttributes = hierarchy.getAllAttributes(viewlet.attachTo) const allAttributes = hierarchy.getAllAttributes(viewlet.attachTo)
@@ -248,15 +248,10 @@
}) })
} }
addAssociations(result, viewlet.attachTo, preference) addAssociations(result, viewlet.attachTo)
} }
function addAssociations ( function addAssociations (result: Config[], _class: Ref<Class<Doc>>, parents: AssociationQuery[] = []): void {
result: Config[],
_class: Ref<Class<Doc>>,
preference: ViewletPreference | undefined,
parents: AssociationQuery[] = []
): void {
const ancestors = new Set(hierarchy.getAncestors(_class)) const ancestors = new Set(hierarchy.getAncestors(_class))
const parent = hierarchy.getParentClass(_class) const parent = hierarchy.getParentClass(_class)
const parentMixins = hierarchy const parentMixins = hierarchy
@@ -276,10 +271,10 @@
const associationsA = client.getModel().findAllSync(core.class.Association, { classB: { $in: allClasses } }) const associationsA = client.getModel().findAllSync(core.class.Association, { classB: { $in: allClasses } })
associationsB.forEach((a) => { associationsB.forEach((a) => {
processAssociation(a, 'b', result, preference, parents) processAssociation(a, 'b', result, parents)
}) })
associationsA.forEach((a) => { associationsA.forEach((a) => {
processAssociation(a, 'a', result, preference, parents) processAssociation(a, 'a', result, parents)
}) })
} }
@@ -291,7 +286,6 @@
association: Association, association: Association,
direction: 'a' | 'b', direction: 'a' | 'b',
result: Config[], result: Config[],
preference: ViewletPreference | undefined,
parents: AssociationQuery[] parents: AssociationQuery[]
): void { ): void {
const associationName = `$associations.${association._id}_${direction}` const associationName = `$associations.${association._id}_${direction}`
@@ -327,17 +321,16 @@
result.push(newValue) result.push(newValue)
} }
if (preference === undefined) return const exists = result.find((p) => {
const exists = preference.config.find((p) => { const key = typeof p.value === 'string' ? p.value : p.value?.key
const key = typeof p === 'string' ? p : p.key
return key === resultName return key === resultName
}) })
if (exists) { if ((exists as AttributeConfig)?.enabled) {
addAssociations(result, targetClass, preference, [...parents, [association._id, direction === 'a' ? 1 : -1]]) addAssociations(result, targetClass, [...parents, [association._id, direction === 'a' ? 1 : -1]])
} }
} }
return preference === undefined ? result : [] return result
} }
</script> </script>
@@ -353,6 +346,8 @@
// TODO UBERF-9639: restore defaults // TODO UBERF-9639: restore defaults
}} }}
on:save={(event) => { on:save={(event) => {
viewlet.config = event.detail
viewlet = viewlet
dispatch('update', event.detail) dispatch('update', event.detail)
}} }}
/> />