Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TSK-950: Remove value from filter if the object doesn't exist #2852

Merged
merged 4 commits into from
Apr 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions plugins/tags-resources/src/components/TagsFilter.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -211,3 +211,10 @@
}}
/>
</div>

<style>
.flex {
display: flex;
align-items: center;
}
</style>
2 changes: 2 additions & 0 deletions plugins/view-assets/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
"FilterIsNot": "is not",
"FilterIsEither": "{value, plural, =1 {is} other {is either of}}",
"FilterStatesCount": "{value, plural, =1 {1 state} other {# states}}",
"FilterUpdated": "Filter was updated",
"FilterRemoved": "{count, plural, =1 {# non-existing value was} other {# non-existing values were}} removed from the filter",
"Before": "Before",
"After": "After",
"Apply": "Apply",
Expand Down
2 changes: 2 additions & 0 deletions plugins/view-assets/lang/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
"FilterIsNot": "не равен",
"FilterIsEither": "{value, plural, =1 {равен} other {один из}}",
"FilterStatesCount": "{value, plural, =1 {1 состоянию} other {# состояний}}",
"FilterUpdated": "Фильтр был обновлен",
"FilterRemoved": "Несуществующие значения были удалены из фильтра: {removed}",
"Before": "До",
"After": "После",
"Apply": "Применить",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<script lang="ts">
import { Button, IconClose, Notification } from '@hcengineering/ui'
import { fade } from 'svelte/transition'

export let onRemove: () => void
export let notification: Notification

const { title, params } = notification
</script>

<div class="root" in:fade out:fade>
<div class="content">
<div class="title">
{title}
</div>
<div class="row">
{params.description}
</div>
</div>
<div class="close-button">
<Button icon={IconClose} kind="transparent" size="small" on:click={onRemove} />
</div>
</div>

<style lang="scss">
.root {
position: relative;
display: flex;
margin: 10px;
box-shadow: 0 4px 10px var(--divider-color);
height: 100px;
width: 400px;
overflow: hidden;
color: var(--caption-color);
background-color: var(--body-color);
border: 1px solid var(--divider-color);
border-radius: 6px;
padding: 10px;
}

.content {
margin-left: 10px;
}

.title {
display: flex;
align-items: center;
color: var(--caption-color);
font-weight: 500;
margin-bottom: 10px;
}

.close-button {
position: absolute;
top: 5px;
right: 5px;
}

.row {
display: flex;
align-items: center;
}
</style>
20 changes: 19 additions & 1 deletion plugins/view-resources/src/components/filter/ObjectFilter.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,20 @@
import presentation, { getClient } from '@hcengineering/presentation'
import type { State } from '@hcengineering/task'
import task from '@hcengineering/task'
import ui, { Button, CheckBox, Label, Loading, resizeObserver, deviceOptionsStore } from '@hcengineering/ui'
import ui, {
Button,
CheckBox,
Label,
Loading,
resizeObserver,
deviceOptionsStore,
addNotification
} from '@hcengineering/ui'
import { Filter } from '@hcengineering/view'
import { createEventDispatcher, onMount } from 'svelte'
import view from '../../plugin'
import { buildConfigLookup, getPresenter } from '../../utils'
import FilterRemovedNotification from './FilterRemovedNotification.svelte'

export let filter: Filter
export let space: Ref<Space> | undefined = undefined
Expand Down Expand Up @@ -92,6 +101,15 @@
const options = clazz.sortingKey !== undefined ? { sort: { [clazz.sortingKey]: SortingOrder.Ascending } } : {}
objectsPromise = client.findAll(targetClass, resultQuery, options)
values = await objectsPromise
if (values.length !== targets.size) {
const notExisting = [...targets.keys()].filter((k) => !values.includes(k))
const oldSize = filter.value.length
filter.value = filter.value.filter((p) => !notExisting.includes(p))
onChange(filter)
addNotification(await translate(view.string.FilterUpdated), filter.key.label, FilterRemovedNotification, {
description: await translate(view.string.FilterRemoved, { count: oldSize - (filter.value.length ?? 0) })
})
}
if (targets.has(undefined)) {
values.unshift(undefined)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@
values.set(value, (values.get(value) ?? 0) + 1)
realValues.set(value, (realValues.get(value) ?? new Set()).add(realValue))
}
for (const object of filter.value.map((p) => p[0])) {
if (!values.has(object)) values.set(object, 0)
}
values = values
objectsPromise = undefined
}
Expand Down
2 changes: 2 additions & 0 deletions plugins/view-resources/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ export default mergeIds(viewId, view, {
FilterIsNot: '' as IntlString,
FilterIsEither: '' as IntlString,
FilterStatesCount: '' as IntlString,
FilterRemoved: '' as IntlString,
FilterUpdated: '' as IntlString,
Before: '' as IntlString,
After: '' as IntlString,
Apply: '' as IntlString,
Expand Down