From afaf783afb06169566646235b9b1130475a3bd62 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sun, 13 Jul 2025 19:16:28 +0200 Subject: [PATCH] Feature/improve labels of line chart components (#5162) * Improve labels * Update changelog --- CHANGELOG.md | 2 ++ .../asset-profile-dialog/asset-profile-dialog.component.ts | 2 ++ .../asset-profile-dialog/asset-profile-dialog.html | 4 +++- .../holding-detail-dialog.component.ts | 3 +++ .../holding-detail-dialog/holding-detail-dialog.html | 6 ++++-- apps/client/src/app/components/home-market/home-market.html | 2 +- .../app/components/home-overview/home-overview.component.ts | 1 + .../src/app/components/home-overview/home-overview.html | 2 +- apps/client/src/app/components/markets/markets.html | 2 +- .../benchmark-detail-dialog/benchmark-detail-dialog.html | 2 +- libs/ui/src/lib/line-chart/line-chart.component.stories.ts | 4 +++- libs/ui/src/lib/line-chart/line-chart.component.ts | 4 ++-- 12 files changed, 24 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1ce65a87..c94387049 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Improved the label for asset profiles with `MANUAL` data source in the chart of the asset profile details dialog in the admin control panel +- Improved the label for asset profiles with `MANUAL` data source in the chart of the holding detail dialog - Improved the language localization for Chinese (`zh`) - Improved the language localization for Dutch (`nl`) - Improved the language localization for French (`fr`) diff --git a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts index b9982cc81..400078d79 100644 --- a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts +++ b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts @@ -49,6 +49,7 @@ import { Prisma, SymbolProfile } from '@prisma/client'; +import { isUUID } from 'class-validator'; import { format } from 'date-fns'; import { StatusCodes } from 'http-status-codes'; import { addIcons } from 'ionicons'; @@ -144,6 +145,7 @@ export class AssetProfileDialog implements OnDestroy, OnInit { public isBenchmark = false; public isDataGatheringEnabled: boolean; public isEditAssetProfileIdentifierMode = false; + public isUUID = isUUID; public marketDataItems: MarketData[] = []; public modeValues = [ diff --git a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html index 53e87cf45..993cf9b12 100644 --- a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html +++ b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html @@ -72,10 +72,12 @@ [colorScheme]="user?.settings?.colorScheme" [historicalDataItems]="historicalDataItems" [isAnimated]="true" + [label]=" + isUUID(data.symbol) ? (assetProfile?.name ?? data.symbol) : data.symbol + " [locale]="data.locale" [showXAxis]="true" [showYAxis]="true" - [symbol]="data.symbol" />
diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts index 105ddfe13..69a2b734c 100644 --- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts +++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts @@ -49,6 +49,7 @@ import { MatTabsModule } from '@angular/material/tabs'; import { Router, RouterModule } from '@angular/router'; import { IonIcon } from '@ionic/angular/standalone'; import { Account, MarketData, Tag } from '@prisma/client'; +import { isUUID } from 'class-validator'; import { format, isSameMonth, isToday, parseISO } from 'date-fns'; import { addIcons } from 'ionicons'; import { @@ -101,6 +102,7 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit { public assetSubClass: string; public averagePrice: number; public benchmarkDataItems: LineChartItem[]; + public benchmarkLabel = $localize`Average Unit Price`; public countries: { [code: string]: { name: string; value: number }; }; @@ -116,6 +118,7 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit { public historicalDataItems: LineChartItem[]; public investmentInBaseCurrencyWithCurrencyEffect: number; public investmentInBaseCurrencyWithCurrencyEffectPrecision = 2; + public isUUID = isUUID; public marketDataItems: MarketData[] = []; public marketPrice: number; public marketPriceMax: number; 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 4625de712..6cd2fa42f 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 @@ -21,18 +21,20 @@
diff --git a/libs/ui/src/lib/line-chart/line-chart.component.stories.ts b/libs/ui/src/lib/line-chart/line-chart.component.stories.ts index 9770074d2..ba8ee1298 100644 --- a/libs/ui/src/lib/line-chart/line-chart.component.stories.ts +++ b/libs/ui/src/lib/line-chart/line-chart.component.stories.ts @@ -229,6 +229,8 @@ export const Simple: Story = { value: 86666.03082624623 } ], - isAnimated: true + isAnimated: true, + label: 'Net Worth', + unit: 'USD' } }; diff --git a/libs/ui/src/lib/line-chart/line-chart.component.ts b/libs/ui/src/lib/line-chart/line-chart.component.ts index 09f5a98eb..e7f8b132e 100644 --- a/libs/ui/src/lib/line-chart/line-chart.component.ts +++ b/libs/ui/src/lib/line-chart/line-chart.component.ts @@ -54,13 +54,13 @@ export class GfLineChartComponent @Input() currency: string; @Input() historicalDataItems: LineChartItem[]; @Input() isAnimated = false; + @Input() label: string; @Input() locale = getLocale(); @Input() showGradient = false; @Input() showLegend = false; @Input() showLoader = true; @Input() showXAxis = false; @Input() showYAxis = false; - @Input() symbol: string; @Input() unit: string; @Input() yMax: number; @Input() yMaxLabel: string; @@ -162,7 +162,7 @@ export class GfLineChartComponent borderWidth: 2, data: marketPrices, fill: true, - label: this.symbol, + label: this.label, pointRadius: 0 } ]