fix: display rack for din nodes (#742)

Author: artemmufazalov

src/components/FullNodeViewer/FullNodeViewer.tsx

@@ -2,7 +2,6 @@ import cn from 'bem-cn-lite';
 
 import type {PreparedNode} from '../../store/reducers/node/types';
 import {LOAD_AVERAGE_TIME_INTERVALS} from '../../utils/constants';
-import {calcUptime} from '../../utils/dataFormatters/dataFormatters';
 
 import InfoViewer, {type InfoViewerItem} from '../InfoViewer/InfoViewer';
 import {ProgressViewer} from '../ProgressViewer/ProgressViewer';
@@ -32,7 +31,7 @@ export const FullNodeViewer = ({node, className}: FullNodeViewerProps) => {
 
     commonInfo.push(
         {label: 'Version', value: node?.Version},
-        {label: 'Uptime', value: calcUptime(node?.StartTime)},
+        {label: 'Uptime', value: node?.Uptime},
         {label: 'DC', value: node?.DataCenterDescription || node?.DC},
         {label: 'Rack', value: node?.Rack},
     );

src/store/reducers/node/types.ts

@@ -1,8 +1,8 @@
 import type {IResponseError} from '../../../types/api/error';
-import type {TSystemStateInfo} from '../../../types/api/nodes';
 import type {TPDiskStateInfo} from '../../../types/api/pdisk';
 import type {TStorageInfo} from '../../../types/api/storage';
 import type {TVDiskStateInfo} from '../../../types/api/vdisk';
+import type {PreparedNodeSystemState} from '../../../utils/nodes';
 import type {ApiRequestAction} from '../../utils';
 
 import {FETCH_NODE, FETCH_NODE_STRUCTURE, resetNode} from './node';
@@ -24,10 +24,7 @@ export interface PreparedStructurePDisk extends TPDiskStateInfo {
 
 export type PreparedNodeStructure = Record<string, PreparedStructurePDisk>;
 
-export interface PreparedNode extends TSystemStateInfo {
-    DC?: string;
-    Rack?: string;
-}
+export interface PreparedNode extends Partial<PreparedNodeSystemState> {}
 
 export interface NodeState {
     data: PreparedNode;

src/store/reducers/node/utils.ts

@@ -1,4 +1,5 @@
 import type {TEvSystemStateResponse} from '../../../types/api/systemState';
+import {prepareNodeSystemState} from '../../../utils/nodes';
 import type {PreparedNode} from './types';
 
 export const prepareNodeData = (data: TEvSystemStateResponse): PreparedNode => {
@@ -8,9 +9,5 @@ export const prepareNodeData = (data: TEvSystemStateResponse): PreparedNode => {
 
     const nodeData = data.SystemStateInfo[0];
 
-    return {
-        ...nodeData,
-        DC: nodeData.Location?.DataCenter,
-        Rack: nodeData.Location?.Rack,
-    };
+    return prepareNodeSystemState(nodeData);
 };

src/store/reducers/nodes/utils.ts

@@ -2,6 +2,7 @@ import type {TComputeInfo, TComputeNodeInfo, TComputeTenantInfo} from '../../../
 import type {TNodesInfo} from '../../../types/api/nodes';
 import {calcUptime} from '../../../utils/dataFormatters/dataFormatters';
 import {generateEvaluator} from '../../../utils/generateEvaluator';
+import {prepareNodeSystemState} from '../../../utils/nodes';
 
 import type {NodesHandledResponse, NodesPreparedEntity} from './types';
 
@@ -56,15 +57,10 @@ export const prepareNodesData = (data: TNodesInfo): NodesHandledResponse => {
         const sharedCacheLimit = Number(node.SystemState.SharedCacheStats?.LimitBytes) || undefined;
 
         return {
-            ...node.SystemState,
+            ...prepareNodeSystemState(node.SystemState),
             Tablets: node.Tablets,
             NodeId: node.NodeId,
-            Uptime: calcUptime(node.SystemState?.StartTime),
             TenantName: node.SystemState?.Tenants?.[0],
-
-            DC: node.SystemState.Location?.DataCenter,
-            Rack: node.SystemState.Location?.Rack,
-
             SharedCacheUsed: node.SystemState.SharedCacheStats?.UsedBytes,
             SharedCacheLimit: sharedCacheLimit,
         };

src/store/reducers/storage/utils.ts

@@ -10,7 +10,7 @@ import {TPDiskState} from '../../../types/api/pdisk';
 import {EFlag} from '../../../types/api/enums';
 import {getPDiskType} from '../../../utils/pdisk';
 import {getUsage} from '../../../utils/storage';
-import {calcUptime} from '../../../utils/dataFormatters/dataFormatters';
+import {prepareNodeSystemState} from '../../../utils/nodes';
 
 import type {PreparedStorageGroup, PreparedStorageNode, PreparedStorageResponse} from './types';
 
@@ -168,21 +168,14 @@ export const prepareStorageGroups = (
 // ==== Prepare nodes ====
 
 const prepareStorageNodeData = (node: TNodeInfo): PreparedStorageNode => {
-    const systemState = node.SystemState ?? {};
     const missing =
         node.PDisks?.filter((pDisk) => {
             return pDisk.State !== TPDiskState.Normal;
         }).length || 0;
 
     return {
+        ...prepareNodeSystemState(node.SystemState),
         NodeId: node.NodeId,
-        SystemState: systemState.SystemState,
-        DC: systemState.Location?.DataCenter,
-        Rack: systemState.Location?.Rack,
-        Host: systemState.Host,
-        Endpoints: systemState.Endpoints,
-        Uptime: calcUptime(systemState.StartTime),
-        StartTime: systemState.StartTime,
         PDisks: node.PDisks,
         VDisks: node.VDisks,
         Missing: missing,

src/utils/nodes.ts

@@ -7,6 +7,7 @@ import type {ProblemFilterValue} from '../store/reducers/settings/types';
 import {ProblemFilterValues} from '../store/reducers/settings/settings';
 import {EFlag} from '../types/api/enums';
 
+import {calcUptime} from './dataFormatters/dataFormatters';
 import {HOUR_IN_SECONDS} from './constants';
 
 export enum NodesUptimeFilterValues {
@@ -31,6 +32,29 @@ export const prepareNodesMap = (nodesList?: TNodeInfo[]) => {
     }, new Map());
 };
 
+export interface PreparedNodeSystemState extends TSystemStateInfo {
+    Rack?: string;
+    DC?: string;
+    Uptime: string;
+}
+
+export const prepareNodeSystemState = (
+    systemState: TSystemStateInfo = {},
+): PreparedNodeSystemState => {
+    // There is no Rack in Location field for din nodes
+    const Rack = systemState.Location?.Rack || systemState.Rack;
+    const DC = systemState.Location?.DataCenter || systemState.DataCenter;
+
+    const Uptime = calcUptime(systemState.StartTime);
+
+    return {
+        ...systemState,
+        Rack,
+        DC,
+        Uptime,
+    };
+};
+
 export const getProblemParamValue = (problemFilter: ProblemFilterValue | undefined) => {
     return problemFilter === ProblemFilterValues.PROBLEMS;
 };