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

Fix filter remove (#2888)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2023-04-05 15:52:40 +06:00 committed by GitHub
parent 5cf989b314
commit febbb0cd08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/view-assets/lang/ru.json
View File

@ -38,7 +38,7 @@
"FilterIsEither": "{value, plural, =1 {равен} other {один из}}", "FilterIsEither": "{value, plural, =1 {равен} other {один из}}",
"FilterStatesCount": "{value, plural, =1 {1 состоянию} other {# состояний}}", "FilterStatesCount": "{value, plural, =1 {1 состоянию} other {# состояний}}",
"FilterUpdated": "Фильтр был обновлен", "FilterUpdated": "Фильтр был обновлен",
"FilterRemoved": "Несуществующие значения были удалены из фильтра: {removed}", "FilterRemoved": "Несуществующие значения были удалены из фильтра: {count}",
"Before": "До", "Before": "До",
"After": "После", "After": "После",
"Apply": "Применить", "Apply": "Применить",

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

@ -100,18 +100,20 @@
const options = clazz.sortingKey !== undefined ? { sort: { [clazz.sortingKey]: SortingOrder.Ascending } } : {} const options = clazz.sortingKey !== undefined ? { sort: { [clazz.sortingKey]: SortingOrder.Ascending } } : {}
objectsPromise = client.findAll(targetClass, resultQuery, options) objectsPromise = client.findAll(targetClass, resultQuery, options)
values = await objectsPromise values = await objectsPromise
if (targets.has(undefined)) {
values.unshift(undefined)
}
if (values.length !== targets.size) { if (values.length !== targets.size) {
const notExisting = [...targets.keys()].filter((k) => !values.includes(k)) for (const value of values) {
targets.delete(value?._id)
}
const oldSize = filter.value.length const oldSize = filter.value.length
filter.value = filter.value.filter((p) => !notExisting.includes(p)) filter.value = filter.value.filter((p) => !targets.has(p._id))
onChange(filter) onChange(filter)
addNotification(await translate(view.string.FilterUpdated, {}), filter.key.label, FilterRemovedNotification, { addNotification(await translate(view.string.FilterUpdated, {}), filter.key.label, FilterRemovedNotification, {
description: await translate(view.string.FilterRemoved, { count: oldSize - (filter.value.length ?? 0) }) description: await translate(view.string.FilterRemoved, { count: oldSize - (filter.value.length ?? 0) })
}) })
} }
if (targets.has(undefined)) {
values.unshift(undefined)
}
if (isStatus) { if (isStatus) {
values = groupValues(values as Status[]) values = groupValues(values as Status[])
} }