Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/eliminate OnDestroy lifecycle hook from account detail dialog component (#6598)
Zakir Jiwanif826819794fb
diff --git a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.tsindex 380fb69cb5..7a30403913 100644--- a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts+++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts@@ -26,11 +26,12 @@ import {ChangeDetectionStrategy,ChangeDetectorRef,Component,+ DestroyRef,Inject,- OnDestroy,OnInit} from '@angular/core';import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';import { MatButtonModule } from '@angular/material/button';import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';import { MatDialogModule } from '@angular/material/dialog';@@ -49,8 +50,7 @@ import {} from 'ionicons/icons';import { isNumber } from 'lodash';import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';-import { forkJoin, Subject } from 'rxjs';-import { takeUntil } from 'rxjs/operators';+import { forkJoin } from 'rxjs';import { AccountDetailDialogParams } from './interfaces/interfaces';@@ -77,7 +77,7 @@ import { AccountDetailDialogParams } from './interfaces/interfaces';styleUrls: ['./account-detail-dialog.component.scss'],templateUrl: 'account-detail-dialog.html'})-export class GfAccountDetailDialogComponent implements OnDestroy, OnInit {+export class GfAccountDetailDialogComponent implements OnInit {public accountBalances: AccountBalancesResponse['balances'];public activities: OrderWithAccount[];public activitiesCount: number;@@ -104,18 +104,17 @@ export class GfAccountDetailDialogComponent implements OnDestroy, OnInit {public user: User;public valueInBaseCurrency: number;- private unsubscribeSubject = new Subject<void>();-public constructor(private changeDetectorRef: ChangeDetectorRef,@Inject(MAT_DIALOG_DATA) public data: AccountDetailDialogParams,private dataService: DataService,+ private destroyRef: DestroyRef,public dialogRef: MatDialogRef<GfAccountDetailDialogComponent>,private router: Router,private userService: UserService) {this.userService.stateChanged- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe((state) => {if (state?.user) {this.user = state.user;@@ -154,7 +153,7 @@ export class GfAccountDetailDialogComponent implements OnDestroy, OnInit {public onAddAccountBalance(accountBalance: CreateAccountBalanceDto) {this.dataService.postAccountBalance(accountBalance)- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe(() => {this.initialize();});@@ -163,7 +162,7 @@ export class GfAccountDetailDialogComponent implements OnDestroy, OnInit {public onDeleteAccountBalance(aId: string) {this.dataService.deleteAccountBalance(aId)- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe(() => {this.initialize();});@@ -176,7 +175,7 @@ export class GfAccountDetailDialogComponent implements OnDestroy, OnInit {this.dataService.fetchExport({ activityIds })- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe((data) => {downloadAsFile({content: data,@@ -212,7 +211,7 @@ export class GfAccountDetailDialogComponent implements OnDestroy, OnInit {private fetchAccount() {this.dataService.fetchAccount(this.data.accountId)- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe(({activitiesCount,@@ -287,7 +286,7 @@ export class GfAccountDetailDialogComponent implements OnDestroy, OnInit {sortColumn: this.sortColumn,sortDirection: this.sortDirection})- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe(({ activities, count }) => {this.dataSource = new MatTableDataSource(activities);this.totalItems = count;@@ -304,7 +303,7 @@ export class GfAccountDetailDialogComponent implements OnDestroy, OnInit {forkJoin({accountBalances: this.dataService.fetchAccountBalances(this.data.accountId)- .pipe(takeUntil(this.unsubscribeSubject)),+ .pipe(takeUntilDestroyed(this.destroyRef)),portfolioPerformance: this.dataService.fetchPortfolioPerformance({filters: [@@ -317,7 +316,7 @@ export class GfAccountDetailDialogComponent implements OnDestroy, OnInit {withExcludedAccounts: true,withItems: true})- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef))}).subscribe({error: () => {this.isLoadingChart = false;@@ -360,7 +359,7 @@ export class GfAccountDetailDialogComponent implements OnDestroy, OnInit {}]})- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe(({ holdings }) => {this.holdings = holdings;@@ -374,9 +373,4 @@ export class GfAccountDetailDialogComponent implements OnDestroy, OnInit {this.fetchChart();this.fetchPortfolioHoldings();}-- public ngOnDestroy() {- this.unsubscribeSubject.next();- this.unsubscribeSubject.complete();- }}