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 #678 from weaveworks/625-garbled-topology-options

Browse Source 
Take default topology option if missing in URL
This commit is contained in:
David
2015-11-16 15:36:34 +01:00
parent 67bf8bd07b 95b2c4f829
commit c8c1996506
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
client/app/scripts/components/topology-options.js
View File

@@ -13,11 +13,27 @@ const TopologyOptions = React.createClass({
renderOption: function(items) {
let activeText;
let activeValue;
const actions = [];
const activeOptions = this.props.activeOptions;
const topologyId = this.props.topologyId;
const option = items[0].option;
// find active option value
if (activeOptions && activeOptions.has(option)) {
activeValue = activeOptions.get(option);
} else {
// get default value
items.forEach(function(item) {
if (item.default) {
activeValue = item.value;
}
});
}
// render active option as text, add other options as actions
items.forEach(function(item) {
if (activeOptions && activeOptions.has(item.option) && activeOptions.get(item.option) === item.value) {
if (item.value === activeValue) {
activeText = item.display;
} else {
actions.push(this.renderAction(item.value, item.option, topologyId));