fix: review fixes and rebase on main

Author: astandrik

src/components/PDiskPopup/PDiskPopup.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import type {PopupProps} from '@gravity-ui/uikit';
 import {Popup} from '@gravity-ui/uikit';
 
-import {selectNodeNamesMap} from '../../store/reducers/nodesList';
+import {selectNodeHostsMap} from '../../store/reducers/nodesList';
 import {EFlag} from '../../types/api/enums';
 import {valueIsDefined} from '../../utils';
 import {cn} from '../../utils/cn';
@@ -21,7 +21,7 @@ const b = cn('pdisk-storage-popup');
 
 const errorColors = [EFlag.Orange, EFlag.Red, EFlag.Yellow];
 
-export const preparePDiskData = (data: PreparedPDisk, nodeName?: string) => {
+export const preparePDiskData = (data: PreparedPDisk, nodeHost?: string) => {
     const {AvailableSize, TotalSize, State, PDiskId, NodeId, Path, Realtime, Type, Device} = data;
 
     const pdiskData: InfoViewerItem[] = [
@@ -37,8 +37,8 @@ export const preparePDiskData = (data: PreparedPDisk, nodeName?: string) => {
         pdiskData.push({label: 'Node Id', value: NodeId});
     }
 
-    if (nodeName) {
-        pdiskData.push({label: 'Host', value: nodeName});
+    if (nodeHost) {
+        pdiskData.push({label: 'Host', value: nodeHost});
     }
 
     if (Path) {
@@ -66,9 +66,9 @@ interface PDiskPopupProps extends PopupProps {
 }
 
 export const PDiskPopup = ({data, ...props}: PDiskPopupProps) => {
-    const nodeNamesMap = useTypedSelector(selectNodeNamesMap);
-    const nodeName = valueIsDefined(data.NodeId) ? nodeNamesMap?.get(data.NodeId) : undefined;
-    const info = React.useMemo(() => preparePDiskData(data, nodeName), [data, nodeName]);
+    const nodeHostsMap = useTypedSelector(selectNodeHostsMap);
+    const nodeHost = valueIsDefined(data.NodeId) ? nodeHostsMap?.get(data.NodeId) : undefined;
+    const info = React.useMemo(() => preparePDiskData(data, nodeHost), [data, nodeHost]);
 
     return (
         <Popup

src/components/VDiskPopup/VDiskPopup.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import type {PopupProps} from '@gravity-ui/uikit';
 import {Label, Popup} from '@gravity-ui/uikit';
 
-import {selectNodeNamesMap} from '../../store/reducers/nodesList';
+import {selectNodeHostsMap} from '../../store/reducers/nodesList';
 import {EFlag} from '../../types/api/enums';
 import type {TVDiskStateInfo} from '../../types/api/vdisk';
 import {valueIsDefined} from '../../utils';
@@ -141,11 +141,11 @@ export const VDiskPopup = ({data, ...props}: VDiskPopupProps) => {
         [data, isFullData],
     );
 
-    const nodeNamesMap = useTypedSelector(selectNodeNamesMap);
-    const nodeName = valueIsDefined(data.NodeId) ? nodeNamesMap?.get(data.NodeId) : undefined;
+    const nodeHostsMap = useTypedSelector(selectNodeHostsMap);
+    const nodeHost = valueIsDefined(data.NodeId) ? nodeHostsMap?.get(data.NodeId) : undefined;
     const pdiskInfo = React.useMemo(
-        () => isFullData && data.PDisk && preparePDiskData(data.PDisk, nodeName),
-        [data, nodeName, isFullData],
+        () => isFullData && data.PDisk && preparePDiskData(data.PDisk, nodeHost),
+        [data, nodeHost, isFullData],
     );
 
     return (

src/containers/Storage/PaginatedStorageGroups.tsx

@@ -52,8 +52,10 @@ export function PaginatedStorageGroups(props: PaginatedStorageProps) {
 function StorageGroupsComponent({database, nodeId, parentContainer}: PaginatedStorageProps) {
     const {searchValue, visibleEntities, handleShowAllGroups} = useStorageQueryParams();
 
-    const {columnsToShow, columnsToSelect, setColumns} =
-        useStorageGroupsSelectedColumns(visibleEntities);
+    const {columnsToShow, columnsToSelect, setColumns} = useStorageGroupsSelectedColumns({
+        visibleEntities,
+        nodeId,
+    });
 
     const renderControls: RenderControls = ({totalEntities, foundEntities, inited}) => {
         return (
@@ -89,8 +91,10 @@ function GroupedStorageGroupsComponent({database, groupId, nodeId}: PaginatedSto
     const {searchValue, storageGroupsGroupByParam, visibleEntities, handleShowAllGroups} =
         useStorageQueryParams();
 
-    const {columnsToShow, columnsToSelect, setColumns} =
-        useStorageGroupsSelectedColumns(visibleEntities);
+    const {columnsToShow, columnsToSelect, setColumns} = useStorageGroupsSelectedColumns({
+        visibleEntities,
+        nodeId,
+    });
 
     const {currentData, isFetching, error} = storageApi.useGetStorageGroupsInfoQuery(
         {

src/containers/Tenant/Diagnostics/Partitions/Partitions.tsx

@@ -5,7 +5,7 @@ import {skipToken} from '@reduxjs/toolkit/query';
 import {ResponseError} from '../../../../components/Errors/ResponseError';
 import {ResizeableDataTable} from '../../../../components/ResizeableDataTable/ResizeableDataTable';
 import {TableSkeleton} from '../../../../components/TableSkeleton/TableSkeleton';
-import {nodesListApi, selectNodeNamesMap} from '../../../../store/reducers/nodesList';
+import {nodesListApi, selectNodeHostsMap} from '../../../../store/reducers/nodesList';
 import {partitionsApi, setSelectedConsumer} from '../../../../store/reducers/partitions/partitions';
 import {selectConsumersNames, topicApi} from '../../../../store/reducers/topic';
 import {cn} from '../../../../utils/cn';
@@ -55,7 +55,7 @@ export const Partitions = ({path, database}: PartitionsProps) => {
         error: nodesError,
     } = nodesListApi.useGetNodesListQuery(undefined);
     const nodesLoading = nodesIsFetching && nodesData === undefined;
-    const nodesMap = useTypedSelector(selectNodeNamesMap);
+    const nodeHostsMap = useTypedSelector(selectNodeHostsMap);
 
     const [hiddenColumns, setHiddenColumns] = useSetting<string[]>(PARTITIONS_HIDDEN_COLUMNS_KEY);
 
@@ -71,8 +71,8 @@ export const Partitions = ({path, database}: PartitionsProps) => {
     const rawPartitions = partitionsData;
 
     const partitionsWithHosts = React.useMemo(() => {
-        return addHostToPartitions(rawPartitions, nodesMap);
-    }, [rawPartitions, nodesMap]);
+        return addHostToPartitions(rawPartitions, nodeHostsMap);
+    }, [rawPartitions, nodeHostsMap]);
 
     // Wrong consumer could be passed in search query
     // Reset consumer if it doesn't exist for current topic

src/containers/Tenant/Diagnostics/Partitions/utils/index.ts

@@ -1,21 +1,21 @@
 import type {PreparedPartitionData} from '../../../../../store/reducers/partitions/types';
-import type {NodesMap} from '../../../../../types/store/nodesList';
+import type {NodeHostsMap} from '../../../../../types/store/nodesList';
 
 import type {PreparedPartitionDataWithHosts} from './types';
 
 export const addHostToPartitions = (
     partitions: PreparedPartitionData[] = [],
-    nodesMap?: NodesMap,
+    nodeHosts?: NodeHostsMap,
 ): PreparedPartitionDataWithHosts[] => {
     return partitions?.map((partition) => {
         const partitionHost =
-            partition.partitionNodeId && nodesMap
-                ? nodesMap.get(partition.partitionNodeId)
+            partition.partitionNodeId && nodeHosts
+                ? nodeHosts.get(partition.partitionNodeId)
                 : undefined;
 
         const connectionHost =
-            partition.connectionNodeId && nodesMap
-                ? nodesMap.get(partition.connectionNodeId)
+            partition.connectionNodeId && nodeHosts
+                ? nodeHosts.get(partition.connectionNodeId)
                 : undefined;
 
         return {

src/store/reducers/nodesList.ts

@@ -1,6 +1,6 @@
 import {createSelector} from '@reduxjs/toolkit';
 
-import {prepareNodesMap} from '../../utils/nodes';
+import {prepareNodeHostsMap} from '../../utils/nodes';
 import type {RootState} from '../defaultStore';
 
 import {api} from './api';
@@ -24,7 +24,7 @@ export const nodesListApi = api.injectEndpoints({
 
 const selectNodesList = nodesListApi.endpoints.getNodesList.select(undefined);
 
-export const selectNodeNamesMap = createSelector(
+export const selectNodeHostsMap = createSelector(
     (state: RootState) => selectNodesList(state).data,
-    (data) => prepareNodesMap(data),
+    (data) => prepareNodeHostsMap(data),
 );

src/store/reducers/tablet.ts

@@ -1,6 +1,6 @@
 import type {TDomainKey} from '../../types/api/tablet';
 import type {ITabletPreparedHistoryItem} from '../../types/store/tablet';
-import {prepareNodesMap} from '../../utils/nodes';
+import {prepareNodeHostsMap} from '../../utils/nodes';
 
 import {api} from './api';
 
@@ -17,7 +17,7 @@ export const tabletApi = api.injectEndpoints({
                         window.api.getTabletHistory({id, database, nodeId}, {signal}),
                         window.api.getNodesList({signal}),
                     ]);
-                    const nodesMap = prepareNodesMap(nodesList);
+                    const nodeHostsMap = prepareNodeHostsMap(nodesList);
 
                     const historyData = Object.keys(historyResponseData).reduce<
                         ITabletPreparedHistoryItem[]
@@ -30,7 +30,9 @@ export const tabletApi = api.injectEndpoints({
                                 leaderTablet;
 
                             const fqdn =
-                                nodesMap && nodeId ? nodesMap.get(Number(nodeId)) : undefined;
+                                nodeHostsMap && nodeId
+                                    ? nodeHostsMap.get(Number(nodeId))
+                                    : undefined;
 
                             if (State !== 'Dead') {
                                 list.push({

src/store/reducers/tablets.ts

@@ -6,7 +6,7 @@ import type {TabletsApiRequestParams} from '../../types/store/tablets';
 import type {RootState} from '../defaultStore';
 
 import {api} from './api';
-import {selectNodeNamesMap} from './nodesList';
+import {selectNodeHostsMap} from './nodesList';
 
 export const tabletsApi = api.injectEndpoints({
     endpoints: (build) => ({
@@ -42,16 +42,16 @@ export const selectGetTabletsInfo = createSelector(
 
 export const selectTabletsWithFqdn = createSelector(
     (state: RootState, params: TabletsApiRequestParams) => selectGetTabletsInfo(state, params),
-    (state: RootState) => selectNodeNamesMap(state),
-    (data, nodesMap): (TTabletStateInfo & {fqdn?: string})[] => {
+    (state: RootState) => selectNodeHostsMap(state),
+    (data, nodeHostsMap): (TTabletStateInfo & {fqdn?: string})[] => {
         if (!data?.TabletStateInfo) {
             return [];
         }
-        if (!nodesMap) {
+        if (!nodeHostsMap) {
             return data.TabletStateInfo;
         }
         return data.TabletStateInfo.map((tablet) => {
-            const fqdn = tablet.NodeId === undefined ? undefined : nodesMap.get(tablet.NodeId);
+            const fqdn = tablet.NodeId === undefined ? undefined : nodeHostsMap.get(tablet.NodeId);
             return {...tablet, fqdn};
         });
     },

src/types/store/nodesList.ts

@@ -1 +1 @@
-export type NodesMap = Map<number, string>;
+export type NodeHostsMap = Map<number, string>;

src/utils/nodes.ts

@@ -6,7 +6,7 @@ import type {ProblemFilterValue} from '../store/reducers/settings/types';
 import {EFlag} from '../types/api/enums';
 import type {NodesSortValue, TSystemStateInfo} from '../types/api/nodes';
 import type {TNodeInfo} from '../types/api/nodesList';
-import type {NodesMap} from '../types/store/nodesList';
+import type {NodeHostsMap} from '../types/store/nodesList';
 
 import {HOUR_IN_SECONDS} from './constants';
 import {calcUptime} from './dataFormatters/dataFormatters';
@@ -30,12 +30,12 @@ export const NodesUptimeFilterTitles = {
 export const isUnavailableNode = (node: NodesPreparedEntity | TSystemStateInfo) =>
     !node.SystemState || node.SystemState === EFlag.Grey;
 
-export const prepareNodesMap = (nodesList?: TNodeInfo[]) => {
-    return nodesList?.reduce<NodesMap>((nodesMap, node) => {
+export const prepareNodeHostsMap = (nodesList?: TNodeInfo[]) => {
+    return nodesList?.reduce<NodeHostsMap>((nodeHosts, node) => {
         if (node.Id && node.Host) {
-            nodesMap.set(Number(node.Id), node.Host);
+            nodeHosts.set(Number(node.Id), node.Host);
         }
-        return nodesMap;
+        return nodeHosts;
     }, new Map());
 };