Merge pull request #237 from appwrite/fix-undefined-values-breaking-usage

Fix: undefined values breaking usage section
This commit is contained in:
Torsten Dittmann authored and GitHub committed 2023-01-27 13:16:25 +01:00
commit ea0c66dda0
2 files changed
+9 -6

No files matched your search

+1
View File
@@ -2,6 +2,7 @@
export type UsagePeriods = '24h' | '30d' | '90d';
export function last(set: Models.Metric[]): Models.Metric | null {
if (!set) return null;
return set.slice(-1)[0] ?? null;
}
@@ -5,11 +5,13 @@
// TODO: metric type is wrong
export function last(set: Array<unknown>): Models.Metric | null {
if (!set) return null;
return (set as Models.Metric[]).slice(-1)[0] ?? null;
}
// TODO: metric type is wrong
export function total(set: Array<unknown>): number {
if (!set) return 0;
return (set as Models.Metric[]).reduce((prev, curr) => prev + curr.value, 0);
}
@@ -65,7 +67,7 @@
<Onboard {projectId} />
{:else}
{#if $usage}
{@const storage = humanFileSize(last($usage.storage).value)}
{@const storage = humanFileSize(last($usage.storage)?.value ?? 0)}
<section class="common-section">
<div class="grid-dashboard-1s-2m-6l">
<div class="card is-2-columns-medium-screen is-3-columns-large-screen">
@@ -89,14 +91,14 @@
<div class="grid-item-1-end-start">
<div class="heading-level-4">
{format(last($usage.documents).value)}
{format(last($usage.documents)?.value ?? 0)}
</div>
<div>Documents</div>
</div>
<div class="grid-item-1-end-end">
<div class="text">
Databases: {format(last($usage.databases).value)}
Databases: {format(last($usage.databases)?.value ?? 0)}
</div>
</div>
</div>
@@ -124,7 +126,7 @@
<div class="grid-item-1-end-end">
<div class="text">
Buckets: {format(last($usage.buckets).value)}
Buckets: {format(last($usage.buckets)?.value ?? 0)}
</div>
</div>
</div>
@@ -144,7 +146,7 @@
<div class="grid-item-1-end-start">
<div class="heading-level-4">
{format(last($usage.users).value)}
{format(last($usage.users)?.value ?? 0)}
</div>
<div>Users</div>
</div>
@@ -165,7 +167,7 @@
<div class="grid-item-1-end-start">
<div class="heading-level-4">
{format(last($usage.executions).value)}
{format(last($usage.executions)?.value ?? 0)}
</div>
<div>Executions</div>
</div>