hcengineering/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2024-11-22 21:50:34 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Nested filter fix (#2739)

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

1
plugins/view-resources/src/components/filter/FilterBar.svelte
View File

@ -41,6 +41,7 @@
if (index === -1) {
$filterStore.push(e)
} else {
$filterStore[index].onRemove?.()
$filterStore[index] = e
}
$filterStore = $filterStore

23
plugins/view-resources/src/components/filter/FilterSection.svelte
View File

@ -32,7 +32,7 @@
function getTargetClass (): Ref<Class<Doc>> | undefined {
try {
return (hierarchy.getAttribute(filter.key._class, filter.key.key).type as RefTo<Doc>).to
return (hierarchy.getAttribute(currentFilter.key._class, currentFilter.key.key).type as RefTo<Doc>).to
} catch (err: any) {
console.error(err)
}
@ -52,7 +52,7 @@
let countLabel: string = ''
async function getLabel (): Promise<void> {
const count = isState ? await getCountStates(filter.value) : filter.value.length
const count = isState ? await getCountStates(currentFilter.value) : currentFilter.value.length
countLabel = await translate(view.string.FilterStatesCount, { value: count })
}
$: if (filter) getLabel()
@ -72,11 +72,11 @@
return await client.findOne(view.class.FilterMode, { _id: mode })
}
function onChange (e: Filter | undefined) {
function onChange (e: Filter) {
if (filter.nested !== undefined) {
filter.nested = filter
filter.nested = e
} else {
filter = filter
filter = e
}
dispatch('change')
}
@ -87,6 +87,7 @@
})
$: modeValuePromise = getMode(filter.mode)
$: nestedModeValuePromise = filter.nested ? getMode(filter.nested.mode) : undefined
</script>
<div class="filter-section">
@ -125,11 +126,13 @@
toggle(true)
}}
>
{#await modeValuePromise then mode}
{#if mode?.label}
<span><Label label={mode.label} params={{ value: filter.value.length }} /></span>
{/if}
{/await}
{#if nestedModeValuePromise}
{#await nestedModeValuePromise then mode}
{#if mode?.label}
<span><Label label={mode.label} params={{ value: filter.value.length }} /></span>
{/if}
{/await}
{/if}
</button>
{/if}
{#await modeValuePromise then mode}