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

Only send filters to nodes from the current topology

Browse Source 
This reverts commit 699fe45e65.
This commit is contained in:
Alfonso Acosta
2016-10-05 15:44:13 +00:00
parent 3250b7289e
commit ffdcc2367e
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,15 +163,19 @@ export function getNodesDelta(topologyUrl, options, dispatch) {
}
}
export function getNodeDetails(topologyUrlsById, topologyOptions, nodeMap, dispatch) {
export function getNodeDetails(topologyUrlsById, currentTopologyId, options, nodeMap, dispatch) {
// get details for all opened nodes
const obj = nodeMap.last();
if (obj && topologyUrlsById.has(obj.topologyId)) {
const options = topologyOptions.get(obj.topologyId);
const topologyUrl = topologyUrlsById.get(obj.topologyId);
const optionsQuery = buildOptionsQuery(options);
const url = [topologyUrl, '/', encodeURIComponent(obj.id), '?', optionsQuery]
.join('').substr(1);
let urlComponents = [topologyUrl, '/', encodeURIComponent(obj.id)];
if (currentTopologyId === obj.topologyId) {
// Only forward filters for nodes in the current topology
const optionsQuery = buildOptionsQuery(options);
urlComponents = urlComponents.concat(['?', optionsQuery]);
}
const url = urlComponents.join('').substr(1);
reqwest({
url,
success: (res) => {