hcengineering/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2024-11-25 19:58:30 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add ignore keys for ClassFilters (#2912)

Browse Source 
Signed-off-by: Ruslan Bayandinov <wazsone@ya.ru>
This commit is contained in:
Ruslan Bayandinov 2023-04-06 16:21:54 +06:00 committed by GitHub
parent b068478d83
commit ef836ac2f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/view-resources/src/components/filter/FilterTypePopup.svelte
View File

@ -25,7 +25,7 @@
showPopup,
Submenu
} from '@hcengineering/ui'
import { Filter, KeyFilter } from '@hcengineering/view'
import { ClassFilters, Filter, KeyFilter } from '@hcengineering/view'
import { createEventDispatcher } from 'svelte'
import { buildFilterKey, FilterQuery } from '../../filter'
import view from '../../plugin'
@ -40,9 +40,7 @@
const client = getClient()
const hierarchy = client.getHierarchy()
function getFilters (_class: Ref<Class<Doc>>): KeyFilter[] {
const clazz = hierarchy.getClass(_class)
const mixin = hierarchy.as(clazz, view.mixin.ClassFilters)
function getFilters (_class: Ref<Class<Doc>>, mixin: ClassFilters): KeyFilter[] {
if (mixin.filters === undefined) return []
const filters = mixin.filters.map((p) => {
return typeof p === 'string' ? buildFilterFromKey(_class, p) : p
@ -83,17 +81,24 @@
function buildFilterFor (
_class: Ref<Class<Doc>>,
allAttributes: Map<string, AnyAttribute>,
result: KeyFilter[]
result: KeyFilter[],
mixin: ClassFilters
): void {
for (const [, attribute] of allAttributes) {
const ignoreKeys = new Set(mixin.ignoreKeys ?? [])
for (const [key, attribute] of allAttributes) {
if (ignoreKeys.has(key)) {
continue
}
buildFilterForAttr(_class, attribute, result)
}
}
function getTypes (_class: Ref<Class<Doc>>): KeyFilter[] {
const result = getFilters(_class)
const clazz = hierarchy.getClass(_class)
const mixin = hierarchy.as(clazz, view.mixin.ClassFilters)
const result = getFilters(_class, mixin)
const allAttributes = hierarchy.getAllAttributes(_class)
buildFilterFor(_class, allAttributes, result)
buildFilterFor(_class, allAttributes, result, mixin)
const desc = hierarchy.getDescendants(_class)
for (const d of desc) {

1
plugins/view/src/index.ts
View File

@ -103,6 +103,7 @@ export interface FilteredView extends Preference {
*/
export interface ClassFilters extends Class<Doc> {
filters: (KeyFilter | string)[]
ignoreKeys?: string[]
}
/**