fix(FeedSourceTable): fix calendar expiration

ibi-group · Aug 11, 2017 · 8010af4 · 8010af4
1 parent faf9f74
commit 8010af4
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/lib/manager/components/FeedSourceTable.js b/lib/manager/components/FeedSourceTable.js
@@ -180,12 +180,16 @@ class FeedSourceAttributes extends Component {
   render () {
     const { feedSource, messages } = this.props
     const dateFormat = getConfigProperty('application.date_format')
-    const hasErrors = feedSource.latestValidation && feedSource.latestValidation.errorCount > 0
     const hasVersion = feedSource.latestValidation
-    const isExpired = feedSource.latestValidation && feedSource.latestValidation.endDate < +moment()
-    const end = feedSource.latestValidation && moment(feedSource.latestValidation.endDate)
-    const endDate = end && end.format(dateFormat)
-    const timeTo = end && moment().to(end)
+    let hasErrors, latestValidationEndMoment, isExpired, endDate, timeTo
+    if (hasVersion) {
+      hasErrors = hasVersion && feedSource.latestValidation.errorCount > 0
+      latestValidationEndMoment = moment(feedSource.latestValidation.endDate, 'YYYYMMDD')
+      isExpired = hasVersion && latestValidationEndMoment.isBefore(moment())
+      endDate = latestValidationEndMoment.format(dateFormat)
+      timeTo = moment().to(latestValidationEndMoment)
+    }
+
     return (
       <ul className='list-inline' style={{marginBottom: '0px'}}>
         <Attribute