X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Baccounts%2Faccounts.component.ts;h=8bde7ad070689123a34b1acd9c98b12e1a859918;hb=9270ccf6dca5b2955ad126947d4296deb385fdcb;hp=d9786fb5cb2052749958d4eae0eef12d133ba232;hpb=c47106315ae3c403239cda29c49b4bba51ddccb2;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts index d9786fb5c..8bde7ad07 100644 --- a/client/src/app/+accounts/accounts.component.ts +++ b/client/src/app/+accounts/accounts.component.ts @@ -7,6 +7,9 @@ import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/oper import { Subscription } from 'rxjs' import { AuthService, Notifier, RedirectService } from '@app/core' import { User, UserRight } from '../../../../shared' +import { I18n } from '@ngx-translate/i18n-polyfill' +import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' +import { VideoChannel } from '@app/shared/video-channel/video-channel.model' @Component({ templateUrl: './accounts.component.html', @@ -15,6 +18,7 @@ import { User, UserRight } from '../../../../shared' export class AccountsComponent implements OnInit, OnDestroy { account: Account user: User + videoChannels: VideoChannel[] private routeSub: Subscription @@ -22,10 +26,12 @@ export class AccountsComponent implements OnInit, OnDestroy { private route: ActivatedRoute, private userService: UserService, private accountService: AccountService, + private videoChannelService: VideoChannelService, private notifier: Notifier, private restExtractor: RestExtractor, private redirectService: RedirectService, - private authService: AuthService + private authService: AuthService, + private i18n: I18n ) {} ngOnInit () { @@ -34,11 +40,15 @@ export class AccountsComponent implements OnInit, OnDestroy { map(params => params[ 'accountId' ]), distinctUntilChanged(), switchMap(accountId => this.accountService.getAccount(accountId)), - tap(account => this.getUserIfNeeded(account)), + tap(account => { + this.account = account + this.getUserIfNeeded(account) + }), + switchMap(account => this.videoChannelService.listAccountVideoChannels(account)), catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 404 ])) ) .subscribe( - account => this.account = account, + videoChannels => this.videoChannels = videoChannels.data, err => this.notifier.error(err.message) ) @@ -56,6 +66,10 @@ export class AccountsComponent implements OnInit, OnDestroy { this.redirectService.redirectToHomepage() } + activateCopiedMessage () { + this.notifier.success(this.i18n('Username copied')) + } + private getUserIfNeeded (account: Account) { if (!account.userId) return if (!this.authService.isLoggedIn()) return