From 6bf2cb91bb5fa893746e905528467462e044e5ec Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Wed, 24 Oct 2018 18:17:30 +0200
Subject: Add validation for date strings passed to GlCountdown

---
 app/assets/javascripts/vue_shared/components/gl_countdown.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/vue_shared/components/gl_countdown.vue b/app/assets/javascripts/vue_shared/components/gl_countdown.vue
index bc42d4611b3..9327a2a4a6c 100644
--- a/app/assets/javascripts/vue_shared/components/gl_countdown.vue
+++ b/app/assets/javascripts/vue_shared/components/gl_countdown.vue
@@ -6,9 +6,12 @@ import { calculateRemainingMilliseconds, formatTime } from '~/lib/utils/datetime
  */
 export default {
   props: {
-    endDate: {
+    endDateString: {
       type: String,
       required: true,
+      validator(value) {
+        return !Number.isNaN(new Date(value).getTime());
+      },
     },
   },
 
@@ -21,7 +24,7 @@ export default {
 
   mounted() {
     const updateRemainingTime = () => {
-      const remainingMilliseconds = calculateRemainingMilliseconds(this.endDate);
+      const remainingMilliseconds = calculateRemainingMilliseconds(this.endDateString);
       this.remainingTime = formatTime(remainingMilliseconds);
     };
 
@@ -38,8 +41,8 @@ export default {
 <template>
   <time
     v-gl-tooltip
-    :datetime="endDate"
-    :title="endDate"
+    :datetime="endDateString"
+    :title="endDateString"
   >
     {{ remainingTime }}
   </time>
-- 
cgit v1.2.1