More accurate loading detection

client/coral-admin/src/routes/Moderation/components/Moderation.js

@@ -7,11 +7,9 @@ import SuspendUserDialog from './SuspendUserDialog';
 import ModerationQueue from './ModerationQueue';
 import ModerationMenu from './ModerationMenu';
 import ModerationHeader from './ModerationHeader';
-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 = {
@@ -105,22 +103,9 @@ export default class Moderation extends Component {
   render () {
 
     const {root, moderation, settings, viewUserDetail, hideUserDetail, activeTab, ...props} = this.props;
-    const providedAssetId = this.props.params.id;
+    const assetId = this.props.params.id;
     const {asset} = root;
 
-    if (providedAssetId) {
-      if (asset === null) {
-
-        // Not found.
-        return <NotFoundAsset assetId={providedAssetId} />;
-      }
-      if (asset === undefined || asset.id !== providedAssetId) {
-
-        // Still loading.
-        return <Spinner />;
-      }
-    }
-
     const comments = root[activeTab];
     let activeTabCount;
     switch(activeTab) {
@@ -174,7 +159,7 @@ export default class Moderation extends Component {
           acceptComment={props.acceptComment}
           rejectComment={props.rejectComment}
           loadMore={props.loadMore}
-          assetId={providedAssetId}
+          assetId={assetId}
           sort={this.props.moderation.sortOrder}
           commentCount={activeTabCount}
           currentUserId={this.props.auth.user.id}

client/coral-admin/src/routes/Moderation/containers/Moderation.js

@@ -8,6 +8,7 @@ import * as notification from 'coral-admin/src/services/notification';
 import t, {timeago} from 'coral-framework/services/i18n';
 import update from 'immutability-helper';
 import truncate from 'lodash/truncate';
+import NotFoundAsset from '../components/NotFoundAsset';
 
 import {withSetUserStatus, withSuspendUser, withSetCommentStatus} from 'coral-framework/graphql/mutations';
 import {handleCommentChange} from '../../../graphql/utils';
@@ -214,14 +215,27 @@ class ModerationContainer extends Component {
   };
 
   render () {
-    const {root, data} = this.props;
+    const {root, root: {asset}, data, params: {id: assetId}} = this.props;
 
     if (data.error) {
       return <div>Error</div>;
     }
 
-    if (!('premodCount' in root)) {
-      return <div><Spinner/></div>;
+    if (assetId) {
+      if (asset === null) {
+
+        // Not found.
+        return <NotFoundAsset assetId={assetId} />;
+      }
+      if (asset === undefined || asset.id !== assetId) {
+
+        // Still loading.
+        return <Spinner />;
+      }
+    } else if(asset !== undefined || !('premodCount' in root)) {
+
+      // loading.
+      return <Spinner />;
     }
 
     return <Moderation