fix(filters): correctly use filter in saved filter
This commit is contained in:
parent
32e1a2018a
commit
4e26fa0b85
@ -1,12 +1,19 @@
|
|||||||
import type {IAbstract} from './IAbstract'
|
import type {IAbstract} from './IAbstract'
|
||||||
import type {IUser} from './IUser'
|
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 {
|
export interface ISavedFilter extends IAbstract {
|
||||||
id: number
|
id: number
|
||||||
title: string
|
title: string
|
||||||
description: string
|
description: string
|
||||||
filters: IFilter
|
filters: Filters
|
||||||
|
|
||||||
owner: IUser
|
owner: IUser
|
||||||
created: Date
|
created: Date
|
||||||
|
@ -11,11 +11,9 @@ export default class SavedFilterModel extends AbstractModel<ISavedFilter> implem
|
|||||||
filters: ISavedFilter['filters'] = {
|
filters: ISavedFilter['filters'] = {
|
||||||
sortBy: ['done', 'id'],
|
sortBy: ['done', 'id'],
|
||||||
orderBy: ['asc', 'desc'],
|
orderBy: ['asc', 'desc'],
|
||||||
filterBy: ['done'],
|
filter: 'done = false',
|
||||||
filterValue: ['false'],
|
|
||||||
filterComparator: ['equals'],
|
|
||||||
filterConcat: 'and',
|
|
||||||
filterIncludeNulls: true,
|
filterIncludeNulls: true,
|
||||||
|
s: '',
|
||||||
}
|
}
|
||||||
|
|
||||||
owner: IUser = {}
|
owner: IUser = {}
|
||||||
|
@ -63,9 +63,6 @@ export default class SavedFilterService extends AbstractService<ISavedFilter> {
|
|||||||
// the filter values in snake_sćase for url parameters.
|
// the filter values in snake_sćase for url parameters.
|
||||||
model.filters = objectToCamelCase(model.filters)
|
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
|
return model
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
export interface IFilter {
|
|
||||||
sortBy: ('done' | 'id')[]
|
|
||||||
orderBy: ('asc' | 'desc')[]
|
|
||||||
filterBy: 'done'[]
|
|
||||||
filterValue: 'false'[]
|
|
||||||
filterComparator: 'equals'[]
|
|
||||||
filterConcat: 'and'
|
|
||||||
filterIncludeNulls: boolean
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user