From f55019a1d0e6ab37bd298a48648c11176a51dcd0 Mon Sep 17 00:00:00 2001
From: John Bodley <john.bodley@airbnb.com>
Date: Thu, 12 Dec 2019 15:06:22 +1300
Subject: [PATCH 1/4] [sip-15] Displaying endpoints for all start/end time
 ranges

---
 .../explore/components/controls/DateFilterControl.jsx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/superset/assets/src/explore/components/controls/DateFilterControl.jsx b/superset/assets/src/explore/components/controls/DateFilterControl.jsx
index 6862ae6dc8e3..9902b865a45d 100644
--- a/superset/assets/src/explore/components/controls/DateFilterControl.jsx
+++ b/superset/assets/src/explore/components/controls/DateFilterControl.jsx
@@ -576,11 +576,12 @@ export default class DateFilterControl extends React.Component {
     const endpoints = this.props.endpoints;
     value = value
       .split(SEPARATOR)
-      .map((v, idx) =>
-        moment(v).isValid()
-          ? v.replace('T00:00:00', '') +
-            (endpoints ? ` (${endpoints[idx]})` : '')
-          : v || (idx === 0 ? '-∞' : '∞'),
+      .map(
+        (v, idx) =>
+          (v.replace('T00:00:00', '') || (idx === 0 ? '-∞' : '∞')) +
+          (endpoints && value.includes(SEPARATOR)
+            ? ` (${endpoints[idx]})`
+            : ''),
       )
       .join(SEPARATOR);
     return (

From 47980a13331b26310097ee641c1cca53472ee83d Mon Sep 17 00:00:00 2001
From: John Bodley <4567245+john-bodley@users.noreply.github.com>
Date: Fri, 17 Jan 2020 10:43:42 -0800
Subject: [PATCH 2/4] Update
 superset/assets/src/explore/components/controls/DateFilterControl.jsx

Co-Authored-By: Erik Ritter <erik.ritter@airbnb.com>
---
 .../src/explore/components/controls/DateFilterControl.jsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset/assets/src/explore/components/controls/DateFilterControl.jsx b/superset/assets/src/explore/components/controls/DateFilterControl.jsx
index 9902b865a45d..534f53f14e44 100644
--- a/superset/assets/src/explore/components/controls/DateFilterControl.jsx
+++ b/superset/assets/src/explore/components/controls/DateFilterControl.jsx
@@ -577,7 +577,7 @@ export default class DateFilterControl extends React.Component {
     value = value
       .split(SEPARATOR)
       .map(
-        (v, idx) =>
+        (v, idx, values) =>
           (v.replace('T00:00:00', '') || (idx === 0 ? '-∞' : '∞')) +
           (endpoints && value.includes(SEPARATOR)
             ? ` (${endpoints[idx]})`

From 2b053a2a31e136cec7231b312dafffb71cce1c95 Mon Sep 17 00:00:00 2001
From: John Bodley <4567245+john-bodley@users.noreply.github.com>
Date: Fri, 17 Jan 2020 10:43:49 -0800
Subject: [PATCH 3/4] Update
 superset/assets/src/explore/components/controls/DateFilterControl.jsx

Co-Authored-By: Erik Ritter <erik.ritter@airbnb.com>
---
 .../src/explore/components/controls/DateFilterControl.jsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset/assets/src/explore/components/controls/DateFilterControl.jsx b/superset/assets/src/explore/components/controls/DateFilterControl.jsx
index 534f53f14e44..be1b20b783cb 100644
--- a/superset/assets/src/explore/components/controls/DateFilterControl.jsx
+++ b/superset/assets/src/explore/components/controls/DateFilterControl.jsx
@@ -579,7 +579,7 @@ export default class DateFilterControl extends React.Component {
       .map(
         (v, idx, values) =>
           (v.replace('T00:00:00', '') || (idx === 0 ? '-∞' : '∞')) +
-          (endpoints && value.includes(SEPARATOR)
+          (endpoints && values.length > 1
             ? ` (${endpoints[idx]})`
             : ''),
       )

From af3fd53931145f096293dc50f4e4ccf6174aba84 Mon Sep 17 00:00:00 2001
From: John Bodley <4567245+john-bodley@users.noreply.github.com>
Date: Fri, 17 Jan 2020 11:22:26 -0800
Subject: [PATCH 4/4] Update DateFilterControl.jsx

---
 .../src/explore/components/controls/DateFilterControl.jsx     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/superset/assets/src/explore/components/controls/DateFilterControl.jsx b/superset/assets/src/explore/components/controls/DateFilterControl.jsx
index be1b20b783cb..93e0637c9f38 100644
--- a/superset/assets/src/explore/components/controls/DateFilterControl.jsx
+++ b/superset/assets/src/explore/components/controls/DateFilterControl.jsx
@@ -579,9 +579,7 @@ export default class DateFilterControl extends React.Component {
       .map(
         (v, idx, values) =>
           (v.replace('T00:00:00', '') || (idx === 0 ? '-∞' : '∞')) +
-          (endpoints && values.length > 1
-            ? ` (${endpoints[idx]})`
-            : ''),
+          (endpoints && values.length > 1 ? ` (${endpoints[idx]})` : ''),
       )
       .join(SEPARATOR);
     return (