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

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

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

@@ -170,7 +170,8 @@ export function changeTopologyOption(option, value, topologyId) {
);
getNodeDetails(
state.get('topologyUrlsById'),
state.get('topologyOptions'),
state.get('currentTopologyId'),
getActiveTopologyOptions(state),
state.get('nodeDetails'),
dispatch
);
@@ -261,7 +262,8 @@ export function clickNode(nodeId, label, origin) {
const state = getState();
getNodeDetails(
state.get('topologyUrlsById'),
state.get('topologyOptions'),
state.get('currentTopologyId'),
getActiveTopologyOptions(state),
state.get('nodeDetails'),
dispatch
);
@@ -287,7 +289,8 @@ export function clickRelative(nodeId, topologyId, label, origin) {
const state = getState();
getNodeDetails(
state.get('topologyUrlsById'),
state.get('topologyOptions'),
state.get('currentTopologyId'),
getActiveTopologyOptions(state),
state.get('nodeDetails'),
dispatch
);
@@ -546,7 +549,8 @@ export function receiveTopologies(topologies) {
);
getNodeDetails(
state.get('topologyUrlsById'),
state.get('topologyOptions'),
state.get('currentTopologyId'),
getActiveTopologyOptions(state),
state.get('nodeDetails'),
dispatch
);
@@ -649,7 +653,8 @@ export function route(urlState) {
);
getNodeDetails(
state.get('topologyUrlsById'),
state.get('topologyOptions'),
state.get('currentTopologyId'),
getActiveTopologyOptions(state),
state.get('nodeDetails'),
dispatch
);

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) => {