Skip to content

[TSK-1368] Remove "Apply" button from filters #3165

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.

Sign up for GitHub

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

Merged
BykhovDenis merged 2 commits into from
May 12, 2023
Merged

[TSK-1368] Remove "Apply" button from filters #3165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a1e305
[TSK-1368] Remove "Apply" button from filters
s0gorelkov May 11, 2023
7f93982
Merge branch 'main' into remove-apply-button-from-filters
s0gorelkov May 11, 2023
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
17 changes: 5 additions & 12 deletions plugins/tags-resources/src/components/TagsFilter.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
} from '@hcengineering/ui'
import { Filter } from '@hcengineering/view'
import { FilterQuery } from '@hcengineering/view-resources'
import view from '@hcengineering/view-resources/src/plugin'
import { createEventDispatcher, onMount } from 'svelte'
import tags from '../plugin'
import { tagLevel } from '../utils'
Expand Down Expand Up @@ -109,6 +108,11 @@
}
objects = objects
categories = categories

filter.value = [...selected]
// Replace last one with value with level
filter.props = { level }
onChange(filter)
}

$: schema = filter.key.attribute.schema ?? '0'
Expand Down Expand Up @@ -209,17 +213,6 @@
{/if}
</div>
</div>
<Button
shape={'round'}
label={view.string.Apply}
on:click={async () => {
filter.value = [...selected]
// Replace last one with value with level
filter.props = { level }
onChange(filter)
dispatch('close')
}}
/>
</div>

<style>
Expand Down
11 changes: 2 additions & 9 deletions plugins/view-resources/src/components/filter/ObjectFilter.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import presentation, { getClient } from '@hcengineering/presentation'
import ui, {
addNotification,
Button,
Icon,
IconCheck,
deviceOptionsStore,
Expand Down Expand Up @@ -140,6 +139,8 @@
filter.value = [...filter.value, undefined]
}
}

onChange(filter)
}

let search: string = ''
Expand Down Expand Up @@ -216,12 +217,4 @@
{/await}
</div>
</div>
<Button
shape={'filter'}
label={view.string.Apply}
on:click={() => {
onChange(filter)
dispatch('close')
}}
/>
</div>
18 changes: 6 additions & 12 deletions plugins/view-resources/src/components/filter/ValueFilter.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import core, { Class, Doc, FindResult, getObjectValue, Ref, SortingOrder, Space } from '@hcengineering/core'
import { translate } from '@hcengineering/platform'
import presentation, { getClient } from '@hcengineering/presentation'
import ui, { Button, Icon, IconCheck, Label, Loading, resizeObserver, deviceOptionsStore } from '@hcengineering/ui'
import ui, { Icon, IconCheck, Label, Loading, resizeObserver, deviceOptionsStore } from '@hcengineering/ui'
import { Filter } from '@hcengineering/view'
import { onMount } from 'svelte'
import { getPresenter } from '../../utils'
Expand Down Expand Up @@ -112,6 +112,11 @@
selectedValues.add(value)
}
selectedValues = selectedValues
filter.value = [...selectedValues.values()].map((v) => {
return [v, [...(realValues.get(v) ?? [])]]
})

onChange(filter)
}

let search: string = ''
Expand Down Expand Up @@ -185,15 +190,4 @@
{/await}
</div>
</div>
<Button
shape={'filter'}
label={view.string.Apply}
on:click={() => {
filter.value = Array.from(selectedValues.values()).map((p) => {
return [p, Array.from(realValues.get(p) ?? [])]
})
onChange(filter)
dispatch('close')
}}
/>
</div>