mirror of
https://github.com/Chocobozzz/PeerTube.git
synced 2025-10-04 10:19:35 +02:00
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
46 lines
1.7 KiB
TypeScript
46 lines
1.7 KiB
TypeScript
import { query } from 'express-validator/check'
|
|
import * as express from 'express'
|
|
|
|
import { checkErrors } from './utils'
|
|
import { logger } from '../../helpers'
|
|
import { SORTABLE_COLUMNS } from '../../initializers'
|
|
|
|
// Initialize constants here for better performances
|
|
const SORTABLE_USERS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.USERS)
|
|
const SORTABLE_VIDEO_ABUSES_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_ABUSES)
|
|
const SORTABLE_VIDEOS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEOS)
|
|
const SORTABLE_BLACKLISTS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.BLACKLISTS)
|
|
|
|
const usersSortValidator = checkSort(SORTABLE_USERS_COLUMNS)
|
|
const videoAbusesSortValidator = checkSort(SORTABLE_VIDEO_ABUSES_COLUMNS)
|
|
const videosSortValidator = checkSort(SORTABLE_VIDEOS_COLUMNS)
|
|
const blacklistSortValidator = checkSort(SORTABLE_BLACKLISTS_COLUMNS)
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export {
|
|
usersSortValidator,
|
|
videoAbusesSortValidator,
|
|
videosSortValidator,
|
|
blacklistSortValidator
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
function checkSort (sortableColumns: string[]) {
|
|
return [
|
|
query('sort').optional().isIn(sortableColumns).withMessage('Should have correct sortable column'),
|
|
|
|
(req: express.Request, res: express.Response, next: express.NextFunction) => {
|
|
logger.debug('Checking sort parameters', { parameters: req.query })
|
|
|
|
checkErrors(req, res, next)
|
|
}
|
|
]
|
|
}
|
|
|
|
function createSortableColumns (sortableColumns: string[]) {
|
|
const sortableColumnDesc = sortableColumns.map(sortableColumn => '-' + sortableColumn)
|
|
|
|
return sortableColumns.concat(sortableColumnDesc)
|
|
}
|