Add links to MP and resolve minor fixes

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>
 
@@ skipping 49 matching lines @@
 
     <url-param name="s"
       value="{{_sortstr}}"
       default_value="id:asc">
     </url-param>
 
     <swarming-app
       client_id="[[client_id]]"
       auth_headers="{{_auth_headers}}"
       signed_in="{{_signed_in}}"
+      server_details="{{_server_details}}"
 
       busy="[[_or(_busy1,_busy2)]]"
       name="Swarming Bot List">
 
       <h2 hidden$="[[_signed_in]]">You must sign in to see anything useful.</h2>
 
       <div hidden$="[[_not(_signed_in)]]">
 
         <div class="horizontal layout">
 
@@ skipping 52 matching lines @@
               array (we are listening to all subproperties). The element returned is
               not of much use, so we'll ignore it in _hide() and use this._columns.
               -->
               <th hidden$="[[_hide('cloud_console_link', _columns.*)]]">
                 <span>Bot in Cloud Console</span>
                 <sort-toggle
                     name="cloud_console_link"
                     current="[[_sort]]">
                 </sort-toggle>
               </th>
+              <th hidden$="[[_hide('mp_lease_id', _columns.*)]]">
+                <span>Machine Provider Lease Id</span>
+                <sort-toggle
+                    name="mp_lease_id"
+                    current="[[_sort]]">
+                </sort-toggle>
+              </th>
               <th hidden$="[[_hide('task', _columns.*)]]">
                 <span>Current Task</span>
                 <sort-toggle
                     name="task"
                     current="[[_sort]]">
                 </sort-toggle>
               </th>
 
               <template
                   is="dom-repeat"
@@ skipping 23 matching lines @@
                       class="center"
                       href$="[[_botLink(bot.bot_id)]]"
                       target="_blank"
                       rel="noopener">
                       [[bot.bot_id]]
                   </a>
                 </td>
                 <td hidden$="[[_hide('cloud_console_link', _columns.*)]]">
                   <a href$="[[_ccLink(bot)]]">[[_ccText(bot)]]</a>
                 </td>
+                <td hidden$="[[_hide('mp_lease_id', _columns.*)]]">
+                  <a href$="[[_mpLink(bot, _server_details.machine_provider_template)]]">
+                    [[_column('mp_lease_id', bot,_verbose)]]
+                  </a>
+                </td>
                 <td hidden$="[[_hide('task', _columns.*)]]">
                   <a href$="[[_taskLink(bot.task_id)]]">[[_taskId(bot)]]</a>
                 </td>
 
                 <template
                     is="dom-repeat"
                     items="[[_plainColumns]]"
                     as="c">
                   <td hidden$="[[_hide(c)]]">
                     [[_column(c, bot, _verbose)]]
@@ skipping 34 matching lines @@
 
       <error-toast></error-toast>
     </swarming-app>
 
   </template>
   <script>
   (function(){
     var UNKNOWN = "unknown";
     // see dynamic-table for more information on specialColumns, headerMap,
     // columnMap, and specialSort
-    var specialColumns = ["id", "task"];
+    var specialColumns = ["id", "task", "cloud_console_link", "mp_lease_id"];
 
     var headerMap = {
       // "id" and "task" are special, so they don't go here. They have their
       // headers hard-coded above.
       "android_devices": "Android Devices",
       "battery_health": "Battery Health",
       "battery_level": "Battery Level (%)",
       "battery_status": "Battery Status",
       "battery_temperature": "Battery Temp (°C)",
       "battery_voltage": "Battery Voltage (mV)",
       "bot_temperature": "Bot Temp (°C)",
       "cores": "Cores",
       "cpu": "CPU",
       "device": "Non-android Device",
       "device_os": "Device OS",
       "device_temperature": "Device Temp (°C)",
       "device_type": "Device Type",
       "disk_space": "Free Space (MB)",
       "first_seen": "First Seen",
       "gpu": "GPU",
       "last_seen": "Last Seen",
+      "mp_lease_expires": "Machine Provider Lease Expires",
       "os": "OS",
       "pool": "Pool",
       "running_time": "Swarming Uptime",
       "status": "Status",
       "uptime": "Bot Uptime",
       "xcode_version": "XCode Version",
     };
 
     var columnMap = {
       android_devices: function(bot) {
@@ skipping 24 matching lines @@
           return bot.state.temp.zones || UNKNOWN;
         }
         return bot.state.temp.average || UNKNOWN;
       },
       device_temperature: function(){
         return "";
       },
       disk_space: function(bot) {
         var aliased = [];
         bot.disks.forEach(function(disk){
-          var alias = sk.human.bytes(disk.mb, swarming.MB);
+          var alias = sk.human.bytes(disk.mb, sk.MB);
           aliased.push(swarming.alias.apply(disk.mb, disk.id + " "+ alias));
         }.bind(this));
         if (this._verbose) {
           return aliased.join(" | ");
         }
         return aliased[0];
       },
-
       external_ip: function(bot) {
         return bot.external_ip || "none";
       },
       first_seen: function(bot) {
         return sk.human.localeTime(bot.first_seen_ts)
       },
       id: function(bot) {
         return bot.bot_id;
       },
       last_seen: function(bot) {
         if (this._verbose) {
           return sk.human.localeTime(bot.last_seen_ts);
         }
         return this._timeDiffApprox(bot.last_seen_ts) + " ago";
       },
+      mp_lease_id: function(bot) {
+        var id = bot.lease_id || "none";
+        if (this._verbose) {
+          return id;
+        }
+        return id.substring(0, 10);
+      },
+      mp_lease_expires: function(bot) {
+        if (!bot.lease_expiration_ts) {
+          return "N/A";
+        }
+        if (this._verbose) {
+          return sk.human.localeTime(bot.lease_expiration_ts);
+        }
+        if (bot.lease_expiration_ts < new Date()) {
+          return this._timeDiffApprox(bot.lease_expiration_ts) + " ago";
+        }
+        return "in " + this._timeDiffApprox(bot.lease_expiration_ts);
+      },
       running_time: function(bot) {
         var u = this._state(bot, "running_time");
         if (!u) {
           return "unknown";
         }
         return sk.human.strDuration(u);
       },
       status: function(bot) {
         // If a bot is both dead and quarantined, show the deadness over the
         // quarentinedness.
@@ skipping 197 matching lines @@
           value: specialColumns,
         },
         _specialSort: {
           type: Object,
           value: specialSort,
         },
       },
 
       observers:["_reload(_query_params,_auth_headers)"],
 
+      _androidAliasDevice: function(device) {
+        if (device.notReady) {
+          return UNAUTHENTICATED.toUpperCase();
+        }
+        return swarming.alias.android(this._deviceType(device));
+      },
+
       _botClass: function(bot) {
         if (bot.is_dead) {
           return "dead";
         }
         if (bot.quarantined) {
           return "quarantined";
         }
         return "";
       },
 
       _ccLink: function(bot){
         var z = this._attribute(bot, "zone")[0];
         if (z === "unknown") {
           return undefined;
         }
         return this._cloudConsoleLink(z, bot.bot_id);
       },
 
       _ccText: function(bot){
         var z = this._attribute(bot, "zone")[0];
         if (z === "unknown") {
           return "Not on GCE";
         }
         return "View Bot";
       },
 
-      _androidAliasDevice: function(device) {
-        if (device.notReady) {
-          return UNAUTHENTICATED.toUpperCase();
-        }
-        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 "";
       },
 
+      _mpLink: function(bot, template) {
+        if (!bot || !bot.lease_id || !template) {
+          return false;
+        }
+        return template.replace("%s", bot.lease_id);
+      },
+
       _reload: function() {
         if (!this._auth_headers || !this._query_params) {
           return;
         }
         var url = "/_ah/api/swarming/v1/bots/list?" + sk.query.fromParamSet(this._query_params);
         this.$.page_bots.load(url,this._auth_headers);
       }
 
     });
   })();
   </script>
 </dom-module>