fix(filters): correctly use filter in saved filter

This commit is contained in:
kolaente 2024-03-09 18:45:51 +01:00
parent 32e1a2018a
commit 4e26fa0b85
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
4 changed files with 11 additions and 18 deletions

View File

@ -1,12 +1,19 @@
import type {IAbstract} from './IAbstract'
import type {IUser} from './IUser'
import type {IFilter} from '@/types/IFilter'
interface Filters {
sortBy: ('start_date' | 'done' | 'id' | 'position')[],
orderBy: ('asc' | 'desc')[],
filter: string,
filterIncludeNulls: boolean,
s: string,
}
export interface ISavedFilter extends IAbstract {
id: number
title: string
description: string
filters: IFilter
filters: Filters
owner: IUser
created: Date

View File

@ -11,11 +11,9 @@ export default class SavedFilterModel extends AbstractModel<ISavedFilter> implem
filters: ISavedFilter['filters'] = {
sortBy: ['done', 'id'],
orderBy: ['asc', 'desc'],
filterBy: ['done'],
filterValue: ['false'],
filterComparator: ['equals'],
filterConcat: 'and',
filter: 'done = false',
filterIncludeNulls: true,
s: '',
}
owner: IUser = {}

View File

@ -63,9 +63,6 @@ export default class SavedFilterService extends AbstractService<ISavedFilter> {
// the filter values in snake_sćase for url parameters.
model.filters = objectToCamelCase(model.filters)
// Make sure all filterValues are passes as strings. This is a requirement of the api.
model.filters.filterValue = model.filters.filterValue.map(v => String(v))
return model
}

View File

@ -1,9 +0,0 @@
export interface IFilter {
sortBy: ('done' | 'id')[]
orderBy: ('asc' | 'desc')[]
filterBy: 'done'[]
filterValue: 'false'[]
filterComparator: 'equals'[]
filterConcat: 'and'
filterIncludeNulls: boolean
}