diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-09-14 11:57:49 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-09-14 11:57:49 +0200 |
commit | d592e0a9b2931c7c9cbedb27fb8efc9aaacad9bb (patch) | |
tree | 549b14b842de296efed846a11b3681efe08cfa9e /client/src/app/+admin/request-schedulers | |
parent | 91f6f169b1110eeae6ebf5c387f4204b0d07703c (diff) | |
download | PeerTube-d592e0a9b2931c7c9cbedb27fb8efc9aaacad9bb.tar.gz PeerTube-d592e0a9b2931c7c9cbedb27fb8efc9aaacad9bb.tar.zst PeerTube-d592e0a9b2931c7c9cbedb27fb8efc9aaacad9bb.zip |
Move to HttpClient and PrimeNG data table
Diffstat (limited to 'client/src/app/+admin/request-schedulers')
-rw-r--r-- | client/src/app/+admin/request-schedulers/shared/request-schedulers.service.ts | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/client/src/app/+admin/request-schedulers/shared/request-schedulers.service.ts b/client/src/app/+admin/request-schedulers/shared/request-schedulers.service.ts index e9b166f78..44d9cbc3e 100644 --- a/client/src/app/+admin/request-schedulers/shared/request-schedulers.service.ts +++ b/client/src/app/+admin/request-schedulers/shared/request-schedulers.service.ts | |||
@@ -1,10 +1,11 @@ | |||
1 | import { Injectable } from '@angular/core' | 1 | import { Injectable } from '@angular/core' |
2 | import { HttpClient } from '@angular/common/http' | ||
2 | import { Observable } from 'rxjs/Observable' | 3 | import { Observable } from 'rxjs/Observable' |
3 | import 'rxjs/add/operator/catch' | 4 | import 'rxjs/add/operator/catch' |
4 | import 'rxjs/add/operator/map' | 5 | import 'rxjs/add/operator/map' |
5 | 6 | ||
6 | import { RequestSchedulerStats } from '../../../../../../shared' | 7 | import { RequestSchedulerStats } from '../../../../../../shared' |
7 | import { AuthHttp, RestExtractor } from '../../../shared' | 8 | import { RestExtractor } from '../../../shared' |
8 | import { RequestSchedulerStatsAttributes } from './request-schedulers-stats-attributes.model' | 9 | import { RequestSchedulerStatsAttributes } from './request-schedulers-stats-attributes.model' |
9 | 10 | ||
10 | @Injectable() | 11 | @Injectable() |
@@ -12,19 +13,18 @@ export class RequestSchedulersService { | |||
12 | private static BASE_REQUEST_URL = API_URL + '/api/v1/request-schedulers/' | 13 | private static BASE_REQUEST_URL = API_URL + '/api/v1/request-schedulers/' |
13 | 14 | ||
14 | constructor ( | 15 | constructor ( |
15 | private authHttp: AuthHttp, | 16 | private authHttp: HttpClient, |
16 | private restExtractor: RestExtractor | 17 | private restExtractor: RestExtractor |
17 | ) {} | 18 | ) {} |
18 | 19 | ||
19 | getStats (): Observable<RequestSchedulerStats> { | 20 | getStats () { |
20 | return this.authHttp.get(RequestSchedulersService.BASE_REQUEST_URL + 'stats') | 21 | return this.authHttp.get<RequestSchedulerStats>(RequestSchedulersService.BASE_REQUEST_URL + 'stats') |
21 | .map(this.restExtractor.extractDataGet) | 22 | .map(res => this.buildRequestObjects(res)) |
22 | .map(this.buildRequestObjects) | 23 | .catch(res => this.restExtractor.handleError(res)) |
23 | .catch((res) => this.restExtractor.handleError(res)) | ||
24 | } | 24 | } |
25 | 25 | ||
26 | private buildRequestObjects (data: RequestSchedulerStats) { | 26 | private buildRequestObjects (data: RequestSchedulerStats) { |
27 | const requestSchedulers = {} | 27 | const requestSchedulers: { [ id: string ]: RequestSchedulerStatsAttributes } = {} |
28 | 28 | ||
29 | Object.keys(data).forEach(requestSchedulerName => { | 29 | Object.keys(data).forEach(requestSchedulerName => { |
30 | requestSchedulers[requestSchedulerName] = new RequestSchedulerStatsAttributes(data[requestSchedulerName]) | 30 | requestSchedulers[requestSchedulerName] = new RequestSchedulerStatsAttributes(data[requestSchedulerName]) |