Browse Source

feat(client): make form strongly typed

pull/7080/head
KenTandrian 4 weeks ago
parent
commit
f5891944af
  1. 7
      apps/client/src/app/pages/accounts/transfer-balance/interfaces/interfaces.ts
  2. 49
      apps/client/src/app/pages/accounts/transfer-balance/transfer-balance-dialog.component.ts

7
apps/client/src/app/pages/accounts/transfer-balance/interfaces/interfaces.ts

@ -1,5 +1,12 @@
import { FormControl, FormGroup } from '@angular/forms';
import { Account } from '@prisma/client'; import { Account } from '@prisma/client';
export interface TransferBalanceDialogParams { export interface TransferBalanceDialogParams {
accounts: Account[]; accounts: Account[];
} }
export type TransferBalanceForm = FormGroup<{
balance: FormControl<number | string | null>;
fromAccount: FormControl<string | null>;
toAccount: FormControl<string | null>;
}>;

49
apps/client/src/app/pages/accounts/transfer-balance/transfer-balance-dialog.component.ts

@ -3,8 +3,7 @@ import { GfEntityLogoComponent } from '@ghostfolio/ui/entity-logo';
import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
import { import {
AbstractControl, FormControl,
FormBuilder,
FormGroup, FormGroup,
ReactiveFormsModule, ReactiveFormsModule,
ValidationErrors, ValidationErrors,
@ -21,7 +20,10 @@ import { MatInputModule } from '@angular/material/input';
import { MatSelectModule } from '@angular/material/select'; import { MatSelectModule } from '@angular/material/select';
import { Account } from '@prisma/client'; import { Account } from '@prisma/client';
import { TransferBalanceDialogParams } from './interfaces/interfaces'; import {
TransferBalanceDialogParams,
TransferBalanceForm
} from './interfaces/interfaces';
@Component({ @Component({
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
@ -42,31 +44,32 @@ import { TransferBalanceDialogParams } from './interfaces/interfaces';
export class GfTransferBalanceDialogComponent { export class GfTransferBalanceDialogComponent {
public accounts: Account[] = []; public accounts: Account[] = [];
public currency: string; public currency: string;
public transferBalanceForm: FormGroup; public transferBalanceForm: TransferBalanceForm;
public constructor( public constructor(
@Inject(MAT_DIALOG_DATA) public data: TransferBalanceDialogParams, @Inject(MAT_DIALOG_DATA) public data: TransferBalanceDialogParams,
public dialogRef: MatDialogRef<GfTransferBalanceDialogComponent>, public dialogRef: MatDialogRef<GfTransferBalanceDialogComponent>
private formBuilder: FormBuilder
) {} ) {}
public ngOnInit() { public ngOnInit() {
this.accounts = this.data.accounts; this.accounts = this.data.accounts;
this.transferBalanceForm = this.formBuilder.group( this.transferBalanceForm = new FormGroup(
{ {
balance: ['', Validators.required], balance: new FormControl<number | string | null>(
fromAccount: ['', Validators.required], '',
toAccount: ['', Validators.required] Validators.required
),
fromAccount: new FormControl<string | null>('', Validators.required),
toAccount: new FormControl<string | null>('', Validators.required)
}, },
{ {
validators: this.compareAccounts validators: this.compareAccounts
} }
); );
this.transferBalanceForm this.transferBalanceForm.controls.fromAccount.valueChanges.subscribe(
.get('fromAccount') (id) => {
?.valueChanges.subscribe((id) => {
const currency = this.accounts.find((account) => { const currency = this.accounts.find((account) => {
return account.id === id; return account.id === id;
})?.currency; })?.currency;
@ -74,7 +77,8 @@ export class GfTransferBalanceDialogComponent {
if (currency) { if (currency) {
this.currency = currency; this.currency = currency;
} }
}); }
);
} }
public onCancel() { public onCancel() {
@ -83,19 +87,22 @@ export class GfTransferBalanceDialogComponent {
public onSubmit() { public onSubmit() {
const account: TransferBalanceDto = { const account: TransferBalanceDto = {
accountIdFrom: this.transferBalanceForm.get('fromAccount')?.value, accountIdFrom: this.transferBalanceForm.controls.fromAccount.value ?? '',
accountIdTo: this.transferBalanceForm.get('toAccount')?.value, accountIdTo: this.transferBalanceForm.controls.toAccount.value ?? '',
balance: this.transferBalanceForm.get('balance')?.value balance: Number(this.transferBalanceForm.controls.balance.value)
}; };
this.dialogRef.close({ account }); this.dialogRef.close({ account });
} }
private compareAccounts(control: AbstractControl): ValidationErrors | null { private compareAccounts(
const accountFrom = control.get('fromAccount'); control: TransferBalanceForm
const accountTo = control.get('toAccount'); ): ValidationErrors | null {
const formGroup = control;
const accountFrom = formGroup.controls.fromAccount;
const accountTo = formGroup.controls.toAccount;
if (accountFrom?.value === accountTo?.value) { if (accountFrom.value === accountTo.value) {
return { invalid: true }; return { invalid: true };
} }

Loading…
Cancel
Save