SONAR-7409 Drop the "Drilldown" page and redirect to the "Measures" page

3 files changed, 4 insertions, 64 deletions

diff --git a/server/sonar-web/src/main/js/apps/drilldown/app.js b/server/sonar-web/src/main/js/apps/drilldown/app.js
deleted file mode 100644
index 276dd969d29..00000000000
--- a/server/sonar-web/src/main/js/apps/drilldown/app.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-import $ from 'jquery';
-import Marionette from 'backbone.marionette';
-import SourceViewer from '../../components/source-viewer/main';
-
-const App = new Marionette.Application();
-const init = function () {
-  const options = window.sonarqube;
-  App.addRegions({ viewerRegion: options.el });
-  $('.js-drilldown-link').on('click', function (e) {
-    e.preventDefault();
-    $(e.currentTarget).closest('table').find('.selected').removeClass('selected');
-    $(e.currentTarget).closest('tr').addClass('selected');
-    const uuid = $(e.currentTarget).data('uuid');
-    const viewer = new SourceViewer();
-    App.viewerRegion.show(viewer);
-    viewer.open(uuid);
-    if (window.drilldown.period != null) {
-      viewer.on('loaded', function () {
-        viewer.filterLinesByDate(window.drilldown.period, window.drilldown.periodName);
-      });
-    }
-  }).addClass('js-ready');
-};
-
-App.on('start', function (options) {
-  init.call(App, options);
-});
-
-window.sonarqube.appStarted.then(options => App.start(options));
diff --git a/server/sonar-web/src/main/js/components/shared/drilldown-link.js b/server/sonar-web/src/main/js/components/shared/drilldown-link.js
index ea50a0390be..151021f9f95 100644
--- a/server/sonar-web/src/main/js/components/shared/drilldown-link.js
+++ b/server/sonar-web/src/main/js/components/shared/drilldown-link.js
@@ -132,10 +132,8 @@ export const DrilldownLink = React.createClass({
       return this.renderIssuesLink();
     }
 
-    let highlightedMetric = HIGHLIGHT_MAPPING[this.props.metric];
-    let url = highlightedMetric ?
-        getComponentDrilldownUrl(this.props.component, highlightedMetric, this.props.period, this.props.metric) :
-        getComponentDrilldownUrl(this.props.component, this.props.metric, this.props.period);
+    const highlightedMetric = HIGHLIGHT_MAPPING[this.props.metric] || this.props.metric;
+    const url = getComponentDrilldownUrl(this.props.component, highlightedMetric);
     return <a className={this.props.className} href={url}>{this.props.children}</a>;
   }
 });
diff --git a/server/sonar-web/src/main/js/helpers/urls.js b/server/sonar-web/src/main/js/helpers/urls.js
index 96f26039701..7826f91227f 100644
--- a/server/sonar-web/src/main/js/helpers/urls.js
+++ b/server/sonar-web/src/main/js/helpers/urls.js
@@ -45,20 +45,10 @@ export function getComponentIssuesUrl (componentKey, query) {
  * Generate URL for a component's drilldown page
  * @param {string} componentKey
  * @param {string} metric
- * @param {string|number} [period]
- * @param {string} [highlightedMetric]
  * @returns {string}
  */
-export function getComponentDrilldownUrl (componentKey, metric, period, highlightedMetric) {
-  let url = '/drilldown/measures?id=' + encodeURIComponent(componentKey) +
-      '&metric=' + encodeURIComponent(metric);
-  if (period) {
-    url += '&period=' + period;
-  }
-  if (highlightedMetric) {
-    url += '&highlight=' + encodeURIComponent(highlightedMetric);
-  }
-  return url;
+export function getComponentDrilldownUrl (componentKey, metric) {
+  return `/component_measures/${metric}?id=${encodeURIComponent(componentKey)}`;
 }