From 67960922d0046f04f06da32f1652b3489aa8cb7c Mon Sep 17 00:00:00 2001 From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com> Date: Wed, 8 Oct 2025 18:33:18 +0530 Subject: [PATCH] fix: display 0 instead of negative usage values --- src/lib/layout/usage.svelte | 2 +- src/lib/layout/usageMultiple.svelte | 5 ++- .../usage/[[invoice]]/+page.svelte | 23 +++++++---- .../overview/+layout.svelte | 10 ++--- .../settings/usage/[[invoice]]/+page.svelte | 39 ++++++++++++------- .../deployments/deploymentMetrics.svelte | 5 ++- 6 files changed, 55 insertions(+), 29 deletions(-) diff --git a/src/lib/layout/usage.svelte b/src/lib/layout/usage.svelte index 9f5889b04..b084fb626 100644 --- a/src/lib/layout/usage.svelte +++ b/src/lib/layout/usage.svelte @@ -119,7 +119,7 @@ {#if count} - {formatNumberWithCommas(total)} + {formatNumberWithCommas(Math.max(0, total))} {countMetadata.title}
diff --git a/src/lib/layout/usageMultiple.svelte b/src/lib/layout/usageMultiple.svelte index 421b0892b..bc8bc8734 100644 --- a/src/lib/layout/usageMultiple.svelte +++ b/src/lib/layout/usageMultiple.svelte @@ -41,7 +41,10 @@ {#if count} - {@const totalCount = total.reduce((a, b) => a + b, 0)} + {@const totalCount = Math.max( + 0, + total.reduce((a, b) => a + b, 0) + )} {formatNumberWithCommas(totalCount)} diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte index a9422df60..b947a1102 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte @@ -445,24 +445,31 @@ {#if data.organizationUsage.storageTotal} {@const totalGbHours = mbSecondsToGBHours( - data.organizationUsage.executionsMBSecondsTotal + - data.organizationUsage.buildsMBSecondsTotal + Math.max( + 0, + data.organizationUsage.executionsMBSecondsTotal + + data.organizationUsage.buildsMBSecondsTotal + ) )} {@const progressBarStorageDate = [ { - size: mbSecondsToGBHours(data.organizationUsage.executionsMBSecondsTotal), + size: mbSecondsToGBHours( + Math.max(0, data.organizationUsage.executionsMBSecondsTotal) + ), color: '#85DBD8', tooltip: { title: 'Executions', - label: `${(Math.round(mbSecondsToGBHours(data.organizationUsage.executionsMBSecondsTotal) * 100) / 100).toLocaleString('en-US')} GB hours` + label: `${(Math.round(mbSecondsToGBHours(Math.max(0, data.organizationUsage.executionsMBSecondsTotal)) * 100) / 100).toLocaleString('en-US')} GB hours` } }, { - size: mbSecondsToGBHours(data.organizationUsage.buildsMBSecondsTotal), + size: mbSecondsToGBHours( + Math.max(0, data.organizationUsage.buildsMBSecondsTotal) + ), color: '#FE9567', tooltip: { title: 'Deployments', - label: `${(Math.round(mbSecondsToGBHours(data.organizationUsage.buildsMBSecondsTotal) * 100) / 100).toLocaleString('en-US')} GB hours` + label: `${(Math.round(mbSecondsToGBHours(Math.max(0, data.organizationUsage.buildsMBSecondsTotal)) * 100) / 100).toLocaleString('en-US')} GB hours` } } ]} @@ -505,7 +512,9 @@ - {formatNumberWithCommas(data.organizationUsage.authPhoneTotal)} + {formatNumberWithCommas( + Math.max(0, data.organizationUsage.authPhoneTotal) + )} OTPs diff --git a/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte b/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte index 44027867a..efeb8da3e 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte @@ -4,7 +4,7 @@ export function totalMetrics(set: Array): number { if (!set) return 0; - return total((set as Metric[]).map((c) => c.value)); + return Math.max(0, total((set as Metric[]).map((c) => c.value))); } @@ -100,7 +100,7 @@ {#if $usage} - {@const storage = humanFileSize($usage.filesStorageTotal ?? 0)} + {@const storage = humanFileSize(Math.max(0, $usage.filesStorageTotal ?? 0))} - {formatNum($usage.documentsTotal ?? 0)} + {formatNum(Math.max(0, $usage.documentsTotal ?? 0))} Rows
@@ -177,7 +177,7 @@
- {formatNum($usage.usersTotal ?? 0)} + {formatNum(Math.max(0, $usage.usersTotal ?? 0))} Users
@@ -199,7 +199,7 @@
- {formatNum($usage.executionsTotal ?? 0)} + {formatNum(Math.max(0, $usage.executionsTotal ?? 0))} Executions
diff --git a/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte index 31fc89017..d0cf04644 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte @@ -24,10 +24,12 @@ $: usersTotal = data.usage.usersTotal; $: executions = data.usage.executions; $: executionsTotal = data.usage.executionsTotal; - $: storage = + $: storage = Math.max( + 0, data.usage.filesStorageTotal + - data.usage.deploymentsStorageTotal + - data.usage.buildsStorageTotal; + data.usage.deploymentsStorageTotal + + data.usage.buildsStorageTotal + ); $: imageTransformations = data.usage.imageTransformations; $: imageTransformationsTotal = data.usage.imageTransformationsTotal; $: dbReads = data.usage.databasesReads; @@ -36,11 +38,17 @@ $: legendData = [ { name: 'Reads', - value: data.usage.databasesReads.reduce((sum, item) => sum + item.value, 0) + value: Math.max( + 0, + data.usage.databasesReads.reduce((sum, item) => sum + item.value, 0) + ) }, { name: 'Writes', - value: data.usage.databasesWrites.reduce((sum, item) => sum + item.value, 0) + value: Math.max( + 0, + data.usage.databasesWrites.reduce((sum, item) => sum + item.value, 0) + ) } ]; @@ -132,7 +140,7 @@ Total user in your project. {#if users} - {@const current = formatNum(usersTotal)} + {@const current = formatNum(Math.max(0, usersTotal))} {current} @@ -208,7 +216,7 @@ Total unique image transformations in your project. {#if imageTransformations} - {@const current = formatNum(imageTransformationsTotal)} + {@const current = formatNum(Math.max(0, imageTransformationsTotal))}

@@ -246,7 +254,7 @@ Calculated for all functions that are executed in this project. {#if executions} - {@const current = formatNum(executionsTotal)} + {@const current = formatNum(Math.max(0, executionsTotal))} {current} @@ -356,23 +364,26 @@ {#if data.usage.executionsMbSecondsTotal} {@const totalGbHours = mbSecondsToGBHours( - data.usage.executionsMbSecondsTotal + data.usage.buildsMbSecondsTotal + Math.max( + 0, + data.usage.executionsMbSecondsTotal + data.usage.buildsMbSecondsTotal + ) )} {@const progressBarStorageDate = [ { - size: mbSecondsToGBHours(data.usage.executionsMbSecondsTotal), + size: mbSecondsToGBHours(Math.max(0, data.usage.executionsMbSecondsTotal)), color: '#85DBD8', tooltip: { title: 'Executions', - label: `${(Math.round(mbSecondsToGBHours(data.usage.executionsMbSecondsTotal) * 100) / 100).toLocaleString('en-US')} GB hours` + label: `${(Math.round(mbSecondsToGBHours(Math.max(0, data.usage.executionsMbSecondsTotal)) * 100) / 100).toLocaleString('en-US')} GB hours` } }, { - size: mbSecondsToGBHours(data.usage.buildsMbSecondsTotal), + size: mbSecondsToGBHours(Math.max(0, data.usage.buildsMbSecondsTotal)), color: '#FE9567', tooltip: { title: 'Deployments', - label: `${(Math.round(mbSecondsToGBHours(data.usage.buildsMbSecondsTotal) * 100) / 100).toLocaleString('en-US')} GB hours` + label: `${(Math.round(mbSecondsToGBHours(Math.max(0, data.usage.buildsMbSecondsTotal)) * 100) / 100).toLocaleString('en-US')} GB hours` } } ]} @@ -405,7 +416,7 @@

- {formatNumberWithCommas(data.usage.authPhoneTotal)} + {formatNumberWithCommas(Math.max(0, data.usage.authPhoneTotal))} OTPs diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte index 6a3fbb1e0..cdb59c7c5 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte @@ -84,7 +84,10 @@ metric.value = time !== '0s' ? time : '-'; } else { - metric.value = usage[metric.id] ?? '-'; + metric.value = + usage[metric.id] !== undefined + ? Math.max(0, usage[metric.id]).toString() + : '-'; } return metric; });