feat: redesign Storage section

Author: astandrik

src/components/InfoViewer/InfoViewer.scss

@@ -1,3 +1,5 @@
+@use '../../styles/mixins.scss';
+
 .info-viewer {
     --ydb-info-viewer-font-size: var(--g-text-body-2-font-size);
     --ydb-info-viewer-line-height: var(--g-text-body-2-line-height);
@@ -28,6 +30,10 @@
 
         max-width: 100%;
         padding-top: 4px;
+
+        &:first-child {
+            padding-top: 0;
+        }
     }
 
     &__label {
@@ -88,4 +94,18 @@
             }
         }
     }
+
+    &_variant_storage {
+        .info-viewer__title {
+            margin: 0 0 var(--g-spacing-3);
+
+            color: var(--g-color-text-primary);
+            @include mixins.subheader-1-typography();
+        }
+
+        .info-viewer__label {
+            color: var(--g-color-text-secondary);
+            @include mixins.body-1-typography();
+        }
+    }
 }

src/components/InfoViewer/InfoViewer.tsx

@@ -16,6 +16,7 @@ export interface InfoViewerProps {
     info?: InfoViewerItem[];
     dots?: boolean;
     size?: 's';
+    variant?: 'default' | 'storage';
     className?: string;
     multilineLabels?: boolean;
     renderEmptyState?: (props?: Pick<InfoViewerProps, 'title' | 'size'>) => React.ReactNode;
@@ -28,6 +29,7 @@ export const InfoViewer = ({
     info,
     dots = true,
     size,
+    variant = 'default',
     className,
     multilineLabels,
     renderEmptyState,
@@ -37,7 +39,7 @@ export const InfoViewer = ({
     }
 
     return (
-        <div className={b({size}, className)}>
+        <div className={b({size, variant}, className)}>
             {title && <div className={b('title')}>{title}</div>}
             {info && info.length > 0 ? (
                 <div className={b('items')}>

src/components/ProgressViewer/ProgressViewer.scss

@@ -109,4 +109,31 @@
         font-size: var(--g-text-body-1-font-size);
         line-height: 36px;
     }
+
+    &_size_storage {
+        position: relative;
+
+        width: 400px;
+        min-width: unset;
+        height: 10px;
+        padding: 0;
+
+        border-radius: var(--g-border-radius-xs);
+        background: var(--g-color-private-white-100);
+
+        #{$block}__progress-container {
+            position: relative;
+
+            width: 100%;
+            height: 100%;
+
+            border-radius: inherit;
+            background: inherit;
+        }
+
+        #{$block}__line {
+            border-radius: var(--g-border-radius-xs);
+            background-color: var(--g-color-private-green-450);
+        }
+    }
 }

src/components/ProgressViewer/ProgressViewer.tsx

@@ -1,15 +1,17 @@
-import {useTheme} from '@gravity-ui/uikit';
+import {Flex, Text, useTheme} from '@gravity-ui/uikit';
 
 import {cn} from '../../utils/cn';
 import {formatNumber, roundToPrecision} from '../../utils/dataFormatters/dataFormatters';
 import {calculateProgressStatus} from '../../utils/progress';
 import {isNumeric} from '../../utils/utils';
 
+import i18n from './i18n';
+
 import './ProgressViewer.scss';
 
 const b = cn('progress-viewer');
 
-type ProgressViewerSize = 'xs' | 's' | 'ns' | 'm' | 'n' | 'l' | 'head';
+type ProgressViewerSize = 'xs' | 's' | 'ns' | 'm' | 'n' | 'l' | 'head' | 'storage';
 
 export type FormatProgressViewerValues = (
     value?: number,
@@ -107,7 +109,29 @@ export function ProgressViewer({
         return valueText;
     };
 
+    const isStorageVariant = size === 'storage';
+
     if (isNumeric(value)) {
+        if (isStorageVariant) {
+            const storageDisplayText =
+                isNumeric(capacity) && !hideCapacity
+                    ? i18n('value_of_capacity', {value: valueText, capacity: capacityText})
+                    : valueText;
+
+            return (
+                <Flex alignItems="center" gap="2" className={className}>
+                    <div className={b({size, theme, status})}>
+                        <div className={b('progress-container')}>
+                            <div className={b('line')} style={lineStyle}></div>
+                        </div>
+                    </div>
+                    <Text variant="body-2" color="secondary">
+                        {storageDisplayText}
+                    </Text>
+                </Flex>
+            );
+        }
+
         return (
             <div className={b({size, theme, status}, className)}>
                 <div className={b('line')} style={lineStyle}></div>
@@ -116,5 +140,5 @@ export function ProgressViewer({
         );
     }
 
-    return <div className={`${b({size})} ${className} error`}>no data</div>;
+    return <div className={`${b({size})} ${className} error`}>{i18n('no-data')}</div>;
 }

src/components/ProgressViewer/i18n/en.json

@@ -0,0 +1,4 @@
+{
+  "value_of_capacity": "{{value}} of {{capacity}}",
+  "no-data": "no data"
+}

src/components/ProgressViewer/i18n/index.ts

@@ -0,0 +1,7 @@
+import {registerKeysets} from '../../../utils/i18n';
+
+import en from './en.json';
+
+const COMPONENT = 'ydb-progress-viewer';
+
+export default registerKeysets(COMPONENT, {en});

src/containers/Tenant/Diagnostics/TenantOverview/TenantDashboard/TenantDashboard.scss

@@ -1,6 +1,6 @@
 .ydb-tenant-dashboard {
     width: var(--diagnostics-section-table-width);
-    margin-bottom: var(--diagnostics-section-margin);
+    margin-bottom: var(--g-spacing-4);
 
     &__charts {
         display: flex;

src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/TenantStorage.scss

@@ -0,0 +1,9 @@
+.tenant-storage {
+    &__tabs-container {
+        margin-top: var(--g-spacing-3);
+    }
+
+    &__tab-content {
+        margin-top: var(--g-spacing-3);
+    }
+}

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

@@ -1,18 +1,34 @@
 import React from 'react';
 
+import {Tab, TabList, TabProvider} from '@gravity-ui/uikit';
+import {useLocation} from 'react-router-dom';
+
 import {InfoViewer} from '../../../../../components/InfoViewer/InfoViewer';
+import {InternalLink} from '../../../../../components/InternalLink';
 import {LabelWithPopover} from '../../../../../components/LabelWithPopover';
 import {ProgressViewer} from '../../../../../components/ProgressViewer/ProgressViewer';
+import {parseQuery} from '../../../../../routes';
+import {TENANT_STORAGE_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
+import {setStorageTab} from '../../../../../store/reducers/tenant/tenant';
+import {cn} from '../../../../../utils/cn';
 import {formatStorageValues} from '../../../../../utils/dataFormatters/dataFormatters';
+import {useTypedDispatch, useTypedSelector} from '../../../../../utils/hooks';
+import {TenantTabsGroups, getTenantPath} from '../../../TenantPages';
 import {TenantDashboard} from '../TenantDashboard/TenantDashboard';
 import i18n from '../i18n';
-import {b} from '../utils';
 
 import {TopGroups} from './TopGroups';
 import {TopTables} from './TopTables';
 import {storageDashboardConfig} from './storageDashboardConfig';
 
-import '../TenantOverview.scss';
+import './TenantStorage.scss';
+
+const tenantStorageCn = cn('tenant-storage');
+
+const storageTabs = [
+    {id: TENANT_STORAGE_TABS_IDS.tables, title: i18n('title_top-tables-by-size')},
+    {id: TENANT_STORAGE_TABS_IDS.groups, title: i18n('title_top-groups-by-usage')},
+];
 
 export interface TenantStorageMetrics {
     blobStorageUsed?: number;
@@ -27,8 +43,31 @@ interface TenantStorageProps {
 }
 
 export function TenantStorage({tenantName, metrics}: TenantStorageProps) {
+    const dispatch = useTypedDispatch();
+    const location = useLocation();
+    const {storageTab = TENANT_STORAGE_TABS_IDS.tables} = useTypedSelector((state) => state.tenant);
+
     const {blobStorageUsed, tabletStorageUsed, blobStorageLimit, tabletStorageLimit} = metrics;
 
+    const queryParams = parseQuery(location);
+
+    React.useEffect(() => {
+        if (!storageTab) {
+            dispatch(setStorageTab(TENANT_STORAGE_TABS_IDS.tables));
+        }
+    }, [storageTab, dispatch]);
+
+    const renderTabContent = () => {
+        switch (storageTab) {
+            case TENANT_STORAGE_TABS_IDS.tables:
+                return <TopTables database={tenantName} />;
+            case TENANT_STORAGE_TABS_IDS.groups:
+                return <TopGroups tenant={tenantName} />;
+            default:
+                return null;
+        }
+    };
+
     const info = [
         {
             label: (
@@ -43,6 +82,7 @@ export function TenantStorage({tenantName, metrics}: TenantStorageProps) {
                     capacity={tabletStorageLimit}
                     formatValues={formatStorageValues}
                     colorizeProgress={true}
+                    size="storage"
                 />
             ),
         },
@@ -59,6 +99,7 @@ export function TenantStorage({tenantName, metrics}: TenantStorageProps) {
                     capacity={blobStorageLimit}
                     formatValues={formatStorageValues}
                     colorizeProgress={true}
+                    size="storage"
                 />
             ),
         },
@@ -67,9 +108,33 @@ export function TenantStorage({tenantName, metrics}: TenantStorageProps) {
     return (
         <React.Fragment>
             <TenantDashboard database={tenantName} charts={storageDashboardConfig} />
-            <InfoViewer className={b('storage-info')} title="Storage details" info={info} />
-            <TopTables database={tenantName} />
-            <TopGroups tenant={tenantName} />
+            <InfoViewer
+                variant="storage"
+                title={i18n('storage.storage-details-title')}
+                info={info}
+            />
+
+            <div className={tenantStorageCn('tabs-container')}>
+                <TabProvider value={storageTab}>
+                    <TabList size="m">
+                        {storageTabs.map(({id, title}) => {
+                            const path = getTenantPath({
+                                ...queryParams,
+                                [TenantTabsGroups.storageTab]: id,
+                            });
+                            return (
+                                <Tab key={id} value={id}>
+                                    <InternalLink to={path} as="tab">
+                                        {title}
+                                    </InternalLink>
+                                </Tab>
+                            );
+                        })}
+                    </TabList>
+                </TabProvider>
+
+                <div className={tenantStorageCn('tab-content')}>{renderTabContent()}</div>
+            </div>
         </React.Fragment>
     );
 }

src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/TopTables.tsx

@@ -11,8 +11,6 @@ import {TENANT_OVERVIEW_TABLES_SETTINGS} from '../../../../../utils/constants';
 import {useAutoRefreshInterval} from '../../../../../utils/hooks';
 import {parseQueryErrorToString} from '../../../../../utils/query';
 import {TenantOverviewTableLayout} from '../TenantOverviewTableLayout';
-import {getSectionTitle} from '../getSectionTitle';
-import i18n from '../i18n';
 
 import '../TenantOverview.scss';
 
@@ -57,14 +55,8 @@ export function TopTables({database}: TopTablesProps) {
                 ) : null,
         },
     ];
-    const title = getSectionTitle({
-        entity: i18n('tables'),
-        postfix: i18n('by-size'),
-    });
-
     return (
         <TenantOverviewTableLayout
-            title={title}
             loading={loading}
             error={parseQueryErrorToString(error)}
             withData={Boolean(currentData)}