Correctly unsubscribe on menu destroy

1 files changed, 17 insertions, 6 deletions

diff --git a/client/src/app/modal/quick-settings-modal.component.ts b/client/src/app/modal/quick-settings-modal.component.ts
index 19f75ad5c..8ba58a23a 100644
--- a/client/src/app/modal/quick-settings-modal.component.ts
+++ b/client/src/app/modal/quick-settings-modal.component.ts
@@ -1,6 +1,6 @@
-import { ReplaySubject } from 'rxjs'
+import { ReplaySubject, Subscription } from 'rxjs'
 import { filter } from 'rxjs/operators'
-import { Component, OnInit, ViewChild } from '@angular/core'
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { AuthService, AuthStatus, LocalStorageService, User, UserService } from '@app/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
@@ -10,7 +10,7 @@ import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
   selector: 'my-quick-settings',
   templateUrl: './quick-settings-modal.component.html'
 })
-export class QuickSettingsModalComponent implements OnInit {
+export class QuickSettingsModalComponent implements OnInit, OnDestroy {
   private static readonly QUERY_MODAL_NAME = 'quick-settings'
 
   @ViewChild('modal', { static: true }) modal: NgbModal
@@ -20,6 +20,10 @@ export class QuickSettingsModalComponent implements OnInit {
 
   private openedModal: NgbModalRef
 
+  private routeSub: Subscription
+  private loginSub: Subscription
+  private localStorageSub: Subscription
+
   constructor (
     private modalService: NgbModal,
     private userService: UserService,
@@ -32,14 +36,15 @@ export class QuickSettingsModalComponent implements OnInit {
 
   ngOnInit () {
     this.user = this.userService.getAnonymousUser()
-    this.localStorageService.watch()
+
+    this.localStorageSub = this.localStorageService.watch()
       .subscribe({
         next: () => this.user = this.userService.getAnonymousUser()
       })
 
     this.userInformationLoaded.next(true)
 
-    this.authService.loginChangedSource
+    this.loginSub = this.authService.loginChangedSource
       .pipe(filter(status => status !== AuthStatus.LoggedIn))
       .subscribe({
         next: () => {
@@ -48,7 +53,7 @@ export class QuickSettingsModalComponent implements OnInit {
         }
       })
 
-    this.route.queryParams.subscribe(params => {
+    this.routeSub = this.route.queryParams.subscribe(params => {
       if (params['modal'] === QuickSettingsModalComponent.QUERY_MODAL_NAME) {
         this.openedModal = this.modalService.open(this.modal, { centered: true })
 
@@ -57,6 +62,12 @@ export class QuickSettingsModalComponent implements OnInit {
     })
   }
 
+  ngOnDestroy () {
+    if (this.routeSub) this.routeSub.unsubscribe()
+    if (this.loginSub) this.loginSub.unsubscribe()
+    if (this.localStorageSub) this.localStorageSub.unsubscribe()
+  }
+
   isUserLoggedIn () {
     return this.authService.isLoggedIn()
   }