Bug 1151337 Perfherder graphs should use OptionCollectionModel

mozilla · Apr 15, 2015 · 8732565 · 8732565
1 parent ff589ff
commit 8732565
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/ui/js/perf.js b/ui/js/perf.js
@@ -30,9 +30,9 @@ perf.factory('getSeriesSummary', [ function() {
 }]);
 
 perf.controller('PerfCtrl', [ '$state', '$stateParams', '$scope', '$rootScope', '$location',
-                              '$modal', 'thServiceDomain', '$http', '$q', '$timeout', 'getSeriesSummary',
+                              '$modal', 'thServiceDomain', '$http', '$q', '$timeout', 'getSeriesSummary', 'ThOptionCollectionModel',
   function PerfCtrl($state, $stateParams, $scope, $rootScope, $location, $modal,
-                    thServiceDomain, $http, $q, $timeout, getSeriesSummary) {
+                    thServiceDomain, $http, $q, $timeout, getSeriesSummary, ThOptionCollectionModel) {
 
     var availableColors = [ 'red', 'green', 'blue', 'orange', 'purple' ];
 
@@ -650,12 +650,14 @@ perf.controller('PerfCtrl', [ '$state', '$stateParams', '$scope', '$rootScope',
 
     var optionCollectionMap = {};
 
-    $http.get(thServiceDomain + '/api/optioncollectionhash').then(
-      function(response) {
-        response.data.forEach(function(dict) {
-          optionCollectionMap[dict.option_collection_hash] =
-            dict.options.map(function(option) {
-              return option.name; }).join(" ");
+    ThOptionCollectionModel.get_list().success(
+      function(optCollectionData) {
+          // gather the string representations of option collections
+        _.each(optCollectionData, function(optColl) {
+          optionCollectionMap[optColl.option_collection_hash] =
+            _.uniq(_.map(optColl.options, function(option) {
+              return option.name;
+            })).sort().join();
         });
       }).then(function() {
         if ($stateParams.series) {

diff --git a/ui/perf.html b/ui/perf.html
@@ -36,6 +36,9 @@
   <script src="vendor/mousetrap.min.js"></script>
   <script src="js/treeherder.js"></script>
   <script src="js/providers.js"></script>
+  <script src="js/models/option_collection.js"></script>
+  <script src="js/services/main.js"></script>
+  <script src="js/services/log.js"></script>
   <script src="js/perf.js"></script>
   <!-- endbuild -->