From 61bc87bafcb437e59aae1c08dbf3f0489728f144 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 11 Jan 2017 17:35:09 -0500
Subject: [PATCH] Adding ALL moderation list.

---
 .../src/components/ModerationList.js          |  2 +-
 .../ModerationQueue/ModerationContainer.js    |  2 +-
 .../ModerationQueue/ModerationQueue.js        | 32 ++++++++++++++++---
 client/coral-admin/src/translations.json      |  1 +
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/components/ModerationList.js b/client/coral-admin/src/components/ModerationList.js
index 29be06362..b9e4db84d 100644
--- a/client/coral-admin/src/components/ModerationList.js
+++ b/client/coral-admin/src/components/ModerationList.js
@@ -202,7 +202,7 @@ export default class ModerationList extends React.Component {
         return itemB.updated_at - itemA.updated_at;
       });
     } else {
-      return commentIds || actionIds;
+      return comments ? commentIds : actionIds;
     }
   }
 
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
index 4930f4af2..21b9a68f7 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
@@ -19,7 +19,7 @@ class ModerationContainer extends React.Component {
     super(props);
 
     this.state = {
-      activeTab: 'pending',
+      activeTab: 'all',
       singleView: false,
       modalOpen: false
     };
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index 853e4a513..4fbf204c8 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -14,6 +14,8 @@ export default (props) => (
   <div>
     <div className='mdl-tabs mdl-js-tabs mdl-js-ripple-effect'>
       <div className={`mdl-tabs__tab-bar ${styles.tabBar}`}>
+        <a href='#all' onClick={() => props.onTabClick('all')}
+           className={`mdl-tabs__tab ${styles.tab}`}>{lang.t('modqueue.all')}</a>
         <a href='#pending' onClick={() => props.onTabClick('pending')}
            className={`mdl-tabs__tab ${styles.tab}`}>{lang.t('modqueue.pending')}</a>
         <a href='#flagged' onClick={() => props.onTabClick('flagged')}
@@ -23,7 +25,30 @@ export default (props) => (
        <a href='#rejected' onClick={() => props.onTabClick('rejected')}
           className={`mdl-tabs__tab ${styles.tab}`}>{lang.t('modqueue.rejected')}</a>
       </div>
-      <div className={`mdl-tabs__panel is-active ${styles.listContainer}`} id='pending'>
+      <div className={`mdl-tabs__panel is-active ${styles.listContainer}`} id='all'>
+        <ModerationList
+          suspectWords={props.settings.settings.wordlist.suspect}
+          isActive={props.activeTab === 'all'}
+          singleView={props.singleView}
+          commentIds={[...props.premodIds, ...props.flaggedIds]}
+          comments={props.comments.byId}
+          users={props.users.byId}
+          actionIds={props.userActionIds}
+          actions={props.actions.byId}
+          userStatusUpdate={props.userStatusUpdate}
+          suspendUser={props.suspendUser}
+          updateCommentStatus={props.updateStatus}
+          onClickShowBanDialog={props.showBanUserDialog}
+          modActions={['reject', 'approve', 'ban']}
+          loading={props.comments.loading}/>
+        <BanUserDialog
+          open={props.comments.showBanUserDialog}
+          handleClose={props.hideBanUserDialog}
+          onClickBanUser={props.userStatusUpdate}
+          user={props.comments.banUser}
+        />
+      </div>
+      <div className={`mdl-tabs__panel ${styles.listContainer}`} id='pending'>
         <ModerationList
           suspectWords={props.settings.settings.wordlist.suspect}
           isActive={props.activeTab === 'pending'}
@@ -31,7 +56,6 @@ export default (props) => (
           commentIds={props.premodIds}
           comments={props.comments.byId}
           users={props.users.byId}
-          actionIds={props.userActionIds}
           actions={props.actions.byId}
           userStatusUpdate={props.userStatusUpdate}
           suspendUser={props.suspendUser}
@@ -61,10 +85,10 @@ export default (props) => (
           loading={props.comments.loading}
         />
       </div>
-      <div className={`mdl-tabs__panel is-active ${styles.listContainer}`} id='account'>
+      <div className={`mdl-tabs__panel ${styles.listContainer}`} id='account'>
         <ModerationList
           suspectWords={props.settings.settings.wordlist.suspect}
-          isActive={props.activeTab === 'pending'}
+          isActive={props.activeTab === 'account'}
           singleView={props.singleView}
           users={props.users.byId}
           actionIds={props.userActionIds}
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index f657255f4..b7cab3250 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -16,6 +16,7 @@
       "loading": "Loading results"
     },
     "modqueue": {
+      "all": "all",
       "pending": "pending",
       "rejected": "rejected",
       "flagged": "flagged",