fix: selectNodesMap

Author: Raubzeug

src/components/PDiskPopup/PDiskPopup.tsx

@@ -10,6 +10,7 @@ import {EMPTY_DATA_PLACEHOLDER} from '../../utils/constants';
 import {createPDiskDeveloperUILink} from '../../utils/developerUI/developerUI';
 import type {PreparedPDisk} from '../../utils/disks/types';
 import {useTypedSelector} from '../../utils/hooks';
+import {useDatabaseFromQuery} from '../../utils/hooks/useDatabaseFromQuery';
 import {useIsUserAllowedToMakeChanges} from '../../utils/hooks/useIsUserAllowedToMakeChanges';
 import {bytesToGB, isNumeric} from '../../utils/utils';
 import {InfoViewer} from '../InfoViewer';
@@ -109,8 +110,9 @@ interface PDiskPopupProps {
 }
 
 export const PDiskPopup = ({data}: PDiskPopupProps) => {
+    const database = useDatabaseFromQuery();
     const isUserAllowedToMakeChanges = useIsUserAllowedToMakeChanges();
-    const nodesMap = useTypedSelector(selectNodesMap);
+    const nodesMap = useTypedSelector((state) => selectNodesMap(state, database));
     const nodeData = valueIsDefined(data.NodeId) ? nodesMap?.get(data.NodeId) : undefined;
     const info = React.useMemo(
         () => preparePDiskData(data, nodeData, isUserAllowedToMakeChanges),

src/components/VDiskPopup/VDiskPopup.tsx

@@ -257,7 +257,7 @@ export const VDiskPopup = ({data}: VDiskPopupProps) => {
         [data, isFullData, isUserAllowedToMakeChanges, database],
     );
 
-    const nodesMap = useTypedSelector(selectNodesMap);
+    const nodesMap = useTypedSelector((state) => selectNodesMap(state, database));
     const nodeData = valueIsDefined(data.NodeId) ? nodesMap?.get(data.NodeId) : undefined;
     const pdiskInfo = React.useMemo(
         () =>

src/containers/Storage/utils/index.ts

@@ -7,6 +7,7 @@ import {valueIsDefined} from '../../../utils';
 import type {PreparedVDisk} from '../../../utils/disks/types';
 import {generateEvaluator} from '../../../utils/generateEvaluator';
 import {useTypedSelector} from '../../../utils/hooks';
+import {useDatabaseFromQuery} from '../../../utils/hooks/useDatabaseFromQuery';
 import type {StorageViewContext} from '../types';
 
 const defaultDegradationEvaluator = generateEvaluator(['success', 'warning', 'danger'], 1, 2);
@@ -91,7 +92,8 @@ function isErasureWithDifferentDC(erasure?: Erasure) {
 }
 
 export function useVDisksWithDCMargins(vDisks: PreparedVDisk[] = [], erasure?: Erasure) {
-    const nodesMap = useTypedSelector(selectNodesMap);
+    const database = useDatabaseFromQuery();
+    const nodesMap = useTypedSelector((state) => selectNodesMap(state, database));
 
     return React.useMemo(() => {
         const disksWithMargins: number[] = [];

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

@@ -56,7 +56,7 @@ export const Partitions = ({path, database}: PartitionsProps) => {
         error: nodesError,
     } = nodesListApi.useGetNodesListQuery({database}, undefined);
     const nodesLoading = nodesIsFetching && nodesData === undefined;
-    const nodeHostsMap = useTypedSelector(selectNodesMap);
+    const nodeHostsMap = useTypedSelector((state) => selectNodesMap(state, database));
 
     const [hiddenColumns, setHiddenColumns] = useSetting<string[]>(PARTITIONS_HIDDEN_COLUMNS_KEY);
 

src/store/reducers/nodesList.ts

@@ -21,9 +21,13 @@ export const nodesListApi = api.injectEndpoints({
     overrideExisting: 'throw',
 });
 
-const selectNodesList = nodesListApi.endpoints.getNodesList.select(undefined);
+const createGetNodesListSelector = createSelector(
+    (database?: string) => database,
+    (database) => nodesListApi.endpoints.getNodesList.select({database}),
+);
 
 export const selectNodesMap = createSelector(
-    (state: RootState) => selectNodesList(state).data,
-    (data) => prepareNodesMap(data),
+    (state: RootState) => state,
+    (_state: RootState, database?: string) => createGetNodesListSelector(database),
+    (state, selectNodesList) => prepareNodesMap(selectNodesList(state).data),
 );

src/store/reducers/tablets.ts

@@ -42,7 +42,7 @@ const selectGetTabletsInfo = createSelector(
 
 export const selectTabletsWithFqdn = createSelector(
     (state: RootState, params: TabletsApiRequestParams) => selectGetTabletsInfo(state, params),
-    (state: RootState) => selectNodesMap(state),
+    (state: RootState, params: TabletsApiRequestParams) => selectNodesMap(state, params.database),
     (data, nodeHostsMap): (TTabletStateInfo & {fqdn?: string})[] => {
         if (!data?.TabletStateInfo) {
             return [];