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/04/15 03:06:14 UTC
[incubator-skywalking-ui] branch 5.0.0/beta updated (b67524a ->
18e76fa)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch 5.0.0/beta
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git.
from b67524a Fix typo
new d4a0ee8 Refactor Trace search form
new 18e76fa Add TraceList component
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
mock/trace.js | 2 +-
src/routes/Trace/Trace.js | 35 ++++++++++++++++++-----------------
2 files changed, 19 insertions(+), 18 deletions(-)
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.
[incubator-skywalking-ui] 01/02: Refactor Trace search form
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch 5.0.0/beta
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit d4a0ee8c4955c06f924a139b09b7037a38beffee
Author: gaohongtao <ha...@gmail.com>
AuthorDate: Sat Apr 14 08:42:37 2018 +0800
Refactor Trace search form
---
src/routes/Trace/Trace.js | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/routes/Trace/Trace.js b/src/routes/Trace/Trace.js
index f86737c..75e55ec 100644
--- a/src/routes/Trace/Trace.js
+++ b/src/routes/Trace/Trace.js
@@ -127,8 +127,8 @@ export default class Trace extends PureComponent {
const { trace: { variables: { options } } } = this.props;
return (
<Form onSubmit={this.handleSearch} layout="inline">
- <Row gutter={{ md: 8, lg: 12, xl: 8 }}>
- <Col xl={4} lg={12} sm={24}>
+ <Row gutter={{ md: 8, lg: 12, xl: 24 }}>
+ <Col xl={8} lg={24} sm={24}>
<FormItem label="Application">
{getFieldDecorator('applicationId')(
<Select placeholder="All application" style={{ width: '100%' }}>
@@ -142,27 +142,31 @@ export default class Trace extends PureComponent {
)}
</FormItem>
</Col>
- <Col xl={4} lg={12} sm={24}>
+ <Col xl={16} lg={24} sm={24}>
+ <FormItem label="OperationName">
+ {getFieldDecorator('operationName')(
+ <Input placeholder="eg Kafka/Trace-topic-1/Consumer" />
+ )}
+ </FormItem>
+ </Col>
+ <Col xl={8} lg={24} sm={24}>
<FormItem label="TraceId">
{getFieldDecorator('traceId')(
- <Input placeholder="Input trace id" />
+ <Input placeholder="eg 3.84.15204769998380001" />
)}
</FormItem>
</Col>
<Col xl={6} lg={12} sm={24}>
- <FormItem label="OperationName">
- {getFieldDecorator('operationName')(
- <Input placeholder="Input operation name" />
+ <FormItem label="Min Duration">
+ {getFieldDecorator('minTraceDuration')(
+ <InputNumber placeholder="eg 100,500" style={{ width: 150 }} />
)}
</FormItem>
</Col>
<Col xl={6} lg={12} sm={24}>
- <FormItem label="DurationRange">
- {getFieldDecorator('minTraceDuration')(
- <InputNumber style={{ width: '40%' }} />
- )}~
+ <FormItem label="Max Duration">
{getFieldDecorator('maxTraceDuration')(
- <InputNumber style={{ width: '40%' }} />
+ <InputNumber placeholder="eg 5000" style={{ width: 150 }} />
)}
</FormItem>
</Col>
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.
[incubator-skywalking-ui] 02/02: Add TraceList component
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch 5.0.0/beta
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit 18e76fa3795cbd0c3063fb9f41acc94123237bb0
Author: gaohongtao <ha...@gmail.com>
AuthorDate: Sun Apr 15 11:04:02 2018 +0800
Add TraceList component
Features:
Response time line chart
Trace id tags
---
mock/trace.js | 2 +-
src/routes/Trace/Trace.js | 7 ++-----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/mock/trace.js b/mock/trace.js
index 06f955c..dc24744 100644
--- a/mock/trace.js
+++ b/mock/trace.js
@@ -35,7 +35,7 @@ export default {
queryBasicTraces: {
'traces|10': [{
key: '@id',
- operationName: '@url',
+ operationName: '@url(200)',
duration: '@natural(100, 1000)',
start: new Date().getTime(),
'isError|1': true,
diff --git a/src/routes/Trace/Trace.js b/src/routes/Trace/Trace.js
index 75e55ec..3df4a87 100644
--- a/src/routes/Trace/Trace.js
+++ b/src/routes/Trace/Trace.js
@@ -19,7 +19,7 @@
import React, { PureComponent } from 'react';
import { connect } from 'dva';
import { Row, Col, Form, Input, Select, Button, Card, InputNumber } from 'antd';
-import TraceTable from '../../components/TraceTable';
+import TraceList from '../../components/Trace/TraceList';
import { Panel } from '../../components/Page';
import styles from './Trace.less';
@@ -192,12 +192,9 @@ export default class Trace extends PureComponent {
globalVariables={this.props.globalVariables}
onChange={this.handleChange}
>
- <TraceTable
+ <TraceList
loading={loading}
data={queryBasicTraces.traces}
- pagination={{ ...values.paging, total: queryBasicTraces.total }}
- onChange={this.handleTableChange}
- onExpand={this.handleTableExpand}
/>
</Panel>
</div>
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.