@@ -12,10 +12,7 @@ import type {NodesPreparedEntity} from '../../store/reducers/nodes/types';
12
12
import { getLoadSeverityForNode } from '../../store/reducers/nodes/utils' ;
13
13
import type { GetNodeRefFunc } from '../../types/additionalProps' ;
14
14
import { EMPTY_DATA_PLACEHOLDER } from '../../utils/constants' ;
15
- import {
16
- formatBytesToGigabyte ,
17
- formatStorageValuesToGb ,
18
- } from '../../utils/dataFormatters/dataFormatters' ;
15
+ import { formatStorageValuesToGb } from '../../utils/dataFormatters/dataFormatters' ;
19
16
20
17
export const NODES_COLUMNS_WIDTH_LS_KEY = 'nodesTableColumnsWidth' ;
21
18
@@ -110,13 +107,14 @@ const memoryColumn: NodesColumn = {
110
107
header : 'Memory' ,
111
108
sortAccessor : ( { MemoryUsed = 0 } ) => Number ( MemoryUsed ) ,
112
109
defaultOrder : DataTable . DESCENDING ,
113
- render : ( { row} ) => {
114
- if ( row . MemoryUsed ) {
115
- return formatBytesToGigabyte ( row . MemoryUsed ) ;
116
- } else {
117
- return '—' ;
118
- }
119
- } ,
110
+ render : ( { row} ) => (
111
+ < ProgressViewer
112
+ value = { row . MemoryUsed }
113
+ capacity = { row . MemoryLimit }
114
+ formatValues = { formatStorageValuesToGb }
115
+ colorizeProgress = { true }
116
+ />
117
+ ) ,
120
118
align : DataTable . RIGHT ,
121
119
width : 120 ,
122
120
} ;
@@ -138,17 +136,18 @@ const loadAverageColumn: NodesColumn = {
138
136
header : 'Load average' ,
139
137
sortAccessor : ( { LoadAveragePercents = [ ] } ) => LoadAveragePercents [ 0 ] ,
140
138
defaultOrder : DataTable . DESCENDING ,
141
- render : ( { row} ) =>
142
- row . LoadAveragePercents && row . LoadAveragePercents . length > 0 ? (
143
- < ProgressViewer
144
- value = { row . LoadAveragePercents [ 0 ] }
145
- percents = { true }
146
- colorizeProgress = { true }
147
- capacity = { 100 }
148
- />
149
- ) : (
150
- '—'
151
- ) ,
139
+ render : ( { row} ) => (
140
+ < ProgressViewer
141
+ value = {
142
+ row . LoadAveragePercents && row . LoadAveragePercents . length > 0
143
+ ? row . LoadAveragePercents [ 0 ]
144
+ : undefined
145
+ }
146
+ percents = { true }
147
+ colorizeProgress = { true }
148
+ capacity = { 100 }
149
+ />
150
+ ) ,
152
151
align : DataTable . LEFT ,
153
152
width : 140 ,
154
153
resizeMinWidth : 140 ,
@@ -211,7 +210,7 @@ const topNodesMemoryColumn: NodesColumn = {
211
210
212
211
const sharedCacheUsageColumn : NodesColumn = {
213
212
name : NODES_COLUMNS_IDS . SharedCacheUsage ,
214
- header : 'Tablet Cache ' ,
213
+ header : 'Caches ' ,
215
214
render : ( { row} ) => (
216
215
< ProgressViewer
217
216
value = { row . SharedCacheUsed }
@@ -226,23 +225,6 @@ const sharedCacheUsageColumn: NodesColumn = {
226
225
sortable : false ,
227
226
} ;
228
227
229
- const memoryUsedInAllocColumn : NodesColumn = {
230
- name : NODES_COLUMNS_IDS . MemoryUsedInAlloc ,
231
- header : 'Query Runtime' ,
232
- render : ( { row} ) => (
233
- < ProgressViewer
234
- value = { row . MemoryUsedInAlloc }
235
- capacity = { row . MemoryLimit }
236
- formatValues = { formatStorageValuesToGb }
237
- colorizeProgress = { true }
238
- />
239
- ) ,
240
- align : DataTable . LEFT ,
241
- width : 140 ,
242
- resizeMinWidth : 140 ,
243
- sortable : false ,
244
- } ;
245
-
246
228
const sessionsColumn : NodesColumn = {
247
229
name : NODES_COLUMNS_IDS . TotalSessions ,
248
230
header : 'Sessions' ,
@@ -295,7 +277,6 @@ export function getTopNodesByMemoryColumns({
295
277
topNodesLoadAverageColumn ,
296
278
topNodesMemoryColumn ,
297
279
sharedCacheUsageColumn ,
298
- memoryUsedInAllocColumn ,
299
280
sessionsColumn ,
300
281
getTabletsColumn ( tabletsPath ) ,
301
282
] ;
0 commit comments