From 89cf13b4cf872628090d16f9028fd328698f4ea1 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 16 Jun 2017 15:05:22 -0300
Subject: [PATCH 01/15] Updates

---
 graph/loaders/assets.js       | 4 ++--
 graph/resolvers/root_query.js | 4 +---
 graph/typeDefs.graphql        | 2 +-
 services/assets.js            | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/graph/loaders/assets.js b/graph/loaders/assets.js
index b32b37b60..7e924e14a 100644
--- a/graph/loaders/assets.js
+++ b/graph/loaders/assets.js
@@ -26,8 +26,8 @@ const genAssetsByID = (context, ids) => AssetModel.find({
  * @param  {Number} limit    limit the number of results
  * @return {Promise}         resolves the assets
  */
-const getAssetsByQuery = (context, value, limit) => {
-  return AssetsService.search(value, null, limit);
+const getAssetsByQuery = (context, query) => {
+  return AssetsService.search(query);
 };
 
 /**
diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index 637af9018..9889b62f2 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -11,9 +11,7 @@ const RootQuery = {
       return null;
     }
 
-    const {value = '', limit} = query;
-
-    return Assets.search(value, limit);
+    return Assets.search(query);
   },
   asset(_, query, {loaders: {Assets}}) {
     if (query.id) {
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index a4c4b8c5c..c946cca94 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -634,7 +634,7 @@ type RootQuery {
   comment(id: ID!): Comment
 
   # All assets. Requires the `ADMIN` role.
-  assets(query: AssetsQuery!): [Asset]
+  assets(query: AssetsQuery): [Asset]
 
   # Find or create an asset by url, or just find with the ID.
   asset(id: ID, url: String): Asset
diff --git a/services/assets.js b/services/assets.js
index b81513b72..5a5b924f3 100644
--- a/services/assets.js
+++ b/services/assets.js
@@ -109,7 +109,7 @@ module.exports = class AssetsService {
    * @param  {String} value string to search by.
    * @return {Promise}
    */
-  static search(value = '', skip = null, limit = null) {
+  static search({value = '', skip = null, limit = null}) {
     if (value.length === 0) {
       return AssetsService.all(skip, limit);
     } else {

From fe94a5a6d144984cda1f631d737274228c6674b9 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 16 Jun 2017 15:08:10 -0300
Subject: [PATCH 02/15] Limit 10

---
 .../coral-admin/src/routes/Moderation/containers/Moderation.js  | 2 +-
 .../coral-admin/src/routes/Moderation/containers/StorySearch.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index e60a6b914..822db3d08 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -212,7 +212,7 @@ const withModQueueQuery = withQuery(gql`
     }) {
       ...CoralAdmin_Moderation_CommentConnection
     }
-    assets: assets(query: {}) {
+    assets: assets(query: {limit: 10}) {
       id
       title
       url
diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
index f52c290b5..334248e33 100644
--- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -54,7 +54,7 @@ class StorySearchContainer extends React.Component {
 
 export const withAssetSearchQuery = withQuery(gql`
   query SearchStories($value: String = "") {
-    assets(query: {value: $value}) {
+    assets(query: {value: $value, limit: 10}) {
       id
       title
       url

From e30d5a9c627a27435134a37fe6ab88e6a88da28b Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 16 Jun 2017 15:41:32 -0300
Subject: [PATCH 03/15] Sizing

---
 .../coral-admin/src/routes/Moderation/components/Story.js  | 6 +++---
 .../src/routes/Moderation/components/StorySearch.css       | 7 ++++---
 .../src/routes/Moderation/containers/Moderation.js         | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Story.js b/client/coral-admin/src/routes/Moderation/components/Story.js
index b87611b24..6c3a4b02f 100644
--- a/client/coral-admin/src/routes/Moderation/components/Story.js
+++ b/client/coral-admin/src/routes/Moderation/components/Story.js
@@ -9,12 +9,12 @@ const formatDate = (date) => {
 const Story = ({author, title, createdAt, open, id, goToStory}) => {
   return (
     <li className={styles.story} onClick={() => goToStory(id)}>
-      <p className={styles.title}>{title}</p>
-      <p className={styles.meta}>
+      <span className={styles.title}>{title}</span>
+      <div className={styles.meta}>
         <span className={styles.author}>By {author}</span>
         <span className={styles.createdAt}>{formatDate(createdAt)}</span>
         <span className={styles.status}>{open ? 'Open' : 'Closed'}</span>
-      </p>
+      </div>
     </li>
   );
 };
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
index 9ea56df0d..cbca8e17d 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -67,12 +67,13 @@
 }
 
 .story {
-  padding: 10px 63px;
+  padding: 5px 63px;
   border-bottom: 1px solid #ddd;
   cursor: pointer;
   display: block;
   text-decoration: none;
   height: 50px;
+  box-sizing: border-box;
 
   &:hover {
     background-color: #efefef;
@@ -86,7 +87,7 @@
 .title, .meta {
   margin: 0;
   color: black;
-  font-size: 17px;
+  font-size: 15px;
 }
 
 .author, .createdAt, .status {
@@ -117,7 +118,7 @@
 }
 
 .searchResults {
-  padding: 10px 24px;
+  padding: 7px 24px;
 }
 
 .searchResults i {
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 822db3d08..e60a6b914 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -212,7 +212,7 @@ const withModQueueQuery = withQuery(gql`
     }) {
       ...CoralAdmin_Moderation_CommentConnection
     }
-    assets: assets(query: {limit: 10}) {
+    assets: assets(query: {}) {
       id
       title
       url

From 4403decbe9d031c6f5b449159d7f1ff696c8764c Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 16 Jun 2017 15:50:58 -0300
Subject: [PATCH 04/15] Handling dropdown on Esc <3

---
 .../src/routes/Moderation/components/StorySearch.css      | 2 +-
 .../src/routes/Moderation/components/StorySearch.js       | 2 +-
 .../src/routes/Moderation/containers/StorySearch.js       | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
index cbca8e17d..6dd5b1071 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -67,7 +67,7 @@
 }
 
 .story {
-  padding: 5px 63px;
+  padding: 7px 63px;
   border-bottom: 1px solid #ddd;
   cursor: pointer;
   display: block;
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index c174c892f..f42ceaadd 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -19,7 +19,7 @@ const StorySearch = (props) => {
 
   return (
     <div>
-      <div className={styles.container} role='alertdialog'>
+      <div className={styles.container} role='alertdialog' onKeyDown={props.handleEsc}>
         <div className={styles.positionShim}>
           <div className={styles.headInput}>
             <input
diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
index 334248e33..cf47ca662 100644
--- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -20,6 +20,13 @@ class StorySearchContainer extends React.Component {
     });
   }
 
+  handleEsc = (e) => {
+    if (e.key === 'Escape') {
+      e.preventDefault();
+      this.props.closeSearch();
+    }
+  }
+
   handleEnter = (e) => {
     if (e.key === 'Enter') {
       e.preventDefault();
@@ -43,6 +50,7 @@ class StorySearchContainer extends React.Component {
       <StorySearch
         search={this.search}
         goToStory={this.goToStory}
+        handleEsc={this.handleEsc}
         handleEnter={this.handleEnter}
         searchValue={this.state.searchValue}
         handleSearchChange={this.handleSearchChange}

From 991bdc608973f0056afc26b24d2d356459ca7f77 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 16 Jun 2017 16:18:02 -0300
Subject: [PATCH 05/15] Updated BE

---
 graph/loaders/assets.js                | 5 ++---
 routes/api/assets/index.js             | 4 ++--
 test/server/routes/api/assets/index.js | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/graph/loaders/assets.js b/graph/loaders/assets.js
index 7e924e14a..020eafbcb 100644
--- a/graph/loaders/assets.js
+++ b/graph/loaders/assets.js
@@ -22,8 +22,7 @@ const genAssetsByID = (context, ids) => AssetModel.find({
 /**
  * [getAssetsByQuery description]
  * @param  {Object} context  the context of the request
- * @param  {String} value    text string to search agains the documents
- * @param  {Number} limit    limit the number of results
+ * @param  {Object} query    the query
  * @return {Promise}         resolves the assets
  */
 const getAssetsByQuery = (context, query) => {
@@ -76,7 +75,7 @@ module.exports = (context) => ({
     // this operation create a new asset if one isn't found.
     getByURL: (url) => findOrCreateAssetByURL(context, url),
 
-    search: (value, limit) => getAssetsByQuery(context, value, limit),
+    search: (query) => getAssetsByQuery(context, query),
     getByID: new DataLoader((ids) => genAssetsByID(context, ids)),
     getForMetrics: () => getAssetsForMetrics(context),
     getAll: new util.SingletonResolver(() => AssetModel.find({}))
diff --git a/routes/api/assets/index.js b/routes/api/assets/index.js
index 3bb3ef778..f02b49f7e 100644
--- a/routes/api/assets/index.js
+++ b/routes/api/assets/index.js
@@ -48,13 +48,13 @@ router.get('/', (req, res, next) => {
   Promise.all([
 
     // Find the actuall assets.
-    FilterOpenAssets(AssetsService.search(search), filter)
+    FilterOpenAssets(AssetsService.search({value: search}), filter)
       .sort({[field]: (sort === 'asc') ? 1 : -1})
       .skip(parseInt(skip))
       .limit(parseInt(limit)),
 
     // Get the count of actual assets.
-    FilterOpenAssets(AssetsService.search(search), filter)
+    FilterOpenAssets(AssetsService.search({value: search}), filter)
       .count()
   ])
   .then(([result, count]) => {
diff --git a/test/server/routes/api/assets/index.js b/test/server/routes/api/assets/index.js
index 80708688b..62c4cdb47 100644
--- a/test/server/routes/api/assets/index.js
+++ b/test/server/routes/api/assets/index.js
@@ -43,6 +43,7 @@ describe('/api/v1/assets', () => {
         .set(passport.inject({roles: ['ADMIN']}))
         .then((res) => {
           const body = res.body;
+          console.log(body)
 
           expect(body).to.have.property('count', 2);
           expect(body).to.have.property('result');

From 367c5707472c57471659019e5103881bd5918a8b Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 16 Jun 2017 16:21:39 -0300
Subject: [PATCH 06/15] ModQueue query

---
 .../coral-admin/src/routes/Moderation/containers/Moderation.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index e60a6b914..167064834 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -212,7 +212,7 @@ const withModQueueQuery = withQuery(gql`
     }) {
       ...CoralAdmin_Moderation_CommentConnection
     }
-    assets: assets(query: {}) {
+    assets: assets(query: {limit: 0}) {
       id
       title
       url

From 61591a9716c7c04377325c16285f0a02783b86ae Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 16 Jun 2017 16:24:00 -0300
Subject: [PATCH 07/15] Removing extra log

---
 test/server/routes/api/assets/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/server/routes/api/assets/index.js b/test/server/routes/api/assets/index.js
index 62c4cdb47..63d3acb75 100644
--- a/test/server/routes/api/assets/index.js
+++ b/test/server/routes/api/assets/index.js
@@ -43,8 +43,7 @@ describe('/api/v1/assets', () => {
         .set(passport.inject({roles: ['ADMIN']}))
         .then((res) => {
           const body = res.body;
-          console.log(body)
-
+          
           expect(body).to.have.property('count', 2);
           expect(body).to.have.property('result');
 

From 614f31d0da58804d260862ef498e47588efb8993 Mon Sep 17 00:00:00 2001
From: IAmSamHankins <samantha.hankins@icloud.com>
Date: Fri, 16 Jun 2017 15:39:24 -0400
Subject: [PATCH 08/15] styling of search results bar

---
 .../routes/Moderation/components/StorySearch.css    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
index 6dd5b1071..d5b1d3afb 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -62,18 +62,19 @@
   letter-spacing: 0.7px;
 }
 
-.storyList {
+/*.storyList {
   border-top: 1px solid #ddd;
-}
+}*/
 
 .story {
-  padding: 7px 63px;
+  padding: 7px 50px;
   border-bottom: 1px solid #ddd;
   cursor: pointer;
   display: block;
   text-decoration: none;
   height: 50px;
   box-sizing: border-box;
+  transition: background-color 400ms;
 
   &:hover {
     background-color: #efefef;
@@ -118,7 +119,8 @@
 }
 
 .searchResults {
-  padding: 7px 24px;
+  padding: 7px 27px;
+  background: #F5F5F5;
 }
 
 .searchResults i {
@@ -135,10 +137,9 @@
   font-weight: 500;
   letter-spacing: 0.7px;
   vertical-align: middle;
-  margin-left: 10px;
+  margin-left: 8px;
 }
 
 .noResults {
   padding: 10px 24px 15px 49px;
 }
-

From e7eb300e12ab8ecd6a816be19e9a5194d65c74e5 Mon Sep 17 00:00:00 2001
From: IAmSamHankins <samantha.hankins@icloud.com>
Date: Fri, 16 Jun 2017 15:47:45 -0400
Subject: [PATCH 09/15] search input box styling

---
 .../src/routes/Moderation/components/StorySearch.css        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
index d5b1d3afb..db1ffcfb6 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -29,8 +29,7 @@
 
 .headInput {
   background-color: #efefef;
-  padding: 17px 56px;
-  height: 80px;
+  padding: 10px 27px;
   box-sizing: border-box;
 }
 
@@ -41,12 +40,13 @@
   font-size: 16px;
   margin-right: 5px;
   position: relative;
-  top: 2px;
+  top: 3px;
   box-sizing: border-box;
   border-radius: 3px;
   border: solid 1px #dfdfdf;
   max-height: 45px;
   max-width: 600px;
+  font-weight: 300;
 }
 
 .cta {

From 6c5d94ec3b639e0722f1899dcd43841acd24c718 Mon Sep 17 00:00:00 2001
From: IAmSamHankins <samantha.hankins@icloud.com>
Date: Fri, 16 Jun 2017 16:40:17 -0400
Subject: [PATCH 10/15] adjustments to letter spacing, and container
 positioning.

---
 .../src/routes/Moderation/components/StorySearch.css        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
index db1ffcfb6..f0503f6b9 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -12,7 +12,7 @@
 .container {
   position: absolute;
   background-color: white;
-  top: 100px;
+  top: 106px;
   left: 0;
   right: 0;
   margin-left: auto;
@@ -59,7 +59,7 @@
   font-size: 15px;
   font-weight: 500;
   padding: 12px 30px;
-  letter-spacing: 0.7px;
+  letter-spacing: 0.25px;
 }
 
 /*.storyList {
@@ -135,7 +135,7 @@
 .headlineRecent {
   font-size: 15px;
   font-weight: 500;
-  letter-spacing: 0.7px;
+  letter-spacing: 0.25px;
   vertical-align: middle;
   margin-left: 8px;
 }

From 77fddba84112b53cf48a63026d91147fe61c602c Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 19 Jun 2017 11:05:16 -0300
Subject: [PATCH 11/15] removing overflow hidden

---
 client/coral-admin/src/components/ui/Layout.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/coral-admin/src/components/ui/Layout.css b/client/coral-admin/src/components/ui/Layout.css
index 792440d97..a3cc7b7b6 100644
--- a/client/coral-admin/src/components/ui/Layout.css
+++ b/client/coral-admin/src/components/ui/Layout.css
@@ -1,6 +1,5 @@
 .layout {
     max-width: 1280px;
     margin: 0 auto;
-    overflow: hidden;
     background-color: #FAFAFA;
 }

From 853c1e407efa9633f4e8f99adb65e70e9961353a Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 19 Jun 2017 20:33:34 +0700
Subject: [PATCH 12/15] Simplify args

---
 .../src/routes/Moderation/containers/Moderation.js         | 2 +-
 services/assets.js                                         | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 167064834..382fd5756 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -212,7 +212,7 @@ const withModQueueQuery = withQuery(gql`
     }) {
       ...CoralAdmin_Moderation_CommentConnection
     }
-    assets: assets(query: {limit: 0}) {
+    assets {
       id
       title
       url
diff --git a/services/assets.js b/services/assets.js
index 5a5b924f3..74bc1aa3a 100644
--- a/services/assets.js
+++ b/services/assets.js
@@ -104,13 +104,12 @@ module.exports = class AssetsService {
   }
 
   /**
-   * Finds assets matching keywords on the model. If `value` is an empty string,
-   * then it will not even perform a text search query.
+   * Finds assets matching keywords on the model.
    * @param  {String} value string to search by.
    * @return {Promise}
    */
-  static search({value = '', skip = null, limit = null}) {
-    if (value.length === 0) {
+  static search({value, skip, limit} = {}) {
+    if (!value) {
       return AssetsService.all(skip, limit);
     } else {
       return AssetModel

From e1bc1476ead8e85fc41087cd82f3c6cd6895a2c9 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 19 Jun 2017 21:02:44 +0700
Subject: [PATCH 13/15] Remove the need for querying all assets

---
 .../routes/Moderation/components/Moderation.js  | 17 ++++++++++-------
 .../routes/Moderation/containers/Moderation.js  | 16 +++-------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index a0a5b3705..bcd76da05 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -11,6 +11,7 @@ import NotFoundAsset from './NotFoundAsset';
 import ModerationKeysModal from '../../../components/ModerationKeysModal';
 import UserDetail from '../containers/UserDetail';
 import StorySearch from '../containers/StorySearch';
+import {Spinner} from 'coral-ui';
 
 export default class Moderation extends Component {
   state = {
@@ -102,18 +103,20 @@ export default class Moderation extends Component {
   }
 
   render () {
-    const {root, moderation, settings, assets, viewUserDetail, hideUserDetail, ...props} = this.props;
+    const {root, moderation, settings, viewUserDetail, hideUserDetail, ...props} = this.props;
     const providedAssetId = this.props.params.id;
     const activeTab = this.props.route.path === ':id' ? 'premod' : this.props.route.path;
+    const {asset} = root;
 
-    let asset;
+    if (providedAssetId && !asset) {
+      if (asset === undefined) {
 
-    if (providedAssetId) {
-      asset = assets.find((asset) => asset.id === this.props.params.id);
-
-      if (!asset) {
-        return <NotFoundAsset assetId={providedAssetId} />;
+        // Still loading.
+        return <Spinner />;
       }
+
+      // Not found.
+      return <NotFoundAsset assetId={providedAssetId} />;
     }
 
     const comments = root[activeTab];
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 382fd5756..c3ace0ebc 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -2,7 +2,6 @@ import React, {Component} from 'react';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import {compose, gql} from 'react-apollo';
-import isEqual from 'lodash/isEqual';
 import withQuery from 'coral-framework/hocs/withQuery';
 import {getDefinitionName} from 'coral-framework/utils';
 import * as notification from 'coral-admin/src/services/notification';
@@ -12,7 +11,6 @@ import update from 'immutability-helper';
 import {withSetUserStatus, withSuspendUser, withSetCommentStatus} from 'coral-framework/graphql/mutations';
 
 import {fetchSettings} from 'actions/settings';
-import {updateAssets} from 'actions/assets';
 import {
   toggleModal,
   singleView,
@@ -39,13 +37,6 @@ class ModerationContainer extends Component {
     this.props.fetchSettings();
   }
 
-  componentWillReceiveProps(nextProps) {
-    const {updateAssets} = this.props;
-    if(!isEqual(nextProps.root.assets, this.props.root.assets)) {
-      updateAssets(nextProps.root.assets);
-    }
-  }
-
   suspendUser = async (args) => {
     this.props.hideSuspendUserDialog();
     try {
@@ -175,7 +166,7 @@ const commentConnectionFragment = gql`
 `;
 
 const withModQueueQuery = withQuery(gql`
-  query CoralAdmin_Moderation($asset_id: ID, $sort: SORT_ORDER) {
+  query CoralAdmin_Moderation($asset_id: ID, $sort: SORT_ORDER, $allAssets: Boolean!) {
     all: comments(query: {
       statuses: [NONE, PREMOD, ACCEPTED, REJECTED],
       asset_id: $asset_id,
@@ -212,7 +203,7 @@ const withModQueueQuery = withQuery(gql`
     }) {
       ...CoralAdmin_Moderation_CommentConnection
     }
-    assets {
+    asset(id: $asset_id) @skip(if: $allAssets) {
       id
       title
       url
@@ -248,6 +239,7 @@ const withModQueueQuery = withQuery(gql`
       variables: {
         asset_id: id,
         sort: sortOrder,
+        allAssets: id === null
       }
     };
   },
@@ -291,14 +283,12 @@ const mapStateToProps = (state) => ({
   moderation: state.moderation.toJS(),
   settings: state.settings.toJS(),
   auth: state.auth.toJS(),
-  assets: state.assets.get('assets')
 });
 
 const mapDispatchToProps = (dispatch) => ({
   ...bindActionCreators({
     toggleModal,
     singleView,
-    updateAssets,
     fetchSettings,
     showBanUserDialog,
     hideBanUserDialog,

From f954d2be903368e07bf4700236555bee55fddff7 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 19 Jun 2017 21:23:30 +0700
Subject: [PATCH 14/15] Better loading detection

---
 .../src/routes/Moderation/components/Moderation.js  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index bcd76da05..ec858eaed 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -108,17 +108,18 @@ export default class Moderation extends Component {
     const activeTab = this.props.route.path === ':id' ? 'premod' : this.props.route.path;
     const {asset} = root;
 
-    if (providedAssetId && !asset) {
-      if (asset === undefined) {
-
-        // Still loading.
-        return <Spinner />;
-      }
+    if (providedAssetId && asset === null) {
 
       // Not found.
       return <NotFoundAsset assetId={providedAssetId} />;
     }
 
+    if (providedAssetId && (asset === undefined || asset.id !== providedAssetId)) {
+
+      // Still loading.
+      return <Spinner />;
+    }
+
     const comments = root[activeTab];
     let activeTabCount;
     switch(activeTab) {

From 0cd3921f4467e7b4cca5f8cc7fb8183fc532f04a Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 19 Jun 2017 21:29:33 +0700
Subject: [PATCH 15/15] Simplification

---
 .../routes/Moderation/components/Moderation.js  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index ec858eaed..c2036247d 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -108,16 +108,17 @@ export default class Moderation extends Component {
     const activeTab = this.props.route.path === ':id' ? 'premod' : this.props.route.path;
     const {asset} = root;
 
-    if (providedAssetId && asset === null) {
+    if (providedAssetId) {
+      if (asset === null) {
 
-      // Not found.
-      return <NotFoundAsset assetId={providedAssetId} />;
-    }
+        // Not found.
+        return <NotFoundAsset assetId={providedAssetId} />;
+      }
+      if (asset === undefined || asset.id !== providedAssetId) {
 
-    if (providedAssetId && (asset === undefined || asset.id !== providedAssetId)) {
-
-      // Still loading.
-      return <Spinner />;
+        // Still loading.
+        return <Spinner />;
+      }
     }
 
     const comments = root[activeTab];