rebaseline_server JSON: pass category values as values, not keys

gm/rebaseline_server/static/view.html

Index: gm/rebaseline_server/static/view.html
diff --git a/gm/rebaseline_server/static/view.html b/gm/rebaseline_server/static/view.html
index 0b2476c534da14746446d46692dcbeaa27661556..8440fea88979e21091856d066215a657012b38d7 100644
--- a/gm/rebaseline_server/static/view.html
+++ b/gm/rebaseline_server/static/view.html
@@ -63,13 +63,14 @@
     <tr valign="top">
       <td>
         resultType<br>
-        <label ng-repeat="(resultType, count) in extraColumnHeaders[constants.KEY__EXTRACOLUMN__RESULT_TYPE][constants.KEY__VALUES_AND_COUNTS] track by $index">
+        <label ng-repeat="value in extraColumnHeaders[constants.KEY__EXTRACOLUMN__RESULT_TYPE][constants.KEY__EXTRACOLUMNHEADERS__VALUES]">
           <input type="checkbox"
                  name="resultTypes"
-                 value="{{resultType}}"
-                 ng-checked="!isValueInSet(resultType, hiddenResultTypes)"
-                 ng-click="toggleValueInSet(resultType, hiddenResultTypes); setUpdatesPending(true)">
-          {{resultType}} ({{count}})<br>
+                 value="{{value}}"
+                 ng-checked="!isValueInSet(value, hiddenResultTypes)"
+                 ng-click="toggleValueInSet(value, hiddenResultTypes); setUpdatesPending(true)">
+          {{value}}
+          ({{extraColumnHeaders[constants.KEY__EXTRACOLUMN__RESULT_TYPE][constants.KEY__EXTRACOLUMNHEADERS__COUNTS][$index]}})<br>
         </label>
         <button ng-click="hiddenResultTypes = {}; updateResults()">
           all
@@ -95,13 +96,14 @@
       </td>
       <td>
         config<br>
-        <label ng-repeat="(config, count) in extraColumnHeaders[constants.KEY__EXTRACOLUMN__CONFIG][constants.KEY__VALUES_AND_COUNTS] track by $index">
+        <label ng-repeat="value in extraColumnHeaders[constants.KEY__EXTRACOLUMN__CONFIG][constants.KEY__EXTRACOLUMNHEADERS__VALUES]">
           <input type="checkbox"
                  name="configs"
-                 value="{{config}}"
-                 ng-checked="!isValueInSet(config, hiddenConfigs)"
-                 ng-click="toggleValueInSet(config, hiddenConfigs); setUpdatesPending(true)">
-          {{config}} ({{count}})<br>
+                 value="{{value}}"
+                 ng-checked="!isValueInSet(value, hiddenConfigs)"
+                 ng-click="toggleValueInSet(value, hiddenConfigs); setUpdatesPending(true)">
+          {{value}}
+          ({{extraColumnHeaders[constants.KEY__EXTRACOLUMN__CONFIG][constants.KEY__EXTRACOLUMNHEADERS__COUNTS][$index]}})<br>
         </label>
         <button ng-click="hiddenConfigs = {}; updateResults()">
           all