You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by ha...@apache.org on 2018/03/05 00:53:39 UTC
[incubator-skywalking-ui] 01/01: Merge from master
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch fix/e2e
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit 4d5557e79ce6153275b95cd6bb78dee8f9d118b3
Merge: 2ef1aa3 8655c0d
Author: hanahmily <ha...@gmail.com>
AuthorDate: Mon Mar 5 08:48:20 2018 +0800
Merge from master
.gitignore | 5 +-
mock/application.js | 12 ++--
mock/server.js | 10 ++--
mock/service.js | 14 ++---
mock/topology.js | 14 ++---
mock/trace.js | 7 +++
src/components/Charts/Area/index.js | 8 ++-
src/components/Charts/Sankey/index.js | 106 +++++++++++++++++++++++++++++++++
src/components/Charts/equal.js | 17 ------
src/components/Charts/index.js | 2 +
src/components/Page/Search/index.js | 7 ++-
src/components/Topology/AppTopology.js | 14 +++--
src/components/TraceStack/index.js | 2 +-
src/components/TraceTable/index.js | 4 +-
src/routes/Server/Server.js | 19 +++---
src/routes/Service/Service.js | 50 ++++++++++++----
16 files changed, 212 insertions(+), 79 deletions(-)
diff --cc src/components/TraceTable/index.js
index 07f574c,8279935..8b66c2b
--- a/src/components/TraceTable/index.js
+++ b/src/components/TraceTable/index.js
@@@ -63,11 -22,12 +63,11 @@@ class TraceTable extends PureComponent
},
{
title: 'State',
- dataIndex: 'isError',
render: (text, record) => {
if (record.isError) {
- return <Badge status="success" text="Success" />;
- } else {
- return 'Error';
+ return <Badge status="error" text="Error" />;
+ } else {
- return 'Success';
++ return <Badge status="success" text="Success" />;
}
},
},
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.