merge confict

client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js

@@ -9,7 +9,7 @@ import {banUser, setCommentStatus} from '../../graphql/mutations';
 
 import {fetchSettings} from 'actions/settings';
 import {updateAssets} from 'actions/assets';
-import {setActiveTab, toggleModal, singleView, showBanUserDialog, hideBanUserDialog} from 'actions/moderation';
+import {toggleModal, singleView, showBanUserDialog, hideBanUserDialog} from 'actions/moderation';
 
 import {Spinner} from 'coral-ui';
 import BanUserDialog from '../../components/BanUserDialog';
@@ -19,7 +19,6 @@ import ModerationHeader from './components/ModerationHeader';
 import NotFoundAsset from './components/NotFoundAsset';
 
 class ModerationContainer extends Component {
-
   componentWillMount() {
     const {toggleModal, singleView} = this.props;
 
@@ -46,6 +45,8 @@ class ModerationContainer extends Component {
   render () {
     const {data, moderation, settings, assets, ...props} = this.props;
     const providedAssetId = this.props.params.id;
+    const activeTab = this.props.route.path === ':id' ? 'premod' : this.props.route.path;
+
     let asset;
 
     if (data.loading) {
@@ -65,20 +66,17 @@ class ModerationContainer extends Component {
       }
     }
 
-    const enablePremodTab = !!data.premod.length;
     return (
       <div>
         <ModerationHeader asset={asset} />
         <ModerationMenu
-          onTabClick={props.onTabClick}
-          enablePremodTab={enablePremodTab}
-          activeTab={moderation.activeTab}
+          activeTab={activeTab}
+          asset={asset}
         />
         <ModerationQueue
           data={data}
           currentAsset={asset}
-          activeTab={moderation.activeTab}
-          enablePremodTab={enablePremodTab}
+          activeTab={activeTab}
           suspectWords={settings.wordlist.suspect}
           showBanUserDialog={props.showBanUserDialog}
           acceptComment={props.acceptComment}
@@ -102,7 +100,6 @@ const mapStateToProps = state => ({
 });
 
 const mapDispatchToProps = dispatch => ({
-  onTabClick: activeTab => dispatch(setActiveTab(activeTab)),
   toggleModal: toggle => dispatch(toggleModal(toggle)),
   onClose: () => dispatch(toggleModal(false)),
   singleView: () => dispatch(singleView()),

client/coral-admin/src/containers/ModerationQueue/ModerationLayout.js

@@ -0,0 +1,9 @@
+import React from 'react';
+
+const ModerationLayout = props => (
+  <div>
+    {props.children}
+  </div>
+);
+
+export default ModerationLayout;

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 = props => {
+const ModerationQueue = ({activeTab = 'premod', ...props}) => {
   return (
     <div id="moderationList">
       <ul>
       {
-        props.data[props.activeTab].map((comment, i) => {
+        props.data[activeTab].map((comment, i) => {
           const status = comment.action_summaries ? 'FLAGGED' : comment.status;
           return <Comment
             key={i}

client/coral-admin/src/containers/ModerationQueue/components/Comment.js

@@ -63,10 +63,6 @@ const Comment = ({actions = [], ...props}) => {
         </p>
       </div>
       {actionSumaries && <FlagBox actionSumaries={actionSumaries} />}
-
-      {/* <span className={styles.context}>*/}
-       {/* <a>View context</a>*/}
-     {/* </span>*/}
     </li>
   );
 };

client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js

@@ -1,59 +1,43 @@
-import React, {PropTypes} from 'react';
+import React from 'react';
 import styles from './styles.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations.json';
+import {Link} from 'react-router';
 
 const lang = new I18n(translations);
 
 const ModerationMenu = (props) => (
   <div className='mdl-tabs'>
     <div className={`mdl-tabs__tab-bar ${styles.tabBar}`}>
-      <a href='#all'
-         onClick={(e) => {
-           e.preventDefault();
-           props.onTabClick('all');
-         }}
-         className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'all' ? styles.active : ''}`}
-      >
-        {lang.t('modqueue.all')}
-      </a>
       {
-        props.enablePremodTab
-          ? <a href='#premod'
-               onClick={(e) => {
-                 e.preventDefault();
-                 props.onTabClick('premod');
-               }}
-               className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'premod' ? styles.active : ''}`}>
-            {lang.t('modqueue.premod')}
-          </a>
-          : null
+        props.asset ? (
+          <div>
+            <Link to={`/admin/moderate/premod/${props.asset.id}`} className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
+              {lang.t('modqueue.premod')}
+            </Link>
+            <Link to={`/admin/moderate/rejected/${props.asset.id}`} className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
+              {lang.t('modqueue.rejected')}
+            </Link>
+            <Link to={`/admin/moderate/flagged/${props.asset.id}`} className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
+            {lang.t('modqueue.flagged')}
+            </Link>
+          </div>
+          ) : (
+            <div>
+              <Link to='/admin/moderate/premod' className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
+                {lang.t('modqueue.premod')}
+              </Link>
+              <Link to='/admin/moderate/rejected' className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
+                {lang.t('modqueue.rejected')}
+              </Link>
+              <Link to='/admin/moderate/flagged' className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
+                {lang.t('modqueue.flagged')}
+              </Link>
+            </div>
+          )
       }
-      <a href='#rejected'
-         onClick={(e) => {
-           e.preventDefault();
-           props.onTabClick('rejected');
-         }}
-         className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'rejected' ? styles.active : ''}`}
-      >
-        {lang.t('modqueue.rejected')}
-      </a>
-      <a href='#flagged'
-         onClick={(e) => {
-           e.preventDefault();
-           props.onTabClick('flagged');
-         }}
-         className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'flagged' ? styles.active : ''}`}
-      >
-        {lang.t('modqueue.flagged')}
-      </a>
     </div>
   </div>
 );
 
-ModerationMenu.propTypes = {
-  activeTab: PropTypes.string.isRequired,
-  enablePremodTab: PropTypes.bool
-};
-
 export default ModerationMenu;