SONAR-8119 restrict options when defining a condition on ratings

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 ffff916d31eeae22a5810316b2e5d9b1120e4397..36f0dc3e73dfa5dfdac714b1cabeb4f8542dbcc9 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
@@ -71,20 +71,20 @@ export default class Condition extends Component {
   }
 
   handleSaveClick (e) {
-    const { qualityGate, condition, onSaveCondition, onError, onResetError } = this.props;
+    const { qualityGate, condition, metric, onSaveCondition, onError, onResetError } = this.props;
     const period = this.state.period;
     const data = {
       metric: condition.metric,
-      op: this.state.op,
+      op: metric.type === 'RATING' ? 'GT' : this.state.op,
       warning: this.state.warning,
       error: this.state.error
     };
 
-    if (period) {
+    if (period && metric.type !== 'RATING') {
       data.period = period;
     }
 
-    if (condition.metric.indexOf('new_') === 0) {
+    if (metric.key.indexOf('new_') === 0) {
       data.period = '1';
     }
 
@@ -97,20 +97,24 @@ export default class Condition extends Component {
   }
 
   handleUpdateClick (e) {
-    const { condition, onSaveCondition, onError, onResetError } = this.props;
+    const { condition, onSaveCondition, metric, onError, onResetError } = this.props;
     const period = this.state.period;
     const data = {
       id: condition.id,
       metric: condition.metric,
-      op: this.state.op,
+      op: metric.type === 'RATING' ? 'GT' : this.state.op,
       warning: this.state.warning,
       error: this.state.error
     };
 
-    if (period) {
+    if (period && metric.type !== 'RATING') {
       data.period = period;
     }
 
+    if (metric.key.indexOf('new_') === 0) {
+      data.period = '1';
+    }
+
     e.preventDefault();
     updateCondition(data).then(newCondition => {
       this.setState({ changed: false });
@@ -120,8 +124,7 @@ export default class Condition extends Component {
   }
 
   handleDeleteClick (e) {
-    const { qualityGate, condition, metrics, onDeleteCondition } = this.props;
-    const metric = metrics.find(metric => metric.key === condition.metric);
+    const { qualityGate, condition, metric, onDeleteCondition } = this.props;
 
     e.preventDefault();
     new DeleteConditionView({
@@ -140,9 +143,10 @@ export default class Condition extends Component {
   }
 
   renderPeriodValue () {
-    const { condition } = this.props;
+    const { condition, metric } = this.props;
     const isLeakSelected = !!this.state.period;
     const isDiffMetric = condition.metric.indexOf('new_') === 0;
+    const isRating = metric.type === 'RATING';
 
     if (isDiffMetric) {
       return (
@@ -150,26 +154,75 @@ export default class Condition extends Component {
             {translate('quality_gates.condition.leak.unconditional')}
           </span>
       );
-    } else {
-      return isLeakSelected ?
-          translate('quality_gates.condition.leak.yes') :
-          translate('quality_gates.condition.leak.no');
     }
+
+    if (isRating) {
+      return (
+          <span className="note">
+            {translate('quality_gates.condition.leak.never')}
+          </span>
+      );
+    }
+
+    return isLeakSelected ?
+        translate('quality_gates.condition.leak.yes') :
+        translate('quality_gates.condition.leak.no');
   }
 
-  render () {
-    const { condition, edit, metrics } = this.props;
-    const metric = metrics.find(metric => metric.key === condition.metric);
+  renderPeriod () {
+    const { condition, metric, edit } = this.props;
+
     const isDiffMetric = condition.metric.indexOf('new_') === 0;
+    const isRating = metric.type === 'RATING';
     const isLeakSelected = !!this.state.period;
+
+    if (isRating || (isDiffMetric && !edit)) {
+      return this.renderPeriodValue();
+    }
+
+    return (
+        <Checkbox
+            checked={isLeakSelected}
+            onCheck={this.handlePeriodChange.bind(this)}/>
+    );
+  }
+
+  renderOperator () {
+    const { condition, edit, metric } = this.props;
+
+    if (!edit) {
+      return metric.type === 'RATING' ?
+          translate('quality_gates.operator', condition.op, 'rating') :
+          translate('quality_gates.operator', condition.op);
+    }
+
+    if (metric.type === 'RATING') {
+      return (
+          <span className="note">{translate('quality_gates.operator.GT.rating')}</span>
+      );
+    }
+
     const operators = ['LT', 'GT', 'EQ', 'NE'];
     const operatorOptions = operators.map(op => {
-      const label = metric.type === 'RATING' ?
-          translate('quality_gates.operator', op, 'rating') :
-          translate('quality_gates.operator', op);
+      const label = translate('quality_gates.operator', op);
       return { label, value: op };
     });
 
+    return (
+        <Select
+            ref="operator"
+            className="input-medium"
+            name="operator"
+            value={this.state.op}
+            clearable={false}
+            searchable={false}
+            options={operatorOptions}
+            onChange={this.handleOperatorChange.bind(this)}/>
+    );
+  }
+
+  render () {
+    const { condition, edit, metric } = this.props;
     return (
         <tr>
           <td className="text-middle nowrap">
@@ -182,25 +235,11 @@ export default class Condition extends Component {
           </td>
 
           <td className="thin text-middle nowrap">
-            {(edit && !isDiffMetric) ? (
-                <Checkbox
-                    checked={isLeakSelected}
-                    onCheck={this.handlePeriodChange.bind(this)}/>
-            ) : this.renderPeriodValue()}
+            {this.renderPeriod()}
           </td>
 
           <td className="thin text-middle nowrap">
-            {edit ? (
-                <Select
-                    ref="operator"
-                    className="input-medium"
-                    name="operator"
-                    value={this.state.op}
-                    clearable={false}
-                    searchable={false}
-                    options={operatorOptions}
-                    onChange={this.handleOperatorChange.bind(this)}/>
-            ) : translate('quality_gates.operator', condition.op)}
+            {this.renderOperator()}
           </td>
 
           <td className="thin text-middle nowrap">

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.js b/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.js
index 4c66bd686ecf92f5a661a502517f2bc4c44b06a0..ce2dddb2e21c0a5f8967585290822fb6b4b72374 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.js
+++ b/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.js
@@ -141,7 +141,7 @@ export default class Conditions extends React.Component {
                         key={getKey(condition, index)}
                         qualityGate={qualityGate}
                         condition={condition}
-                        metrics={metrics}
+                        metric={metrics.find(metric => metric.key === condition.metric)}
                         edit={edit}
                         onSaveCondition={onSaveCondition}
                         onDeleteCondition={onDeleteCondition}

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 0b173769ef39364d8963aec0fd5936bd933a9994..6b23c1893db21deb833e196b9382f41d9c108bd7 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -942,6 +942,7 @@ qualifiers.update.VW=Update View
 qualifiers.UTS=Unit Test Files
 qualifiers.VW=Views
 quality_gates.add_condition=Add Condition
+quality_gates.condition.leak.never=Never
 quality_gates.condition.leak.no=No
 quality_gates.condition.leak.unconditional=Always
 quality_gates.condition.leak.yes=Yes