wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-21 15:59:15 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix filters (#2804)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2023-03-22 15:06:57 +06:00 committed by GitHub
parent 48be42610e
commit ad6eb3a84b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/query/src/index.ts
View File

@ -130,6 +130,13 @@ export class LiveQuery extends TxProcessor implements Client {
if (this.client.getHierarchy().getDomain(_class) === DOMAIN_MODEL) { if (this.client.getHierarchy().getDomain(_class) === DOMAIN_MODEL) {
return await this.client.findAll(_class, query, options) return await this.client.findAll(_class, query, options)
} }
if (options?.projection !== undefined) {
options.projection = {
...options.projection,
_class: 1,
modifiedOn: 1
}
}
const q = this.findQuery(_class, query, options) ?? this.createDumpQuery(_class, query, options) const q = this.findQuery(_class, query, options) ?? this.createDumpQuery(_class, query, options)
if (q.result instanceof Promise) { if (q.result instanceof Promise) {
q.result = await q.result q.result = await q.result
@ -148,6 +155,13 @@ export class LiveQuery extends TxProcessor implements Client {
if (this.client.getHierarchy().getDomain(_class) === DOMAIN_MODEL) { if (this.client.getHierarchy().getDomain(_class) === DOMAIN_MODEL) {
return await this.client.findOne(_class, query, options) return await this.client.findOne(_class, query, options)
} }
if (options?.projection !== undefined) {
options.projection = {
...options.projection,
_class: 1,
modifiedOn: 1
}
}
const q = this.findQuery(_class, query, options) ?? this.createDumpQuery(_class, query, options) const q = this.findQuery(_class, query, options) ?? this.createDumpQuery(_class, query, options)
if (q.result instanceof Promise) { if (q.result instanceof Promise) {
q.result = await q.result q.result = await q.result
@ -255,6 +269,13 @@ export class LiveQuery extends TxProcessor implements Client {
callback: (result: FindResult<T>) => void, callback: (result: FindResult<T>) => void,
options?: FindOptions<T> options?: FindOptions<T>
): () => void { ): () => void {
if (options?.projection !== undefined) {
options.projection = {
...options.projection,
_class: 1,
modifiedOn: 1
}
}
const q = const q =
this.getQuery(_class, query, callback as (result: Doc[]) => void, options) ?? this.getQuery(_class, query, callback as (result: Doc[]) => void, options) ??
this.createQuery(_class, query, callback, options) this.createQuery(_class, query, callback, options)

2
plugins/view-resources/src/components/filter/ObjectFilter.svelte
View File

@ -70,7 +70,7 @@
} }
targets.clear() targets.clear()
const baseObjects = await client.findAll(filter.key._class, space ? { space } : {}, { const baseObjects = await client.findAll(filter.key._class, space ? { space } : {}, {
projection: { [filter.key.key]: 1 } projection: { [filter.key.key]: 1, space: 1 }
}) })
for (const object of baseObjects) { for (const object of baseObjects) {
const value = getObjectValue(filter.key.key, object) ?? undefined const value = getObjectValue(filter.key.key, object) ?? undefined

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

@ -64,7 +64,7 @@
{ ...resultQuery, ...(space ? { space } : {}) }, { ...resultQuery, ...(space ? { space } : {}) },
{ {
sort: { [filter.key.key]: SortingOrder.Ascending }, sort: { [filter.key.key]: SortingOrder.Ascending },
projection: { [prefix + filter.key.key]: 1 } projection: { [prefix + filter.key.key]: 1, space: 1 }
} }
) )
const res = await objectsPromise const res = await objectsPromise