From 55d34acd31b04750ea0dac5a4a6f10b6462cabfd Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 12 Oct 2023 15:16:59 +0200 Subject: [PATCH] feat: normalize size data --- src/lib/helpers/numbers.ts | 4 ++++ src/lib/helpers/sizeConvertion.ts | 2 +- .../project-[project]/settings/usage/[[period]]/+page.svelte | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/lib/helpers/numbers.ts b/src/lib/helpers/numbers.ts index 8e0b53097..e36a41c10 100644 --- a/src/lib/helpers/numbers.ts +++ b/src/lib/helpers/numbers.ts @@ -10,3 +10,7 @@ export function abbreviateNumber(num: number, decimals: number = 1): string { return num.toString(); } } + +export function toDecimals(num: number, decimals: number = 1): number { + return parseFloat(num.toFixed(decimals)); +} diff --git a/src/lib/helpers/sizeConvertion.ts b/src/lib/helpers/sizeConvertion.ts index b97279591..d268c5fa2 100644 --- a/src/lib/helpers/sizeConvertion.ts +++ b/src/lib/helpers/sizeConvertion.ts @@ -35,6 +35,6 @@ export function humanFileSize(bytes: number): { return { value: value[0], - unit: value[1] as Size + unit: value[1].toUpperCase() as Size }; } diff --git a/src/routes/console/project-[project]/settings/usage/[[period]]/+page.svelte b/src/routes/console/project-[project]/settings/usage/[[period]]/+page.svelte index 4677b9008..22b6f565d 100644 --- a/src/routes/console/project-[project]/settings/usage/[[period]]/+page.svelte +++ b/src/routes/console/project-[project]/settings/usage/[[period]]/+page.svelte @@ -5,6 +5,7 @@ import { BarChart } from '$lib/charts'; import { page } from '$app/stores'; import { bytesToSize, humanFileSize } from '$lib/helpers/sizeConvertion'; + import { toDecimals } from '$lib/helpers/numbers.js'; export let data; @@ -26,7 +27,7 @@ return { data: files.map((e) => ({ date: new Date(e.date).toLocaleDateString(), - value: bytesToSize(e.value, unit) + value: toDecimals(bytesToSize(e.value, unit), 2) })), unit };