Skip to content

Commit 31e5a4d

Browse files
fix: preserve merged nodes row height after rebase
1 parent 9dd0a74 commit 31e5a4d

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

‎src/containers/Nodes/NodesTable.tsx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ import React from 'react';
22

33
import type {PaginatedTableData} from '../../components/PaginatedTable';
44
import {PAGINATED_TABLE_IDS, ResizeablePaginatedTable} from '../../components/PaginatedTable';
5-
import {NODES_COLUMNS_WIDTH_LS_KEY} from '../../components/nodesColumns/constants';
5+
import {
6+
NODES_COLUMNS_IDS,
7+
NODES_COLUMNS_WIDTH_LS_KEY,
8+
} from '../../components/nodesColumns/constants';
69
import type {NodesColumn} from '../../components/nodesColumns/types';
710
import {useClusterWithProxy} from '../../store/reducers/cluster/cluster';
811
import type {NodesFilters} from '../../store/reducers/nodes/types';
@@ -94,6 +97,9 @@ export function NodesTable({
9497
columnsWidthLSKey={NODES_COLUMNS_WIDTH_LS_KEY}
9598
scrollContainerRef={scrollContainerRef}
9699
columns={columns}
100+
rowHeight={
101+
columns.some((column) => column.name === NODES_COLUMNS_IDS.PDisks) ? 51 : undefined
102+
}
97103
fetchData={getNodes}
98104
initialEntitiesCount={initialEntitiesCount}
99105
renderErrorMessage={renderPaginatedTableErrorMessage}

0 commit comments

Comments
 (0)