Skip to content

Commit 25dff18

Browse files
fix(ui): handle unset memory used/limit values (#3210)
1 parent f7594fb commit 25dff18

File tree

1 file changed

+21
-16
lines changed

1 file changed

+21
-16
lines changed

src/components/nodesColumns/columns.tsx

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -147,28 +147,33 @@ export function getRAMColumn<T extends {MemoryUsed?: string; MemoryLimit?: strin
147147
sortAccessor: ({MemoryUsed = 0}) => Number(MemoryUsed),
148148
defaultOrder: DataTable.DESCENDING,
149149
render: ({row}) => {
150-
const [memoryUsed, memoryLimit] =
151-
isNumeric(row.MemoryUsed) && isNumeric(row.MemoryLimit)
152-
? formatStorageValues(
153-
Number(row.MemoryUsed),
154-
Number(row.MemoryLimit),
155-
'gb',
156-
undefined,
157-
true,
158-
)
159-
: [0, 0];
150+
const [memoryUsed, memoryLimit] = formatStorageValues(
151+
isNumeric(row.MemoryUsed) ? Number(row.MemoryUsed) : undefined,
152+
isNumeric(row.MemoryLimit) ? Number(row.MemoryLimit) : undefined,
153+
'gb',
154+
undefined,
155+
true,
156+
);
157+
158+
const hasData = memoryUsed || memoryLimit;
159+
160160
return (
161161
<CellWithPopover
162162
placement={['top', 'bottom']}
163163
fullWidth
164+
disabled={!hasData}
164165
content={
165166
<DefinitionList responsive>
166-
<DefinitionList.Item name={i18n('field_memory-used')}>
167-
{memoryUsed}
168-
</DefinitionList.Item>
169-
<DefinitionList.Item name={i18n('field_memory-limit')}>
170-
{memoryLimit}
171-
</DefinitionList.Item>
167+
{memoryUsed && (
168+
<DefinitionList.Item name={i18n('field_memory-used')}>
169+
{memoryUsed}
170+
</DefinitionList.Item>
171+
)}
172+
{memoryLimit && (
173+
<DefinitionList.Item name={i18n('field_memory-limit')}>
174+
{memoryLimit}
175+
</DefinitionList.Item>
176+
)}
172177
</DefinitionList>
173178
}
174179
>

0 commit comments

Comments
 (0)