Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/eliminate OnDestroy lifecycle hook from create or update activity dialog component (#6623)
Erwin79e779190aec
diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.tsindex c7cd63191f..9cc312b25c 100644--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts@@ -20,9 +20,10 @@ import {ChangeDetectionStrategy,ChangeDetectorRef,Component,- Inject,- OnDestroy+ DestroyRef,+ Inject} from '@angular/core';+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';import {FormBuilder,FormGroup,@@ -46,8 +47,8 @@ import { AssetClass, Tag, Type } from '@prisma/client';import { isAfter, isToday } from 'date-fns';import { addIcons } from 'ionicons';import { calendarClearOutline, refreshOutline } from 'ionicons/icons';-import { EMPTY, Subject } from 'rxjs';-import { catchError, delay, takeUntil } from 'rxjs/operators';+import { EMPTY } from 'rxjs';+import { catchError, delay } from 'rxjs/operators';import { CreateOrUpdateActivityDialogParams } from './interfaces/interfaces';import { ActivityType } from './types/activity-type.type';@@ -75,7 +76,7 @@ import { ActivityType } from './types/activity-type.type';styleUrls: ['./create-or-update-activity-dialog.scss'],templateUrl: 'create-or-update-activity-dialog.html'})-export class GfCreateOrUpdateActivityDialogComponent implements OnDestroy {+export class GfCreateOrUpdateActivityDialogComponent {public activityForm: FormGroup;public assetClassOptions: AssetClassSelectorOption[] = Object.keys(AssetClass)@@ -101,13 +102,12 @@ export class GfCreateOrUpdateActivityDialogComponent implements OnDestroy {public typesTranslationMap = new Map<Type, string>();public Validators = Validators;- private unsubscribeSubject = new Subject<void>();-public constructor(private changeDetectorRef: ChangeDetectorRef,@Inject(MAT_DIALOG_DATA) public data: CreateOrUpdateActivityDialogParams,private dataService: DataService,private dateAdapter: DateAdapter<any>,+ private destroyRef: DestroyRef,public dialogRef: MatDialogRef<GfCreateOrUpdateActivityDialogComponent>,private formBuilder: FormBuilder,@Inject(MAT_DATE_LOCALE) private locale: string,@@ -133,7 +133,7 @@ export class GfCreateOrUpdateActivityDialogComponent implements OnDestroy {this.dataService.fetchPortfolioHoldings()- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe(({ holdings }) => {this.defaultLookupItems = holdings.filter(({ assetSubClass }) => {@@ -237,7 +237,7 @@ export class GfCreateOrUpdateActivityDialogComponent implements OnDestroy {// Slightly delay until the more specific form control value changes have// completeddelay(300),- takeUntil(this.unsubscribeSubject)+ takeUntilDestroyed(this.destroyRef)).subscribe(async () => {if (@@ -284,7 +284,7 @@ export class GfCreateOrUpdateActivityDialogComponent implements OnDestroy {this.activityForm.get('assetClass')- .valueChanges.pipe(takeUntil(this.unsubscribeSubject))+ .valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((assetClass) => {const assetSubClasses = ASSET_CLASS_MAPPING.get(assetClass) ?? [];@@ -335,7 +335,7 @@ export class GfCreateOrUpdateActivityDialogComponent implements OnDestroy {if (newTag && this.hasPermissionToCreateOwnTag) {this.dataService.postTag({ ...newTag, userId: this.data.user.id })- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe((tag) => {this.activityForm.get('tags').setValue(tags.map((currentTag) => {@@ -349,7 +349,7 @@ export class GfCreateOrUpdateActivityDialogComponent implements OnDestroy {this.userService.get(true)- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe();});}@@ -357,7 +357,7 @@ export class GfCreateOrUpdateActivityDialogComponent implements OnDestroy {this.activityForm.get('type')- .valueChanges.pipe(takeUntil(this.unsubscribeSubject))+ .valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((type: ActivityType) => {if (type === 'VALUABLE' ||@@ -465,7 +465,7 @@ export class GfCreateOrUpdateActivityDialogComponent implements OnDestroy {dataSource: this.data.activity?.SymbolProfile?.dataSource,symbol: this.data.activity?.SymbolProfile?.symbol})- .pipe(takeUntil(this.unsubscribeSubject))+ .pipe(takeUntilDestroyed(this.destroyRef)).subscribe(({ marketPrice }) => {this.currentMarketPrice = marketPrice;@@ -557,11 +557,6 @@ export class GfCreateOrUpdateActivityDialogComponent implements OnDestroy {}}- public ngOnDestroy() {- this.unsubscribeSubject.next();- this.unsubscribeSubject.complete();- }-private updateAssetProfile() {this.isLoading = true;this.changeDetectorRef.markForCheck();@@ -581,7 +576,7 @@ export class GfCreateOrUpdateActivityDialogComponent implements OnDestroy {return EMPTY;}),- takeUntil(this.unsubscribeSubject)+ takeUntilDestroyed(this.destroyRef)).subscribe(({ currency, dataSource, marketPrice }) => {if (this.mode === 'create') {