From 453f010bfd17356db9003ab057d78bfde7c35b75 Mon Sep 17 00:00:00 2001
From: shimon <shimon@appwrite.io>
Date: Tue, 7 Feb 2023 16:47:01 +0200
Subject: [PATCH] support usage metrics update

---
 src/lib/layout/usage.svelte                   | 79 -------------------
 .../auth/usage/[[period]]/+page.svelte        | 26 +-----
 .../auth/usage/[[period]]/+page.ts            |  6 +-
 .../usage/[[period]]/+page.svelte             | 26 +-----
 .../usage/[[period]]/+page.ts                 |  6 +-
 .../usage/[[period]]/+page.svelte             | 26 +-----
 .../usage/[[period]]/+page.ts                 |  6 +-
 .../databases/usage/[[period]]/+page.svelte   | 26 +-----
 .../databases/usage/[[period]]/+page.ts       |  6 +-
 .../usage/[[period]]/+page.svelte             | 17 +---
 .../usage/[[period]]/+page.ts                 |  3 +-
 .../usage/[[period]]/+page.svelte             | 26 +-----
 .../bucket-[bucket]/usage/[[period]]/+page.ts |  6 +-
 .../storage/usage/[[period]]/+page.svelte     | 26 +-----
 .../storage/usage/[[period]]/+page.ts         |  6 +-
 15 files changed, 14 insertions(+), 277 deletions(-)

diff --git a/src/lib/layout/usage.svelte b/src/lib/layout/usage.svelte
index f46913608..4967d0b6e 100644
--- a/src/lib/layout/usage.svelte
+++ b/src/lib/layout/usage.svelte
@@ -26,16 +26,7 @@
 
     export let title: string;
     export let count: Models.Metric[];
-    export let created: Models.Metric[];
-    export let read: Models.Metric[];
-    export let updated: Models.Metric[];
-    export let deleted: Models.Metric[];
-
     export let countMetadata: MetricMetadata;
-    export let createdMetadata: MetricMetadata;
-    export let readMetadata: MetricMetadata;
-    export let updatedMetadata: MetricMetadata;
-    export let deletedMetadata: MetricMetadata;
     export let path: string = null;
 </script>
 
@@ -72,76 +63,6 @@
             </div>
         {/if}
     </Card>
-    <Tiles>
-        <Card isTile>
-            {#if created}
-                <Heading tag="h6" size="6">{total(created)}</Heading>
-                <p>{createdMetadata.title}</p>
-                <div class="u-margin-block-start-16" />
-                <div class="chart-container">
-                    <LineChart
-                        series={[
-                            {
-                                name: createdMetadata.legend,
-                                data: [...created.map((e) => [e.date, e.value])],
-                                color: Colors.Secondary
-                            }
-                        ]} />
-                </div>
-            {/if}
-        </Card>
-        <Card isTile>
-            {#if read}
-                <Heading tag="h6" size="6">{total(read)}</Heading>
-                <p>{readMetadata.title}</p>
-                <div class="u-margin-block-start-16" />
-                <div class="chart-container">
-                    <LineChart
-                        series={[
-                            {
-                                name: readMetadata.legend,
-                                data: [...read.map((e) => [e.date, e.value])],
-                                color: Colors.Tertiary
-                            }
-                        ]} />
-                </div>
-            {/if}
-        </Card>
-        <Card isTile>
-            {#if updated}
-                <Heading tag="h6" size="6">{total(updated)}</Heading>
-                <p>{updatedMetadata.title}</p>
-                <div class="u-margin-block-start-16" />
-                <div class="chart-container">
-                    <LineChart
-                        series={[
-                            {
-                                name: updatedMetadata.legend,
-                                data: [...updated.map((e) => [e.date, e.value])],
-                                color: Colors.Quaternary
-                            }
-                        ]} />
-                </div>
-            {/if}
-        </Card>
-        <Card isTile>
-            {#if deleted}
-                <Heading tag="h6" size="6">{total(deleted)}</Heading>
-                <p>{deletedMetadata.title}</p>
-                <div class="u-margin-block-start-16" />
-                <div class="chart-container">
-                    <LineChart
-                        series={[
-                            {
-                                name: deletedMetadata.legend,
-                                data: [...deleted.map((e) => [e.date, e.value])],
-                                color: Colors.Quinary
-                            }
-                        ]} />
-                </div>
-            {/if}
-        </Card>
-    </Tiles>
 </Container>
 
 <style lang="scss">
diff --git a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.svelte b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.svelte
index 879419d72..33ef1bac0 100644
--- a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.svelte
+++ b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.svelte
@@ -5,38 +5,14 @@
 
     export let data: PageData;
 
-    $: count = data.count;
-    $: created = data.created;
-    $: read = data.read;
-    $: updated = data.updated;
-    $: deleted = data.deleted;
+    $: count = data.usersTotal;
 </script>
 
 <Usage
     title="Users"
     path={`/console/project-${$page.params.project}/auth/usage`}
     {count}
-    {created}
-    {read}
-    {updated}
-    {deleted}
     countMetadata={{
         legend: 'Users',
         title: 'Registered users'
-    }}
-    createdMetadata={{
-        legend: 'Create',
-        title: 'Users created'
-    }}
-    readMetadata={{
-        legend: 'Read',
-        title: 'Users read'
-    }}
-    updatedMetadata={{
-        legend: 'Update',
-        title: 'Users updated'
-    }}
-    deletedMetadata={{
-        legend: 'Delete',
-        title: 'Users deleted'
     }} />
diff --git a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts
index fbc99f708..d8f3b1cf0 100644
--- a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts
+++ b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts
@@ -7,10 +7,6 @@ export const load: PageLoad = async ({ params, parent }) => {
     const { period } = params;
     const response = await sdkForProject.users.getUsage(period ?? '30d');
     return {
-        count: response.usersCount as unknown as Models.Metric[],
-        created: response.usersCreate as unknown as Models.Metric[],
-        read: response.usersRead as unknown as Models.Metric[],
-        updated: response.usersUpdate as unknown as Models.Metric[],
-        deleted: response.usersDelete as unknown as Models.Metric[]
+        usersTotal: response.usersTotal as unknown as Models.Metric[]
     };
 };
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte
index b4f9eb530..fd7382f3e 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte
@@ -5,38 +5,14 @@
 
     export let data: PageData;
 
-    $: count = data.count;
-    $: created = data.created;
-    $: read = data.read;
-    $: updated = data.updated;
-    $: deleted = data.deleted;
+    $: count = data.documentsTotal;
 </script>
 
 <Usage
     title="Databases"
     path={`/console/project-${$page.params.project}/databases/database-${$page.params.database}/collection-${$page.params.collection}/usage`}
     {count}
-    {created}
-    {read}
-    {updated}
-    {deleted}
     countMetadata={{
         legend: 'Documents',
         title: 'Total documents'
-    }}
-    createdMetadata={{
-        legend: 'Create',
-        title: 'Documents created'
-    }}
-    readMetadata={{
-        legend: 'Read',
-        title: 'Documents read'
-    }}
-    updatedMetadata={{
-        legend: 'Update',
-        title: 'Documents updated'
-    }}
-    deletedMetadata={{
-        legend: 'Delete',
-        title: 'Documents deleted'
     }} />
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts
index cf4a899cf..02ca19486 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts
@@ -11,10 +11,6 @@ export const load: PageLoad = async ({ params, parent }) => {
     );
 
     return {
-        count: response.documentsCount as unknown as Models.Metric[],
-        created: response.documentsCreate as unknown as Models.Metric[],
-        read: response.documentsRead as unknown as Models.Metric[],
-        updated: response.documentsUpdate as unknown as Models.Metric[],
-        deleted: response.documentsDelete as unknown as Models.Metric[]
+        documentsTotal: response.documentsTotal as unknown as Models.Metric[]
     };
 };
diff --git a/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
index 869150446..b376c62b1 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
@@ -5,38 +5,14 @@
 
     export let data: PageData;
 
-    $: count = data.count;
-    $: created = data.created;
-    $: read = data.read;
-    $: updated = data.updated;
-    $: deleted = data.deleted;
+    $: count = data.collectionsTotal;
 </script>
 
 <Usage
     title="Databases"
     path={`/console/project-${$page.params.project}/databases/database-${$page.params.database}/usage`}
     {count}
-    {created}
-    {read}
-    {updated}
-    {deleted}
     countMetadata={{
         legend: 'Collections',
         title: 'Total collections'
-    }}
-    createdMetadata={{
-        legend: 'Create',
-        title: 'Collections created'
-    }}
-    readMetadata={{
-        legend: 'Read',
-        title: 'Collections read'
-    }}
-    updatedMetadata={{
-        legend: 'Update',
-        title: 'Collections updated'
-    }}
-    deletedMetadata={{
-        legend: 'Delete',
-        title: 'Collections deleted'
     }} />
diff --git a/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts
index bc1023198..396922292 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts
+++ b/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts
@@ -10,10 +10,6 @@ export const load: PageLoad = async ({ params, parent }) => {
     );
 
     return {
-        count: response.collectionsCount as unknown as Models.Metric[],
-        created: response.collectionsCreate as unknown as Models.Metric[],
-        read: response.collectionsRead as unknown as Models.Metric[],
-        updated: response.collectionsUpdate as unknown as Models.Metric[],
-        deleted: response.collectionsDelete as unknown as Models.Metric[]
+        collectionsTotal: response.collectionsTotal as unknown as Models.Metric[]
     };
 };
diff --git a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.svelte b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.svelte
index a4a116618..dce3a94d4 100644
--- a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.svelte
+++ b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.svelte
@@ -5,38 +5,14 @@
 
     export let data: PageData;
 
-    $: count = data.count;
-    $: created = data.created;
-    $: read = data.read;
-    $: updated = data.updated;
-    $: deleted = data.deleted;
+    $: count = data.databasesTotal;
 </script>
 
 <Usage
     title="Databases"
     path={`/console/project-${$page.params.project}/databases/usage`}
     {count}
-    {created}
-    {read}
-    {updated}
-    {deleted}
     countMetadata={{
         legend: 'Databases',
         title: 'Total databases'
-    }}
-    createdMetadata={{
-        legend: 'Create',
-        title: 'Databases created'
-    }}
-    readMetadata={{
-        legend: 'Read',
-        title: 'Databases read'
-    }}
-    updatedMetadata={{
-        legend: 'Update',
-        title: 'Databases updated'
-    }}
-    deletedMetadata={{
-        legend: 'Delete',
-        title: 'Databases deleted'
     }} />
diff --git a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts
index 9017a1b24..e3fbe2edd 100644
--- a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts
+++ b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts
@@ -8,10 +8,6 @@ export const load: PageLoad = async ({ params, parent }) => {
     const response = await sdkForProject.databases.getUsage(period ?? '30d');
 
     return {
-        count: response.databasesCount as unknown as Models.Metric[],
-        created: response.databasesCreate as unknown as Models.Metric[],
-        read: response.databasesRead as unknown as Models.Metric[],
-        updated: response.databasesUpdate as unknown as Models.Metric[],
-        deleted: response.databasesDelete as unknown as Models.Metric[]
+        databasesTotal: response.databasesTotal as unknown as Models.Metric[]
     };
 };
diff --git a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte
index 628eaf11e..d9baaea93 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte
@@ -8,8 +8,7 @@
 
     export let data: PageData;
 
-    $: count = data.count;
-    $: errors = data.errors;
+    $: count = data.executionsTotal;
 </script>
 
 <Container>
@@ -47,18 +46,4 @@
                 ]} />
         </Card>
     {/if}
-    {#if errors}
-        <Card>
-            <Heading tag="h6" size="6">{last(errors).value}</Heading>
-            <p>Errors</p>
-            <div class="u-margin-block-start-16" />
-            <BarChart
-                series={[
-                    {
-                        name: 'Count of function errors over time',
-                        data: [...errors.map((e) => [e.date, e.value])]
-                    }
-                ]} />
-        </Card>
-    {/if}
 </Container>
diff --git a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts
index fcba697b3..82aaac446 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts
+++ b/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts
@@ -10,7 +10,6 @@ export const load: PageLoad = async ({ params, parent }) => {
     );
 
     return {
-        count: response.executionsTotal as unknown as Models.Metric[],
-        errors: response.buildsFailure as unknown as Models.Metric[]
+        executionsTotal: response.executionsTotal as unknown as Models.Metric[]
     };
 };
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte
index e9111d150..9b18a11df 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte
@@ -5,38 +5,14 @@
 
     export let data: PageData;
 
-    $: count = data.count;
-    $: created = data.created;
-    $: read = data.read;
-    $: updated = data.updated;
-    $: deleted = data.deleted;
+    $: count = data.filesTotal;
 </script>
 
 <Usage
     title="Files"
     path={`/console/project-${$page.params.project}/storage/bucket-${$page.params.bucket}/usage`}
     {count}
-    {created}
-    {read}
-    {updated}
-    {deleted}
     countMetadata={{
         legend: 'Files',
         title: 'Total files'
-    }}
-    createdMetadata={{
-        legend: 'Create',
-        title: 'Files created'
-    }}
-    readMetadata={{
-        legend: 'Read',
-        title: 'Files read'
-    }}
-    updatedMetadata={{
-        legend: 'Update',
-        title: 'Files updated'
-    }}
-    deletedMetadata={{
-        legend: 'Delete',
-        title: 'Files deleted'
     }} />
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts
index 19e5e71bc..53d485f1b 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts
@@ -10,10 +10,6 @@ export const load: PageLoad = async ({ params, parent }) => {
     );
 
     return {
-        count: response.filesCount as unknown as Models.Metric[],
-        created: response.filesCreate as unknown as Models.Metric[],
-        read: response.filesRead as unknown as Models.Metric[],
-        updated: response.filesUpdate as unknown as Models.Metric[],
-        deleted: response.filesDelete as unknown as Models.Metric[]
+        filesTotal: response.filesTotal as unknown as Models.Metric[]
     };
 };
diff --git a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.svelte b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.svelte
index 5ac40adb9..01e0c02ca 100644
--- a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.svelte
+++ b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.svelte
@@ -5,38 +5,14 @@
 
     export let data: PageData;
 
-    $: count = data.count;
-    $: created = data.created;
-    $: read = data.read;
-    $: updated = data.updated;
-    $: deleted = data.deleted;
+    $: count = data.bucketsTotal;
 </script>
 
 <Usage
     title="Buckets"
     path={`/console/project-${$page.params.project}/storage/usage`}
     {count}
-    {created}
-    {read}
-    {updated}
-    {deleted}
     countMetadata={{
         legend: 'Buckets',
         title: 'Total buckets'
-    }}
-    createdMetadata={{
-        legend: 'Create',
-        title: 'Buckets created'
-    }}
-    readMetadata={{
-        legend: 'Read',
-        title: 'Buckets read'
-    }}
-    updatedMetadata={{
-        legend: 'Update',
-        title: 'Buckets updated'
-    }}
-    deletedMetadata={{
-        legend: 'Delete',
-        title: 'Buckets deleted'
     }} />
diff --git a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts
index 245f790ea..eb33b488a 100644
--- a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts
+++ b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts
@@ -7,10 +7,6 @@ export const load: PageLoad = async ({ params, parent }) => {
     const response = await sdkForProject.storage.getUsage(params.period ?? '30d');
 
     return {
-        count: response.bucketsCount as unknown as Models.Metric[],
-        created: response.bucketsCreate as unknown as Models.Metric[],
-        read: response.bucketsRead as unknown as Models.Metric[],
-        updated: response.bucketsUpdate as unknown as Models.Metric[],
-        deleted: response.bucketsDelete as unknown as Models.Metric[]
+        bucketsTotal: response.bucketsTotal as unknown as Models.Metric[]
     };
 };