File tree 2 files changed +16
-13
lines changed
2 files changed +16
-13
lines changed Original file line number Diff line number Diff line change @@ -6,10 +6,12 @@ import {PDiskPopup} from '../../../components/PDiskPopup/PDiskPopup';
6
6
import { VDiskWithDonorsStack } from '../../../components/VDisk/VDiskWithDonorsStack' ;
7
7
import routes , { createHref , getPDiskPagePath } from '../../../routes' ;
8
8
import { useDiskPagesAvailable } from '../../../store/reducers/capabilities/hooks' ;
9
+ import { selectNodesMap } from '../../../store/reducers/nodesList' ;
9
10
import { valueIsDefined } from '../../../utils' ;
10
11
import { cn } from '../../../utils/cn' ;
11
12
import { stringifyVdiskId } from '../../../utils/dataFormatters/dataFormatters' ;
12
13
import type { PreparedPDisk , PreparedVDisk } from '../../../utils/disks/types' ;
14
+ import { useTypedSelector } from '../../../utils/hooks' ;
13
15
import { STRUCTURE } from '../../Node/NodePages' ;
14
16
15
17
import './PDisk.scss' ;
@@ -39,6 +41,7 @@ export const PDisk = ({
39
41
} : PDiskProps ) => {
40
42
const [ isPopupVisible , setIsPopupVisible ] = React . useState ( false ) ;
41
43
44
+ const nodes = useTypedSelector ( selectNodesMap ) ;
42
45
const diskPagesAvailable = useDiskPagesAvailable ( ) ;
43
46
44
47
const anchor = React . useRef ( null ) ;
@@ -115,7 +118,12 @@ export const PDisk = ({
115
118
< div className = { b ( 'media-type' ) } > { data . Type } </ div >
116
119
</ InternalLink >
117
120
</ div >
118
- < PDiskPopup data = { data } anchorRef = { anchor } open = { isPopupVisible || showPopup } />
121
+ < PDiskPopup
122
+ data = { data }
123
+ nodes = { nodes }
124
+ anchorRef = { anchor }
125
+ open = { isPopupVisible || showPopup }
126
+ />
119
127
</ React . Fragment >
120
128
) ;
121
129
} ;
Original file line number Diff line number Diff line change 1
1
import DataTable from '@gravity-ui/react-data-table' ;
2
2
3
3
import { NodeHostWrapper } from '../../../../components/NodeHostWrapper/NodeHostWrapper' ;
4
- import type { AdditionalNodesProps } from '../../../../types/additionalProps' ;
5
4
import { cn } from '../../../../utils/cn' ;
6
5
import { EMPTY_DATA_PLACEHOLDER } from '../../../../utils/constants' ;
7
6
import { isSortableNodesProperty } from '../../../../utils/nodes' ;
@@ -14,11 +13,11 @@ import './StorageNodesColumns.scss';
14
13
15
14
const b = cn ( 'ydb-storage-nodes-columns' ) ;
16
15
17
- const getStorageNodesColumns = (
18
- additionalNodesProps : AdditionalNodesProps | undefined ,
19
- database ?: string ,
20
- groupId ?: string ,
21
- ) => {
16
+ const getStorageNodesColumns = ( {
17
+ additionalNodesProps,
18
+ database,
19
+ groupId,
20
+ } : GetStorageNodesColumnsParams ) => {
22
21
const getNodeRef = additionalNodesProps ?. getNodeRef ;
23
22
24
23
const columns : StorageNodesColumn [ ] = [
@@ -107,12 +106,8 @@ const getStorageNodesColumns = (
107
106
return columns ;
108
107
} ;
109
108
110
- export const getPreparedStorageNodesColumns = ( {
111
- additionalNodesProps,
112
- database,
113
- groupId,
114
- } : GetStorageNodesColumnsParams ) => {
115
- const rawColumns = getStorageNodesColumns ( additionalNodesProps , database , groupId ) ;
109
+ export const getPreparedStorageNodesColumns = ( params : GetStorageNodesColumnsParams ) => {
110
+ const rawColumns = getStorageNodesColumns ( params ) ;
116
111
117
112
const sortableColumns = rawColumns . map ( ( column ) => ( {
118
113
...column ,
You can’t perform that action at this time.
0 commit comments