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

Merge pull request #704 from weaveworks/693-no-filter-details

Browse Source 
Dont send topology options when requesting node details
This commit is contained in:
Tom Wilkie
2015-11-30 22:55:46 +09:00
parent f16db9df1a 40f504022c
commit 0c3802c29c
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,8 +23,7 @@ module.exports = {
);
WebapiUtils.getNodeDetails(
AppStore.getCurrentTopologyUrl(),
AppStore.getSelectedNodeId(),
AppStore.getActiveTopologyOptions()
AppStore.getSelectedNodeId()
);
},
@@ -43,8 +42,7 @@ module.exports = {
RouterUtils.updateRoute();
WebapiUtils.getNodeDetails(
AppStore.getCurrentTopologyUrl(),
AppStore.getSelectedNodeId(),
AppStore.getActiveTopologyOptions()
AppStore.getSelectedNodeId()
);
},
@@ -162,8 +160,7 @@ module.exports = {
);
WebapiUtils.getNodeDetails(
AppStore.getCurrentTopologyUrl(),
AppStore.getSelectedNodeId(),
AppStore.getActiveTopologyOptions()
AppStore.getSelectedNodeId()
);
},
@@ -195,8 +192,7 @@ module.exports = {
);
WebapiUtils.getNodeDetails(
AppStore.getCurrentTopologyUrl(),
AppStore.getSelectedNodeId(),
AppStore.getActiveTopologyOptions()
AppStore.getSelectedNodeId()
);
}
};

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

@@ -100,11 +100,9 @@ function getTopology(topologyUrl, options) {
}
}
function getNodeDetails(topologyUrl, nodeId, options) {
const optionsQuery = buildOptionsQuery(options);
function getNodeDetails(topologyUrl, nodeId) {
if (topologyUrl && nodeId) {
const url = [topologyUrl, '/', encodeURIComponent(nodeId), '?', optionsQuery]
const url = [topologyUrl, '/', encodeURIComponent(nodeId)]
.join('').substr(1);
reqwest({
url: url,