aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2016-04-15 14:38:58 +0200
committerStas Vilchik <vilchiks@gmail.com>2016-04-15 14:38:58 +0200
commit267a66720f000fb81b6b6b395d5366011158f1a5 (patch)
tree2160f10a15f81fa97be288561ac012f7e54d499d /server
parent95a49ae41384bef3fef6fffebc681917124da412 (diff)
downloadsonarqube-267a66720f000fb81b6b6b395d5366011158f1a5.tar.gz
sonarqube-267a66720f000fb81b6b6b395d5366011158f1a5.zip
SONAR-7543 Sanitize metric domains (#901)
* rename Tests to Coverage * rename Duplication to Diplications * move "alert_status" to new releasability domain
Diffstat (limited to 'server')
-rw-r--r--server/sonar-web/src/main/js/apps/component-measures/config/domains.js6
-rw-r--r--server/sonar-web/src/main/js/apps/component-measures/home/reducer.js3
-rw-r--r--server/sonar-web/src/main/js/apps/overview/main/coverage.js2
-rw-r--r--server/sonar-web/src/main/js/apps/overview/main/duplications.js2
4 files changed, 7 insertions, 6 deletions
diff --git a/server/sonar-web/src/main/js/apps/component-measures/config/domains.js b/server/sonar-web/src/main/js/apps/component-measures/config/domains.js
index d4f2611c02b..4423332349f 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/config/domains.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/config/domains.js
@@ -66,7 +66,7 @@ export const domains = {
]
},
- 'Tests': {
+ 'Coverage': {
main: [
'overall_coverage',
'coverage',
@@ -130,7 +130,7 @@ export const domains = {
]
},
- 'Duplication': {
+ 'Duplications': {
main: [
'duplicated_lines_density'
],
@@ -178,7 +178,7 @@ export const domains = {
]
},
- 'General': {
+ 'Releasability': {
main: [
'alert_status'
],
diff --git a/server/sonar-web/src/main/js/apps/component-measures/home/reducer.js b/server/sonar-web/src/main/js/apps/component-measures/home/reducer.js
index d15d4a11411..9d0cfafb1f5 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/home/reducer.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/home/reducer.js
@@ -31,7 +31,8 @@ const initialState = {
};
function groupByDomains (measures) {
- const KNOWN_DOMAINS = ['Reliability', 'Security', 'Maintainability', 'Tests', 'Duplication', 'Size', 'Complexity'];
+ const KNOWN_DOMAINS = ['Reliability', 'Security', 'Maintainability', 'Coverage', 'Duplications', 'Size',
+ 'Complexity'];
const domains = sortBy(toPairs(groupBy(measures, measure => measure.metric.domain)).map(r => {
const [name, measures] = r;
diff --git a/server/sonar-web/src/main/js/apps/overview/main/coverage.js b/server/sonar-web/src/main/js/apps/overview/main/coverage.js
index 4d619bbf379..81639060a0d 100644
--- a/server/sonar-web/src/main/js/apps/overview/main/coverage.js
+++ b/server/sonar-web/src/main/js/apps/overview/main/coverage.js
@@ -104,7 +104,7 @@ export const GeneralCoverage = React.createClass({
{ value: 100 - this.props.measures[coverageMetric], fill: '#d4333f' }
];
- const domainUrl = window.baseUrl + '/component_measures/domain/Tests?id=' +
+ const domainUrl = window.baseUrl + '/component_measures/domain/Coverage?id=' +
encodeURIComponent(this.props.component.key);
return <Domain>
diff --git a/server/sonar-web/src/main/js/apps/overview/main/duplications.js b/server/sonar-web/src/main/js/apps/overview/main/duplications.js
index 22162b18718..96c94d50e61 100644
--- a/server/sonar-web/src/main/js/apps/overview/main/duplications.js
+++ b/server/sonar-web/src/main/js/apps/overview/main/duplications.js
@@ -74,7 +74,7 @@ export const GeneralDuplications = React.createClass({
{ value: Math.max(0, 20 - this.props.measures['duplicated_lines_density']), fill: '#e6e6e6' }
];
- const domainUrl = window.baseUrl + '/component_measures/domain/Duplication?id=' +
+ const domainUrl = window.baseUrl + '/component_measures/domain/Duplications?id=' +
encodeURIComponent(this.props.component.key);
return <Domain>