[incubator-skywalking-ui] branch master updated: fix Field 'name' in type 'AppServerInfo' is undefined error in javascript (#154)

[hanahmily]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 2c5f234  fix Field 'name' in type 'AppServerInfo' is undefined error 
in javascript (#154)
2c5f234 is described below

commit 2c5f234f73c129e4b6990e4918409b1b884fd373
Author: lican <295198...@qq.com>
AuthorDate: Sun Apr 8 09:28:59 2018 +0800

    fix Field 'name' in type 'AppServerInfo' is undefined error in javascript 
(#154)
    
    * name_2_osName_fix
    
    * name_2_osName_fix_2
    
    * name_2_osName_fix_2_also fix
---
 src/models/application.js   | 2 +-
 src/routes/Server/Server.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/models/application.js b/src/models/application.js
index 26b8fee..67a109a 100644
--- a/src/models/application.js
+++ b/src/models/application.js
@@ -36,7 +36,7 @@ const dataQuery = `
     }
     getServerThroughput(applicationId: $applicationId, duration: $duration, 
topN: 10) {
       key: id
-      name
+      osName
       callsPerSec
     }
     getApplicationTopology(applicationId: $applicationId, duration: $duration) 
{
diff --git a/src/routes/Server/Server.js b/src/routes/Server/Server.js
index c176fb7..6469c79 100644
--- a/src/routes/Server/Server.js
+++ b/src/routes/Server/Server.js
@@ -87,7 +87,7 @@ export default class Server extends PureComponent {
                   query SearchServer($keyword: String!, $duration: Duration!) {
                     searchServer(keyword: $keyword, duration: $duration) {
                       key: id
-                      name
+                      osName
                       host
                       pid
                       ipv4
@@ -111,7 +111,7 @@ export default class Server extends PureComponent {
               <Description term="Host Name">{serverInfo.host}</Description>
               <Description term="IPv4">{serverInfo.ipv4 ? 
serverInfo.ipv4.join() : ''}</Description>
               <Description term="Process Id">{serverInfo.pid}</Description>
-              <Description term="OS">{serverInfo.name}</Description>
+              <Description term="OS">{serverInfo.osName}</Description>
             </DescriptionList>
           </Card>
           <Row gutter={24}>

-- 
To stop receiving notification emails like this one, please contact
hanahm...@apache.org.