rebaseline_server JSON: pass category values as values, not keys

gm/rebaseline_server/static/loader.js

 /*
  * Loader:
  * Reads GM result reports written out by results.py, and imports
  * them into $scope.extraColumnHeaders and $scope.imagePairs .
  */
 var Loader = angular.module(
     'Loader',
     ['ConstantsModule']
 );
 
@@ skipping 130 matching lines @@
           $scope.selectedImagePairs = [];
 
           // Sets within which the user can toggle individual elements.
           $scope.hiddenResultTypes = {};
           $scope.hiddenResultTypes[
               constants.KEY__RESULT_TYPE__FAILUREIGNORED] = true;
           $scope.hiddenResultTypes[
               constants.KEY__RESULT_TYPE__NOCOMPARISON] = true;
           $scope.hiddenResultTypes[
               constants.KEY__RESULT_TYPE__SUCCEEDED] = true;
-          $scope.allResultTypes = Object.keys(
+          $scope.allResultTypes = $scope.columnSliceOf2DArray(
               $scope.extraColumnHeaders[constants.KEY__EXTRACOLUMN__RESULT_TYPE]
-                                       [constants.KEY__VALUES_AND_COUNTS]);
+                                       [constants.KEY__EXTRACOLUMNHEADERS__VALUES_AND_COUNTS],
+              0);
           $scope.hiddenConfigs = {};
-          $scope.allConfigs = Object.keys(
+          $scope.allConfigs = $scope.columnSliceOf2DArray(
               $scope.extraColumnHeaders[constants.KEY__EXTRACOLUMN__CONFIG]
-                                       [constants.KEY__VALUES_AND_COUNTS]);
+                                       [constants.KEY__EXTRACOLUMNHEADERS__VALUES_AND_COUNTS],
+              0);
 
           // Associative array of partial string matches per category.
           $scope.categoryValueMatch = {};
           $scope.categoryValueMatch.builder = "";
           $scope.categoryValueMatch.test = "";
 
           // If any defaults were overridden in the URL, get them now.
           $scope.queryParameters.load();
 
           // Any image URLs which are relative should be relative to the JSON
@@ skipping 569 matching lines @@
       }
     }
 
 
     //
     // Miscellaneous utility functions.
     // TODO(epoger): move into a separate .js file?
     //
 
     /**
+     * Returns a single "column slice" of a 2D array.
+     *
+     * For example, if array is:
+     * [[A0, A1],
+     *  [B0, B1],
+     *  [C0, C1]]
+     * and index is 0, this this will return:
+     * [A0, B0, C0]
+     *
+     * @param array a Javascript Array
+     * @param column (numeric): index within each row array
+     */
+    $scope.columnSliceOf2DArray = function(array, column) {
+      var slice = [];
+      var numRows = array.length;
+      for (var row = 0; row < numRows; row++) {
+        slice.push(array[row][column]);
+      }
+      return slice;
+    }
+
+    /**
      * Returns a human-readable (in local time zone) time string for a
      * particular moment in time.
      *
      * @param secondsPastEpoch (numeric): seconds past epoch in UTC
      */
     $scope.localTimeString = function(secondsPastEpoch) {
       var d = new Date(secondsPastEpoch * 1000);
       return d.toString();
     }
 
@@ skipping 46 matching lines @@
      */
     $scope.getImageDiffRelativeUrl = function(imagePair) {
       var before =
           imagePair[constants.KEY__IMAGE_A_URL] + "-vs-" +
           imagePair[constants.KEY__IMAGE_B_URL];
       return before.replace(/[^\w\-]/g, "_") + ".png";
     }
 
   }
 );