Extract shared filters and aliasing code

appengine/swarming/elements/res/imp/botlist/bot-list-data.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-data>
 
@@ skipping 44 matching lines @@
   Methods:
     signIn(): Force a signin of the user using OAuth.  This happens
         automatically when auth_headers is set.
 
   Events:
     None.
 -->
 
 <link rel="import" href="/res/imp/bower_components/iron-ajax/iron-ajax.html">
 
-<link rel="import" href="bot-list-shared.html">
+<link rel="import" href="bot-list-shared-behavior.html">
 
 <dom-module id="bot-list-data">
   <template>
     <iron-ajax id="botlist"
        url="/_ah/api/swarming/v1/bots/list"
        headers="[[auth_headers]]"
        params="[[query_params]]"
        handle-as="json"
        last-response="{{_list}}"
        loading="{{_busy1}}">
@@ skipping 15 matching lines @@
        loading="{{_busy3}}">
     </iron-ajax>
   </template>
   <script>
   (function(){
     var BLACKLIST_DIMENSIONS = ["quarantined", "error"];
 
     Polymer({
       is: 'bot-list-data',
 
-      behaviors: [SwarmingBehaviors.BotListBehavior],
+      behaviors: [
+          SwarmingBehaviors.BotListBehavior,
+      ],
 
       properties: {
         // inputs
         auth_headers: {
           type: Object,
           observer: "signIn",
         },
         query_params: {
           type: Object,
         },
@@ skipping 13 matching lines @@
           type: Array,
           computed: "_makeArray(_dimensions)",
           notify: true,
         },
         fleet: {
           type: Object,
           computed: "_fleet(_count)",
           notify: true,
         },
         primary_map: {
-          type:Object,
+          type: Object,
           computed: "_primaryMap(_dimensions)",
           notify: true,
         },
         primary_arr: {
           type: Array,
           //BOT_PROPERTIES is inherited from BotListBehavior
           computed: "_primaryArr(dimensions, BOT_PROPERTIES)",
           notify: true,
         },
 
@@ skipping 66 matching lines @@
       _makeArray: function(dimObj) {
         if (!dimObj || !dimObj.bots_dimensions) {
           return [];
         }
         var dims = [];
         dimObj.bots_dimensions.forEach(function(d){
           if (BLACKLIST_DIMENSIONS.indexOf(d.key) === -1) {
             dims.push(d.key);
           }
         });
+        dims.push("id");
         dims.sort();
         return dims;
       },
 
       _primaryArr: function(dimensions, properties) {
         return dimensions.concat(properties);
       },
 
       _primaryMap: function(dimensions){
         // pMap will have a list of columns to available values (primary key
         // to secondary values). This includes bot dimensions, but also
         // includes state like disk_space, quarantined, busy, etc.
         dimensions = dimensions.bots_dimensions;
 
         var pMap = {};
         dimensions.forEach(function(d){
-          if (this.DIMENSIONS_WITH_ALIASES.indexOf(d.key) === -1) {
+          if (swarming.alias.DIMENSIONS_WITH_ALIASES.indexOf(d.key) === -1) {
             // value is an array of all seen values for the dimension d.key
             pMap[d.key] = d.value;
           } else if (d.key === "gpu") {
             var gpus = [];
             d.value.forEach(function(g){
-              var alias = this._gpuAlias(g);
+              var alias = swarming.alias.gpu(g);
               if (alias !== "unknown") {
-                gpus.push(this._applyAlias(g, alias));
+                gpus.push(swarming.alias.apply(g, alias));
               } else {
                 gpus.push(g);
               }
             }.bind(this));
             pMap["gpu"] = gpus;
           } else if (d.key === "device_type") {
             var devs = [];
             d.value.forEach(function(dt){
-              var alias = this._androidAlias(dt);
+              var alias = swarming.alias.android(dt);
               if (alias !== "unknown") {
-                devs.push(this._applyAlias(dt, alias));
+                devs.push(swarming.alias.apply(dt, alias));
               } else {
                 devs.push(dt);
               }
             }.bind(this));
             pMap["device_type"] = devs;
           } else {
             console.log("Unknown alias type: ", d);
           }
-        }.bind(this));
+        });
 
         // Add some options that might not show up.
         pMap["android_devices"].push("0");
         pMap["device_os"].push("none");
         pMap["device_type"].push("none");
 
         pMap["id"] = [];
 
         // Create custom filter options
         pMap["disk_space"] = [];
         pMap["task"] = ["busy", "idle"];
         pMap["status"] = ["alive", "dead", "quarantined"];
 
         // No need to sort any of this, bot-filters sorts secondary items
         // automatically, especially when the user types a query.
         return pMap;
       },
 
     });
   })();
   </script>
 </dom-module>