[web] update eventlog

1 files changed, 103 insertions, 53 deletions

diff --git a/web/src/js/ducks/eventLog.js b/web/src/js/ducks/eventLog.js
index 44b67b2c..1c4cbfe4 100644
--- a/web/src/js/ducks/eventLog.js
+++ b/web/src/js/ducks/eventLog.js
@@ -1,80 +1,130 @@
-import makeList from "./utils/list"
-import {updateViewFilter, updateViewList} from "./utils/view"
-
-const TOGGLE_FILTER = 'TOGGLE_EVENTLOG_FILTER'
-const TOGGLE_VISIBILITY = 'TOGGLE_EVENTLOG_VISIBILITY'
-export const UPDATE_LOG = "UPDATE_EVENTLOG"
-
-const {
-    reduceList,
-    updateList,
-    fetchList,
-    addItem,
-} = makeList(UPDATE_LOG, "/events")
+import { fetchApi as fetch } from '../utils'
+import reduceList, * as listActions from './utils/list'
 
+export const TOGGLE_FILTER = 'EVENTLOG_TOGGLE_FILTER'
+export const TOGGLE_VISIBILITY = 'EVENTLOG_TOGGLE_VISIBILITY'
+export const ADD = 'EVENTLOG_ADD'
+export const UPDATE = 'EVENTLOG_UPDATE'
+export const REQUEST = 'EVENTLOG_REQUEST'
+export const RECEIVE = 'EVENTLOG_RECEIVE'
+export const ERROR = 'EVENTLOG_ERROR'
 
 const defaultState = {
     visible: false,
-    filter: {
-        "debug": false,
-        "info": true,
-        "web": true
-    },
-    events: reduceList(),
-    filteredEvents: [],
+    filters: { debug: false, info: true, web: true },
+    list: reduceList()
 }
 
-export default function reducer(state = defaultState, action) {
+export default function reduce(state = defaultState, action) {
     switch (action.type) {
+
+        case TOGGLE_VISIBILITY:
+            return { ...state, visible: !state.visible }
+
         case TOGGLE_FILTER:
-            const filter = {
-                ...state.filter,
-                [action.filter]: !state.filter[action.filter]
+            const filters = { ...state.filters, [action.filter]: !state.filters[action.filter] }
+            return {
+                ...state,
+                filters,
+                list: reduceList(state.list, listActions.updateFilter(e => filters[e.level]))
             }
+
+        case ADD:
             return {
                 ...state,
-                filter,
-                filteredEvents: updateViewFilter(
-                    state.events,
-                    x => filter[x.level]
-                )
+                list: reduceList(state.list, listActions.add({ message: action.message, level: action.level }))
             }
-        case TOGGLE_VISIBILITY:
+
+        case UPDATE:
             return {
                 ...state,
-                visible: !state.visible
+                list: reduceList(state.list, listActions.update(action))
             }
-        case UPDATE_LOG:
-            const events = reduceList(state.events, action)
+
+        case RECEIVE:
             return {
                 ...state,
-                events,
-                filteredEvents: updateViewList(
-                    state.filteredEvents,
-                    state.events,
-                    events,
-                    action,
-                    x => state.filter[x.level]
-                )
+                list: reduceList(state.list, listActions.reset(action.list))
             }
+
         default:
             return state
     }
 }
 
+/**
+ * @public
+ */
+export function toggleFilter(filter) {
+    return { type: TOGGLE_FILTER, filter }
+}
+
+/**
+ * @public
+ *
+ * @todo move to ui?
+ */
+export function toggleVisibility() {
+    return { type: TOGGLE_VISIBILITY }
+}
+
+/**
+ * @public
+ */
+export function add(message, level = 'web') {
+    return { type: ADD, message, level }
+}
+
+/**
+ * This action creater takes all WebSocket events
+ *
+ * @public websocket
+ */
+export function handleWsMsg(msg) {
+    if (msg.cmd === WS_CMD_RESET) {
+        return fetch()
+    }
+    return update(msg.cmd, msg.data)
+}
+
+/**
+ * @private
+ */
+export function update(cmd, data) {
+    return { type: UPDATE, cmd, data }
+}
+
+/**
+ * @private
+ */
+export function fetch() {
+    return dispatch => {
+        dispatch(request())
 
-export function toggleEventLogFilter(filter) {
-    return {type: TOGGLE_FILTER, filter}
+        return fetch('/events')
+            .then(res => res.json())
+            .then(json =>  dispatch(receive(json.data)))
+            .catch(error => dispatch(fetchError(error)))
+    }
 }
-export function toggleEventLogVisibility() {
-    return {type: TOGGLE_VISIBILITY}
+
+/**
+ * @private
+ */
+export function request() {
+    return { type: REQUEST }
 }
-let id = 0
-export function addLogEntry(message, level = "web") {
-    return addItem({
-        message,
-        level,
-        id: `log-${id++}`
-    })
+
+/**
+ * @private
+ */
+export function receive(list) {
+    return { type: RECEIVE, list }
+}
+
+/**
+ * @private
+ */
+export function fetchError(error) {
+    return { type: FETCH_ERROR, error }
 }
-export {updateList as updateLogEntries, fetchList as fetchLogEntries}
\ No newline at end of file