Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Unsubscribe when component is destroyed

Chocobozzz329a6976c8a2
diff --git a/client/src/app/+admin/admin-moderation.component.ts b/client/src/app/+admin/admin-moderation.component.ts
index 9c6a24bb12..f0d24efa78 100644
--- a/client/src/app/+admin/admin-moderation.component.ts
+++ b/client/src/app/+admin/admin-moderation.component.ts
@@ -1,4 +1,5 @@
-import { Component, OnInit, inject } from '@angular/core'
+import { Component, DestroyRef, OnInit, inject } from '@angular/core'
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop'
import { RouterOutlet } from '@angular/router'
import { AuthService, ServerService } from '@app/core'
import { HorizontalMenuComponent, HorizontalMenuEntry } from '@app/shared/shared-main/menu/horizontal-menu.component'
@@ -10,13 +11,16 @@ import { UserRight, UserRightType } from '@peertube/peertube-models'
imports: [ HorizontalMenuComponent, RouterOutlet ]
})
export class AdminModerationComponent implements OnInit {
+ private destroyRef = inject(DestroyRef)
private auth = inject(AuthService)
private server = inject(ServerService)
menuEntries: HorizontalMenuEntry[] = []
ngOnInit () {
- this.server.configReloaded.subscribe(() => this.buildMenu())
+ this.server.configReloaded
+ .pipe(takeUntilDestroyed(this.destroyRef))
+ .subscribe(() => this.buildMenu())
this.buildMenu()
}
diff --git a/client/src/app/+admin/admin-settings.component.ts b/client/src/app/+admin/admin-settings.component.ts
index 9d16796f0c..4342b68292 100644
--- a/client/src/app/+admin/admin-settings.component.ts
+++ b/client/src/app/+admin/admin-settings.component.ts
@@ -1,4 +1,5 @@
-import { Component, OnInit, inject } from '@angular/core'
+import { Component, DestroyRef, OnInit, inject } from '@angular/core'
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop'
import { RouterOutlet } from '@angular/router'
import { AuthService, ServerService } from '@app/core'
import { HorizontalMenuComponent, HorizontalMenuEntry } from '@app/shared/shared-main/menu/horizontal-menu.component'
@@ -12,11 +13,14 @@ import { PluginType, UserRight, UserRightType } from '@peertube/peertube-models'
export class AdminSettingsComponent implements OnInit {
private auth = inject(AuthService)
private server = inject(ServerService)
+ private destroyRef = inject(DestroyRef)
menuEntries: HorizontalMenuEntry[] = []
ngOnInit () {
- this.server.configReloaded.subscribe(() => this.buildMenu())
+ this.server.configReloaded
+ .pipe(takeUntilDestroyed(this.destroyRef))
+ .subscribe(() => this.buildMenu())
this.buildMenu()
}