fix: use shared getPDisksColumn implementation and storage node data preparation for cluster nodes

src/containers/Nodes/Nodes.tsx

@@ -8,7 +8,7 @@ import {
 } from '../../components/nodesColumns/constants';
 import type {NodesColumnId} from '../../components/nodesColumns/constants';
 import {useBridgeModeEnabled} from '../../store/reducers/capabilities/hooks';
-import type {NodesPreparedEntity} from '../../store/reducers/nodes/types';
+import type {PreparedStorageNode} from '../../store/reducers/storage/types';
 import type {AdditionalNodesProps} from '../../types/additionalProps';
 import type {NodesGroupByField} from '../../types/api/nodes';
 import {
@@ -33,7 +33,7 @@ export interface NodesProps {
     scrollContainerRef: React.RefObject<HTMLElement>;
     additionalNodesProps?: AdditionalNodesProps;
     withPeerRoleFilter?: boolean;
-    columns?: Column<NodesPreparedEntity>[];
+    columns?: Column<PreparedStorageNode>[];
     defaultColumnsIds?: NodesColumnId[];
     requiredColumnsIds?: NodesColumnId[];
     selectedColumnsKey?: string;

src/containers/Nodes/NodesTable.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import {Illustration} from '../../components/Illustration';
 import {ResizeablePaginatedTable} from '../../components/PaginatedTable';
 import {NODES_COLUMNS_WIDTH_LS_KEY} from '../../components/nodesColumns/constants';
-import type {NodesFilters, NodesPreparedEntity} from '../../store/reducers/nodes/types';
+import type {PreparedStorageNode} from '../../store/reducers/storage/types';
 import type {ProblemFilterValue} from '../../store/reducers/settings/types';
 import type {NodesGroupByField, NodesPeerRole} from '../../types/api/nodes';
 import {NodesUptimeFilterValues} from '../../utils/nodes';
@@ -14,6 +14,18 @@ import {getNodes} from './getNodes';
 import i18n from './i18n';
 import {getRowClassName} from './shared';
 
+// Define filters type for consistency with storage nodes
+interface NodesFilters {
+    searchValue?: string;
+    problemFilter?: ProblemFilterValue;
+    uptimeFilter?: NodesUptimeFilterValues;
+    peerRoleFilter?: NodesPeerRole;
+    path?: string;
+    database?: string;
+    filterGroup?: string;
+    filterGroupBy?: NodesGroupByField;
+}
+
 interface NodesTableProps {
     path?: string;
     database?: string;
@@ -26,7 +38,7 @@ interface NodesTableProps {
     filterGroup?: string;
     filterGroupBy?: NodesGroupByField;
 
-    columns: Column<NodesPreparedEntity>[];
+    columns: Column<PreparedStorageNode>[];
     scrollContainerRef: React.RefObject<HTMLElement>;
 
     initialEntitiesCount?: number;

src/containers/Nodes/PaginatedNodes/GroupedNodesComponent.tsx

@@ -6,7 +6,7 @@ import {PaginatedTableWithLayout} from '../../../components/PaginatedTable/Pagin
 import {NODES_COLUMNS_TITLES} from '../../../components/nodesColumns/constants';
 import type {NodesColumnId} from '../../../components/nodesColumns/constants';
 import {nodesApi} from '../../../store/reducers/nodes/nodes';
-import type {NodesPreparedEntity} from '../../../store/reducers/nodes/types';
+import type {PreparedStorageNode} from '../../../store/reducers/storage/types';
 import type {NodesGroupByField, NodesPeerRole} from '../../../types/api/nodes';
 import {useAutoRefreshInterval} from '../../../utils/hooks';
 import {useSelectedColumns} from '../../../utils/hooks/useSelectedColumns';
@@ -28,7 +28,7 @@ interface NodeGroupProps {
     searchValue: string;
     peerRoleFilter?: NodesPeerRole;
     groupByParam?: NodesGroupByField;
-    columns: Column<NodesPreparedEntity>[];
+    columns: Column<PreparedStorageNode>[];
     scrollContainerRef: React.RefObject<HTMLElement>;
     onIsExpandedChange: (name: string, isExpanded: boolean) => void;
 }
@@ -85,7 +85,7 @@ interface GroupedNodesComponentProps {
     database?: string;
     scrollContainerRef: React.RefObject<HTMLElement>;
     withPeerRoleFilter?: boolean;
-    columns: Column<NodesPreparedEntity>[];
+    columns: Column<PreparedStorageNode>[];
     defaultColumnsIds: NodesColumnId[];
     requiredColumnsIds: NodesColumnId[];
     selectedColumnsKey: string;

src/containers/Nodes/PaginatedNodes/NodesComponent.tsx

@@ -5,7 +5,7 @@ import {PaginatedTableWithLayout} from '../../../components/PaginatedTable/Pagin
 import {NODES_COLUMNS_TITLES} from '../../../components/nodesColumns/constants';
 import type {NodesColumnId} from '../../../components/nodesColumns/constants';
 import {useViewerNodesHandlerHasGrouping} from '../../../store/reducers/capabilities/hooks';
-import type {NodesPreparedEntity} from '../../../store/reducers/nodes/types';
+import type {PreparedStorageNode} from '../../../store/reducers/storage/types';
 import {useProblemFilter} from '../../../store/reducers/settings/hooks';
 import type {NodesGroupByField} from '../../../types/api/nodes';
 import {useSelectedColumns} from '../../../utils/hooks/useSelectedColumns';
@@ -19,7 +19,7 @@ interface NodesComponentProps {
     database?: string;
     scrollContainerRef: React.RefObject<HTMLElement>;
     withPeerRoleFilter?: boolean;
-    columns: Column<NodesPreparedEntity>[];
+    columns: Column<PreparedStorageNode>[];
     defaultColumnsIds: NodesColumnId[];
     requiredColumnsIds: NodesColumnId[];
     selectedColumnsKey: string;

src/containers/Nodes/PaginatedNodes/PaginatedNodes.tsx

@@ -7,7 +7,7 @@ import {
     useCapabilitiesLoaded,
     useViewerNodesHandlerHasGrouping,
 } from '../../../store/reducers/capabilities/hooks';
-import type {NodesPreparedEntity} from '../../../store/reducers/nodes/types';
+import type {PreparedStorageNode} from '../../../store/reducers/storage/types';
 import {useProblemFilter} from '../../../store/reducers/settings/hooks';
 import type {NodesGroupByField} from '../../../types/api/nodes';
 import {NodesUptimeFilterValues} from '../../../utils/nodes';
@@ -23,7 +23,7 @@ export interface PaginatedNodesProps {
     database?: string;
     scrollContainerRef: React.RefObject<HTMLElement>;
     withPeerRoleFilter?: boolean;
-    columns: Column<NodesPreparedEntity>[];
+    columns: Column<PreparedStorageNode>[];
     defaultColumnsIds: NodesColumnId[];
     requiredColumnsIds: NodesColumnId[];
     selectedColumnsKey: string;

src/containers/Nodes/columns/columns.tsx

@@ -16,25 +16,27 @@ import {
 } from '../../../components/nodesColumns/columns';
 import {isSortableNodesColumn} from '../../../components/nodesColumns/constants';
 import type {GetNodesColumnsParams} from '../../../components/nodesColumns/types';
-import type {NodesPreparedEntity} from '../../../store/reducers/nodes/types';
+import type {PreparedStorageNode} from '../../../store/reducers/storage/types';
 import type {Column} from '../../../utils/tableUtils/types';
+import {getPDisksColumn} from '../../Storage/PaginatedStorageNodesTable/columns/columns';
 
-export function getNodesColumns(params: GetNodesColumnsParams): Column<NodesPreparedEntity>[] {
+export function getNodesColumns(params: GetNodesColumnsParams): Column<PreparedStorageNode>[] {
     const columns = [
-        getNodeIdColumn<NodesPreparedEntity>(),
-        getHostColumn<NodesPreparedEntity>(params),
-        getNodeNameColumn<NodesPreparedEntity>(),
-        getDataCenterColumn<NodesPreparedEntity>(),
-        getPileNameColumn<NodesPreparedEntity>(),
-        getRackColumn<NodesPreparedEntity>(),
-        getUptimeColumn<NodesPreparedEntity>(),
-        getCpuColumn<NodesPreparedEntity>(),
-        getPoolsColumn<NodesPreparedEntity>(),
-        getRAMColumn<NodesPreparedEntity>(),
-        getMemoryColumn<NodesPreparedEntity>(),
-        getLoadAverageColumn<NodesPreparedEntity>(),
-        getVersionColumn<NodesPreparedEntity>(),
-        getTabletsColumn<NodesPreparedEntity>(params),
+        getNodeIdColumn<PreparedStorageNode>(),
+        getHostColumn<PreparedStorageNode>(params),
+        getNodeNameColumn<PreparedStorageNode>(),
+        getDataCenterColumn<PreparedStorageNode>(),
+        getPileNameColumn<PreparedStorageNode>(),
+        getRackColumn<PreparedStorageNode>(),
+        getUptimeColumn<PreparedStorageNode>(),
+        getCpuColumn<PreparedStorageNode>(),
+        getPoolsColumn<PreparedStorageNode>(),
+        getRAMColumn<PreparedStorageNode>(),
+        getMemoryColumn<PreparedStorageNode>(),
+        getLoadAverageColumn<PreparedStorageNode>(),
+        getVersionColumn<PreparedStorageNode>(),
+        getPDisksColumn({viewContext: {}, columnsSettings: undefined}),
+        getTabletsColumn<PreparedStorageNode>(params),
     ];
 
     return columns.map((column) => {

src/containers/Nodes/columns/constants.ts

@@ -13,7 +13,6 @@ export const DEFAULT_NODES_COLUMNS: NodesColumnId[] = [
     'CPU',
     'RAM',
     'Version',
-    'Tablets',
 ];
 
 export const REQUIRED_NODES_COLUMNS: NodesColumnId[] = ['NodeId'];

src/containers/Nodes/getNodes.ts

@@ -3,15 +3,16 @@ import {
     NODES_COLUMNS_TO_DATA_FIELDS,
     getNodesColumnSortField,
 } from '../../components/nodesColumns/constants';
-import type {NodesFilters, NodesPreparedEntity} from '../../store/reducers/nodes/types';
-import {prepareNodesData} from '../../store/reducers/nodes/utils';
+import type {NodesFilters} from '../../store/reducers/nodes/types';
+import type {PreparedStorageNode} from '../../store/reducers/storage/types';
+import {prepareStorageNodesResponse} from '../../store/reducers/storage/utils';
 import type {NodesRequestParams} from '../../types/api/nodes';
 import {prepareSortValue} from '../../utils/filters';
 import {getProblemParamValue, getUptimeParamValue} from '../../utils/nodes';
 import {getRequiredDataFields} from '../../utils/tableUtils/getRequiredDataFields';
 
 export const getNodes: FetchData<
-    NodesPreparedEntity,
+    PreparedStorageNode,
     NodesFilters,
     Pick<NodesRequestParams, 'type' | 'storage'>
 > = async (params) => {
@@ -50,11 +51,11 @@ export const getNodes: FetchData<
         filter_group_by: filterGroupBy,
         fieldsRequired: dataFieldsRequired,
     });
-    const preparedResponse = prepareNodesData(response);
+    const preparedResponse = prepareStorageNodesResponse(response);
 
     return {
-        data: preparedResponse.Nodes || [],
-        found: preparedResponse.FoundNodes || 0,
-        total: preparedResponse.TotalNodes || 0,
+        data: preparedResponse.nodes || [],
+        found: preparedResponse.found || 0,
+        total: preparedResponse.total || 0,
     };
 };

src/containers/Storage/PaginatedStorageNodesTable/columns/columns.tsx

@@ -13,6 +13,7 @@ import {
     getPoolsColumn,
     getRAMColumn,
     getRackColumn,
+    getTabletsColumn,
     getUptimeColumn,
     getVersionColumn,
 } from '../../../../components/nodesColumns/columns';
@@ -35,7 +36,7 @@ import './StorageNodesColumns.scss';
 
 const b = cn('ydb-storage-nodes-columns');
 
-const getPDisksColumn = ({
+export const getPDisksColumn = ({
     viewContext,
     columnsSettings,
 }: GetStorageNodesColumnsParams & {
@@ -98,6 +99,7 @@ export const getStorageNodesColumns = ({
         getVersionColumn<PreparedStorageNode>(),
         getMissingDisksColumn<PreparedStorageNode>(),
         getPDisksColumn({viewContext, columnsSettings}),
+        getTabletsColumn<PreparedStorageNode>({database}),
     ];
 
     const sortableColumns = columns.map((column) => ({

src/containers/Storage/PaginatedStorageNodesTable/columns/constants.ts

@@ -14,7 +14,6 @@ export const DEFAULT_STORAGE_NODES_COLUMNS: NodesColumnId[] = [
     'Uptime',
     'CPU',
     'RAM',
-    'PDisks',
 ];
 export const REQUIRED_STORAGE_NODES_COLUMNS: NodesColumnId[] = ['NodeId'];
 

src/store/reducers/storage/types.ts

@@ -3,6 +3,7 @@ import {z} from 'zod';
 import type {EFlag} from '../../../types/api/enums';
 import type {NodesGroupByField} from '../../../types/api/nodes';
 import type {Erasure, GroupsGroupByField} from '../../../types/api/storage';
+import type {TTabletStateInfo} from '../../../types/api/tablet';
 import type {PreparedPDisk, PreparedVDisk} from '../../../utils/disks/types';
 import type {NodesUptimeFilterValues, PreparedNodeSystemState} from '../../../utils/nodes';
 
@@ -33,6 +34,7 @@ export interface PreparedStorageNode extends PreparedNodeSystemState {
 
     PDisks?: PreparedPDisk[];
     VDisks?: PreparedVDisk[];
+    Tablets?: TTabletStateInfo[];
 
     Missing: number;
     MaximumSlotsPerDisk: number;

src/store/reducers/storage/utils.ts

@@ -222,6 +222,7 @@ const prepareStorageNodeData = (
         PileName: node.PileName,
         PDisks: pDisks,
         VDisks: vDisks,
+        Tablets: node.Tablets,
         Missing: missing,
         MaximumSlotsPerDisk: maximumSlotsPerDisk,
         MaximumDisksPerNode: maximumDisksPerNode,