github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 09:41:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2390 from weaveworks/fix-resource-view-not-loading-topologies

Browse Source 
Fetch resource view topologies on first topologies load
This commit is contained in:
Filip Barl
2017-03-24 19:11:38 +01:00
committed by GitHub
parent 69fd397217 f633c6edb1
commit 32988c06d2
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -618,10 +618,14 @@ export function receiveTopologies(topologies) {
state.get('nodeDetails'),
dispatch
);
// populate search matches on first load
// Populate search matches on first load
if (firstLoad && state.get('searchQuery')) {
dispatch(focusSearch());
}
// Fetch all the relevant nodes once on first load
if (firstLoad && isResourceViewModeSelector(state)) {
getResourceViewNodesSnapshot(getState, dispatch);
}
};
}

7
client/app/scripts/utils/web-api-utils.js
View File

@@ -188,14 +188,11 @@ export function getAllNodes(getState, dispatch) {
/**
* One-time update of all the nodes of topologies that appear in the current resource view.
* TODO: Replace the one-time snapshot with periodic polling.
*/
export function getResourceViewNodesSnapshot(getState, dispatch) {
const topologyIds = layersTopologyIdsSelector(getState());
// TODO: Remove the timeout and replace it with normal polling once we figure how to make
// resource view dynamic (from the UI point of view, the challenge is to make it stable).
setTimeout(() => {
getNodesForTopologies(getState, dispatch, topologyIds);
}, 1200);
getNodesForTopologies(getState, dispatch, topologyIds);
}
export function getTopologies(options, dispatch, initialPoll) {