You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2019/12/11 05:50:45 UTC
[skywalking-rocketbot-ui] branch master updated: Add Armeria logo
and fix npm warning (#227)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-rocketbot-ui.git
The following commit(s) were added to refs/heads/master by this push:
new b08b723 Add Armeria logo and fix npm warning (#227)
b08b723 is described below
commit b08b723030fa45ada4063c188eef4e84aa4ae6f3
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Wed Dec 11 13:50:39 2019 +0800
Add Armeria logo and fix npm warning (#227)
* Add Armeria logo and fix npm warning
* Only trigger builds on pr and master push
---
.github/workflows/nodejs.yml | 6 +++++-
src/views/components/topology/assets/ARMERIA.png | Bin 0 -> 10116 bytes
src/views/components/topology/topo.vue | 1 +
src/views/components/trace/trace-search.vue | 4 ++--
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 5925949..920861f 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -1,6 +1,10 @@
name: Node CI
-on: [push, pull_request]
+on:
+ pull_request:
+ push:
+ branches:
+ - master
jobs:
build:
diff --git a/src/views/components/topology/assets/ARMERIA.png b/src/views/components/topology/assets/ARMERIA.png
new file mode 100644
index 0000000..30b0634
Binary files /dev/null and b/src/views/components/topology/assets/ARMERIA.png differ
diff --git a/src/views/components/topology/topo.vue b/src/views/components/topology/topo.vue
index c9bb4f5..2a7fb8f 100644
--- a/src/views/components/topology/topo.vue
+++ b/src/views/components/topology/topo.vue
@@ -45,6 +45,7 @@ export default {
data() {
return {
LOCAL: require('./assets/Local2.png'),
+ ARMERIA: require('./assets/ARMERIA.png'),
CUBE: require('./assets/cube22.png'),
CUBEERROR: require('./assets/cube21.png'),
USER: require('./assets/USER.png'),
diff --git a/src/views/components/trace/trace-search.vue b/src/views/components/trace/trace-search.vue
index 3c23b94..80f55aa 100644
--- a/src/views/components/trace/trace-search.vue
+++ b/src/views/components/trace/trace-search.vue
@@ -236,8 +236,8 @@
}
private created() {
- this.endpointName = this.$route.query.endpointname? this.$route.query.endpointname.toString() : this.endpointName;
- this.traceId = this.$route.query.traceid? this.$route.query.traceid.toString() : this.traceId;
+ this.endpointName = this.$route.query.endpointname ? this.$route.query.endpointname.toString() : this.endpointName;
+ this.traceId = this.$route.query.traceid ? this.$route.query.traceid.toString() : this.traceId;
this.time = [this.rocketbotGlobal.durationRow.start, this.rocketbotGlobal.durationRow.end];
}