Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/eliminate OnDestroy lifecycle hook from accounts page (#6527)
Erwin-Ncfa974385ada
diff --git a/apps/client/src/app/pages/accounts/accounts-page.component.ts b/apps/client/src/app/pages/accounts/accounts-page.component.tsindex a0eef4eba0..fdc78a8c40 100644--- a/apps/client/src/app/pages/accounts/accounts-page.component.ts+++ b/apps/client/src/app/pages/accounts/accounts-page.component.ts@@ -13,7 +13,13 @@ import { GfAccountsTableComponent } from '@ghostfolio/ui/accounts-table';import { NotificationService } from '@ghostfolio/ui/notifications';import { DataService } from '@ghostfolio/ui/services';-import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';+import {+ ChangeDetectorRef,+ Component,+ DestroyRef,+ OnInit+} from '@angular/core';+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';import { MatButtonModule } from '@angular/material/button';import { MatDialog } from '@angular/material/dialog';import { ActivatedRoute, Router, RouterModule } from '@angular/router';@@ -21,8 +27,8 @@ import { Account as AccountModel } from '@prisma/client';import { addIcons } from 'ionicons';import { addOutline } from 'ionicons/icons';import { DeviceDetectorService } from 'ngx-device-detector';-import { EMPTY, Subject, Subscription } from 'rxjs';-import { catchError, takeUntil } from 'rxjs/operators';+import { EMPTY, Subscription } from 'rxjs';+import { catchError } from 'rxjs/operators';import { GfCreateOrUpdateAccountDialogComponent } from './create-or-update-account-dialog/create-or-update-account-dialog.component';import { CreateOrUpdateAccountDialogParams } from './create-or-update-account-dialog/interfaces/interfaces';@@ -36,7 +42,7 @@ import { GfTransferBalanceDialogComponent } from './transfer-balance/transfer-bastyleUrls: ['./accounts-page.scss'],templateUrl: './accounts-page.html'})-export class GfAccountsPageComponent implements OnDestroy, OnInit {+export class GfAccountsPageComponent implements OnInit {public accounts: AccountModel[];public activitiesCount = 0;public deviceType: string;@@ -48,11 +54,10 @@ export class GfAccountsPageComponent implements OnDestroy, OnInit {public totalValueInBaseCurrency = 0;public user: User;- private unsubscribeSubject = new Subject<void>();-public constructor(private changeDetectorRef: ChangeDetectorRef,private dataService: DataService,+ private destroyRef: DestroyRef,private deviceService: DeviceDetectorService,private dialog: MatDialog,private impersonationStorageService: ImpersonationStorageService,@@ -62,7 +67,7 @@ export class GfAccountsPageComponent implements OnDestroy, OnInit {private userService: UserService) {this.route.queryParams- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe((params) => {if (params['accountId'] && params['accountDetailDialog']) {this.openAccountDetailDialog(params['accountId']);@@ -94,13 +99,13 @@ export class GfAccountsPageComponent implements OnDestroy, OnInit {this.impersonationStorageService.onChangeHasImpersonation()- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe((impersonationId) => {this.hasImpersonationId = !!impersonationId;});this.userService.stateChanged- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe((state) => {if (state?.user) {this.user = state.user;@@ -124,7 +129,7 @@ export class GfAccountsPageComponent implements OnDestroy, OnInit {public fetchAccounts() {this.dataService.fetchAccounts()- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe(({accounts,@@ -151,11 +156,11 @@ export class GfAccountsPageComponent implements OnDestroy, OnInit {this.dataService.deleteAccount(aId)- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe(() => {this.userService.get(true)- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe();this.fetchAccounts();@@ -204,18 +209,18 @@ export class GfAccountsPageComponent implements OnDestroy, OnInit {dialogRef.afterClosed()- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe((account: UpdateAccountDto | null) => {if (account) {this.reset();this.dataService.putAccount(account)- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe(() => {this.userService.get(true)- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe();this.fetchAccounts();@@ -228,11 +233,6 @@ export class GfAccountsPageComponent implements OnDestroy, OnInit {});}- public ngOnDestroy() {- this.unsubscribeSubject.next();- this.unsubscribeSubject.complete();- }-private openAccountDetailDialog(aAccountId: string) {const dialogRef = this.dialog.open<GfAccountDetailDialogComponent,@@ -254,7 +254,7 @@ export class GfAccountsPageComponent implements OnDestroy, OnInit {dialogRef.afterClosed()- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe(() => {this.fetchAccounts();@@ -284,18 +284,18 @@ export class GfAccountsPageComponent implements OnDestroy, OnInit {dialogRef.afterClosed()- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe((account: CreateAccountDto | null) => {if (account) {this.reset();this.dataService.postAccount(account)- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe(() => {this.userService.get(true)- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe();this.fetchAccounts();@@ -321,7 +321,7 @@ export class GfAccountsPageComponent implements OnDestroy, OnInit {dialogRef.afterClosed()- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe((data: any) => {if (data) {this.reset();@@ -343,7 +343,7 @@ export class GfAccountsPageComponent implements OnDestroy, OnInit {return EMPTY;}),- takeUntil(this.unsubscribeSubject)+ takeUntilDestroyed(this.destroyRef)).subscribe(() => {this.fetchAccounts();