From 99b2b8633db4fa3fa21d43f3e6a27694b00908e4 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 16 Jun 2016 12:20:32 +0800 Subject: [web] settings store --- web/src/js/ducks/index.js | 2 ++ web/src/js/ducks/settings.js | 81 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 web/src/js/ducks/settings.js (limited to 'web/src/js/ducks') diff --git a/web/src/js/ducks/index.js b/web/src/js/ducks/index.js index fee4d792..ffde1a64 100644 --- a/web/src/js/ducks/index.js +++ b/web/src/js/ducks/index.js @@ -2,12 +2,14 @@ import {combineReducers} from 'redux' import eventLog from './eventLog' import websocket from './websocket' import flows from './flows' +import settings from './settings' import ui from './ui' const rootReducer = combineReducers({ eventLog, websocket, flows, + settings, ui }) diff --git a/web/src/js/ducks/settings.js b/web/src/js/ducks/settings.js new file mode 100644 index 00000000..8513c2f1 --- /dev/null +++ b/web/src/js/ducks/settings.js @@ -0,0 +1,81 @@ +import { StoreCmds } from '../actions' + +export const WS_MSG_TYPE = 'settings' +export const WS_MSG_CMD_RESET = 'reset' +export const WS_MSG_CMD_UPDATE = 'update' + +export const BEGIN_FETCH = 'SETTINGS_BEGIN_FETCH' +export const FETCH_SETTINGS = 'SETTINGS_FETCH_SETTINGS' +export const FETCH_ERROR = 'SETTINGS_FETCH_ERROR' +export const RECV_WS_MSG = 'SETTINGS_RECV_WS_MSG' + +const defaultState = { settings: {}, pendings: null, req: null } + +function reduceData(data, action) { + switch (action.cmd) { + + case WS_MSG_CMD_RESET: + return action.data || {} + + case WS_MSG_CMD_UPDATE: + return _.merge({}, data.settings, action.data) + + default: + return data + } +} + +export default function reduce(state = defaultState, action) { + switch (action.type) { + + case BEGIN_FETCH: + return { ...state, pendings: [], req: action.req } + + case FETCH_SETTINGS: + const pendings = state.pendings || [] + return { ...state, pendings: null, settings: pendings.reduce(reduceData, data) } + + case RECV_WS_MSG: + if (state.pendings) { + return { ...state, pendings: state.pendings.concat(action) } + } + return { ...state, settings: reduceData(state.settings, action) } + + default: + return state + } +} + +export function fetch() { + return dispatch => { + const req = $.getJSON('/' + this.type) + .done(msg => dispatch(reset(msg.data))) + .fail(error => dispatch(handleFetchError(error))); + + dispatch({ type: BEGIN_FETCH, req }) + + return req + } +} + +export function handleWsMsg(msg) { + return (dispatch, getState) => { + if (msg.cmd === STORE_CMDS_RESET) { + const req = getState().settings.req + if (req) { + req.abort() + } + return dispatch(reset(msg.data)) + } + dispatch({ type: RECV_WS_MSG, cmd: msg.cmd, data: msg.data }) + } +} + +export function reset(data) { + return { type: FETCH_SETTINGS, data } +} + +export function handleFetchError(error) { + console.error(error) + return { type: FETCH_ERROR, error } +} -- cgit v1.2.3 From 7fb0836bfedefd851403ba440e88bc04548cf7b0 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 16 Jun 2016 16:46:13 +0800 Subject: [web] remove store --- web/src/js/ducks/settings.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'web/src/js/ducks') diff --git a/web/src/js/ducks/settings.js b/web/src/js/ducks/settings.js index 8513c2f1..05499da5 100644 --- a/web/src/js/ducks/settings.js +++ b/web/src/js/ducks/settings.js @@ -60,14 +60,14 @@ export function fetch() { export function handleWsMsg(msg) { return (dispatch, getState) => { - if (msg.cmd === STORE_CMDS_RESET) { - const req = getState().settings.req - if (req) { - req.abort() - } - return dispatch(reset(msg.data)) + if (msg.cmd !== STORE_CMDS_RESET) { + return dispatch({ type: RECV_WS_MSG, cmd: msg.cmd, data: msg.data }) + } + const req = getState().settings.req + if (req) { + req.abort() } - dispatch({ type: RECV_WS_MSG, cmd: msg.cmd, data: msg.data }) + dispatch(reset(msg.data)) } } -- cgit v1.2.3 From cedac98b700efc6d1a38378e673626f07bff916d Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 16 Jun 2016 17:21:57 +0800 Subject: [web] promot reduce --- web/src/js/ducks/settings.js | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'web/src/js/ducks') diff --git a/web/src/js/ducks/settings.js b/web/src/js/ducks/settings.js index 05499da5..41e99d29 100644 --- a/web/src/js/ducks/settings.js +++ b/web/src/js/ducks/settings.js @@ -1,4 +1,5 @@ import { StoreCmds } from '../actions' +import { addLogEntry } from './eventLog' export const WS_MSG_TYPE = 'settings' export const WS_MSG_CMD_RESET = 'reset' @@ -11,20 +12,6 @@ export const RECV_WS_MSG = 'SETTINGS_RECV_WS_MSG' const defaultState = { settings: {}, pendings: null, req: null } -function reduceData(data, action) { - switch (action.cmd) { - - case WS_MSG_CMD_RESET: - return action.data || {} - - case WS_MSG_CMD_UPDATE: - return _.merge({}, data.settings, action.data) - - default: - return data - } -} - export default function reduce(state = defaultState, action) { switch (action.type) { @@ -46,6 +33,20 @@ export default function reduce(state = defaultState, action) { } } +function reduceData(data, action) { + switch (action.cmd) { + + case WS_MSG_CMD_RESET: + return action.data || {} + + case WS_MSG_CMD_UPDATE: + return _.merge({}, data.settings, action.data) + + default: + return data + } +} + export function fetch() { return dispatch => { const req = $.getJSON('/' + this.type) @@ -76,6 +77,8 @@ export function reset(data) { } export function handleFetchError(error) { - console.error(error) - return { type: FETCH_ERROR, error } + return (dispatch, getState) => { + dispatch(addLogEntry(error.stack || error.message || error)) + dispatch({ type: FETCH_ERROR, error }) + } } -- cgit v1.2.3 From 6ad2f13341208b8460eae0dd0105c3109e773bae Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 17 Jun 2016 06:01:29 +0800 Subject: [web] fix settings ducks --- web/src/js/ducks/settings.js | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'web/src/js/ducks') diff --git a/web/src/js/ducks/settings.js b/web/src/js/ducks/settings.js index 41e99d29..37ff04de 100644 --- a/web/src/js/ducks/settings.js +++ b/web/src/js/ducks/settings.js @@ -6,7 +6,8 @@ export const WS_MSG_CMD_RESET = 'reset' export const WS_MSG_CMD_UPDATE = 'update' export const BEGIN_FETCH = 'SETTINGS_BEGIN_FETCH' -export const FETCH_SETTINGS = 'SETTINGS_FETCH_SETTINGS' +export const FETCHED = 'SETTINGS_FETCHED' +export const RESET = 'SETTINGS_RESET' export const FETCH_ERROR = 'SETTINGS_FETCH_ERROR' export const RECV_WS_MSG = 'SETTINGS_RECV_WS_MSG' @@ -18,9 +19,12 @@ export default function reduce(state = defaultState, action) { case BEGIN_FETCH: return { ...state, pendings: [], req: action.req } - case FETCH_SETTINGS: + case FETCHED: const pendings = state.pendings || [] - return { ...state, pendings: null, settings: pendings.reduce(reduceData, data) } + return { ...state, pendings: null, settings: pendings.reduce(reduceData, action.data) } + + case RESET: + return { ...state, pendings: null, settings: action.data || {} } case RECV_WS_MSG: if (state.pendings) { @@ -40,7 +44,7 @@ function reduceData(data, action) { return action.data || {} case WS_MSG_CMD_UPDATE: - return _.merge({}, data.settings, action.data) + return _.merge({}, data, action.data) default: return data @@ -49,8 +53,8 @@ function reduceData(data, action) { export function fetch() { return dispatch => { - const req = $.getJSON('/' + this.type) - .done(msg => dispatch(reset(msg.data))) + const req = $.getJSON('/settings') + .done(msg => dispatch(handleFetchResponse(msg.data))) .fail(error => dispatch(handleFetchError(error))); dispatch({ type: BEGIN_FETCH, req }) @@ -61,7 +65,7 @@ export function fetch() { export function handleWsMsg(msg) { return (dispatch, getState) => { - if (msg.cmd !== STORE_CMDS_RESET) { + if (msg.cmd !== StoreCmds.RESET) { return dispatch({ type: RECV_WS_MSG, cmd: msg.cmd, data: msg.data }) } const req = getState().settings.req @@ -72,8 +76,12 @@ export function handleWsMsg(msg) { } } +export function handleFetchResponse(data) { + return { type: FETCHED, data } +} + export function reset(data) { - return { type: FETCH_SETTINGS, data } + return { type: RESET, data } } export function handleFetchError(error) { -- cgit v1.2.3 From 965b27b52942cc6bf082355a1540bc0f960f1043 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 17 Jun 2016 22:02:34 +0800 Subject: [web] simplify settings --- web/src/js/ducks/settings.js | 44 ++++++++------------------------------------ 1 file changed, 8 insertions(+), 36 deletions(-) (limited to 'web/src/js/ducks') diff --git a/web/src/js/ducks/settings.js b/web/src/js/ducks/settings.js index 37ff04de..6de1c2af 100644 --- a/web/src/js/ducks/settings.js +++ b/web/src/js/ducks/settings.js @@ -1,31 +1,24 @@ -import { StoreCmds } from '../actions' import { addLogEntry } from './eventLog' export const WS_MSG_TYPE = 'settings' -export const WS_MSG_CMD_RESET = 'reset' export const WS_MSG_CMD_UPDATE = 'update' export const BEGIN_FETCH = 'SETTINGS_BEGIN_FETCH' export const FETCHED = 'SETTINGS_FETCHED' -export const RESET = 'SETTINGS_RESET' -export const FETCH_ERROR = 'SETTINGS_FETCH_ERROR' export const RECV_WS_MSG = 'SETTINGS_RECV_WS_MSG' -const defaultState = { settings: {}, pendings: null, req: null } +const defaultState = { settings: {}, pendings: null } export default function reduce(state = defaultState, action) { switch (action.type) { case BEGIN_FETCH: - return { ...state, pendings: [], req: action.req } + return { ...state, pendings: [] } case FETCHED: const pendings = state.pendings || [] return { ...state, pendings: null, settings: pendings.reduce(reduceData, action.data) } - case RESET: - return { ...state, pendings: null, settings: action.data || {} } - case RECV_WS_MSG: if (state.pendings) { return { ...state, pendings: state.pendings.concat(action) } @@ -40,11 +33,8 @@ export default function reduce(state = defaultState, action) { function reduceData(data, action) { switch (action.cmd) { - case WS_MSG_CMD_RESET: - return action.data || {} - case WS_MSG_CMD_UPDATE: - return _.merge({}, data, action.data) + return { ...data, ...action.data } default: return data @@ -53,40 +43,22 @@ function reduceData(data, action) { export function fetch() { return dispatch => { - const req = $.getJSON('/settings') + dispatch({ type: BEGIN_FETCH }) + return $.getJSON('/settings') .done(msg => dispatch(handleFetchResponse(msg.data))) .fail(error => dispatch(handleFetchError(error))); - - dispatch({ type: BEGIN_FETCH, req }) - - return req } } export function handleWsMsg(msg) { - return (dispatch, getState) => { - if (msg.cmd !== StoreCmds.RESET) { - return dispatch({ type: RECV_WS_MSG, cmd: msg.cmd, data: msg.data }) - } - const req = getState().settings.req - if (req) { - req.abort() - } - dispatch(reset(msg.data)) - } + return { type: RECV_WS_MSG, cmd: msg.cmd, data: msg.data } } export function handleFetchResponse(data) { return { type: FETCHED, data } } -export function reset(data) { - return { type: RESET, data } -} - export function handleFetchError(error) { - return (dispatch, getState) => { - dispatch(addLogEntry(error.stack || error.message || error)) - dispatch({ type: FETCH_ERROR, error }) - } + // @todo let eventLog subscribe to SettingsActions.FETCH_ERROR + return addLogEntry(error.stack || error.message || error) } -- cgit v1.2.3 From ce53799c623a8ac74631f6fc4ab8fb134bff1cc8 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Fri, 17 Jun 2016 21:03:19 -0700 Subject: simplify settings reducer --- web/src/js/ducks/settings.js | 96 ++++++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 44 deletions(-) (limited to 'web/src/js/ducks') 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 + } } -- cgit v1.2.3 From f203936fbf51b04f424666f9d2dd63bce8c84404 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Fri, 17 Jun 2016 21:06:17 -0700 Subject: add setInterceptPattern action creator --- web/src/js/ducks/settings.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'web/src/js/ducks') diff --git a/web/src/js/ducks/settings.js b/web/src/js/ducks/settings.js index 479d1300..73c62120 100644 --- a/web/src/js/ducks/settings.js +++ b/web/src/js/ducks/settings.js @@ -70,3 +70,8 @@ export function fetchSettings() { // TODO: Error handling } } + +export function setInterceptPattern(intercept) { + return dispatch => + fetchApi.put("/settings", {intercept}) +} -- cgit v1.2.3