Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/improve type safety in create or update activity dialog component (#6682)
Kenrick Tandrian211745d93480
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 9cc312b25c..2777018621 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@@ -1,5 +1,6 @@import { UserService } from '@ghostfolio/client/services/user/user.service';import { ASSET_CLASS_MAPPING } from '@ghostfolio/common/config';+import { locale as defaultLocale } from '@ghostfolio/common/config';import { CreateOrderDto, UpdateOrderDto } from '@ghostfolio/common/dtos';import { getDateFormatString } from '@ghostfolio/common/helper';import {@@ -89,11 +90,11 @@ export class GfCreateOrUpdateActivityDialogComponent {public assetSubClassOptions: AssetClassSelectorOption[] = [];public currencies: string[] = [];- public currencyOfAssetProfile: string;- public currentMarketPrice = null;+ public currencyOfAssetProfile: string | undefined;+ public currentMarketPrice: number | null = null;public defaultDateFormat: string;public defaultLookupItems: LookupItem[] = [];- public hasPermissionToCreateOwnTag: boolean;+ public hasPermissionToCreateOwnTag: boolean | undefined;public isLoading = false;public isToday = isToday;public mode: 'create' | 'update';@@ -106,7 +107,7 @@ export class GfCreateOrUpdateActivityDialogComponent {private changeDetectorRef: ChangeDetectorRef,@Inject(MAT_DIALOG_DATA) public data: CreateOrUpdateActivityDialogParams,private dataService: DataService,- private dateAdapter: DateAdapter<any>,+ private dateAdapter: DateAdapter<Date, string>,private destroyRef: DestroyRef,public dialogRef: MatDialogRef<GfCreateOrUpdateActivityDialogComponent>,private formBuilder: FormBuilder,@@ -121,7 +122,7 @@ export class GfCreateOrUpdateActivityDialogComponent {this.hasPermissionToCreateOwnTag =this.data.user?.settings?.isExperimentalFeatures &&hasPermission(this.data.user?.permissions, permissions.createOwnTag);- this.locale = this.data.user?.settings?.locale;+ this.locale = this.data.user.settings.locale ?? defaultLocale;this.mode = this.data.activity?.id ? 'update' : 'create';this.dateAdapter.setLocale(this.locale);@@ -136,34 +137,25 @@ export class GfCreateOrUpdateActivityDialogComponent {.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(({ holdings }) => {this.defaultLookupItems = holdings- .filter(({ assetSubClass }) => {- return !['CASH'].includes(assetSubClass);+ .filter(({ assetProfile }) => {+ return !['CASH'].includes(assetProfile.assetSubClass);}).sort((a, b) => {return a.name?.localeCompare(b.name);})- .map(- ({- assetClass,- assetSubClass,- currency,- dataSource,- name,- symbol- }) => {- return {- assetClass,- assetSubClass,- currency,- dataSource,- name,- symbol,- dataProviderInfo: {- isPremium: false- }- };- }- );+ .map(({ assetProfile }) => {+ return {+ assetClass: assetProfile.assetClass,+ assetSubClass: assetProfile.assetSubClass,+ currency: assetProfile.currency ?? '',+ dataProviderInfo: {+ isPremium: false+ },+ dataSource: assetProfile.dataSource,+ name: assetProfile.name ?? '',+ symbol: assetProfile.symbol+ };+ });this.changeDetectorRef.markForCheck();});@@ -242,25 +234,25 @@ export class GfCreateOrUpdateActivityDialogComponent {.subscribe(async () => {if (['BUY', 'FEE', 'VALUABLE'].includes(- this.activityForm.get('type').value+ this.activityForm.get('type')?.value)) {this.total =- this.activityForm.get('quantity').value *- this.activityForm.get('unitPrice').value +- (this.activityForm.get('fee').value ?? 0);+ this.activityForm.get('quantity')?.value *+ this.activityForm.get('unitPrice')?.value ++ (this.activityForm.get('fee')?.value ?? 0);} else {this.total =- this.activityForm.get('quantity').value *- this.activityForm.get('unitPrice').value -- (this.activityForm.get('fee').value ?? 0);+ this.activityForm.get('quantity')?.value *+ this.activityForm.get('unitPrice')?.value -+ (this.activityForm.get('fee')?.value ?? 0);}this.changeDetectorRef.markForCheck();});- this.activityForm.get('accountId').valueChanges.subscribe((accountId) => {- const type = this.activityForm.get('type').value;+ this.activityForm.get('accountId')?.valueChanges.subscribe((accountId) => {+ const type = this.activityForm.get('type')?.value;if (['FEE', 'INTEREST', 'LIABILITY', 'VALUABLE'].includes(type)) {const currency =@@ -268,15 +260,15 @@ export class GfCreateOrUpdateActivityDialogComponent {return id === accountId;})?.currency ?? this.data.user.settings.baseCurrency;- this.activityForm.get('currency').setValue(currency);- this.activityForm.get('currencyOfUnitPrice').setValue(currency);+ this.activityForm.get('currency')?.setValue(currency);+ this.activityForm.get('currencyOfUnitPrice')?.setValue(currency);if (['FEE', 'INTEREST'].includes(type)) {- if (this.activityForm.get('accountId').value) {- this.activityForm.get('updateAccountBalance').enable();+ if (this.activityForm.get('accountId')?.value) {+ this.activityForm.get('updateAccountBalance')?.enable();} else {- this.activityForm.get('updateAccountBalance').disable();- this.activityForm.get('updateAccountBalance').setValue(false);+ this.activityForm.get('updateAccountBalance')?.disable();+ this.activityForm.get('updateAccountBalance')?.setValue(false);}}}@@ -284,7 +276,7 @@ export class GfCreateOrUpdateActivityDialogComponent {this.activityForm.get('assetClass')- .valueChanges.pipe(takeUntilDestroyed(this.destroyRef))+ ?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((assetClass) => {const assetSubClasses = ASSET_CLASS_MAPPING.get(assetClass) ?? [];@@ -297,28 +289,28 @@ export class GfCreateOrUpdateActivityDialogComponent {}).sort((a, b) => a.label.localeCompare(b.label));- this.activityForm.get('assetSubClass').setValue(null);+ this.activityForm.get('assetSubClass')?.setValue(null);this.changeDetectorRef.markForCheck();});- this.activityForm.get('date').valueChanges.subscribe(() => {- if (isToday(this.activityForm.get('date').value)) {- this.activityForm.get('updateAccountBalance').enable();+ this.activityForm.get('date')?.valueChanges.subscribe(() => {+ if (isToday(this.activityForm.get('date')?.value)) {+ this.activityForm.get('updateAccountBalance')?.enable();} else {- this.activityForm.get('updateAccountBalance').disable();- this.activityForm.get('updateAccountBalance').setValue(false);+ this.activityForm.get('updateAccountBalance')?.disable();+ this.activityForm.get('updateAccountBalance')?.setValue(false);}this.changeDetectorRef.markForCheck();});- this.activityForm.get('searchSymbol').valueChanges.subscribe(() => {- if (this.activityForm.get('searchSymbol').invalid) {+ this.activityForm.get('searchSymbol')?.valueChanges.subscribe(() => {+ if (this.activityForm.get('searchSymbol')?.invalid) {this.data.activity.SymbolProfile = null;} else if (['BUY', 'DIVIDEND', 'SELL'].includes(- this.activityForm.get('type').value+ this.activityForm.get('type')?.value)) {this.updateAssetProfile();@@ -327,7 +319,7 @@ export class GfCreateOrUpdateActivityDialogComponent {this.changeDetectorRef.markForCheck();});- this.activityForm.get('tags').valueChanges.subscribe((tags: Tag[]) => {+ this.activityForm.get('tags')?.valueChanges.subscribe((tags: Tag[]) => {const newTag = tags.find(({ id }) => {return id === undefined;});@@ -337,7 +329,7 @@ export class GfCreateOrUpdateActivityDialogComponent {.postTag({ ...newTag, userId: this.data.user.id }).pipe(takeUntilDestroyed(this.destroyRef)).subscribe((tag) => {- this.activityForm.get('tags').setValue(+ this.activityForm.get('tags')?.setValue(tags.map((currentTag) => {if (currentTag.id === undefined) {return tag;@@ -357,106 +349,106 @@ export class GfCreateOrUpdateActivityDialogComponent {this.activityForm.get('type')- .valueChanges.pipe(takeUntilDestroyed(this.destroyRef))+ ?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((type: ActivityType) => {if (type === 'VALUABLE' ||- (this.activityForm.get('dataSource').value === 'MANUAL' &&+ (this.activityForm.get('dataSource')?.value === 'MANUAL' &&type === 'BUY')) {const currency =this.data.accounts.find(({ id }) => {- return id === this.activityForm.get('accountId').value;+ return id === this.activityForm.get('accountId')?.value;})?.currency ?? this.data.user.settings.baseCurrency;- this.activityForm.get('currency').setValue(currency);- this.activityForm.get('currencyOfUnitPrice').setValue(currency);+ this.activityForm.get('currency')?.setValue(currency);+ this.activityForm.get('currencyOfUnitPrice')?.setValue(currency);this.activityForm.get('dataSource')- .removeValidators(Validators.required);- this.activityForm.get('dataSource').updateValueAndValidity();- this.activityForm.get('fee').setValue(0);- this.activityForm.get('name').setValidators(Validators.required);- this.activityForm.get('name').updateValueAndValidity();+ ?.removeValidators(Validators.required);+ this.activityForm.get('dataSource')?.updateValueAndValidity();+ this.activityForm.get('fee')?.setValue(0);+ this.activityForm.get('name')?.setValidators(Validators.required);+ this.activityForm.get('name')?.updateValueAndValidity();if (type === 'VALUABLE') {- this.activityForm.get('quantity').setValue(1);+ this.activityForm.get('quantity')?.setValue(1);}this.activityForm.get('searchSymbol')- .removeValidators(Validators.required);- this.activityForm.get('searchSymbol').updateValueAndValidity();- this.activityForm.get('updateAccountBalance').disable();- this.activityForm.get('updateAccountBalance').setValue(false);+ ?.removeValidators(Validators.required);+ this.activityForm.get('searchSymbol')?.updateValueAndValidity();+ this.activityForm.get('updateAccountBalance')?.disable();+ this.activityForm.get('updateAccountBalance')?.setValue(false);} else if (['FEE', 'INTEREST', 'LIABILITY'].includes(type)) {const currency =this.data.accounts.find(({ id }) => {- return id === this.activityForm.get('accountId').value;+ return id === this.activityForm.get('accountId')?.value;})?.currency ?? this.data.user.settings.baseCurrency;- this.activityForm.get('currency').setValue(currency);- this.activityForm.get('currencyOfUnitPrice').setValue(currency);+ this.activityForm.get('currency')?.setValue(currency);+ this.activityForm.get('currencyOfUnitPrice')?.setValue(currency);this.activityForm.get('dataSource')- .removeValidators(Validators.required);- this.activityForm.get('dataSource').updateValueAndValidity();+ ?.removeValidators(Validators.required);+ this.activityForm.get('dataSource')?.updateValueAndValidity();if (['INTEREST', 'LIABILITY'].includes(type)) {- this.activityForm.get('fee').setValue(0);+ this.activityForm.get('fee')?.setValue(0);}- this.activityForm.get('name').setValidators(Validators.required);- this.activityForm.get('name').updateValueAndValidity();+ this.activityForm.get('name')?.setValidators(Validators.required);+ this.activityForm.get('name')?.updateValueAndValidity();if (type === 'FEE') {- this.activityForm.get('quantity').setValue(0);+ this.activityForm.get('quantity')?.setValue(0);} else if (['INTEREST', 'LIABILITY'].includes(type)) {- this.activityForm.get('quantity').setValue(1);+ this.activityForm.get('quantity')?.setValue(1);}this.activityForm.get('searchSymbol')- .removeValidators(Validators.required);- this.activityForm.get('searchSymbol').updateValueAndValidity();+ ?.removeValidators(Validators.required);+ this.activityForm.get('searchSymbol')?.updateValueAndValidity();if (type === 'FEE') {- this.activityForm.get('unitPrice').setValue(0);+ this.activityForm.get('unitPrice')?.setValue(0);}if (['FEE', 'INTEREST'].includes(type) &&- this.activityForm.get('accountId').value+ this.activityForm.get('accountId')?.value) {- this.activityForm.get('updateAccountBalance').enable();+ this.activityForm.get('updateAccountBalance')?.enable();} else {- this.activityForm.get('updateAccountBalance').disable();- this.activityForm.get('updateAccountBalance').setValue(false);+ this.activityForm.get('updateAccountBalance')?.disable();+ this.activityForm.get('updateAccountBalance')?.setValue(false);}} else {this.activityForm.get('dataSource')- .setValidators(Validators.required);- this.activityForm.get('dataSource').updateValueAndValidity();- this.activityForm.get('name').removeValidators(Validators.required);- this.activityForm.get('name').updateValueAndValidity();+ ?.setValidators(Validators.required);+ this.activityForm.get('dataSource')?.updateValueAndValidity();+ this.activityForm.get('name')?.removeValidators(Validators.required);+ this.activityForm.get('name')?.updateValueAndValidity();this.activityForm.get('searchSymbol')- .setValidators(Validators.required);- this.activityForm.get('searchSymbol').updateValueAndValidity();- this.activityForm.get('updateAccountBalance').enable();+ ?.setValidators(Validators.required);+ this.activityForm.get('searchSymbol')?.updateValueAndValidity();+ this.activityForm.get('updateAccountBalance')?.enable();}this.changeDetectorRef.markForCheck();});- this.activityForm.get('type').setValue(this.data.activity?.type);+ this.activityForm.get('type')?.setValue(this.data.activity?.type);if (this.data.activity?.id) {- this.activityForm.get('searchSymbol').disable();- this.activityForm.get('type').disable();+ this.activityForm.get('searchSymbol')?.disable();+ this.activityForm.get('type')?.disable();}if (this.data.activity?.SymbolProfile?.symbol) {@@ -476,7 +468,7 @@ export class GfCreateOrUpdateActivityDialogComponent {public applyCurrentMarketPrice() {this.activityForm.patchValue({- currencyOfUnitPrice: this.activityForm.get('currency').value,+ currencyOfUnitPrice: this.activityForm.get('currency')?.value,unitPrice: this.currentMarketPrice});}@@ -495,42 +487,42 @@ export class GfCreateOrUpdateActivityDialogComponent {public async onSubmit() {const activity: CreateOrderDto | UpdateOrderDto = {- accountId: this.activityForm.get('accountId').value,- assetClass: this.activityForm.get('assetClass').value,- assetSubClass: this.activityForm.get('assetSubClass').value,- comment: this.activityForm.get('comment').value || null,- currency: this.activityForm.get('currency').value,- customCurrency: this.activityForm.get('currencyOfUnitPrice').value,+ accountId: this.activityForm.get('accountId')?.value,+ assetClass: this.activityForm.get('assetClass')?.value,+ assetSubClass: this.activityForm.get('assetSubClass')?.value,+ comment: this.activityForm.get('comment')?.value || null,+ currency: this.activityForm.get('currency')?.value,+ customCurrency: this.activityForm.get('currencyOfUnitPrice')?.value,dataSource: ['FEE', 'INTEREST', 'LIABILITY', 'VALUABLE'].includes(- this.activityForm.get('type').value+ this.activityForm.get('type')?.value)? 'MANUAL'- : this.activityForm.get('dataSource').value,- date: this.activityForm.get('date').value,- fee: this.activityForm.get('fee').value,- quantity: this.activityForm.get('quantity').value,+ : this.activityForm.get('dataSource')?.value,+ date: this.activityForm.get('date')?.value,+ fee: this.activityForm.get('fee')?.value,+ quantity: this.activityForm.get('quantity')?.value,symbol:(['FEE', 'INTEREST', 'LIABILITY', 'VALUABLE'].includes(- this.activityForm.get('type').value+ this.activityForm.get('type')?.value)? undefined: this.activityForm.get('searchSymbol')?.value?.symbol) ??this.activityForm.get('name')?.value,- tags: this.activityForm.get('tags').value?.map(({ id }) => {+ tags: this.activityForm.get('tags')?.value?.map(({ id }) => {return id;}),type:- this.activityForm.get('type').value === 'VALUABLE'+ this.activityForm.get('type')?.value === 'VALUABLE'? 'BUY'- : this.activityForm.get('type').value,- unitPrice: this.activityForm.get('unitPrice').value+ : this.activityForm.get('type')?.value,+ unitPrice: this.activityForm.get('unitPrice')?.value};try {if (this.mode === 'create') {activity.updateAccountBalance = this.activityForm.get('updateAccountBalance'- ).value;+ )?.value;await validateObjectForForm({classDto: CreateOrderDto,@@ -563,8 +555,8 @@ export class GfCreateOrUpdateActivityDialogComponent {this.dataService.fetchSymbolItem({- dataSource: this.activityForm.get('searchSymbol').value.dataSource,- symbol: this.activityForm.get('searchSymbol').value.symbol+ dataSource: this.activityForm.get('searchSymbol')?.value.dataSource,+ symbol: this.activityForm.get('searchSymbol')?.value.symbol}).pipe(catchError(() => {@@ -580,9 +572,9 @@ export class GfCreateOrUpdateActivityDialogComponent {).subscribe(({ currency, dataSource, marketPrice }) => {if (this.mode === 'create') {- this.activityForm.get('currency').setValue(currency);- this.activityForm.get('currencyOfUnitPrice').setValue(currency);- this.activityForm.get('dataSource').setValue(dataSource);+ this.activityForm.get('currency')?.setValue(currency);+ this.activityForm.get('currencyOfUnitPrice')?.setValue(currency);+ this.activityForm.get('dataSource')?.setValue(dataSource);}this.currencyOfAssetProfile = currency;diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.htmlindex 278ddcbbd3..038da44cb9 100644--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html@@ -15,7 +15,7 @@<mat-label i18n>Type</mat-label><mat-select formControlName="type"><mat-select-trigger>{{- typesTranslationMap[activityForm.get('type').value]+ typesTranslationMap[activityForm.get('type')?.value]}}</mat-select-trigger><mat-option value="BUY"><span@@ -113,7 +113,7 @@[ngClass]="{'d-none': !activityForm.get('searchSymbol')- .hasValidator(Validators.required)+ ?.hasValidator(Validators.required)}"><mat-form-field appearance="outline" class="w-100">@@ -128,7 +128,7 @@<divclass="mb-3"[ngClass]="{- 'd-none': !activityForm.get('name').hasValidator(Validators.required)+ 'd-none': !activityForm.get('name')?.hasValidator(Validators.required)}"><mat-form-field appearance="outline" class="w-100">@@ -228,7 +228,7 @@</mat-form-field>@if (currencyOfAssetProfile ===- activityForm.get('currencyOfUnitPrice').value &&+ activityForm.get('currencyOfUnitPrice')?.value &¤tMarketPrice &&['BUY', 'SELL'].includes(data.activity.type) &&isToday(activityForm.get('date')?.value)@@ -262,7 +262,7 @@matTextSuffix[ngClass]="{ 'd-none': !activityForm.get('currency')?.value }">- {{ activityForm.get('currencyOfUnitPrice').value }}+ {{ activityForm.get('currencyOfUnitPrice')?.value }}</div></mat-form-field></div>diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/interfaces/interfaces.ts b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/interfaces/interfaces.tsindex 5206aacf9b..322bcc0769 100644--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/interfaces/interfaces.ts+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/interfaces/interfaces.ts@@ -4,6 +4,8 @@ import { Account } from '@prisma/client';export interface CreateOrUpdateActivityDialogParams {accounts: Account[];- activity: Activity;+ activity: Omit<Activity, 'SymbolProfile'> & {+ SymbolProfile: Activity['SymbolProfile'] | null;+ };user: User;}