web: reduxify event log store

5 files changed, 48 insertions, 26 deletions

diff --git a/web/src/js/ducks/eventLog.js b/web/src/js/ducks/eventLog.js
index 5bae252a..2040711c 100644
--- a/web/src/js/ducks/eventLog.js
+++ b/web/src/js/ducks/eventLog.js
@@ -1,5 +1,7 @@
+import getList, {ADD} from "./list"
 const TOGGLE_FILTER = 'TOGGLE_EVENTLOG_FILTER'
 const TOGGLE_VISIBILITY = 'TOGGLE_EVENTLOG_VISIBILITY'
+const UPDATE_LIST = "UPDATE_EVENTLOG"
 
 
 const defaultState = {
@@ -8,23 +10,35 @@ const defaultState = {
         "debug": false,
         "info": true,
         "web": true
-    }
+    },
+    events: getList(),
+    filteredEvents: [],
 }
+
 export default function reducer(state = defaultState, action) {
     switch (action.type) {
         case TOGGLE_FILTER:
+            const filter = {
+                ...state.filter,
+                [action.filter]: !state.filter[action.filter]
+            }
             return {
                 ...state,
-                filter: {
-                    ...state.filter,
-                    [action.filter]: !state.filter[action.filter]
-                }
+                filter,
+                filteredEvents: state.events.list.filter(x => filter[x.level])
             }
         case TOGGLE_VISIBILITY:
             return {
                 ...state,
                 visible: !state.visible
             }
+        case UPDATE_LIST:
+            const events = getList(state.events, action)
+            return {
+                ...state,
+                events,
+                filteredEvents: events.list.filter(x => state.filter[x.level])
+            }
         default:
             return state
     }
@@ -36,4 +50,12 @@ export function toggleEventLogFilter(filter) {
 }
 export function toggleEventLogVisibility() {
     return {type: TOGGLE_VISIBILITY}
+}
+let id = 0;
+export function addLogEntry(message, level = "web") {
+    return {
+        type: UPDATE_LIST,
+        cmd: ADD,
+        data: {message, level, id: `log-${id++}`}
+    }
 }
\ No newline at end of file
diff --git a/web/src/js/ducks/flows.js b/web/src/js/ducks/flows.js
deleted file mode 100644
index c4077f7a..00000000
--- a/web/src/js/ducks/flows.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const defaultState = {
-    list: [],
-    isFetching: false,
-    updateBeforeFetch: [],
-    byId: {},
-    indexOf: {},
-    views: {}
-}
-
-export default function reducer(state = defaultState, action) {
-    switch (action.type) {
-        default:
-            return state
-    }
-}
diff --git a/web/src/js/ducks/index.js b/web/src/js/ducks/index.js
index 0074bda4..3043344c 100644
--- a/web/src/js/ducks/index.js
+++ b/web/src/js/ducks/index.js
@@ -1,11 +1,9 @@
 import {combineReducers} from 'redux'
 import eventLog from './eventLog.js'
 import websocket from './websocket.js'
-import flows from './flows.js'
 
 const rootReducer = combineReducers({
     eventLog,
-    flows,
     websocket,
 })
 
diff --git a/web/src/js/ducks/list.js b/web/src/js/ducks/list.js
new file mode 100644
index 00000000..0b3771e2
--- /dev/null
+++ b/web/src/js/ducks/list.js
@@ -0,0 +1,21 @@
+export const ADD = 'add'
+
+const defaultState = {
+    list: [],
+    //isFetching: false,
+    //updateBeforeFetch: [],
+    indexOf: {},
+    //views: {}
+};
+
+export default function getList(state = defaultState, action = {}) {
+    switch (action.cmd) {
+        case ADD:
+            return {
+                list: [...state.list, action.data],
+                indexOf: {...state.indexOf, [action.data.id]: state.list.length},
+            }
+        default:
+            return state
+    }
+}
\ No newline at end of file
diff --git a/web/src/js/ducks/websocket.js b/web/src/js/ducks/websocket.js
index 281d1f2c..3999dbcf 100644
--- a/web/src/js/ducks/websocket.js
+++ b/web/src/js/ducks/websocket.js
@@ -1,6 +1,5 @@
 const CONNECTED = 'WEBSOCKET_CONNECTED'
 const DISCONNECTED = 'WEBSOCKET_DISCONNECTED'
-const RECEIVE_MESSAGE = 'RECEIVE_WEBSOCKET_MESSAGE'
 
 
 const defaultState = {
@@ -28,7 +27,4 @@ export function connected() {
 }
 export function disconnected() {
     return {type: DISCONNECTED}
-}
-export function receiveMessage(message) {
-    return {type: RECEIVE_MESSAGE, message}
 }
\ No newline at end of file