Skip to content

Commit 141f8b4

Browse files
fix(PDisk): show node host name in popup
1 parent 73642db commit 141f8b4

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

src/containers/Storage/PDisk/PDisk.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ import {PDiskPopup} from '../../../components/PDiskPopup/PDiskPopup';
66
import {VDiskWithDonorsStack} from '../../../components/VDisk/VDiskWithDonorsStack';
77
import routes, {createHref, getPDiskPagePath} from '../../../routes';
88
import {useDiskPagesAvailable} from '../../../store/reducers/capabilities/hooks';
9+
import {selectNodesMap} from '../../../store/reducers/nodesList';
910
import type {TVDiskStateInfo} from '../../../types/api/vdisk';
1011
import {valueIsDefined} from '../../../utils';
1112
import {cn} from '../../../utils/cn';
1213
import {stringifyVdiskId} from '../../../utils/dataFormatters/dataFormatters';
1314
import type {PreparedPDisk} from '../../../utils/disks/types';
15+
import {useTypedSelector} from '../../../utils/hooks';
1416
import {STRUCTURE} from '../../Node/NodePages';
1517

1618
import './PDisk.scss';
@@ -38,6 +40,7 @@ export const PDisk = ({
3840
}: PDiskProps) => {
3941
const [isPopupVisible, setIsPopupVisible] = React.useState(false);
4042

43+
const nodes = useTypedSelector(selectNodesMap);
4144
const diskPagesAvailable = useDiskPagesAvailable();
4245

4346
const anchor = React.useRef(null);
@@ -113,7 +116,12 @@ export const PDisk = ({
113116
<div className={b('media-type')}>{data.Type}</div>
114117
</InternalLink>
115118
</div>
116-
<PDiskPopup data={data} anchorRef={anchor} open={isPopupVisible || showPopup} />
119+
<PDiskPopup
120+
data={data}
121+
nodes={nodes}
122+
anchorRef={anchor}
123+
open={isPopupVisible || showPopup}
124+
/>
117125
</React.Fragment>
118126
);
119127
};

src/containers/Storage/StorageNodes/columns/columns.tsx

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import DataTable from '@gravity-ui/react-data-table';
22

33
import {NodeHostWrapper} from '../../../../components/NodeHostWrapper/NodeHostWrapper';
4-
import type {AdditionalNodesProps} from '../../../../types/additionalProps';
54
import {cn} from '../../../../utils/cn';
65
import {EMPTY_DATA_PLACEHOLDER} from '../../../../utils/constants';
76
import {isSortableNodesProperty} from '../../../../utils/nodes';
@@ -14,10 +13,7 @@ import './StorageNodesColumns.scss';
1413

1514
const b = cn('ydb-storage-nodes-columns');
1615

17-
const getStorageNodesColumns = (
18-
additionalNodesProps: AdditionalNodesProps | undefined,
19-
database?: string,
20-
) => {
16+
const getStorageNodesColumns = ({additionalNodesProps, database}: GetStorageNodesColumnsParams) => {
2117
const getNodeRef = additionalNodesProps?.getNodeRef;
2218

2319
const columns: StorageNodesColumn[] = [
@@ -98,11 +94,8 @@ const getStorageNodesColumns = (
9894
return columns;
9995
};
10096

101-
export const getPreparedStorageNodesColumns = ({
102-
additionalNodesProps,
103-
database,
104-
}: GetStorageNodesColumnsParams) => {
105-
const rawColumns = getStorageNodesColumns(additionalNodesProps, database);
97+
export const getPreparedStorageNodesColumns = (params: GetStorageNodesColumnsParams) => {
98+
const rawColumns = getStorageNodesColumns(params);
10699

107100
const sortableColumns = rawColumns.map((column) => ({
108101
...column,

0 commit comments

Comments
 (0)