From 805aef19292b4c038e601c1bcf9eefed0d278ac0 Mon Sep 17 00:00:00 2001
From: Yongjie Zhao <yongjie.zhao@gmail.com>
Date: Tue, 6 Apr 2021 22:44:45 +0800
Subject: [PATCH] fix: annotation modal dateRangePicker saved invalid value

---
 .../src/views/CRUD/annotation/AnnotationModal.tsx          | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx b/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx
index 84f14053b90e3..af0a65a505e2b 100644
--- a/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx
+++ b/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx
@@ -311,14 +311,13 @@ const AnnotationModal: FunctionComponent<AnnotationModalProps> = ({
           <span className="required">*</span>
         </div>
         <RangePicker
-          format="YYYY-MM-DD hh:mm a"
+          format="YYYY-MM-DD HH:mm"
           onChange={onDateChange}
           showTime={{ format: 'hh:mm a' }}
           use12Hours
           value={
-            currentAnnotation &&
-            (currentAnnotation?.start_dttm.length ||
-              currentAnnotation?.end_dttm.length)
+            currentAnnotation?.start_dttm?.length ||
+            currentAnnotation?.end_dttm?.length
               ? [
                   moment(currentAnnotation.start_dttm),
                   moment(currentAnnotation.end_dttm),