Update FAQ.md

[github/Chocobozzz/PeerTube.git] / client / src / app / +admin / users / shared / user.service.ts

diff --git a/client/src/app/+admin/users/shared/user.service.ts b/client/src/app/+admin/users/shared/user.service.ts
index 6536546fb4b83bce0697b76c45bbc669197d8cf9..470beef08cbfe42d1b9ff39b917db253ddb2c822 100644 (file)
--- a/client/src/app/+admin/users/shared/user.service.ts
+++ b/client/src/app/+admin/users/shared/user.service.ts
@@ -1,13 +1,13 @@
+import { catchError, map } from 'rxjs/operators'
 import { HttpClient, HttpParams } from '@angular/common/http'
 import { Injectable } from '@angular/core'
 import { BytesPipe } from 'ngx-pipes'
 import { SortMeta } from 'primeng/components/common/sortmeta'
-import 'rxjs/add/operator/catch'
-import 'rxjs/add/operator/map'
-import { Observable } from 'rxjs/Observable'
-import { ResultList, UserCreate, UserUpdate } from '../../../../../../shared'
+import { Observable } from 'rxjs'
+import { ResultList, UserCreate, UserUpdate, User, UserRole } from '../../../../../../shared'
 import { environment } from '../../../../environments/environment'
-import { RestExtractor, RestPagination, RestService, User } from '../../../shared'
+import { RestExtractor, RestPagination, RestService } from '../../../shared'
+import { I18n } from '@ngx-translate/i18n-polyfill'
 
 @Injectable()
 export class UserService {
@@ -17,24 +17,29 @@ export class UserService {
   constructor (
     private authHttp: HttpClient,
     private restService: RestService,
-    private restExtractor: RestExtractor
-  ) {}
+    private restExtractor: RestExtractor,
+    private i18n: I18n
+  ) { }
 
   addUser (userCreate: UserCreate) {
     return this.authHttp.post(UserService.BASE_USERS_URL, userCreate)
-                        .map(this.restExtractor.extractDataBool)
-                        .catch(err => this.restExtractor.handleError(err))
+               .pipe(
+                 map(this.restExtractor.extractDataBool),
+                 catchError(err => this.restExtractor.handleError(err))
+               )
   }
 
   updateUser (userId: number, userUpdate: UserUpdate) {
     return this.authHttp.put(UserService.BASE_USERS_URL + userId, userUpdate)
-                        .map(this.restExtractor.extractDataBool)
-                        .catch(err => this.restExtractor.handleError(err))
+               .pipe(
+                 map(this.restExtractor.extractDataBool),
+                 catchError(err => this.restExtractor.handleError(err))
+               )
   }
 
   getUser (userId: number) {
     return this.authHttp.get<User>(UserService.BASE_USERS_URL + userId)
-                        .catch(err => this.restExtractor.handleError(err))
+               .pipe(catchError(err => this.restExtractor.handleError(err)))
   }
 
   getUsers (pagination: RestPagination, sort: SortMeta): Observable<ResultList<User>> {
@@ -42,25 +47,50 @@ export class UserService {
     params = this.restService.addRestGetParams(params, pagination, sort)
 
     return this.authHttp.get<ResultList<User>>(UserService.BASE_USERS_URL, { params })
-                        .map(res => this.restExtractor.convertResultListDateToHuman(res))
-                        .map(res => this.restExtractor.applyToResultListData(res, this.formatUser.bind(this)))
-                        .catch(err => this.restExtractor.handleError(err))
+               .pipe(
+                 map(res => this.restExtractor.convertResultListDateToHuman(res)),
+                 map(res => this.restExtractor.applyToResultListData(res, this.formatUser.bind(this))),
+                 catchError(err => this.restExtractor.handleError(err))
+               )
   }
 
   removeUser (user: User) {
     return this.authHttp.delete(UserService.BASE_USERS_URL + user.id)
+               .pipe(catchError(err => this.restExtractor.handleError(err)))
+  }
+
+  banUser (user: User, reason?: string) {
+    const body = reason ? { reason } : {}
+
+    return this.authHttp.post(UserService.BASE_USERS_URL + user.id + '/block', body)
+               .pipe(catchError(err => this.restExtractor.handleError(err)))
+  }
+
+  unbanUser (user: User) {
+    return this.authHttp.post(UserService.BASE_USERS_URL + user.id + '/unblock', {})
+               .pipe(catchError(err => this.restExtractor.handleError(err)))
   }
 
   private formatUser (user: User) {
     let videoQuota
     if (user.videoQuota === -1) {
-      videoQuota = 'Unlimited'
+      videoQuota = this.i18n('Unlimited')
     } else {
-      videoQuota = this.bytesPipe.transform(user.videoQuota)
+      videoQuota = this.bytesPipe.transform(user.videoQuota, 0)
+    }
+
+    const videoQuotaUsed = this.bytesPipe.transform(user.videoQuotaUsed, 0)
+
+    const roleLabels: { [ id in UserRole ]: string } = {
+      [UserRole.USER]: this.i18n('User'),
+      [UserRole.ADMINISTRATOR]: this.i18n('Administrator'),
+      [UserRole.MODERATOR]: this.i18n('Moderator')
     }
 
     return Object.assign(user, {
-      videoQuota
+      roleLabel: roleLabels[user.role],
+      videoQuota,
+      videoQuotaUsed
     })
   }
 }