From edb14f4ff564691f741e2d35ab3e5c142d268bdf Mon Sep 17 00:00:00 2001
From: Jared Scheib <jared.scheib@gmail.com>
Date: Tue, 13 Jun 2017 18:19:28 -0700
Subject: [PATCH] Update JSONFeedReader to use latest live schema

---
 ui/src/status/components/JSONFeedReader.js | 52 +++++++++++++++++-----
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/ui/src/status/components/JSONFeedReader.js b/ui/src/status/components/JSONFeedReader.js
index e2578ba535..c11310d27c 100644
--- a/ui/src/status/components/JSONFeedReader.js
+++ b/ui/src/status/components/JSONFeedReader.js
@@ -5,25 +5,53 @@ import moment from 'moment'
 const JSONFeedReader = ({data}) =>
   data
     ? <div className="newsfeed">
-        {data.items.map(({date_published, title, content_html}, i) =>
-          <div key={i} className="newsfeed--post">
-            <div className="newsfeed--date">
-              {`${moment(date_published).format('MMM DD')}`}
+        {data.items.map(
+          ({
+            id,
+            date_published,
+            url,
+            title,
+            author: {name},
+            image,
+            content_text: contentText,
+          }) =>
+            <div key={id} className="newsfeed--post">
+              <div className="newsfeed--date">
+                {`${moment(date_published).format('MMM DD')}`}
+              </div>
+              <div className="newsfeed--post-title">
+                <a href={url} target="_blank">
+                  <h6>{title}</h6>
+                </a>
+                <span>by {name}</span>
+              </div>
+              <div className="newsfeed--content">
+                {image ? <img src={image} /> : null}
+                <p>{contentText}</p>
+              </div>
             </div>
-            <div className="newsfeed--post-title">{title}</div>
-            <div className="newsfeed--content">
-              <div dangerouslySetInnerHTML={{__html: content_html}} />
-            </div>
-          </div>
         )}
       </div>
     : null
 
-const {shape} = PropTypes
+const {arrayOf, instanceOf, shape, string} = PropTypes
 
-// TODO: define JSONFeed schema
 JSONFeedReader.propTypes = {
-  data: shape().isRequired,
+  data: shape({
+    items: arrayOf(
+      shape({
+        author: shape({
+          name: string.isRequired,
+        }).isRequired,
+        content_text: string.isRequired,
+        date_published: instanceOf(Date),
+        id: string.isRequired,
+        image: string,
+        title: string.isRequired,
+        url: string.isRequired,
+      })
+    ),
+  }).isRequired,
 }
 
 export default JSONFeedReader