rename rebaseline_server JSON constants to be more consistent

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 17 matching lines @@
 // (We would have to make sure truncation still took place after
 // sorting, though.)
 Loader.filter(
   'removeHiddenImagePairs',
   function(constants) {
     return function(unfilteredImagePairs, hiddenResultTypes, hiddenConfigs,
                     builderSubstring, testSubstring, viewingTab) {
       var filteredImagePairs = [];
       for (var i = 0; i < unfilteredImagePairs.length; i++) {
         var imagePair = unfilteredImagePairs[i];
-        var extraColumnValues = imagePair[constants.KEY__EXTRA_COLUMN_VALUES];
+        var extraColumnValues = imagePair[constants.KEY__IMAGEPAIRS__EXTRACOLUMNS];
         // For performance, we examine the "set" objects directly rather
         // than calling $scope.isValueInSet().
         // Besides, I don't think we have access to $scope in here...
         if (!(true == hiddenResultTypes[extraColumnValues[
-                  constants.KEY__EXTRACOLUMN__RESULT_TYPE]]) &&
+                  constants.KEY__EXTRACOLUMNS__RESULT_TYPE]]) &&
             !(true == hiddenConfigs[extraColumnValues[
-                  constants.KEY__EXTRACOLUMN__CONFIG]]) &&
-            !(-1 == extraColumnValues[constants.KEY__EXTRACOLUMN__BUILDER]
+                  constants.KEY__EXTRACOLUMNS__CONFIG]]) &&
+            !(-1 == extraColumnValues[constants.KEY__EXTRACOLUMNS__BUILDER]
                     .indexOf(builderSubstring)) &&
-            !(-1 == extraColumnValues[constants.KEY__EXTRACOLUMN__TEST]
+            !(-1 == extraColumnValues[constants.KEY__EXTRACOLUMNS__TEST]
                     .indexOf(testSubstring)) &&
             (viewingTab == imagePair.tab)) {
           filteredImagePairs.push(imagePair);
         }
       }
       return filteredImagePairs;
     };
   }
 );
 
 
 Loader.controller(
   'Loader.Controller',
     function($scope, $http, $filter, $location, $log, $timeout, constants) {
     $scope.constants = constants;
     $scope.windowTitle = "Loading GM Results...";
     $scope.resultsToLoad = $location.search().resultsToLoad;
     $scope.loadingMessage = "please wait...";
 
     /**
      * On initial page load, load a full dictionary of results.
      * Once the dictionary is loaded, unhide the page elements so they can
      * render the data.
      */
     $http.get($scope.resultsToLoad).success(
       function(data, status, header, config) {
-        var dataHeader = data[constants.KEY__HEADER];
+        var dataHeader = data[constants.KEY__ROOT__HEADER];
         if (dataHeader[constants.KEY__HEADER__SCHEMA_VERSION] !=
-            constants.REBASELINE_SERVER_SCHEMA_VERSION_NUMBER) {
+            constants.VALUE__HEADER__SCHEMA_VERSION) {
           $scope.loadingMessage = "ERROR: Got JSON file with schema version "
               + dataHeader[constants.KEY__HEADER__SCHEMA_VERSION]
               + " but expected schema version "
-              + constants.REBASELINE_SERVER_SCHEMA_VERSION_NUMBER;
+              + constants.VALUE__HEADER__SCHEMA_VERSION;
         } else if (dataHeader[constants.KEY__HEADER__IS_STILL_LOADING]) {
           // Apply the server's requested reload delay to local time,
           // so we will wait the right number of seconds regardless of clock
           // skew between client and server.
           var reloadDelayInSeconds =
               dataHeader[constants.KEY__HEADER__TIME_NEXT_UPDATE_AVAILABLE] -
               dataHeader[constants.KEY__HEADER__TIME_UPDATED];
           var timeNow = new Date().getTime();
           var timeToReload = timeNow + reloadDelayInSeconds * 1000;
           $scope.loadingMessage =
               "server is still loading results; will retry at " +
               $scope.localTimeString(timeToReload / 1000);
           $timeout(
               function(){location.reload();},
               timeToReload - timeNow);
         } else {
           $scope.loadingMessage = "processing data, please wait...";
 
           $scope.header = dataHeader;
-          $scope.extraColumnHeaders = data[constants.KEY__EXTRACOLUMNHEADERS];
-          $scope.imagePairs = data[constants.KEY__IMAGEPAIRS];
-          $scope.imageSets = data[constants.KEY__IMAGESETS];
-          $scope.sortColumnSubdict = constants.KEY__DIFFERENCE_DATA;
-          $scope.sortColumnKey = constants.KEY__DIFFERENCE_DATA__PERCEPTUAL_DIFF;
+          $scope.extraColumnHeaders = data[constants.KEY__ROOT__EXTRACOLUMNHEADERS];
+          $scope.imagePairs = data[constants.KEY__ROOT__IMAGEPAIRS];
+          $scope.imageSets = data[constants.KEY__ROOT__IMAGESETS];
+          $scope.sortColumnSubdict = constants.KEY__IMAGEPAIRS__DIFFERENCES;
+          $scope.sortColumnKey = constants.KEY__DIFFERENCES__PERCEPTUAL_DIFF;
 
           $scope.showSubmitAdvancedSettings = false;
           $scope.submitAdvancedSettings = {};
           $scope.submitAdvancedSettings[
               constants.KEY__EXPECTATIONS__REVIEWED] = true;
           $scope.submitAdvancedSettings[
               constants.KEY__EXPECTATIONS__IGNOREFAILURE] = false;
           $scope.submitAdvancedSettings['bug'] = '';
 
           // Create the list of tabs (lists into which the user can file each
@@ skipping 26 matching lines @@
 
           // 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 = $scope.columnSliceOf2DArray(
-              $scope.extraColumnHeaders[constants.KEY__EXTRACOLUMN__RESULT_TYPE]
+              $scope.extraColumnHeaders[constants.KEY__EXTRACOLUMNS__RESULT_TYPE]
                                        [constants.KEY__EXTRACOLUMNHEADERS__VALUES_AND_COUNTS],
               0);
           $scope.hiddenConfigs = {};
           $scope.allConfigs = $scope.columnSliceOf2DArray(
-              $scope.extraColumnHeaders[constants.KEY__EXTRACOLUMN__CONFIG]
+              $scope.extraColumnHeaders[constants.KEY__EXTRACOLUMNS__CONFIG]
                                        [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();
@@ skipping 167 matching lines @@
       'resultsToLoad':         $scope.queryParameters.copiers.simple,
       'displayLimitPending':   $scope.queryParameters.copiers.simple,
       'showThumbnailsPending': $scope.queryParameters.copiers.simple,
       'imageSizePending':      $scope.queryParameters.copiers.simple,
       'sortColumnSubdict':     $scope.queryParameters.copiers.simple,
       'sortColumnKey':         $scope.queryParameters.copiers.simple,
 
       'hiddenResultTypes': $scope.queryParameters.copiers.set,
       'hiddenConfigs':     $scope.queryParameters.copiers.set,
     };
-    $scope.queryParameters.map[constants.KEY__EXTRACOLUMN__BUILDER] =
+    $scope.queryParameters.map[constants.KEY__EXTRACOLUMNS__BUILDER] =
         $scope.queryParameters.copiers.categoryValueMatch;
-    $scope.queryParameters.map[constants.KEY__EXTRACOLUMN__TEST] =
+    $scope.queryParameters.map[constants.KEY__EXTRACOLUMNS__TEST] =
         $scope.queryParameters.copiers.categoryValueMatch;
 
     // Loads all parameters into $scope from the URL query string;
     // any which are not found within the URL will keep their current value.
     $scope.queryParameters.load = function() {
       var nameValuePairs = $location.search();
       angular.forEach($scope.queryParameters.map,
                       function(copier, paramName) {
                         copier.load(nameValuePairs, paramName);
                       }
@@ skipping 46 matching lines @@
       // another copy of the array.  Is there a way we can filter out
       // the imagePairs as they are displayed, rather than storing multiple
       // array copies?  (For better performance.)
 
       if ($scope.viewingTab == $scope.defaultTab) {
 
         // TODO(epoger): Until we allow the user to reverse sort order,
         // there are certain columns we want to sort in a different order.
         var doReverse = (
             ($scope.sortColumnKey ==
-             constants.KEY__DIFFERENCE_DATA__PERCENT_DIFF_PIXELS) ||
+             constants.KEY__DIFFERENCES__PERCENT_DIFF_PIXELS) ||
             ($scope.sortColumnKey ==
-             constants.KEY__DIFFERENCE_DATA__PERCEPTUAL_DIFF));
+             constants.KEY__DIFFERENCES__PERCEPTUAL_DIFF));
 
         $scope.filteredImagePairs =
             $filter("orderBy")(
                 $filter("removeHiddenImagePairs")(
                     $scope.imagePairs,
                     $scope.hiddenResultTypes,
                     $scope.hiddenConfigs,
                     $scope.categoryValueMatch.builder,
                     $scope.categoryValueMatch.test,
                     $scope.viewingTab
@@ skipping 23 matching lines @@
      * after updateResults().
      */
     $scope.resultsUpdatedCallback = function() {
       $scope.renderEndTime = window.performance.now();
       $log.debug("renderEndTime: " + $scope.renderEndTime);
     }
 
     /**
      * Re-sort the displayed results.
      *
-     * @param subdict (string): which subdictionary
-     *     (constants.KEY__DIFFERENCE_DATA, constants.KEY__EXPECTATIONS_DATA,
-     *      constants.KEY__EXTRA_COLUMN_VALUES) the sort column key is within
+     * @param subdict (string): which KEY__IMAGEPAIRS__* subdictionary
+     *     the sort column key is within
      * @param key (string): sort by value associated with this key in subdict
      */
     $scope.sortResultsBy = function(subdict, key) {
       $scope.sortColumnSubdict = subdict;
       $scope.sortColumnKey = key;
       $scope.updateResults();
     }
 
     /**
      * For a particular ImagePair, return the value of the column we are
@@ skipping 97 matching lines @@
       // rebaselining failures in alternative renderModes, but it does work.
       // For a better solution, see
       // https://code.google.com/p/skia/issues/detail?id=1748 ('gm: add new
       // result type, RenderModeMismatch')
       var encounteredComparisonConfig = false;
 
       var updatedExpectations = [];
       for (var i = 0; i < imagePairsSubset.length; i++) {
         var imagePair = imagePairsSubset[i];
         var updatedExpectation = {};
-        updatedExpectation[constants.KEY__EXPECTATIONS_DATA] =
-            imagePair[constants.KEY__EXPECTATIONS_DATA];
-        updatedExpectation[constants.KEY__EXTRA_COLUMN_VALUES] =
-            imagePair[constants.KEY__EXTRA_COLUMN_VALUES];
-        updatedExpectation[constants.KEY__NEW_IMAGE_URL] =
-            imagePair[constants.KEY__IMAGE_B_URL];
-        if (0 == updatedExpectation[constants.KEY__EXTRA_COLUMN_VALUES]
-                                   [constants.KEY__EXTRACOLUMN__CONFIG]
+        updatedExpectation[constants.KEY__IMAGEPAIRS__EXPECTATIONS] =
+            imagePair[constants.KEY__IMAGEPAIRS__EXPECTATIONS];
+        updatedExpectation[constants.KEY__IMAGEPAIRS__EXTRACOLUMNS] =
+            imagePair[constants.KEY__IMAGEPAIRS__EXTRACOLUMNS];
+        // IMAGE_B_URL contains the actual image (which is now the expectation)
+        updatedExpectation[constants.KEY__IMAGEPAIRS__IMAGE_B_URL] =
+            imagePair[constants.KEY__IMAGEPAIRS__IMAGE_B_URL];
+        if (0 == updatedExpectation[constants.KEY__IMAGEPAIRS__EXTRACOLUMNS]
+                                   [constants.KEY__EXTRACOLUMNS__CONFIG]
                                    .indexOf('comparison-')) {
           encounteredComparisonConfig = true;
         }
 
         // Advanced settings...
-        if (null == updatedExpectation[constants.KEY__EXPECTATIONS_DATA]) {
-          updatedExpectation[constants.KEY__EXPECTATIONS_DATA] = {};
+        if (null == updatedExpectation[constants.KEY__IMAGEPAIRS__EXPECTATIONS]) {
+          updatedExpectation[constants.KEY__IMAGEPAIRS__EXPECTATIONS] = {};
         }
-        updatedExpectation[constants.KEY__EXPECTATIONS_DATA]
+        updatedExpectation[constants.KEY__IMAGEPAIRS__EXPECTATIONS]
                           [constants.KEY__EXPECTATIONS__REVIEWED] =
             $scope.submitAdvancedSettings[
                 constants.KEY__EXPECTATIONS__REVIEWED];
         if (true == $scope.submitAdvancedSettings[
             constants.KEY__EXPECTATIONS__IGNOREFAILURE]) {
           // if it's false, don't send it at all (just keep the default)
-          updatedExpectation[constants.KEY__EXPECTATIONS_DATA]
+          updatedExpectation[constants.KEY__IMAGEPAIRS__EXPECTATIONS]
                             [constants.KEY__EXPECTATIONS__IGNOREFAILURE] = true;
         }
-        updatedExpectation[constants.KEY__EXPECTATIONS_DATA]
+        updatedExpectation[constants.KEY__IMAGEPAIRS__EXPECTATIONS]
                           [constants.KEY__EXPECTATIONS__BUGS] = bugs;
 
         updatedExpectations.push(updatedExpectation);
       }
       if (encounteredComparisonConfig) {
         alert("Approval failed -- you cannot approve results with config " +
             "type comparison-*");
         $scope.submitPending = false;
         return;
       }
@@ skipping 203 matching lines @@
      * Depending on which diff this is (whitediffs, pixeldiffs, etc.) this
      * will be relative to different base URLs.
      *
      * We must keep this function in sync with _get_difference_locator() in
      * ../imagediffdb.py
      *
      * @param imagePair: ImagePair to generate image diff URL for
      */
     $scope.getImageDiffRelativeUrl = function(imagePair) {
       var before =
-          imagePair[constants.KEY__IMAGE_A_URL] + "-vs-" +
-          imagePair[constants.KEY__IMAGE_B_URL];
+          imagePair[constants.KEY__IMAGEPAIRS__IMAGE_A_URL] + "-vs-" +
+          imagePair[constants.KEY__IMAGEPAIRS__IMAGE_B_URL];
       return before.replace(/[^\w\-]/g, "_") + ".png";
     }
 
   }
 );