simplify settings reducer

3 files changed, 56 insertions, 57 deletions

diff --git a/web/src/js/components/ProxyApp.jsx b/web/src/js/components/ProxyApp.jsx
index 8129b0f0..39cadff5 100644
--- a/web/src/js/components/ProxyApp.jsx
+++ b/web/src/js/components/ProxyApp.jsx
@@ -3,7 +3,6 @@ import ReactDOM from 'react-dom'
 import _ from 'lodash'
 import { connect } from 'react-redux'
 
-import { fetch as fetchSettings } from '../ducks/settings'
 import Header from './Header'
 import EventLog from './EventLog'
 import Footer from './Footer'
@@ -50,12 +49,7 @@ class ProxyAppMain extends Component {
         return _.clone(this.props.location.query)
     }
 
-    componentWillMount() {
-        this.props.fetchSettings();
-    }
-
     /**
-     * @todo connect websocket here
      * @todo listen to window's key events
      */
     componentDidMount() {
@@ -139,8 +133,5 @@ export default connect(
     state => ({
         showEventLog: state.eventLog.visible,
         settings: state.settings.settings,
-    }),
-    {
-        fetchSettings,
-    }
+    })
 )(ProxyAppMain)
diff --git a/web/src/js/connection.js b/web/src/js/connection.js
index a2582288..786a6394 100644
--- a/web/src/js/connection.js
+++ b/web/src/js/connection.js
@@ -13,7 +13,7 @@ export default function Connection(url, dispatch) {
     var ws = new WebSocket(url);
     ws.onopen = function () {
         dispatch(webSocketActions.connected())
-        dispatch(settingsActions.fetch())
+        dispatch(settingsActions.fetchSettings())
         dispatch(flowActions.fetchFlows())
         // workaround to make sure that our state is already available.
             .then(() => {
@@ -30,8 +30,8 @@ export default function Connection(url, dispatch) {
                 return dispatch(eventLogActions.updateLogEntries(message))
             case flowActions.UPDATE_FLOWS:
                 return dispatch(flowActions.updateFlows(message))
-            case settingsActions.WS_MSG_TYPE:
-                return dispatch(settingsActions.handleWsMsg(message))
+            case settingsActions.UPDATE_SETTINGS:
+                return dispatch(settingsActions.updateSettings(message))
             default:
                 console.warn("unknown message", message)
         }
diff --git a/web/src/js/ducks/settings.js b/web/src/js/ducks/settings.js
index 6de1c2af..479d1300 100644
--- a/web/src/js/ducks/settings.js
+++ b/web/src/js/ducks/settings.js
@@ -1,64 +1,72 @@
-import { addLogEntry } from './eventLog'
+import {fetchApi} from "../utils";
 
-export const WS_MSG_TYPE = 'settings'
-export const WS_MSG_CMD_UPDATE = 'update'
+export const REQUEST_SETTINGS = "REQUEST_SETTINGS"
+export const RECEIVE_SETTINGS = "RECEIVE_SETTINGS"
+export const UPDATE_SETTINGS = "UPDATE_SETTINGS"
 
-export const BEGIN_FETCH = 'SETTINGS_BEGIN_FETCH'
-export const FETCHED = 'SETTINGS_FETCHED'
-export const RECV_WS_MSG = 'SETTINGS_RECV_WS_MSG'
-
-const defaultState = { settings: {}, pendings: null }
+const defaultState = {
+    settings: {},
+    isFetching: false,
+    actionsDuringFetch: [],
+}
 
-export default function reduce(state = defaultState, action) {
+export default function reducer(state = defaultState, action) {
     switch (action.type) {
 
-        case BEGIN_FETCH:
-            return { ...state, pendings: [] }
+        case REQUEST_SETTINGS:
+            return {
+                ...state,
+                isFetching: true
+            }
 
-        case FETCHED:
-            const pendings = state.pendings || []
-            return { ...state, pendings: null, settings: pendings.reduce(reduceData, action.data) }
+        case RECEIVE_SETTINGS:
+            let s = {
+                settings: action.settings,
+                isFetching: false,
+                actionsDuringFetch: [],
+            }
+            for (action of state.actionsDuringFetch) {
+                s = reducer(s, action)
+            }
+            return s
 
-        case RECV_WS_MSG:
-            if (state.pendings) {
-                return { ...state, pendings: state.pendings.concat(action) }
+        case UPDATE_SETTINGS:
+            if (state.isFetching) {
+                return {
+                    ...state,
+                    actionsDuringFetch: [...state.actionsDuringFetch, action]
+                }
+            }
+            return {
+                ...state,
+                settings: {...state.settings, ...action.settings}
             }
-            return { ...state, settings: reduceData(state.settings, action) }
 
         default:
             return state
     }
 }
 
-function reduceData(data, action) {
-    switch (action.cmd) {
-
-        case WS_MSG_CMD_UPDATE:
-            return { ...data, ...action.data }
-
-        default:
-            return data
+export function updateSettings(event) {
+    /* This action creator takes all WebSocket events */
+    if (event.cmd === "update") {
+        return {
+            type: UPDATE_SETTINGS,
+            settings: event.data
+        }
     }
+    console.error("unknown settings update", event)
 }
 
-export function fetch() {
+export function fetchSettings() {
     return dispatch => {
-        dispatch({ type: BEGIN_FETCH })
-        return $.getJSON('/settings')
-            .done(msg => dispatch(handleFetchResponse(msg.data)))
-            .fail(error => dispatch(handleFetchError(error)));
-    }
-}
-
-export function handleWsMsg(msg) {
-    return { type: RECV_WS_MSG, cmd: msg.cmd, data: msg.data }
-}
-
-export function handleFetchResponse(data) {
-    return { type: FETCHED, data }
-}
+        dispatch({type: REQUEST_SETTINGS})
 
-export function handleFetchError(error) {
-    // @todo let eventLog subscribe to SettingsActions.FETCH_ERROR
-    return addLogEntry(error.stack || error.message || error)
+        return fetchApi("/settings")
+            .then(response => response.json())
+            .then(json =>
+                dispatch({type: RECEIVE_SETTINGS, settings: json.data})
+            )
+        // TODO: Error handling
+    }
 }