Skip to content

Commit a91474c

Browse files
committed
fix: review fixes
1 parent 504295a commit a91474c

File tree

4 files changed

+32
-10
lines changed

4 files changed

+32
-10
lines changed

src/containers/Cluster/ClusterOverview/ClusterOverview.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import React from 'react';
2+
13
import {ArrowToggle, Disclosure, Flex, Icon, Text} from '@gravity-ui/uikit';
24

35
import {ResponseError} from '../../../components/Errors/ResponseError';
@@ -105,7 +107,7 @@ function ClusterDoughnuts({cluster, groupStats = {}, loading, collapsed}: Cluste
105107
if (loading) {
106108
return <ClusterDashboardSkeleton collapsed={collapsed} />;
107109
}
108-
const metricsCards = [] as React.ReactNode[];
110+
const metricsCards: React.ReactNode[] = [];
109111
if (isClusterInfoV2(cluster)) {
110112
const {CoresUsed, NumberOfCpus, CoresTotal} = cluster;
111113
const total = CoresTotal ?? NumberOfCpus;
@@ -160,5 +162,3 @@ function ClusterDoughnuts({cluster, groupStats = {}, loading, collapsed}: Cluste
160162

161163
return metricsCards;
162164
}
163-
164-
//

src/containers/Nodes/Nodes.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export function Nodes({
6868
}
6969

7070
const pileColumn = getPileNameColumn<NodesPreparedEntity>();
71-
// Type trick above is irrelevant at runtime; cast to any and enhance with sortable
71+
// Add sortable flag consistently with other columns using nodesColumns constants
7272
const enhancedPileColumn = {
7373
...pileColumn,
7474
sortable: isSortableNodesColumn(NODES_COLUMNS_IDS.PileName),

src/containers/Versions/NodesTable/NodesTable.tsx

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,31 @@ import {
1111
getUptimeColumn,
1212
} from '../../../components/nodesColumns/columns';
1313
import type {GetNodesColumnsParams} from '../../../components/nodesColumns/types';
14+
import {useBridgeModeEnabled} from '../../../store/reducers/capabilities/hooks';
1415
import type {NodesPreparedEntity} from '../../../store/reducers/nodes/types';
1516
import {DEFAULT_TABLE_SETTINGS} from '../../../utils/constants';
1617
import {useAdditionalNodesProps} from '../../../utils/hooks/useAdditionalNodesProps';
1718

1819
const VERSIONS_COLUMNS_WIDTH_LS_KEY = 'versionsTableColumnsWidth';
1920

20-
function getColumns(params: GetNodesColumnsParams): Column<NodesPreparedEntity>[] {
21-
return [
21+
function getColumns(
22+
params: GetNodesColumnsParams,
23+
includePileName: boolean,
24+
): Column<NodesPreparedEntity>[] {
25+
const cols: Column<NodesPreparedEntity>[] = [
2226
getNodeIdColumn<NodesPreparedEntity>(),
2327
getHostColumn<NodesPreparedEntity>(params),
24-
getPileNameColumn<NodesPreparedEntity>(),
28+
];
29+
if (includePileName) {
30+
cols.push(getPileNameColumn<NodesPreparedEntity>());
31+
}
32+
cols.push(
2533
getUptimeColumn<NodesPreparedEntity>(),
2634
getRAMColumn<NodesPreparedEntity>(),
2735
getCpuColumn<NodesPreparedEntity>(),
2836
getLoadAverageColumn<NodesPreparedEntity>(),
29-
];
37+
);
38+
return cols;
3039
}
3140

3241
interface NodesTableProps {
@@ -35,8 +44,9 @@ interface NodesTableProps {
3544

3645
export const NodesTable = ({nodes}: NodesTableProps) => {
3746
const additionalNodesProps = useAdditionalNodesProps();
47+
const bridgeModeEnabled = useBridgeModeEnabled();
3848

39-
const columns = getColumns({getNodeRef: additionalNodesProps?.getNodeRef});
49+
const columns = getColumns({getNodeRef: additionalNodesProps?.getNodeRef}, bridgeModeEnabled);
4050

4151
return (
4252
<ResizeableDataTable

tests/suites/bridge/mocks.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,19 @@ export const mockNodesWithPile = (page: Page) => {
2424
body: JSON.stringify({
2525
FoundNodes: 1,
2626
TotalNodes: 1,
27-
Nodes: [{NodeId: 1, SystemState: {}, PileName: 'r1'}],
27+
Nodes: [
28+
{
29+
NodeId: 1,
30+
SystemState: {
31+
Host: 'localhost',
32+
Version: 'test-version',
33+
LoadAverage: [0.1, 0.1, 0.1],
34+
NumberOfCpus: 8,
35+
StartTime: '1',
36+
},
37+
PileName: 'r1',
38+
},
39+
],
2840
}),
2941
});
3042
});

0 commit comments

Comments
 (0)