From a0c032f446f5130a7988db9df8399ef29ffdf787 Mon Sep 17 00:00:00 2001 From: Witheast Date: Tue, 17 Mar 2026 17:51:44 +0300 Subject: [PATCH 1/2] refactor: eliminate OnDestroy in OpenComponent (#6588) --- .../src/app/pages/open/open-page.component.ts | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/apps/client/src/app/pages/open/open-page.component.ts b/apps/client/src/app/pages/open/open-page.component.ts index 6284c41f4..342bcd244 100644 --- a/apps/client/src/app/pages/open/open-page.component.ts +++ b/apps/client/src/app/pages/open/open-page.component.ts @@ -7,11 +7,10 @@ import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, - OnDestroy, OnInit } from '@angular/core'; +import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { MatCardModule } from '@angular/material/card'; -import { Subject, takeUntil } from 'rxjs'; @Component({ host: { class: 'page' }, @@ -21,12 +20,10 @@ import { Subject, takeUntil } from 'rxjs'; styleUrls: ['./open-page.scss'], templateUrl: './open-page.html' }) -export class GfOpenPageComponent implements OnDestroy, OnInit { +export class GfOpenPageComponent implements OnInit { public statistics: Statistics; public user: User; - private unsubscribeSubject = new Subject(); - public constructor( private changeDetectorRef: ChangeDetectorRef, private dataService: DataService, @@ -35,11 +32,9 @@ export class GfOpenPageComponent implements OnDestroy, OnInit { const { statistics } = this.dataService.fetchInfo(); this.statistics = statistics; - } - public ngOnInit() { this.userService.stateChanged - .pipe(takeUntil(this.unsubscribeSubject)) + .pipe(takeUntilDestroyed()) .subscribe((state) => { if (state?.user) { this.user = state.user; @@ -49,8 +44,5 @@ export class GfOpenPageComponent implements OnDestroy, OnInit { }); } - public ngOnDestroy() { - this.unsubscribeSubject.next(); - this.unsubscribeSubject.complete(); - } + public ngOnInit() {} } From 9418027fa88de90f9ef190b1c0bbf28b19ef0156 Mon Sep 17 00:00:00 2001 From: Witheast Date: Tue, 17 Mar 2026 17:52:20 +0300 Subject: [PATCH 2/2] refactor: eliminate OnDestroy in OpenComponent (#6588) --- apps/client/src/app/pages/open/open-page.component.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/client/src/app/pages/open/open-page.component.ts b/apps/client/src/app/pages/open/open-page.component.ts index 342bcd244..7150c3dea 100644 --- a/apps/client/src/app/pages/open/open-page.component.ts +++ b/apps/client/src/app/pages/open/open-page.component.ts @@ -7,7 +7,8 @@ import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, - OnInit + inject, + DestroyRef } from '@angular/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { MatCardModule } from '@angular/material/card'; @@ -20,10 +21,12 @@ import { MatCardModule } from '@angular/material/card'; styleUrls: ['./open-page.scss'], templateUrl: './open-page.html' }) -export class GfOpenPageComponent implements OnInit { +export class GfOpenPageComponent { public statistics: Statistics; public user: User; + private destroyRef = inject(DestroyRef); + public constructor( private changeDetectorRef: ChangeDetectorRef, private dataService: DataService, @@ -34,7 +37,7 @@ export class GfOpenPageComponent implements OnInit { this.statistics = statistics; this.userService.stateChanged - .pipe(takeUntilDestroyed()) + .pipe(takeUntilDestroyed(this.destroyRef)) .subscribe((state) => { if (state?.user) { this.user = state.user; @@ -43,6 +46,4 @@ export class GfOpenPageComponent implements OnInit { } }); } - - public ngOnInit() {} }