Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Unified Diff: appengine/swarming/elements/res/imp/botlist/bot-list-demo.html

Issue 2211163003: Update new botlist to use dimensions endpoint (Closed) Base URL: https://chromium.googlesource.com/external/github.com/luci/luci-py@limiting
Patch Set: Make devices column make more sense Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: appengine/swarming/elements/res/imp/botlist/bot-list-demo.html
diff --git a/appengine/swarming/elements/res/imp/botlist/bot-list-demo.html b/appengine/swarming/elements/res/imp/botlist/bot-list-demo.html
index d28aae209f41d35ee75504b3730e2130700a311e..8ffe5db6d6ce33bb4750f672be8d9389c99cf271 100644
--- a/appengine/swarming/elements/res/imp/botlist/bot-list-demo.html
+++ b/appengine/swarming/elements/res/imp/botlist/bot-list-demo.html
@@ -13,15 +13,18 @@
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1, user-scalable=yes">
<script src="../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
<script src="/res/js/common.js"></script>
- <script src="../../../node_modules/sinon/pkg/sinon-1.17.2.js"></script>
+ <script src="../../../node_modules/sinon/pkg/sinon-1.17.5.js"></script>
<!-- Makes a var called data-->
<script type="text/javascript" src="bot-list-demo.json"></script>
+ <!-- Makes a var called fleetData-->
+ <script type="text/javascript" src="bot-list-fleet-data-demo.json"></script>
<script type="text/javascript" charset="utf-8">
sinon.format = function(object) {return JSON.stringify(object);}
sinon.log = function(message) {console.log(message);};
var server = sinon.fakeServer.create();
server.autoRespond = true;
+ //server.autoRespondAfter = 2000;
jcgregorio 2016/08/08 16:14:42 leftover?
kjlubick 2016/08/08 19:07:10 This is convenient for testing how the demo looks
var respond = function(request){
if (!request.requestHeaders.authorization) {
@@ -30,11 +33,12 @@
return;
}
sinon.log("User authenticated :) "+ request.requestHeaders.authorization);
+ sinon.log("List Request: "+sinon.format(request));
request.respond(200, {"Content-Type":"application/json"}, JSON.stringify(data));
}
- server.respondWith("GET", "/_ah/api/swarming/v1/bots/list", respond);
- server.respondWith("GET", "/api/swarming/v1/bots/list", respond);
+ server.respondWith("GET", /^\/api\/swarming\/v1\/bots\/list.*/, respond);
+ server.respondWith("GET", /^\/_ah\/api\/swarming\/v1\/bots\/list.*/, respond);
var mockFleetSummary = {
"count": "2625",
@@ -46,8 +50,11 @@
"etag": "\"nhThK35uIVdvx1_Mr5DChu_DyBs/aO8fy5IdESDx-fy3If19oDKu0f0\""
};
- server.respondWith("GET", "/_ah/api/swarming/v1/bots/count", JSON.stringify(mockFleetSummary));
- server.respondWith("GET", "/api/swarming/v1/bots/count", JSON.stringify(mockFleetSummary));
+ server.respondWith("GET", /^\/_ah\/api\/swarming\/v1\/bots\/count/, JSON.stringify(mockFleetSummary));
+ server.respondWith("GET", /^\/api\/swarming\/v1\/bots\/count/, JSON.stringify(mockFleetSummary));
+
+ server.respondWith("GET", /^\/_ah\/api\/swarming\/v1\/bots\/dimensions/, JSON.stringify(fleetData));
+ server.respondWith("GET", /^\/api\/swarming\/v1\/bots\/dimensions/, JSON.stringify(fleetData));
</script>
<link rel="import" href="bot-list.html">

Powered by Google App Engine
This is Rietveld 408576698