Add UI to new botlist to show summary

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 12 matching lines @@
 
 <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/sort-toggle.html">
 <link rel="import" href="/res/imp/common/swarming-app.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-summary.html">
 
 <dom-module id="bot-list">
   <template>
     <style include="iron-flex iron-flex-alignment iron-positioning swarming-app-style">
-      bot-filters {
+      bot-filters, bot-list-summary {
         margin-bottom: 5px;
+        margin-right: 5px;
       }
       .bot {
         margin:5px;
         max-width:400px;
         min-height:100px;
         min-width:300px;
       }
       table {
         border-collapse: collapse;
         margin-left: 5px;
@@ skipping 19 matching lines @@
         top: 0.4em;
       }
       .bot-list th > span {
         /* Leave space for sort-toggle*/
         padding-right: 30px;
       }
     </style>
 
     <swarming-app
       auth_headers="{{auth_headers}}"
+      signed_in="{{signed_in}}"
+
       busy="[[busy]]"
       name="Swarming Bot List">
 
-      <bot-filters
-        primary_map="[[primary_map]]"
-        primary_arr="[[primary_arr]]"
+      <h2 hidden$="[[signed_in]]">You must sign in to see anything useful.</h2>
 
-        columns="{{columns}}"
-        filter="{{filter}}"
-        verbose="{{verbose}}">
-      </bot-filters>
+      <div hidden$="[[_not(signed_in)]]">
 
-      <bot-list-data
-        auth_headers="[[auth_headers]]"
+        <div class="horizontal layout">
 
-        bots="{{bots}}"
-        busy="{{busy}}"
-        primary_map="{{primary_map}}"
-        primary_arr="{{primary_arr}}">
-      </bot-list-data>
+          <bot-filters
+            primary_map="[[primary_map]]"
+            primary_arr="[[primary_arr]]"
 
-      <table class="bot-list">
-        <thead on-sort_change="sortChange">
-        <!-- To allow for dynamic columns without having a lot of copy-pasted
-        code, we break columns up into "special" and "plain" columns. Special
-        columns require some sort of HTML output (e.g. anchor tags) and plain
-        columns just output text.  The plain columns use Polymer functions to
-        insert their text [_header(), _column(), _deviceColumn()].  Polymer
-        functions do not allow HTML (to avoid XSS), so special columns, like id
-        and task are inserted in a fixed order.
-        -->
-          <th>
-            <span>Bot Id</span>
-            <sort-toggle
-                name="id"
-                current="[[sort]]">
-            </sort-toggle>
-          </th>
-          <!-- This wonky syntax is the proper way to listen to changes on an
-          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.
+            columns="{{columns}}"
+            filter="{{filter}}"
+            verbose="{{verbose}}">
+          </bot-filters>
+
+          <bot-list-summary
+            fleet="[[fleet]]"
+            filtered_bots="[[filteredSortedBots]]">
+          </bot-list-summary>
+
+        </div>
+
+        <bot-list-data
+          auth_headers="[[auth_headers]]"
+
+          bots="{{bots}}"
+          busy="{{busy}}"
+          fleet="{{fleet}}"
+          primary_map="{{primary_map}}"
+          primary_arr="{{primary_arr}}">
+        </bot-list-data>
+
+        <table class="bot-list">
+          <thead on-sort_change="sortChange">

[stephana, 2016/08/02 14:00:29]

There should be a <tr> element wrapping the <th> elements. 

[kjlubick, 2016/08/03 12:52:30]

Done.

+          <!-- To allow for dynamic columns without having a lot of copy-pasted
+          code, we break columns up into "special" and "plain" columns. Special
+          columns require some sort of HTML output (e.g. anchor tags) and plain
+          columns just output text.  The plain columns use Polymer functions to
+          insert their text [_header(), _column(), _deviceColumn()].  Polymer
+          functions do not allow HTML (to avoid XSS), so special columns, like id
+          and task are inserted in a fixed order.
           -->
-          <th hidden$="[[_hide('task', columns.*)]]">
-            <span>Current Task</span>
-            <sort-toggle
-                name="task"
-                current="[[sort]]">
-            </sort-toggle>
-          </th>
-
-          <template is="dom-repeat"
-                items="[[plain_columns]]"
-                as="c">
-            <th hidden$="[[_hide(c)]]">
-              <span>[[_header(c)]]</span>
+            <th>
+              <span>Bot Id</span>
               <sort-toggle
-                  name="[[c]]"
+                  name="id"
                   current="[[sort]]">
               </sort-toggle>
             </th>
-          </template>
-        </thead>
-        <tbody>
-          <template id="bot_table" is="dom-repeat"
-                items="[[bots]]"
-                as="bot"
-                initial-count=50
-                filter="_filterBotTable">
+            <!-- This wonky syntax is the proper way to listen to changes on an
+            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('task', columns.*)]]">
+              <span>Current Task</span>
+              <sort-toggle
+                  name="task"
+                  current="[[sort]]">
+              </sort-toggle>
+            </th>
 
-            <tr class$="[[_botClass(bot)]]">
-              <td>
-                <a class="center"
-                   href$="[[_botLink(bot.bot_id)]]"
-                   target="_blank">
-                   [[bot.bot_id]]
-                </a>
-              </td>
-              <td hidden$="[[_hide('task', columns.*)]]">
-                <a href$="[[_taskLink(bot)]]">[[_taskId(bot)]]</a>
-              </td>
+            <template is="dom-repeat"
+                  items="[[plain_columns]]"
+                  as="c">
+              <th hidden$="[[_hide(c)]]">
+                <span>[[_header(c)]]</span>
+                <sort-toggle
+                    name="[[c]]"
+                    current="[[sort]]">
+                </sort-toggle>
+              </th>
+            </template>
+          </thead>
+          <tbody>
+            <template id="bot_table" is="dom-repeat"
+                  items="[[filteredSortedBots]]"
+                  as="bot"
+                  initial-count=50>
 
-              <template is="dom-repeat"
-                    items="[[plain_columns]]"
-                    as="c">
-                <td hidden$="[[_hide(c)]]">
-                  [[_column(c, bot, verbose)]]
+              <tr class$="[[_botClass(bot)]]">
+                <td>
+                  <a class="center"
+                     href$="[[_botLink(bot.bot_id)]]"
+                     target="_blank">
+                     [[bot.bot_id]]
+                  </a>
                 </td>
-              </template>
+                <td hidden$="[[_hide('task', columns.*)]]">
+                  <a href$="[[_taskLink(bot)]]">[[_taskId(bot)]]</a>
+                </td>
 
-            </tr>
-            <template is="dom-repeat"
-                  items="[[_devices(bot)]]"
-                  as="device">
-              <tr hidden$="[[_hide('devices', columns.*)]]"
-                  class$="[[_deviceClass(device)]]">
-                <td></td>
-                <td hidden$="[[_hide('task', columns.*)]]"></td>
                 <template is="dom-repeat"
                       items="[[plain_columns]]"
                       as="c">
                   <td hidden$="[[_hide(c)]]">
-                    [[_deviceColumn(c, device, verbose)]]
+                    [[_column(c, bot, verbose)]]
                   </td>
                 </template>
+
               </tr>
-            </template> <!--devices repeat-->
-          </template> <!--bot-table repeat-->
-        </tbody>
-      </table>
+              <template is="dom-repeat"
+                    items="[[_devices(bot)]]"
+                    as="device">
+                <tr hidden$="[[_hide('devices', columns.*)]]"
+                    class$="[[_deviceClass(device)]]">
+                  <td></td>
+                  <td hidden$="[[_hide('task', columns.*)]]"></td>
+                  <template is="dom-repeat"
+                        items="[[plain_columns]]"
+                        as="c">
+                    <td hidden$="[[_hide(c)]]">
+                      [[_deviceColumn(c, device, verbose)]]
+                    </td>
+                  </template>
+                </tr>
+              </template> <!--devices repeat-->
+            </template> <!--bot-table repeat-->
+          </tbody>
+        </table>
+      </div>
 
     </swarming-app>
 
   </template>
   <script>
   (function(){
     var special_columns = ["id", "task"];
 
     var headerMap = {
       // "id" and "task" are special, so they don't go here and have their
@@ skipping 85 matching lines @@
         return this._taskId(bot);
       },
     };
 
     Polymer({
       is: 'bot-list',
       behaviors: [SwarmingBehaviors.BotListBehavior],
 
       properties: {
 
+        bots: {
+          type: Array,
+        },
+
         columns: {
           type: Array,
         },
-        // Should have a property "filter" which is a function.
+
         filter: {

[stephana, 2016/08/02 14:00:29]

If these are exposed properties then they should be documented up top, otherwise
they should be prefixed with "_". 

[kjlubick, 2016/08/03 12:52:30]

Done.

-          type: Object,
+          type: Function,
+          value: function() {
+            return true;
+          },
+        },
+
+        filteredSortedBots: {
+          type: Array,
+          computed: "_filterAndSort(bots,filter.*,sort.*)"
         },
 
         plain_columns: {
           type: Array,
           computed: "_stripSpecial(columns.*)",
         },
 
         // sort is an Object {name:String, direction:String}.
         sort: {
           type: Object,
+          value: function() {
+            return {
+              name: "id",
+              direction: "asc",
+            };
+          }
         },
 
         verbose: {
           type: Boolean,
         }
       },
 
-      observers: [
-        '_reRender(filter.*)',
-        '_checkSorts(columns.*)'
-      ],
-
       _botClass: function(bot) {
         if (bot.is_dead) {
           return "dead";
         }
         if (bot.quarantined) {
           return "quarantined";
         }
         return "";
       },
 
       _botLink: function(id) {
         // TODO(kjlubick) Make this point to /newui/ when appropriate.
         return "/restricted/bot/"+id;
       },
 
-      // _checkSorts makes sure that if a column has been removed, the related
-      // sort is also removed.
-      _checkSorts: function() {
-        if (!this.sort) {
-          return;
-        }
-        this._reRender();
-      },
 
       _column: function(col, bot) {
         return columnMap[col].bind(this)(bot);
       },
 
       _deviceColumn: function(col, device) {
         if (col === "devices") {
           var str = this._androidAlias(device);
           if (device.okay) {
             str = this._applyAlias(this._deviceType(device), str);
           }
           str += " S/N:";
           str += device.serial;
           return str;
         }
         if (col === "status") {
           return device.state;
         }
         return "";
       },
 
       _deviceClass: function(device) {
         if (!device.okay) {
           return "bad-device";
         }
         return "";
       },
 
-      _filterBotTable: function(bot) {
-        if (!this.filter || !this.filter.filter) {
-          return true;
+      _filterAndSort: function(a,b,c) {
+        // We intentionally sort this.bots (and not a copy) to allow users to
+        // "chain" sorts, that is, sort by one thing and then another, and
+        // have both orderings properly impact the list.
+        swarming.stableSort(this.bots, this._sortBotTable.bind(this));
+        var bots = this.bots;
+        if (this.filter) {
+          bots = bots.filter(this.filter.bind(this));
         }
-        return this.filter.filter.bind(this)(bot);
+
+        return bots;
       },
 
       _header: function(col){
         return headerMap[col];
       },
 
       _hide: function(col) {
         return this.columns.indexOf(col) === -1;
       },
 
@@ skipping 14 matching lines @@
 
         return dir * swarming.naturalCompare(botACol, botBCol);
       },
 
       sortChange: function(e) {
         // The event we get from sort-toggle tells us the name of what needs
         // to be sorting and how to sort it.
         if (!(e && e.detail && e.detail.name)) {
           return;
         }
+        // should trigger __filterAndSort
         this.set("sort", e.detail);
-        swarming.stableSort(this.bots, this._sortBotTable.bind(this));
-        this._reRender();
       },
 
       // _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 special_columns.indexOf(c) === -1;
         }).sort();
       },
 
       _taskLink: function(data) {
         if (data && data.task_id) {
           return "/user/task/" + data.task_id;
         }
         return undefined;
       }
 
     });
   })();
   </script>
 </dom-module>