This is an automated email from the ASF dual-hosted git repository. hanahmily pushed a commit to branch fix/bugs in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit 5e3991ff31a7f887b2a190b301d7f024266ceb98 Author: gaohongtao <[email protected]> AuthorDate: Sun Mar 4 20:30:35 2018 +0800 Amend sankey map issue --- mock/service.js | 2 +- src/routes/Server/Server.js | 2 +- src/routes/Service/Service.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mock/service.js b/mock/service.js index f2eefc9..7876ad7 100644 --- a/mock/service.js +++ b/mock/service.js @@ -69,7 +69,7 @@ export default { target: 1, 'isAlert|1': true, 'callType|1': ['rpc', 'http', 'dubbo'], - 'callsPerSec|0-2000': 1, + 'callsPerSec|0-1': 1, 'avgResponseTime|500-5000': 1, }))).concat(downNodes.nodes.map(node => (mockjs.mock({ source: 1, diff --git a/src/routes/Server/Server.js b/src/routes/Server/Server.js index 0b7ace9..7ff19cd 100644 --- a/src/routes/Server/Server.js +++ b/src/routes/Server/Server.js @@ -48,7 +48,7 @@ export default class Server extends PureComponent { }); } avg = list => (list.length > 0 ? - (list.reduce((acc, curr) => acc + curr) / list.length).toFixed(2) : 0) + parseFloat((list.reduce((acc, curr) => acc + curr) / list.length).toFixed(2)) : 0) bytesToMB = list => list.map(_ => parseFloat((_ / (1024 ** 2)).toFixed(2))) render() { const { form, duration, server } = this.props; diff --git a/src/routes/Service/Service.js b/src/routes/Service/Service.js index ac0a3aa..a13ed60 100644 --- a/src/routes/Service/Service.js +++ b/src/routes/Service/Service.js @@ -57,8 +57,8 @@ export default class Service extends PureComponent { }); const nData = { nodes: data.nodes, - edges: data.calls.filter(_ => _.callsPerSec * _.avgResponseTime > 0).map(_ => - ({ ..._, value: _.callsPerSec * _.avgResponseTime, source: nodesMap.get(`${_.source}`), target: nodesMap.get(`${_.target}`) })), + edges: data.calls.map(_ => + ({ ..._, value: (_.callsPerSec < 1 ? 1000 : _.callsPerSec * _.avgResponseTime), source: nodesMap.get(`${_.source}`), target: nodesMap.get(`${_.target}`) })), }; return ( <Row gutter={24}> @@ -72,7 +72,7 @@ export default class Service extends PureComponent { edgeTooltip={['target*source*callsPerSec*avgResponseTime*isAlert', (target, source, callsPerSec, avgResponseTime) => { return { name: `${source.name} to ${target.name} </span>`, - value: `${callsPerSec} calls/s ${avgResponseTime}ms`, + value: `${callsPerSec < 1 ? '<1' : callsPerSec} calls/s ${avgResponseTime}ms`, }; }]} edgeColor={['isAlert', isAlert => (isAlert ? '#DC143C' : '#bbb')]} -- To stop receiving notification emails like this one, please contact [email protected].
