feat: database storage

src/containers/Cluster/ClusterOverview/utils.tsx

@@ -3,6 +3,24 @@ import {calculateProgressStatus} from '../../../utils/progress';
 
 import type {ClusterMetricsBaseProps, ClusterMetricsCommonProps} from './shared';
 
+function parseDiagramValue(value: number | string) {
+    if (typeof value === 'string' && value.trim() === '') {
+        return NaN;
+    }
+
+    const parsedValue = Number(value);
+
+    return Number.isFinite(parsedValue) ? parsedValue : NaN;
+}
+
+function calculateFillWidth(value: number, capacity: number) {
+    if (!Number.isFinite(value) || !Number.isFinite(capacity) || capacity <= 0) {
+        return 0;
+    }
+
+    return (value / capacity) * 100;
+}
+
 export function calculateBaseDiagramValues({
     colorizeProgress = true,
     warningThreshold,
@@ -33,9 +51,9 @@ export function getDiagramValues({
 }: ClusterMetricsCommonProps & {
     legendFormatter: (params: {value: number; capacity: number}) => string;
 }) {
-    const parsedValue = parseFloat(String(value));
-    const parsedCapacity = parseFloat(String(capacity));
-    const fillWidth = (parsedValue / parsedCapacity) * 100 || 0;
+    const parsedValue = parseDiagramValue(value);
+    const parsedCapacity = parseDiagramValue(capacity);
+    const fillWidth = calculateFillWidth(parsedValue, parsedCapacity);
 
     const legend = legendFormatter({
         value: parsedValue,

src/containers/Tenant/Diagnostics/TenantOverview/MetricsTabs/MetricsTabs.tsx

@@ -29,9 +29,39 @@ import './MetricsTabs.scss';
 
 const b = cn('tenant-metrics-tabs');
 
+interface SelectStorageStatsForMetricCardParams {
+    blobStorageStats?: TenantStorageStats[];
+    tabletStorageStats?: TenantStorageStats[];
+    isServerless: boolean;
+}
+
+export function selectStorageStatsForMetricCard({
+    blobStorageStats,
+    tabletStorageStats,
+    isServerless,
+}: SelectStorageStatsForMetricCardParams) {
+    if (isServerless) {
+        return tabletStorageStats || blobStorageStats || [];
+    }
+
+    const hasLimit = (stats?: TenantStorageStats[]) =>
+        Boolean(stats?.some((item) => Number(item.limit) > 0));
+
+    if (hasLimit(tabletStorageStats)) {
+        return tabletStorageStats || [];
+    }
+
+    if (hasLimit(blobStorageStats)) {
+        return blobStorageStats || [];
+    }
+
+    return blobStorageStats || tabletStorageStats || [];
+}
+
 interface MetricsTabsProps {
     poolsCpuStats?: TenantPoolsStats[];
     memoryStats?: TenantMetricStats[];
+    storageMetricStats?: TenantStorageStats[];
     blobStorageStats?: TenantStorageStats[];
     tabletStorageStats?: TenantStorageStats[];
     networkUtilization?: number;
@@ -46,6 +76,7 @@ interface MetricsTabsProps {
 export function MetricsTabs({
     poolsCpuStats,
     memoryStats,
+    storageMetricStats,
     blobStorageStats,
     tabletStorageStats,
     networkUtilization,
@@ -84,11 +115,18 @@ export function MetricsTabs({
         [poolsCpuStats],
     );
     const cpuMetrics = React.useMemo(() => calculateMetricAggregates(cpuPools), [cpuPools]);
+    const isServerless = databaseType === 'Serverless';
 
     // Calculate storage metrics using utility
     const storageStats = React.useMemo(
-        () => tabletStorageStats || blobStorageStats || [],
-        [tabletStorageStats, blobStorageStats],
+        () =>
+            storageMetricStats ??
+            selectStorageStatsForMetricCard({
+                blobStorageStats,
+                tabletStorageStats,
+                isServerless,
+            }),
+        [blobStorageStats, isServerless, storageMetricStats, tabletStorageStats],
     );
     const storageMetrics = React.useMemo(
         () => calculateMetricAggregates(storageStats),
@@ -106,8 +144,6 @@ export function MetricsTabs({
 
     // card variant is handled within subcomponents
 
-    const isServerless = databaseType === 'Serverless';
-
     const renderNetworkTab = () => {
         if (!showNetworkUtilization) {
             return null;

src/containers/Tenant/Diagnostics/TenantOverview/MetricsTabs/__test__/MetricsTabs.test.ts

@@ -0,0 +1,85 @@
+import {EType} from '../../../../../../types/api/tenant';
+import {selectStorageStatsForMetricCard} from '../MetricsTabs';
+
+describe('selectStorageStatsForMetricCard', () => {
+    test('keeps prod legacy fallback to database storage when tablet storage has no limit', () => {
+        const blobStorageStats = [
+            {
+                name: EType.SSD,
+                used: 492_778_291_200,
+                limit: 6_399_113_297_920,
+                usage: 7.7,
+            },
+        ];
+        const tabletStorageStats = [
+            {
+                name: EType.SSD,
+                used: 35_915_303_563,
+                limit: undefined,
+                usage: undefined,
+            },
+        ];
+
+        expect(
+            selectStorageStatsForMetricCard({
+                blobStorageStats,
+                tabletStorageStats,
+                isServerless: false,
+            }),
+        ).toBe(blobStorageStats);
+    });
+
+    test('keeps quota-based tablet storage priority from main', () => {
+        const blobStorageStats = [
+            {
+                name: EType.SSD,
+                used: 492_778_291_200,
+                limit: 6_399_113_297_920,
+                usage: 7.7,
+            },
+        ];
+        const tabletStorageStats = [
+            {
+                name: EType.SSD,
+                used: 289_166_965_049,
+                limit: 612_032_839_680,
+                usage: 47.2,
+            },
+        ];
+
+        expect(
+            selectStorageStatsForMetricCard({
+                blobStorageStats,
+                tabletStorageStats,
+                isServerless: false,
+            }),
+        ).toBe(tabletStorageStats);
+    });
+
+    test('keeps serverless legacy priority for tablet storage', () => {
+        const blobStorageStats = [
+            {
+                name: EType.SSD,
+                used: 500,
+                limit: 1_000,
+                usage: 50,
+            },
+        ];
+        const tabletStorageStats = [
+            {
+                name: EType.SSD,
+                used: 100,
+                limit: undefined,
+                usage: undefined,
+            },
+        ];
+
+        expect(
+            selectStorageStatsForMetricCard({
+                blobStorageStats,
+                tabletStorageStats,
+                isServerless: true,
+            }),
+        ).toBe(tabletStorageStats);
+    });
+});