From e3774be0aa323e24f43d4a0d68aed92f8d2a1de1 Mon Sep 17 00:00:00 2001
From: Darshan
Date: Sat, 25 Jan 2025 19:37:10 +0530
Subject: [PATCH] update: use new usageMultiple component for database r&w
metrics.
---
.../usage/[[invoice]]/+page.svelte | 11 +++-
.../usage/[[invoice]]/+page.ts | 2 +-
.../usage/[[period]]/+page.svelte | 27 +++------
.../databases/usage/[[period]]/+page.svelte | 27 +++------
.../settings/usage/[[invoice]]/+page.svelte | 57 +++++++++----------
5 files changed, 56 insertions(+), 68 deletions(-)
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
index bcd97f80d..b002e59f3 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
@@ -10,7 +10,7 @@
import { organization } from '$lib/stores/organization';
import { Button } from '$lib/elements/forms';
import { bytesToSize, humanFileSize, mbSecondsToGBHours } from '$lib/helpers/sizeConvertion';
- import { BarChart } from '$lib/charts';
+ import { BarChart, Legend } from '$lib/charts';
import ProjectBreakdown from './ProjectBreakdown.svelte';
import { formatNum } from '$lib/helpers/string';
import { accumulateFromEndingTotal, total } from '$lib/layout/usage.svelte';
@@ -29,6 +29,11 @@
const plan = data?.plan ?? undefined;
$: project = (data.organizationUsage as OrganizationUsage).projects;
+
+ $: legendData = [
+ { name: 'Reads', value: data.organizationUsage.databasesReadsTotal },
+ { name: 'Writes', value: data.organizationUsage.databasesWritesTotal }
+ ];
@@ -200,7 +205,6 @@
The total number of database reads and writes across all projects in your organization.
-
{#if data.organizationUsage.databasesReads || data.organizationUsage.databasesWrites}
+
+
+
{#if project?.length > 0}
{
databasesReads: null,
databasesWrites: null,
databasesReadsTotal: null,
- databasesWritesTotal: null,
+ databasesWritesTotal: null
}
};
}
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 68297576c..fd5fd5875 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
@@ -1,7 +1,7 @@