From 56dedb551f4c8bf88c04a0b0aec7a01db259f082 Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Tue, 11 Apr 2017 15:02:04 -0700
Subject: [PATCH 1/8] Adds click to showAll and refresh query to the '#
 comments' tab.

---
 client/coral-embed-stream/src/Embed.js            | 8 +++++++-
 client/coral-plugin-comment-count/CommentCount.js | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index d9b5c8310..4df0290ac 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -144,7 +144,13 @@ class Embed extends Component {
       <div style={expandForLogin}>
         <div className="commentStream">
           <TabBar onChange={this.changeTab} activeTab={activeTab}>
-            <Tab><Count count={asset.totalCommentCount}/></Tab>
+            <Tab><Count
+              count={asset.totalCommentCount}
+              onClick={()=> {
+                this.props.viewAllComments();
+                this.props.data.refetch();
+              }}/>
+            </Tab>
             <Tab>{lang.t('MY_COMMENTS')}</Tab>
             <Tab restricted={!isAdmin}>Configure Stream</Tab>
           </TabBar>
diff --git a/client/coral-plugin-comment-count/CommentCount.js b/client/coral-plugin-comment-count/CommentCount.js
index 764984634..e53944025 100644
--- a/client/coral-plugin-comment-count/CommentCount.js
+++ b/client/coral-plugin-comment-count/CommentCount.js
@@ -3,8 +3,8 @@ import {I18n} from '../coral-framework';
 import translations from './translations.json';
 const name = 'coral-plugin-comment-count';
 
-const CommentCount = ({count}) => {
-  return <div className={`${name}-text`}>
+const CommentCount = ({count, onClick}) => {
+  return <div className={`${name}-text`} onClick={() => onClick()}>
     {`${count} ${count === 1 ? lang.t('comment') : lang.t('comment-plural')}`}
   </div>;
 };

From f900727455521a03271f08172343ea53e975fd48 Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Tue, 11 Apr 2017 17:57:56 -0700
Subject: [PATCH 2/8] Move the method to the class, changes name and removes
 wrapper.

---
 client/coral-embed-stream/src/Embed.js        | 25 +++++++++++++------
 .../CommentCount.js                           |  4 +--
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index 4df0290ac..aa4223757 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React from 'react';
 import {compose} from 'react-apollo';
 import {connect} from 'react-redux';
 import isEqual from 'lodash/isEqual';
@@ -36,9 +36,18 @@ import HighlightedComment from './Comment';
 import LoadMore from './LoadMore';
 import NewCount from './NewCount';
 
-class Embed extends Component {
+class Embed extends React.Component {
 
-  state = {activeTab: 0, showSignInDialog: false, activeReplyBox: ''};
+  constructor(props) {
+    super(props);
+    this.state = {
+      activeTab: 0,
+      showSignInDialog:
+      false, activeReplyBox: ''
+    };
+
+    this.handleClick = this.handleClick.bind(this);
+  }
 
   changeTab = (tab) => {
     const {isAdmin} = this.props.auth;
@@ -114,6 +123,11 @@ class Embed extends Component {
     }
   }
 
+  handleClick() {
+    this.props.viewAllComments();
+    this.props.data.refetch();
+  }
+
   render () {
     const {activeTab} = this.state;
     const {closedAt, countCache = {}} = this.props.asset;
@@ -146,10 +160,7 @@ class Embed extends Component {
           <TabBar onChange={this.changeTab} activeTab={activeTab}>
             <Tab><Count
               count={asset.totalCommentCount}
-              onClick={()=> {
-                this.props.viewAllComments();
-                this.props.data.refetch();
-              }}/>
+              handleClick={this.handleClick}/>
             </Tab>
             <Tab>{lang.t('MY_COMMENTS')}</Tab>
             <Tab restricted={!isAdmin}>Configure Stream</Tab>
diff --git a/client/coral-plugin-comment-count/CommentCount.js b/client/coral-plugin-comment-count/CommentCount.js
index e53944025..be38d1425 100644
--- a/client/coral-plugin-comment-count/CommentCount.js
+++ b/client/coral-plugin-comment-count/CommentCount.js
@@ -3,8 +3,8 @@ import {I18n} from '../coral-framework';
 import translations from './translations.json';
 const name = 'coral-plugin-comment-count';
 
-const CommentCount = ({count, onClick}) => {
-  return <div className={`${name}-text`} onClick={() => onClick()}>
+const CommentCount = ({count, handleClick}) => {
+  return <div className={`${name}-text`} onClick={handleClick}>
     {`${count} ${count === 1 ? lang.t('comment') : lang.t('comment-plural')}`}
   </div>;
 };

From f4f8e5053f1a0d59d040631c687fe7cb536a0e5c Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Wed, 12 Apr 2017 10:11:21 -0700
Subject: [PATCH 3/8] Remove the binding in the constructor.

---
 client/coral-embed-stream/src/Embed.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index aa4223757..453d645c2 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -42,11 +42,9 @@ class Embed extends React.Component {
     super(props);
     this.state = {
       activeTab: 0,
-      showSignInDialog:
-      false, activeReplyBox: ''
+      showSignInDialog: false,
+      activeReplyBox: ''
     };
-
-    this.handleClick = this.handleClick.bind(this);
   }
 
   changeTab = (tab) => {
@@ -123,7 +121,7 @@ class Embed extends React.Component {
     }
   }
 
-  handleClick() {
+  handleClick = () => {
     this.props.viewAllComments();
     this.props.data.refetch();
   }

From 48795b29bf600810a7d3cca01fe982c16c877862 Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Wed, 12 Apr 2017 10:40:15 -0700
Subject: [PATCH 4/8] Removes isAdmin for refetching when changing tabs.

---
 client/coral-embed-stream/src/Embed.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index 453d645c2..342e490ea 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -48,10 +48,10 @@ class Embed extends React.Component {
   }
 
   changeTab = (tab) => {
-    const {isAdmin} = this.props.auth;
 
     // Everytime the comes from another tab, the Stream needs to be updated.
-    if (tab === 0 && isAdmin) {
+    if (tab === 0) {
+      this.props.viewAllComments();
       this.props.data.refetch();
     }
 

From 92205a2c6f85c29519053cd07d398d9fec9fb5e9 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 13 Apr 2017 01:17:46 +0700
Subject: [PATCH 5/8] Fix load more buttons

---
 client/coral-embed-stream/src/Embed.js               | 12 +++++++++---
 client/coral-embed-stream/src/NewCount.js            |  4 ++--
 .../graphql/queries/streamQuery.graphql              |  3 +++
 graph/resolvers/asset.js                             |  7 +++++++
 graph/typeDefs.graphql                               |  3 +++
 5 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index d9b5c8310..a16852c00 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -79,10 +79,12 @@ class Embed extends Component {
     if(!isEqual(nextProps.data.asset, this.props.data.asset)) {
       loadAsset(nextProps.data.asset);
 
-      const {getCounts, updateCountCache} = this.props;
+      const {getCounts, updateCountCache, asset: {countCache}} = this.props;
       const {asset} = nextProps.data;
 
-      updateCountCache(asset.id, asset.commentCount);
+      if (!countCache) {
+        updateCountCache(asset.id, asset.commentCount);
+      }
 
       this.setState({
         countPoll: setInterval(() => {
@@ -127,6 +129,10 @@ class Embed extends Component {
 
     const banned = user && user.status === 'BANNED';
 
+    const hasOlderComments =
+      asset && asset.lastComment &&
+      asset.lastComment.id !== asset.comments[asset.comments.length - 1].id;
+
     const expandForLogin = showSignInDialog ? {
       minHeight: document.body.scrollHeight + 200
     } : {};
@@ -259,7 +265,7 @@ class Embed extends Component {
                   topLevel={true}
                   assetId={asset.id}
                   comments={asset.comments}
-                  moreComments={countCache[asset.id] > asset.comments.length}
+                  moreComments={hasOlderComments}
                   loadMore={this.props.loadMore} />
               </div>
             }
diff --git a/client/coral-embed-stream/src/NewCount.js b/client/coral-embed-stream/src/NewCount.js
index 2368c1ab8..8d7333aab 100644
--- a/client/coral-embed-stream/src/NewCount.js
+++ b/client/coral-embed-stream/src/NewCount.js
@@ -17,10 +17,10 @@ const onLoadMoreClick = ({loadMore, commentCount, firstCommentDate, assetId, upd
 const NewCount = (props) => {
   const newComments = props.commentCount - props.countCache;
 
-  return <div className='coral-new-comments'>
+  return <div className='coral-new-comments coral-load-more'>
     {
       props.countCache && newComments > 0 ?
-      <button onClick={onLoadMoreClick(props)} className='coral-load-more'>
+      <button onClick={onLoadMoreClick(props)}>
         {newComments === 1
           ? lang.t('newCount', newComments, lang.t('comment'))
           : lang.t('newCount', newComments, lang.t('comments'))}
diff --git a/client/coral-framework/graphql/queries/streamQuery.graphql b/client/coral-framework/graphql/queries/streamQuery.graphql
index 102c656e5..94dc3d32e 100644
--- a/client/coral-framework/graphql/queries/streamQuery.graphql
+++ b/client/coral-framework/graphql/queries/streamQuery.graphql
@@ -38,6 +38,9 @@ query AssetQuery($asset_id: ID, $asset_url: String, $comment_id: ID!, $has_comme
         }
         commentCount
         totalCommentCount
+        lastComment {
+          id
+        }
         comments(limit: 10) {
             ...commentView
             replyCount
diff --git a/graph/resolvers/asset.js b/graph/resolvers/asset.js
index c2a0a2b66..877b5e7aa 100644
--- a/graph/resolvers/asset.js
+++ b/graph/resolvers/asset.js
@@ -1,4 +1,11 @@
 const Asset = {
+  lastComment({id}, _, {loaders: {Comments}}) {
+    return Comments.getByQuery({
+      asset_id: id,
+      limit: 1,
+      parent_id: null
+    }).then(data => data[0]);
+  },
   recentComments({id}, _, {loaders: {Comments}}) {
     return Comments.genRecentComments.load(id);
   },
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 8b07c2ab2..3f61273d4 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -413,6 +413,9 @@ type Asset {
   # The URL that the asset is located on.
   url: String
 
+  # Returns last comment
+  lastComment: Comment
+
   # Returns recent comments
   recentComments: [Comment]
 

From 81bd983f0bf231a1bbd99aaa15ed9c9b03710139 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 13 Apr 2017 01:34:27 +0700
Subject: [PATCH 6/8] Handle empty stream case

---
 client/coral-embed-stream/src/Embed.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index a16852c00..6d20e011a 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -129,9 +129,11 @@ class Embed extends Component {
 
     const banned = user && user.status === 'BANNED';
 
-    const hasOlderComments =
-      asset && asset.lastComment &&
-      asset.lastComment.id !== asset.comments[asset.comments.length - 1].id;
+    const hasOlderComments = !!(
+      asset &&
+      asset.lastComment &&
+      asset.lastComment.id !== asset.comments[asset.comments.length - 1].id
+    );
 
     const expandForLogin = showSignInDialog ? {
       minHeight: document.body.scrollHeight + 200

From cbde4cc8bc4031283202b646452e38d522589222 Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Wed, 12 Apr 2017 11:58:41 -0700
Subject: [PATCH 7/8] Removes handleClick as it is working now with the
 changeTab (as the viewAllComments was added). /cc @kiwi

---
 client/coral-embed-stream/src/Embed.js            | 9 +--------
 client/coral-plugin-comment-count/CommentCount.js | 4 ++--
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index 342e490ea..db9c76000 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -121,11 +121,6 @@ class Embed extends React.Component {
     }
   }
 
-  handleClick = () => {
-    this.props.viewAllComments();
-    this.props.data.refetch();
-  }
-
   render () {
     const {activeTab} = this.state;
     const {closedAt, countCache = {}} = this.props.asset;
@@ -156,9 +151,7 @@ class Embed extends React.Component {
       <div style={expandForLogin}>
         <div className="commentStream">
           <TabBar onChange={this.changeTab} activeTab={activeTab}>
-            <Tab><Count
-              count={asset.totalCommentCount}
-              handleClick={this.handleClick}/>
+            <Tab><Count count={asset.totalCommentCount}/>
             </Tab>
             <Tab>{lang.t('MY_COMMENTS')}</Tab>
             <Tab restricted={!isAdmin}>Configure Stream</Tab>
diff --git a/client/coral-plugin-comment-count/CommentCount.js b/client/coral-plugin-comment-count/CommentCount.js
index be38d1425..764984634 100644
--- a/client/coral-plugin-comment-count/CommentCount.js
+++ b/client/coral-plugin-comment-count/CommentCount.js
@@ -3,8 +3,8 @@ import {I18n} from '../coral-framework';
 import translations from './translations.json';
 const name = 'coral-plugin-comment-count';
 
-const CommentCount = ({count, handleClick}) => {
-  return <div className={`${name}-text`} onClick={handleClick}>
+const CommentCount = ({count}) => {
+  return <div className={`${name}-text`}>
     {`${count} ${count === 1 ? lang.t('comment') : lang.t('comment-plural')}`}
   </div>;
 };

From 29fe5e2901ea01886292646bd08bfd553b16c3c7 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Wed, 12 Apr 2017 15:40:34 -0400
Subject: [PATCH 8/8] Fix broken links to Stories page

---
 .../containers/ModerationQueue/components/ModerationHeader.js | 4 ++--
 .../containers/ModerationQueue/components/NotFoundAsset.js    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js
index 8d9f6b7e0..e823be9fe 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js
@@ -14,13 +14,13 @@ const ModerationHeader = props => (
                 <span>{props.asset.title}</span>
                 <Icon className={styles.settingsButton} name="open_in_new"/>
               </a>
-              <Link className="mdl-tabs__tab" to="/admin/streams">Select Stream</Link>
+              <Link className="mdl-tabs__tab" to="/admin/stories">Select Stream</Link>
             </div>
             :
             <div className={`mdl-tabs__tab-bar ${styles.moderateAsset}`}>
               <a className="mdl-tabs__tab" />
               <a className="mdl-tabs__tab">All Streams</a>
-              <Link className="mdl-tabs__tab" to="/admin/streams">Select Stream</Link>
+              <Link className="mdl-tabs__tab" to="/admin/stories">Select Stream</Link>
             </div>
         }
       </div>
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/NotFoundAsset.js b/client/coral-admin/src/containers/ModerationQueue/components/NotFoundAsset.js
index ffa1adfcd..90610a577 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/NotFoundAsset.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/NotFoundAsset.js
@@ -6,7 +6,7 @@ const NotFound = props => (
   <div className={`mdl-card mdl-shadow--2dp ${styles.notFound}`}>
     <p>
       The provided asset id <Link to={`/admin/moderate/${props.assetId}`}>{props.assetId}</Link> does not exist.
-      <Link className={styles.goToStreams} to="/admin/streams">Go to Streams</Link>
+      <Link className={styles.goToStreams} to="/admin/stories">Go to Streams</Link>
     </p>
   </div>
 );