diff --git a/CHANGELOG.md b/CHANGELOG.md index 98835da8..f00b0376 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 chart tooltip of the benchmark comparator by adding the benchmark name - Upgraded `angular` from version `17.1.3` to `17.2.4` - Upgraded `Nx` from version `18.0.4` to `18.1.2` diff --git a/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.html b/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.html index c34fcf27..2f74037f 100644 --- a/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.html +++ b/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.html @@ -20,7 +20,7 @@ diff --git a/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.ts b/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.ts index 8a9c8f8d..fdf20023 100644 --- a/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.ts +++ b/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.ts @@ -46,8 +46,8 @@ import annotationPlugin from 'chartjs-plugin-annotation'; styleUrls: ['./benchmark-comparator.component.scss'] }) export class BenchmarkComparatorComponent implements OnChanges, OnDestroy { + @Input() benchmark: Partial; @Input() benchmarkDataItems: LineChartItem[] = []; - @Input() benchmark: string; @Input() benchmarks: Partial[]; @Input() colorScheme: ColorScheme; @Input() daysInMarket: number; @@ -116,7 +116,7 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy { data: this.benchmarkDataItems.map(({ date, value }) => { return { x: parseDate(date).getTime(), y: value }; }), - label: $localize`Benchmark` + label: this.benchmark?.name ?? $localize`Benchmark` } ] }; diff --git a/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts b/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts index 96c7c01d..c0569b9f 100644 --- a/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts +++ b/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts @@ -32,6 +32,7 @@ import { takeUntil } from 'rxjs/operators'; templateUrl: './analysis-page.html' }) export class AnalysisPageComponent implements OnDestroy, OnInit { + public benchmark: Partial; public benchmarkDataItems: HistoricalDataItem[] = []; public benchmarks: Partial[]; public bottom3: Position[]; @@ -122,6 +123,10 @@ export class AnalysisPageComponent implements OnDestroy, OnInit { if (state?.user) { this.user = state.user; + this.benchmark = this.benchmarks.find(({ id }) => { + return id === this.user.settings?.benchmark; + }); + this.update(); } }); diff --git a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html index 692adeb7..5f6acdbe 100644 --- a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html +++ b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html @@ -4,7 +4,7 @@