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

Merge pull request #1893 from weaveworks/1880-fixes-ui-hang-on-absent-topo

Browse Source 
Fixes UI hanging if currentTopology no longer exists for some reason
This commit is contained in:
David
2016-09-27 11:35:44 -07:00
committed by GitHub
parent b130f1ba13 b2837c21e8
commit d80b2ef900
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -606,7 +606,8 @@ export function rootReducer(state = initialState, action) {
state = state.set('errorUrl', null);
state = state.update('topologyUrlsById', topologyUrlsById => topologyUrlsById.clear());
state = processTopologies(state, action.topologies);
if (!state.get('currentTopologyId')) {
const currentTopologyId = state.get('currentTopologyId');
if (!currentTopologyId || !findTopologyById(state.get('topologies'), currentTopologyId)) {
state = state.set('currentTopologyId', getDefaultTopology(state.get('topologies')));
log(`Set currentTopologyId to ${state.get('currentTopologyId')}`);
}