SONAR-9608 Fix files view with multiple measures

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 08d7bdc35370af4e1c79654ae7589497f1d8ed6d..d894e4419cd8f6dc1a7e07d1c40fa12c52889052 100644 (file)
--- 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 45be86a7f1d110899e63ea267932c6b81dc81926..b075104a42483f69e8c799c5a8b3f7b4d43a735b 100644 (file)
--- 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 9b813b15ba33b48cce8a90eaef2945dff8a27b1e..46c6839ca1970b4e4ac4fe9ee00599ab9909531c 100644 (file)
--- 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', {