Skip to content

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

Task/refactor rounding logic in treemap chart component (#7200)

Thomas Kaulca6716e7bafd
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdc3c99fc5..f8f19142d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
+- Refactored the rounding logic in the treemap chart component
- Restricted the modification of activity tags in the impersonation mode
- Hardened the endpoint of the public access for portfolio sharing by restricting it to public accesses
- Improved the parsing of integer query parameters (`skip` and `take`) in the `GET api/v1/admin/user` endpoint
diff --git a/libs/ui/src/lib/treemap-chart/treemap-chart.component.ts b/libs/ui/src/lib/treemap-chart/treemap-chart.component.ts
index 36ea0023ac..2a04ba6ba7 100644
--- a/libs/ui/src/lib/treemap-chart/treemap-chart.component.ts
+++ b/libs/ui/src/lib/treemap-chart/treemap-chart.component.ts
@@ -30,7 +30,7 @@ import { Chart, Tooltip } from 'chart.js';
import { TreemapController, TreemapElement } from 'chartjs-chart-treemap';
import { isUUID } from 'class-validator';
import { differenceInDays, max } from 'date-fns';
-import { orderBy } from 'lodash';
+import { orderBy, round } from 'lodash';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
import OpenColor from 'open-color';
@@ -221,9 +221,10 @@ export class GfTreemapChartComponent
)
}).toNumber();
- // Round to 2 decimal places
- annualizedNetPerformancePercent =
- Math.round(annualizedNetPerformancePercent * 100) / 100;
+ annualizedNetPerformancePercent = round(
+ annualizedNetPerformancePercent,
+ 2
+ );
const { backgroundColor } = this.getColor({
annualizedNetPerformancePercent,
@@ -252,9 +253,10 @@ export class GfTreemapChartComponent
)
}).toNumber();
- // Round to 2 decimal places
- annualizedNetPerformancePercent =
- Math.round(annualizedNetPerformancePercent * 100) / 100;
+ annualizedNetPerformancePercent = round(
+ annualizedNetPerformancePercent,
+ 2
+ );
const { fontColor } = this.getColor({
annualizedNetPerformancePercent,
@@ -267,11 +269,10 @@ export class GfTreemapChartComponent
display: true,
font: [{ size: 16 }, { lineHeight: 1.5, size: 14 }],
formatter: ({ raw }: GfTreemapScriptableContext) => {
- // Round to 4 decimal places
- let netPerformancePercentWithCurrencyEffect =
- Math.round(
- raw._data.netPerformancePercentWithCurrencyEffect * 10000
- ) / 10000;
+ let netPerformancePercentWithCurrencyEffect = round(
+ raw._data.netPerformancePercentWithCurrencyEffect,
+ 4
+ );
if (Math.abs(netPerformancePercentWithCurrencyEffect) === 0) {
netPerformancePercentWithCurrencyEffect = Math.abs(