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

UBER-480: Fix ValueFilter for space-like objects (#3428)

Browse Source
This commit is contained in:
Vyacheslav Tumanov 2023-06-15 10:31:36 +05:00 committed by GitHub
parent 8c282362a6
commit 9ea3f4c3a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/view-resources/src/components/filter/ValueFilter.svelte
View File

@ -67,26 +67,30 @@
} }
: {} : {}
let prefix = '' let prefix = ''
const hieararchy = client.getHierarchy() const hierarchy = client.getHierarchy()
const attr = hieararchy.getAttribute(filter.key._class, filter.key.key) const attr = hierarchy.getAttribute(filter.key._class, filter.key.key)
if (hieararchy.isMixin(attr.attributeOf)) { if (hierarchy.isMixin(attr.attributeOf)) {
prefix = attr.attributeOf + '.' prefix = attr.attributeOf + '.'
} }
const isDerivedFromSpace = hierarchy.isDerived(_class, core.class.Space)
objectsPromise = client.findAll( objectsPromise = client.findAll(
_class, _class,
{ ...resultQuery, ...(space ? { space } : { '$lookup.space.archived': false }) }, {
...resultQuery,
...(space ? { space } : isDerivedFromSpace ? { archived: false } : { '$lookup.space.archived': false })
},
{ {
sort: { [filter.key.key]: SortingOrder.Ascending }, sort: { [filter.key.key]: SortingOrder.Ascending },
projection: { [prefix + filter.key.key]: 1, space: 1 }, projection: { [prefix + filter.key.key]: 1, space: 1 },
...(space ? {} : { lookup: { space: core.class.Space } }) ...(space || isDerivedFromSpace ? {} : { lookup: { space: core.class.Space } })
} }
) )
const res = await objectsPromise const res = await objectsPromise
for (const object of res) { for (const object of res) {
let asDoc = object let asDoc = object
if (hieararchy.isMixin(filter.key._class)) { if (hierarchy.isMixin(filter.key._class)) {
asDoc = hieararchy.as(object, filter.key._class) asDoc = hierarchy.as(object, filter.key._class)
} }
const realValue = getObjectValue(filter.key.key, asDoc) const realValue = getObjectValue(filter.key.key, asDoc)
const value = getValue(realValue) const value = getValue(realValue)