From a1def6f950f9d8ab9ec280edf8f07422cee8c242 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Tue, 3 Jan 2017 10:33:25 -0700 Subject: [PATCH] missing state for the wordlist. --- client/coral-admin/src/components/CommentList.js | 7 +++---- .../containers/ModerationQueue/ModerationContainer.js | 1 + .../src/containers/ModerationQueue/ModerationQueue.js | 9 ++++++--- client/coral-admin/src/reducers/settings.js | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/client/coral-admin/src/components/CommentList.js b/client/coral-admin/src/components/CommentList.js index a1a990490..91c88a796 100644 --- a/client/coral-admin/src/components/CommentList.js +++ b/client/coral-admin/src/components/CommentList.js @@ -21,12 +21,11 @@ export default class CommentList extends React.Component { comments: PropTypes.object.isRequired, users: PropTypes.object.isRequired, onClickAction: PropTypes.func, - modActions: PropTypes.arrayOf(PropTypes.string), + // list of actions (flags, etc) associated with the comments + modActions: PropTypes.arrayOf(PropTypes.string).isRequired, loading: PropTypes.bool, - // list of actions (flags, etc) associated with the comments - actions: PropTypes.arrayOf(PropTypes.string), - suspectWords: PropTypes.arrayOf(PropTypes.string) + suspectWords: PropTypes.arrayOf(PropTypes.string).isRequired } constructor (props) { diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js index a2bc5a411..145faf4df 100644 --- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js +++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js @@ -80,6 +80,7 @@ class ModerationContainer extends React.Component { const mapStateToProps = state => ({ comments: state.comments.toJS(), + settings: state.settings.toJS(), users: state.users.toJS() }); diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js index 7c3a1c06c..55a2e705e 100644 --- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js +++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js @@ -23,6 +23,7 @@ export default ({onTabClick, ...props}) => (
( users={props.users.byId} onClickAction={props.updateStatus} onClickShowBanDialog={props.showBanUserDialog} - actions={['reject', 'approve', 'ban']} + modActions={['reject', 'approve', 'ban']} loading={props.comments.loading}/> (
diff --git a/client/coral-admin/src/reducers/settings.js b/client/coral-admin/src/reducers/settings.js index b05418715..12b16d9ad 100644 --- a/client/coral-admin/src/reducers/settings.js +++ b/client/coral-admin/src/reducers/settings.js @@ -37,7 +37,7 @@ const updateSettings = (state, action) => { // any nested settings must have a specialized setter const updateWordlist = (state, action) => { - return state.setIn(['settings', 'wordlist', action.listName], action.wordlist); + return state.setIn(['settings', 'wordlist', action.listName], action.list); }; const saveComplete = (state, action) => {