SONAR-8119 Correctly display rating conditions in quality gates and in project dashboard

diff --git a/server/sonar-web/src/main/js/apps/overview/qualityGate/QualityGateCondition.js b/server/sonar-web/src/main/js/apps/overview/qualityGate/QualityGateCondition.js
index 2910c3d81c3428a1d6ce01592cf3e15d9ac6ff0f..84de099c7e823101dfbb7facf11e042b106df839 100644 (file)
--- a/server/sonar-web/src/main/js/apps/overview/qualityGate/QualityGateCondition.js
+++ b/server/sonar-web/src/main/js/apps/overview/qualityGate/QualityGateCondition.js
@@ -41,6 +41,10 @@ const QualityGateCondition = ({ component, periods, condition }) => {
   const periodLabel = getPeriodLabel(period);
   const periodDate = getPeriodDate(period);
 
+  const operator = metric.type === 'RATING' ?
+      translate('quality_gates.operator', condition.op, 'rating') :
+      translate('quality_gates.operator', condition.op, 'short');
+
   return (
       <li className="overview-quality-gate-condition">
         <div className="overview-quality-gate-condition-period">
@@ -65,7 +69,7 @@ const QualityGateCondition = ({ component, periods, condition }) => {
               {metric.name}
             </div>
             <div className="overview-quality-gate-condition-threshold">
-              {translate('quality_gates.operator', condition.op, 'short')}
+              {operator}
               {' '}
               {formatMeasure(threshold, metric.type)}
             </div>

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.js b/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.js
index 4eeb48bcb8ecd58bf27ee8c18d99c74b6a928d49..8169218183eeed2a9aad43e9a0876f12f0823643 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.js
+++ b/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.js
@@ -153,10 +153,10 @@ export default class Condition extends Component {
     const isLeakSelected = !!this.state.period;
     const operators = ['LT', 'GT', 'EQ', 'NE'];
     const operatorOptions = operators.map(op => {
-      return {
-        label: translate('quality_gates.operator', op),
-        value: op
-      };
+      const label = metric.type === 'RATING' ?
+          translate('quality_gates.operator', op, 'rating') :
+          translate('quality_gates.operator', op);
+      return { label, value: op };
     });
 
     return (

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 2f6354fd0e567fa1fe7ca36cc788c545794c4a9e..b3243cc9690a40dcbb3d4f6ebced109eae44e1f6 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2802,6 +2802,10 @@ quality_gates.operator.LT.short=<
 quality_gates.operator.GT.short=>
 quality_gates.operator.EQ.short==
 quality_gates.operator.NE.short=\u2260
+quality_gates.operator.LT.rating=is better than
+quality_gates.operator.GT.rating=is worse than
+quality_gates.operator.EQ.rating=is
+quality_gates.operator.NE.rating=is not
 quality_gates.delete.confirm.message=Are you sure you want to delete the "{0}" quality gate?
 quality_gates.delete.confirm.default=Are you sure you want to delete the "{0}" quality gate, which is the default quality gate?
 quality_gates.delete_condition=Delete Condition