Skip to content

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

Feature/improve usability of holdings table (#3017)

Thomas Kaul448cea0b6999
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fe813c570..65a386edf0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
+- Improved the usability of the holdings table
- Improved the language localization for German (`de`)
- Upgraded `ng-extract-i18n-merge` from version `2.9.1` to `2.10.0`
diff --git a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
index 9cae03e2c6..23875bfded 100644
--- a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
+++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
@@ -77,6 +77,7 @@
<gf-holdings-table
[baseCurrency]="user?.settings?.baseCurrency"
[deviceType]="data.deviceType"
+ [hasPermissionToOpenDetails]="false"
[holdings]="holdings"
[locale]="user?.settings?.locale"
/>
diff --git a/apps/client/src/app/pages/public/public-page.html b/apps/client/src/app/pages/public/public-page.html
index 71cb2ec2d9..bac3189bea 100644
--- a/apps/client/src/app/pages/public/public-page.html
+++ b/apps/client/src/app/pages/public/public-page.html
@@ -132,6 +132,7 @@
<div class="col-lg">
<gf-holdings-table
[deviceType]="deviceType"
+ [hasPermissionToOpenDetails]="false"
[hasPermissionToShowValues]="false"
[holdings]="holdings"
[pageSize]="7"
diff --git a/libs/ui/src/lib/holdings-table/holdings-table.component.html b/libs/ui/src/lib/holdings-table/holdings-table.component.html
index f60b11f021..164c5e74bc 100644
--- a/libs/ui/src/lib/holdings-table/holdings-table.component.html
+++ b/libs/ui/src/lib/holdings-table/holdings-table.component.html
@@ -137,12 +137,11 @@
mat-row
[ngClass]="{
'cursor-pointer':
- hasPermissionToShowValues &&
+ hasPermissionToOpenDetails &&
!ignoreAssetSubClasses.includes(row.assetSubClass)
}"
(click)="
- hasPermissionToShowValues &&
- !ignoreAssetSubClasses.includes(row.assetSubClass) &&
+ !ignoreAssetSubClasses.includes(row.assetSubClass) &&
onOpenPositionDialog({
dataSource: row.dataSource,
symbol: row.symbol
diff --git a/libs/ui/src/lib/holdings-table/holdings-table.component.ts b/libs/ui/src/lib/holdings-table/holdings-table.component.ts
index 94516b7150..7c965f7d7c 100644
--- a/libs/ui/src/lib/holdings-table/holdings-table.component.ts
+++ b/libs/ui/src/lib/holdings-table/holdings-table.component.ts
@@ -26,6 +26,7 @@ export class HoldingsTableComponent implements OnChanges, OnDestroy, OnInit {
@Input() baseCurrency: string;
@Input() deviceType: string;
@Input() hasPermissionToCreateActivity: boolean;
+ @Input() hasPermissionToOpenDetails = true;
@Input() hasPermissionToShowValues = true;
@Input() holdings: PortfolioPosition[];
@Input() locale: string;
@@ -68,10 +69,12 @@ export class HoldingsTableComponent implements OnChanges, OnDestroy, OnInit {
}
}
- public onOpenPositionDialog({ dataSource, symbol }: UniqueAsset): void {
- this.router.navigate([], {
- queryParams: { dataSource, symbol, positionDetailDialog: true }
- });
+ public onOpenPositionDialog({ dataSource, symbol }: UniqueAsset) {
+ if (this.hasPermissionToOpenDetails) {
+ this.router.navigate([], {
+ queryParams: { dataSource, symbol, positionDetailDialog: true }
+ });
+ }
}
public onShowAllPositions() {