Link Swarming Tasklist and Botlist together

appengine/swarming/ui/res/imp/common/common-behavior.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.
 
   It contains the definition of the following Behaviors:
 
     SwarmingBehaviors.CommonBehavior
 
   To use it, include
@@ skipping 12 matching lines @@
     SwarmingBehaviors.CommonBehavior = {
 
       _botLink: function(bot_id) {
         if (!bot_id) {
           return undefined;
         }
         return "/bot?id=" + bot_id;
       },
 
       // Create a link to a bot list with the preloaded filters and columns.
-      // filters should be an array of {key:String, value:String} and
+      // filters should be an array of {key:String, value:String} or an array

[jcgregorio, 2016/12/06 18:51:55]

Document arg params like you did in task-list-data.html.

Here and for _taskListLink.

[kjlubick, 2016/12/06 20:05:27]

Done.

+      // of {key:String, value:Array<String>} or an array of Strings
+      // of Strings, where the Strings are valid filters (e.g. "foo:bar") and

[stephana, 2016/12/06 18:43:39]

typo: "array of Strings of Strings"

[kjlubick, 2016/12/06 18:50:32]

Done.

       // columns should be an array of Strings.
       _botListLink: function(filters, columns) {
         filters = filters || [];
         columns = columns || [];
         var fArr = [];
         filters.forEach(function(f){
-          fArr.push(f.key + ":" + f.value);
+          if (f.key && f.value) {
+            if (Array.isArray(f.value)) {
+              f.value.forEach(function(v) {
+                fArr.push(f.key + ":" + v);
+              });
+            } else {
+              fArr.push(f.key + ":" + f.value);
+            }
+          } else {
+            fArr.push(f);
+          }
         });
         var obj = {
           f: fArr,
           c: columns,
         }
         return "/botlist?" + sk.query.fromParamSet(obj);
       },
 
       // Create a link to a bot in Google Cloud Console. Cloud console will try
       // to find the bot in the last project the user was logged in as, which
@@ skipping 124 matching lines @@
           // task abcefgh0 is the "canonical" task id. The first try has the id
           // abcefgh1. If there is a second (transparent retry), it will be
           // abcefgh2.  We almost always want to link to the canonical one,
           // because the milo output (if any) will only be generated for
           // abcefgh0, not abcefgh1 or abcefgh2.
           taskId = taskId.substring(0, taskId.length - 1) + "0";
         }
         return "/task?id=" + taskId;
       },
 
+      // Create a link to a task list with the preloaded filters and columns.
+      // filters should be an array of {key:String, value:String} or an array
+      // of Strings, where the Strings are valid filters (e.g. "foo:bar") and
+      // columns should be an array of Strings.
+      _taskListLink: function(filters, columns) {
+        filters = filters || [];
+        columns = columns || [];
+        var fArr = [];
+        filters.forEach(function(f){
+          if (f.key && f.value) {
+            fArr.push(f.key + ":" + f.value);
+          } else {
+            fArr.push(f);
+          }
+        });
+        var obj = {
+          f: fArr,
+          c: columns,
+        }
+        return "/tasklist?" + sk.query.fromParamSet(obj);
+      },
+
       // _timeDiffApprox returns the approximate difference between now and
       // the specified date.
       _timeDiffApprox: function(date){
         if (!date) {
           return "eons";
         }
         return sk.human.diffDate(date.getTime());
       },
 
       // timeDiffExact returns the exact difference between the two specified
       // dates.  E.g. 2d 22h 22m 28s ago If a second date is not provided,
       // now is used.
       _timeDiffExact: function(first, second){
         if (!first) {
           return "eons";
         }
         if (!second) {
           second = new Date();
         }
         return this._humanDuration((second.getTime() - first.getTime())/1000);
       },
 
       _truthy: function(a){
         return !!a;
       }
     };
   })();
 </script>