From: Stas Vilchik <stas.vilchik@sonarsource.com>
Date: Wed, 26 Jul 2017 09:03:35 +0000 (+0200)
Subject: fix display of application quality gate
X-Git-Tag: 6.6-RC1~786
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6db8e9f15c5eda573673f53964a08e4171f6f702;p=sonarqube.git

fix display of application quality gate
---

diff --git a/server/sonar-web/src/main/js/apps/overview/qualityGate/ApplicationQualityGateProject.js b/server/sonar-web/src/main/js/apps/overview/qualityGate/ApplicationQualityGateProject.js
index 1c96978d4ae..26f941e9d21 100644
--- a/server/sonar-web/src/main/js/apps/overview/qualityGate/ApplicationQualityGateProject.js
+++ b/server/sonar-web/src/main/js/apps/overview/qualityGate/ApplicationQualityGateProject.js
@@ -29,7 +29,7 @@ import './ApplicationQualityGateProject.css';
 type Condition = {
   comparator: string,
   errorThreshold?: string,
-  metricKey: string,
+  metric: string,
   onLeak: boolean,
   status: string,
   value: string,
@@ -56,13 +56,13 @@ export default class ApplicationQualityGateProject extends React.PureComponent {
   props: Props;
 
   renderCondition = (condition: Condition) => {
-    const metric = this.props.metrics[condition.metricKey];
+    const metric = this.props.metrics[condition.metric];
     const metricName = getLocalizedMetricName(metric);
     const threshold = condition.errorThreshold || condition.warningThreshold;
-    const isDiff = isDiffMetric(condition.metricKey);
+    const isDiff = isDiffMetric(condition.metric);
 
     return (
-      <li key={condition.metricKey}>
+      <li key={condition.metric}>
         <span className="text-limited">
           <strong>{formatMeasure(condition.value, metric.type)}</strong> {metricName}
           {!isDiff && condition.onLeak && ' ' + translate('quality_gates.conditions.leak')}
diff --git a/server/sonar-web/src/main/js/apps/overview/qualityGate/QualityGate.js b/server/sonar-web/src/main/js/apps/overview/qualityGate/QualityGate.js
index 18413693f9a..5bfcb90b203 100644
--- a/server/sonar-web/src/main/js/apps/overview/qualityGate/QualityGate.js
+++ b/server/sonar-web/src/main/js/apps/overview/qualityGate/QualityGate.js
@@ -50,7 +50,7 @@ export default function QualityGate({ component, measures }: Props) {
 
   let conditions = [];
   if (detailsMeasure && detailsMeasure.value) {
-    conditions = parseQualityGateDetails(detailsMeasure.value).conditions;
+    conditions = parseQualityGateDetails(detailsMeasure.value).conditions || [];
   }
 
   return (
diff --git a/server/sonar-web/src/main/js/apps/overview/qualityGate/__tests__/ApplicationQualityGateProject-test.js b/server/sonar-web/src/main/js/apps/overview/qualityGate/__tests__/ApplicationQualityGateProject-test.js
index 9aad7367621..88c232cd583 100644
--- a/server/sonar-web/src/main/js/apps/overview/qualityGate/__tests__/ApplicationQualityGateProject-test.js
+++ b/server/sonar-web/src/main/js/apps/overview/qualityGate/__tests__/ApplicationQualityGateProject-test.js
@@ -36,7 +36,7 @@ it('renders', () => {
     conditions: [
       {
         status: 'ERROR',
-        metricKey: 'new_coverage',
+        metric: 'new_coverage',
         comparator: 'LT',
         onLeak: true,
         errorThreshold: '85',
@@ -44,7 +44,7 @@ it('renders', () => {
       },
       {
         status: 'WARN',
-        metricKey: 'bugs',
+        metric: 'bugs',
         comparator: 'GT',
         onLeak: false,
         warningThreshold: '0',
@@ -52,7 +52,7 @@ it('renders', () => {
       },
       {
         status: 'ERROR',
-        metricKey: 'bugs',
+        metric: 'bugs',
         comparator: 'GT',
         onLeak: true,
         warningThreshold: '0',
@@ -60,7 +60,7 @@ it('renders', () => {
       },
       {
         status: 'OK',
-        metricKey: 'skipped_tests',
+        metric: 'skipped_tests',
         comparator: 'GT',
         onLeak: false,
         warningThreshold: '0',