aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main/js
diff options
context:
space:
mode:
authorGrégoire Aubert <gregoire.aubert@sonarsource.com>2017-08-10 13:17:57 +0200
committerGrégoire Aubert <gregoire.aubert@sonarsource.com>2017-08-14 11:44:44 +0200
commit01fb5079116562408e83dbeeda04473a1084581c (patch)
treeff251e788f6217085e436ccc192a0f7a4f7da9b9 /server/sonar-web/src/main/js
parent66a035c4388ef78798ac1881d12a00de5d238458 (diff)
downloadsonarqube-01fb5079116562408e83dbeeda04473a1084581c.tar.gz
sonarqube-01fb5079116562408e83dbeeda04473a1084581c.zip
SONAR-9608 Fix files view with multiple measures
Diffstat (limited to 'server/sonar-web/src/main/js')
-rw-r--r--server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentCell.js4
-rw-r--r--server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentsList.js4
-rw-r--r--server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentsListRow.js6
3 files changed, 7 insertions, 7 deletions
diff --git a/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentCell.js b/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentCell.js
index 08d7bdc3537..d894e4419cd 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentCell.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentCell.js
@@ -22,10 +22,10 @@ import React from 'react';
import QualifierIcon from '../../../components/icons-components/QualifierIcon';
import { splitPath } from '../../../helpers/path';
import { getComponentUrl } from '../../../helpers/urls';
-import type { Component } from '../types';
+import type { ComponentEnhanced } from '../types';
type Props = {
- component: Component,
+ component: ComponentEnhanced,
onClick: string => void
};
diff --git a/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentsList.js b/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentsList.js
index 45be86a7f1d..b075104a424 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentsList.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentsList.js
@@ -23,11 +23,11 @@ import ComponentsListRow from './ComponentsListRow';
import EmptyResult from './EmptyResult';
import { complementary } from '../config/complementary';
import { getLocalizedMetricName } from '../../../helpers/l10n';
-import type { Component } from '../types';
+import type { ComponentEnhanced } from '../types';
import type { Metric } from '../../../store/metrics/actions';
type Props = {|
- components: Array<Component>,
+ components: Array<ComponentEnhanced>,
onClick: string => void,
metric: Metric,
metrics: { [string]: Metric },
diff --git a/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentsListRow.js b/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentsListRow.js
index 9b813b15ba3..46c6839ca19 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentsListRow.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentsListRow.js
@@ -22,11 +22,11 @@ import React from 'react';
import classNames from 'classnames';
import ComponentCell from './ComponentCell';
import MeasureCell from './MeasureCell';
-import type { Component } from '../types';
+import type { ComponentEnhanced } from '../types';
import type { Metric } from '../../../store/metrics/actions';
type Props = {|
- component: Component,
+ component: ComponentEnhanced,
isSelected: boolean,
onClick: string => void,
otherMetrics: Array<Metric>,
@@ -36,7 +36,7 @@ type Props = {|
export default function ComponentsListRow(props: Props) {
const { component } = props;
const otherMeasures = props.otherMetrics.map(metric => {
- const measure = component.measures.find(measure => measure.metric === metric.key);
+ const measure = component.measures.find(measure => measure.metric.key === metric.key);
return { ...measure, metric };
});
const rowClass = classNames('measure-details-component-row', {