fix(Overview): use nodes?group=Version to get node versions (#1230)

Author: ValeraS

src/containers/Cluster/ClusterInfo/ClusterInfo.tsx

@@ -25,7 +25,7 @@ import {cn} from '../../../utils/cn';
 import {DEVELOPER_UI_TITLE} from '../../../utils/constants';
 import {formatStorageValues} from '../../../utils/dataFormatters/dataFormatters';
 import {useTypedSelector} from '../../../utils/hooks';
-import {parseNodesToVersionsValues} from '../../../utils/versions';
+import {parseNodeGroupsToVersionsValues, parseNodesToVersionsValues} from '../../../utils/versions';
 import {VersionsBar} from '../VersionsBar/VersionsBar';
 import i18n from '../i18n';
 
@@ -214,12 +214,18 @@ export const ClusterInfo = ({
 
     const {currentData} = nodesApi.useGetNodesQuery({
         tablets: false,
+        group: 'Version',
     });
 
-    const nodes = currentData?.Nodes;
     const versionsValues = React.useMemo(() => {
-        return parseNodesToVersionsValues(nodes, versionToColor);
-    }, [nodes, versionToColor]);
+        if (!currentData) {
+            return [];
+        }
+        if (Array.isArray(currentData.NodeGroups)) {
+            return parseNodeGroupsToVersionsValues(currentData.NodeGroups, versionToColor);
+        }
+        return parseNodesToVersionsValues(currentData.Nodes, versionToColor);
+    }, [currentData, versionToColor]);
 
     let internalLink = backend + '/internal';
 

src/store/reducers/nodes/types.ts

@@ -76,15 +76,22 @@ export interface NodesApiRequestParams extends NodesGeneralRequestParams {
     visibleEntities?: VisibleEntities; // "with" param
     storage?: boolean;
     tablets?: boolean;
+    group?: string;
 }
 
 export interface ComputeApiRequestParams extends NodesGeneralRequestParams {
     path: string;
     version?: EVersion; // only v2 works with filters
 }
 
+export interface NodesGroup {
+    name: string;
+    count: number;
+}
+
 export interface NodesHandledResponse {
     Nodes?: NodesPreparedEntity[];
+    NodeGroups?: NodesGroup[];
     TotalNodes: number;
     FoundNodes?: number;
 }

src/store/reducers/nodes/utils.ts

@@ -67,8 +67,14 @@ export const prepareNodesData = (data: TNodesInfo): NodesHandledResponse => {
         };
     });
 
+    const preparedGroups = data.NodeGroups?.map((group) => ({
+        name: group.GroupName,
+        count: group.NodeCount,
+    }));
+
     return {
         Nodes: preparedNodes,
+        NodeGroups: preparedGroups,
         TotalNodes: Number(data.TotalNodes) || preparedNodes.length,
         FoundNodes: Number(data.FoundNodes),
     };

src/types/api/nodes.ts

@@ -11,6 +11,7 @@ import type {TVDiskStateInfo} from './vdisk';
 export interface TNodesInfo {
     Overall?: EFlag;
     Nodes?: TNodeInfo[];
+    NodeGroups?: TNodesGroup[];
 
     /** uint64 */
     TotalNodes: string;
@@ -26,6 +27,11 @@ export interface TNodeInfo {
     Tablets?: TTabletStateInfo[];
 }
 
+export interface TNodesGroup {
+    GroupName: string;
+    NodeCount: number;
+}
+
 /**
  * source: https://github.com/ydb-platform/ydb/blob/main/ydb/core/protos/node_whiteboard.proto
  */

src/utils/versions/parseNodesToVersionsValues.ts

@@ -1,3 +1,4 @@
+import type {NodesGroup} from '../../store/reducers/nodes/types';
 import type {TSystemStateInfo} from '../../types/api/nodes';
 import type {VersionToColorMap, VersionValue} from '../../types/versions';
 
@@ -27,3 +28,17 @@ export const parseNodesToVersionsValues = (
         };
     });
 };
+
+export function parseNodeGroupsToVersionsValues(
+    groups: NodesGroup[],
+    versionsToColor?: VersionToColorMap,
+) {
+    return groups.map((group) => {
+        return {
+            title: group.name,
+            version: group.name,
+            color: versionsToColor?.get(group.name),
+            value: group.count,
+        };
+    });
+}