From f392b8e34cae2d985c500ddc26a93c8f620a6f57 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 24 Jun 2016 01:20:42 +0800 Subject: [web] bug fix --- web/src/js/ducks/eventLog.js | 2 +- web/src/js/ducks/views/main.js | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'web/src/js/ducks') diff --git a/web/src/js/ducks/eventLog.js b/web/src/js/ducks/eventLog.js index 7a4f2d5e..0c875689 100644 --- a/web/src/js/ducks/eventLog.js +++ b/web/src/js/ducks/eventLog.js @@ -3,7 +3,7 @@ import reduceList, * as listActions from './utils/list' import reduceView, * as viewActions from './utils/view' import * as websocketActions from './websocket' -export const WS_MSG_TYPE = 'UPDATE_LOG' +export const WS_MSG_TYPE = 'UPDATE_EVENTLOG' export const ADD = 'EVENTLOG_ADD' export const REQUEST = 'EVENTLOG_REQUEST' diff --git a/web/src/js/ducks/views/main.js b/web/src/js/ducks/views/main.js index 3bcbdd01..74dc2606 100755 --- a/web/src/js/ducks/views/main.js +++ b/web/src/js/ducks/views/main.js @@ -1,4 +1,5 @@ -import reduceView, * as viewActions from '../utils/list' +import { RequestUtils } from '../../flow/utils' +import reduceView, * as viewActions from '../utils/view' import * as viewsActions from '../views' export const UPDATE_FILTER = 'FLOW_VIEWS_MAIN_UPDATE_FILTER' @@ -170,13 +171,16 @@ export function select(id) { * @private */ function makeFilter(filter) { - return filter && Filt.parse(filter) + if (!filter) { + return + } + return Filt.parse(filter) } /** * @private */ -function makeSorter(column, desc) { +function makeSorter({ column, desc }) { const sortKeyFun = sortKeyFuns[column] if (!sortKeyFun) { return -- cgit v1.2.3