vikunja
/
vikunja
6
43
Fork 72
Code Issues 150 Pull Requests 18 Packages Releases 32 Activity

feat(filter): fall back to simple search when filter query does not contain any filter inputs

This commit is contained in:
kolaente 2024-03-08 19:17:39 +01:00
parent be253333c2
commit e0a7f46e5d
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/src/components/project/partials/filters.vue
View File

@ -43,7 +43,7 @@ import {useRoute} from 'vue-router'
import type {TaskFilterParams} from '@/services/taskCollection'
import {useLabelStore} from '@/stores/labels'
import {useProjectStore} from '@/stores/projects'
import {transformFilterStringForApi, transformFilterStringFromApi} from '@/helpers/filters'
import {FILTER_OPERATORS, transformFilterStringForApi, transformFilterStringFromApi} from '@/helpers/filters'
const props = defineProps({
hasTitle: {
@ -78,8 +78,8 @@ watchDebounced(
const val = {...value}
val.filter = transformFilterStringFromApi(
val?.filter || '',
labelId => labelStore.getLabelById(labelId),
projectId => projectStore.projects.value[projectId] || null,
labelId => labelStore.getLabelById(labelId)?.title,
projectId => projectStore.projects.value[projectId]?.title || null,
)
params.value = val
},
@ -96,9 +96,18 @@ function change() {
projectTitle => projectStore.searchProject(projectTitle)[0]?.id || null,
)
let s = ''
// When the filter does not contain any filter tokens, assume a simple search and redirect the input
const hasFilterQueries = FILTER_OPERATORS.find(o => filter.includes(o)) || false
if (!hasFilterQueries) {
s = filter
}
modelValue.value = {
...params.value,
filter,
filter: s === '' ? filter : '',
s,
}
}
</script>