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

UBER-182: Fix status object filter (#3250)

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2023-05-25 01:00:31 +07:00 committed by GitHub
parent 635cc442b1
commit 4d8412b38b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,22 +15,22 @@
<script lang="ts"> <script lang="ts">
import core, { Doc, FindResult, getObjectValue, Ref, RefTo, SortingOrder, Space, Status } from '@hcengineering/core' import core, { Doc, FindResult, getObjectValue, Ref, RefTo, SortingOrder, Space, Status } from '@hcengineering/core'
import { translate } from '@hcengineering/platform' import { translate } from '@hcengineering/platform'
import presentation, { getClient } from '@hcengineering/presentation' import presentation, { getClient, statusStore } from '@hcengineering/presentation'
import ui, { import ui, {
addNotification, addNotification,
deviceOptionsStore,
EditWithIcon,
Icon, Icon,
IconCheck, IconCheck,
IconSearch, IconSearch,
deviceOptionsStore,
Label, Label,
Loading, Loading,
resizeObserver, resizeObserver
EditWithIcon
} from '@hcengineering/ui' } from '@hcengineering/ui'
import { Filter } from '@hcengineering/view' import { Filter } from '@hcengineering/view'
import { createEventDispatcher } from 'svelte' import { createEventDispatcher } from 'svelte'
import view from '../../plugin'
import { FILTER_DEBOUNCE_MS, sortFilterValues } from '../../filter' import { FILTER_DEBOUNCE_MS, sortFilterValues } from '../../filter'
import view from '../../plugin'
import { buildConfigLookup, getPresenter } from '../../utils' import { buildConfigLookup, getPresenter } from '../../utils'
import FilterRemovedNotification from './FilterRemovedNotification.svelte' import FilterRemovedNotification from './FilterRemovedNotification.svelte'
@ -116,8 +116,7 @@
} }
if (values.length !== targets.size) { if (values.length !== targets.size) {
const oldSize = filter.value.length const oldSize = filter.value.length
const set = new Set(values.map((p) => p?._id)) filter.value = filter.value.filter((p) => targets.has(p))
filter.value = filter.value.filter((p) => set.has(p))
const removed = oldSize - (filter.value.length ?? 0) const removed = oldSize - (filter.value.length ?? 0)
if (removed > 0) { if (removed > 0) {
onChange(filter) onChange(filter)
@ -130,6 +129,14 @@
} }
function isSelected (value: Doc | undefined | null, values: any[]): boolean { function isSelected (value: Doc | undefined | null, values: any[]): boolean {
if (isStatus) {
const statusSet = new Set(
$statusStore
.filter((it) => it.name.trim().toLocaleLowerCase() === (value as Status)?.name?.trim()?.toLocaleLowerCase())
.map((it) => it._id)
)
return values.some((it) => statusSet.has(it))
}
return values.includes(value?._id ?? value) return values.includes(value?._id ?? value)
} }