Feature/sonar update6.7 lts

src/allProjects/stats.controller.js

@@ -5,5 +5,13 @@ controller('sonarStatsCtrl', sonarStatsCtrl);
 
 function sonarStatsCtrl(data){
   var vm = this;
-  vm.data = data;
+  if (data){
+    if (data.support){
+      vm.support = data;
+    }else{
+      vm.data = data;
+    }
+  }
+
+
 }

src/allProjects/view.html

@@ -28,15 +28,19 @@
 
 <div>
   <div class="sonar-content col-md-12">
-    <div class="col-md-12 linesOfCode">
+
+    <div ng-if="vm.data.linesOfCode" class="col-md-12 linesOfCode">
       <span class="glyphicon glyphicon-pencil linesOfCodePencil"></span>
       <h1>{{(vm.data.linesOfCode | number)||0}}</h1>
       <h4>Lines of code</h4>
     </div>
-    <div class="col-md-12 coverage">
+    <div ng-if="vm.data.linesOfCode" class="col-md-12 coverage">
       <span class="glyphicon glyphicon-tasks coverageTask"></span>
       <h1>{{(vm.data.coverage | number:2)||0}}%</h1>
       <h4>Average test coverage</h4>
     </div>
   </div>
+  <div class="alert alert-warning" ng-if="vm.support">
+    {{vm.support.message}}
+  </div>
 </div>

src/chart/lineChart.controller.js

@@ -6,10 +6,9 @@ sonarADFWidget.
 function sonarLineChart(data, METRIC_NAMES) {
   //initialize controller variable
   var vm = this;
-  if (data) {
-    vm.chart = createChart();
+  if (data != "Please Setup the Widget"){
+      vm.chart = createChart();
   }
-
   function createChart() {
     var options = {
         legend:{
@@ -32,7 +31,6 @@ function sonarLineChart(data, METRIC_NAMES) {
     }
 
     chart.labels = data[0].dates;
-
     return chart;
   }
 }

src/chart/view.html

@@ -1,8 +1,11 @@
 <div class="alert alert-info" ng-if="!vm.chart">
   Please configure the widget
 </div>
+
 <div ng-if="vm.chart">
   <canvas id="line" class="chart chart-line" chart-data="vm.chart.data" chart-labels="vm.chart.labels" chart-series="vm.chart.series"
     chart-options="vm.chart.options">
   </canvas>
-</div
+</div>
+
+

src/compare/compare.controller.js

@@ -2,12 +2,24 @@
 
 sonarADFWidget.controller('compare', compare);
 
-function compare(data,METRIC_NAMES) {
+function compare(data) {
   var vm = this;
-
-  vm.METRIC_NAMES = METRIC_NAMES;
-  vm.projectLeft = data.projectLeft;
-  vm.projectRight = data.projectRight;
+  if(data != "Please Setup the Widget"){
+    vm.projectLeft = data.projectLeft.split(':')[1];
+    vm.projectRight = data.projectRight.split(':')[1];
+    var projectLeftMetrics = data.resp.projectLeft.data.component.measures;
+    var projectRightMetrics = data.resp.projectRight.data.component.measures;
+    var compareTable = [];
+    angular.forEach(projectLeftMetrics, function (metricLeft) {
+      angular.forEach(projectRightMetrics, function (metricRight) {
+        if (metricRight.metric === metricLeft.metric) {
+          compareTable.push({metricName: metricLeft.metric,
+            projectValLeft: metricLeft.value, projectValRight: metricRight.value});
+        }
+      });
+    });
+    vm.compareTable = compareTable;
+  }
 
 }
 
@@ -28,11 +40,11 @@ function editController($scope, $http, sonarApi, sonarEndpoint) {
       data.forEach(function(project) {
         var proj = {
           name: project.k
-        }
+        };
         vm.projects.push(proj);
       });
     });
-  }
+  };
   $scope.updateProjects();
 
 }

src/compare/view.html

@@ -1,18 +1,19 @@
-<div class="alert alert-info" ng-if="!vm.projectLeft">
+<div class="alert alert-info" ng-if="!vm.compareTable">
   Please configure the widget
 </div>
-<div ng-if="vm.projectLeft" class="col-md-12 centerText">
+<div ng-if="vm.compareTable" class="col-md-12 centerText">
+
 
   <table class="table">
     <tr>
       <th>Metric</th>
-      <th>{{vm.projectLeft.data.component.name}}</th>
-      <th>{{vm.projectRight.data.component.name}}</th>
+      <th>{{vm.projectLeft}}</th>
+      <th>{{vm.projectRight}}</th>
     </tr>
-    <tr ng-repeat="metric in vm.projectLeft.data.component.measures">
-      <td>{{vm.METRIC_NAMES[metric.metric]}}</td>
-      <td>{{vm.projectLeft.data.component.measures[$index].value}}</td>
-      <td>{{vm.projectRight.data.component.measures[$index].value}}</td>
+    <tr ng-repeat="entry in vm.compareTable">
+      <td>{{entry.metricName}}</td>
+      <td>{{entry.projectValLeft}}</td>
+      <td>{{entry.projectValRight}}</td>
     </tr>
   </table>
 

src/projectquality/quality.controller.js

@@ -4,15 +4,24 @@ sonarADFWidget.controller('qualityCtrl', qualityCtrl);
 
 function qualityCtrl(data) {
     var vm = this;
-    vm.name = data.name;
+    if(data!="Please Setup the Widget") {
 
-    angular.forEach(data.msr, function (metric) {
-        if (metric.key === "coverage") //going through all entries with if/elseif since there could miss some entries. So there is no special order
-            vm.coverage = metric.frmt_val;
-        else if (metric.key === "blocker_violations")
-            vm.blocker = metric.frmt_val;
-        else if (metric.key === "quality_gate_details") {
-            vm.qualityGateStatus = metric.data.split('"')[3]; //structure of quality_gate_details: "level":"OK",...
+      vm.project = data.project.split(':')[1];
+      vm.url = data.url;
+
+      angular.forEach(data.quality_index, function (metric) {
+        if (metric.metric === "coverage") //going through all entries with if/elseif since there could miss some entries. So there is no special order
+          vm.coverage = metric.value;
+        else if (metric.metric === "blocker_violations")
+          vm.blocker = metric.value;
+        else if (metric.metric === "alert_status") {
+          vm.qualityGateStatus = metric.value;
+        } else if (metric.metric === "sqale_index") {
+          vm.technicalDept = metric.value;
+        } else if (metric.metric === "vulnerabilities") {
+          vm.vulnerabilities = metric.value;
         }
-    });
+      });
+    }
+
 }

src/projectquality/view.html

@@ -1,29 +1,33 @@
 <style type="text/css">
 
-  div.sonar-content, div.sonar-content h1, div.sonar-content h4 {
+  div.sonar-content, div.sonar-content h1, div.sonar-content h5 a{
     text-align: right;
     color: white;
   }
 
-  .statusQualitygate {
-    border-radius: 8px;
-    margin-bottom: 2%;
+  h4#headline{
+    color: white;
+    border: 2px solid white;
+    padding: 8px;
+    text-align: center;
   }
 
-  .codeCoverage {
-    border-radius: 8px;
-    background-color: #fcc700;
+
+   div.sonar-content .statusQualitygate,div.sonar-content > .codeCoverage,
+   div.sonar-content > .blockerIssues,div.sonar-content >.technicalDept,div.sonar-content >.vulnerabilities {
+    border: 2px solid white;
     margin-bottom: 2%;
   }
 
-  .blockerIssues {
-    border-radius: 8px;
+  div.sonar-content >.codeCoverage,div.sonar-content >.technicalDept,div.sonar-content >.blockerIssues,
+  div.sonar-content >.vulnerabilities, div.sonar-content>h4{
     background-color: #1B7DAA;
   }
 
+
   .glyphiconStyle {
     float: left;
-    font-size: 3em;
+    font-size: 2.5em;
     margin-top: 25px;
   }
 
@@ -45,54 +49,64 @@
 </style>
 
 
-<div class="alert alert-info" ng-if="!vm.name">
+<div class="alert alert-info" ng-if="!vm.project">
   Please configure the widget
 </div>
 
-<div class="sonar-content col-md-12" ng-if="vm.name">
-
+<div class="sonar-content col-md-12" ng-if="vm.project">
+  <h4 id="headline">{{vm.project}}</h4>
   <div ng-switch on="vm.qualityGateStatus">
     <div ng-switch-when="OK">
-      <div class="ok col-md-12 statusQualitygate">
-        <span class="glyphicon glyphicon-ok glyphiconStyle"></span>
-        <h1>Passed</h1>
-        <h4>Quality Gate</h4>
+      <div class="ok col-md-6 statusQualitygate">
+        <span class="glyphicon  glyphicon-ok-sign glyphiconStyle"></span>
+        <h1>OK</h1>
+        <h5><a href="{{vm.url}}/quality_gates">Quality Gate</a></h5>
       </div>
     </div>
     <div ng-switch-when="ERROR">
-      <div class="error col-md-12 statusQualitygate">
-        <span class="glyphicon glyphicon-remove glyphiconStyle"></span>
-        <h1>Failed</h1>
-        <h4>Quality Gate</h4>
+      <div class="error col-md-6 statusQualitygate">
+        <h2>Failed</h2>
+        <h5><a href="{{vm.url}}/quality_gates">Quality Gate</a></h5>
       </div>
     </div>
     <div ng-switch-when="WARNING">
-      <div class="warning col-md-12 statusQualitygate">
-        <span class="glyphicon glyphicon-info-sign glyphiconStyle"></span>
-        <h1>Warning</h1>
-        <h4>Quality Gate</h4>
+      <div class="warning col-md-6 statusQualitygate">
+        <h2>Warning</h2>
+        <h5><a href="{{vm.url}}/quality_gates">Quality Gate</a></h5>
       </div>
     </div>
 
     <div ng-switch-default>
-      <div class="unknown col-md-12 statusQualitygate">
-        <span class="glyphicon glyphicon-question-sign glyphiconStyle"></span>
-        <h1>unknown</h1>
-        <h4>Quality Gate</h4>
+      <div class="unknown col-md-6 statusQualitygate">
+        <h2>unknown</h2>
+        <h5><a href="{{vm.url}}/quality_gates">Quality Gate</a></h5>
       </div>
     </div>
   </div>
 
-  <div class="col-md-12 codeCoverage">
+
+  <div class="col-md-6 vulnerabilities">
+    <span class="glyphicon  glyphicon glyphicon-lock glyphiconStyle"></span>
+    <h1>{{vm.vulnerabilities}}</h1>
+    <h5>Vulnerabilities</a></h5>
+  </div>
+
+
+  <div class="col-md-6 codeCoverage">
     <span class="glyphicon glyphicon-tasks glyphiconStyle"></span>
-    <h1>{{vm.coverage||"unknown"}}</h1>
-    <h4>Code Coverage</h4>
+    <h1>{{vm.coverage||"/"}}</h1>
+    <h5>Code Coverage</a></h5>
   </div>
-  <div class="col-md-12 blockerIssues">
+  <div class="col-md-6 blockerIssues">
     <span class="glyphicon glyphicon-exclamation-sign glyphiconStyle"></span>
-    <h1>{{vm.blocker||"unknown"}}</h1>
-    <h4>Blocker Issues</h4>
+    <h1>{{vm.blocker||"/"}}</h1>
+    <h5>Blocker Issues</a></h5>
   </div>
-
+  <div class="col-md-12 technicalDept">
+    <span class="glyphicon glyphicon-time glyphiconStyle"></span>
+    <h1>{{vm.technicalDept+" days" ||"/"}}</h1>
+    <h5>Technical Dept</a></h5>
+  </div>
+  <a href="https://docs.sonarqube.org/latest/user-guide/metric-definitions/" class="pull-right">about metrics</a>
 </div>