diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts index ec3ca5328..69fd6eb64 100644 --- a/src/lib/stores/sdk.ts +++ b/src/lib/stores/sdk.ts @@ -24,6 +24,7 @@ import { import { Billing } from '../sdk/billing'; import { Sources } from '$lib/sdk/sources'; import { SpecsFunctions } from '$lib/sdk/functionsSpec'; +import { ProjectDBStorage } from '$lib/sdk/usageDatabaseStorage'; const endpoint = VARS.APPWRITE_ENDPOINT ?? `${globalThis?.location?.origin}/v1`; @@ -45,6 +46,7 @@ const sdkForProject = { messaging: new Messaging(clientProject), project: new Project(clientProject), projectApi: new ProjectApi(clientProject), + projectDatabaseStorage: new ProjectDBStorage(clientProject), storage: new Storage(clientProject), teams: new Teams(clientProject), users: new Users(clientProject), 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 55b97f174..56c9a0bda 100644 --- a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.svelte +++ b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.svelte @@ -6,6 +6,8 @@ export let data: PageData; $: total = data.databasesTotal; $: count = data.databases; + $: totalStorage = data.databasesStorageTotal; + $: countStorage = data.databasesStorage; + + 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 47e4f5dfa..df88b1119 100644 --- a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts @@ -9,7 +9,7 @@ export const load: PageLoad = async ({ params }) => { ? params.period : DatabaseUsageRange.ThirtyDays; try { - return sdk.forProject.databases.getUsage(period); + return sdk.forProject.projectDatabaseStorage.getDBUsage(period); } catch (e) { error(e.code, e.message); } diff --git a/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte index a4d52bdf4..382dd5f79 100644 --- a/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte +++ b/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte @@ -28,6 +28,7 @@ $: executions = data.usage.executions; $: executionsTotal = data.usage.executionsTotal; $: storage = data.usage.filesStorageTotal; + $: databasesStorage = data.usage.databasesStorageTotal; const tier = data?.currentInvoice?.tier ?? $organization?.billingPlan; const plan = tierToPlan(tier).name; @@ -264,7 +265,7 @@

Calculated for all your files, deployments, builds and databases. While in beta, only - file storage is counted against your plan limits. + file and database storage is counted against your plan limits.

@@ -273,6 +274,7 @@

+ Files - {humanized.value} {humanized.unit}

@@ -312,7 +314,56 @@ class="icon-chart-square-bar text-large" aria-hidden="true" style="font-size: 32px;" /> -

No data to show

+

No data to show for files storage

+
+ + {/if} + {#if databasesStorage} + {@const humanized = humanFileSize(databasesStorage)} +
+
+

+ Databases - + {humanized.value} + {humanized.unit} +

+
+
+ {#if data.usage.databasesStorageBreakdown.length > 0} + + + Database + Usage + + + + {#each data.usage.databasesStorageBreakdown.sort((a, b) => b.value - a.value) as database} + {@const humanized = humanFileSize(database.value)} + + + {database.name ?? database.resourceId} + + + {humanized.value}{humanized.unit} + + + View database + + + {/each} + +
+ {/if} + {:else} + +
+
{/if} diff --git a/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.ts b/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.ts index 2cb455ae0..a50fa05ca 100644 --- a/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.ts +++ b/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.ts @@ -29,7 +29,7 @@ export const load: PageLoad = async ({ params, parent }) => { /** * Workaround because project id might not be populated yet. */ - getSdkForProject(project).project.getUsage(startDate, endDate) + getSdkForProject(project).projectDatabaseStorage.getUsage(startDate, endDate) ]); if (invoice) {