diff --git a/src/routes/console/project-[project]/authentication/usage/+page.svelte b/src/routes/console/project-[project]/authentication/usage/+page.svelte index 102819394..5e960f3e0 100644 --- a/src/routes/console/project-[project]/authentication/usage/+page.svelte +++ b/src/routes/console/project-[project]/authentication/usage/+page.svelte @@ -10,11 +10,11 @@ $: usersUsage.load(currentRange); // TODO: metric type is wrong - $: usersCount = $usersUsage.usersCount as unknown as Models.Metric[]; - $: usersCreate = $usersUsage.usersCreate as unknown as Models.Metric[]; - $: usersRead = $usersUsage.usersRead as unknown as Models.Metric[]; - $: usersUpdate = $usersUsage.usersUpdate as unknown as Models.Metric[]; - $: usersDelete = $usersUsage.usersDelete as unknown as Models.Metric[]; + $: usersCount = $usersUsage?.usersCount as unknown as Models.Metric[]; + $: usersCreate = $usersUsage?.usersCreate as unknown as Models.Metric[]; + $: usersRead = $usersUsage?.usersRead as unknown as Models.Metric[]; + $: usersUpdate = $usersUsage?.usersUpdate as unknown as Models.Metric[]; + $: usersDelete = $usersUsage?.usersDelete as unknown as Models.Metric[]; function last(set: Array): Models.Metric | null { return (set as Models.Metric[]).slice(-1)[0] ?? null; @@ -56,76 +56,78 @@ - - {#if usersCount} -
{last(usersCount).value}
-

Registered users

-
- [e.date, e.value])] - } - ]} /> - {/if} - - - - {#if usersCreate} -
{total(usersCreate)}
-

Users created

+ {#if $usersUsage} + + {#if usersCount} +
{last(usersCount).value}
+

Registered users

- [e.date, e.value])] + name: 'User', + data: [...usersCount.map((e) => [e.date, e.value])] } ]} /> {/if} - - {#if usersRead} -
{total(usersRead)}
-

Users read

-
- [e.date, e.value])] - } - ]} /> - {/if} - - - {#if usersUpdate} -
{total(usersUpdate)}
-

Users updated

-
- [e.date, e.value])] - } - ]} /> - {/if} - - - {#if usersDelete} -
{total(usersDelete)}
-

Users deleted

-
- [e.date, e.value])] - } - ]} /> - {/if} - - + + + {#if usersCreate} +
{total(usersCreate)}
+

Users created

+
+ [e.date, e.value])] + } + ]} /> + {/if} + + + {#if usersRead} +
{total(usersRead)}
+

Users read

+
+ [e.date, e.value])] + } + ]} /> + {/if} + + + {#if usersUpdate} +
{total(usersUpdate)}
+

Users updated

+
+ [e.date, e.value])] + } + ]} /> + {/if} + + + {#if usersDelete} +
{total(usersDelete)}
+

Users deleted

+
+ [e.date, e.value])] + } + ]} /> + {/if} + + + {/if} diff --git a/src/routes/console/project-[project]/storage/bucket/[bucket]/usage/+page.svelte b/src/routes/console/project-[project]/storage/bucket/[bucket]/usage/+page.svelte index 37a204d4c..c1c8f26ee 100644 --- a/src/routes/console/project-[project]/storage/bucket/[bucket]/usage/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket/[bucket]/usage/+page.svelte @@ -13,11 +13,11 @@ $: bucketUsage.load(bucketId, currentRange); // TODO: metric type is wrong - $: filesCount = $bucketUsage.filesCount as unknown as Models.Metric[]; - $: filesCreate = $bucketUsage.filesCreate as unknown as Models.Metric[]; - $: filesRead = $bucketUsage.filesRead as unknown as Models.Metric[]; - $: filesUpdate = $bucketUsage.filesUpdate as unknown as Models.Metric[]; - $: filesDelete = $bucketUsage.filesDelete as unknown as Models.Metric[]; + $: filesCount = $bucketUsage?.filesCount as unknown as Models.Metric[]; + $: filesCreate = $bucketUsage?.filesCreate as unknown as Models.Metric[]; + $: filesRead = $bucketUsage?.filesRead as unknown as Models.Metric[]; + $: filesUpdate = $bucketUsage?.filesUpdate as unknown as Models.Metric[]; + $: filesDelete = $bucketUsage?.filesDelete as unknown as Models.Metric[]; function last(set: Array): Models.Metric | null { return (set as Models.Metric[]).slice(-1)[0] ?? null; @@ -59,76 +59,78 @@
- - {#if filesCount} -
{last(filesCount).value}
-

Total Files

-
- [e.date, e.value])] - } - ]} /> - {/if} - - - - {#if filesCreate} -
{total(filesCreate)}
-

Files created

+ {#if $bucketUsage} + + {#if filesCount} +
{last(filesCount).value}
+

Total Files

- [e.date, e.value])] + name: 'User', + data: [...filesCount.map((e) => [e.date, e.value])] } ]} /> {/if} - - {#if filesRead} -
{total(filesRead)}
-

Files read

-
- [e.date, e.value])] - } - ]} /> - {/if} - - - {#if filesUpdate} -
{total(filesUpdate)}
-

Files updated

-
- [e.date, e.value])] - } - ]} /> - {/if} - - - {#if filesDelete} -
{total(filesDelete)}
-

Files deleted

-
- [e.date, e.value])] - } - ]} /> - {/if} - - + + + {#if filesCreate} +
{total(filesCreate)}
+

Files created

+
+ [e.date, e.value])] + } + ]} /> + {/if} + + + {#if filesRead} +
{total(filesRead)}
+

Files read

+
+ [e.date, e.value])] + } + ]} /> + {/if} + + + {#if filesUpdate} +
{total(filesUpdate)}
+

Files updated

+
+ [e.date, e.value])] + } + ]} /> + {/if} + + + {#if filesDelete} +
{total(filesDelete)}
+

Files deleted

+
+ [e.date, e.value])] + } + ]} /> + {/if} + + + {/if} diff --git a/src/routes/console/project-[project]/storage/usage/+page.svelte b/src/routes/console/project-[project]/storage/usage/+page.svelte index 68e22bcc3..ffa51a930 100644 --- a/src/routes/console/project-[project]/storage/usage/+page.svelte +++ b/src/routes/console/project-[project]/storage/usage/+page.svelte @@ -10,11 +10,11 @@ $: storageUsage.load(currentRange); // TODO: metric type is wrong - $: bucketsCount = $storageUsage.bucketsCount as unknown as Models.Metric[]; - $: bucketsCreate = $storageUsage.bucketsCreate as unknown as Models.Metric[]; - $: bucketsRead = $storageUsage.bucketsRead as unknown as Models.Metric[]; - $: bucketsUpdate = $storageUsage.bucketsUpdate as unknown as Models.Metric[]; - $: bucketsDelete = $storageUsage.bucketsDelete as unknown as Models.Metric[]; + $: bucketsCount = $storageUsage?.bucketsCount as unknown as Models.Metric[]; + $: bucketsCreate = $storageUsage?.bucketsCreate as unknown as Models.Metric[]; + $: bucketsRead = $storageUsage?.bucketsRead as unknown as Models.Metric[]; + $: bucketsUpdate = $storageUsage?.bucketsUpdate as unknown as Models.Metric[]; + $: bucketsDelete = $storageUsage?.bucketsDelete as unknown as Models.Metric[]; function last(set: Array): Models.Metric | null { return (set as Models.Metric[]).slice(-1)[0] ?? null; @@ -56,76 +56,78 @@
- - {#if bucketsCount} -
{last(bucketsCount).value}
-

Total Buckets

-
- [e.date, e.value])] - } - ]} /> - {/if} - - - - {#if bucketsCreate} -
{total(bucketsCreate)}
-

Buckets created

+ {#if $storageUsage} + + {#if bucketsCount} +
{last(bucketsCount).value}
+

Total Buckets

- [e.date, e.value])] + name: 'User', + data: [...bucketsCount.map((e) => [e.date, e.value])] } ]} /> {/if} - - {#if bucketsRead} -
{total(bucketsRead)}
-

Buckets read

-
- [e.date, e.value])] - } - ]} /> - {/if} - - - {#if bucketsUpdate} -
{total(bucketsUpdate)}
-

Buckets updated

-
- [e.date, e.value])] - } - ]} /> - {/if} - - - {#if bucketsDelete} -
{total(bucketsDelete)}
-

Buckets deleted

-
- [e.date, e.value])] - } - ]} /> - {/if} - - + + + {#if bucketsCreate} +
{total(bucketsCreate)}
+

Buckets created

+
+ [e.date, e.value])] + } + ]} /> + {/if} + + + {#if bucketsRead} +
{total(bucketsRead)}
+

Buckets read

+
+ [e.date, e.value])] + } + ]} /> + {/if} + + + {#if bucketsUpdate} +
{total(bucketsUpdate)}
+

Buckets updated

+
+ [e.date, e.value])] + } + ]} /> + {/if} + + + {#if bucketsDelete} +
{total(bucketsDelete)}
+

Buckets deleted

+
+ [e.date, e.value])] + } + ]} /> + {/if} + + + {/if}