Skip to content

Commit 36038bc

Browse files
fix(UptimeViewer): do not show StartTime if DisconnectTime present (#1864)
1 parent 1990103 commit 36038bc

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

src/components/UptimeViewer/UptimeViewer.tsx

+16-14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import React from 'react';
2+
13
import {DefinitionList} from '@gravity-ui/uikit';
24

35
import {EMPTY_DATA_PLACEHOLDER} from '../../utils/constants';
@@ -17,33 +19,33 @@ interface NodeUptimeProps {
1719

1820
export function NodeUptime({StartTime, DisconnectTime}: NodeUptimeProps) {
1921
let uptime: string | undefined;
22+
let content: React.ReactNode = null;
2023

2124
if (DisconnectTime) {
2225
uptime = getDowntimeFromDateFormatted(DisconnectTime);
26+
content = (
27+
<DefinitionList.Item key={'DisconnectTime'} name={i18n('disconnect-time')}>
28+
{formatDateTime(DisconnectTime, {withTimeZone: true})}
29+
</DefinitionList.Item>
30+
);
2331
} else if (StartTime) {
2432
uptime = getUptimeFromDateFormatted(StartTime);
33+
content = (
34+
<DefinitionList.Item key={'StartTime'} name={i18n('start-time')}>
35+
{formatDateTime(StartTime, {withTimeZone: true})}
36+
</DefinitionList.Item>
37+
);
2538
}
2639

2740
if (!uptime) {
2841
return EMPTY_DATA_PLACEHOLDER;
2942
}
43+
3044
return (
3145
<CellWithPopover
3246
placement={['top', 'auto']}
33-
content={
34-
<DefinitionList responsive>
35-
{StartTime ? (
36-
<DefinitionList.Item key={'StartTime'} name={i18n('start-time')}>
37-
{formatDateTime(StartTime, {withTimeZone: true})}
38-
</DefinitionList.Item>
39-
) : null}
40-
{DisconnectTime ? (
41-
<DefinitionList.Item key={'DisconnectTime'} name={i18n('disconnect-time')}>
42-
{formatDateTime(DisconnectTime, {withTimeZone: true})}
43-
</DefinitionList.Item>
44-
) : null}
45-
</DefinitionList>
46-
}
47+
disabled={!content}
48+
content={<DefinitionList responsive>{content}</DefinitionList>}
4749
>
4850
{uptime}
4951
</CellWithPopover>

0 commit comments

Comments
 (0)