Spearhead/joyent-portal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Consul to display correctly

Browse Source
This commit is contained in:
JUDIT GRESKOVITS 2017-03-06 11:59:04 +00:00 committed by Sérgio Ramos
parent f33f91988d
commit 9cdfda0e64
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ui/src/components/topology/topology-graph.js
View File

@ -1,6 +1,7 @@
import styled from 'styled-components'; import styled from 'styled-components';
import { Baseline } from '../../shared/composers'; import { Baseline } from '../../shared/composers';
import { createSimulation, updateSimulation } from './graph-simulation'; import { createSimulation, updateSimulation } from './graph-simulation';
import Constants from './constants';
import GraphNode from './graph-node'; import GraphNode from './graph-node';
import GraphLink from './graph-link'; import GraphLink from './graph-link';
import React from 'react'; import React from 'react';
@ -24,7 +25,10 @@ let dragInfo = {
class TopologyGraph extends React.Component { class TopologyGraph extends React.Component {
componentWillMount() { componentWillMount() {
const services = this.props.services; const services = this.props.services.reduce((acc, service, index) => {
if(service.id !== 'consul') acc.push(service);
return acc;
}, []);
const simulationData = createSimulation( const simulationData = createSimulation(
services, services,
@ -59,7 +63,10 @@ class TopologyGraph extends React.Component {
links links
} = this.state; } = this.state;
const services = nextProps.services; const services = nextProps.services.reduce((acc, service, index) => {
if(service.id !== 'consul') acc.push(service);
return acc;
}, []);
// TODO this here means we'll need to evaluate whether to we have more links! // TODO this here means we'll need to evaluate whether to we have more links!
// this is tmp for the compare above // this is tmp for the compare above
@ -108,10 +115,16 @@ class TopologyGraph extends React.Component {
nodes.reduce((acc, simNode, index) => nodes.reduce((acc, simNode, index) =>
simNode.id === nodeId ? simNode : acc, {}); simNode.id === nodeId ? simNode : acc, {});
const nodesData = services.map((service, index) => ({ const nodesData = services.map((service, index) => {
const sNode = service.id === 'consul' ? {
x: svgSize.width - Constants.nodeSize.width,
y: 0
} : simNode(service.uuid);
return ({
...service, ...service,
...simNode(service.uuid) ...sNode
})); });
});
const nodeData = (nodeId) => const nodeData = (nodeId) =>
nodesData.reduce((acc, nodeData, index) => nodesData.reduce((acc, nodeData, index) =>
@ -205,7 +218,7 @@ class TopologyGraph extends React.Component {
data={n} data={n}
index={index} index={index}
onDragStart={onDragStart} onDragStart={onDragStart}
connected connected={n.id !== 'consul'}
/> />
)); ));