Merge branch 'release/2.1.0' into develop

[github/Chocobozzz/PeerTube.git] / server / controllers / api / jobs.ts

diff --git a/server/controllers/api/jobs.ts b/server/controllers/api/jobs.ts
index c19596dde2c5518c2048616c38721afab19e1d4b..13fc04d187a2a20fa1d8d11f4dc63f4123fcb5ea 100644 (file)
--- a/server/controllers/api/jobs.ts
+++ b/server/controllers/api/jobs.ts
@@ -24,7 +24,7 @@ jobsRouter.get('/:state',
   jobsSortValidator,
   setDefaultSort,
   setDefaultPagination,
-  asyncMiddleware(listJobsValidator),
+  listJobsValidator,
   asyncMiddleware(listJobs)
 )
 
@@ -36,14 +36,21 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function listJobs (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const state: JobState = req.params.state
+async function listJobs (req: express.Request, res: express.Response) {
+  const state = req.params.state as JobState
   const asc = req.query.sort === 'createdAt'
+  const jobType = req.query.jobType
 
-  const jobs = await JobQueue.Instance.listForApi(state, req.query.start, req.query.count, asc)
+  const jobs = await JobQueue.Instance.listForApi({
+    state,
+    start: req.query.start,
+    count: req.query.count,
+    asc,
+    jobType
+  })
   const total = await JobQueue.Instance.count(state)
 
-  const result: ResultList<any> = {
+  const result: ResultList<Job> = {
     total,
     data: jobs.map(j => formatJob(j, state))
   }