diff --git a/client/app/scripts/components/topologies.js b/client/app/scripts/components/topologies.js index d13a9e955..52abd307d 100644 --- a/client/app/scripts/components/topologies.js +++ b/client/app/scripts/components/topologies.js @@ -14,10 +14,12 @@ const Topologies = React.createClass({ renderSubTopology: function(subTopology) { const isActive = subTopology.name === this.props.currentTopology.name; const topologyId = AppStore.getTopologyIdForUrl(subTopology.url); + const title = this.renderTitle(subTopology); const className = isActive ? 'topologies-sub-item topologies-sub-item-active' : 'topologies-sub-item'; return ( -
+
{subTopology.name}
@@ -25,13 +27,16 @@ const Topologies = React.createClass({ ); }, + renderTitle: function(topology) { + return ['Nodes: ' + topology.stats.node_count, + 'Connections: ' + topology.stats.node_count].join('\n'); + }, + renderTopology: function(topology) { const isActive = topology.name === this.props.currentTopology.name; const className = isActive ? 'topologies-item-main topologies-item-main-active' : 'topologies-item-main'; const topologyId = AppStore.getTopologyIdForUrl(topology.url); - const title = ['Topology: ' + topology.name, - 'Nodes: ' + topology.stats.node_count, - 'Connections: ' + topology.stats.node_count].join('\n'); + const title = this.renderTitle(topology); return (
diff --git a/client/app/scripts/utils/web-api-utils.js b/client/app/scripts/utils/web-api-utils.js index b5d37e851..dce7160c3 100644 --- a/client/app/scripts/utils/web-api-utils.js +++ b/client/app/scripts/utils/web-api-utils.js @@ -39,50 +39,10 @@ function createWebsocket(topologyUrl) { currentUrl = topologyUrl; } - -const TOPOLOGIES = [ - { - 'name': 'Applications', - 'url': '/api/topology/applications', - 'stats': { - 'node_count': 12, - 'nonpseudo_node_count': 10, - 'edge_count': 13 - }, - 'sub_topologies': [ - { - 'name': 'by name', - 'url': '/api/topology/applications-grouped' - } - ] - }, - { - 'name': 'Containers', - 'url': '/api/topology/containers', - 'grouped_url': '/api/topology/containers-grouped', - 'stats': { - 'node_count': 2, - 'nonpseudo_node_count': 1, - 'edge_count': 2 - } - }, - { - 'name': 'Hosts', - 'url': '/api/topology/hosts', - 'stats': { - 'node_count': 2, - 'nonpseudo_node_count': 1, - 'edge_count': 2 - } - } -]; - - function getTopologies() { clearTimeout(topologyTimer); - reqwest('/api/topology', function() { - // injecting static topos - AppActions.receiveTopologies(TOPOLOGIES); + reqwest('/api/topology', function(res) { + AppActions.receiveTopologies(res); topologyTimer = setTimeout(getTopologies, 10000); }); }