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

Fix extra no grouping (#2624)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2023-02-13 14:17:42 +06:00 committed by GitHub
parent e90b8c74bf
commit 6450ebe66d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/view-resources/src/components/ViewOptions.svelte
View File

@ -13,10 +13,10 @@
const dispatch = createEventDispatcher() const dispatch = createEventDispatcher()
$: grops = viewOptions.groupBy = const groups = (viewOptions.groupBy =
viewOptions.groupBy[viewOptions.groupBy.length - 1] === noCategory viewOptions.groupBy[viewOptions.groupBy.length - 1] === noCategory
? viewOptions.groupBy ? viewOptions.groupBy
: [...viewOptions.groupBy, noCategory] : [...viewOptions.groupBy, noCategory])
const client = getClient() const client = getClient()
const hierarchy = client.getHierarchy() const hierarchy = client.getHierarchy()
@ -40,17 +40,17 @@
}) })
function selectGrouping (value: string, i: number) { function selectGrouping (value: string, i: number) {
viewOptions.groupBy[i] = value groups[i] = value
if (value === noCategory) { if (value === noCategory) {
viewOptions.groupBy.length = i + 1 groups.length = i + 1
} else if (config.groupDepth === undefined || config.groupDepth > viewOptions.groupBy.length) { } else if (config.groupDepth === undefined || config.groupDepth > viewOptions.groupBy.length) {
viewOptions.groupBy.length = i + 1 groups.length = i + 1
viewOptions.groupBy[i + 1] = noCategory groups[i + 1] = noCategory
} }
viewOptions.groupBy = viewOptions.groupBy viewOptions.groupBy = groups.length > 1 ? groups.filter((p) => p !== noCategory) : [...groups]
dispatch('update', { dispatch('update', {
key: 'groupBy', key: 'groupBy',
value: viewOptions.groupBy.length > 1 ? viewOptions.groupBy.filter((p) => p !== noCategory) : viewOptions.groupBy value: viewOptions.groupBy
}) })
} }
@ -62,7 +62,7 @@
<div class="antiCard"> <div class="antiCard">
<div class="antiCard-group grid"> <div class="antiCard-group grid">
{#each grops as group, i} {#each groups as group, i}
<span class="label"><Label label={i === 0 ? view.string.Grouping : view.string.Then} /></span> <span class="label"><Label label={i === 0 ? view.string.Grouping : view.string.Then} /></span>
<div class="value grouping"> <div class="value grouping">
<DropdownLabelsIntl <DropdownLabelsIntl