diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js index be51f6639..4ee8a1c13 100644 --- a/client/coral-admin/src/containers/Configure/Configure.js +++ b/client/coral-admin/src/containers/Configure/Configure.js @@ -18,10 +18,9 @@ import Wordlist from './Wordlist'; class Configure extends React.Component { constructor (props) { super(props); - console.log(props); this.state = { activeSection: 'comments', - wordlist: props.settings.wordlist && props.settings.wordlist.join(' '), + wordlist: [], changed: false }; this.saveSettings = this.saveSettings.bind(this); @@ -33,8 +32,18 @@ class Configure extends React.Component { this.props.dispatch(fetchSettings()); } + componentWillUpdate (newProps) { + if ((!this.props.settings + || !this.props.settings.wordlist) + && newProps.settings.wordlist + && newProps.settings.wordlist.length !== 0 ) { + this.setState({wordlist: newProps.settings.wordlist.join(', ')}); + } + } + saveSettings () { this.props.dispatch(saveSettingsToServer()); + this.setState({changed: false}); } changeSection (activeSection) { diff --git a/client/coral-framework/reducers/items.js b/client/coral-framework/reducers/items.js index 17569c545..93388c1ab 100644 --- a/client/coral-framework/reducers/items.js +++ b/client/coral-framework/reducers/items.js @@ -6,7 +6,7 @@ import * as actions from '../actions/items'; const initialState = fromJS({ comments: {}, users: {}, - actions: {} + actions: {} }); export default (state = initialState, action) => { @@ -17,7 +17,6 @@ export default (state = initialState, action) => { return state.setIn([action.item_type, action.id, action.property], fromJS(action.value)); case actions.APPEND_ITEM_ARRAY: return state.updateIn([action.item_type, action.id, action.property], (prop) => { - console.log(prop); if (action.add_to_front) { return prop ? prop.unshift(fromJS(action.value)) : fromJS([action.value]); } else {