792dbaf07f
* Client: Add list blacklist feature * Server: Add list blacklist feature * Client: Add videoId column * Server: Add some video infos in the REST api * Client: Add video information in the blacklist list * Fix sortable columns :) * Client: Add removeFromBlacklist feature * Server: Add removeFromBlacklist feature * Move to TypeScript * Move to TypeScript and Promises * Server: Fix blacklist list sort * Server: Fetch videos informations * Use common shared interface for client and server * Add check-params remove blacklisted video tests * Add check-params list blacklisted videos tests * Add list blacklist tests * Add remove from blacklist tests * Add video blacklist management tests * Fix rebase onto develop issues * Server: Add sort on blacklist id column * Server: Add blacklists library * Add blacklist id sort test * Add check-params tests for blacklist list pagination, count and sort * Fix coding style * Increase Remote API tests timeout * Increase Request scheduler API tests timeout * Fix typo * Increase video transcoding API tests timeout * Move tests to Typescript * Use lodash orderBy method * Fix typos * Client: Remove optional tests in blacklist model attributes * Move blacklist routes from 'blacklists' to 'blacklist' * CLient: Remove blacklist-list.component.scss * Rename 'blacklists' files to 'blacklist' * Use only BlacklistedVideo interface * Server: Use getFormattedObjects method in listBlacklist method * Client: Use new coding style * Server: Use new sort validator methods * Server: Use new checkParams methods * Client: Fix sortable columns
53 lines
1.5 KiB
TypeScript
53 lines
1.5 KiB
TypeScript
import 'express-validator'
|
|
import * as express from 'express'
|
|
|
|
import { SortType } from '../helpers'
|
|
import { database } from '../initializers'
|
|
|
|
function setUsersSort (req: express.Request, res: express.Response, next: express.NextFunction) {
|
|
if (!req.query.sort) req.query.sort = '-createdAt'
|
|
|
|
return next()
|
|
}
|
|
|
|
function setVideoAbusesSort (req: express.Request, res: express.Response, next: express.NextFunction) {
|
|
if (!req.query.sort) req.query.sort = '-createdAt'
|
|
|
|
return next()
|
|
}
|
|
|
|
function setVideosSort (req: express.Request, res: express.Response, next: express.NextFunction) {
|
|
if (!req.query.sort) req.query.sort = '-createdAt'
|
|
|
|
return next()
|
|
}
|
|
|
|
function setBlacklistSort (req: express.Request, res: express.Response, next: express.NextFunction) {
|
|
let newSort: SortType = { sortModel: undefined, sortValue: undefined }
|
|
|
|
if (!req.query.sort) req.query.sort = '-createdAt'
|
|
|
|
// Set model we want to sort onto
|
|
if (req.query.sort === '-createdAt' || req.query.sort === 'createdAt' ||
|
|
req.query.sort === '-id' || req.query.sort === 'id') {
|
|
// If we want to sort onto the BlacklistedVideos relation, we won't specify it in the query parameter ...
|
|
newSort.sortModel = undefined
|
|
} else {
|
|
newSort.sortModel = database.Video
|
|
}
|
|
|
|
newSort.sortValue = req.query.sort
|
|
|
|
req.query.sort = newSort
|
|
|
|
return next()
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export {
|
|
setUsersSort,
|
|
setVideoAbusesSort,
|
|
setVideosSort,
|
|
setBlacklistSort
|
|
}
|