Move measures page drilldown components at the same level as the sidebar

8 files changed, 27 insertions, 31 deletions

diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js
index 3f473359707..1743010d1e7 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js
@@ -22,13 +22,13 @@ import React from 'react';
 import moment from 'moment';
 import Breadcrumbs from './Breadcrumbs';
 import Favorite from '../../../components/controls/Favorite';
-import FilesView from './drilldown/FilesView';
+import FilesView from '../drilldown/FilesView';
 import MeasureHeader from './MeasureHeader';
 import MeasureViewSelect from './MeasureViewSelect';
 import MetricNotFound from './MetricNotFound';
 import PageActions from './PageActions';
 import SourceViewer from '../../../components/SourceViewer/SourceViewer';
-import TreeMapView from './drilldown/TreeMapView';
+import TreeMapView from '../drilldown/TreeMapView';
 import { getComponentTree } from '../../../api/components';
 import { complementary } from '../config/complementary';
 import { enhanceComponent, isFileType } from '../utils';
diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/drilldown/ComponentCell.js b/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentCell.js
index a0294788571..6b0850ec74e 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/components/drilldown/ComponentCell.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentCell.js
@@ -20,10 +20,10 @@
 // @flow
 import React from 'react';
 import classNames from 'classnames';
-import QualifierIcon from '../../../../components/shared/QualifierIcon';
-import { splitPath } from '../../../../helpers/path';
-import { getComponentUrl } from '../../../../helpers/urls';
-import type { Component } from '../../types';
+import QualifierIcon from '../../../components/shared/QualifierIcon';
+import { splitPath } from '../../../helpers/path';
+import { getComponentUrl } from '../../../helpers/urls';
+import type { Component } from '../types';
 
 type Props = {
   component: Component,
diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/drilldown/ComponentsList.js b/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentsList.js
index cdf62ecea70..ccc417f5d30 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/components/drilldown/ComponentsList.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentsList.js
@@ -21,10 +21,10 @@
 import React from 'react';
 import ComponentsListRow from './ComponentsListRow';
 import EmptyComponentsList from './EmptyComponentsList';
-import { complementary } from '../../config/complementary';
-import { getLocalizedMetricName } from '../../../../helpers/l10n';
-import type { Component } from '../../types';
-import type { Metric } from '../../../../store/metrics/actions';
+import { complementary } from '../config/complementary';
+import { getLocalizedMetricName } from '../../../helpers/l10n';
+import type { Component } from '../types';
+import type { Metric } from '../../../store/metrics/actions';
 
 type Props = {|
   components: Array<Component>,
diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/drilldown/ComponentsListRow.js b/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentsListRow.js
index bbb2ca2fe8c..29613eb6b1e 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/components/drilldown/ComponentsListRow.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentsListRow.js
@@ -21,8 +21,8 @@
 import React from 'react';
 import ComponentCell from './ComponentCell';
 import MeasureCell from './MeasureCell';
-import type { Component } from '../../types';
-import type { Metric } from '../../../../store/metrics/actions';
+import type { Component } from '../types';
+import type { Metric } from '../../../store/metrics/actions';
 
 type Props = {|
   component: Component,
diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/drilldown/EmptyComponentsList.js b/server/sonar-web/src/main/js/apps/component-measures/drilldown/EmptyComponentsList.js
index bcdeee0e710..01f19c0bff5 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/components/drilldown/EmptyComponentsList.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/EmptyComponentsList.js
@@ -19,7 +19,7 @@
  */
 // @flow
 import React from 'react';
-import { translate } from '../../../../helpers/l10n';
+import { translate } from '../../../helpers/l10n';
 
 export default function EmptyComponentsList() {
   return (
diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/drilldown/FilesView.js b/server/sonar-web/src/main/js/apps/component-measures/drilldown/FilesView.js
index 912a74ea31d..a37c37af1d6 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/components/drilldown/FilesView.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/FilesView.js
@@ -20,9 +20,9 @@
 // @flow
 import React from 'react';
 import ComponentsList from './ComponentsList';
-import ListFooter from '../../../../components/controls/ListFooter';
-import type { ComponentEnhanced, Paging } from '../../types';
-import type { Metric } from '../../../../store/metrics/actions';
+import ListFooter from '../../../components/controls/ListFooter';
+import type { ComponentEnhanced, Paging } from '../types';
+import type { Metric } from '../../../store/metrics/actions';
 
 type Props = {|
   components: Array<ComponentEnhanced>,
diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/drilldown/MeasureCell.js b/server/sonar-web/src/main/js/apps/component-measures/drilldown/MeasureCell.js
index be6348e5105..4d05b885f25 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/components/drilldown/MeasureCell.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/MeasureCell.js
@@ -19,9 +19,9 @@
  */
 // @flow
 import React from 'react';
-import Measure from '../../../../components/measure/Measure';
-import type { Component } from '../../types';
-import type { Metric } from '../../../../store/metrics/actions';
+import Measure from '../../../components/measure/Measure';
+import type { Component } from '../types';
+import type { Metric } from '../../../store/metrics/actions';
 
 type Props = {
   component: Component,
diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/drilldown/TreeMapView.js b/server/sonar-web/src/main/js/apps/component-measures/drilldown/TreeMapView.js
index 41fc108a9f8..529e95d25c4 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/components/drilldown/TreeMapView.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/TreeMapView.js
@@ -21,18 +21,14 @@
 import React from 'react';
 import { AutoSizer } from 'react-virtualized';
 import { scaleLinear, scaleOrdinal } from 'd3-scale';
-import QualifierIcon from '../../../../components/shared/QualifierIcon';
-import TreeMap from '../../../../components/charts/TreeMap';
-import {
-  translate,
-  translateWithParameters,
-  getLocalizedMetricName
-} from '../../../../helpers/l10n';
-import { formatMeasure, isDiffMetric } from '../../../../helpers/measures';
-import { getComponentUrl } from '../../../../helpers/urls';
-import type { Metric } from '../../../../store/metrics/actions';
-import type { ComponentEnhanced } from '../../types';
-import type { TreeMapItem } from '../../../../components/charts/TreeMap';
+import QualifierIcon from '../../../components/shared/QualifierIcon';
+import TreeMap from '../../../components/charts/TreeMap';
+import { translate, translateWithParameters, getLocalizedMetricName } from '../../../helpers/l10n';
+import { formatMeasure, isDiffMetric } from '../../../helpers/measures';
+import { getComponentUrl } from '../../../helpers/urls';
+import type { Metric } from '../../../store/metrics/actions';
+import type { ComponentEnhanced } from '../types';
+import type { TreeMapItem } from '../../../components/charts/TreeMap';
 
 type Props = {|
   components: Array<ComponentEnhanced>,