From ff52714f272aa69f0c090e9c0630d36de37ca528 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 8 Nov 2016 16:16:27 -0700
Subject: [PATCH] update state correctly. save to server correctly

---
 client/coral-admin/src/actions/settings.js     |  5 ++---
 client/coral-admin/src/containers/Configure.js |  6 +-----
 client/coral-admin/src/reducers/settings.js    | 17 +++++++++--------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/client/coral-admin/src/actions/settings.js b/client/coral-admin/src/actions/settings.js
index 73e7d9510..488764c17 100644
--- a/client/coral-admin/src/actions/settings.js
+++ b/client/coral-admin/src/actions/settings.js
@@ -49,12 +49,11 @@ export const fetchSettings = () => dispatch => {
 }
 
 export const updateSettings = settings => {
-  console.log('updated settings', settings)
   return {type: SETTINGS_UPDATED, settings}
 }
 
-export const saveSettingsToServer = (dispatch, getState) => {
-  const settings = getState().settings.settings
+export const saveSettingsToServer = () => (dispatch, getState) => {
+  const settings = getState().settings.toJS().settings
   dispatch({type: SAVE_SETTINGS_LOADING})
   fetch(`${base}/settings`, getInit('PUT', settings))
     .then(handleResp)
diff --git a/client/coral-admin/src/containers/Configure.js b/client/coral-admin/src/containers/Configure.js
index 70c357cc5..12a47613c 100644
--- a/client/coral-admin/src/containers/Configure.js
+++ b/client/coral-admin/src/containers/Configure.js
@@ -113,10 +113,6 @@ class Configure extends React.Component {
   }
 }
 
-const mapStateToProps = state => {
-  return {
-    settings: state.settings.toJS()
-  }
-}
+const mapStateToProps = state => state.settings.toJS()
 
 export default connect(mapStateToProps)(Configure)
diff --git a/client/coral-admin/src/reducers/settings.js b/client/coral-admin/src/reducers/settings.js
index 9d877a36d..60dcd05af 100644
--- a/client/coral-admin/src/reducers/settings.js
+++ b/client/coral-admin/src/reducers/settings.js
@@ -12,9 +12,9 @@ const initialState = Map({
 export default (state = initialState, action) => {
   switch (action.type) {
     case types.SETTINGS_LOADING: return state.set('fetchingSettings', true).set('fetchSettingsError', null)
-    case types.SETTINGS_RECEIVED: return receivedSettings(state, action)
+    case types.SETTINGS_RECEIVED: return updateSettings(state, action)
     case types.SETTINGS_FETCH_ERROR: return settingsFetchFailed(state, action)
-    case types.SETTINGS_UPDAETD: return state.get('settings').merge(action.settings)
+    case types.SETTINGS_UPDATED: return updateSettings(state, action)
     case types.SAVE_SETTINGS_LOADING: return state.set('fetchingSettings', true).set('saveSettingsError', null)
     case types.SAVE_SETTINGS_SUCCESS: return saveComplete(state, action)
     case types.SAVE_SETTINGS_FAILED: return settingsSaveFailed(state, action)
@@ -22,15 +22,16 @@ export default (state = initialState, action) => {
   }
 }
 
-const receivedSettings = (state, action) => {
-  state.set('fetchingSettings', false).set('fetchSettingsError', null)
-  return state.get('settings').merge(action.settings)
+const updateSettings = (state, action) => {
+  const s = state.set('fetchingSettings', false).set('fetchSettingsError', null)
+  const settings = s.get('settings').merge(action.settings)
+  return s.set('settings', settings)
 }
 
 const saveComplete = (state, action) => {
-  state.set('fetchingSettings', false).set('saveSettingsError', null)
-  console.log('saveComplete', action.settings)
-  return state.get('settings').merge(action.settings)
+  const s = state.set('fetchingSettings', false).set('saveSettingsError', null)
+  const settings = s.get('settings').merge(action.settings)
+  return s.set('settings', settings)
 }
 
 const settingsFetchFailed = (state, action) => {