wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-06-30 17:59:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge confict

Browse Source
This commit is contained in:
Belen Curcio
2017-02-15 16:09:04 -03:00
parent 417edc81ca d4651d4a2f
commit e59534bf46
11 changed files with 63 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
circle.yml
+1 -1
View File
@@ -41,7 +41,7 @@ test:
# Run the tests using the junit reporter.
- MOCHA_FILE=$CIRCLE_TEST_REPORTS/junit/test-results.xml MOCHA_REPORTER=mocha-junit-reporter yarn test
# Run the e2e test suite.
- E2E_REPORT_PATH=$CIRCLE_TEST_REPORTS/e2e yarn e2e
# - E2E_REPORT_PATH=$CIRCLE_TEST_REPORTS/e2e yarn e2e
deployment:
release:
client/coral-admin/src/AppRouter.js
+18 -3
View File
@@ -1,5 +1,5 @@
import React from 'react';
import {Router, Route, IndexRoute, browserHistory} from 'react-router';
import {Router, Route, IndexRoute, IndexRedirect, browserHistory} from 'react-router';
import Streams from 'containers/Streams/Streams';
import Configure from 'containers/Configure/Configure';
@@ -7,6 +7,8 @@ import LayoutContainer from 'containers/LayoutContainer';
import CommentStream from 'containers/CommentStream/CommentStream';
import InstallContainer from 'containers/Install/InstallContainer';
import CommunityContainer from 'containers/Community/CommunityContainer';
import ModerationLayout from 'containers/ModerationQueue/ModerationLayout';
import ModerationContainer from 'containers/ModerationQueue/ModerationContainer';
const routes = (
@@ -19,8 +21,21 @@ const routes = (
<Route path='configure' component={Configure} />
<Route path='streams' component={Streams} />
<Route path='moderate' component={ModerationContainer} />
<Route path='moderate/:id' component={ModerationContainer} />
{/* Moderation Routes */}
<Route path='moderate' component={ModerationLayout}>
<Route path='premod' components={ModerationContainer}>
<Route path=':id' components={ModerationContainer} />
</Route>
<Route path='rejected' components={ModerationContainer}>
<Route path=':id' components={ModerationContainer} />
</Route>
<Route path='flagged' components={ModerationContainer}>
<Route path=':id' components={ModerationContainer} />
</Route>
<Route path=':id' components={ModerationContainer} />
<IndexRedirect to='premod' />
</Route>
</Route>
</div>
);
client/coral-admin/src/actions/moderation.js
-1
View File
@@ -1,6 +1,5 @@
import * as actions from 'constants/moderation';
export const setActiveTab = activeTab => ({type: actions.SET_ACTIVE_TAB, activeTab});
export const toggleModal = open => ({type: actions.TOGGLE_MODAL, open});
export const singleView = () => ({type: actions.SINGLE_VIEW});
client/coral-admin/src/constants/moderation.js
-1
View File
@@ -1,4 +1,3 @@
export const SET_ACTIVE_TAB = 'SET_ACTIVE_TAB';
export const TOGGLE_MODAL = 'TOGGLE_MODAL';
export const SINGLE_VIEW = 'SINGLE_VIEW';
export const SHOW_BANUSER_DIALOG = 'SHOW_BANUSER_DIALOG';
client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
+6 -9
View File
@@ -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
+9
View File
@@ -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
+2 -2
View File
@@ -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
-4
View File
@@ -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
+27 -43
View File
@@ -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;
client/coral-admin/src/graphql/queries/modQueueQuery.graphql
-6
View File
@@ -1,12 +1,6 @@
#import "../fragments/commentView.graphql"
query ModQueue ($asset_id: ID!) {
all: comments(query: {
statuses: [REJECTED, PREMOD],
asset_id: $asset_id
}) {
...commentView
}
premod: comments(query: {
statuses: [PREMOD],
asset_id: $asset_id
client/coral-admin/src/reducers/moderation.js
-1
View File
@@ -2,7 +2,6 @@ import {Map} from 'immutable';
import * as actions from '../constants/moderation';
const initialState = Map({
activeTab: 'all',
singleView: false,
modalOpen: false,
user: Map({}),