1 files changed, 4 insertions, 48 deletions
diff --git a/web/src/js/ducks/settings.js b/web/src/js/ducks/settings.js
index 6b21baec..a2e360de 100644
--- a/web/src/js/ducks/settings.js
+++ b/web/src/js/ducks/settings.js
@@ -1,12 +1,7 @@
 import { fetchApi } from '../utils'
-import * as websocketActions from './websocket'
-import * as msgQueueActions from './msgQueue'
 
-export const MSG_TYPE = 'UPDATE_SETTINGS'
-export const DATA_URL = '/settings'
-
-export const RECEIVE        = 'RECEIVE'
-export const UPDATE         = 'UPDATE'
+export const RECEIVE        = 'SETTINGS_RECEIVE'
+export const UPDATE         = 'SETTINGS_UPDATE'
 export const REQUEST_UPDATE = 'REQUEST_UPDATE'
 export const UNKNOWN_CMD    = 'SETTINGS_UNKNOWN_CMD'
 
@@ -18,12 +13,12 @@ export default function reducer(state = defaultState, action) {
     switch (action.type) {
 
         case RECEIVE:
-            return action.settings
+            return action.data
 
         case UPDATE:
             return {
                 ...state,
-                ...action.settings,
+                ...action.data,
             }
 
         default:
@@ -31,46 +26,7 @@ export default function reducer(state = defaultState, action) {
     }
 }
 
-/**
- * @public msgQueue
- */
-export function handleWsMsg(msg) {
-    switch (msg.cmd) {
-
-        case websocketActions.CMD_UPDATE:
-            return updateSettings(msg.data)
-
-        default:
-            console.error('unknown settings update', msg)
-            return { type: UNKNOWN_CMD, msg }
-    }
-}
-
-/**
- * @public
- */
 export function update(settings) {
     fetchApi.put('/settings', settings)
     return { type: REQUEST_UPDATE }
 }
-
-/**
- * @public websocket
- */
-export function fetchData() {
-    return msgQueueActions.fetchData(MSG_TYPE)
-}
-
-/**
- * @public msgQueue
- */
-export function receiveData(settings) {
-    return { type: RECEIVE, settings }
-}
-
-/**
- * @private
- */
-export function updateSettings(settings) {
-    return { type: UPDATE, settings }
-}