From 371348ced5f52cbec336eb9f464e87ac7bea264a Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Mon, 31 Jul 2017 10:03:58 -0300 Subject: [PATCH] changes --- client/coral-admin/src/AppRouter.js | 2 +- .../src/routes/Moderation/components/Moderation.js | 3 ++- .../src/routes/Moderation/components/ModerationMenu.js | 4 ++-- .../src/routes/Moderation/components/StorySearch.js | 1 - .../src/routes/Moderation/containers/Moderation.js | 2 ++ 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js index 5b60a9337..ffc891a0d 100644 --- a/client/coral-admin/src/AppRouter.js +++ b/client/coral-admin/src/AppRouter.js @@ -1,5 +1,5 @@ import React from 'react'; -import {Router, Route, IndexRedirect, Redirect} from 'react-router'; +import {Router, Route, IndexRedirect} from 'react-router'; import {history} from 'coral-framework/helpers/router'; import Configure from 'routes/Configure'; diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js index 60ac78ec3..917061681 100644 --- a/client/coral-admin/src/routes/Moderation/components/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js @@ -132,7 +132,7 @@ export default class Moderation extends Component { } render () { - const {root, moderation, settings, viewUserDetail, hideUserDetail, activeTab, ...props} = this.props; + const {root, moderation, settings, viewUserDetail, hideUserDetail, activeTab, getModPath, ...props} = this.props; const assetId = this.props.params.id; const {asset} = root; @@ -171,6 +171,7 @@ export default class Moderation extends Component { asset={asset} allCount={root.allCount} newCount={root.newCount} + getModPath={getModPath} approvedCount={root.approvedCount} premodCount={root.premodCount} rejectedCount={root.rejectedCount} diff --git a/client/coral-admin/src/routes/Moderation/components/ModerationMenu.js b/client/coral-admin/src/routes/Moderation/components/ModerationMenu.js index 1e61f504b..86ed925a4 100644 --- a/client/coral-admin/src/routes/Moderation/components/ModerationMenu.js +++ b/client/coral-admin/src/routes/Moderation/components/ModerationMenu.js @@ -4,7 +4,6 @@ import styles from './styles.css'; import {SelectField, Option} from 'react-mdl-selectfield'; import {Icon} from 'coral-ui'; import {Link} from 'react-router'; -import {getModPath} from '../../../utils'; import t from 'coral-framework/services/i18n'; @@ -18,7 +17,8 @@ const ModerationMenu = ({ reportedCount, selectSort, sort, - premodEnabled + premodEnabled, + getModPath }) => { return (
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js index 598b9e11c..7a716e3dd 100644 --- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js +++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js @@ -3,7 +3,6 @@ import PropTypes from 'prop-types'; import styles from './StorySearch.css'; import {Button, Spinner, Icon} from 'coral-ui'; import Story from './Story'; -import {isPremod} from '../../../utils'; const StorySearch = (props) => { diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js index cceedbdd1..92ce5f733 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js @@ -8,6 +8,7 @@ import t from 'coral-framework/services/i18n'; import update from 'immutability-helper'; import truncate from 'lodash/truncate'; import NotFoundAsset from '../components/NotFoundAsset'; +import {getModPath} from '../../../utils'; import {withSetCommentStatus} from 'coral-framework/graphql/mutations'; import {handleCommentChange} from '../../../graphql/utils'; @@ -215,6 +216,7 @@ class ModerationContainer extends Component { return