From e72c698e66542ffb7b96c1a820f1c0b28a5f3f73 Mon Sep 17 00:00:00 2001
From: mufazalov <mufazalov@yandex-team.ru>
Date: Tue, 21 Jan 2025 17:37:21 +0300
Subject: [PATCH 1/2] fix(UptimeViewer): do not show StartTime if
 DisconnectTime present

---
 src/components/UptimeViewer/UptimeViewer.tsx | 29 ++++++++++----------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/components/UptimeViewer/UptimeViewer.tsx b/src/components/UptimeViewer/UptimeViewer.tsx
index d3a1ba98b..9d4ff1770 100644
--- a/src/components/UptimeViewer/UptimeViewer.tsx
+++ b/src/components/UptimeViewer/UptimeViewer.tsx
@@ -1,3 +1,5 @@
+import React from 'react';
+
 import {DefinitionList} from '@gravity-ui/uikit';
 
 import {EMPTY_DATA_PLACEHOLDER} from '../../utils/constants';
@@ -17,33 +19,32 @@ interface NodeUptimeProps {
 
 export function NodeUptime({StartTime, DisconnectTime}: NodeUptimeProps) {
     let uptime: string | undefined;
+    let content: React.ReactNode = null;
 
     if (DisconnectTime) {
         uptime = getDowntimeFromDateFormatted(DisconnectTime);
+        content = (
+            <DefinitionList.Item key={'DisconnectTime'} name={i18n('disconnect-time')}>
+                {formatDateTime(DisconnectTime, {withTimeZone: true})}
+            </DefinitionList.Item>
+        );
     } else if (StartTime) {
         uptime = getUptimeFromDateFormatted(StartTime);
+        content = (
+            <DefinitionList.Item key={'StartTime'} name={i18n('start-time')}>
+                {formatDateTime(StartTime, {withTimeZone: true})}
+            </DefinitionList.Item>
+        );
     }
 
     if (!uptime) {
         return EMPTY_DATA_PLACEHOLDER;
     }
+
     return (
         <CellWithPopover
             placement={['top', 'auto']}
-            content={
-                <DefinitionList responsive>
-                    {StartTime ? (
-                        <DefinitionList.Item key={'StartTime'} name={i18n('start-time')}>
-                            {formatDateTime(StartTime, {withTimeZone: true})}
-                        </DefinitionList.Item>
-                    ) : null}
-                    {DisconnectTime ? (
-                        <DefinitionList.Item key={'DisconnectTime'} name={i18n('disconnect-time')}>
-                            {formatDateTime(DisconnectTime, {withTimeZone: true})}
-                        </DefinitionList.Item>
-                    ) : null}
-                </DefinitionList>
-            }
+            content={<DefinitionList responsive>{content}</DefinitionList>}
         >
             {uptime}
         </CellWithPopover>

From fe50e1151bfcbca6c688f93c2f1cf8e19df637ed Mon Sep 17 00:00:00 2001
From: mufazalov <mufazalov@yandex-team.ru>
Date: Wed, 22 Jan 2025 17:47:46 +0300
Subject: [PATCH 2/2] fix(UptimeViewer): do not show popup if no content

---
 src/components/UptimeViewer/UptimeViewer.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/UptimeViewer/UptimeViewer.tsx b/src/components/UptimeViewer/UptimeViewer.tsx
index 9d4ff1770..004613d5f 100644
--- a/src/components/UptimeViewer/UptimeViewer.tsx
+++ b/src/components/UptimeViewer/UptimeViewer.tsx
@@ -44,6 +44,7 @@ export function NodeUptime({StartTime, DisconnectTime}: NodeUptimeProps) {
     return (
         <CellWithPopover
             placement={['top', 'auto']}
+            disabled={!content}
             content={<DefinitionList responsive>{content}</DefinitionList>}
         >
             {uptime}