use new WS on code, projects and overview pages

3 files changed, 27 insertions, 23 deletions

diff --git a/server/sonar-web/src/main/js/apps/overview/components/domain-bubble-chart.js b/server/sonar-web/src/main/js/apps/overview/components/domain-bubble-chart.js
index e7ae61e7ca8..6554987adf6 100644
--- a/server/sonar-web/src/main/js/apps/overview/components/domain-bubble-chart.js
+++ b/server/sonar-web/src/main/js/apps/overview/components/domain-bubble-chart.js
@@ -32,7 +32,7 @@ const BUBBLES_LIMIT = 500;
 
 
 function getMeasure (component, metric) {
-  return component.measures[metric] || 0;
+  return Number(component.measures[metric]) || 0;
 }
 
 
@@ -53,28 +53,29 @@ export class DomainBubbleChart extends React.Component {
   }
 
   requestFiles () {
-    let metrics = [].concat(this.props.xMetric, this.props.yMetric, this.props.sizeMetrics);
-    return getFiles(this.props.component.key, metrics).then(r => {
+    const metrics = [].concat(this.props.xMetric, this.props.yMetric, this.props.sizeMetrics);
+    const options = {
+      s: 'metric',
+      metricSort: this.props.sizeMetrics,
+      asc: false,
+      ps: BUBBLES_LIMIT
+    };
+    return getFiles(this.props.component.key, metrics, options).then(r => {
       let files = r.map(file => {
         let measures = {};
-        (file.msr || []).forEach(measure => {
-          measures[measure.key] = measure.val;
+        (file.measures || []).forEach(measure => {
+          measures[measure.metric] = measure.value;
         });
         return _.extend(file, { measures });
       });
       this.setState({
         loading: false,
-        files: this.limitFiles(files),
+        files: files,
         total: files.length
       });
     });
   }
 
-  limitFiles (files) {
-    const comparator = file => -1 * this.getSizeMetricsValue(file);
-    return _.sortBy(files, comparator).slice(0, BUBBLES_LIMIT);
-  }
-
   getMetricObject (metrics, metricKey) {
     return _.findWhere(metrics, { key: metricKey });
   }
@@ -96,15 +97,17 @@ export class DomainBubbleChart extends React.Component {
     /* eslint max-len: 0 */
     let inner = [
       component.name,
-      `${this.state.xMetric.name}: ${formatMeasure(getMeasure(component, this.props.xMetric), this.state.xMetric.type)}`,
-      `${this.state.yMetric.name}: ${formatMeasure(getMeasure(component, this.props.yMetric), this.state.yMetric.type)}`,
+      `${this.state.xMetric.name}: ${formatMeasure(getMeasure(component, this.props.xMetric),
+          this.state.xMetric.type)}`,
+      `${this.state.yMetric.name}: ${formatMeasure(getMeasure(component, this.props.yMetric),
+          this.state.yMetric.type)}`,
       `${sizeMetricsTitle}: ${formatMeasure(this.getSizeMetricsValue(component), sizeMetricsType)}`
     ].join('<br>');
     return `<div class="text-left">${inner}</div>`;
   }
 
-  handleBubbleClick (uuid) {
-    Workspace.openComponent({ uuid });
+  handleBubbleClick (id) {
+    Workspace.openComponent({ uuid: id });
   }
 
   renderLoading () {
@@ -123,7 +126,7 @@ export class DomainBubbleChart extends React.Component {
         x: getMeasure(component, this.props.xMetric),
         y: getMeasure(component, this.props.yMetric),
         size: this.getSizeMetricsValue(component),
-        link: component.uuid,
+        link: component.id,
         tooltip: this.getTooltip(component)
       };
     });
@@ -160,7 +163,8 @@ export class DomainBubbleChart extends React.Component {
           {this.state.xMetric.name}
         </div>
         {this.state.total > BUBBLES_LIMIT &&
-        <div className="note text-center">{translateWithParameters('overview.chart.files.limit_message', BUBBLES_LIMIT)}</div>}
+        <div className="note text-center">{translateWithParameters('overview.chart.files.limit_message',
+            BUBBLES_LIMIT)}</div>}
       </div>
     </div>;
   }
diff --git a/server/sonar-web/src/main/js/apps/overview/components/domain-treemap.js b/server/sonar-web/src/main/js/apps/overview/components/domain-treemap.js
index 4ea27a3523a..3ea605187df 100644
--- a/server/sonar-web/src/main/js/apps/overview/components/domain-treemap.js
+++ b/server/sonar-web/src/main/js/apps/overview/components/domain-treemap.js
@@ -51,12 +51,12 @@ export class DomainTreemap extends React.Component {
     return getChildren(componentKey, metrics).then(r => {
       let components = r.map(component => {
         let measures = {};
-        (component.msr || []).forEach(measure => {
-          measures[measure.key] = measure.val;
+        (component.measures || []).forEach(measure => {
+          measures[measure.metric] = measure.value;
         });
         return _.extend(component, {
           measures,
-          key: component.copy ? `${component.copy}` : component.key
+          key: component.refKey || component.key
         });
       });
       this.setState({ loading: false, components });
diff --git a/server/sonar-web/src/main/js/apps/overview/components/ncloc-distribution.js b/server/sonar-web/src/main/js/apps/overview/components/ncloc-distribution.js
index d0c6e5f793e..dfe8cff2dbc 100644
--- a/server/sonar-web/src/main/js/apps/overview/components/ncloc-distribution.js
+++ b/server/sonar-web/src/main/js/apps/overview/components/ncloc-distribution.js
@@ -50,8 +50,8 @@ export const NclocDistribution = React.createClass({
     return getChildren(this.props.component.key, metrics).then(r => {
       let components = r.map(component => {
         let measures = {};
-        (component.msr || []).forEach(measure => {
-          measures[measure.key] = measure.val;
+        (component.measures || []).forEach(measure => {
+          measures[measure.metric] = measure.value;
         });
         return _.extend(component, { measures });
       });
@@ -76,7 +76,7 @@ export const NclocDistribution = React.createClass({
 
     let data = this.state.components.map((component, index) => {
       return {
-        x: parseInt(component.measures[METRIC], 10),
+        x: component.measures[METRIC] ? parseInt(component.measures[METRIC], 10) : 0,
         y: index,
         value: component.name,
         component: component