Medium sized improvements to bot-list and task-list

appengine/swarming/elements/res/js/alias.js

 // Copyright 2016 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 // TODO(kjlubick): add tests for this code
 
 this.swarming = this.swarming || {};
 this.swarming.alias = this.swarming.alias || (function(){
   var ANDROID_ALIASES = {
     "angler": "Nexus 6p",
@@ skipping 33 matching lines @@
     "10de:1244": "NVIDIA GeForce GTX 550 Ti",
     "10de:1401": "NVIDIA GeForce GTX 960",
     "8086":      "Intel",
     "8086:0412": "Intel Haswell Integrated",
     "8086:041a": "Intel Xeon Integrated",
     "8086:0a2e": "Intel Haswell Integrated",
     "8086:0d26": "Intel Crystal Well Integrated",
     "8086:22b1": "Intel Braswell Integrated",
   }
 
+  // Taken from http://developer.android.com/reference/android/os/BatteryManager.html
+  var BATTERY_HEALTH_ALIASES = {
+    1: "Unknown",
+    2: "Good",
+    3: "Overheated",
+    4: "Dead",
+    5: "Over Voltage",
+    6: "Unspecified Failure",
+    7: "Too Cold",
+  }
+
+  var BATTERY_STATUS_ALIASES = {
+    1: "Unknown",
+    2: "Charging",
+    3: "Discharging",
+    4: "Not Charging",
+    5: "Full",
+  }
+
   // For consistency, all aliases are displayed like:
   // Nexus 5X (bullhead)
   // This regex matches a string like "ALIAS (ORIG)", with ORIG as group 1.
   var ALIAS_REGEXP = /.+ \((.*)\)/;
 
   var alias = {};
 
-  alias.DIMENSIONS_WITH_ALIASES = ["device_type", "gpu"];
+  alias.DIMENSIONS_WITH_ALIASES = ["device_type", "gpu", "battery_health"];
 
   alias.android = function(dt) {
     return ANDROID_ALIASES[dt] || UNKNOWN;
   };
 
+  alias.battery_health = function(bh) {
+    return BATTERY_HEALTH_ALIASES[bh] || UNKNOWN;
+  };
+
+  alias.battery_status = function(bs) {
+    return BATTERY_STATUS_ALIASES[bs] || UNKNOWN;
+  };
+
   // alias.apply tries to alias the string "orig" based on what "type" it is.
   // If type is in DIMENSIONS_WITH_ALIASES, the appropriate alias (e.g. gpu)
   // is automatically applied.  Otherwise, "type" is treated as the alias.
   // If type is known, but there is no matching alias (e.g. for gpu: FOOBAR)
   // the original will be returned.
   alias.apply = function(orig, type) {
     var aliaser = aliasMap[type];
     if (!aliaser) {
       // treat type as the actual alias
       return type + " ("+orig+")";
     }
     var alias = aliaser(orig);
-    if (alias !== "unknown") {
+    if (alias !== UNKNOWN) {
       return alias + " ("+orig+")";
     }
     return orig;
   };
 
   alias.has = function(type) {
     return !!aliasMap[type];
   };
 
   alias.gpu = function(gpu) {
     return GPU_ALIASES[gpu] || UNKNOWN;
   };
 
   // alias.unapply will return the base dimension/state with its alias removed
   // if it had one.  This is handy for sorting and filtering.
   alias.unapply = function(str) {
     var match = ALIAS_REGEXP.exec(str);
     if (match) {
       return match[1];
     }
     return str;
   };
 
   var aliasMap = {
     "device_type": alias.android,
     "gpu": alias.gpu,
+    "battery_health": alias.battery_health,
+    "battery_status": alias.battery_status,
   }
 
   return alias;
 })();