[incubator-skywalking-ui] branch 5.0.0/beta2 updated: Refactor trace list in Service page for mutation of Trace schema

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hanahmily pushed a commit to branch 5.0.0/beta2
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git


The following commit(s) were added to refs/heads/5.0.0/beta2 by this push:
     new 3c8015f  Refactor trace list in Service page for mutation of Trace schema
3c8015f is described below

commit 3c8015f580181b4a415fce0805f1a1f84170b8c6
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Jun 28 10:03:26 2018 +0800

    Refactor trace list in Service page for mutation of Trace schema
---
 mock/service.js               | 4 ++--
 src/models/service.js         | 4 ++--
 src/routes/Service/Service.js | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mock/service.js b/mock/service.js
index 055d739..a3a21f4 100644
--- a/mock/service.js
+++ b/mock/service.js
@@ -37,14 +37,14 @@ export default {
     res.json(mockjs.mock(
       {
         data: {
-          getTrace: () => {
+          queryBasicTraces: () => {
             let offset = 0;
             let duration = 2500;
             return mockjs.mock(
               {
                 'traces|20': [{
                   key: '@id',
-                  operationName: '200://wgmb.ev/jcknolzq',
+                  operationNames: ['200://wgmb.ev/jcknolzq'],
                   duration: () => {
                     duration -= 100;
                     return duration;
diff --git a/src/models/service.js b/src/models/service.js
index 0d47fbe..777c8a3 100644
--- a/src/models/service.js
+++ b/src/models/service.js
@@ -39,7 +39,7 @@ const dataQuery = `
     getServiceSLATrend(serviceId: $serviceId, duration: $duration) {
       trendList
     }
-    getTrace(condition: $traceCondition) {
+    queryBasicTraces(condition: $traceCondition) {
       traces {
         key: segmentId
         operationName
@@ -127,7 +127,7 @@ export default generateModal({
       nodes: [],
       calls: [],
     },
-    getTrace: {
+    queryBasicTraces: {
       traces: [],
       total: 0,
     },
diff --git a/src/routes/Service/Service.js b/src/routes/Service/Service.js
index de04082..cabe194 100644
--- a/src/routes/Service/Service.js
+++ b/src/routes/Service/Service.js
@@ -111,6 +111,8 @@ export default class Service extends PureComponent {
           applicationId: values.applicationId,
           operationName: serviceName,
           queryDuration: variables.duration,
+          traceState: 'ALL',
+          queryOrder: 'BY_DURATION',
           paging: {
             pageNum: 1,
             pageSize: 20,
@@ -137,7 +139,7 @@ export default class Service extends PureComponent {
     const { service, duration } = this.props;
     const { variables: { values }, data } = service;
     const { getServiceResponseTimeTrend, getServiceThroughputTrend,
-      getServiceSLATrend, getServiceTopology, getTrace } = data;
+      getServiceSLATrend, getServiceTopology, queryBasicTraces } = data;
     if (!values.serviceId) {
       return null;
     }
@@ -191,7 +193,7 @@ export default class Service extends PureComponent {
               title="Top 20 Slow Traces"
             >
               <TraceList
-                data={getTrace.traces}
+                data={queryBasicTraces.traces}
                 onClickTraceTag={this.handleShowTrace}
                 loading={this.props.loading}
               />