From 8866366d3cf5f95e2a4d3c244fb13fea76dc8634 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 17 Feb 2017 16:07:34 -0700
Subject: [PATCH 01/37] storing my place in case we want to come back to this

---
 .../coral-admin/src/components/FlagWidget.js  |  2 +-
 .../coral-admin/src/components/LikeWidget.js  | 34 +++++++++++++++++++
 client/coral-admin/src/components/Widget.css  | 34 +++++++++++++++++++
 .../src/containers/Dashboard/Dashboard.js     | 11 ++++--
 .../coral-admin/src/graphql/queries/index.js  | 20 +++++++++--
 .../src/graphql/queries/metrics.graphql       | 24 +++++++++++++
 6 files changed, 119 insertions(+), 6 deletions(-)
 create mode 100644 client/coral-admin/src/components/LikeWidget.js
 create mode 100644 client/coral-admin/src/components/Widget.css
 create mode 100644 client/coral-admin/src/graphql/queries/metrics.graphql

diff --git a/client/coral-admin/src/components/FlagWidget.js b/client/coral-admin/src/components/FlagWidget.js
index 187306c8c..96e21ac0b 100644
--- a/client/coral-admin/src/components/FlagWidget.js
+++ b/client/coral-admin/src/components/FlagWidget.js
@@ -1,6 +1,6 @@
 import React, {PropTypes} from 'react';
 import {Link} from 'react-router';
-import styles from './FlagWidget.css';
+import styles from './Widget.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations';
 
diff --git a/client/coral-admin/src/components/LikeWidget.js b/client/coral-admin/src/components/LikeWidget.js
new file mode 100644
index 000000000..33df3e2b4
--- /dev/null
+++ b/client/coral-admin/src/components/LikeWidget.js
@@ -0,0 +1,34 @@
+import React, {PropTypes} from 'react';
+import {Link} from 'react-router';
+import styles from './Widget.css';
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from 'coral-admin/src/translations';
+
+const lang = new I18n(translations);
+
+const LikeWidget = ({assets}) => {
+  return (
+    <table className={styles.widgetTable}>
+    </table>
+  );
+};
+
+LikeWidget.propTypes = {
+  assets: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.string,
+      title: PropTypes.string,
+      url: PropTypes.string,
+      commentCount: PropTypes.number,
+      action_summaries: PropTypes.arrayOf(
+        PropTypes.shape({
+          __typename: PropTypes.string.isRequired,
+          actionCount: PropTypes.number.isRequired,
+          actionableItemCount: PropTypes.number.isRequired
+        })
+      )
+    })
+  ).isRequired
+};
+
+export default LikeWidget;
diff --git a/client/coral-admin/src/components/Widget.css b/client/coral-admin/src/components/Widget.css
new file mode 100644
index 000000000..f40da403d
--- /dev/null
+++ b/client/coral-admin/src/components/Widget.css
@@ -0,0 +1,34 @@
+.heading {
+  margin: 0;
+  font-size: 1.5rem;
+  font-weight: bold;
+}
+
+.widgetTable {
+  width: 100%;
+  border-collapse: collapse;
+  box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.2);
+}
+
+.widgetTable thead th {
+  border-bottom: 1px solid #f47e6b;
+  padding: 10px;
+  text-align: left;
+}
+
+.widgetTable tbody tr {
+  border-bottom: 1px solid lightgrey;
+}
+
+.widgetTable tbody tr:last-child {
+  border-bottom: none;
+}
+
+.widgetTable tbody td {
+  padding: 10px;
+}
+
+.lede {
+  font-size: 0.9em;
+  color: grey;
+}
diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index 6baa16af1..253c0980b 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -1,14 +1,16 @@
 import React from 'react';
 import {compose} from 'react-apollo';
-import {mostFlags} from 'coral-admin/src/graphql/queries';
+import {mostFlags, mostLikes} from 'coral-admin/src/graphql/queries';
 import {Spinner} from 'coral-ui';
 import styles from './Dashboard.css';
 import FlagWidget from '../../components/FlagWidget';
+import LikeWidget from '../../components/LikeWidget';
 
 class Dashboard extends React.Component {
   render () {
 
     const {data} = this.props;
+    console.log('data', data);
     const {metrics: assets} = data;
 
     if (data.loading) {
@@ -28,11 +30,16 @@ class Dashboard extends React.Component {
         <div className={styles.widget}>
           <h2 className={styles.heading}>Top ten comments with the most likes</h2>
         </div>
+        <div className={styles.widget}>
+          <h2 className={styles.heading}>Top Ten Articles with the most likes</h2>
+          <LikeWidget assets={assets} />
+        </div>
       </div>
     );
   }
 }
 
 export default compose(
-  mostFlags
+  mostFlags,
+  mostLikes
 )(Dashboard);
diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js
index 3325249e1..f98b40091 100644
--- a/client/coral-admin/src/graphql/queries/index.js
+++ b/client/coral-admin/src/graphql/queries/index.js
@@ -1,14 +1,14 @@
 import {graphql} from 'react-apollo';
 
-import MOST_FLAGS from './mostFlags.graphql';
+import METRICS from './metrics.graphql';
 import MOD_QUEUE_QUERY from './modQueueQuery.graphql';
 
-export const mostFlags = graphql(MOST_FLAGS, {
+export const mostFlags = graphql(METRICS, {
   options: () => {
 
     // currently hard-coded per Greg's advice
     const fiveMinutesAgo = new Date();
-    fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 305);
+    fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
     return {
       variables: {
         sort: 'FLAG',
@@ -19,6 +19,20 @@ export const mostFlags = graphql(MOST_FLAGS, {
   }
 });
 
+export const mostLikes = graphql(METRICS, {
+  options: () => {
+    const fiveMinutesAgo = new Date();
+    fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
+    return {
+      variables: {
+        sort: 'LIKE',
+        from: fiveMinutesAgo.toISOString(),
+        to: new Date().toISOString()
+      }
+    };
+  }
+});
+
 export const modQueueQuery = graphql(MOD_QUEUE_QUERY, {
   options: ({params: {id = null}}) => {
     return {
diff --git a/client/coral-admin/src/graphql/queries/metrics.graphql b/client/coral-admin/src/graphql/queries/metrics.graphql
new file mode 100644
index 000000000..2f9afe621
--- /dev/null
+++ b/client/coral-admin/src/graphql/queries/metrics.graphql
@@ -0,0 +1,24 @@
+fragment metrics on Asset {
+  id
+  title
+  action_summaries {
+    type: __typename
+    actionCount
+    actionableItemCount
+  }
+}
+
+query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
+  metrics(from: $from, to: $to, sort: $sort) {
+    id
+    title
+    url
+    commentCount
+    author
+    created_at
+    action_summaries {
+      actionCount
+      actionableItemCount
+    }
+  }
+}

From 364cf1808e107551218beec3f329d121e4d42dbf Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 21 Feb 2017 10:28:33 -0700
Subject: [PATCH 02/37] assets by like?

---
 .../src/containers/Dashboard/Dashboard.js     |  6 +++---
 .../{metrics.graphql => assetsByFlag.graphql} | 17 ++++++-----------
 .../src/graphql/queries/assetsByLike.graphql  | 19 +++++++++++++++++++
 .../coral-admin/src/graphql/queries/index.js  |  7 ++++---
 4 files changed, 32 insertions(+), 17 deletions(-)
 rename client/coral-admin/src/graphql/queries/{metrics.graphql => assetsByFlag.graphql} (51%)
 create mode 100644 client/coral-admin/src/graphql/queries/assetsByLike.graphql

diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index 253c0980b..0cc015e00 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -11,7 +11,7 @@ class Dashboard extends React.Component {
 
     const {data} = this.props;
     console.log('data', data);
-    const {metrics: assets} = data;
+    const {assetsByLike, assetsByFlag} = data;
 
     if (data.loading) {
       return <Spinner />;
@@ -25,14 +25,14 @@ class Dashboard extends React.Component {
       <div className={styles.Dashboard}>
         <div className={styles.widget}>
           <h2 className={styles.heading}>Top Ten Articles with the most flagged comments</h2>
-          <FlagWidget assets={assets} />
+          <FlagWidget assets={assetsByFlag} />
         </div>
         <div className={styles.widget}>
           <h2 className={styles.heading}>Top ten comments with the most likes</h2>
         </div>
         <div className={styles.widget}>
           <h2 className={styles.heading}>Top Ten Articles with the most likes</h2>
-          <LikeWidget assets={assets} />
+          <LikeWidget assets={assetsByLike} />
         </div>
       </div>
     );
diff --git a/client/coral-admin/src/graphql/queries/metrics.graphql b/client/coral-admin/src/graphql/queries/assetsByFlag.graphql
similarity index 51%
rename from client/coral-admin/src/graphql/queries/metrics.graphql
rename to client/coral-admin/src/graphql/queries/assetsByFlag.graphql
index 2f9afe621..c6f0900ac 100644
--- a/client/coral-admin/src/graphql/queries/metrics.graphql
+++ b/client/coral-admin/src/graphql/queries/assetsByFlag.graphql
@@ -1,6 +1,10 @@
 fragment metrics on Asset {
   id
   title
+  url
+  commentCount
+  author
+  created_at
   action_summaries {
     type: __typename
     actionCount
@@ -9,16 +13,7 @@ fragment metrics on Asset {
 }
 
 query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
-  metrics(from: $from, to: $to, sort: $sort) {
-    id
-    title
-    url
-    commentCount
-    author
-    created_at
-    action_summaries {
-      actionCount
-      actionableItemCount
-    }
+  assetsByFlag: metrics(from: $from, to: $to, sort: $sort) {
+    ...metrics
   }
 }
diff --git a/client/coral-admin/src/graphql/queries/assetsByLike.graphql b/client/coral-admin/src/graphql/queries/assetsByLike.graphql
new file mode 100644
index 000000000..853afee41
--- /dev/null
+++ b/client/coral-admin/src/graphql/queries/assetsByLike.graphql
@@ -0,0 +1,19 @@
+fragment metrics on Asset {
+  id
+  title
+  url
+  commentCount
+  author
+  created_at
+  action_summaries {
+    type: __typename
+    actionCount
+    actionableItemCount
+  }
+}
+
+query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
+  assetsByLike: metrics(from: $from, to: $to, sort: $sort) {
+    ...metrics
+  }
+}
diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js
index f98b40091..96cb319c9 100644
--- a/client/coral-admin/src/graphql/queries/index.js
+++ b/client/coral-admin/src/graphql/queries/index.js
@@ -1,9 +1,10 @@
 import {graphql} from 'react-apollo';
 
-import METRICS from './metrics.graphql';
+import BY_LIKES from './assetsByLike.graphql';
+import BY_FLAGS from './assetsByFlag.graphql';
 import MOD_QUEUE_QUERY from './modQueueQuery.graphql';
 
-export const mostFlags = graphql(METRICS, {
+export const mostFlags = graphql(BY_FLAGS, {
   options: () => {
 
     // currently hard-coded per Greg's advice
@@ -19,7 +20,7 @@ export const mostFlags = graphql(METRICS, {
   }
 });
 
-export const mostLikes = graphql(METRICS, {
+export const mostLikes = graphql(BY_LIKES, {
   options: () => {
     const fiveMinutesAgo = new Date();
     fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);

From 5d94a98305bfaa5c07b87746d40565dc41ff6337 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 21 Feb 2017 14:05:49 -0700
Subject: [PATCH 03/37] Like and Flag summaries work again

---
 .../coral-admin/src/components/FlagWidget.js  | 102 +++++++++---------
 .../coral-admin/src/components/LikeWidget.js  |  73 +++++++++----
 .../src/containers/Dashboard/Dashboard.js     |  53 +++------
 .../src/graphql/queries/assetsByLike.graphql  |  19 ----
 .../coral-admin/src/graphql/queries/index.js  |   9 +-
 .../{assetsByFlag.graphql => metrics.graphql} |   2 +-
 client/coral-admin/src/translations.json      |   2 +
 7 files changed, 121 insertions(+), 139 deletions(-)
 delete mode 100644 client/coral-admin/src/graphql/queries/assetsByLike.graphql
 rename client/coral-admin/src/graphql/queries/{assetsByFlag.graphql => metrics.graphql} (80%)

diff --git a/client/coral-admin/src/components/FlagWidget.js b/client/coral-admin/src/components/FlagWidget.js
index 96e21ac0b..a37ddcd2c 100644
--- a/client/coral-admin/src/components/FlagWidget.js
+++ b/client/coral-admin/src/components/FlagWidget.js
@@ -1,66 +1,60 @@
-import React, {PropTypes} from 'react';
+import React from 'react';
+import {compose} from 'react-apollo';
+import {mostFlags} from 'coral-admin/src/graphql/queries';
 import {Link} from 'react-router';
 import styles from './Widget.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations';
+import {Spinner} from 'coral-ui';
 
 const lang = new I18n(translations);
 
-const FlagWidget = ({assets}) => {
+const FlagWidget = (props) => {
+
+  if (props.data.loading) {
+    return <Spinner />;
+  }
+
+  const {data: {metrics: assets}} = props;
 
   return (
-    <table className={styles.widgetTable}>
-      <thead className={styles.widgetHead}>
-        <tr>
-          <th></th>{/* empty on purpose */}
-          <th>{lang.t('streams.article')}</th>
-          <th>{lang.t('modqueue.flagged')}</th>
-          <th>{lang.t('modqueue.likes')}</th>
-          <th>{lang.t('dashboard.comment_count')}</th>
-        </tr>
-      </thead>
-      <tbody>
-        {
-          assets.length
-          ? assets.map((asset, index) => {
-            const flagSummary = asset.action_summaries.find(s => s.__typename === 'FlagAssetActionSummary');
-            const likeSummary = asset.action_summaries.find(s => s.__typename === 'LikeAssetActionSummary');
-            return (
-              <tr key={asset.id}>
-                <td>{index + 1}.</td>
-                <td>
-                  <Link to={`/admin/moderate/flagged/${asset.id}`}>{asset.title}</Link>
-                  <p className={styles.lede}>{asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()}</p>
-                </td>
-                <td>{flagSummary ? flagSummary.actionCount : 0}</td>
-                <td>{likeSummary ? likeSummary.actionCount : 0}</td>
-                <td>{asset.commentCount}</td>
-              </tr>
-            );
-          })
-          : <tr><td colSpan="3">{lang.t('dashboard.no_flags')}</td></tr>
-        }
-      </tbody>
-    </table>
+    <div>
+      <h2 className={styles.heading}>Top Ten Articles with the most flagged comments</h2>
+      <table className={styles.widgetTable}>
+        <thead className={styles.widgetHead}>
+          <tr>
+            <th></th>{/* empty on purpose */}
+            <th>{lang.t('streams.article')}</th>
+            <th>{lang.t('modqueue.flagged')}</th>
+            <th>{lang.t('modqueue.likes')}</th>
+            <th>{lang.t('dashboard.comment_count')}</th>
+          </tr>
+        </thead>
+        <tbody>
+          {
+            assets.length
+            ? assets.map((asset, index) => {
+              const flagSummary = asset.action_summaries.find(s => s.type === 'FlagAssetActionSummary');
+              const likeSummary = asset.action_summaries.find(s => s.type === 'LikeAssetActionSummary');
+              return (
+                <tr key={asset.id}>
+                  <td>{index + 1}.</td>
+                  <td>
+                    <Link to={`/admin/moderate/flagged/${asset.id}`}>{asset.title}</Link>
+                    <p className={styles.lede}>{asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()}</p>
+                  </td>
+                  <td>{flagSummary ? flagSummary.actionCount : 0}</td>
+                  <td>{likeSummary ? likeSummary.actionCount : 0}</td>
+                  <td>{asset.commentCount}</td>
+                </tr>
+              );
+            })
+            : <tr><td colSpan="3">{lang.t('dashboard.no_flags')}</td></tr>
+          }
+        </tbody>
+      </table>
+    </div>
   );
 };
 
-FlagWidget.propTypes = {
-  assets: PropTypes.arrayOf(
-    PropTypes.shape({
-      id: PropTypes.string,
-      title: PropTypes.string,
-      url: PropTypes.string,
-      commentCount: PropTypes.number,
-      action_summaries: PropTypes.arrayOf(
-        PropTypes.shape({
-          __typename: PropTypes.string.isRequired,
-          actionCount: PropTypes.number.isRequired,
-          actionableItemCount: PropTypes.number.isRequired
-        })
-      )
-    })
-  ).isRequired
-};
-
-export default FlagWidget;
+export default compose(mostFlags)(FlagWidget);
diff --git a/client/coral-admin/src/components/LikeWidget.js b/client/coral-admin/src/components/LikeWidget.js
index 33df3e2b4..ac9e111ea 100644
--- a/client/coral-admin/src/components/LikeWidget.js
+++ b/client/coral-admin/src/components/LikeWidget.js
@@ -1,34 +1,61 @@
-import React, {PropTypes} from 'react';
+import React from 'react';
+import {compose} from 'react-apollo';
+import {mostLikes} from 'coral-admin/src/graphql/queries';
 import {Link} from 'react-router';
+import {Spinner} from 'coral-ui';
 import styles from './Widget.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations';
 
 const lang = new I18n(translations);
 
-const LikeWidget = ({assets}) => {
+const LikeWidget = (props) => {
+
+  if (props.data.loading) {
+    return <Spinner />;
+  }
+
+  const {data: {metrics: assets}} = props;
+
   return (
-    <table className={styles.widgetTable}>
-    </table>
+    <div>
+      <h2 className={styles.heading}>Top Ten Articles with the most likes</h2>
+      <table className={styles.widgetTable}>
+        <thead className={styles.widgetHead}>
+          <tr>
+            <th></th>{/* empty on purpose */}
+            <th>{lang.t('streams.article')}</th>
+            <th>{lang.t('modqueue.flagged')}</th>
+            <th>{lang.t('modqueue.likes')}</th>
+            <th>{lang.t('dashboard.comment_count')}</th>
+          </tr>
+        </thead>
+        <tbody>
+          {
+            assets.length
+            ? assets.map((asset, index) => {
+              const flagSummary = asset.action_summaries.find(s => s.type === 'FlagAssetActionSummary');
+              const likeSummary = asset.action_summaries.find(s => s.type === 'LikeAssetActionSummary');
+              console.log('LikeWidget', likeSummary);
+              return (
+                <tr key={asset.id}>
+                  <td>{index + 1}.</td>
+                  <td>
+                    <Link to={`/admin/moderate/flagged/${asset.id}`}>{asset.title}</Link>
+                    <p className={styles.lede}>{asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()}</p>
+                  </td>
+                  <td>{flagSummary ? flagSummary.actionCount : 0}</td>
+                  <td>{likeSummary ? likeSummary.actionCount : 0}</td>
+                  <td>{asset.commentCount}</td>
+                </tr>
+              );
+            })
+            : <tr><td colSpan="3">{lang.t('dashboard.no_likes')}</td></tr>
+          }
+        </tbody>
+      </table>
+    </div>
   );
 };
 
-LikeWidget.propTypes = {
-  assets: PropTypes.arrayOf(
-    PropTypes.shape({
-      id: PropTypes.string,
-      title: PropTypes.string,
-      url: PropTypes.string,
-      commentCount: PropTypes.number,
-      action_summaries: PropTypes.arrayOf(
-        PropTypes.shape({
-          __typename: PropTypes.string.isRequired,
-          actionCount: PropTypes.number.isRequired,
-          actionableItemCount: PropTypes.number.isRequired
-        })
-      )
-    })
-  ).isRequired
-};
-
-export default LikeWidget;
+export default compose(mostLikes)(LikeWidget);
diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index 0cc015e00..fcccb36b3 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -1,45 +1,22 @@
 import React from 'react';
-import {compose} from 'react-apollo';
-import {mostFlags, mostLikes} from 'coral-admin/src/graphql/queries';
-import {Spinner} from 'coral-ui';
 import styles from './Dashboard.css';
 import FlagWidget from '../../components/FlagWidget';
 import LikeWidget from '../../components/LikeWidget';
 
-class Dashboard extends React.Component {
-  render () {
-
-    const {data} = this.props;
-    console.log('data', data);
-    const {assetsByLike, assetsByFlag} = data;
-
-    if (data.loading) {
-      return <Spinner />;
-    }
-
-    if (data.error) {
-      return <code><pre>{data.error}</pre></code>;
-    }
-
-    return (
-      <div className={styles.Dashboard}>
-        <div className={styles.widget}>
-          <h2 className={styles.heading}>Top Ten Articles with the most flagged comments</h2>
-          <FlagWidget assets={assetsByFlag} />
-        </div>
-        <div className={styles.widget}>
-          <h2 className={styles.heading}>Top ten comments with the most likes</h2>
-        </div>
-        <div className={styles.widget}>
-          <h2 className={styles.heading}>Top Ten Articles with the most likes</h2>
-          <LikeWidget assets={assetsByLike} />
-        </div>
+const Dashboard = () => {
+  return (
+    <div className={styles.Dashboard}>
+      <div className={styles.widget}>
+        <FlagWidget />
       </div>
-    );
-  }
-}
+      <div className={styles.widget}>
+        <h2 className={styles.heading}>Top ten comments with the most likes</h2>
+      </div>
+      <div className={styles.widget}>
+        <LikeWidget />
+      </div>
+    </div>
+  );
+};
 
-export default compose(
-  mostFlags,
-  mostLikes
-)(Dashboard);
+export default Dashboard;
diff --git a/client/coral-admin/src/graphql/queries/assetsByLike.graphql b/client/coral-admin/src/graphql/queries/assetsByLike.graphql
deleted file mode 100644
index 853afee41..000000000
--- a/client/coral-admin/src/graphql/queries/assetsByLike.graphql
+++ /dev/null
@@ -1,19 +0,0 @@
-fragment metrics on Asset {
-  id
-  title
-  url
-  commentCount
-  author
-  created_at
-  action_summaries {
-    type: __typename
-    actionCount
-    actionableItemCount
-  }
-}
-
-query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
-  assetsByLike: metrics(from: $from, to: $to, sort: $sort) {
-    ...metrics
-  }
-}
diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js
index 96cb319c9..1628a4ac8 100644
--- a/client/coral-admin/src/graphql/queries/index.js
+++ b/client/coral-admin/src/graphql/queries/index.js
@@ -1,10 +1,9 @@
 import {graphql} from 'react-apollo';
 
-import BY_LIKES from './assetsByLike.graphql';
-import BY_FLAGS from './assetsByFlag.graphql';
+import METRICS from './metrics.graphql';
 import MOD_QUEUE_QUERY from './modQueueQuery.graphql';
 
-export const mostFlags = graphql(BY_FLAGS, {
+export const mostFlags = graphql(METRICS, {
   options: () => {
 
     // currently hard-coded per Greg's advice
@@ -20,8 +19,10 @@ export const mostFlags = graphql(BY_FLAGS, {
   }
 });
 
-export const mostLikes = graphql(BY_LIKES, {
+export const mostLikes = graphql(METRICS, {
   options: () => {
+
+    // currently hard-coded per Greg's advice
     const fiveMinutesAgo = new Date();
     fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
     return {
diff --git a/client/coral-admin/src/graphql/queries/assetsByFlag.graphql b/client/coral-admin/src/graphql/queries/metrics.graphql
similarity index 80%
rename from client/coral-admin/src/graphql/queries/assetsByFlag.graphql
rename to client/coral-admin/src/graphql/queries/metrics.graphql
index c6f0900ac..9a226d8bc 100644
--- a/client/coral-admin/src/graphql/queries/assetsByFlag.graphql
+++ b/client/coral-admin/src/graphql/queries/metrics.graphql
@@ -13,7 +13,7 @@ fragment metrics on Asset {
 }
 
 query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
-  assetsByFlag: metrics(from: $from, to: $to, sort: $sort) {
+  metrics(from: $from, to: $to, sort: $sort) {
     ...metrics
   }
 }
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index 5b15564d7..13d482d6c 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -110,6 +110,7 @@
     },
     "dashboard": {
       "no_flags": "There have been no flags in the last 5 minutes! Hooray!",
+      "no_likes": "There have been no likes in the last 5 minutes. All quiet.",
       "comment_count": "Comments"
     },
     "streams": {
@@ -217,6 +218,7 @@
     },
     "dashbord": {
       "no_flags": "¡Nadie ha marcado nada en los últimos 5 minutos! ¡Bravo!",
+      "no_likes": "A nadie le ha gustado algún comentario en los últimos 5 minutos. Todo tranquilo.",
       "comment_count": "Comentarios"
     },
     "streams": {

From f32fe2629ce74e3214c590fc7014b6109440c4e0 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 21 Feb 2017 14:16:02 -0700
Subject: [PATCH 04/37] css is the worst

---
 .../src/containers/Dashboard/Dashboard.css          | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.css b/client/coral-admin/src/containers/Dashboard/Dashboard.css
index be2cd9f7a..0e46fb642 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.css
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.css
@@ -1,19 +1,14 @@
 .Dashboard {
   display: flex;
-  padding: 5px;
+  flex-wrap: wrap;
 }
 
 .widget {
-  margin-top: 10px;
-  flex: 1;
+  box-sizing: border-box;
+  margin: 10px 5px 5px 5px;
   box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.2);
-  margin-right: 10px;
   padding: 15px;
-
-}
-
-.widget:last-child {
-  margin-right: 0;
+  width: calc(50% - 10px);
 }
 
 .heading {

From 2360f280d2015849954e4d911ee0f78f7781f03c Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 21 Feb 2017 14:17:56 -0700
Subject: [PATCH 05/37] Added commentMetrics edge.

---
 graph/loaders/metrics.js      | 65 +++++++++++++++++++++++++++++++++--
 graph/resolvers/comment.js    |  6 +++-
 graph/resolvers/root_query.js | 12 +++++--
 graph/typeDefs.graphql        | 10 ++++--
 4 files changed, 85 insertions(+), 8 deletions(-)

diff --git a/graph/loaders/metrics.js b/graph/loaders/metrics.js
index a842165c0..7cdecbc8e 100644
--- a/graph/loaders/metrics.js
+++ b/graph/loaders/metrics.js
@@ -5,7 +5,10 @@ const {objectCacheKeyFn} = require('./util');
 const CommentModel = require('../../models/comment');
 const ActionModel = require('../../models/action');
 
-const getMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit}) => {
+/**
+ * Returns a list of assets with action metadata included on the models.
+ */
+const getAssetMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit}) => {
 
   let commentMetrics = {};
   let assetMetrics = [];
@@ -99,6 +102,59 @@ const getMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit}) => {
     });
 };
 
+/**
+ * Returns a list of comments that are retrieved based on most activity within
+ * the indicated time range.
+ */
+const getCommentMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit}) => {
+
+  let commentActionSummaries = {};
+
+  return Metrics.getRecentActions.load({from, to})
+    .then((actionSummaries) => {
+
+      actionSummaries.sort((a, b) => {
+        let aActionSummary = a.action_type === sort ? a : null;
+        let bActionSummary = b.action_type === sort ? b : null;
+
+        // If either a or b don't have this action type, then one of them will
+        // automatically win.
+        if (aActionSummary == null || bActionSummary == null) {
+          if (bActionSummary != null) {
+            return 1;
+          }
+
+          if (aActionSummary != null) {
+            return -1;
+          }
+
+          return 0;
+        }
+
+        // Both of them had an actionCount, hence we can determine that we could
+        // compare the actual values directly.
+        return bActionSummary.count - aActionSummary.count;
+      });
+
+      commentActionSummaries = _.groupBy(actionSummaries, 'item_id');
+
+      let commentIDs = _.uniq(actionSummaries.map(({item_id}) => item_id));
+
+      // Only keep the top `limit`.
+      commentIDs = commentIDs.slice(0, limit);
+
+      // Find those comments.
+      return Metrics.getSpecificComments.loadMany(commentIDs);
+    })
+    .then((comments) => comments.map((comment) => {
+
+      // Add in the action summaries genrerated.
+      comment.action_summaries = commentActionSummaries[comment.id];
+
+      return comment;
+    }));
+};
+
 const getRecentActions = (context, {from, to}) => {
   return ActionModel.aggregate([
 
@@ -150,6 +206,11 @@ module.exports = (context) => ({
       batch: false,
       cacheKeyFn: objectCacheKeyFn('from', 'to')
     }),
-    get: ({from, to, sort, limit}) => getMetrics(context, {from, to, sort, limit})
+    Assets: {
+      get: ({from, to, sort, limit}) => getAssetMetrics(context, {from, to, sort, limit})
+    },
+    Comments: {
+      get: ({from, to, sort, limit}) => getCommentMetrics(context, {from, to, sort, limit})
+    }
   }
 });
diff --git a/graph/resolvers/comment.js b/graph/resolvers/comment.js
index ef77ff6b5..de1909df1 100644
--- a/graph/resolvers/comment.js
+++ b/graph/resolvers/comment.js
@@ -25,7 +25,11 @@ const Comment = {
 
     return null;
   },
-  action_summaries({id}, _, {loaders: {Actions}}) {
+  action_summaries({id, action_summaries}, _, {loaders: {Actions}}) {
+    if (action_summaries) {
+      return action_summaries;
+    }
+
     return Actions.getSummariesByItemID.load(id);
   },
   asset({asset_id}, _, {loaders: {Assets}}) {
diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index ced4e65cf..8800bfebf 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -56,12 +56,20 @@ const RootQuery = {
     return Comments.getCountByQuery({statuses, asset_id, parent_id});
   },
 
-  metrics(_, {from, to, sort, limit = 10}, {user, loaders: {Metrics}}) {
+  assetMetrics(_, {from, to, sort, limit = 10}, {user, loaders: {Metrics: {Assets}}}) {
     if (user == null || !user.hasRoles('ADMIN')) {
       return null;
     }
 
-    return Metrics.get({from, to, sort, limit});
+    return Assets.get({from, to, sort, limit});
+  },
+
+  commentMetrics(_, {from, to, sort, limit = 10}, {user, loaders: {Metrics: {Comments}}}) {
+    if (user == null || !user.hasRoles('ADMIN')) {
+      return null;
+    }
+
+    return Comments.get({from, to, sort, limit});
   },
 
   // This returns the current user, ensure that if we aren't logged in, we
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 72a54a0cd..0eec34b54 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -456,9 +456,13 @@ type RootQuery {
   # role.
   me: User
 
-  # Metrics related to user actions are saturated into the assets returned. The
-  # sort will affect if it will allow
-  metrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): [Asset]
+  # Asset metrics related to user actions are saturated into the assets
+  # returned.
+  assetMetrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): [Asset]
+
+  # Comment metrics related to user actions are saturated into the comments
+  # returned.
+  commentMetrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): [Comment]
 }
 
 ################################################################################

From 6398e2faad14b3e3728a774e8352d2c06ea84a8d Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 22 Feb 2017 09:32:51 -0700
Subject: [PATCH 06/37] Fixed issue with comment hydration

---
 graph/loaders/comments.js | 16 ++++++++++++++++
 graph/loaders/metrics.js  | 13 ++++++++++---
 graph/typeDefs.graphql    |  4 ++--
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/graph/loaders/comments.js b/graph/loaders/comments.js
index ad78a1e92..47a8095dc 100644
--- a/graph/loaders/comments.js
+++ b/graph/loaders/comments.js
@@ -270,6 +270,21 @@ const genRecentComments = (_, ids) => {
   .then(util.arrayJoinBy(ids, 'asset_id'));
 };
 
+/**
+ * Returns the comment's by their id.
+ * @param  {Object}        context graph context
+ * @param  {Array<String>} ids     the comment id's to fetch
+ * @return {Promise}       resolves to the comments
+ */
+const genCommentsByID = (context, ids) => {
+  return CommentModel.find({
+    id: {
+      $in: ids
+    }
+  })
+  .then(util.singleJoinBy(ids, 'id'));
+};
+
 /**
  * Creates a set of loaders based on a GraphQL context.
  * @param  {Object} context the context of the GraphQL request
@@ -277,6 +292,7 @@ const genRecentComments = (_, ids) => {
  */
 module.exports = (context) => ({
   Comments: {
+    get: new DataLoader((ids) => genCommentsByID(context, ids)),
     getByQuery: (query) => getCommentsByQuery(context, query),
     getCountByQuery: (query) => getCommentCountByQuery(context, query),
     countByAssetID: new util.SharedCacheDataLoader('Comments.countByAssetID', 3600, (ids) => getCountsByAssetID(context, ids)),
diff --git a/graph/loaders/metrics.js b/graph/loaders/metrics.js
index 7cdecbc8e..8591ecefe 100644
--- a/graph/loaders/metrics.js
+++ b/graph/loaders/metrics.js
@@ -106,7 +106,7 @@ const getAssetMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit})
  * Returns a list of comments that are retrieved based on most activity within
  * the indicated time range.
  */
-const getCommentMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit}) => {
+const getCommentMetrics = ({loaders: {Metrics, Comments}}, {from, to, sort, limit}) => {
 
   let commentActionSummaries = {};
 
@@ -143,8 +143,15 @@ const getCommentMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit}
       // Only keep the top `limit`.
       commentIDs = commentIDs.slice(0, limit);
 
-      // Find those comments.
-      return Metrics.getSpecificComments.loadMany(commentIDs);
+      // If there are no comment's to get, then just continue with an empty
+      // array.
+      if (commentIDs.length === 0) {
+        return [];
+      }
+
+      // Find those comments, this is the final stage, so let's get all the
+      // fields.
+      return Comments.get.loadMany(commentIDs);
     })
     .then((comments) => comments.map((comment) => {
 
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 0eec34b54..c61312255 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -458,11 +458,11 @@ type RootQuery {
 
   # Asset metrics related to user actions are saturated into the assets
   # returned.
-  assetMetrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): [Asset]
+  assetMetrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): [Asset!]
 
   # Comment metrics related to user actions are saturated into the comments
   # returned.
-  commentMetrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): [Comment]
+  commentMetrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): [Comment!]
 }
 
 ################################################################################

From bc4849632794a2a1947d92b3ecd27113bb92902b Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 22 Feb 2017 10:47:23 -0700
Subject: [PATCH 07/37] add most liked comments widget

---
 .../src/containers/Dashboard/Dashboard.css    |  8 -----
 .../src/containers/Dashboard/Dashboard.js     | 17 ++++-----
 .../Dashboard}/FlagWidget.js                  |  2 +-
 .../Dashboard}/LikeWidget.js                  |  2 +-
 .../Dashboard/MostLikedCommentsWidget.js      | 35 +++++++++++++++++++
 .../Dashboard}/Widget.css                     |  8 +++++
 .../ModerationQueue/ModerationContainer.js    |  5 +--
 .../ModerationQueue/ModerationQueue.js        |  6 ++--
 .../{metrics.graphql => assetMetrics.graphql} |  2 +-
 .../graphql/queries/commentMetrics.graphql    | 19 ++++++++++
 .../coral-admin/src/graphql/queries/index.js  | 23 ++++++++++--
 .../coral-sign-in/components/SignUpContent.js |  9 ++---
 12 files changed, 100 insertions(+), 36 deletions(-)
 rename client/coral-admin/src/{components => containers/Dashboard}/FlagWidget.js (98%)
 rename client/coral-admin/src/{components => containers/Dashboard}/LikeWidget.js (98%)
 create mode 100644 client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
 rename client/coral-admin/src/{components => containers/Dashboard}/Widget.css (75%)
 rename client/coral-admin/src/graphql/queries/{metrics.graphql => assetMetrics.graphql} (80%)
 create mode 100644 client/coral-admin/src/graphql/queries/commentMetrics.graphql

diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.css b/client/coral-admin/src/containers/Dashboard/Dashboard.css
index 0e46fb642..a23927d8a 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.css
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.css
@@ -3,14 +3,6 @@
   flex-wrap: wrap;
 }
 
-.widget {
-  box-sizing: border-box;
-  margin: 10px 5px 5px 5px;
-  box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.2);
-  padding: 15px;
-  width: calc(50% - 10px);
-}
-
 .heading {
   margin: 0;
   font-size: 1.5rem;
diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index fcccb36b3..282772403 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -1,20 +1,15 @@
 import React from 'react';
 import styles from './Dashboard.css';
-import FlagWidget from '../../components/FlagWidget';
-import LikeWidget from '../../components/LikeWidget';
+import FlagWidget from './FlagWidget';
+import LikeWidget from './LikeWidget';
+import MostLikedCommentsWidget from './MostLikedCommentsWidget';
 
 const Dashboard = () => {
   return (
     <div className={styles.Dashboard}>
-      <div className={styles.widget}>
-        <FlagWidget />
-      </div>
-      <div className={styles.widget}>
-        <h2 className={styles.heading}>Top ten comments with the most likes</h2>
-      </div>
-      <div className={styles.widget}>
-        <LikeWidget />
-      </div>
+      <FlagWidget />
+      <MostLikedCommentsWidget />
+      <LikeWidget />
     </div>
   );
 };
diff --git a/client/coral-admin/src/components/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
similarity index 98%
rename from client/coral-admin/src/components/FlagWidget.js
rename to client/coral-admin/src/containers/Dashboard/FlagWidget.js
index a37ddcd2c..4fb993d35 100644
--- a/client/coral-admin/src/components/FlagWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
@@ -18,7 +18,7 @@ const FlagWidget = (props) => {
   const {data: {metrics: assets}} = props;
 
   return (
-    <div>
+    <div className={styles.widget}>
       <h2 className={styles.heading}>Top Ten Articles with the most flagged comments</h2>
       <table className={styles.widgetTable}>
         <thead className={styles.widgetHead}>
diff --git a/client/coral-admin/src/components/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
similarity index 98%
rename from client/coral-admin/src/components/LikeWidget.js
rename to client/coral-admin/src/containers/Dashboard/LikeWidget.js
index ac9e111ea..0f6ea2ba0 100644
--- a/client/coral-admin/src/components/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -18,7 +18,7 @@ const LikeWidget = (props) => {
   const {data: {metrics: assets}} = props;
 
   return (
-    <div>
+    <div className={styles.widget}>
       <h2 className={styles.heading}>Top Ten Articles with the most likes</h2>
       <table className={styles.widgetTable}>
         <thead className={styles.widgetHead}>
diff --git a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
new file mode 100644
index 000000000..6e7d03185
--- /dev/null
+++ b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import {compose} from 'react-apollo';
+import {mostLikedComments} from 'coral-admin/src/graphql/queries';
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from 'coral-admin/src/translations';
+import ModerationQueue from 'coral-admin/src/containers/ModerationQueue/ModerationQueue';
+import {Spinner} from 'coral-ui';
+import styles from './Widget.css';
+
+const lang = new I18n(translations);
+
+const MostLikedCommentsWidget = props => {
+
+  if (props.data.loading) {
+    return <Spinner />;
+  }
+
+  const {data: {comments}} = props;
+
+  console.log('MostLikedCommentsWidget', comments);
+
+  return (
+    <div className={styles.widget}>
+      <h2 className={styles.heading}>most liked comments</h2>
+      <ModerationQueue
+        comments={comments}
+        suspectWords={[]}
+        showBanUserDialog={() => {}}
+        acceptComment={() => {}}
+        rejectComment={() => {}} />
+    </div>
+  );
+};
+
+export default compose(mostLikedComments)(MostLikedCommentsWidget);
diff --git a/client/coral-admin/src/components/Widget.css b/client/coral-admin/src/containers/Dashboard/Widget.css
similarity index 75%
rename from client/coral-admin/src/components/Widget.css
rename to client/coral-admin/src/containers/Dashboard/Widget.css
index f40da403d..d9cce2043 100644
--- a/client/coral-admin/src/components/Widget.css
+++ b/client/coral-admin/src/containers/Dashboard/Widget.css
@@ -1,3 +1,11 @@
+.widget {
+  box-sizing: border-box;
+  margin: 10px 5px 5px 5px;
+  box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.2);
+  padding: 15px;
+  width: calc(50% - 10px);
+}
+
 .heading {
   margin: 0;
   font-size: 1.5rem;
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
index f685ac094..9c68d0728 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
@@ -66,6 +66,8 @@ class ModerationContainer extends Component {
       }
     }
 
+    const comments = data[activeTab];
+
     return (
       <div>
         <ModerationHeader asset={asset} />
@@ -76,9 +78,8 @@ class ModerationContainer extends Component {
           flaggedCount={data.flaggedCount}
         />
         <ModerationQueue
-          data={data}
           currentAsset={asset}
-          activeTab={activeTab}
+          comments={comments}
           suspectWords={settings.wordlist.suspect}
           showBanUserDialog={props.showBanUserDialog}
           acceptComment={props.acceptComment}
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index d30f24c1f..2022fd432 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -3,12 +3,12 @@ import React, {PropTypes} from 'react';
 import Comment from './components/Comment';
 import {actionsMap} from './helpers/moderationQueueActionsMap';
 
-const ModerationQueue = ({activeTab = 'premod', ...props}) => {
+const ModerationQueue = ({comments, ...props}) => {
   return (
     <div id="moderationList">
       <ul>
       {
-        props.data[activeTab].map((comment, i) => {
+        comments.map((comment, i) => {
           const status = comment.action_summaries ? 'FLAGGED' : comment.status;
           return <Comment
             key={i}
@@ -29,7 +29,7 @@ const ModerationQueue = ({activeTab = 'premod', ...props}) => {
 };
 
 ModerationQueue.propTypes = {
-  data: PropTypes.object.isRequired
+  comments: PropTypes.array.isRequired
 };
 
 export default ModerationQueue;
diff --git a/client/coral-admin/src/graphql/queries/metrics.graphql b/client/coral-admin/src/graphql/queries/assetMetrics.graphql
similarity index 80%
rename from client/coral-admin/src/graphql/queries/metrics.graphql
rename to client/coral-admin/src/graphql/queries/assetMetrics.graphql
index 9a226d8bc..caed174b4 100644
--- a/client/coral-admin/src/graphql/queries/metrics.graphql
+++ b/client/coral-admin/src/graphql/queries/assetMetrics.graphql
@@ -13,7 +13,7 @@ fragment metrics on Asset {
 }
 
 query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
-  metrics(from: $from, to: $to, sort: $sort) {
+  metrics: assetMetrics(from: $from, to: $to, sort: $sort) {
     ...metrics
   }
 }
diff --git a/client/coral-admin/src/graphql/queries/commentMetrics.graphql b/client/coral-admin/src/graphql/queries/commentMetrics.graphql
new file mode 100644
index 000000000..59a89739c
--- /dev/null
+++ b/client/coral-admin/src/graphql/queries/commentMetrics.graphql
@@ -0,0 +1,19 @@
+query CommentMetrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
+  comments: commentMetrics(from: $from, to: $to, sort: $sort) {
+    id
+    body
+    user {
+      status
+      username
+    }
+    asset {
+      id
+      title
+    }
+    created_at
+    action_summaries {
+      type: __typename
+      count
+    }
+  }
+}
diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js
index 1628a4ac8..ceedffd9d 100644
--- a/client/coral-admin/src/graphql/queries/index.js
+++ b/client/coral-admin/src/graphql/queries/index.js
@@ -1,9 +1,10 @@
 import {graphql} from 'react-apollo';
 
-import METRICS from './metrics.graphql';
+import ASSET_METRICS from './assetMetrics.graphql';
+import COMMENT_METRICS from './commentMetrics.graphql';
 import MOD_QUEUE_QUERY from './modQueueQuery.graphql';
 
-export const mostFlags = graphql(METRICS, {
+export const mostFlags = graphql(ASSET_METRICS, {
   options: () => {
 
     // currently hard-coded per Greg's advice
@@ -19,7 +20,23 @@ export const mostFlags = graphql(METRICS, {
   }
 });
 
-export const mostLikes = graphql(METRICS, {
+export const mostLikes = graphql(ASSET_METRICS, {
+  options: () => {
+
+    // currently hard-coded per Greg's advice
+    const fiveMinutesAgo = new Date();
+    fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
+    return {
+      variables: {
+        sort: 'LIKE',
+        from: fiveMinutesAgo.toISOString(),
+        to: new Date().toISOString()
+      }
+    };
+  }
+});
+
+export const mostLikedComments = graphql(COMMENT_METRICS, {
   options: () => {
 
     // currently hard-coded per Greg's advice
diff --git a/client/coral-sign-in/components/SignUpContent.js b/client/coral-sign-in/components/SignUpContent.js
index 6a781675b..216349412 100644
--- a/client/coral-sign-in/components/SignUpContent.js
+++ b/client/coral-sign-in/components/SignUpContent.js
@@ -138,12 +138,9 @@ class SignUpContent extends React.Component {
           </div>
         }
         <div className={styles.footer}>
-          <span>
-            {lang.t('signIn.alreadyHaveAnAccount')}
-            <a id="coralSignInViewTrigger" onClick={() => changeView('SIGNIN')}>
-              {lang.t('signIn.signIn')}
-            </a>
-          </span>
+          {lang.t('signIn.alreadyHaveAnAccount')} <a id="coralSignInViewTrigger" onClick={() => changeView('SIGNIN')}>
+            {lang.t('signIn.signIn')}
+          </a>
         </div>
       </div>
     );

From 691d00121366f7f2e14bc2a65cd1e76b61343d2d Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 22 Feb 2017 10:49:48 -0700
Subject: [PATCH 08/37] simplify a bit

---
 client/coral-admin/src/containers/Dashboard/FlagWidget.js   | 2 +-
 client/coral-admin/src/containers/Dashboard/LikeWidget.js   | 2 +-
 client/coral-admin/src/graphql/queries/assetMetrics.graphql | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
index 4fb993d35..8c334d2b8 100644
--- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
@@ -15,7 +15,7 @@ const FlagWidget = (props) => {
     return <Spinner />;
   }
 
-  const {data: {metrics: assets}} = props;
+  const {data: {assets}} = props;
 
   return (
     <div className={styles.widget}>
diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
index 0f6ea2ba0..09dc5606e 100644
--- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -15,7 +15,7 @@ const LikeWidget = (props) => {
     return <Spinner />;
   }
 
-  const {data: {metrics: assets}} = props;
+  const {data: {assets}} = props;
 
   return (
     <div className={styles.widget}>
diff --git a/client/coral-admin/src/graphql/queries/assetMetrics.graphql b/client/coral-admin/src/graphql/queries/assetMetrics.graphql
index caed174b4..de0eb1fe8 100644
--- a/client/coral-admin/src/graphql/queries/assetMetrics.graphql
+++ b/client/coral-admin/src/graphql/queries/assetMetrics.graphql
@@ -13,7 +13,7 @@ fragment metrics on Asset {
 }
 
 query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
-  metrics: assetMetrics(from: $from, to: $to, sort: $sort) {
+  assets: assetMetrics(from: $from, to: $to, sort: $sort) {
     ...metrics
   }
 }

From 111b956522df820b008b112406cf51f3c4b7e744 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 22 Feb 2017 13:10:50 -0700
Subject: [PATCH 09/37] change index route to Dashboard component

---
 client/coral-admin/src/AppRouter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js
index d96bacfe0..38d06dcb1 100644
--- a/client/coral-admin/src/AppRouter.js
+++ b/client/coral-admin/src/AppRouter.js
@@ -15,7 +15,7 @@ const routes = (
   <div>
     <Route exact path="/admin/install" component={InstallContainer}/>
     <Route path='/admin' component={LayoutContainer}>
-      <IndexRoute component={ModerationContainer} />
+      <IndexRoute component={Dashboard} />
       <Route path='community' component={CommunityContainer} />
       <Route path='configure' component={Configure} />
       <Route path='streams' component={Streams} />

From e6b78a3e63fe3b5f336c1470ccbeee702afa1277 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 22 Feb 2017 13:33:50 -0700
Subject: [PATCH 10/37] change some copy

---
 client/coral-admin/src/containers/Dashboard/FlagWidget.js | 2 +-
 client/coral-admin/src/containers/Dashboard/LikeWidget.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
index 8c334d2b8..370010c35 100644
--- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
@@ -19,7 +19,7 @@ const FlagWidget = (props) => {
 
   return (
     <div className={styles.widget}>
-      <h2 className={styles.heading}>Top Ten Articles with the most flagged comments</h2>
+      <h2 className={styles.heading}>Articles with the most flags</h2>
       <table className={styles.widgetTable}>
         <thead className={styles.widgetHead}>
           <tr>
diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
index 09dc5606e..9c46fbbe0 100644
--- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -19,7 +19,7 @@ const LikeWidget = (props) => {
 
   return (
     <div className={styles.widget}>
-      <h2 className={styles.heading}>Top Ten Articles with the most likes</h2>
+      <h2 className={styles.heading}>Articles with the most likes</h2>
       <table className={styles.widgetTable}>
         <thead className={styles.widgetHead}>
           <tr>

From 9e759c7667ceebd1fd4b975f78db3f1333866b9d Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 22 Feb 2017 13:55:48 -0700
Subject: [PATCH 11/37] Adjusted BE beheviour

---
 .../Dashboard/MostLikedCommentsWidget.js      |  8 ++-
 graph/loaders/metrics.js                      | 42 +++++++-----
 test/graph/loaders/metrics.js                 | 66 +++++++++++++++++++
 3 files changed, 96 insertions(+), 20 deletions(-)
 create mode 100644 test/graph/loaders/metrics.js

diff --git a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
index 6e7d03185..39f01b41b 100644
--- a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
@@ -1,13 +1,15 @@
 import React from 'react';
 import {compose} from 'react-apollo';
 import {mostLikedComments} from 'coral-admin/src/graphql/queries';
-import I18n from 'coral-framework/modules/i18n/i18n';
-import translations from 'coral-admin/src/translations';
+
+// import I18n from 'coral-framework/modules/i18n/i18n';
+// import translations from 'coral-admin/src/translations';
+
 import ModerationQueue from 'coral-admin/src/containers/ModerationQueue/ModerationQueue';
 import {Spinner} from 'coral-ui';
 import styles from './Widget.css';
 
-const lang = new I18n(translations);
+// const lang = new I18n(translations);
 
 const MostLikedCommentsWidget = props => {
 
diff --git a/graph/loaders/metrics.js b/graph/loaders/metrics.js
index 8591ecefe..1b0719d0f 100644
--- a/graph/loaders/metrics.js
+++ b/graph/loaders/metrics.js
@@ -17,6 +17,10 @@ const getAssetMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit})
     .then((actionSummaries) => {
 
       commentMetrics = actionSummaries.reduce((acc, {item_id, action_type, count}) => {
+        if (action_type !== sort) {
+          return acc;
+        }
+
         if (!(item_id in acc)) {
           acc[item_id] = [];
         }
@@ -47,29 +51,24 @@ const getAssetMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit})
         }));
 
         return {action_summaries, id: asset_id};
-      });
+      })
+
+      .filter((asset) => {
+        let contextActionSummary = asset.action_summaries.find((({action_type}) => action_type === sort));
+        if (contextActionSummary === null) {
+          return false;
+        }
+
+        return true;
+      })
 
       // Sort these metrics by the predefined sort order. This will ensure that
       // if the action summary does not exist on the object, that it is less
       // prefered over the one that does have it.
-      assetMetrics.sort((a, b) => {
+      .sort((a, b) => {
         let aActionSummary = a.action_summaries.find((({action_type}) => action_type === sort));
         let bActionSummary = b.action_summaries.find((({action_type}) => action_type === sort));
 
-        // If either a or b don't have this action type, then one of them will
-        // automatically win.
-        if (aActionSummary == null || bActionSummary == null) {
-          if (bActionSummary != null) {
-            return 1;
-          }
-
-          if (aActionSummary != null) {
-            return -1;
-          }
-
-          return 0;
-        }
-
         // Both of them had an actionCount, hence we can determine that we could
         // compare the actual values directly.
         return bActionSummary.actionCount - aActionSummary.actionCount;
@@ -138,7 +137,16 @@ const getCommentMetrics = ({loaders: {Metrics, Comments}}, {from, to, sort, limi
 
       commentActionSummaries = _.groupBy(actionSummaries, 'item_id');
 
-      let commentIDs = _.uniq(actionSummaries.map(({item_id}) => item_id));
+      // Grab the comment id's for comment where they have at least one of the
+      // actions being sorted by.
+      let commentIDs = Object.keys(commentActionSummaries).filter((item_id) => {
+        let contextActionSummary = commentActionSummaries[item_id].find(({action_type}) => action_type === sort);
+        if (contextActionSummary == null) {
+          return false;
+        }
+
+        return true;
+      });
 
       // Only keep the top `limit`.
       commentIDs = commentIDs.slice(0, limit);
diff --git a/test/graph/loaders/metrics.js b/test/graph/loaders/metrics.js
new file mode 100644
index 000000000..303b40897
--- /dev/null
+++ b/test/graph/loaders/metrics.js
@@ -0,0 +1,66 @@
+const {expect} = require('chai');
+const {graphql} = require('graphql');
+
+const schema = require('../../../graph/schema');
+const Context = require('../../../graph/context');
+const UserModel = require('../../../models/user');
+const SettingsService = require('../../../services/settings');
+const ActionModel = require('../../../models/action');
+const CommentModel = require('../../../models/comment');
+
+describe('graph.loaders.Metrics', () => {
+  beforeEach(() => SettingsService.init());
+
+  describe('#Comments', () => {
+    const query = `
+      query CommentMetrics($from: Date!, $to: Date!) {
+        liked: commentMetrics(from: $from, to: $to, sort: LIKE) {
+          id
+        }
+        flagged: commentMetrics(from: $from, to: $to, sort: FLAG) {
+          id
+        }
+      }
+    `;
+
+    describe('different comment states', () => {
+
+      beforeEach(() => CommentModel.create([
+        {id: '1', body: 'a new comment!'}
+      ]));
+
+      [
+        {liked: 0, flagged: 0, actions: []},
+        {liked: 1, flagged: 0, actions: [{action_type: 'LIKE', item_id: '1', item_type: 'COMMENTS'}]},
+        {liked: 0, flagged: 1, actions: [{action_type: 'FLAG', item_id: '1', item_type: 'COMMENTS'}]},
+        {liked: 1, flagged: 1, actions: [
+          {action_type: 'FLAG', item_id: '1', item_type: 'COMMENTS'},
+          {action_type: 'LIKE', item_id: '1', item_type: 'COMMENTS'}
+        ]}
+      ].forEach(({liked, flagged, actions}) => {
+
+        describe(`with actions=${actions.length}`, () => {
+
+          beforeEach(() => ActionModel.create(actions));
+
+          it(`returns the correct amount of metrics liked=${liked} flagged=${flagged}`, () => {
+            const context = new Context({user: new UserModel({roles: ['ADMIN']})});
+
+            return graphql(schema, query, {}, context, {
+              from: (new Date()).setMinutes((new Date()).getMinutes() - 5),
+              to: (new Date()).setMinutes((new Date()).getMinutes() + 5)
+            })
+              .then(({data, errors}) => {
+                expect(errors).to.be.undefined;
+                expect(data.liked).to.have.length(liked);
+                expect(data.flagged).to.have.length(flagged);
+              });
+          });
+
+        });
+
+      });
+
+    });
+  });
+});

From 2f314c6937069819b510502fa1a6a26c44220167 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Thu, 23 Feb 2017 14:29:51 -0700
Subject: [PATCH 12/37] omg, a bunch of UI madness

---
 .../src/containers/Dashboard/Dashboard.js     | 79 ++++++++++++++++---
 .../src/containers/Dashboard/FlagWidget.js    | 12 +--
 .../src/containers/Dashboard/LikeWidget.js    |  8 +-
 .../Dashboard/MostLikedCommentsWidget.js      | 63 ++++++++-------
 .../src/graphql/queries/assetMetrics.graphql  | 19 -----
 .../graphql/queries/commentMetrics.graphql    | 19 -----
 .../coral-admin/src/graphql/queries/index.js  | 66 ++++------------
 .../src/graphql/queries/metrics.graphql       | 39 +++++++++
 .../src/graphql/queries/mostFlags.graphql     | 14 ----
 9 files changed, 164 insertions(+), 155 deletions(-)
 delete mode 100644 client/coral-admin/src/graphql/queries/assetMetrics.graphql
 delete mode 100644 client/coral-admin/src/graphql/queries/commentMetrics.graphql
 create mode 100644 client/coral-admin/src/graphql/queries/metrics.graphql
 delete mode 100644 client/coral-admin/src/graphql/queries/mostFlags.graphql

diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index 282772403..74bbce9fb 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -1,17 +1,76 @@
 import React from 'react';
 import styles from './Dashboard.css';
+import {graphql} from 'react-apollo';
+import {connect} from 'react-redux';
 import FlagWidget from './FlagWidget';
 import LikeWidget from './LikeWidget';
-import MostLikedCommentsWidget from './MostLikedCommentsWidget';
+import METRICS from 'coral-admin/src/graphql/queries/metrics.graphql';
+// import MostLikedCommentsWidget from './MostLikedCommentsWidget';
+import {showBanUserDialog, hideBanUserDialog} from 'coral-admin/src/actions/moderation';
+import {Spinner} from 'coral-ui';
 
-const Dashboard = () => {
-  return (
-    <div className={styles.Dashboard}>
-      <FlagWidget />
-      <MostLikedCommentsWidget />
-      <LikeWidget />
-    </div>
-  );
+class Dashboard extends React.Component {
+
+  render () {
+
+    if (this.props.data && this.props.data.loading) {
+      return <Spinner />;
+    }
+
+    console.log(this.props.data);
+
+    const {data: {assetsByLike, assetsByFlag}} = this.props;
+
+    console.log('assetsByLike', assetsByLike);
+    console.log('assetsByFlag', assetsByFlag);
+
+    // const {moderation, settings} = this.props;
+
+    return (
+      <div className={styles.Dashboard}>
+        {assetsByFlag && <FlagWidget assets={assetsByFlag} />}
+        {/*<MostLikedCommentsWidget
+          moderation={moderation}
+          settings={settings}
+          showBanUserDialog={this.props.showBanUserDialog}
+          hideBanUserDialog={this.props.hideBanUserDialog} />*/}
+        {assetsByLike && <LikeWidget assets={assetsByLike} />}
+      </div>
+    );
+  }
+}
+
+let fiveMinutesAgo = new Date();
+fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
+fiveMinutesAgo = fiveMinutesAgo.toISOString();
+const now = new Date().toISOString();
+
+const getMetrics = graphql(METRICS, {
+  options: () => {
+
+    return {
+      variables: {
+        from: fiveMinutesAgo,
+        // from: '2017-02-23T16:09:44.235Z',
+        to: now
+        // to: '2017-02-23T19:30:23.251Z'
+      }
+    };
+  }
+});
+
+const DashboardWithData = getMetrics(Dashboard);
+
+const mapStateToProps = state => {
+  return {
+    settings: state.settings.toJS(),
+    moderation: state.moderation.toJS()
+  };
 };
 
-export default Dashboard;
+const mapDispatchToProps = dispatch => ({
+  showBanUserDialog: (user, commentId) => dispatch(showBanUserDialog(user, commentId)),
+  hideBanUserDialog: () => dispatch(hideBanUserDialog(false))
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(DashboardWithData);
diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
index 370010c35..ada1f03f3 100644
--- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
@@ -1,21 +1,13 @@
 import React from 'react';
-import {compose} from 'react-apollo';
-import {mostFlags} from 'coral-admin/src/graphql/queries';
 import {Link} from 'react-router';
 import styles from './Widget.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations';
-import {Spinner} from 'coral-ui';
 
 const lang = new I18n(translations);
 
 const FlagWidget = (props) => {
-
-  if (props.data.loading) {
-    return <Spinner />;
-  }
-
-  const {data: {assets}} = props;
+  const {assets} = props;
 
   return (
     <div className={styles.widget}>
@@ -57,4 +49,4 @@ const FlagWidget = (props) => {
   );
 };
 
-export default compose(mostFlags)(FlagWidget);
+export default FlagWidget;
diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
index 9c46fbbe0..9358b1f63 100644
--- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -11,11 +11,7 @@ const lang = new I18n(translations);
 
 const LikeWidget = (props) => {
 
-  if (props.data.loading) {
-    return <Spinner />;
-  }
-
-  const {data: {assets}} = props;
+  const {assets} = props;
 
   return (
     <div className={styles.widget}>
@@ -58,4 +54,4 @@ const LikeWidget = (props) => {
   );
 };
 
-export default compose(mostLikes)(LikeWidget);
+export default LikeWidget;
diff --git a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
index 39f01b41b..600a09c13 100644
--- a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
@@ -1,37 +1,44 @@
 import React from 'react';
-import {compose} from 'react-apollo';
-import {mostLikedComments} from 'coral-admin/src/graphql/queries';
-
-// import I18n from 'coral-framework/modules/i18n/i18n';
-// import translations from 'coral-admin/src/translations';
-
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from 'coral-admin/src/translations';
 import ModerationQueue from 'coral-admin/src/containers/ModerationQueue/ModerationQueue';
 import {Spinner} from 'coral-ui';
 import styles from './Widget.css';
+import BanUserDialog from 'coral-admin/src/components/BanUserDialog';
 
-// const lang = new I18n(translations);
+const lang = new I18n(translations);
 
-const MostLikedCommentsWidget = props => {
+class MostLikedCommentsWidget extends React.Component {
 
-  if (props.data.loading) {
-    return <Spinner />;
+  render () {
+    // console.log('render! loading?', this.props.data.loading);
+
+    // if (this.props.data.loading) {
+    //   return <Spinner />;
+    // }
+
+    // const {
+    //   comments,
+    //   moderation,
+    //   settings,
+    //   showBanUserDialog,
+    //   hideBanUserDialog
+    // } = this.props;
+
+    // console.log('MostLikedCommentsWidget', comments);
+
+    return (
+      <div className={styles.widget}>
+        <h2 className={styles.heading}>{lang.t('most_liked_comments')}</h2>
+        {/*<ModerationQueue
+          comments={comments}
+          suspectWords={settings.wordlist.suspect}
+          showBanUserDialog={showBanUserDialog}
+          acceptComment={() => {}}
+          rejectComment={() => {}} />*/}
+      </div>
+    );
   }
+}
 
-  const {data: {comments}} = props;
-
-  console.log('MostLikedCommentsWidget', comments);
-
-  return (
-    <div className={styles.widget}>
-      <h2 className={styles.heading}>most liked comments</h2>
-      <ModerationQueue
-        comments={comments}
-        suspectWords={[]}
-        showBanUserDialog={() => {}}
-        acceptComment={() => {}}
-        rejectComment={() => {}} />
-    </div>
-  );
-};
-
-export default compose(mostLikedComments)(MostLikedCommentsWidget);
+export default MostLikedCommentsWidget;
diff --git a/client/coral-admin/src/graphql/queries/assetMetrics.graphql b/client/coral-admin/src/graphql/queries/assetMetrics.graphql
deleted file mode 100644
index de0eb1fe8..000000000
--- a/client/coral-admin/src/graphql/queries/assetMetrics.graphql
+++ /dev/null
@@ -1,19 +0,0 @@
-fragment metrics on Asset {
-  id
-  title
-  url
-  commentCount
-  author
-  created_at
-  action_summaries {
-    type: __typename
-    actionCount
-    actionableItemCount
-  }
-}
-
-query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
-  assets: assetMetrics(from: $from, to: $to, sort: $sort) {
-    ...metrics
-  }
-}
diff --git a/client/coral-admin/src/graphql/queries/commentMetrics.graphql b/client/coral-admin/src/graphql/queries/commentMetrics.graphql
deleted file mode 100644
index 59a89739c..000000000
--- a/client/coral-admin/src/graphql/queries/commentMetrics.graphql
+++ /dev/null
@@ -1,19 +0,0 @@
-query CommentMetrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
-  comments: commentMetrics(from: $from, to: $to, sort: $sort) {
-    id
-    body
-    user {
-      status
-      username
-    }
-    asset {
-      id
-      title
-    }
-    created_at
-    action_summaries {
-      type: __typename
-      count
-    }
-  }
-}
diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js
index ceedffd9d..d6011e056 100644
--- a/client/coral-admin/src/graphql/queries/index.js
+++ b/client/coral-admin/src/graphql/queries/index.js
@@ -1,56 +1,24 @@
 import {graphql} from 'react-apollo';
 
-import ASSET_METRICS from './assetMetrics.graphql';
-import COMMENT_METRICS from './commentMetrics.graphql';
+import METRICS from './metrics.graphql';
 import MOD_QUEUE_QUERY from './modQueueQuery.graphql';
 
-export const mostFlags = graphql(ASSET_METRICS, {
-  options: () => {
-
-    // currently hard-coded per Greg's advice
-    const fiveMinutesAgo = new Date();
-    fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
-    return {
-      variables: {
-        sort: 'FLAG',
-        from: fiveMinutesAgo.toISOString(),
-        to: new Date().toISOString()
-      }
-    };
-  }
-});
-
-export const mostLikes = graphql(ASSET_METRICS, {
-  options: () => {
-
-    // currently hard-coded per Greg's advice
-    const fiveMinutesAgo = new Date();
-    fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
-    return {
-      variables: {
-        sort: 'LIKE',
-        from: fiveMinutesAgo.toISOString(),
-        to: new Date().toISOString()
-      }
-    };
-  }
-});
-
-export const mostLikedComments = graphql(COMMENT_METRICS, {
-  options: () => {
-
-    // currently hard-coded per Greg's advice
-    const fiveMinutesAgo = new Date();
-    fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
-    return {
-      variables: {
-        sort: 'LIKE',
-        from: fiveMinutesAgo.toISOString(),
-        to: new Date().toISOString()
-      }
-    };
-  }
-});
+// export const getMetrics = graphql(METRICS, {
+//   options: () => {
+//
+//     // currently hard-coded per Greg's advice
+//     const fiveMinutesAgo = new Date();
+//     fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
+//     return {
+//       variables: {
+//         // from: fiveMinutesAgo.toISOString(),
+//         from: '2017-02-23T16:09:44.235Z',
+//         // to: new Date().toISOString()
+//         to: '2017-02-23T19:30:23.251Z'
+//       }
+//     };
+//   }
+// });
 
 export const modQueueQuery = graphql(MOD_QUEUE_QUERY, {
   options: ({params: {id = null}}) => {
diff --git a/client/coral-admin/src/graphql/queries/metrics.graphql b/client/coral-admin/src/graphql/queries/metrics.graphql
new file mode 100644
index 000000000..4e713c0b7
--- /dev/null
+++ b/client/coral-admin/src/graphql/queries/metrics.graphql
@@ -0,0 +1,39 @@
+fragment metrics on Asset {
+  id
+  title
+  url
+  commentCount
+  author
+  created_at
+  action_summaries {
+    type: __typename
+    actionCount
+    actionableItemCount
+  }
+}
+
+query Metrics ($from: Date!, $to: Date!) {
+  assetsByFlag: assetMetrics(from: $from, to: $to, sort: FLAG) {
+    ...metrics
+  }
+  assetsByLike: assetMetrics(from: $from, to: $to, sort: LIKE) {
+    ...metrics
+  }
+  mostLikedComments: commentMetrics(from: $from, to: $to, sort: LIKE) {
+    id
+    body
+    user {
+      status
+      username
+    }
+    asset {
+      id
+      title
+    }
+    created_at
+    action_summaries {
+      type: __typename
+      count
+    }
+  }
+}
diff --git a/client/coral-admin/src/graphql/queries/mostFlags.graphql b/client/coral-admin/src/graphql/queries/mostFlags.graphql
deleted file mode 100644
index 182ea0c8b..000000000
--- a/client/coral-admin/src/graphql/queries/mostFlags.graphql
+++ /dev/null
@@ -1,14 +0,0 @@
-query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
-  metrics(from: $from, to: $to, sort: $sort) {
-    id
-    title
-    url
-    commentCount
-    author
-    created_at
-    action_summaries {
-      actionCount
-      actionableItemCount
-    }
-  }
-}

From 30b6259e872dfd65851d6bffc913df96f54f3a21 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 23 Feb 2017 14:43:25 -0700
Subject: [PATCH 13/37] Patched bug with asset metrics

---
 graph/loaders/metrics.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graph/loaders/metrics.js b/graph/loaders/metrics.js
index 1b0719d0f..a22cbb58f 100644
--- a/graph/loaders/metrics.js
+++ b/graph/loaders/metrics.js
@@ -31,7 +31,7 @@ const getAssetMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit})
       }, {});
 
       // Collect just the comment id's.
-      let commentIDs = _.uniq(actionSummaries.map((as) => as.item_id));
+      let commentIDs = Object.keys(commentMetrics);
 
       // Find those comments.
       return Metrics.getSpecificComments.loadMany(commentIDs);

From be25d6f56d9b2770493e05ee7886559e6ebb1587 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Thu, 23 Feb 2017 15:46:44 -0700
Subject: [PATCH 14/37] "works"

---
 .../src/containers/Dashboard/Dashboard.css    |  1 -
 .../src/containers/Dashboard/Dashboard.js     | 33 ++++++-----
 .../Dashboard/MostLikedCommentsWidget.js      | 59 +++++++++----------
 .../src/containers/Dashboard/Widget.css       |  2 +-
 4 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.css b/client/coral-admin/src/containers/Dashboard/Dashboard.css
index a23927d8a..72b9bd90c 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.css
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.css
@@ -1,6 +1,5 @@
 .Dashboard {
   display: flex;
-  flex-wrap: wrap;
 }
 
 .heading {
diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index 74bbce9fb..10d3b3ba3 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -1,12 +1,13 @@
 import React from 'react';
 import styles from './Dashboard.css';
-import {graphql} from 'react-apollo';
+import {graphql, compose} from 'react-apollo';
 import {connect} from 'react-redux';
 import FlagWidget from './FlagWidget';
 import LikeWidget from './LikeWidget';
 import METRICS from 'coral-admin/src/graphql/queries/metrics.graphql';
-// import MostLikedCommentsWidget from './MostLikedCommentsWidget';
+import MostLikedCommentsWidget from './MostLikedCommentsWidget';
 import {showBanUserDialog, hideBanUserDialog} from 'coral-admin/src/actions/moderation';
+import {banUser, setCommentStatus} from 'coral-admin/src/graphql/mutations';
 import {Spinner} from 'coral-ui';
 
 class Dashboard extends React.Component {
@@ -19,30 +20,34 @@ class Dashboard extends React.Component {
 
     console.log(this.props.data);
 
-    const {data: {assetsByLike, assetsByFlag}} = this.props;
+    const {data: {assetsByLike, assetsByFlag, mostLikedComments}} = this.props;
 
     console.log('assetsByLike', assetsByLike);
     console.log('assetsByFlag', assetsByFlag);
 
-    // const {moderation, settings} = this.props;
+    const {moderation, settings} = this.props;
 
     return (
       <div className={styles.Dashboard}>
-        {assetsByFlag && <FlagWidget assets={assetsByFlag} />}
-        {/*<MostLikedCommentsWidget
+        <FlagWidget assets={assetsByFlag} />
+        <MostLikedCommentsWidget
+          comments={mostLikedComments}
           moderation={moderation}
           settings={settings}
+          acceptComment={this.props.acceptComment}
+          rejectComment={this.props.rejectComment}
+          handleBanUser={this.props.banUser}
           showBanUserDialog={this.props.showBanUserDialog}
-          hideBanUserDialog={this.props.hideBanUserDialog} />*/}
-        {assetsByLike && <LikeWidget assets={assetsByLike} />}
+          hideBanUserDialog={this.props.hideBanUserDialog} />
+        <LikeWidget assets={assetsByLike} />
       </div>
     );
   }
 }
 
-let fiveMinutesAgo = new Date();
-fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
-fiveMinutesAgo = fiveMinutesAgo.toISOString();
+let then = new Date();
+then.setMinutes(then.getMinutes() - 205);
+then = then.toISOString();
 const now = new Date().toISOString();
 
 const getMetrics = graphql(METRICS, {
@@ -50,16 +55,14 @@ const getMetrics = graphql(METRICS, {
 
     return {
       variables: {
-        from: fiveMinutesAgo,
-        // from: '2017-02-23T16:09:44.235Z',
+        from: then,
         to: now
-        // to: '2017-02-23T19:30:23.251Z'
       }
     };
   }
 });
 
-const DashboardWithData = getMetrics(Dashboard);
+const DashboardWithData = compose(getMetrics, setCommentStatus, banUser)(Dashboard);
 
 const mapStateToProps = state => {
   return {
diff --git a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
index 600a09c13..5b0427acb 100644
--- a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
@@ -8,37 +8,34 @@ import BanUserDialog from 'coral-admin/src/components/BanUserDialog';
 
 const lang = new I18n(translations);
 
-class MostLikedCommentsWidget extends React.Component {
+const MostLikedCommentsWidget = props => {
+  const {
+    comments,
+    moderation,
+    settings,
+    handleBanUser,
+    showBanUserDialog,
+    hideBanUserDialog,
+    acceptComment,
+    rejectComment
+  } = props;
 
-  render () {
-    // console.log('render! loading?', this.props.data.loading);
-
-    // if (this.props.data.loading) {
-    //   return <Spinner />;
-    // }
-
-    // const {
-    //   comments,
-    //   moderation,
-    //   settings,
-    //   showBanUserDialog,
-    //   hideBanUserDialog
-    // } = this.props;
-
-    // console.log('MostLikedCommentsWidget', comments);
-
-    return (
-      <div className={styles.widget}>
-        <h2 className={styles.heading}>{lang.t('most_liked_comments')}</h2>
-        {/*<ModerationQueue
-          comments={comments}
-          suspectWords={settings.wordlist.suspect}
-          showBanUserDialog={showBanUserDialog}
-          acceptComment={() => {}}
-          rejectComment={() => {}} />*/}
-      </div>
-    );
-  }
-}
+  return (
+    <div className={styles.widget}>
+      <h2 className={styles.heading}>{lang.t('most_liked_comments')}</h2>
+      <ModerationQueue
+        comments={comments}
+        suspectWords={settings.wordlist.suspect}
+        showBanUserDialog={showBanUserDialog}
+        acceptComment={acceptComment}
+        rejectComment={rejectComment} />
+      <BanUserDialog
+        open={moderation.banDialog}
+        user={moderation.user}
+        handleClose={hideBanUserDialog}
+        handleBanUser={handleBanUser} />
+    </div>
+  );
+};
 
 export default MostLikedCommentsWidget;
diff --git a/client/coral-admin/src/containers/Dashboard/Widget.css b/client/coral-admin/src/containers/Dashboard/Widget.css
index d9cce2043..624b72519 100644
--- a/client/coral-admin/src/containers/Dashboard/Widget.css
+++ b/client/coral-admin/src/containers/Dashboard/Widget.css
@@ -3,7 +3,7 @@
   margin: 10px 5px 5px 5px;
   box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.2);
   padding: 15px;
-  width: calc(50% - 10px);
+  flex: 1;
 }
 
 .heading {

From dc5f95ec7f20cba1f6cdcd6e88fe18dcff04a19c Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 24 Feb 2017 08:50:52 -0700
Subject: [PATCH 15/37] simplify moderationqueue

---
 .../src/containers/ModerationQueue/ModerationQueue.js        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index a0e6332b5..b1792f720 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -12,7 +12,8 @@ const ModerationQueue = ({comments, ...props}) => {
     <div id="moderationList">
       <ul style={{paddingLeft: 0}}>
       {
-        comments.map((comment, i) => {
+        comments.length
+        ? comments.map((comment, i) => {
           const status = comment.action_summaries ? 'FLAGGED' : comment.status;
           return <Comment
             key={i}
@@ -34,7 +35,7 @@ const ModerationQueue = ({comments, ...props}) => {
 };
 
 ModerationQueue.propTypes = {
-  suspectWords: PropTypes.arrayOf(PropTypes.string).isRequired
+  suspectWords: PropTypes.arrayOf(PropTypes.string).isRequired,
   currentAsset: PropTypes.object,
   showBanUserDialog: PropTypes.func.isRequired,
   rejectComment: PropTypes.func.isRequired,

From c8c3c4acaf2adcc2c0e35b782ccfb6e63650c5ff Mon Sep 17 00:00:00 2001
From: riley <riley.davis@gmail.com>
Date: Fri, 24 Feb 2017 08:59:23 -0700
Subject: [PATCH 16/37] lint

---
 .../src/containers/Dashboard/LikeWidget.js     |  3 ---
 .../Dashboard/MostLikedCommentsWidget.js       |  1 -
 .../coral-admin/src/graphql/queries/index.js   | 18 ------------------
 3 files changed, 22 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
index 9358b1f63..076958bcd 100644
--- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -1,8 +1,5 @@
 import React from 'react';
-import {compose} from 'react-apollo';
-import {mostLikes} from 'coral-admin/src/graphql/queries';
 import {Link} from 'react-router';
-import {Spinner} from 'coral-ui';
 import styles from './Widget.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations';
diff --git a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
index 5b0427acb..0c41ac7c6 100644
--- a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
@@ -2,7 +2,6 @@ import React from 'react';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations';
 import ModerationQueue from 'coral-admin/src/containers/ModerationQueue/ModerationQueue';
-import {Spinner} from 'coral-ui';
 import styles from './Widget.css';
 import BanUserDialog from 'coral-admin/src/components/BanUserDialog';
 
diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js
index d6011e056..022522500 100644
--- a/client/coral-admin/src/graphql/queries/index.js
+++ b/client/coral-admin/src/graphql/queries/index.js
@@ -1,25 +1,7 @@
 import {graphql} from 'react-apollo';
 
-import METRICS from './metrics.graphql';
 import MOD_QUEUE_QUERY from './modQueueQuery.graphql';
 
-// export const getMetrics = graphql(METRICS, {
-//   options: () => {
-//
-//     // currently hard-coded per Greg's advice
-//     const fiveMinutesAgo = new Date();
-//     fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
-//     return {
-//       variables: {
-//         // from: fiveMinutesAgo.toISOString(),
-//         from: '2017-02-23T16:09:44.235Z',
-//         // to: new Date().toISOString()
-//         to: '2017-02-23T19:30:23.251Z'
-//       }
-//     };
-//   }
-// });
-
 export const modQueueQuery = graphql(MOD_QUEUE_QUERY, {
   options: ({params: {id = null}}) => {
     return {

From c283f193deceb61e5f07b423cd0e103933ff341c Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 24 Feb 2017 09:07:03 -0700
Subject: [PATCH 17/37] remove console.log

---
 client/coral-admin/src/containers/Dashboard/Dashboard.js  | 6 ------
 client/coral-admin/src/containers/Dashboard/LikeWidget.js | 1 -
 2 files changed, 7 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index 10d3b3ba3..51e46408d 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -18,13 +18,7 @@ class Dashboard extends React.Component {
       return <Spinner />;
     }
 
-    console.log(this.props.data);
-
     const {data: {assetsByLike, assetsByFlag, mostLikedComments}} = this.props;
-
-    console.log('assetsByLike', assetsByLike);
-    console.log('assetsByFlag', assetsByFlag);
-
     const {moderation, settings} = this.props;
 
     return (
diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
index 076958bcd..82eecb049 100644
--- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -29,7 +29,6 @@ const LikeWidget = (props) => {
             ? assets.map((asset, index) => {
               const flagSummary = asset.action_summaries.find(s => s.type === 'FlagAssetActionSummary');
               const likeSummary = asset.action_summaries.find(s => s.type === 'LikeAssetActionSummary');
-              console.log('LikeWidget', likeSummary);
               return (
                 <tr key={asset.id}>
                   <td>{index + 1}.</td>

From f5277ce5e3cdbabd9423b8b825bfec52951d9677 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 24 Feb 2017 09:56:18 -0700
Subject: [PATCH 18/37] Patched silly bug

---
 client/.eslintrc.json         |  3 +-
 graph/loaders/metrics.js      | 18 +------
 test/graph/loaders/metrics.js | 89 ++++++++++++++++++++++++++++++++++-
 3 files changed, 92 insertions(+), 18 deletions(-)

diff --git a/client/.eslintrc.json b/client/.eslintrc.json
index a935eaec6..1144f985d 100644
--- a/client/.eslintrc.json
+++ b/client/.eslintrc.json
@@ -18,6 +18,7 @@
     ],
     "rules": {
       "react/jsx-uses-react": "error",
-      "react/jsx-uses-vars": "error"
+      "react/jsx-uses-vars": "error",
+      "no-console": ["warn", { "allow": ["warn", "error"] }]
     }
 }
diff --git a/graph/loaders/metrics.js b/graph/loaders/metrics.js
index a22cbb58f..2627d82d9 100644
--- a/graph/loaders/metrics.js
+++ b/graph/loaders/metrics.js
@@ -2,13 +2,12 @@ const _ = require('lodash');
 const DataLoader = require('dataloader');
 const {objectCacheKeyFn} = require('./util');
 
-const CommentModel = require('../../models/comment');
 const ActionModel = require('../../models/action');
 
 /**
  * Returns a list of assets with action metadata included on the models.
  */
-const getAssetMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit}) => {
+const getAssetMetrics = ({loaders: {Metrics, Assets, Comments}}, {from, to, sort, limit}) => {
 
   let commentMetrics = {};
   let assetMetrics = [];
@@ -34,7 +33,7 @@ const getAssetMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit})
       let commentIDs = Object.keys(commentMetrics);
 
       // Find those comments.
-      return Metrics.getSpecificComments.loadMany(commentIDs);
+      return Comments.get.loadMany(commentIDs);
     })
     .then((comments) => {
 
@@ -202,21 +201,8 @@ const getRecentActions = (context, {from, to}) => {
   ]);
 };
 
-const getSpecificComments = (context, ids) => {
-  return CommentModel.find({
-    id: {
-      $in: ids
-    }
-  })
-  .select({
-    id: 1,
-    asset_id: 1
-  });
-};
-
 module.exports = (context) => ({
   Metrics: {
-    getSpecificComments: new DataLoader((ids) => getSpecificComments(context, ids)),
     getRecentActions: new DataLoader(([{from, to}]) => getRecentActions(context, {from, to}).then((as) => [as]), {
       batch: false,
       cacheKeyFn: objectCacheKeyFn('from', 'to')
diff --git a/test/graph/loaders/metrics.js b/test/graph/loaders/metrics.js
index 303b40897..032a59536 100644
--- a/test/graph/loaders/metrics.js
+++ b/test/graph/loaders/metrics.js
@@ -4,6 +4,7 @@ const {graphql} = require('graphql');
 const schema = require('../../../graph/schema');
 const Context = require('../../../graph/context');
 const UserModel = require('../../../models/user');
+const AssetModel = require('../../../models/asset');
 const SettingsService = require('../../../services/settings');
 const ActionModel = require('../../../models/action');
 const CommentModel = require('../../../models/comment');
@@ -26,7 +27,9 @@ describe('graph.loaders.Metrics', () => {
     describe('different comment states', () => {
 
       beforeEach(() => CommentModel.create([
-        {id: '1', body: 'a new comment!'}
+        {id: '1', body: 'a new comment!'},
+        {id: '2', body: 'a new comment!'},
+        {id: '3', body: 'a new comment!'}
       ]));
 
       [
@@ -36,6 +39,12 @@ describe('graph.loaders.Metrics', () => {
         {liked: 1, flagged: 1, actions: [
           {action_type: 'FLAG', item_id: '1', item_type: 'COMMENTS'},
           {action_type: 'LIKE', item_id: '1', item_type: 'COMMENTS'}
+        ]},
+        {liked: 3, flagged: 1, actions: [
+          {action_type: 'LIKE', item_id: '1', item_type: 'COMMENTS'},
+          {action_type: 'LIKE', item_id: '2', item_type: 'COMMENTS'},
+          {action_type: 'LIKE', item_id: '3', item_type: 'COMMENTS'},
+          {action_type: 'FLAG', item_id: '3', item_type: 'COMMENTS'}
         ]}
       ].forEach(({liked, flagged, actions}) => {
 
@@ -63,4 +72,82 @@ describe('graph.loaders.Metrics', () => {
 
     });
   });
+
+  describe('#Assets', () => {
+    const query = `
+      fragment metrics on Asset {
+        id
+        action_summaries {
+          type: __typename
+          actionCount
+          actionableItemCount
+        }
+      }
+
+      query Metrics($from: Date!, $to: Date!) {
+        assetsByFlag: assetMetrics(from: $from, to: $to, sort: FLAG) {
+          ...metrics
+        }
+        assetsByLike: assetMetrics(from: $from, to: $to, sort: LIKE) {
+          ...metrics
+        }
+      }
+    `;
+
+    describe('different comment states', () => {
+
+      beforeEach(() => Promise.all([
+        AssetModel.create([
+          {id: 'a1', url: 'http://localhost:3030/article/1'},
+          {id: 'a2', url: 'http://localhost:3030/article/2'}
+        ]),
+        CommentModel.create([
+          {id: 'c1', asset_id: 'a1', body: 'a new comment!'},
+          {id: 'c2', asset_id: 'a1', body: 'a new comment!'},
+          {id: 'c3', asset_id: 'a1', body: 'a new comment!'}
+        ])
+      ]));
+
+      [
+        {liked: 0, flagged: 0, actions: []},
+        {liked: 1, flagged: 0, actions: [{action_type: 'LIKE', item_id: 'c1', item_type: 'COMMENTS'}]},
+        {liked: 0, flagged: 1, actions: [{action_type: 'FLAG', item_id: 'c1', item_type: 'COMMENTS'}]},
+        {liked: 1, flagged: 1, actions: [
+          {action_type: 'FLAG', item_id: 'c1', item_type: 'COMMENTS'},
+          {action_type: 'LIKE', item_id: 'c1', item_type: 'COMMENTS'}
+        ]},
+        {liked: 1, flagged: 1, actions: [
+          {action_type: 'LIKE', item_id: 'c1', item_type: 'COMMENTS'},
+          {action_type: 'LIKE', item_id: 'c2', item_type: 'COMMENTS'},
+          {action_type: 'LIKE', item_id: 'c3', item_type: 'COMMENTS'},
+          {action_type: 'FLAG', item_id: 'c3', item_type: 'COMMENTS'}
+        ]}
+      ].forEach(({liked, flagged, actions}) => {
+
+        describe(`with actions=${actions.length}`, () => {
+
+          beforeEach(() => ActionModel.create(actions));
+
+          it(`returns the correct amount of metrics liked=${liked} flagged=${flagged}`, () => {
+            const context = new Context({user: new UserModel({roles: ['ADMIN']})});
+
+            return graphql(schema, query, {}, context, {
+              from: (new Date()).setMinutes((new Date()).getMinutes() - 5),
+              to: (new Date()).setMinutes((new Date()).getMinutes() + 5)
+            })
+              .then(({data, errors}) => {
+                console.log(JSON.stringify(errors, null, 2));
+
+                expect(errors).to.be.undefined;
+                expect(data.assetsByLike).to.have.length(liked);
+                expect(data.assetsByFlag).to.have.length(flagged);
+              });
+          });
+
+        });
+
+      });
+
+    });
+  });
 });

From 799727264e6a42ad7c82925269af8760bbfe9628 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 24 Feb 2017 09:57:57 -0700
Subject: [PATCH 19/37] Removed log

---
 test/graph/loaders/metrics.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/graph/loaders/metrics.js b/test/graph/loaders/metrics.js
index 032a59536..29f2eeff1 100644
--- a/test/graph/loaders/metrics.js
+++ b/test/graph/loaders/metrics.js
@@ -136,8 +136,6 @@ describe('graph.loaders.Metrics', () => {
               to: (new Date()).setMinutes((new Date()).getMinutes() + 5)
             })
               .then(({data, errors}) => {
-                console.log(JSON.stringify(errors, null, 2));
-
                 expect(errors).to.be.undefined;
                 expect(data.assetsByLike).to.have.length(liked);
                 expect(data.assetsByFlag).to.have.length(flagged);

From 38e093aac32e48db9606ec46047ae4a79c4503c1 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 24 Feb 2017 11:26:23 -0700
Subject: [PATCH 20/37] remove most liked comments widget

---
 .../src/containers/Dashboard/Dashboard.js     | 12 ++++---
 .../src/containers/Dashboard/FlagWidget.js    |  3 --
 .../src/containers/Dashboard/LikeWidget.js    |  3 --
 .../src/graphql/queries/metrics.graphql       | 34 +++++++++----------
 client/coral-admin/src/translations.json      |  4 +--
 5 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index 51e46408d..ba840c627 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -5,7 +5,8 @@ import {connect} from 'react-redux';
 import FlagWidget from './FlagWidget';
 import LikeWidget from './LikeWidget';
 import METRICS from 'coral-admin/src/graphql/queries/metrics.graphql';
-import MostLikedCommentsWidget from './MostLikedCommentsWidget';
+
+// import MostLikedCommentsWidget from './MostLikedCommentsWidget';
 import {showBanUserDialog, hideBanUserDialog} from 'coral-admin/src/actions/moderation';
 import {banUser, setCommentStatus} from 'coral-admin/src/graphql/mutations';
 import {Spinner} from 'coral-ui';
@@ -18,12 +19,14 @@ class Dashboard extends React.Component {
       return <Spinner />;
     }
 
-    const {data: {assetsByLike, assetsByFlag, mostLikedComments}} = this.props;
-    const {moderation, settings} = this.props;
+    const {data: {assetsByLike, assetsByFlag/* , mostLikedComments*/}} = this.props;
+
+    // const {moderation, settings} = this.props;
 
     return (
       <div className={styles.Dashboard}>
         <FlagWidget assets={assetsByFlag} />
+        {/*
         <MostLikedCommentsWidget
           comments={mostLikedComments}
           moderation={moderation}
@@ -33,6 +36,7 @@ class Dashboard extends React.Component {
           handleBanUser={this.props.banUser}
           showBanUserDialog={this.props.showBanUserDialog}
           hideBanUserDialog={this.props.hideBanUserDialog} />
+          */}
         <LikeWidget assets={assetsByLike} />
       </div>
     );
@@ -40,7 +44,7 @@ class Dashboard extends React.Component {
 }
 
 let then = new Date();
-then.setMinutes(then.getMinutes() - 205);
+then.setMinutes(then.getMinutes() - 5);
 then = then.toISOString();
 const now = new Date().toISOString();
 
diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
index ada1f03f3..34c67086e 100644
--- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
@@ -18,7 +18,6 @@ const FlagWidget = (props) => {
             <th></th>{/* empty on purpose */}
             <th>{lang.t('streams.article')}</th>
             <th>{lang.t('modqueue.flagged')}</th>
-            <th>{lang.t('modqueue.likes')}</th>
             <th>{lang.t('dashboard.comment_count')}</th>
           </tr>
         </thead>
@@ -27,7 +26,6 @@ const FlagWidget = (props) => {
             assets.length
             ? assets.map((asset, index) => {
               const flagSummary = asset.action_summaries.find(s => s.type === 'FlagAssetActionSummary');
-              const likeSummary = asset.action_summaries.find(s => s.type === 'LikeAssetActionSummary');
               return (
                 <tr key={asset.id}>
                   <td>{index + 1}.</td>
@@ -36,7 +34,6 @@ const FlagWidget = (props) => {
                     <p className={styles.lede}>{asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()}</p>
                   </td>
                   <td>{flagSummary ? flagSummary.actionCount : 0}</td>
-                  <td>{likeSummary ? likeSummary.actionCount : 0}</td>
                   <td>{asset.commentCount}</td>
                 </tr>
               );
diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
index 82eecb049..dd92a94ca 100644
--- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -18,7 +18,6 @@ const LikeWidget = (props) => {
           <tr>
             <th></th>{/* empty on purpose */}
             <th>{lang.t('streams.article')}</th>
-            <th>{lang.t('modqueue.flagged')}</th>
             <th>{lang.t('modqueue.likes')}</th>
             <th>{lang.t('dashboard.comment_count')}</th>
           </tr>
@@ -27,7 +26,6 @@ const LikeWidget = (props) => {
           {
             assets.length
             ? assets.map((asset, index) => {
-              const flagSummary = asset.action_summaries.find(s => s.type === 'FlagAssetActionSummary');
               const likeSummary = asset.action_summaries.find(s => s.type === 'LikeAssetActionSummary');
               return (
                 <tr key={asset.id}>
@@ -36,7 +34,6 @@ const LikeWidget = (props) => {
                     <Link to={`/admin/moderate/flagged/${asset.id}`}>{asset.title}</Link>
                     <p className={styles.lede}>{asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()}</p>
                   </td>
-                  <td>{flagSummary ? flagSummary.actionCount : 0}</td>
                   <td>{likeSummary ? likeSummary.actionCount : 0}</td>
                   <td>{asset.commentCount}</td>
                 </tr>
diff --git a/client/coral-admin/src/graphql/queries/metrics.graphql b/client/coral-admin/src/graphql/queries/metrics.graphql
index 4e713c0b7..da5125a48 100644
--- a/client/coral-admin/src/graphql/queries/metrics.graphql
+++ b/client/coral-admin/src/graphql/queries/metrics.graphql
@@ -19,21 +19,21 @@ query Metrics ($from: Date!, $to: Date!) {
   assetsByLike: assetMetrics(from: $from, to: $to, sort: LIKE) {
     ...metrics
   }
-  mostLikedComments: commentMetrics(from: $from, to: $to, sort: LIKE) {
-    id
-    body
-    user {
-      status
-      username
-    }
-    asset {
-      id
-      title
-    }
-    created_at
-    action_summaries {
-      type: __typename
-      count
-    }
-  }
+#  mostLikedComments: commentMetrics(from: $from, to: $to, sort: LIKE) {
+#    id
+#    body
+#    user {
+#      status
+#      username
+#    }
+#    asset {
+#      id
+#      title
+#    }
+#    created_at
+#    action_summaries {
+#      type: __typename
+#      count
+#    }
+#  }
 }
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index f3deb6792..92e5d098a 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -112,7 +112,7 @@
     "dashboard": {
       "no_flags": "There have been no flags in the last 5 minutes! Hooray!",
       "no_likes": "There have been no likes in the last 5 minutes. All quiet.",
-      "comment_count": "Comments"
+      "comment_count": "comments"
     },
     "streams": {
       "empty_result": "No assets match this search. Maybe try widening your search?",
@@ -222,7 +222,7 @@
     "dashbord": {
       "no_flags": "¡Nadie ha marcado nada en los últimos 5 minutos! ¡Bravo!",
       "no_likes": "A nadie le ha gustado algún comentario en los últimos 5 minutos. Todo tranquilo.",
-      "comment_count": "Comentarios"
+      "comment_count": "comentarios"
     },
     "streams": {
       "empty_result": "No se encuentro articulo con esta busqueda. Tal vez extender la busqueda?",

From 1058bff8ad66a194cf1a8516f032c14ba9773c81 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 24 Feb 2017 11:30:59 -0700
Subject: [PATCH 21/37] remove logs

---
 client/coral-admin/src/actions/install.js     |   3 +-
 .../containers/Configure/CommentSettings.js   |   1 -
 .../ModerationQueue/ModerationContainer.js    |   1 -
 client/coral-framework/actions/auth.js        |   3 +-
 client/coral-plugin-commentbox/CommentBox.js  |   1 -
 .../RileysAwesomeCommentBox.js                |  58 ----------
 client/coral-plugin-stream/Stream.js          | 100 ------------------
 .../coral-settings/components/NotLoggedIn.js  |   1 -
 8 files changed, 2 insertions(+), 166 deletions(-)
 delete mode 100644 client/coral-plugin-stream/RileysAwesomeCommentBox.js
 delete mode 100644 client/coral-plugin-stream/Stream.js

diff --git a/client/coral-admin/src/actions/install.js b/client/coral-admin/src/actions/install.js
index c1d05d253..9fc308d2f 100644
--- a/client/coral-admin/src/actions/install.js
+++ b/client/coral-admin/src/actions/install.js
@@ -75,8 +75,7 @@ export const submitUser = () => (dispatch, getState) => {
     dispatch(installRequest());
     coralApi('/setup', {method: 'POST', body: data})
       .then(result => {
-        console.log(result);
-        dispatch(installSuccess());
+        dispatch(installSuccess(result));
         dispatch(nextStep());
       })
       .catch(error => {
diff --git a/client/coral-admin/src/containers/Configure/CommentSettings.js b/client/coral-admin/src/containers/Configure/CommentSettings.js
index 5a14cf565..90057c5fe 100644
--- a/client/coral-admin/src/containers/Configure/CommentSettings.js
+++ b/client/coral-admin/src/containers/Configure/CommentSettings.js
@@ -52,7 +52,6 @@ const updateClosedMessage = (updateSettings) => (event) => {
 };
 
 const updateCustomCssUrl = (updateSettings) => (event) => {
-  console.log('updateCustomCssUrl', event.target.value);
   const customCssUrl = event.target.value;
   updateSettings({customCssUrl});
 };
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
index 9c68d0728..a7d7110ae 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
@@ -54,7 +54,6 @@ class ModerationContainer extends Component {
     }
 
     if (data.error) {
-      console.log(data);
       return <div>Error</div>;
     }
 
diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 4a12245eb..418acc5bb 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -192,9 +192,8 @@ export const requestConfirmEmail = (email, redirectUri) => dispatch => {
       dispatch(verifyEmailSuccess());
     })
     .catch(err => {
-      console.log('failed to send email verification', err);
 
       // email might have already been verifyed
-      dispatch(verifyEmailFailure());
+      dispatch(verifyEmailFailure(err));
     });
 };
diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index 3d895df07..004f294b2 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -110,7 +110,6 @@ class CommentBox extends Component {
                 cStyle='darkGrey'
                 className={`${name}-cancel-button`}
                 onClick={() => {
-                  console.log('cancel button in comment box');
                   cancelButtonClicked('');
                 }}>
                 {lang.t('cancel')}
diff --git a/client/coral-plugin-stream/RileysAwesomeCommentBox.js b/client/coral-plugin-stream/RileysAwesomeCommentBox.js
deleted file mode 100644
index 73fa6407d..000000000
--- a/client/coral-plugin-stream/RileysAwesomeCommentBox.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import React, {Component} from 'react';
-import {graphql} from 'react-apollo';
-import gql from 'graphql-tag';
-
-export class RileysAwesomeCommentBox extends Component {
-
-  postComment() {
-    console.log(this.props);
-    console.log('postComment', this.props.asset_id);
-    this.props.mutate({
-      variables: {
-        asset_id: this.props.asset_id,
-        body: this.textarea.value,
-        parent_id: null
-      }
-    }).then(({data}) => {
-      console.log('it workt');
-      console.log(data);
-    });
-  }
-
-  render() {
-    return <div>
-      <textarea ref={textarea => this.textarea = textarea}></textarea>
-      <button onClick={this.postComment.bind(this)}>POST</button>
-    </div>;
-  }
-}
-
-const postComment = gql`
-  fragment commentView on Comment {
-    id
-    body
-    user {
-      name: username
-    }
-    actions {
-      type: action_type
-      count
-      current: current_user {
-        id
-        created_at
-      }
-    }
-  }
-
-  mutation CreateComment ($asset_id: ID!, $parent_id: ID, $body: String!) {
-    createComment(asset_id:$asset_id, parent_id:$parent_id, body:$body) {
-        ...commentView
-      }
-    }
-`;
-
-const RileysAwesomeCommentBoxWithData = graphql(
-  postComment
-)(RileysAwesomeCommentBox);
-
-export default RileysAwesomeCommentBoxWithData;
diff --git a/client/coral-plugin-stream/Stream.js b/client/coral-plugin-stream/Stream.js
deleted file mode 100644
index 72e03d4ae..000000000
--- a/client/coral-plugin-stream/Stream.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import React, {Component} from 'react';
-import {graphql} from 'react-apollo';
-import gql from 'graphql-tag';
-import {fetchSignIn} from 'coral-framework/actions/auth';
-import RileysAwesomeCommentBox from 'coral-plugin-stream/RileysAwesomeCommentBox';
-
-const assetID = '6187a94b-0b6d-4a96-ac6b-62b529cd8410';
-
-// MyComponent is a "presentational" or apollo-unaware component,
-// It could be a simple React class:
-class Stream extends Component {
-
-  constructor(props) {
-    super(props);
-  }
-
-  logMeIn() {
-    fetchSignIn({email: 'your@example.com', password: 'dfasidfaisdufoiausdfoiuaspdoifas'})(() => {});
-  }
-
-  render() {
-    const {data} = this.props;
-    return <div>
-      <button onClick={this.logMeIn.bind(this)}>Login or whatever</button>
-      {
-        data.loading
-        ? 'loading!'
-        : <div>
-            <RileysAwesomeCommentBox asset_id={data.asset.id} />
-            <p>Asset ID: {data.asset.id}</p>
-            <ul>
-            {
-              data.asset.comments.map(comment => {
-                return <li key={comment.id}>
-                  {comment.body} [{comment.id}]
-                  <ul>
-                    {
-                      comment.replies.map(reply => {
-                        return <li key={reply.id}>{reply.body}</li>;
-                      })
-                    }
-                  </ul>
-                </li>;
-              })
-            }
-            </ul>
-          </div>
-      }
-    </div>;
-  }
-}
-
-// Initialize GraphQL queries or mutations with the gql tag
-const StreamQuery = gql`fragment commentView on Comment {
-  id
-  body
-  user {
-    name: username
-  }
-  tags {
-    name
-  }
-  actions {
-    type: action_type
-    count
-    current: current_user {
-      id
-      created_at
-    }
-  }
-}
-
-query AssetQuery($asset_id: ID!) {
-  asset(id: $asset_id) {
-    id
-    title
-    url
-    commentCount
-    comments {
-      ...commentView
-      replies {
-        ...commentView
-      }
-    }
-  }
-}`;
-
-// We then can use `graphql` to pass the query results returned by MyQuery
-// to MyComponent as a prop (and update them as the results change)
-const StreamWithData = graphql(
-  StreamQuery, {
-    options: {
-      variables: {
-        asset_id: assetID
-      }
-    }
-  }
-)(Stream);
-
-export default StreamWithData;
diff --git a/client/coral-settings/components/NotLoggedIn.js b/client/coral-settings/components/NotLoggedIn.js
index 2e2b64181..acd3ae7e6 100644
--- a/client/coral-settings/components/NotLoggedIn.js
+++ b/client/coral-settings/components/NotLoggedIn.js
@@ -10,7 +10,6 @@ export default ({showSignInDialog}) => (
     <SignInContainer noButton={true}/>
     <div>
       <a onClick={() => {
-        console.log('Signin click');
         showSignInDialog();
       }}>{lang.t('signIn')}</a> {lang.t('toAccess')}
     </div>

From aefcb29877015b15dd4fd2ae4467c5f3c1183ffb Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 24 Feb 2017 12:58:06 -0700
Subject: [PATCH 22/37] remove comment count from results

---
 client/coral-admin/src/containers/Dashboard/FlagWidget.js | 2 --
 client/coral-admin/src/containers/Dashboard/LikeWidget.js | 2 --
 client/coral-admin/src/graphql/queries/metrics.graphql    | 1 -
 3 files changed, 5 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
index 34c67086e..537b89b8f 100644
--- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
@@ -18,7 +18,6 @@ const FlagWidget = (props) => {
             <th></th>{/* empty on purpose */}
             <th>{lang.t('streams.article')}</th>
             <th>{lang.t('modqueue.flagged')}</th>
-            <th>{lang.t('dashboard.comment_count')}</th>
           </tr>
         </thead>
         <tbody>
@@ -34,7 +33,6 @@ const FlagWidget = (props) => {
                     <p className={styles.lede}>{asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()}</p>
                   </td>
                   <td>{flagSummary ? flagSummary.actionCount : 0}</td>
-                  <td>{asset.commentCount}</td>
                 </tr>
               );
             })
diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
index dd92a94ca..ed6a0c0ae 100644
--- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -19,7 +19,6 @@ const LikeWidget = (props) => {
             <th></th>{/* empty on purpose */}
             <th>{lang.t('streams.article')}</th>
             <th>{lang.t('modqueue.likes')}</th>
-            <th>{lang.t('dashboard.comment_count')}</th>
           </tr>
         </thead>
         <tbody>
@@ -35,7 +34,6 @@ const LikeWidget = (props) => {
                     <p className={styles.lede}>{asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()}</p>
                   </td>
                   <td>{likeSummary ? likeSummary.actionCount : 0}</td>
-                  <td>{asset.commentCount}</td>
                 </tr>
               );
             })
diff --git a/client/coral-admin/src/graphql/queries/metrics.graphql b/client/coral-admin/src/graphql/queries/metrics.graphql
index da5125a48..68de89cab 100644
--- a/client/coral-admin/src/graphql/queries/metrics.graphql
+++ b/client/coral-admin/src/graphql/queries/metrics.graphql
@@ -2,7 +2,6 @@ fragment metrics on Asset {
   id
   title
   url
-  commentCount
   author
   created_at
   action_summaries {

From b1ec512721ba53c1fda474bd1eb34c0be6dba8cf Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 14:42:57 -0300
Subject: [PATCH 23/37] Adding whitelist step, sending whitelist

---
 .../src/containers/Install/InstallContainer.js    |  2 ++
 .../Install/components/Steps/WhitelistStep.js     | 15 +++++++++++++++
 client/coral-admin/src/reducers/install.js        | 11 +++++++++--
 client/coral-ui/components/WizardNav.css          |  1 +
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 client/coral-admin/src/containers/Install/components/Steps/WhitelistStep.js

diff --git a/client/coral-admin/src/containers/Install/InstallContainer.js b/client/coral-admin/src/containers/Install/InstallContainer.js
index 7a8634180..b015140ed 100644
--- a/client/coral-admin/src/containers/Install/InstallContainer.js
+++ b/client/coral-admin/src/containers/Install/InstallContainer.js
@@ -18,6 +18,7 @@ import {
 import InitialStep from './components/Steps/InitialStep';
 import AddOrganizationName from './components/Steps/AddOrganizationName';
 import CreateYourAccount from './components/Steps/CreateYourAccount';
+import WhitelistStep from './components/Steps/WhitelistStep';
 import FinalStep from './components/Steps/FinalStep';
 
 class InstallContainer extends Component {
@@ -43,6 +44,7 @@ class InstallContainer extends Component {
                   <InitialStep/>
                   <AddOrganizationName/>
                   <CreateYourAccount/>
+                  <WhitelistStep/>
                   <FinalStep/>
                 </Wizard>
               </div>
diff --git a/client/coral-admin/src/containers/Install/components/Steps/WhitelistStep.js b/client/coral-admin/src/containers/Install/components/Steps/WhitelistStep.js
new file mode 100644
index 000000000..e246b457e
--- /dev/null
+++ b/client/coral-admin/src/containers/Install/components/Steps/WhitelistStep.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import styles from './style.css';
+import {Button} from 'coral-ui';
+
+const WhitelistStep = props => {
+  const {nextStep} = props;
+  return (
+    <div className={styles.step}>
+      <h3>Domain Whitelist</h3>
+      <Button cStyle='green' onClick={nextStep} raised>Add domains</Button>
+    </div>
+  );
+};
+
+export default WhitelistStep;
diff --git a/client/coral-admin/src/reducers/install.js b/client/coral-admin/src/reducers/install.js
index 596fd16cd..429d5cce0 100644
--- a/client/coral-admin/src/reducers/install.js
+++ b/client/coral-admin/src/reducers/install.js
@@ -1,4 +1,4 @@
-import {Map} from 'immutable';
+import {Map, List} from 'immutable';
 
 import * as actions from '../constants/install';
 
@@ -6,7 +6,10 @@ const initialState = Map({
   isLoading: false,
   data: Map({
     settings: Map({
-      organizationName: ''
+      organizationName: '',
+      domains: Map({
+        whitelist: List()
+      })
     }),
     user: Map({
       username: '',
@@ -33,6 +36,10 @@ const initialState = Map({
   {
     text: '2. Create your account',
     step: 2
+  },
+  {
+    text: '3. Domain Whitelist',
+    step: 3
   }],
   installRequest: null,
   installRequestError: null,
diff --git a/client/coral-ui/components/WizardNav.css b/client/coral-ui/components/WizardNav.css
index 001ee8603..1f0b78d86 100644
--- a/client/coral-ui/components/WizardNav.css
+++ b/client/coral-ui/components/WizardNav.css
@@ -13,6 +13,7 @@
     position: relative;
     padding-left: 40px;
     border-radius: 1px;
+    min-height: 24px;
 
     &:hover {
       cursor: pointer;

From 9305853502ca738bd70211a1d2ee0c15e9862efd Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 15:50:07 -0300
Subject: [PATCH 24/37] Renamed to PermittedDomains

---
 client/coral-admin/src/actions/install.js     | 34 ++++++++++++-------
 .../containers/Install/InstallContainer.js    |  7 ++--
 .../components/Steps/PermittedDomainsStep.js  | 31 +++++++++++++++++
 .../Install/components/Steps/WhitelistStep.js | 15 --------
 .../src/containers/Install/translations.json  | 16 +++++++++
 client/coral-admin/src/reducers/install.js    |  5 +--
 6 files changed, 72 insertions(+), 36 deletions(-)
 create mode 100644 client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js
 delete mode 100644 client/coral-admin/src/containers/Install/components/Steps/WhitelistStep.js
 create mode 100644 client/coral-admin/src/containers/Install/translations.json

diff --git a/client/coral-admin/src/actions/install.js b/client/coral-admin/src/actions/install.js
index c1d05d253..73e7aaa82 100644
--- a/client/coral-admin/src/actions/install.js
+++ b/client/coral-admin/src/actions/install.js
@@ -71,21 +71,31 @@ export const submitSettings = () => (dispatch, getState) => {
 export const submitUser = () => (dispatch, getState) => {
   const userFormData = getState().install.toJS().data.user;
   validation(userFormData, dispatch, function() {
-    const data = getState().install.toJS().data;
-    dispatch(installRequest());
-    coralApi('/setup', {method: 'POST', body: data})
-      .then(result => {
-        console.log(result);
-        dispatch(installSuccess());
-        dispatch(nextStep());
-      })
-      .catch(error => {
-        console.error(error);
-        dispatch(installFailure(`${error.translation_key}`));
-      });
+    dispatch(nextStep());
   });
 };
 
+export const submitWhitelistDomains = () => (dispatch) => {
+  submitForm().then(() => {
+    dispatch(installSuccess());
+  });
+};
+
+const submitForm = () => (dispatch, getState) => {
+  const data = getState().install.toJS().data;
+  dispatch(installRequest());
+  return coralApi('/setup', { method: 'POST', body: data })
+    .then(result => {
+      console.log(result);
+      dispatch(installSuccess());
+      dispatch(nextStep());
+    })
+    .catch(error => {
+      console.error(error);
+      dispatch(installFailure(`${error.translation_key}`));
+    });
+};
+
 export const updateSettingsFormData = (name, value) => ({type: actions.UPDATE_FORMDATA_SETTINGS, name, value});
 export const updateUserFormData = (name, value) => ({type: actions.UPDATE_FORMDATA_USER, name, value});
 
diff --git a/client/coral-admin/src/containers/Install/InstallContainer.js b/client/coral-admin/src/containers/Install/InstallContainer.js
index b015140ed..fe41e12e4 100644
--- a/client/coral-admin/src/containers/Install/InstallContainer.js
+++ b/client/coral-admin/src/containers/Install/InstallContainer.js
@@ -18,7 +18,7 @@ import {
 import InitialStep from './components/Steps/InitialStep';
 import AddOrganizationName from './components/Steps/AddOrganizationName';
 import CreateYourAccount from './components/Steps/CreateYourAccount';
-import WhitelistStep from './components/Steps/WhitelistStep';
+import PermittedDomainsStep from './components/Steps/PermittedDomainsStep';
 import FinalStep from './components/Steps/FinalStep';
 
 class InstallContainer extends Component {
@@ -41,10 +41,7 @@ class InstallContainer extends Component {
                 <h2>Welcome to the Coral Project</h2>
                 { install.step !== 0 ? <WizardNav items={install.navItems} currentStep={install.step} icon='check'/> : null }
                 <Wizard currentStep={install.step} {...this.props}>
-                  <InitialStep/>
-                  <AddOrganizationName/>
-                  <CreateYourAccount/>
-                  <WhitelistStep/>
+                  <PermittedDomainsStep/>
                   <FinalStep/>
                 </Wizard>
               </div>
diff --git a/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js b/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js
new file mode 100644
index 000000000..c5fae148e
--- /dev/null
+++ b/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js
@@ -0,0 +1,31 @@
+import React from 'react';
+import styles from './style.css';
+import {Button, Card} from 'coral-ui';
+import TagsInput from 'react-tagsinput';
+
+const lang = new I18n(translations);
+import translations from '../../translations.json';
+import I18n from 'coral-framework/modules/i18n/i18n';
+
+const PermittedDomainsStep = props => {
+  const {nextStep, onChangeDomainlist} = props;
+  const domains = [];
+  return (
+    <div className={styles.step}>
+      <h3>{lang.t('PERMITTED_DOMAINS.TITLE')}</h3>
+      <Card>
+        <p>{lang.t('PERMITTED_DOMAINS.DESCRIPTION')}</p>
+        <TagsInput
+          value={domains}
+          inputProps={{placeholder: 'URL'}}
+          addOnPaste={true}
+          pasteSplit={data => data.split(',').map(d => d.trim())}
+          onChange={tags => onChangeDomainlist(tags)}
+        />
+      </Card>
+      <Button cStyle='green' onClick={nextStep} raised>{lang.t('PERMITTED_DOMAINS.SUBMIT')}</Button>
+    </div>
+  );
+};
+
+export default PermittedDomainsStep;
diff --git a/client/coral-admin/src/containers/Install/components/Steps/WhitelistStep.js b/client/coral-admin/src/containers/Install/components/Steps/WhitelistStep.js
deleted file mode 100644
index e246b457e..000000000
--- a/client/coral-admin/src/containers/Install/components/Steps/WhitelistStep.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import styles from './style.css';
-import {Button} from 'coral-ui';
-
-const WhitelistStep = props => {
-  const {nextStep} = props;
-  return (
-    <div className={styles.step}>
-      <h3>Domain Whitelist</h3>
-      <Button cStyle='green' onClick={nextStep} raised>Add domains</Button>
-    </div>
-  );
-};
-
-export default WhitelistStep;
diff --git a/client/coral-admin/src/containers/Install/translations.json b/client/coral-admin/src/containers/Install/translations.json
new file mode 100644
index 000000000..494a020f4
--- /dev/null
+++ b/client/coral-admin/src/containers/Install/translations.json
@@ -0,0 +1,16 @@
+{
+  "en": {
+    "PERMITTED_DOMAINS": {
+      "TITLE": "Permitted domains",
+      "DESCRIPTION": "Add permitted domains",
+      "SUBMIT": "Finish install"
+    }
+  },
+  "es": {
+    "PERMITTED_DOMAINS": {
+      "TITLE": "Dominios Permitidos",
+      "DESCRIPTION": "Agrega dominios permitidos",
+      "SUBMIT": "Finalizar instalación"
+    }
+  }
+}
diff --git a/client/coral-admin/src/reducers/install.js b/client/coral-admin/src/reducers/install.js
index 429d5cce0..8d3ea0f76 100644
--- a/client/coral-admin/src/reducers/install.js
+++ b/client/coral-admin/src/reducers/install.js
@@ -6,10 +6,7 @@ const initialState = Map({
   isLoading: false,
   data: Map({
     settings: Map({
-      organizationName: '',
-      domains: Map({
-        whitelist: List()
-      })
+      organizationName: ''
     }),
     user: Map({
       username: '',

From 013625df274c2e8b40743bd798592bff9299bc01 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 16:39:52 -0300
Subject: [PATCH 25/37] no validation for domains

---
 client/coral-admin/src/actions/install.js     | 38 ++++++++---------
 client/coral-admin/src/constants/install.js   |  1 +
 .../src/containers/Configure/Domainlist.js    | 42 ++++++++++---------
 .../containers/Install/InstallContainer.js    | 23 ++++++----
 .../components/Steps/PermittedDomainsStep.js  | 10 ++---
 .../Install/components/Steps/style.css        |  6 +++
 client/coral-admin/src/reducers/install.js    |  8 +++-
 7 files changed, 76 insertions(+), 52 deletions(-)

diff --git a/client/coral-admin/src/actions/install.js b/client/coral-admin/src/actions/install.js
index 73e7aaa82..970c15141 100644
--- a/client/coral-admin/src/actions/install.js
+++ b/client/coral-admin/src/actions/install.js
@@ -20,13 +20,17 @@ const validation = (formData, dispatch, next) => {
     return dispatch(hasError());
   }
 
+  const validKeys = Object.keys(formData)
+    .filter(name => name !== 'domains');
+
   // Required Validation
-  const empty = Object.keys(formData).filter(name => {
+  const empty = validKeys
+  .filter(name => {
     const cond = !formData[name].length;
 
     if (cond) {
 
-      // Adding Error
+    // Adding Error
       dispatch(addError(name, 'This field is required.'));
     } else {
       dispatch(addError(name, ''));
@@ -40,18 +44,19 @@ const validation = (formData, dispatch, next) => {
   }
 
   // RegExp Validation
-  const validation = Object.keys(formData).filter(name => {
-    const cond = !validate[name](formData[name]);
-    if (cond) {
+  const validation = validKeys
+    .filter(name => {
+      const cond = !validate[name](formData[name]);
+      if (cond) {
 
       // Adding Error
-      dispatch(addError(name, errorMsj[name]));
-    } else {
-      dispatch(addError(name, ''));
-    }
+        dispatch(addError(name, errorMsj[name]));
+      } else {
+        dispatch(addError(name, ''));
+      }
 
-    return cond;
-  });
+      return cond;
+    });
 
   if (validation.length) {
     return dispatch(hasError());
@@ -75,16 +80,10 @@ export const submitUser = () => (dispatch, getState) => {
   });
 };
 
-export const submitWhitelistDomains = () => (dispatch) => {
-  submitForm().then(() => {
-    dispatch(installSuccess());
-  });
-};
-
-const submitForm = () => (dispatch, getState) => {
+export const finishInstall = () => (dispatch, getState) => {
   const data = getState().install.toJS().data;
   dispatch(installRequest());
-  return coralApi('/setup', { method: 'POST', body: data })
+  return coralApi('/setup', {method: 'POST', body: data})
     .then(result => {
       console.log(result);
       dispatch(installSuccess());
@@ -98,6 +97,7 @@ const submitForm = () => (dispatch, getState) => {
 
 export const updateSettingsFormData = (name, value) => ({type: actions.UPDATE_FORMDATA_SETTINGS, name, value});
 export const updateUserFormData = (name, value) => ({type: actions.UPDATE_FORMDATA_USER, name, value});
+export const updatePermittedDomains = (value) => ({type: actions.UPDATE_PERMITTED_DOMAINS_SETTINGS, value});
 
 const checkInstallRequest = () => ({type: actions.CHECK_INSTALL_REQUEST});
 const checkInstallSuccess = installed => ({type: actions.CHECK_INSTALL_SUCCESS, installed});
diff --git a/client/coral-admin/src/constants/install.js b/client/coral-admin/src/constants/install.js
index b3fd7e0d0..743d68593 100644
--- a/client/coral-admin/src/constants/install.js
+++ b/client/coral-admin/src/constants/install.js
@@ -10,6 +10,7 @@ export const INSTALL_SUCCESS = 'INSTALL_SUCCESS';
 export const INSTALL_FAILURE = 'INSTALL_FAILURE';
 export const UPDATE_FORMDATA_USER = 'UPDATE_FORMDATA_USER';
 export const UPDATE_FORMDATA_SETTINGS = 'UPDATE_FORMDATA_SETTINGS';
+export const UPDATE_PERMITTED_DOMAINS_SETTINGS = 'UPDATE_PERMITTED_DOMAINS_SETTINGS';
 
 export const CHECK_INSTALL_REQUEST = 'CHECK_INSTALL_REQUEST';
 export const CHECK_INSTALL_SUCCESS = 'CHECK_INSTALL_SUCCESS';
diff --git a/client/coral-admin/src/containers/Configure/Domainlist.js b/client/coral-admin/src/containers/Configure/Domainlist.js
index f845dfeaa..6918c0471 100644
--- a/client/coral-admin/src/containers/Configure/Domainlist.js
+++ b/client/coral-admin/src/containers/Configure/Domainlist.js
@@ -1,26 +1,28 @@
 import React from 'react';
+import {Card} from 'coral-ui';
+import styles from './Configure.css';
+import TagsInput from 'react-tagsinput';
+
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
-import TagsInput from 'react-tagsinput';
-import styles from './Configure.css';
-import {Card} from 'coral-ui';
+const lang = new I18n(translations);
 
-const Domainlist = ({domains, onChangeDomainlist}) => (
-  <div>
-    <h3>{lang.t('configure.domain-list-title')}</h3>
-    <Card id={styles.domainlist}>
-      <p className={styles.domainlistDesc}>{lang.t('configure.domain-list-text')}</p>
-      <TagsInput
-        value={domains}
-        inputProps={{placeholder: 'URL'}}
-        addOnPaste={true}
-        pasteSplit={data => data.split(',').map(d => d.trim())}
-        onChange={tags => onChangeDomainlist('whitelist', tags)}
-      />
-    </Card>
-  </div>
-);
+const Domainlist = ({domains, onChangeDomainlist}) => {
+  return (
+    <div>
+      <h3>{lang.t('configure.domain-list-title')}</h3>
+      <Card id={styles.domainlist}>
+        <p className={styles.domainlistDesc}>{lang.t('configure.domain-list-text')}</p>
+        <TagsInput
+          value={domains}
+          inputProps={{placeholder: 'URL'}}
+          addOnPaste={true}
+          pasteSplit={data => data.split(',').map(d => d.trim())}
+          onChange={tags => onChangeDomainlist('whitelist', tags)}
+        />
+      </Card>
+    </div>
+  );
+};
 
 export default Domainlist;
-
-const lang = new I18n(translations);
diff --git a/client/coral-admin/src/containers/Install/InstallContainer.js b/client/coral-admin/src/containers/Install/InstallContainer.js
index fe41e12e4..b70d3b8c9 100644
--- a/client/coral-admin/src/containers/Install/InstallContainer.js
+++ b/client/coral-admin/src/containers/Install/InstallContainer.js
@@ -5,14 +5,16 @@ import {Wizard, WizardNav} from 'coral-ui';
 import {Layout} from '../../components/ui/Layout';
 
 import {
-  nextStep,
-  previousStep,
   goToStep,
+  nextStep,
+  submitUser,
+  checkInstall,
+  previousStep,
+  finishInstall,
+  submitSettings,
   updateUserFormData,
   updateSettingsFormData,
-  submitSettings,
-  submitUser,
-  checkInstall
+  updatePermittedDomains
 } from '../../actions/install';
 
 import InitialStep from './components/Steps/InitialStep';
@@ -41,6 +43,9 @@ class InstallContainer extends Component {
                 <h2>Welcome to the Coral Project</h2>
                 { install.step !== 0 ? <WizardNav items={install.navItems} currentStep={install.step} icon='check'/> : null }
                 <Wizard currentStep={install.step} {...this.props}>
+                  <InitialStep/>
+                  <AddOrganizationName/>
+                  <CreateYourAccount/>
                   <PermittedDomainsStep/>
                   <FinalStep/>
                 </Wizard>
@@ -64,10 +69,14 @@ const mapStateToProps = state => ({
 });
 
 const mapDispatchToProps = dispatch => ({
-  checkInstall: next => dispatch(checkInstall(next)),
   nextStep: () => dispatch(nextStep()),
-  previousStep: () => dispatch(previousStep()),
   goToStep: step => dispatch(goToStep(step)),
+  previousStep: () => dispatch(previousStep()),
+  finishInstall: () => dispatch(finishInstall()),
+  checkInstall: next => dispatch(checkInstall(next)),
+  handleDomainsChange: value => {
+    dispatch(updatePermittedDomains(value));
+  },
   handleSettingsChange: e => {
     const {name, value} = e.currentTarget;
     dispatch(updateSettingsFormData(name, value));
diff --git a/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js b/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js
index c5fae148e..f2c1546f6 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js
@@ -8,22 +8,22 @@ import translations from '../../translations.json';
 import I18n from 'coral-framework/modules/i18n/i18n';
 
 const PermittedDomainsStep = props => {
-  const {nextStep, onChangeDomainlist} = props;
-  const domains = [];
+  const {finishInstall, install, handleDomainsChange} = props;
+  const domains = install.data.settings.domains.whitelist;
   return (
     <div className={styles.step}>
       <h3>{lang.t('PERMITTED_DOMAINS.TITLE')}</h3>
-      <Card>
+      <Card className={styles.card}>
         <p>{lang.t('PERMITTED_DOMAINS.DESCRIPTION')}</p>
         <TagsInput
           value={domains}
           inputProps={{placeholder: 'URL'}}
           addOnPaste={true}
           pasteSplit={data => data.split(',').map(d => d.trim())}
-          onChange={tags => onChangeDomainlist(tags)}
+          onChange={tags => handleDomainsChange(tags)}
         />
       </Card>
-      <Button cStyle='green' onClick={nextStep} raised>{lang.t('PERMITTED_DOMAINS.SUBMIT')}</Button>
+      <Button cStyle='green' onClick={finishInstall} raised>{lang.t('PERMITTED_DOMAINS.SUBMIT')}</Button>
     </div>
   );
 };
diff --git a/client/coral-admin/src/containers/Install/components/Steps/style.css b/client/coral-admin/src/containers/Install/components/Steps/style.css
index a5867e960..dea752298 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/style.css
+++ b/client/coral-admin/src/containers/Install/components/Steps/style.css
@@ -59,6 +59,12 @@
       }
     }
   }
+
+  .card {
+    max-width: 500px;
+    margin: 20px auto;
+    text-align: left;
+  }
 }
 
 .finalStep {
diff --git a/client/coral-admin/src/reducers/install.js b/client/coral-admin/src/reducers/install.js
index 8d3ea0f76..1f0f079ff 100644
--- a/client/coral-admin/src/reducers/install.js
+++ b/client/coral-admin/src/reducers/install.js
@@ -6,7 +6,10 @@ const initialState = Map({
   isLoading: false,
   data: Map({
     settings: Map({
-      organizationName: ''
+      organizationName: '',
+      domains: Map({
+        whitelist: List()
+      })
     }),
     user: Map({
       username: '',
@@ -54,6 +57,9 @@ export default function install (state = initialState, action) {
   case actions.GO_TO_STEP:
     return state
       .set('step', action.step);
+  case actions.UPDATE_PERMITTED_DOMAINS_SETTINGS:
+    return state
+      .setIn(['data', 'settings', 'domains', 'whitelist'], action.value);
   case actions.UPDATE_FORMDATA_SETTINGS:
     return state
       .setIn(['data', 'settings', action.name], action.value);

From 1e52c579cc318703494d5170c6cb03c8d1b467b3 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 16:50:04 -0300
Subject: [PATCH 26/37] =?UTF-8?q?=C3=8Dnitial=20translations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Install/components/Steps/InitialStep.js          | 12 ++++++------
 .../src/containers/Install/translations.json         |  8 ++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/containers/Install/components/Steps/InitialStep.js b/client/coral-admin/src/containers/Install/components/Steps/InitialStep.js
index 9f9770fe9..1838e3178 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/InitialStep.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/InitialStep.js
@@ -2,16 +2,16 @@ import React from 'react';
 import styles from './style.css';
 import {Button} from 'coral-ui';
 
+const lang = new I18n(translations);
+import translations from '../../translations.json';
+import I18n from 'coral-framework/modules/i18n/i18n';
+
 const InitialStep = props => {
   const {nextStep} = props;
   return (
     <div className={styles.step}>
-      <p>
-        The remainder of the Talk installation will take about ten minutes.
-        Once you complete the following two steps, you will have a free
-        installation and provision of Mongo and Redis.
-      </p>
-      <Button cStyle='green' onClick={nextStep} raised>Get Started</Button>
+      <p>{lang.t('INITIAL.DESCRIPTION')}</p>
+      <Button cStyle='green' onClick={nextStep} raised>{lang.t('INITIAL.SUBMIT')}</Button>
     </div>
   );
 };
diff --git a/client/coral-admin/src/containers/Install/translations.json b/client/coral-admin/src/containers/Install/translations.json
index 494a020f4..5b3c5f036 100644
--- a/client/coral-admin/src/containers/Install/translations.json
+++ b/client/coral-admin/src/containers/Install/translations.json
@@ -1,5 +1,9 @@
 {
   "en": {
+    "INITIAL" : {
+      "DESCRIPTION": "The remainder of the Talk installation will take about ten minutes. Once you complete the following two steps, you will have a free installation and provision of Mongo and Redis.",
+      "SUBMIT": "Get Started"
+    },
     "PERMITTED_DOMAINS": {
       "TITLE": "Permitted domains",
       "DESCRIPTION": "Add permitted domains",
@@ -7,6 +11,10 @@
     }
   },
   "es": {
+    "INITIAL" : {
+      "DESCRIPTION": "La instalación de Talk tomará aproximadamente diez minutos. Tan pronto como termines los tres pasos, tendrás una gratis instalación y provision de Mongo y Redis",
+      "SUBMIT": "Empezá!"
+    },
     "PERMITTED_DOMAINS": {
       "TITLE": "Dominios Permitidos",
       "DESCRIPTION": "Agrega dominios permitidos",

From 7341fdff4eb9b3b5bf1cfd36f7b628555cc18dbf Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 16:54:03 -0300
Subject: [PATCH 27/37] add Organization translations

---
 .../Install/components/Steps/AddOrganizationName.js | 13 +++++++------
 .../src/containers/Install/translations.json        | 10 ++++++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js b/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js
index ae23d0048..127c4afa1 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js
@@ -2,25 +2,26 @@ import React from 'react';
 import styles from './style.css';
 import {TextField, Button} from 'coral-ui';
 
+const lang = new I18n(translations);
+import translations from '../../translations.json';
+import I18n from 'coral-framework/modules/i18n/i18n';
+
 const AddOrganizationName = props => {
   const {handleSettingsChange, handleSettingsSubmit, install} = props;
   return (
     <div className={styles.step}>
-      <p>
-        Please tell us the name of your organization. This will appear in emails when
-        inviting new team members
-      </p>
+      <p>{lang.t('ADD_ORGANIZATION.DESCRIPTION')}</p>
       <div className={styles.form}>
         <form onSubmit={handleSettingsSubmit}>
           <TextField
             className={styles.TextField}
             id="organizationName"
             type="text"
-            label='Organization name'
+            label={lang.t('ADD_ORGANIZATION.DESCRIPTION')}
             onChange={handleSettingsChange}
             showErrors={install.showErrors}
             errorMsg={install.errors.organizationName} />
-          <Button type="submit" cStyle='black' full>Save</Button>
+          <Button type="submit" cStyle='black' full>{lang.t('ADD_ORGANIZATION.SAVE')}</Button>
         </form>
       </div>
     </div>
diff --git a/client/coral-admin/src/containers/Install/translations.json b/client/coral-admin/src/containers/Install/translations.json
index 5b3c5f036..aee01c3cd 100644
--- a/client/coral-admin/src/containers/Install/translations.json
+++ b/client/coral-admin/src/containers/Install/translations.json
@@ -4,6 +4,11 @@
       "DESCRIPTION": "The remainder of the Talk installation will take about ten minutes. Once you complete the following two steps, you will have a free installation and provision of Mongo and Redis.",
       "SUBMIT": "Get Started"
     },
+    "ADD_ORGANIZATION": {
+      "DESCRIPTION": "Please tell us the name of your organization. This will appear in emails when inviting new team members",
+      "LABEL": "Organization Name",
+      "SAVE": "Save"
+    },
     "PERMITTED_DOMAINS": {
       "TITLE": "Permitted domains",
       "DESCRIPTION": "Add permitted domains",
@@ -15,6 +20,11 @@
       "DESCRIPTION": "La instalación de Talk tomará aproximadamente diez minutos. Tan pronto como termines los tres pasos, tendrás una gratis instalación y provision de Mongo y Redis",
       "SUBMIT": "Empezá!"
     },
+    "ADD_ORGANIZATION": {
+      "DESCRIPTION": "Por favor, dinos el nombre de tu organización. Este aparecerá en los emails cuando invites nuevos miembros",
+      "LABEL": "Nombre de la Organización",
+      "SAVE": "Guardar"
+    },
     "PERMITTED_DOMAINS": {
       "TITLE": "Dominios Permitidos",
       "DESCRIPTION": "Agrega dominios permitidos",

From b47fd3543740c55fc61779710196a0c6f7727773 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 16:58:16 -0300
Subject: [PATCH 28/37] add user translations

---
 .../Install/components/Steps/CreateYourAccount.js  | 10 +++++-----
 .../src/containers/Install/translations.json       | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js b/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js
index cb0f4635f..ec1e34607 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js
@@ -12,7 +12,7 @@ const InitialStep = props => {
             className={styles.textField}
             id="email"
             type="email"
-            label='Email address'
+            label={lang.t('CREATE.EMAIL')}
             onChange={handleUserChange}
             showErrors={install.showErrors}
             errorMsg={install.errors.email}
@@ -23,7 +23,7 @@ const InitialStep = props => {
             className={styles.textField}
             id="username"
             type="text"
-            label='Username'
+            label={lang.t('CREATE.USERNAME')}
             onChange={handleUserChange}
             showErrors={install.showErrors}
             errorMsg={install.errors.username}
@@ -33,7 +33,7 @@ const InitialStep = props => {
             className={styles.textField}
             id="password"
             type="password"
-            label='Password'
+            label={lang.t('CREATE.PASSWORD')}
             onChange={handleUserChange}
             showErrors={install.showErrors}
             errorMsg={install.errors.password}
@@ -43,7 +43,7 @@ const InitialStep = props => {
             className={styles.textField}
             id="confirmPassword"
             type="password"
-            label='Confirm Password'
+            label={lang.t('CREATE.CONFIRM_PASSWORD')}
             onChange={handleUserChange}
             showErrors={install.showErrors}
             errorMsg={install.errors.confirmPassword}
@@ -51,7 +51,7 @@ const InitialStep = props => {
 
           {
             !props.install.isLoading ?
-            <Button cStyle='black' type="submit" full>Save</Button>
+            <Button cStyle='black' type="submit" full>{lang.t('CREATE.SAVE')}</Button>
             :
             <Spinner />
           }
diff --git a/client/coral-admin/src/containers/Install/translations.json b/client/coral-admin/src/containers/Install/translations.json
index aee01c3cd..64b18101a 100644
--- a/client/coral-admin/src/containers/Install/translations.json
+++ b/client/coral-admin/src/containers/Install/translations.json
@@ -9,6 +9,13 @@
       "LABEL": "Organization Name",
       "SAVE": "Save"
     },
+    "CREATE": {
+      "EMAIL": "Email address",
+      "USERNAME": "Username",
+      "PASSWORD": "Password",
+      "CONFIRM_PASSWORD": "Confirm Password",
+      "SAVE": "Save"
+    },
     "PERMITTED_DOMAINS": {
       "TITLE": "Permitted domains",
       "DESCRIPTION": "Add permitted domains",
@@ -25,6 +32,13 @@
       "LABEL": "Nombre de la Organización",
       "SAVE": "Guardar"
     },
+    "CREATE": {
+      "EMAIL": "Dirección de E-Mail",
+      "USERNAME": "Usuario",
+      "PASSWORD": "Contraseña",
+      "CONFIRM_PASSWORD": "Confirmar contraseña",
+      "SAVE": "Guardar"
+    },
     "PERMITTED_DOMAINS": {
       "TITLE": "Dominios Permitidos",
       "DESCRIPTION": "Agrega dominios permitidos",

From 628e8844f3ff6dcdd087e7380f37a8d9e7a5fbd6 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 17:04:14 -0300
Subject: [PATCH 29/37] final translations

---
 .../Install/components/Steps/CreateYourAccount.js  |  4 ++++
 .../Install/components/Steps/FinalStep.js          | 14 +++++++-------
 .../src/containers/Install/translations.json       | 10 ++++++++++
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js b/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js
index ec1e34607..416fac195 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js
@@ -2,6 +2,10 @@ import React from 'react';
 import styles from './style.css';
 import {TextField, Button, Spinner} from 'coral-ui';
 
+const lang = new I18n(translations);
+import translations from '../../translations.json';
+import I18n from 'coral-framework/modules/i18n/i18n';
+
 const InitialStep = props => {
   const {handleUserChange, handleUserSubmit, install} = props;
   return (
diff --git a/client/coral-admin/src/containers/Install/components/Steps/FinalStep.js b/client/coral-admin/src/containers/Install/components/Steps/FinalStep.js
index e549ebe63..0ad918487 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/FinalStep.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/FinalStep.js
@@ -3,16 +3,16 @@ import styles from './style.css';
 import {Button} from 'coral-ui';
 import {Link} from 'react-router';
 
+const lang = new I18n(translations);
+import translations from '../../translations.json';
+import I18n from 'coral-framework/modules/i18n/i18n';
+
 const InitialStep = () => {
   return (
     <div className={`${styles.step} ${styles.finalStep}`}>
-      <p>
-        Thanks for installing Talk! We sent an email to verify your email
-        address. While you finish setting the account, you can start engaging
-        with your readers now.
-      </p>
-      <Button raised><Link to='/admin'>Launch Talk</Link></Button>
-      <Button cStyle='black' raised><a href="http://coralproject.net">Close this Installer</a></Button>
+      <p>{lang.t('FINAL.DESCRIPTION')}</p>
+      <Button raised><Link to='/admin'>{lang.t('FINAL.LAUNCH')}</Link></Button>
+      <Button cStyle='black' raised><a href="http://coralproject.net">{lang.t('FINAL.CLOSE')}</a></Button>
     </div>
   );
 };
diff --git a/client/coral-admin/src/containers/Install/translations.json b/client/coral-admin/src/containers/Install/translations.json
index 64b18101a..3bae62c3a 100644
--- a/client/coral-admin/src/containers/Install/translations.json
+++ b/client/coral-admin/src/containers/Install/translations.json
@@ -20,6 +20,11 @@
       "TITLE": "Permitted domains",
       "DESCRIPTION": "Add permitted domains",
       "SUBMIT": "Finish install"
+    },
+    "FINAL": {
+      "DESCRIPTION": "Thanks for installing Talk! We sent an email to verify your email address. While you finish setting the account, you can start engaging with your readers now.",
+      "LAUNCH": "Launch Talk",
+      "CLOSE": "Close this Installer"
     }
   },
   "es": {
@@ -43,6 +48,11 @@
       "TITLE": "Dominios Permitidos",
       "DESCRIPTION": "Agrega dominios permitidos",
       "SUBMIT": "Finalizar instalación"
+    },
+    "FINAL": {
+      "DESCRIPTION": "Gracias por instalar Talk! Te enviamos un email para verificar tu identidad. Mientras se termina de configurar la cuenta, ya puedes empezar a interactuar con tus lectores",
+      "LAUNCH": "Lanzar Talk",
+      "CLOSE": "Cerrar este instalador"
     }
   }
 }

From b9e9d3e7fa60b5e1e11141d27df9dc339a62b3d9 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 17:06:22 -0300
Subject: [PATCH 30/37] status

---
 .../containers/Install/components/Steps/AddOrganizationName.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js b/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js
index 127c4afa1..bcac6ef29 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js
@@ -17,7 +17,7 @@ const AddOrganizationName = props => {
             className={styles.TextField}
             id="organizationName"
             type="text"
-            label={lang.t('ADD_ORGANIZATION.DESCRIPTION')}
+            label={lang.t('ADD_ORGANIZATION.LABEL')}
             onChange={handleSettingsChange}
             showErrors={install.showErrors}
             errorMsg={install.errors.organizationName} />

From 1234a99a0d75d634fc94f11babe12635655fb1a4 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 17:16:19 -0300
Subject: [PATCH 31/37] copy for install permitted domains updated

---
 client/coral-admin/src/containers/Install/translations.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/containers/Install/translations.json b/client/coral-admin/src/containers/Install/translations.json
index 3bae62c3a..8f651240c 100644
--- a/client/coral-admin/src/containers/Install/translations.json
+++ b/client/coral-admin/src/containers/Install/translations.json
@@ -18,7 +18,7 @@
     },
     "PERMITTED_DOMAINS": {
       "TITLE": "Permitted domains",
-      "DESCRIPTION": "Add permitted domains",
+      "DESCRIPTION": "Enter the domains you would like to permit for Talk, e.g. your local, staging and production environments (ex. localhost:3000, staging.domain.com, domain.com).",
       "SUBMIT": "Finish install"
     },
     "FINAL": {
@@ -46,7 +46,7 @@
     },
     "PERMITTED_DOMAINS": {
       "TITLE": "Dominios Permitidos",
-      "DESCRIPTION": "Agrega dominios permitidos",
+      "DESCRIPTION": "Agrega dominios permitidos a Talk, e.g. tu localhost, staging y ambientes de production  (ex. localhost:3000, staging.domain.com, domain.com).",
       "SUBMIT": "Finalizar instalación"
     },
     "FINAL": {

From 555faa02f5629eb4d97a7e0522af5c890cc8a8a0 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 17:18:37 -0300
Subject: [PATCH 32/37] new translations for configure

---
 client/coral-admin/src/translations.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index 7219a22ca..e32d3fb9d 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -86,7 +86,7 @@
       "comment-count-text-post": " characters.",
       "comment-count-error": "Please enter a valid number.",
       "domain-list-title": "Domain Whitelist",
-      "domain-list-text": "Some instructions on how to type the urls."
+      "domain-list-text": "Enter the domains you would like to permit for Talk, e.g. your local, staging and production environments (ex. localhost:3000, staging.domain.com, domain.com)."
     },
     "bandialog": {
       "ban_user": "Ban User?",
@@ -206,7 +206,7 @@
       "comment-count-text-post": " caracteres",
       "comment-count-error": "Por favor escribe un número válido.",
       "domain-list-title": "Lista de Dominios Permitidos",
-      "domain-list-text": "Instrucciones de como ingresar las URLs."
+      "domain-list-text": "Agrega dominios permitidos a Talk, e.g. tu localhost, staging y ambientes de production  (ex. localhost:3000, staging.domain.com, domain.com)."
     },
     "embedlink": {
       "copy": "Copiar"

From 95a9259c06e6194017c242bad74399218a5a4bcd Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Tue, 28 Feb 2017 12:06:27 -0500
Subject: [PATCH 33/37] Fixing bug with mod queue sorting.

---
 .../containers/ModerationQueue/components/ModerationMenu.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
index d2520f784..f9b0c266f 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
@@ -52,8 +52,8 @@ class ModerationMenu extends Component {
             label='Sort'
             value={this.state.sort}
             onChange={sort => this.selectSort(sort)}>
-            <Option value={'CHRONOLOGICAL'}>Newest First</Option>
-            <Option value={'REVERSE_CHRONOLOGICAL'}>Oldest First</Option>
+            <Option value={'REVERSE_CHRONOLOGICAL'}>Newest First</Option>
+            <Option value={'CHRONOLOGICAL'}>Oldest First</Option>
           </SelectField>
         </div>
       </div>

From 3bfde67d5821d7fbc25c01488675ab94cff7ad34 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Tue, 28 Feb 2017 12:32:51 -0500
Subject: [PATCH 34/37] Copy updates with translations

---
 .../src/containers/Install/translations.json           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/coral-admin/src/containers/Install/translations.json b/client/coral-admin/src/containers/Install/translations.json
index 8f651240c..0b702a81d 100644
--- a/client/coral-admin/src/containers/Install/translations.json
+++ b/client/coral-admin/src/containers/Install/translations.json
@@ -1,11 +1,11 @@
 {
   "en": {
     "INITIAL" : {
-      "DESCRIPTION": "The remainder of the Talk installation will take about ten minutes. Once you complete the following two steps, you will have a free installation and provision of Mongo and Redis.",
+      "DESCRIPTION": "Let's set up your Talk community in just a few short steps.",
       "SUBMIT": "Get Started"
     },
     "ADD_ORGANIZATION": {
-      "DESCRIPTION": "Please tell us the name of your organization. This will appear in emails when inviting new team members",
+      "DESCRIPTION": "Please tell us the name of your organization. This will appear in emails when inviting new team members.",
       "LABEL": "Organization Name",
       "SAVE": "Save"
     },
@@ -22,18 +22,18 @@
       "SUBMIT": "Finish install"
     },
     "FINAL": {
-      "DESCRIPTION": "Thanks for installing Talk! We sent an email to verify your email address. While you finish setting the account, you can start engaging with your readers now.",
+      "DESCRIPTION": "Thanks for installing Talk! We sent an email to verify your email address. While you finish setting up the account, you can start engaging with your readers now.",
       "LAUNCH": "Launch Talk",
       "CLOSE": "Close this Installer"
     }
   },
   "es": {
     "INITIAL" : {
-      "DESCRIPTION": "La instalación de Talk tomará aproximadamente diez minutos. Tan pronto como termines los tres pasos, tendrás una gratis instalación y provision de Mongo y Redis",
+      "DESCRIPTION": "Configuremos su comunidad de Talk en sólo algunos pasos.",
       "SUBMIT": "Empezá!"
     },
     "ADD_ORGANIZATION": {
-      "DESCRIPTION": "Por favor, dinos el nombre de tu organización. Este aparecerá en los emails cuando invites nuevos miembros",
+      "DESCRIPTION": "Por favor, dinos el nombre de tu organización. Este aparecerá en los emails cuando invites nuevos miembros.",
       "LABEL": "Nombre de la Organización",
       "SAVE": "Guardar"
     },

From b3b10efbbabfd1016eaeb3c5fbf094f5cf6e0b19 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Tue, 28 Feb 2017 12:35:20 -0500
Subject: [PATCH 35/37] =?UTF-8?q?Use=20t=C3=BA=20to=20match=20other=20tran?=
 =?UTF-8?q?slations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/coral-admin/src/containers/Install/translations.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/containers/Install/translations.json b/client/coral-admin/src/containers/Install/translations.json
index 0b702a81d..e5b9f1542 100644
--- a/client/coral-admin/src/containers/Install/translations.json
+++ b/client/coral-admin/src/containers/Install/translations.json
@@ -29,7 +29,7 @@
   },
   "es": {
     "INITIAL" : {
-      "DESCRIPTION": "Configuremos su comunidad de Talk en sólo algunos pasos.",
+      "DESCRIPTION": "Configuremos tu comunidad de Talk en sólo algunos pasos.",
       "SUBMIT": "Empezá!"
     },
     "ADD_ORGANIZATION": {

From 65e8e42ae6ad42dede3b5d00154237348ea43582 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 28 Feb 2017 10:51:14 -0700
Subject: [PATCH 36/37] remove query from Dashboard component per belen's
 advice

---
 .../src/containers/Dashboard/Dashboard.js     | 47 ++++---------------
 .../coral-admin/src/graphql/queries/index.js  | 13 +++++
 client/coral-admin/src/reducers/settings.js   |  9 ++++
 3 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index ba840c627..96e837a9e 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -1,14 +1,12 @@
 import React from 'react';
 import styles from './Dashboard.css';
-import {graphql, compose} from 'react-apollo';
+import {compose} from 'react-apollo';
 import {connect} from 'react-redux';
+import {getMetrics} from 'coral-admin/src/graphql/queries';
 import FlagWidget from './FlagWidget';
 import LikeWidget from './LikeWidget';
-import METRICS from 'coral-admin/src/graphql/queries/metrics.graphql';
-
-// import MostLikedCommentsWidget from './MostLikedCommentsWidget';
 import {showBanUserDialog, hideBanUserDialog} from 'coral-admin/src/actions/moderation';
-import {banUser, setCommentStatus} from 'coral-admin/src/graphql/mutations';
+
 import {Spinner} from 'coral-ui';
 
 class Dashboard extends React.Component {
@@ -19,49 +17,17 @@ class Dashboard extends React.Component {
       return <Spinner />;
     }
 
-    const {data: {assetsByLike, assetsByFlag/* , mostLikedComments*/}} = this.props;
-
-    // const {moderation, settings} = this.props;
+    const {data: {assetsByLike, assetsByFlag}} = this.props;
 
     return (
       <div className={styles.Dashboard}>
         <FlagWidget assets={assetsByFlag} />
-        {/*
-        <MostLikedCommentsWidget
-          comments={mostLikedComments}
-          moderation={moderation}
-          settings={settings}
-          acceptComment={this.props.acceptComment}
-          rejectComment={this.props.rejectComment}
-          handleBanUser={this.props.banUser}
-          showBanUserDialog={this.props.showBanUserDialog}
-          hideBanUserDialog={this.props.hideBanUserDialog} />
-          */}
         <LikeWidget assets={assetsByLike} />
       </div>
     );
   }
 }
 
-let then = new Date();
-then.setMinutes(then.getMinutes() - 5);
-then = then.toISOString();
-const now = new Date().toISOString();
-
-const getMetrics = graphql(METRICS, {
-  options: () => {
-
-    return {
-      variables: {
-        from: then,
-        to: now
-      }
-    };
-  }
-});
-
-const DashboardWithData = compose(getMetrics, setCommentStatus, banUser)(Dashboard);
-
 const mapStateToProps = state => {
   return {
     settings: state.settings.toJS(),
@@ -74,4 +40,7 @@ const mapDispatchToProps = dispatch => ({
   hideBanUserDialog: () => dispatch(hideBanUserDialog(false))
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(DashboardWithData);
+export default compose(
+  connect(mapStateToProps, mapDispatchToProps),
+  getMetrics
+)(Dashboard);
diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js
index 97320591f..a2140a502 100644
--- a/client/coral-admin/src/graphql/queries/index.js
+++ b/client/coral-admin/src/graphql/queries/index.js
@@ -1,6 +1,7 @@
 import {graphql} from 'react-apollo';
 
 import MOD_QUEUE_QUERY from './modQueueQuery.graphql';
+import METRICS from './metrics.graphql';
 
 export const modQueueQuery = graphql(MOD_QUEUE_QUERY, {
   options: ({params: {id = null}}) => {
@@ -17,6 +18,18 @@ export const modQueueQuery = graphql(MOD_QUEUE_QUERY, {
   })
 });
 
+export const getMetrics = graphql(METRICS, {
+  options: ({settings: {dashboardWindowStart, dashboardWindowEnd}}) => {
+
+    return {
+      variables: {
+        from: dashboardWindowStart,
+        to: dashboardWindowEnd
+      }
+    };
+  }
+});
+
 export const modQueueResort = (id, fetchMore) => (sort) => {
   return fetchMore({
     query: MOD_QUEUE_QUERY,
diff --git a/client/coral-admin/src/reducers/settings.js b/client/coral-admin/src/reducers/settings.js
index a02cac198..a6e0c9339 100644
--- a/client/coral-admin/src/reducers/settings.js
+++ b/client/coral-admin/src/reducers/settings.js
@@ -1,11 +1,20 @@
 import {Map, List} from 'immutable';
 import * as actions from '../actions/settings';
 
+// this is initialized here because
+// currently you have to reload the dashboard to get new stats
+// cleaner updates are planned in the future.
+const DASHBOARD_WINDOW_MINUTES = 5;
+let then = new Date();
+then.setMinutes(then.getMinutes() - DASHBOARD_WINDOW_MINUTES);
+
 const initialState = Map({
   wordlist: Map({
     banned: List(),
     suspect: List()
   }),
+  dashboardWindowStart: then.toISOString(),
+  dashboardWindowEnd: new Date().toISOString(),
   domains: Map({
     whitelist: List()
   }),

From 86a6b545cc637cfcc9284281fadf17610374078a Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 28 Feb 2017 11:15:44 -0700
Subject: [PATCH 37/37] create a fragment for asset metrics. add some comments

---
 .../fragments/assetMetricsView.graphql        | 12 ++++++
 .../coral-admin/src/graphql/queries/index.js  |  2 +-
 .../src/graphql/queries/metrics.graphql       | 38 -------------------
 .../src/graphql/queries/metricsQuery.graphql  | 10 +++++
 client/coral-admin/src/reducers/settings.js   |  2 +
 5 files changed, 25 insertions(+), 39 deletions(-)
 create mode 100644 client/coral-admin/src/graphql/fragments/assetMetricsView.graphql
 delete mode 100644 client/coral-admin/src/graphql/queries/metrics.graphql
 create mode 100644 client/coral-admin/src/graphql/queries/metricsQuery.graphql

diff --git a/client/coral-admin/src/graphql/fragments/assetMetricsView.graphql b/client/coral-admin/src/graphql/fragments/assetMetricsView.graphql
new file mode 100644
index 000000000..37335aeaa
--- /dev/null
+++ b/client/coral-admin/src/graphql/fragments/assetMetricsView.graphql
@@ -0,0 +1,12 @@
+fragment metrics on Asset {
+  id
+  title
+  url
+  author
+  created_at
+  action_summaries {
+    type: __typename
+    actionCount
+    actionableItemCount
+  }
+}
diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js
index a2140a502..c4a30ad44 100644
--- a/client/coral-admin/src/graphql/queries/index.js
+++ b/client/coral-admin/src/graphql/queries/index.js
@@ -1,7 +1,7 @@
 import {graphql} from 'react-apollo';
 
 import MOD_QUEUE_QUERY from './modQueueQuery.graphql';
-import METRICS from './metrics.graphql';
+import METRICS from './metricsQuery.graphql';
 
 export const modQueueQuery = graphql(MOD_QUEUE_QUERY, {
   options: ({params: {id = null}}) => {
diff --git a/client/coral-admin/src/graphql/queries/metrics.graphql b/client/coral-admin/src/graphql/queries/metrics.graphql
deleted file mode 100644
index 68de89cab..000000000
--- a/client/coral-admin/src/graphql/queries/metrics.graphql
+++ /dev/null
@@ -1,38 +0,0 @@
-fragment metrics on Asset {
-  id
-  title
-  url
-  author
-  created_at
-  action_summaries {
-    type: __typename
-    actionCount
-    actionableItemCount
-  }
-}
-
-query Metrics ($from: Date!, $to: Date!) {
-  assetsByFlag: assetMetrics(from: $from, to: $to, sort: FLAG) {
-    ...metrics
-  }
-  assetsByLike: assetMetrics(from: $from, to: $to, sort: LIKE) {
-    ...metrics
-  }
-#  mostLikedComments: commentMetrics(from: $from, to: $to, sort: LIKE) {
-#    id
-#    body
-#    user {
-#      status
-#      username
-#    }
-#    asset {
-#      id
-#      title
-#    }
-#    created_at
-#    action_summaries {
-#      type: __typename
-#      count
-#    }
-#  }
-}
diff --git a/client/coral-admin/src/graphql/queries/metricsQuery.graphql b/client/coral-admin/src/graphql/queries/metricsQuery.graphql
new file mode 100644
index 000000000..42a9fb70e
--- /dev/null
+++ b/client/coral-admin/src/graphql/queries/metricsQuery.graphql
@@ -0,0 +1,10 @@
+#import "../fragments/assetMetricsView.graphql"
+
+query Metrics ($from: Date!, $to: Date!) {
+  assetsByFlag: assetMetrics(from: $from, to: $to, sort: FLAG) {
+    ...metrics
+  }
+  assetsByLike: assetMetrics(from: $from, to: $to, sort: LIKE) {
+    ...metrics
+  }
+}
diff --git a/client/coral-admin/src/reducers/settings.js b/client/coral-admin/src/reducers/settings.js
index a6e0c9339..f74eb659f 100644
--- a/client/coral-admin/src/reducers/settings.js
+++ b/client/coral-admin/src/reducers/settings.js
@@ -4,6 +4,8 @@ import * as actions from '../actions/settings';
 // this is initialized here because
 // currently you have to reload the dashboard to get new stats
 // cleaner updates are planned in the future.
+// TODO: if there are more than two fields for the dashboard being created here,
+// please create a new reducer specifically for the Dashboard.
 const DASHBOARD_WINDOW_MINUTES = 5;
 let then = new Date();
 then.setMinutes(then.getMinutes() - DASHBOARD_WINDOW_MINUTES);