From db400f447a9f7aae1c56fa25396e93069744483f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 15 May 2018 11:55:51 +0200 Subject: Upgrade to rxjs 6 --- .../src/app/+admin/config/shared/config.service.ts | 5 ++-- .../app/+admin/follows/shared/follow.service.ts | 34 +++++++++++++--------- client/src/app/+admin/jobs/shared/job.service.ts | 13 +++++---- client/src/app/+admin/users/shared/user.service.ts | 31 ++++++++++++-------- .../users/user-edit/user-update.component.ts | 13 ++------- 5 files changed, 53 insertions(+), 43 deletions(-) (limited to 'client/src/app/+admin') diff --git a/client/src/app/+admin/config/shared/config.service.ts b/client/src/app/+admin/config/shared/config.service.ts index 2a39c7155..1565774b3 100644 --- a/client/src/app/+admin/config/shared/config.service.ts +++ b/client/src/app/+admin/config/shared/config.service.ts @@ -1,3 +1,4 @@ +import { catchError } from 'rxjs/operators' import { HttpClient } from '@angular/common/http' import { Injectable } from '@angular/core' import { CustomConfig } from '../../../../../../shared/models/server/custom-config.model' @@ -16,11 +17,11 @@ export class ConfigService { getCustomConfig () { return this.authHttp.get(ConfigService.BASE_APPLICATION_URL + '/custom') - .catch(res => this.restExtractor.handleError(res)) + .pipe(catchError(res => this.restExtractor.handleError(res))) } updateCustomConfig (data: CustomConfig) { return this.authHttp.put(ConfigService.BASE_APPLICATION_URL + '/custom', data) - .catch(res => this.restExtractor.handleError(res)) + .pipe(catchError(res => this.restExtractor.handleError(res))) } } diff --git a/client/src/app/+admin/follows/shared/follow.service.ts b/client/src/app/+admin/follows/shared/follow.service.ts index 089be9d64..5897e64ca 100644 --- a/client/src/app/+admin/follows/shared/follow.service.ts +++ b/client/src/app/+admin/follows/shared/follow.service.ts @@ -1,9 +1,8 @@ +import { catchError, map } from 'rxjs/operators' import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' import { SortMeta } from 'primeng/primeng' -import 'rxjs/add/operator/catch' -import 'rxjs/add/operator/map' -import { Observable } from 'rxjs/Observable' +import { Observable } from 'rxjs' import { AccountFollow, ResultList } from '../../../../../../shared' import { environment } from '../../../../environments/environment' import { RestExtractor, RestPagination, RestService } from '../../../shared' @@ -16,24 +15,29 @@ export class FollowService { private authHttp: HttpClient, private restService: RestService, private restExtractor: RestExtractor - ) {} + ) { + } getFollowing (pagination: RestPagination, sort: SortMeta): Observable> { let params = new HttpParams() params = this.restService.addRestGetParams(params, pagination, sort) return this.authHttp.get>(FollowService.BASE_APPLICATION_URL + '/following', { params }) - .map(res => this.restExtractor.convertResultListDateToHuman(res)) - .catch(res => this.restExtractor.handleError(res)) + .pipe( + map(res => this.restExtractor.convertResultListDateToHuman(res)), + catchError(res => this.restExtractor.handleError(res)) + ) } getFollowers (pagination: RestPagination, sort: SortMeta): Observable> { let params = new HttpParams() params = this.restService.addRestGetParams(params, pagination, sort) - return this.authHttp.get>(FollowService.BASE_APPLICATION_URL + '/followers', { params }) - .map(res => this.restExtractor.convertResultListDateToHuman(res)) - .catch(res => this.restExtractor.handleError(res)) + return this.authHttp.get>(FollowService.BASE_APPLICATION_URL + '/followers', { params }) + .pipe( + map(res => this.restExtractor.convertResultListDateToHuman(res)), + catchError(res => this.restExtractor.handleError(res)) + ) } follow (notEmptyHosts: string[]) { @@ -42,13 +46,17 @@ export class FollowService { } return this.authHttp.post(FollowService.BASE_APPLICATION_URL + '/following', body) - .map(this.restExtractor.extractDataBool) - .catch(res => this.restExtractor.handleError(res)) + .pipe( + map(this.restExtractor.extractDataBool), + catchError(res => this.restExtractor.handleError(res)) + ) } unfollow (follow: AccountFollow) { return this.authHttp.delete(FollowService.BASE_APPLICATION_URL + '/following/' + follow.following.host) - .map(this.restExtractor.extractDataBool) - .catch(res => this.restExtractor.handleError(res)) + .pipe( + map(this.restExtractor.extractDataBool), + catchError(res => this.restExtractor.handleError(res)) + ) } } diff --git a/client/src/app/+admin/jobs/shared/job.service.ts b/client/src/app/+admin/jobs/shared/job.service.ts index 98f29b742..6441eaac1 100644 --- a/client/src/app/+admin/jobs/shared/job.service.ts +++ b/client/src/app/+admin/jobs/shared/job.service.ts @@ -1,9 +1,8 @@ +import { catchError, map } from 'rxjs/operators' import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' import { SortMeta } from 'primeng/primeng' -import 'rxjs/add/operator/catch' -import 'rxjs/add/operator/map' -import { Observable } from 'rxjs/Observable' +import { Observable } from 'rxjs' import { ResultList } from '../../../../../../shared' import { JobState } from '../../../../../../shared/models' import { Job } from '../../../../../../shared/models/server/job.model' @@ -25,9 +24,11 @@ export class JobService { params = this.restService.addRestGetParams(params, pagination, sort) return this.authHttp.get>(JobService.BASE_JOB_URL + '/' + state, { params }) - .map(res => this.restExtractor.convertResultListDateToHuman(res, [ 'createdAt', 'updatedAt' ])) - .map(res => this.restExtractor.applyToResultListData(res, this.prettyPrintData)) - .catch(err => this.restExtractor.handleError(err)) + .pipe( + map(res => this.restExtractor.convertResultListDateToHuman(res, [ 'createdAt', 'updatedAt' ])), + map(res => this.restExtractor.applyToResultListData(res, this.prettyPrintData)), + catchError(err => this.restExtractor.handleError(err)) + ) } private prettyPrintData (obj: Job) { diff --git a/client/src/app/+admin/users/shared/user.service.ts b/client/src/app/+admin/users/shared/user.service.ts index 6536546fb..578cd98c3 100644 --- a/client/src/app/+admin/users/shared/user.service.ts +++ b/client/src/app/+admin/users/shared/user.service.ts @@ -1,10 +1,9 @@ +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 { Observable } from 'rxjs' import { ResultList, UserCreate, UserUpdate } from '../../../../../../shared' import { environment } from '../../../../environments/environment' import { RestExtractor, RestPagination, RestService, User } from '../../../shared' @@ -18,23 +17,28 @@ export class UserService { private authHttp: HttpClient, private restService: RestService, private restExtractor: RestExtractor - ) {} + ) { + } 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(UserService.BASE_USERS_URL + userId) - .catch(err => this.restExtractor.handleError(err)) + .pipe(catchError(err => this.restExtractor.handleError(err))) } getUsers (pagination: RestPagination, sort: SortMeta): Observable> { @@ -42,13 +46,16 @@ export class UserService { params = this.restService.addRestGetParams(params, pagination, sort) return this.authHttp.get>(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))) } private formatUser (user: User) { diff --git a/client/src/app/+admin/users/user-edit/user-update.component.ts b/client/src/app/+admin/users/user-edit/user-update.component.ts index 23e44ac1f..3cde07c65 100644 --- a/client/src/app/+admin/users/user-edit/user-update.component.ts +++ b/client/src/app/+admin/users/user-edit/user-update.component.ts @@ -1,20 +1,13 @@ import { Component, OnDestroy, OnInit } from '@angular/core' import { FormBuilder, FormGroup } from '@angular/forms' import { ActivatedRoute, Router } from '@angular/router' -import { Subscription } from 'rxjs/Subscription' - +import { Subscription } from 'rxjs' import { NotificationsService } from 'angular2-notifications' - import { UserService } from '../shared' -import { - USER_EMAIL, - USER_VIDEO_QUOTA, - USER_ROLE, - User -} from '../../../shared' +import { User, USER_EMAIL, USER_ROLE, USER_VIDEO_QUOTA } from '../../../shared' import { ServerService } from '../../../core' import { UserEdit } from './user-edit' -import { UserUpdate, UserRole } from '../../../../../../shared' +import { UserUpdate } from '../../../../../../shared' @Component({ selector: 'my-user-update', -- cgit v1.2.3