Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/improve type safety in account balances component (#6352)
Kenrick Tandrian6c6f20c3fdbc
diff --git a/libs/ui/src/lib/account-balances/account-balances.component.html b/libs/ui/src/lib/account-balances/account-balances.component.htmlindex caef922ed7..29037a985f 100644--- a/libs/ui/src/lib/account-balances/account-balances.component.html+++ b/libs/ui/src/lib/account-balances/account-balances.component.html@@ -12,7 +12,7 @@<ng-container i18n>Date</ng-container></th><td *matCellDef="let element" class="px-2" mat-cell>- <gf-value [isDate]="true" [locale]="locale" [value]="element?.date" />+ <gf-value [isDate]="true" [locale]="locale()" [value]="element?.date" /></td><td *matFooterCellDef class="px-2" mat-footer-cell><mat-form-field appearance="outline" class="py-1 without-hint">@@ -37,7 +37,7 @@<div class="d-flex justify-content-end"><gf-value[isCurrency]="true"- [locale]="locale"+ [locale]="locale()"[unit]="element?.account?.currency"[value]="element?.value"/>@@ -48,7 +48,7 @@<mat-form-field appearance="outline" class="without-hint"><input formControlName="balance" matInput type="number" /><div class="ml-2" matTextSuffix>- {{ accountCurrency }}+ {{ accountCurrency() }}</div></mat-form-field></div>@@ -58,7 +58,7 @@<ng-container matColumnDef="actions" stickyEnd><th *matHeaderCellDef class="px-1 text-center" mat-header-cell></th><td *matCellDef="let element" class="px-1 text-center" mat-cell>- @if (showActions) {+ @if (showActions()) {<buttonclass="mx-1 no-min-width px-2"mat-button@@ -100,7 +100,7 @@<tr*matFooterRowDef="displayedColumns"mat-footer-row- [hidden]="!showActions"+ [hidden]="!showActions()"></tr></table></form>diff --git a/libs/ui/src/lib/account-balances/account-balances.component.ts b/libs/ui/src/lib/account-balances/account-balances.component.tsindex 608ee1c752..7b26263b01 100644--- a/libs/ui/src/lib/account-balances/account-balances.component.ts+++ b/libs/ui/src/lib/account-balances/account-balances.component.ts@@ -10,12 +10,12 @@ import {ChangeDetectionStrategy,Component,EventEmitter,- Input,OnChanges,- OnDestroy,OnInit,Output,- ViewChild+ inject,+ input,+ viewChild} from '@angular/core';import {FormGroup,@@ -39,8 +39,7 @@ import {ellipsisHorizontal,trashOutline} from 'ionicons/icons';-import { get } from 'lodash';-import { Subject } from 'rxjs';+import { get, isNil } from 'lodash';import { GfValueComponent } from '../value';@@ -63,50 +62,44 @@ import { GfValueComponent } from '../value';styleUrls: ['./account-balances.component.scss'],templateUrl: './account-balances.component.html'})-export class GfAccountBalancesComponent- implements OnChanges, OnDestroy, OnInit-{- @Input() accountBalances: AccountBalancesResponse['balances'];- @Input() accountCurrency: string;- @Input() accountId: string;- @Input() locale = getLocale();- @Input() showActions = true;-+export class GfAccountBalancesComponent implements OnChanges, OnInit {@Output() accountBalanceCreated = new EventEmitter<CreateAccountBalanceDto>();@Output() accountBalanceDeleted = new EventEmitter<string>();- @ViewChild(MatSort) sort: MatSort;+ public readonly accountBalances =+ input.required<AccountBalancesResponse['balances']>();+ public readonly accountCurrency = input.required<string>();+ public readonly accountId = input.required<string>();+ public readonly displayedColumns: string[] = ['date', 'value', 'actions'];+ public readonly locale = input(getLocale());+ public readonly showActions = input(true);+ public readonly sort = viewChild(MatSort);public accountBalanceForm = new FormGroup({- balance: new FormControl(0, Validators.required),- date: new FormControl(new Date(), Validators.required)+ balance: new FormControl(0, (control) => Validators.required(control)),+ date: new FormControl(new Date(), (control) => Validators.required(control))});public dataSource = new MatTableDataSource<AccountBalancesResponse['balances'][0]>();- public displayedColumns: string[] = ['date', 'value', 'actions'];- public Validators = Validators;-- private unsubscribeSubject = new Subject<void>();+ private dateAdapter = inject<DateAdapter<Date, string>>(DateAdapter);+ private notificationService = inject(NotificationService);- public constructor(- private dateAdapter: DateAdapter<any>,- private notificationService: NotificationService- ) {+ public constructor() {addIcons({ calendarClearOutline, ellipsisHorizontal, trashOutline });}public ngOnInit() {- this.dateAdapter.setLocale(this.locale);+ this.dateAdapter.setLocale(this.locale());}public ngOnChanges() {- if (this.accountBalances) {- this.dataSource = new MatTableDataSource(this.accountBalances);+ if (this.accountBalances()) {+ this.dataSource = new MatTableDataSource(this.accountBalances());- this.dataSource.sort = this.sort;+ this.dataSource.sort = this.sort();this.dataSource.sortingDataAccessor = get;}}@@ -122,10 +115,16 @@ export class GfAccountBalancesComponent}public async onSubmitAccountBalance() {+ const { balance, date } = this.accountBalanceForm.value;++ if (isNil(balance) || !date) {+ return;+ }+const accountBalance: CreateAccountBalanceDto = {- accountId: this.accountId,- balance: this.accountBalanceForm.get('balance').value,- date: format(this.accountBalanceForm.get('date').value, DATE_FORMAT)+ balance,+ accountId: this.accountId(),+ date: format(date, DATE_FORMAT)};try {@@ -141,9 +140,4 @@ export class GfAccountBalancesComponentthis.accountBalanceCreated.emit(accountBalance);}-- public ngOnDestroy() {- this.unsubscribeSubject.next();- this.unsubscribeSubject.complete();- }}diff --git a/libs/ui/src/lib/accounts-table/accounts-table.component.ts b/libs/ui/src/lib/accounts-table/accounts-table.component.tsindex d486b775f7..99e68c6799 100644--- a/libs/ui/src/lib/accounts-table/accounts-table.component.ts+++ b/libs/ui/src/lib/accounts-table/accounts-table.component.ts@@ -53,7 +53,7 @@ import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';templateUrl: './accounts-table.component.html'})export class GfAccountsTableComponent {- public readonly accounts = input.required<Account[] | undefined>();+ public readonly accounts = input.required<Account[]>();public readonly activitiesCount = input<number>();public readonly baseCurrency = input<string>();public readonly hasPermissionToOpenDetails = input(true);