SONAR-6570 use new api/metric/search for source viewer

SonarSource · Jun 17, 2015 · e3f93d1 · e3f93d1
1 parent 05b53e3
commit e3f93d1
Show file tree

Hide file tree

Showing 3 changed files with 1,353 additions and 1,845 deletions.
diff --git a/server/sonar-web/src/main/js/components/source-viewer/measures-overlay.js b/server/sonar-web/src/main/js/components/source-viewer/measures-overlay.js
@@ -59,13 +59,14 @@ define([
 
     getMetrics: function () {
       var metrics = '',
-          url = baseUrl + '/api/metrics';
+          url = baseUrl + '/api/metrics/search';
       $.ajax({
         url: url,
-        async: false
+        async: false,
+        data: { ps: 9999 }
       }).done(function (data) {
-        metrics = _.filter(data, function (metric) {
-          return metric.val_type !== 'DATA';
+        metrics = _.filter(data.metrics, function (metric) {
+          return metric.type.key !== 'DATA';
         });
         metrics = _.sortBy(metrics, 'name');
       });

diff --git a/server/sonar-web/src/test/js/source-viewer-spec.js b/server/sonar-web/src/test/js/source-viewer-spec.js
@@ -308,7 +308,7 @@ casper.test.begin(testName('Details'), 15, function (test) {
         lib.mockRequestFromFile('/api/components/app', 'app.json', { data: { uuid: 'uuid' } });
         lib.mockRequestFromFile('/api/sources/lines', 'lines.json', { data: { uuid: 'uuid' } });
         lib.mockRequestFromFile('/api/issues/search', 'issues-details.json', { data: { componentUuids: 'uuid' } });
-        lib.mockRequestFromFile('/api/metrics', 'metrics.json');
+        lib.mockRequestFromFile('/api/metrics/search', 'metrics.json');
         lib.mockRequestFromFile('/api/resources', 'measures.json',
             { data: { resource: 'org.codehaus.sonar:sonar-batch:src/main/java/org/sonar/batch/index/Cache.java' } });
       })
@@ -376,7 +376,7 @@ casper.test.begin(testName('Details', 'Tests'), 41, function (test) {
         lib.mockRequestFromFile('/api/components/app', 'app-test.json', { data: { uuid: 'uuid' } });
         lib.mockRequestFromFile('/api/sources/lines', 'lines.json', { data: { uuid: 'uuid' } });
         lib.mockRequestFromFile('/api/issues/search', 'issues-details.json', { data: { componentUuids: 'uuid' } });
-        lib.mockRequestFromFile('/api/metrics', 'metrics.json');
+        lib.mockRequestFromFile('/api/metrics/search', 'metrics.json');
         lib.mockRequestFromFile('/api/resources', 'measures-test.json',
             { data: { resource: 'org.codehaus.sonar:sonar-batch:src/main/java/org/sonar/batch/index/Cache.java' } });
         lib.mockRequestFromFile('/api/tests/list', 'tests.json', { data: { testFileUuid: 'uuid' } });