Просмотр исходного кода

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

tags/6.2-RC1
Stas Vilchik 7 лет назад
Родитель
Сommit
2bd1401370

+ 5
- 1
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>

+ 4
- 4
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 (

+ 4
- 0
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

Загрузка…
Отмена
Сохранить