Fix account/channel pages route subscription

1 files changed, 19 insertions, 8 deletions

diff --git a/client/src/app/+video-channels/video-channels.component.ts b/client/src/app/+video-channels/video-channels.component.ts
index 09541b370..cd0463859 100644
--- a/client/src/app/+video-channels/video-channels.component.ts
+++ b/client/src/app/+video-channels/video-channels.component.ts
@@ -1,28 +1,39 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, OnInit, OnDestroy } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
 import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
 import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
 import { RestExtractor } from '@app/shared'
-import { catchError } from 'rxjs/operators'
+import { catchError, switchMap, map, distinctUntilChanged } from 'rxjs/operators'
+import { Subscription } from 'rxjs/Subscription'
 
 @Component({
   templateUrl: './video-channels.component.html',
   styleUrls: [ './video-channels.component.scss' ]
 })
-export class VideoChannelsComponent implements OnInit {
+export class VideoChannelsComponent implements OnInit, OnDestroy {
   videoChannel: VideoChannel
 
+  private routeSub: Subscription
+
   constructor (
     private route: ActivatedRoute,
     private videoChannelService: VideoChannelService,
     private restExtractor: RestExtractor
-  ) {}
+  ) { }
 
   ngOnInit () {
-    const videoChannelId = this.route.snapshot.params['videoChannelId']
+    this.routeSub = this.route.params
+                        .pipe(
+                          map(params => params[ 'videoChannelId' ]),
+                          distinctUntilChanged(),
+                          switchMap(videoChannelId => this.videoChannelService.getVideoChannel(videoChannelId)),
+                          catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 404 ]))
+                        )
+                        .subscribe(videoChannel => this.videoChannel = videoChannel)
+
+  }
 
-    this.videoChannelService.getVideoChannel(videoChannelId)
-        .pipe(catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 404 ])))
-        .subscribe(videoChannel => this.videoChannel = videoChannel)
+  ngOnDestroy () {
+    if (this.routeSub) this.routeSub.unsubscribe()
   }
 }