jeena/PeerTube
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Fix sort inconsistency

Browse source
This commit is contained in:
Chocobozzz 2018-02-19 09:41:03 +01:00
parent 2519d9fec6
commit 3bb6c52645
No known key found for this signature in database
GPG key ID: 583A612D890159BE
9 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
server/models/utils.ts
View file

@ -1,5 +1,5 @@
// Translate for example "-name" to [ 'name', 'DESC' ]
function getSort (value: string) {
// Translate for example "-name" to [ [ 'name', 'DESC' ], [ 'id', 'ASC' ] ]
function getSort (value: string, lastSort: string[] = [ 'id', 'ASC' ]) {
let field: string
let direction: 'ASC' | 'DESC'
@ -11,14 +11,14 @@ function getSort (value: string) {
field = value
}
return [ field, direction ]
return [ [ field, direction ], lastSort ]
}
function getSortOnModel (model: any, value: string) {
let sort = getSort(value)
function getSortOnModel (model: any, value: string, lastSort: string[] = [ 'id', 'ASC' ]) {
let [ firstSort ] = getSort(value)
if (model) return [ model, sort[0], sort[1] ]
return sort
if (model) return [ [ model, firstSort[0], firstSort[1] ], lastSort ]
return [ firstSort, lastSort ]
}
function throwIfNotValid (value: any, validator: (value: any) => boolean, fieldName = 'value') {