chrismattmann closed pull request #149: Second update on feedbacks
URL: https://github.com/apache/drat/pull/149
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/webapps/proteus-new/src/main/webapp/resources/public/index.html
b/webapps/proteus-new/src/main/webapp/resources/public/index.html
index 3bd39e51..d2ea7e56 100644
--- a/webapps/proteus-new/src/main/webapp/resources/public/index.html
+++ b/webapps/proteus-new/src/main/webapp/resources/public/index.html
@@ -10,7 +10,7 @@
- proteus
+ Proteus
diff --git a/webapps/proteus-new/src/main/webapp/resources/src/App.vue
b/webapps/proteus-new/src/main/webapp/resources/src/App.vue
index 0e902e4a..d071508f 100644
--- a/webapps/proteus-new/src/main/webapp/resources/src/App.vue
+++ b/webapps/proteus-new/src/main/webapp/resources/src/App.vue
@@ -301,7 +301,7 @@ export default {
height: auto;
position: fixed;
bottom: 0%;
- z-index: 1000;
+ z-index: 900;
}
#logospace{
diff --git
a/webapps/proteus-new/src/main/webapp/resources/src/components/auditsummarycomp.vue
b/webapps/proteus-new/src/main/webapp/resources/src/components/auditsummarycomp.vue
index 385b75c6..e8593734 100644
---
a/webapps/proteus-new/src/main/webapp/resources/src/components/auditsummarycomp.vue
+++
b/webapps/proteus-new/src/main/webapp/resources/src/components/auditsummarycomp.vue
@@ -254,5 +254,6 @@ the License.
.auditsummarycomp {
margin-top: 5%;
+ margin-bottom: 10%;
}
diff --git
a/webapps/proteus-new/src/main/webapp/resources/src/components/barchartcomp.vue
b/webapps/proteus-new/src/main/webapp/resources/src/components/barchartcomp.vue
index 6c4a12d8..57a028d5 100644
---
a/webapps/proteus-new/src/main/webapp/resources/src/components/barchartcomp.vue
+++
b/webapps/proteus-new/src/main/webapp/resources/src/components/barchartcomp.vue
@@ -41,15 +41,19 @@ import store from './../store/store'
store,
mounted() {
this.loadData();
-setInterval(function () {
- this.loadData();
+this.timerClearvar = setInterval(function () {
+ if(this.currentState=="MAP" ||
this.currentState=="REDUCE")this.loadData();
}.bind(this), 1000);
},
+beforeDestroy(){
+ clearInterval(this.timerClearvar);
+},
data() {
return {
licenseTypes : [],
emptynote : '',
+timerClearvar:''
}
},
@@ -61,7 +65,6 @@ import store from './../store/store'
axios.get(this.origin+"/proteus/service/repo/breakdown/license")
.then(response=>{
- this.$log.info(response.data);
this.licenseTypes=response.data;
this.init();
})
@@ -72,8 +75,6 @@ import store from './../store/store'
},
init(){
-
- this.$log.info("c0");
var svg = d3.select("#barsvg"),
margin = {top: 20, right: 20, bottom: 50, left: 40},
width = +svg.attr("width") - margin.left - margin.right,
@@ -135,7 +136,7 @@ import store from './../store/store'
},
-
+
},
computed: {
@@ -148,6 +149,9 @@ import store from './../store/store'
},
origin(){
return store.state.origin;
+ },
+ currentState(){
+return store.state.currentActionStep;
}
}
}
diff --git
a/webapps/proteus-new/src/main/webapp/resources/src/components/bublechartcomp.vue
b/webapps/proteus-new/src/main/webapp/resources/src/components/bublechartcomp.vue
index d56340f1..752b91b0 100644
---
a/webapps/proteus-new/src/main/webapp/resources/src/components/bublechartcomp.vue
+++
b/webapps/proteus-new/src/main/webapp/resources/src/components/bublechartcomp.vue
@@ -37,16 +37,19 @@ the License.
props: [],
mounted() {
this.init();
- setInterval(function(){
+ this.timerClearVar = setInterval(function(){
this.init();
}.bind(this),3);
},
data() {
return {
data:[],
-
+timerClearVar:'',
}
},
+beforeDestroy(){
+ clearInterval(this.timerClearVar)
+},
methods: {
init(){
@@ -72,7 +75,6 @@ the License.
var docs = response.data.response.docs;
var resultingData = [];
- var result = [];
var mime = {};
for(var i = 0; i < docs.length; i++) {
@@ -119,7 +121,6 @@ the License.
return d.value;
})
- console.log(color);
bubble(root);
@@ -137,8 +138,8 @@ the License.
node.append("circle")
.attr("r", function(d) { return d.r; })
-