From 1d875a45994540adef23ad6f638d78c9945ef873 Mon Sep 17 00:00:00 2001
From: Brent Bovenzi <brent.bovenzi@gmail.com>
Date: Tue, 26 Apr 2022 12:45:58 -0400
Subject: [PATCH] Handle undefined data interval in grid runs (#23265)

---
 .../www/static/js/tree/dagRuns/Tooltip.jsx    |  4 +--
 .../js/tree/details/content/dagRun/index.jsx  | 29 ++++++++++---------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/airflow/www/static/js/tree/dagRuns/Tooltip.jsx b/airflow/www/static/js/tree/dagRuns/Tooltip.jsx
index c15e6e53515e9..6c00b66bf5eb1 100644
--- a/airflow/www/static/js/tree/dagRuns/Tooltip.jsx
+++ b/airflow/www/static/js/tree/dagRuns/Tooltip.jsx
@@ -25,7 +25,7 @@ import Time from '../Time';
 
 const DagRunTooltip = ({
   dagRun: {
-    state, duration, dataIntervalEnd,
+    state, duration, dataIntervalStart, executionDate,
   },
 }) => (
   <Box py="2px">
@@ -37,7 +37,7 @@ const DagRunTooltip = ({
     <Text whiteSpace="nowrap">
       Run:
       {' '}
-      <Time dateTime={dataIntervalEnd} />
+      <Time dateTime={dataIntervalStart || executionDate} />
     </Text>
     <Text>
       Duration:
diff --git a/airflow/www/static/js/tree/details/content/dagRun/index.jsx b/airflow/www/static/js/tree/details/content/dagRun/index.jsx
index 363bdeddfd6bc..1816385c5891c 100644
--- a/airflow/www/static/js/tree/details/content/dagRun/index.jsx
+++ b/airflow/www/static/js/tree/details/content/dagRun/index.jsx
@@ -126,19 +126,22 @@ const DagRun = ({ runId }) => {
         <Time dateTime={endDate} />
       </Text>
       )}
-      <br />
-      <Text as="strong">Data Interval:</Text>
-      <Text>
-        Start:
-        {' '}
-        <Time dateTime={dataIntervalStart} />
-      </Text>
-      <Text>
-        End:
-        {' '}
-        <Time dateTime={dataIntervalEnd} />
-      </Text>
-
+      {dataIntervalStart && dataIntervalEnd && (
+        <>
+          <br />
+          <Text as="strong">Data Interval:</Text>
+          <Text>
+            Start:
+            {' '}
+            <Time dateTime={dataIntervalStart} />
+          </Text>
+          <Text>
+            End:
+            {' '}
+            <Time dateTime={dataIntervalEnd} />
+          </Text>
+        </>
+      )}
     </Box>
   );
 };