Extract shared filters and aliasing code

appengine/swarming/elements/res/imp/botlist/bot-list.html

 <!--
   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.
 
   This in an HTML Import-able file that contains the definition
   of the following elements:
 
     <bot-list>
 
   bot-list creats a dynamic table for viewing swarming bots.  Columns can be
   dynamically filtered and it supports client-side filtering.
 
   This is a top-level element.
 
   Properties:
     client_id: String, Oauth 2.0 client id.  It will be set by server-side
         template evaluation.
 
   Methods:
     None.
 
   Events:
     None.
 -->
 
 <link rel="import" href="/res/imp/bower_components/iron-flex-layout/iron-flex-layout-classes.html">
 <link rel="import" href="/res/imp/bower_components/polymer/polymer.html">
 
-<link rel="import" href="/res/imp/common/dynamic-table.html">
+<link rel="import" href="/res/imp/common/dynamic-table-behavior.html">
 <link rel="import" href="/res/imp/common/sort-toggle.html">
 <link rel="import" href="/res/imp/common/swarming-app.html">
 <link rel="import" href="/res/imp/common/url-param.html">
 
 <link rel="import" href="bot-filters.html">
 <link rel="import" href="bot-list-data.html">
-<link rel="import" href="bot-list-shared.html">
+<link rel="import" href="bot-list-shared-behavior.html">
 <link rel="import" href="bot-list-summary.html">
 
 <dom-module id="bot-list">
   <template>
     <style include="iron-flex iron-flex-alignment iron-positioning swarming-app-style dynamic-table-style">
       bot-filters, bot-list-summary {
         margin-bottom: 8px;
         margin-right: 10px;
       }
       .quarantined, .bad-device {
@@ skipping 179 matching lines @@
       "device_type": "Device Type",
       "disk_space": "Free Space (MB)",
       "gpu": "GPU",
       "os": "OS",
       "pool": "Pool",
       "status": "Status",
       "xcode_version": "XCode Version",
     };
 
     var columnMap = {
-      android_devices: function(bot) {
-        var devs = this._attribute(bot, "android_devices", "0");
-        if (this._verbose) {
-          return devs.join(" | ") + " devices available";
-        }
-        // max() works on strings as long as they can be coerced to Number.
-        return Math.max(...devs) + " devices available";
-      },
-      device_type: function(bot) {
-        var dt = this._attribute(bot, "device_type", "none");
-        dt = dt[0];
-        var alias = this._androidAlias(dt);
-        if (alias === "unknown") {
-          return dt;
-        }
-        return this._applyAlias(dt, alias);
-      },
       disk_space: function(bot) {
         var aliased = [];
         bot.disks.forEach(function(disk){
           var alias = sk.human.bytes(disk.mb, swarming.MB);
-          aliased.push(this._applyAlias(disk.mb, disk.id + " "+ alias));
+          aliased.push(swarming.alias.apply(disk.mb, disk.id + " "+ alias));
         }.bind(this));
         if (this._verbose) {
           return aliased.join(" | ");
         }
         return aliased[0];
       },
-      gpu: function(bot){
-        var gpus = this._attribute(bot, "gpu", "none")
-        var verbose = []
-        var named = [];
-        // non-verbose mode has only the top level GPU info "e.g. NVidia"
-        // which is found by looking for gpu ids w/o a colon.
-        gpus.forEach(function(g){
-          var alias = this._gpuAlias(g);
-          if (alias === "unknown") {
-            verbose.push(g);
-            if (g.indexOf(":") === -1) {
-              named.push(g);
-            }
-            return;
-          }
-          verbose.push(this._applyAlias(g, alias));
-          if (g.indexOf(":") === -1) {
-            named.push(this._applyAlias(g, alias));
-          }
-        }.bind(this))
-        if (this._verbose) {
-          return verbose.join(" | ");
-        }
-        return named.join(" | ");
-      },
       id: function(bot) {
         return bot.bot_id;
       },
-      pool: function(bot) {
-        var pool = this._attribute(bot, "pool");
-        return pool.join(" | ");
-      },
       status: function(bot) {
         // If a bot is both dead and quarantined, show the deadness over the
         // quarentinedness.
         if (bot.is_dead) {
           return "Dead.  Last seen " + sk.human.diffDate(bot.last_seen_ts) +
               " ago";
         }
         if (bot.quarantined) {
-          return "Quarantined: " + this._attribute(bot, "quarantined");
+          var msg = this._state(bot, "quarantined")[0];
+          // Sometimes, the quarantined message is actually in "error".  This
+          // happens when the bot code has thrown an exception.
+          if (msg === "unknown" || msg === "true" || msg === true) {
+            msg = this._attribute(bot, "error");
+          }
+          return "Quarantined: " + msg;
         }
         return "Alive";
       },
       task: function(bot){
         return this._taskId(bot);
       },
     };
 
     var deviceColumnMap = {
       android_devices: function(device) {
         var str = this._androidAliasDevice(device);
         if (device.okay) {
-          str = this._applyAlias(this._deviceType(device), str);
+          str = swarming.alias.apply(this._deviceType(device), str);
         }
         str += " S/N:";
         str += device.serial;
         return str;
       },
       device_os: function(device) {
         if (device.build) {
           return device.build["build.id"];
         }
         return "unknown";
@@ skipping 16 matching lines @@
       disk_space: function(dir, botA, botB) {
         // We sort based on the raw number of MB of the first disk.
         var botACol = botA.disks[0].mb;
         var botBCol = botB.disks[0].mb;;
         return dir * swarming.naturalCompare(botACol, botBCol);
       },
     };
 
     Polymer({
       is: 'bot-list',
-      behaviors: [SwarmingBehaviors.BotListBehavior,
-                  SwarmingBehaviors.DynamicTableBehavior],
+
+      // The order behaviors are applied in matters - later ones overwrite
+      // attributes of earlier ones
+      behaviors: [
+          SwarmingBehaviors.BotListBehavior,
+          SwarmingBehaviors.DynamicTableBehavior,
+      ],
 
       properties: {
         client_id: {
           type: String,
         },
 
         // For dynamic table.
         _columnMap: {
           type: Object,
-          value: columnMap,
+          value: function() {
+            var base = this._commonColumns();
+            for (var attr in columnMap) {
+              base[attr] = columnMap[attr];
+            }
+            return base;
+          },
         },
         _headerMap: {
           type: Object,
           value: headerMap,
         },
         _specialColumns: {
           type: Array,
           value: specialColumns,
         },
         _specialSort: {
@@ skipping 16 matching lines @@
       _botLink: function(id) {
         // TODO(kjlubick) Make this point to /newui/ when appropriate.
         return "/restricted/bot/"+id;
       },
 
 
       _androidAliasDevice: function(device) {
         if (device.notReady) {
           return UNAUTHENTICATED.toUpperCase();
         }
-        return this._androidAlias(this._deviceType(device));
+        return swarming.alias.android(this._deviceType(device));
       },
 
       _deviceColumn: function(col, device) {
         var f = deviceColumnMap[col];
         if (!f || !device) {
           return "";
         }
         return f.bind(this)(device);
       },
 
       _deviceClass: function(device) {
         if (!device.okay) {
           return "bad-device";
         }
         return "";
       },
 
       _taskLink: function(data) {
         if (data && data.task_id) {
           return "/user/task/" + data.task_id;
         }
         return undefined;
       }
 
     });
   })();
   </script>
 </dom-module>