Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Task/improve type safety in accounts table component (#6307)

Kenrick Tandrian8a50b8c922ad
diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
index 27df91a176..86f4676f3b 100644
--- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
+++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
@@ -377,7 +377,6 @@
<gf-accounts-table
[accounts]="accounts"
[baseCurrency]="user?.settings?.baseCurrency"
- [deviceType]="data.deviceType"
[hasPermissionToOpenDetails]="false"
[locale]="user?.settings?.locale"
[showActivitiesCount]="false"
diff --git a/apps/client/src/app/pages/accounts/accounts-page.html b/apps/client/src/app/pages/accounts/accounts-page.html
index 0c6b7b8f36..3d9d7ee5c6 100644
--- a/apps/client/src/app/pages/accounts/accounts-page.html
+++ b/apps/client/src/app/pages/accounts/accounts-page.html
@@ -6,7 +6,6 @@
[accounts]="accounts"
[activitiesCount]="activitiesCount"
[baseCurrency]="user?.settings?.baseCurrency"
- [deviceType]="deviceType"
[locale]="user?.settings?.locale"
[showActions]="
!hasImpersonationId &&
diff --git a/libs/ui/src/lib/accounts-table/accounts-table.component.html b/libs/ui/src/lib/accounts-table/accounts-table.component.html
index 63a7a89b6a..15f5bb21ff 100644
--- a/libs/ui/src/lib/accounts-table/accounts-table.component.html
+++ b/libs/ui/src/lib/accounts-table/accounts-table.component.html
@@ -3,7 +3,7 @@
<button
class="align-items-center d-flex"
mat-stroked-button
- [disabled]="dataSource()?.data.length < 2"
+ [disabled]="dataSource?.data.length < 2"
(click)="onTransferBalance()"
>
<ion-icon class="mr-2" name="arrow-redo-outline" />
@@ -19,7 +19,7 @@
matSort
matSortActive="name"
matSortDirection="asc"
- [dataSource]="dataSource()"
+ [dataSource]="dataSource"
>
<ng-container matColumnDef="status">
<th
@@ -79,7 +79,7 @@
{{ element.currency }}
</td>
<td *matFooterCellDef class="d-none d-lg-table-cell px-1" mat-footer-cell>
- {{ baseCurrency }}
+ {{ baseCurrency() }}
</td>
</ng-container>
@@ -129,7 +129,7 @@
{{ element.activitiesCount }}
</td>
<td *matFooterCellDef class="px-1 text-right" mat-footer-cell>
- {{ activitiesCount }}
+ {{ activitiesCount() }}
</td>
</ng-container>
@@ -150,7 +150,7 @@
<gf-value
class="d-inline-block justify-content-end"
[isCurrency]="true"
- [locale]="locale"
+ [locale]="locale()"
[value]="element.balance"
/>
</td>
@@ -162,8 +162,8 @@
<gf-value
class="d-inline-block justify-content-end"
[isCurrency]="true"
- [locale]="locale"
- [value]="totalBalanceInBaseCurrency"
+ [locale]="locale()"
+ [value]="totalBalanceInBaseCurrency()"
/>
</td>
</ng-container>
@@ -185,7 +185,7 @@
<gf-value
class="d-inline-block justify-content-end"
[isCurrency]="true"
- [locale]="locale"
+ [locale]="locale()"
[value]="element.value"
/>
</td>
@@ -197,8 +197,8 @@
<gf-value
class="d-inline-block justify-content-end"
[isCurrency]="true"
- [locale]="locale"
- [value]="totalValueInBaseCurrency"
+ [locale]="locale()"
+ [value]="totalValueInBaseCurrency()"
/>
</td>
</ng-container>
@@ -220,7 +220,7 @@
<gf-value
class="d-inline-block justify-content-end"
[isCurrency]="true"
- [locale]="locale"
+ [locale]="locale()"
[value]="element.valueInBaseCurrency"
/>
</td>
@@ -232,8 +232,8 @@
<gf-value
class="d-inline-block justify-content-end"
[isCurrency]="true"
- [locale]="locale"
- [value]="totalValueInBaseCurrency"
+ [locale]="locale()"
+ [value]="totalValueInBaseCurrency()"
/>
</td>
</ng-container>
@@ -255,7 +255,7 @@
<gf-value
class="d-inline-block justify-content-end"
[isPercent]="true"
- [locale]="locale"
+ [locale]="locale()"
[precision]="2"
[value]="element.allocationInPercentage"
/>
@@ -341,14 +341,14 @@
*matRowDef="let row; columns: displayedColumns()"
mat-row
[ngClass]="{
- 'cursor-pointer': hasPermissionToOpenDetails
+ 'cursor-pointer': hasPermissionToOpenDetails()
}"
(click)="onOpenAccountDetailDialog(row.id)"
></tr>
<tr
*matFooterRowDef="displayedColumns()"
mat-footer-row
- [ngClass]="{ 'd-none': isLoading() || !showFooter }"
+ [ngClass]="{ 'd-none': isLoading() || !showFooter() }"
></tr>
</table>
</div>
diff --git a/libs/ui/src/lib/accounts-table/accounts-table.component.stories.ts b/libs/ui/src/lib/accounts-table/accounts-table.component.stories.ts
index 594db4c6ad..62a01164f9 100644
--- a/libs/ui/src/lib/accounts-table/accounts-table.component.stories.ts
+++ b/libs/ui/src/lib/accounts-table/accounts-table.component.stories.ts
@@ -111,7 +111,6 @@ export const Loading: Story = {
args: {
accounts: undefined,
baseCurrency: 'USD',
- deviceType: 'desktop',
hasPermissionToOpenDetails: false,
locale: 'en-US',
showActions: false,
@@ -129,7 +128,6 @@ export const Default: Story = {
accounts,
activitiesCount: 12,
baseCurrency: 'USD',
- deviceType: 'desktop',
hasPermissionToOpenDetails: false,
locale: 'en-US',
showActions: false,
@@ -149,7 +147,6 @@ export const WithoutFooter: Story = {
accounts,
activitiesCount: 12,
baseCurrency: 'USD',
- deviceType: 'desktop',
hasPermissionToOpenDetails: false,
locale: 'en-US',
showActions: false,
diff --git a/libs/ui/src/lib/accounts-table/accounts-table.component.ts b/libs/ui/src/lib/accounts-table/accounts-table.component.ts
index 834e33fb39..d486b775f7 100644
--- a/libs/ui/src/lib/accounts-table/accounts-table.component.ts
+++ b/libs/ui/src/lib/accounts-table/accounts-table.component.ts
@@ -8,13 +8,11 @@ import { CommonModule } from '@angular/common';
import {
ChangeDetectionStrategy,
Component,
- EventEmitter,
- Input,
- OnDestroy,
- Output,
computed,
+ effect,
inject,
input,
+ output,
viewChild
} from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
@@ -35,7 +33,6 @@ import {
walletOutline
} from 'ionicons/icons';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
-import { Subject } from 'rxjs';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
@@ -55,35 +52,29 @@ import { Subject } from 'rxjs';
styleUrls: ['./accounts-table.component.scss'],
templateUrl: './accounts-table.component.html'
})
-export class GfAccountsTableComponent implements OnDestroy {
- @Input() activitiesCount: number;
- @Input() baseCurrency: string;
- @Input() deviceType: string;
- @Input() hasPermissionToOpenDetails = true;
- @Input() locale = getLocale();
- @Input() showFooter = true;
- @Input() totalBalanceInBaseCurrency: number;
- @Input() totalValueInBaseCurrency: number;
-
- @Output() accountDeleted = new EventEmitter<string>();
- @Output() accountToUpdate = new EventEmitter<Account>();
- @Output() transferBalance = new EventEmitter<void>();
-
+export class GfAccountsTableComponent {
public readonly accounts = input.required<Account[] | undefined>();
+ public readonly activitiesCount = input<number>();
+ public readonly baseCurrency = input<string>();
+ public readonly hasPermissionToOpenDetails = input(true);
+ public readonly locale = input(getLocale());
public readonly showActions = input<boolean>();
public readonly showActivitiesCount = input(true);
public readonly showAllocationInPercentage = input<boolean>();
public readonly showBalance = input(true);
+ public readonly showFooter = input(true);
public readonly showValue = input(true);
public readonly showValueInBaseCurrency = input(false);
+ public readonly totalBalanceInBaseCurrency = input<number>();
+ public readonly totalValueInBaseCurrency = input<number>();
+
+ public readonly accountDeleted = output<string>();
+ public readonly accountToUpdate = output<Account>();
+ public readonly transferBalance = output<void>();
+
public readonly sort = viewChild.required(MatSort);
- protected readonly dataSource = computed(() => {
- const dataSource = new MatTableDataSource<Account>(this.accounts());
- dataSource.sortingDataAccessor = getLowercase;
- dataSource.sort = this.sort();
- return dataSource;
- });
+ protected readonly dataSource = new MatTableDataSource<Account>([]);
protected readonly displayedColumns = computed(() => {
const columns = ['status', 'account', 'platform'];
@@ -123,7 +114,6 @@ export class GfAccountsTableComponent implements OnDestroy {
private readonly notificationService = inject(NotificationService);
private readonly router = inject(Router);
- private readonly unsubscribeSubject = new Subject<void>();
public constructor() {
addIcons({
@@ -135,9 +125,21 @@ export class GfAccountsTableComponent implements OnDestroy {
trashOutline,
walletOutline
});
+
+ this.dataSource.sortingDataAccessor = getLowercase;
+
+ // Reactive data update
+ effect(() => {
+ this.dataSource.data = this.accounts();
+ });
+
+ // Reactive view connection
+ effect(() => {
+ this.dataSource.sort = this.sort();
+ });
}
- public onDeleteAccount(aId: string) {
+ protected onDeleteAccount(aId: string) {
this.notificationService.confirm({
confirmFn: () => {
this.accountDeleted.emit(aId);
@@ -147,30 +149,25 @@ export class GfAccountsTableComponent implements OnDestroy {
});
}
- public onOpenAccountDetailDialog(accountId: string) {
- if (this.hasPermissionToOpenDetails) {
+ protected onOpenAccountDetailDialog(accountId: string) {
+ if (this.hasPermissionToOpenDetails()) {
this.router.navigate([], {
queryParams: { accountId, accountDetailDialog: true }
});
}
}
- public onOpenComment(aComment: string) {
+ protected onOpenComment(aComment: string) {
this.notificationService.alert({
title: aComment
});
}
- public onTransferBalance() {
+ protected onTransferBalance() {
this.transferBalance.emit();
}
- public onUpdateAccount(aAccount: Account) {
+ protected onUpdateAccount(aAccount: Account) {
this.accountToUpdate.emit(aAccount);
}
-
- public ngOnDestroy() {
- this.unsubscribeSubject.next();
- this.unsubscribeSubject.complete();
- }
}