Extract shared filters and aliasing code

appengine/swarming/elements/res/imp/common/dynamic-table.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 file contains most of the logic needed to create a dynamic table. It is broken up into two
   parts, a style dom-module called "dynamic-table-style" and a behavior called
   SwarmingBehaviors.DynamicTableBehavior. This behavior ties together filtering, sorting and column
   content. It also offers a few utilities to make creating the table easier. A client of these two
   parts needs to create the templates to actually draw the <table>,<tr> and so on.  See
@@ skipping 39 matching lines @@
     _filteredSortedItems, Array<Object>, The list of items that should shown, after filtering and
         sorting.
     _plainColumns, Array<String>, the list of columns with any special columns stripped out.
 
   This behavior provides the following methods:
     _column(col, item): Return the text content of item for a column.
     _header(col): Return the header for a column, defaulting to the column name.
     _hide(col): Return a boolean based on whether to hide this column.
     _sortChange(event): Update the sorting based on an event created by sort-toggle.
  -->
-
+<link rel="import" href="common-aliases.html">
 <dom-module id="dynamic-table-style">
   <template>
     <style>
       table {
         border-collapse: collapse;
         margin-left: 5px;
       }
       td, th {
         border: 1px solid #DDD;
         padding: 5px;
       }
       th {
         position: relative;
       }
       sort-toggle {
         position: absolute;
         right: 0;
         top: 0.4em;
       }
     </style>
 
   </template>
 </dom-module>
 
 <script>
-  window.SwarmingBehaviors = window.SwarmingBehaviors || {};
   (function(){
     // This behavior wraps up all the shared swarming functionality.
-    SwarmingBehaviors.DynamicTableBehavior = {
+    SwarmingBehaviors.DynamicTableBehavior = [SwarmingBehaviors.Aliases, {
 
       properties: {
 
         _columns: {
           type: Array,
         },
 
         _filter: {
           type: Function,
         },
@@ skipping 107 matching lines @@
       },
       // _stripSpecial removes the special columns and sorts the remaining
       // columns so they always appear in the same order, regardless of
       // the order they are added.
       _stripSpecial: function(){
         return this._columns.filter(function(c) {
           return this._specialColumns.indexOf(c) === -1;
         }.bind(this)).sort();
       },
 
-    };
+      // Common columns shared between tasklist and botlist
+      _commonColumns: function() {
+        // return a fresh object so all elements have their own copy
+        return {
+          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);
+          },
+          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 || !named.length) {
+              return verbose.join(" | ");
+            }
+            return named.join(" | ");
+          },
+          pool: function(bot) {
+            var pool = this._attribute(bot, "pool");
+            return pool.join(" | ");
+          },
+        };
+      },
+

[jcgregorio, 2016/08/23 13:07:44]

One blank line here.

[kjlubick, 2016/08/23 17:43:19]

Done.

+
+    }];
   })();
 </script>