hanahmily closed pull request #154: fix Field 'name' in type 'AppServerInfo' is
undefined error in javascript
URL: https://github.com/apache/incubator-skywalking-ui/pull/154
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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}>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
