Add optional Tablets column to storage nodes and PDisks column to cluster nodes

Co-authored-by: adameat <[email protected]>

Author: Copilot

src/components/nodesColumns/NodesColumns.scss

@@ -3,4 +3,20 @@
     &__column-cpu {
         min-width: 40px;
     }
+
+    &__pdisks-column {
+        overflow: visible; // to enable stacked disks overflow the row
+    }
+
+    &__pdisks-wrapper {
+        display: flex;
+        gap: 10px;
+
+        height: 40px;
+    }
+
+    &__pdisks-item {
+        display: flex;
+        flex-shrink: 0;
+    }
 }

src/containers/Nodes/columns/columns.tsx

@@ -1,3 +1,5 @@
+import DataTable from '@gravity-ui/react-data-table';
+
 import {
     getCpuColumn,
     getDataCenterColumn,
@@ -14,10 +16,65 @@ import {
     getUptimeColumn,
     getVersionColumn,
 } from '../../../components/nodesColumns/columns';
-import {isSortableNodesColumn} from '../../../components/nodesColumns/constants';
+import {
+    NODES_COLUMNS_IDS,
+    NODES_COLUMNS_TITLES,
+    isSortableNodesColumn,
+} from '../../../components/nodesColumns/constants';
 import type {GetNodesColumnsParams} from '../../../components/nodesColumns/types';
 import type {NodesPreparedEntity} from '../../../store/reducers/nodes/types';
+import type {TPDiskStateInfo} from '../../../types/api/pdisk';
+import type {TVDiskStateInfo} from '../../../types/api/vdisk';
+import {cn} from '../../../utils/cn';
+import {
+    prepareWhiteboardPDiskData,
+    prepareWhiteboardVDiskData,
+} from '../../../utils/disks/prepareDisks';
 import type {Column} from '../../../utils/tableUtils/types';
+import {PDisk} from '../../Storage/PDisk/PDisk';
+
+const b = cn('ydb-nodes-columns');
+
+// Extended type for nodes that may have disk information
+type NodeWithDisks = NodesPreparedEntity & {
+    PDisks?: TPDiskStateInfo[];
+    VDisks?: TVDiskStateInfo[];
+};
+
+function getPDisksColumn(): Column<NodesPreparedEntity> {
+    return {
+        name: NODES_COLUMNS_IDS.PDisks,
+        header: NODES_COLUMNS_TITLES.PDisks,
+        className: b('pdisks-column'),
+        render: ({row}) => {
+            const nodeWithDisks = row as NodeWithDisks;
+            return (
+                <div className={b('pdisks-wrapper')}>
+                    {nodeWithDisks.PDisks?.map((pDisk) => {
+                        const preparedPDisk = prepareWhiteboardPDiskData(pDisk);
+                        const vDisks = nodeWithDisks.VDisks?.filter(
+                            (vdisk) => vdisk.PDiskId === pDisk.PDiskId,
+                        );
+                        const preparedVDisks = vDisks?.map(prepareWhiteboardVDiskData);
+
+                        return (
+                            <div className={b('pdisks-item')} key={pDisk.PDiskId}>
+                                <PDisk
+                                    data={preparedPDisk}
+                                    vDisks={preparedVDisks}
+                                    viewContext={{}}
+                                />
+                            </div>
+                        );
+                    })}
+                </div>
+            );
+        },
+        align: DataTable.CENTER,
+        sortable: false,
+        resizeable: false,
+    };
+}
 
 export function getNodesColumns(params: GetNodesColumnsParams): Column<NodesPreparedEntity>[] {
     const columns = [
@@ -35,6 +92,7 @@ export function getNodesColumns(params: GetNodesColumnsParams): Column<NodesPrep
         getLoadAverageColumn<NodesPreparedEntity>(),
         getVersionColumn<NodesPreparedEntity>(),
         getTabletsColumn<NodesPreparedEntity>(params),
+        getPDisksColumn(),
     ];
 
     return columns.map((column) => {

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

@@ -13,6 +13,7 @@ import {
     getPoolsColumn,
     getRAMColumn,
     getRackColumn,
+    getTabletsColumn,
     getUptimeColumn,
     getVersionColumn,
 } from '../../../../components/nodesColumns/columns';
@@ -97,6 +98,7 @@ export const getStorageNodesColumns = ({
         getDiskSpaceUsageColumn<PreparedStorageNode>(),
         getVersionColumn<PreparedStorageNode>(),
         getMissingDisksColumn<PreparedStorageNode>(),
+        getTabletsColumn<PreparedStorageNode>({database}),
         getPDisksColumn({viewContext, columnsSettings}),
     ];
 

src/utils/yaMetrica.ts

@@ -2,11 +2,10 @@ import {uiFactory} from '../uiFactory/uiFactory';
 
 /**
  * Interface for a counter that provides methods for tracking metrics.
- *
- * @method hit - Tracks a hit event with optional arguments. https://yandex.ru/support/metrica/ru/objects/hit
- * @method params - Sets parameters for the counter with optional arguments. https://yandex.ru/support/metrica/ru/objects/params-method
- * @method userParams - Sets user-specific parameters for the counter with optional arguments. https://yandex.ru/support/metrica/ru/objects/user-params
- * @method reachGoal - Tracks a goal achievement event with optional arguments. https://yandex.ru/support/metrica/ru/objects/reachgoal
+ * @function hit - Tracks a hit event with optional arguments. https://yandex.ru/support/metrica/ru/objects/hit
+ * @function params - Sets parameters for the counter with optional arguments. https://yandex.ru/support/metrica/ru/objects/params-method
+ * @function userParams - Sets user-specific parameters for the counter with optional arguments. https://yandex.ru/support/metrica/ru/objects/user-params
+ * @function reachGoal - Tracks a goal achievement event with optional arguments. https://yandex.ru/support/metrica/ru/objects/reachgoal
  */
 export interface Counter {
     hit: (...args: unknown[]) => void;
@@ -21,7 +20,6 @@ const yaMetricaMap = uiFactory.yaMetricaMap;
  * A fake implementation of a counter metric for Yandex.Metrica.
  * This class is used when the actual Yandex.Metrica counter is not defined,
  * and it provides a warning message the first time any of its methods are called.
- *
  * @property name - The name of the counter.
  * @property warnShown - Flag to indicate if the warning has been shown.
  */
@@ -61,7 +59,6 @@ class FakeMetrica implements Counter {
 /**
  * Retrieves a Yandex Metrica instance by name from the global window object.
  * If no instance is found for the given name, returns a FakeMetrica instance instead.
- *
  * @param name The name of the metrica to retrieve
  * @returns The Yandex Metrica instance if found, otherwise a FakeMetrica instance
  */