aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main/js/apps/overview/events
diff options
context:
space:
mode:
authorGrégoire Aubert <gregoire.aubert@sonarsource.com>2017-07-18 10:58:50 +0200
committerGrégoire Aubert <gregoire.aubert@sonarsource.com>2017-07-18 11:50:43 +0200
commitc3e93b8e881a6be261a5cdc800a571cf1343c998 (patch)
tree331cbf5084a98999421a8ed684e93daf511117b7 /server/sonar-web/src/main/js/apps/overview/events
parentc7e8ffc345227eb02beb0bfa3c3e9574d86a8957 (diff)
downloadsonarqube-c3e93b8e881a6be261a5cdc800a571cf1343c998.tar.gz
sonarqube-c3e93b8e881a6be261a5cdc800a571cf1343c998.zip
SONAR-9403 Fix metric translation for plugins metrics on project activity page
Diffstat (limited to 'server/sonar-web/src/main/js/apps/overview/events')
-rw-r--r--server/sonar-web/src/main/js/apps/overview/events/PreviewGraphTooltips.js3
-rw-r--r--server/sonar-web/src/main/js/apps/overview/events/__tests__/PreviewGraphTooltips-test.js4
-rw-r--r--server/sonar-web/src/main/js/apps/overview/events/__tests__/__snapshots__/PreviewGraphTooltips-test.js.snap3
3 files changed, 3 insertions, 7 deletions
diff --git a/server/sonar-web/src/main/js/apps/overview/events/PreviewGraphTooltips.js b/server/sonar-web/src/main/js/apps/overview/events/PreviewGraphTooltips.js
index 982320a3a7c..3ee59922574 100644
--- a/server/sonar-web/src/main/js/apps/overview/events/PreviewGraphTooltips.js
+++ b/server/sonar-web/src/main/js/apps/overview/events/PreviewGraphTooltips.js
@@ -21,6 +21,7 @@ import React from 'react';
import BubblePopup from '../../../components/common/BubblePopup';
import FormattedDate from '../../../components/ui/FormattedDate';
import PreviewGraphTooltipsContent from './PreviewGraphTooltipsContent';
+import { getLocalizedMetricName } from '../../../helpers/l10n';
import type { Metric } from '../types';
import type { Serie } from '../../../components/charts/AdvancedTimeline';
@@ -68,7 +69,7 @@ export default class PreviewGraphTooltips extends React.PureComponent {
<PreviewGraphTooltipsContent
key={serie.name}
serie={serie}
- translatedName={metric && metric.custom ? metric.name : serie.translatedName}
+ translatedName={metric ? getLocalizedMetricName(metric) : serie.translatedName}
value={this.props.formatValue(point.y)}
/>
);
diff --git a/server/sonar-web/src/main/js/apps/overview/events/__tests__/PreviewGraphTooltips-test.js b/server/sonar-web/src/main/js/apps/overview/events/__tests__/PreviewGraphTooltips-test.js
index 10a9a0864cb..1b37aaf3691 100644
--- a/server/sonar-web/src/main/js/apps/overview/events/__tests__/PreviewGraphTooltips-test.js
+++ b/server/sonar-web/src/main/js/apps/overview/events/__tests__/PreviewGraphTooltips-test.js
@@ -24,7 +24,6 @@ import PreviewGraphTooltips from '../PreviewGraphTooltips';
const SERIES_OVERVIEW = [
{
name: 'code_smells',
- translatedName: 'Code Smells',
style: 1,
data: [
{
@@ -39,7 +38,6 @@ const SERIES_OVERVIEW = [
},
{
name: 'bugs',
- translatedName: 'Bugs',
style: 0,
data: [
{
@@ -54,7 +52,6 @@ const SERIES_OVERVIEW = [
},
{
name: 'vulnerabilities',
- translatedName: 'Vulnerabilities',
style: 2,
data: [
{
@@ -70,6 +67,7 @@ const SERIES_OVERVIEW = [
];
const METRICS = [
+ { key: 'code_smells', name: 'Code Smells', type: 'INT' },
{ key: 'bugs', name: 'Bugs', type: 'INT' },
{ key: 'vulnerabilities', name: 'Vulnerabilities', type: 'INT', custom: true }
];
diff --git a/server/sonar-web/src/main/js/apps/overview/events/__tests__/__snapshots__/PreviewGraphTooltips-test.js.snap b/server/sonar-web/src/main/js/apps/overview/events/__tests__/__snapshots__/PreviewGraphTooltips-test.js.snap
index e8090585551..455d71d0124 100644
--- a/server/sonar-web/src/main/js/apps/overview/events/__tests__/__snapshots__/PreviewGraphTooltips-test.js.snap
+++ b/server/sonar-web/src/main/js/apps/overview/events/__tests__/__snapshots__/PreviewGraphTooltips-test.js.snap
@@ -41,7 +41,6 @@ exports[`should render correctly 1`] = `
],
"name": "code_smells",
"style": 1,
- "translatedName": "Code Smells",
}
}
translatedName="Code Smells"
@@ -62,7 +61,6 @@ exports[`should render correctly 1`] = `
],
"name": "bugs",
"style": 0,
- "translatedName": "Bugs",
}
}
translatedName="Bugs"
@@ -83,7 +81,6 @@ exports[`should render correctly 1`] = `
],
"name": "vulnerabilities",
"style": 2,
- "translatedName": "Vulnerabilities",
}
}
translatedName="Vulnerabilities"