Browse Source

refactor: eliminate OnDestroy in OpenComponent (#6588)

pull/6591/head
Witheast 2 weeks ago
parent
commit
a0c032f446
  1. 16
      apps/client/src/app/pages/open/open-page.component.ts

16
apps/client/src/app/pages/open/open-page.component.ts

@ -7,11 +7,10 @@ import {
ChangeDetectorRef, ChangeDetectorRef,
Component, Component,
CUSTOM_ELEMENTS_SCHEMA, CUSTOM_ELEMENTS_SCHEMA,
OnDestroy,
OnInit OnInit
} from '@angular/core'; } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatCardModule } from '@angular/material/card'; import { MatCardModule } from '@angular/material/card';
import { Subject, takeUntil } from 'rxjs';
@Component({ @Component({
host: { class: 'page' }, host: { class: 'page' },
@ -21,12 +20,10 @@ import { Subject, takeUntil } from 'rxjs';
styleUrls: ['./open-page.scss'], styleUrls: ['./open-page.scss'],
templateUrl: './open-page.html' templateUrl: './open-page.html'
}) })
export class GfOpenPageComponent implements OnDestroy, OnInit { export class GfOpenPageComponent implements OnInit {
public statistics: Statistics; public statistics: Statistics;
public user: User; public user: User;
private unsubscribeSubject = new Subject<void>();
public constructor( public constructor(
private changeDetectorRef: ChangeDetectorRef, private changeDetectorRef: ChangeDetectorRef,
private dataService: DataService, private dataService: DataService,
@ -35,11 +32,9 @@ export class GfOpenPageComponent implements OnDestroy, OnInit {
const { statistics } = this.dataService.fetchInfo(); const { statistics } = this.dataService.fetchInfo();
this.statistics = statistics; this.statistics = statistics;
}
public ngOnInit() {
this.userService.stateChanged this.userService.stateChanged
.pipe(takeUntil(this.unsubscribeSubject)) .pipe(takeUntilDestroyed())
.subscribe((state) => { .subscribe((state) => {
if (state?.user) { if (state?.user) {
this.user = state.user; this.user = state.user;
@ -49,8 +44,5 @@ export class GfOpenPageComponent implements OnDestroy, OnInit {
}); });
} }
public ngOnDestroy() { public ngOnInit() {}
this.unsubscribeSubject.next();
this.unsubscribeSubject.complete();
}
} }

Loading…
Cancel
Save