Add ability to report comments in front end

[github/Chocobozzz/PeerTube.git] / client / src / app / +accounts / accounts.component.ts

diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts
index b06ecfe0e49db6fe0c7a03fc28911c0ad4ad6b72..01911cac286892648079c6dc1a38d6f5820a5bd7 100644 (file)
--- a/client/src/app/+accounts/accounts.component.ts
+++ b/client/src/app/+accounts/accounts.component.ts
@@ -1,15 +1,11 @@
+import { Subscription } from 'rxjs'
+import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators'
 import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
-import { AccountService } from '@app/shared/account/account.service'
-import { Account } from '@app/shared/account/account.model'
-import { RestExtractor, UserService } from '@app/shared'
-import { catchError, distinctUntilChanged, first, map, switchMap, tap } from 'rxjs/operators'
-import { forkJoin, Subscription } from 'rxjs'
-import { AuthService, Notifier, RedirectService } from '@app/core'
-import { User, UserRight } from '../../../../shared'
+import { AuthService, Notifier, RedirectService, RestExtractor, ScreenService, UserService } from '@app/core'
+import { Account, AccountService, ListOverflowItem, VideoChannel, VideoChannelService } from '@app/shared/shared-main'
 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'
+import { User, UserRight } from '@shared/models'
 
 @Component({
   templateUrl: './accounts.component.html',
@@ -19,6 +15,7 @@ export class AccountsComponent implements OnInit, OnDestroy {
   account: Account
   accountUser: User
   videoChannels: VideoChannel[] = []
+  links: ListOverflowItem[] = []
 
   isAccountManageable = false
   accountFollowerTitle = ''
@@ -34,35 +31,49 @@ export class AccountsComponent implements OnInit, OnDestroy {
     private restExtractor: RestExtractor,
     private redirectService: RedirectService,
     private authService: AuthService,
+    private screenService: ScreenService,
     private i18n: I18n
-  ) {}
+  ) {
+  }
 
   ngOnInit () {
     this.routeSub = this.route.params
-      .pipe(
-        map(params => params[ 'accountId' ]),
-        distinctUntilChanged(),
-        switchMap(accountId => this.accountService.getAccount(accountId)),
-        tap(account => {
-          this.account = account
-
-          this.isAccountManageable = this.account.userId && this.account.userId === this.authService.getUser().id
-
-          this.accountFollowerTitle = this.i18n(
-            '{{followers}} direct account followers',
-            { followers: this.subscribersDisplayFor(account.followersCount) }
-          )
-
-          this.getUserIfNeeded(account)
-        }),
-        switchMap(account => this.videoChannelService.listAccountVideoChannels(account)),
-        catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 404 ]))
-      )
-      .subscribe(
-        videoChannels => this.videoChannels = videoChannels.data,
-
-        err => this.notifier.error(err.message)
-      )
+                        .pipe(
+                          map(params => params[ 'accountId' ]),
+                          distinctUntilChanged(),
+                          switchMap(accountId => this.accountService.getAccount(accountId)),
+                          tap(account => {
+                            this.account = account
+
+                            if (this.authService.isLoggedIn()) {
+                              this.authService.userInformationLoaded.subscribe(
+                                () => {
+                                  this.isAccountManageable = this.account.userId && this.account.userId === this.authService.getUser().id
+
+                                  this.accountFollowerTitle = this.i18n(
+                                    '{{followers}} direct account followers',
+                                    { followers: this.subscribersDisplayFor(account.followersCount) }
+                                  )
+                                }
+                              )
+                            }
+
+                            this.getUserIfNeeded(account)
+                          }),
+                          switchMap(account => this.videoChannelService.listAccountVideoChannels(account)),
+                          catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 404 ]))
+                        )
+                        .subscribe(
+                          videoChannels => this.videoChannels = videoChannels.data,
+
+                          err => this.notifier.error(err.message)
+                        )
+
+    this.links = [
+      { label: this.i18n('VIDEO CHANNELS'), routerLink: 'video-channels' },
+      { label: this.i18n('VIDEOS'), routerLink: 'videos' },
+      { label: this.i18n('ABOUT'), routerLink: 'about' }
+    ]
   }
 
   ngOnDestroy () {
@@ -76,6 +87,10 @@ export class AccountsComponent implements OnInit, OnDestroy {
     )
   }
 
+  get isInSmallView () {
+    return this.screenService.isInSmallView()
+  }
+
   onUserChanged () {
     this.getUserIfNeeded(this.account)
   }
@@ -89,7 +104,7 @@ export class AccountsComponent implements OnInit, OnDestroy {
   }
 
   subscribersDisplayFor (count: number) {
-    return this.i18n(`{count, plural, =1 {1 subscriber} other {${count} subscribers}}`, { count })
+    return this.i18n('{count, plural, =1 {1 subscriber} other {{{count}} subscribers}}', { count })
   }
 
   private getUserIfNeeded (account: Account) {
@@ -97,11 +112,8 @@ export class AccountsComponent implements OnInit, OnDestroy {
 
     const user = this.authService.getUser()
     if (user.hasRight(UserRight.MANAGE_USERS)) {
-      forkJoin([
-        this.userService.getUser(account.userId),
-        this.authService.userInformationLoaded.pipe(first())
-      ]).subscribe(
-        ([ accountUser ]) => this.accountUser = accountUser,
+      this.userService.getUser(account.userId).subscribe(
+        accountUser => this.accountUser = accountUser,
 
         err => this.notifier.error(err.message)
       )