ydb-embedded-ui 21.0.0 → 22.0.0

package/src/containers/Tablets/TabletsTable.tsx

@@ -190,7 +190,9 @@ function TabletActions(tablet: TTabletStateInfo) {
         <ButtonWithConfirmDialog
             buttonView="outlined"
             dialogHeader={i18n('dialog.kill-header')}
-            dialogWarning={i18n('dialog.kill-text')}
+            dialogText={i18n('dialog.kill-text')}
+            applyButtonText={i18n('dialog.kill-header')}
+            applyButtonView="action"
             onConfirmAction={() => {
                 return killTablet({id}).unwrap();
             }}

package/src/containers/Tablets/i18n/en.json

@@ -10,7 +10,7 @@
   "Generation": "Generation",
   "Uptime": "Uptime",
   "dialog.kill-header": "Restart tablet",
-  "dialog.kill-text": "The tablet will be restarted. Do you want to proceed?",
+  "dialog.kill-text": "The tablet will restart. A portion of table data will be temporarily unavailable. Active transactions and scans will be interrupted with a retriable error and can be retried.",
   "controls.kill-not-allowed": "You don't have enough rights to restart tablet",
   "controls.kill-impossible-follower": "It's impossible to restart a follower",
   "controls.search-placeholder": "Tablet ID",

package/src/containers/Tenant/Diagnostics/TenantOverview/Healthcheck/HealthcheckPreview.tsx

@@ -7,6 +7,7 @@ import {healthcheckApi} from '../../../../../store/reducers/healthcheckInfo/heal
 import {SelfCheckResult} from '../../../../../types/api/healthcheck';
 import {cn} from '../../../../../utils/cn';
 import {useAutoRefreshInterval} from '../../../../../utils/hooks';
+import {useClusterNameFromQuery} from '../../../../../utils/hooks/useDatabaseFromQuery';
 import {isEnumMember} from '../../../../../utils/typecheckers';
 import {HEALTHCHECK_RESULT_TO_TEXT} from '../../../constants';
 import {useTenantQueryParams} from '../../../useTenantQueryParams';
@@ -24,6 +25,7 @@ interface HealthcheckPreviewProps {
 
 export function HealthcheckPreview(props: HealthcheckPreviewProps) {
     const {database} = props;
+    const clusterName = useClusterNameFromQuery();
     const [autoRefreshInterval] = useAutoRefreshInterval();
 
     const {handleShowHealthcheckChange} = useTenantQueryParams();
@@ -33,7 +35,7 @@ export function HealthcheckPreview(props: HealthcheckPreviewProps) {
         isFetching,
         error,
     } = healthcheckApi.useGetHealthcheckInfoQuery(
-        {database},
+        {database, clusterName},
         {
             pollingInterval: autoRefreshInterval,
         },

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

@@ -311,11 +311,11 @@ export function TenantOverview({
 
     // Use healthcheck self_check_result as the database status color when available;
     // fall back to tenantinfo.Overall (e.g. for Serverless databases where healthcheck is skipped).
-    // Polling is managed by HealthcheckPreview (deduped via the same cache key); the database
+    // Polling is managed by HealthcheckPreview via the same {database, clusterName} cache key. The database
     // status badge is only rendered when !isV2NavigationEnabled, so skip the query in V2 mode
     // and until tenant info is loaded to avoid spurious requests.
     const {currentData: healthcheckData} = healthcheckApi.useGetHealthcheckInfoQuery(
-        {database},
+        {database, clusterName},
         {
             skip: shouldSkipHealthcheck({isServerless, isV2NavigationEnabled, tenant}),
         },

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

@@ -1,10 +1,7 @@
 import React from 'react';
 
 import {ResizeableDataTable} from '../../../../../components/ResizeableDataTable/ResizeableDataTable';
-import {
-    useCapabilitiesLoaded,
-    useStorageGroupsHandlerAvailable,
-} from '../../../../../store/reducers/capabilities/hooks';
+import {useCapabilitiesLoaded} from '../../../../../store/reducers/capabilities/hooks';
 import {storageApi} from '../../../../../store/reducers/storage/storage';
 import type {GroupsRequiredField} from '../../../../../types/api/storage';
 import {
@@ -45,7 +42,6 @@ interface TopGroupsProps {
 
 export function TopGroups({tenant, capacityMetricsEnabled}: TopGroupsProps) {
     const capabilitiesLoaded = useCapabilitiesLoaded();
-    const groupsHandlerAvailable = useStorageGroupsHandlerAvailable();
     const [autoRefreshInterval] = useAutoRefreshInterval();
 
     const {columns, fieldsRequired, sort} = React.useMemo(
@@ -59,7 +55,6 @@ export function TopGroups({tenant, capacityMetricsEnabled}: TopGroupsProps) {
             sort,
             with: 'all',
             limit: TENANT_OVERVIEW_TABLES_LIMIT,
-            shouldUseGroupsHandler: groupsHandlerAvailable,
             fieldsRequired,
         },
         {

package/src/containers/Tenant/Diagnostics/useDiagnosticsPages.ts

@@ -3,7 +3,6 @@ import React from 'react';
 import {
     useConfigAvailable,
     useNewStorageViewEnabled,
-    useStorageGroupsHandlerAvailable,
     useStorageStatsAvailable,
     useTopicDataAvailable,
 } from '../../../store/reducers/capabilities/hooks';
@@ -42,10 +41,8 @@ export function useDiagnosticsPages({
 
     const hasConfigs = useConfigAvailable();
     const newStorageViewEnabled = useNewStorageViewEnabled();
-    const storageGroupsAvailable = useStorageGroupsHandlerAvailable();
     const storageStatsAvailable = useStorageStatsAvailable();
-    const hasStorageUsageCapabilities = storageGroupsAvailable && storageStatsAvailable;
-    const hasStorageUsage = newStorageViewEnabled && hasStorageUsageCapabilities;
+    const hasStorageUsage = newStorageViewEnabled && storageStatsAvailable;
     const hasTopicData = useTopicDataAvailable();
     const isViewerUser = useIsViewerUser();
     const userPermissions = useUserPermissions();

package/src/containers/Tenant/Healthcheck/components/HealthcheckDrawer.tsx

@@ -7,6 +7,7 @@ import {DrawerWrapper} from '../../../../components/Drawer';
 import type {DrawerControl} from '../../../../components/Drawer';
 import {EnableFullscreenButton} from '../../../../components/EnableFullscreenButton/EnableFullscreenButton';
 import type {SelfCheckResult} from '../../../../types/api/healthcheck';
+import {uiFactory} from '../../../../uiFactory/uiFactory';
 import {createAndDownloadJsonFile} from '../../../../utils/downloadFile';
 
 import {HealthcheckDrawerTitle} from './HealthcheckDrawerTitle';
@@ -42,6 +43,20 @@ export function HealthcheckDrawer({
     downloadTooltip,
     isDownloadDisabled,
 }: HealthcheckDrawerProps) {
+    const renderDrawerExtension = uiFactory.healthcheck.renderDrawerExtension;
+    const renderContentWithExtension = React.useCallback(() => {
+        if (!renderDrawerExtension) {
+            return renderDrawerContent();
+        }
+
+        return (
+            <React.Fragment>
+                {renderDrawerExtension()}
+                {renderDrawerContent()}
+            </React.Fragment>
+        );
+    }, [renderDrawerContent, renderDrawerExtension]);
+
     const handleDownload = React.useCallback(
         (event: React.MouseEvent<HTMLButtonElement>) => {
             event.stopPropagation();
@@ -86,7 +101,7 @@ export function HealthcheckDrawer({
             isDrawerVisible={isDrawerVisible}
             onCloseDrawer={onCloseDrawer}
             onTransitionInComplete={onTransitionInComplete}
-            renderDrawerContent={renderDrawerContent}
+            renderDrawerContent={renderContentWithExtension}
             drawerId={drawerId}
             storageKey={storageKey}
             detectClickOutside

package/src/routes.ts

@@ -169,7 +169,7 @@ export function getStorageGroupPath(groupId: string | number, query: Query = {})
 }
 
 export function getDefaultNodePath(
-    params: {id: string | number; activeTab?: NodeTab},
+    params: {id: string | number; activeTab?: NodeTab; environment?: string},
     query: NodePageQuery = {},
     options?: CreateHrefOptions,
 ) {

package/src/services/api/viewer.ts

@@ -28,12 +28,7 @@ import type {
 import type {JsonRenderRequestParams, JsonRenderResponse} from '../../types/api/render';
 import type {DescribeReplicationResult} from '../../types/api/replication';
 import type {TEvDescribeSchemeResult} from '../../types/api/schema';
-import type {
-    StorageRequestParams,
-    StorageStatsRequestParams,
-    StorageStatsResponse,
-    TStorageInfo,
-} from '../../types/api/storage';
+import type {StorageStatsRequestParams, StorageStatsResponse} from '../../types/api/storage';
 import type {TEvSystemStateResponse} from '../../types/api/systemState';
 import type {
     TDomainKey,
@@ -524,25 +519,6 @@ export class ViewerAPI extends BaseYdbAPI {
         );
     }
 
-    getStorageInfo(
-        {database, nodeId, groupId, pDiskId, filter, ...params}: StorageRequestParams,
-        {concurrentId, signal}: AxiosOptions = {},
-    ) {
-        return this.get<TStorageInfo>(
-            this.getPath(`/viewer/json/storage?enums=true`),
-            {
-                database,
-                node_id: nodeId,
-                group_id: groupId,
-                pdisk_id: pDiskId,
-                // Do not send empty string
-                filter: filter || undefined,
-                ...params,
-            },
-            {concurrentId, requestConfig: {signal}},
-        );
-    }
-
     getStorageStats(
         {
             database,

package/src/store/reducers/api.ts

@@ -1,6 +1,8 @@
 import type {BaseQueryFn} from '@reduxjs/toolkit/query';
 import {createApi} from '@reduxjs/toolkit/query/react';
 
+import {CLUSTER_DATA_TAG, DATABASE_DATA_TAG} from './entityDataTags';
+
 export const api = createApi({
     baseQuery: fakeBaseQuery(),
     /**
@@ -27,6 +29,8 @@ export const api = createApi({
         'Backups',
         'BackupsSchedule',
         'OperationList',
+        DATABASE_DATA_TAG,
+        CLUSTER_DATA_TAG,
     ],
 });
 

package/src/store/reducers/capabilities/hooks.ts

@@ -81,10 +81,6 @@ export const useTracingLevelOptionAvailable = () => {
     return useGetFeatureVersion('/viewer/query') > 2;
 };
 
-export const useStorageGroupsHandlerAvailable = () => {
-    return useGetFeatureVersion('/storage/groups') > 2;
-};
-
 export const useStorageStatsAvailable = () => {
     return useGetFeatureVersion('/viewer/storage_stats') > 0;
 };

package/src/store/reducers/cluster/cluster.ts

@@ -13,6 +13,7 @@ import {useIsViewerUser} from '../../../utils/hooks/useIsUserAllowedToMakeChange
 import {isQueryErrorResponse} from '../../../utils/query';
 import type {RootState} from '../../defaultStore';
 import {api} from '../api';
+import {getClusterDataTag} from '../entityDataTags';
 import {selectNodesMap} from '../nodesList';
 
 import {
@@ -117,7 +118,7 @@ export const clusterApi = api.injectEndpoints({
                     return {error};
                 }
             },
-            providesTags: ['All'],
+            providesTags: (_result, _error, clusterName) => ['All', getClusterDataTag(clusterName)],
         }),
         getClusterBaseInfo: builder.query({
             queryFn: async (clusterName: string, {signal}) => {
@@ -131,7 +132,7 @@ export const clusterApi = api.injectEndpoints({
                     return {error};
                 }
             },
-            providesTags: ['All'],
+            providesTags: (_result, _error, clusterName) => ['All', getClusterDataTag(clusterName)],
         }),
     }),
     overrideExisting: 'throw',

package/src/store/reducers/clusters/clusters.ts

@@ -2,6 +2,7 @@ import {createSlice} from '@reduxjs/toolkit';
 import type {PayloadAction} from '@reduxjs/toolkit';
 
 import {api} from '../api';
+import {CLUSTER_DATA_LIST_TAG} from '../entityDataTags';
 
 import type {ClustersFilters} from './types';
 import {prepareClustersData} from './utils';
@@ -43,7 +44,7 @@ export const clustersApi = api.injectEndpoints({
                     return {error};
                 }
             },
-            providesTags: ['All'],
+            providesTags: ['All', CLUSTER_DATA_LIST_TAG],
         }),
     }),
     overrideExisting: 'throw',

package/src/store/reducers/entityDataTags.ts

@@ -0,0 +1,34 @@
+export const DATABASE_DATA_TAG = 'DatabaseData';
+export const CLUSTER_DATA_TAG = 'ClusterData';
+
+const ENTITY_DATA_LIST_TAG_ID = 'LIST';
+
+export const DATABASE_DATA_LIST_TAG = {
+    type: DATABASE_DATA_TAG,
+    id: ENTITY_DATA_LIST_TAG_ID,
+} as const;
+
+export const CLUSTER_DATA_LIST_TAG = {
+    type: CLUSTER_DATA_TAG,
+    id: ENTITY_DATA_LIST_TAG_ID,
+} as const;
+
+export function getDatabaseDataTag({
+    clusterName,
+    database,
+}: {
+    clusterName?: string;
+    database: string;
+}) {
+    return {
+        type: DATABASE_DATA_TAG,
+        id: JSON.stringify([clusterName ?? null, database]),
+    } as const;
+}
+
+export function getClusterDataTag(clusterName?: string) {
+    return {
+        type: CLUSTER_DATA_TAG,
+        id: JSON.stringify(clusterName ?? null),
+    } as const;
+}

package/src/store/reducers/node/node.ts

@@ -15,17 +15,6 @@ export const nodeApi = api.injectEndpoints({
             },
             providesTags: ['All'],
         }),
-        getNodeStructure: build.query({
-            queryFn: async ({nodeId}: {nodeId: string}, {signal}) => {
-                try {
-                    const data = await window.api.viewer.getStorageInfo({nodeId}, {signal});
-                    return {data};
-                } catch (error) {
-                    return {error};
-                }
-            },
-            providesTags: ['All'],
-        }),
     }),
     overrideExisting: 'throw',
 });

package/src/store/reducers/node/types.ts

@@ -1,21 +1,3 @@
-import type {PreparedPDisk, PreparedVDisk} from '../../../utils/disks/types';
 import type {PreparedNodeSystemState} from '../../../utils/nodes';
 
-interface RawStructurePDisk extends PreparedPDisk {
-    vDisks: Record<string, PreparedVDisk>;
-}
-
-export type RawNodeStructure = Record<string, RawStructurePDisk>;
-
-export interface PreparedStructureVDisk extends PreparedVDisk {
-    id: string;
-    order: number;
-}
-
-export interface PreparedStructurePDisk extends PreparedPDisk {
-    vDisks: PreparedStructureVDisk[];
-}
-
-export type PreparedNodeStructure = Record<string, PreparedStructurePDisk>;
-
 export interface PreparedNode extends Partial<PreparedNodeSystemState> {}

package/src/store/reducers/storage/requestStorageData.ts

@@ -1,21 +1,9 @@
 import type {AxiosOptions} from '../../../services/api/base';
-import type {GroupsRequestParams, StorageRequestParams} from '../../../types/api/storage';
+import type {GroupsRequestParams} from '../../../types/api/storage';
 
-import {prepareGroupsResponse, prepareStorageResponse} from './utils';
+import {prepareGroupsResponse} from './utils';
 
-export async function requestStorageData(
-    {
-        version = 'v2',
-        shouldUseGroupsHandler,
-        ...params
-    }: StorageRequestParams & GroupsRequestParams & {shouldUseGroupsHandler?: boolean},
-    options?: AxiosOptions,
-) {
-    if (shouldUseGroupsHandler && version !== 'v1') {
-        const result = await window.api.storage.getStorageGroups({...params}, options);
-        return prepareGroupsResponse(result);
-    } else {
-        const result = await window.api.viewer.getStorageInfo({version, ...params}, options);
-        return prepareStorageResponse(result);
-    }
+export async function requestStorageData(params: GroupsRequestParams, options?: AxiosOptions) {
+    const result = await window.api.storage.getStorageGroups(params, options);
+    return prepareGroupsResponse(result);
 }

package/src/store/reducers/storage/storage.ts

@@ -1,5 +1,5 @@
 import type {NodesRequestParams} from '../../../types/api/nodes';
-import type {GroupsRequestParams, StorageRequestParams} from '../../../types/api/storage';
+import type {GroupsRequestParams} from '../../../types/api/storage';
 import {api} from '../api';
 
 import {requestStorageData} from './requestStorageData';
@@ -22,11 +22,7 @@ export const storageApi = api.injectEndpoints({
             providesTags: ['All', 'StorageData'],
         }),
         getStorageGroupsInfo: builder.query({
-            queryFn: async (
-                params: StorageRequestParams &
-                    GroupsRequestParams & {shouldUseGroupsHandler?: boolean},
-                {signal},
-            ) => {
+            queryFn: async (params: GroupsRequestParams, {signal}) => {
                 try {
                     const result = await requestStorageData(params, {signal});
                     return {data: result};

package/src/store/reducers/storage/types.ts

@@ -83,16 +83,7 @@ export interface PreparedStorageGroup {
     VDisks?: PreparedVDisk[];
 
     Kind?: string;
-    ChangeTime?: number | string;
     GroupGeneration?: string;
-    Latency?: EFlag;
-    AcquiredUnits?: string;
-    AcquiredIOPS?: number;
-    AcquiredThroughput?: string;
-    AcquiredSize?: string;
-    MaximumIOPS?: number;
-    MaximumThroughput?: string;
-    MaximumSize?: string;
 
     AllocationUnits?: string | number;
     GroupSizeInUnits?: number;

package/src/store/reducers/storage/utils.ts

@@ -1,16 +1,7 @@
 import type {EFlag} from '../../../types/api/enums';
 import type {TNodeInfo, TNodesInfo} from '../../../types/api/nodes';
 import {TPDiskState} from '../../../types/api/pdisk';
-import type {
-    StorageGroupsResponse,
-    TGroupsStorageGroupInfo,
-    TStorageGroupInfo,
-    TStorageGroupInfoV2,
-    TStorageInfo,
-    TStoragePoolInfo,
-} from '../../../types/api/storage';
-import {EVDiskState} from '../../../types/api/vdisk';
-import type {TVDiskStateInfo} from '../../../types/api/vdisk';
+import type {StorageGroupsResponse, TGroupsStorageGroupInfo} from '../../../types/api/storage';
 import {
     getColorSeverity,
     getDataSeverityColor,
@@ -21,7 +12,6 @@ import {
     prepareWhiteboardVDiskData,
 } from '../../../utils/disks/prepareDisks';
 import {prepareNodeSystemState} from '../../../utils/nodes';
-import {getUsage} from '../../../utils/storage';
 import {parseUsToMs} from '../../../utils/timeParsers';
 import {parseOptionalNonNegativeNumber} from '../../../utils/utils';
 
@@ -47,7 +37,7 @@ const normalizeMaxPercent = (value: number | string | null | undefined): number
 
 // ==== Prepare groups ====
 
-function getGroupDiskSpaceStatus(group: TStorageGroupInfo | TGroupsStorageGroupInfo): EFlag {
+function getGroupDiskSpaceStatus(group: TGroupsStorageGroupInfo): EFlag {
     const {DiskSpace, VDisks = []} = group;
 
     if (DiskSpace) {
@@ -61,157 +51,6 @@ function getGroupDiskSpaceStatus(group: TStorageGroupInfo | TGroupsStorageGroupI
     return getDataSeverityColor(maxSeverity);
 }
 
-const prepareVDisk = (vDisk: TVDiskStateInfo, poolName: string | undefined) => {
-    const preparedVDisk = prepareWhiteboardVDiskData(vDisk);
-
-    // VDisk doesn't have its own StoragePoolName when located inside StoragePool data
-    return {
-        ...preparedVDisk,
-        StoragePoolName: poolName,
-        Donors: preparedVDisk?.Donors?.map((donor) => ({
-            ...donor,
-            StoragePoolName: poolName,
-        })),
-    };
-};
-
-const prepareStorageGroupData = (
-    group: TStorageGroupInfo,
-    pool: TStoragePoolInfo,
-): PreparedStorageGroup => {
-    let missing = 0;
-    let usedSpaceBytes = 0;
-    let limitSizeBytes = 0;
-    let readSpeedBytesPerSec = 0;
-    let writeSpeedBytesPerSec = 0;
-    let mediaType: string | undefined;
-
-    const {Name: poolName, MediaType: poolMediaType} = pool;
-
-    if (group.VDisks) {
-        for (const vDisk of group.VDisks) {
-            const {
-                Replicated,
-                VDiskState,
-                AvailableSize,
-                AllocatedSize,
-                PDisk,
-                ReadThroughput,
-                WriteThroughput,
-            } = vDisk;
-
-            const {
-                Type: PDiskType,
-                State: PDiskState,
-                AvailableSize: PDiskAvailableSize,
-            } = prepareWhiteboardPDiskData(PDisk);
-
-            if (
-                Replicated === false ||
-                PDiskState !== TPDiskState.Normal ||
-                VDiskState !== EVDiskState.OK
-            ) {
-                missing += 1;
-            }
-
-            const available = Number(AvailableSize ?? PDiskAvailableSize) || 0;
-            const allocated = Number(AllocatedSize) || 0;
-
-            usedSpaceBytes += allocated;
-            limitSizeBytes += available + allocated;
-
-            readSpeedBytesPerSec += Number(ReadThroughput) || 0;
-            writeSpeedBytesPerSec += Number(WriteThroughput) || 0;
-
-            mediaType = PDiskType && (PDiskType === mediaType || !mediaType) ? PDiskType : 'Mixed';
-        }
-    }
-
-    const vDisks = group.VDisks?.map((vdisk) => prepareVDisk(vdisk, poolName));
-
-    // Do not calculate usage if there is no limit
-    const usage = limitSizeBytes
-        ? getUsage({Used: usedSpaceBytes, Limit: limitSizeBytes}, 5)
-        : undefined;
-
-    const diskSpaceStatus = getGroupDiskSpaceStatus(group);
-
-    return {
-        ...group,
-        GroupGeneration: group.GroupGeneration ? String(group.GroupGeneration) : undefined,
-        GroupId: group.GroupID,
-        Overall: group.Overall,
-        VDisks: vDisks,
-        Usage: usage,
-        Read: readSpeedBytesPerSec,
-        Write: writeSpeedBytesPerSec,
-        PoolName: poolName,
-        Used: usedSpaceBytes,
-        Limit: limitSizeBytes,
-        Degraded: missing,
-        MediaType: poolMediaType || mediaType || undefined,
-        DiskSpace: diskSpaceStatus,
-    };
-};
-
-const prepareStorageGroupDataV2 = (group: TStorageGroupInfoV2): PreparedStorageGroup => {
-    const {
-        VDisks = [],
-        PoolName,
-        Usage = 0,
-        Read = 0,
-        Write = 0,
-        Used = 0,
-        Limit = 0,
-        Degraded = 0,
-        Kind,
-        MediaType,
-        GroupID,
-        Overall,
-        GroupGeneration,
-    } = group;
-
-    const vDisks = VDisks.map((vdisk) => prepareVDisk(vdisk, PoolName));
-    const usage = Number(Usage) * 100;
-
-    const diskSpaceStatus = getGroupDiskSpaceStatus(group);
-
-    return {
-        ...group,
-        PoolName,
-        GroupId: GroupID,
-        MediaType: MediaType || Kind,
-        VDisks: vDisks,
-        Usage: usage,
-        Overall,
-        GroupGeneration: GroupGeneration ? String(GroupGeneration) : undefined,
-        Read: Number(Read),
-        Write: Number(Write),
-        Used: Number(Used),
-        Limit: Number(Limit),
-        Degraded: Number(Degraded),
-        DiskSpace: diskSpaceStatus,
-    };
-};
-
-const prepareStorageGroups = (
-    StorageGroups?: TStorageGroupInfoV2[],
-    StoragePools?: TStoragePoolInfo[],
-) => {
-    let preparedGroups: PreparedStorageGroup[] = [];
-    if (StorageGroups) {
-        preparedGroups = StorageGroups.map(prepareStorageGroupDataV2);
-    } else {
-        StoragePools?.forEach((pool) => {
-            pool.Groups?.forEach((group) => {
-                preparedGroups.push(prepareStorageGroupData(group, pool));
-            });
-        });
-    }
-
-    return preparedGroups;
-};
-
 // ==== Prepare nodes ====
 
 const prepareStorageNodeData = (
@@ -237,10 +76,10 @@ const prepareStorageNodeData = (
         }).length || 0;
 
     const pDisks = PDisks?.map((pDisk) => {
-        return {
-            ...prepareWhiteboardPDiskData(pDisk),
+        return prepareWhiteboardPDiskData({
+            ...pDisk,
             NodeId,
-        };
+        });
     });
     const vDisks = VDisks?.map((vDisk) => {
         return {
@@ -361,18 +200,6 @@ export const prepareStorageNodesResponse = (data: TNodesInfo): PreparedStorageRe
     };
 };
 
-export const prepareStorageResponse = (data: TStorageInfo): PreparedStorageResponse => {
-    const {StoragePools, StorageGroups, TotalGroups, FoundGroups} = data;
-
-    const preparedGroups = prepareStorageGroups(StorageGroups, StoragePools);
-
-    return {
-        groups: preparedGroups,
-        total: Number(TotalGroups) || preparedGroups.length,
-        found: Number(FoundGroups),
-    };
-};
-
 export function prepareGroupsResponse(data: StorageGroupsResponse): PreparedStorageResponse {
     const {FoundGroups, TotalGroups, StorageGroups = [], StorageGroupGroups} = data;
     const preparedGroups: PreparedStorageGroup[] = StorageGroups.map((group) => {

package/src/store/reducers/tenant/tenant.ts

@@ -5,6 +5,7 @@ import type {TTenantInfo} from '../../../types/api/tenant';
 import {useClusterNameFromQuery} from '../../../utils/hooks/useDatabaseFromQuery';
 import {useDatabasesV2} from '../../../utils/hooks/useDatabasesV2';
 import {api} from '../api';
+import {getDatabaseDataTag} from '../entityDataTags';
 import {prepareTenants} from '../tenants/utils';
 
 import {TENANT_DIAGNOSTICS_TABS_IDS, TENANT_METRICS_TABS_IDS} from './constants';
@@ -90,7 +91,22 @@ export const tenantApi = api.injectEndpoints({
                     return {error};
                 }
             },
-            providesTags: ['All'],
+            providesTags: (result, _error, {clusterName, database}) => {
+                const databaseAliases = new Set([database]);
+                if (result?.Id) {
+                    databaseAliases.add(result.Id);
+                }
+                if (result?.Name) {
+                    databaseAliases.add(result.Name);
+                }
+
+                return [
+                    'All' as const,
+                    ...Array.from(databaseAliases, (databaseAlias) =>
+                        getDatabaseDataTag({clusterName, database: databaseAlias}),
+                    ),
+                ];
+            },
             serializeQueryArgs: ({queryArgs}) => {
                 const {clusterName, database} = queryArgs;
                 return {clusterName, database};