github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 02:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle loading message for empty topos correctly.

Browse Source 
It was showing infinite loading...
This commit is contained in:
Simon Howe
2016-05-12 13:00:38 +02:00
parent 5df5e402f3
commit 04f4071fd3
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/app/scripts/actions/app-actions.js
View File

@@ -468,6 +468,8 @@ export function receiveNodeDetails(details) {
export function receiveNodesDelta(delta) {
return (dispatch, getState) => {
dispatch({ type: ActionTypes.SET_RECEIVED_NODES_DELTA });
if (delta.add || delta.update || delta.remove) {
const state = getState();
if (state.get('updatePausedAt') !== null) {

1
client/app/scripts/constants/action-types.js
View File

@@ -54,6 +54,7 @@ const ACTION_TYPES = [
'PIN_NETWORK',
'UNPIN_NETWORK',
'SHOW_NETWORKS',
'SET_RECEIVED_NODES_DELTA',
];
export default _.zipObject(ACTION_TYPES, ACTION_TYPES);

16
client/app/scripts/reducers/root.js
View File

@@ -10,7 +10,6 @@ import { getNetworkNodes, getAvailableNetworks } from '../utils/network-view-uti
import { findTopologyById, getAdjacentNodes, setTopologyUrlsById,
updateTopologyIds, filterHiddenTopologies } from '../utils/topology-utils';
const log = debug('scope:app-store');
const error = debug('scope:error');
// Helpers
@@ -481,18 +480,11 @@ export function rootReducer(state = initialState, action) {
return state;
}
case ActionTypes.SET_RECEIVED_NODES_DELTA: {
return state.set('nodesLoaded', true);
}
case ActionTypes.RECEIVE_NODES_DELTA: {
const emptyMessage = !action.delta.add && !action.delta.remove
&& !action.delta.update;
state = state.set('nodesLoaded', true);
if (!emptyMessage) {
log('RECEIVE_NODES_DELTA',
'remove', _.size(action.delta.remove),
'update', _.size(action.delta.update),
'add', _.size(action.delta.add));
}
state = state.set('errorUrl', null);
// nodes that no longer exist