From fda2333cf21c2d71ad0ca276f78fd4b5b6fef314 Mon Sep 17 00:00:00 2001 From: John Bodley <4567245+john-bodley@users.noreply.github.com> Date: Fri, 1 Nov 2019 17:44:28 -0700 Subject: [PATCH] [SIP-15] Updating ISO 8601 regex match to make time optional (#8494) --- .../src/explore/components/controls/DateFilterControl.jsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/superset/assets/src/explore/components/controls/DateFilterControl.jsx b/superset/assets/src/explore/components/controls/DateFilterControl.jsx index 43fd3b7ac67..dcdf4169f14 100644 --- a/superset/assets/src/explore/components/controls/DateFilterControl.jsx +++ b/superset/assets/src/explore/components/controls/DateFilterControl.jsx @@ -83,7 +83,6 @@ const FREEFORM_TOOLTIP = t( ); const DATE_FILTER_POPOVER_STYLE = { width: '250px' }; -const ISO_8601_REGEX_MATCH = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$/; const propTypes = { animation: PropTypes.bool, @@ -514,7 +513,7 @@ export default class DateFilterControl extends React.Component { value = value .split(SEPARATOR) .map((v, idx) => - ISO_8601_REGEX_MATCH.test(v) + moment(v).isValid() ? v.replace('T00:00:00', '') + (endpoints ? ` (${endpoints[idx]})` : '') : v || (idx === 0 ? '-∞' : '∞'), )