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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: appengine/swarming/elements/res/imp/taskpage/task-page-demo.html

Issue 2337363003: Create boilerplate for task-page (Closed) Base URL: git@github.com:luci/luci-py@refactor-task
Patch Set: Address whitespace Created 4 years, 3 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
« no previous file with comments | « appengine/swarming/elements/res/imp/taskpage/task-page-data.html ('k') | appengine/swarming/templates/public_task_index.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: appengine/swarming/elements/res/imp/taskpage/task-page-demo.html
diff --git a/appengine/swarming/elements/res/imp/botpage/bot-page-demo.html b/appengine/swarming/elements/res/imp/taskpage/task-page-demo.html
similarity index 50%
copy from appengine/swarming/elements/res/imp/botpage/bot-page-demo.html
copy to appengine/swarming/elements/res/imp/taskpage/task-page-demo.html
index 6e068ec13d1b92e5d0ec5558596a8ba1dd4a84d0..4376670673a510b4063be5a8e98a8ea59bb33817 100644
--- a/appengine/swarming/elements/res/imp/botpage/bot-page-demo.html
+++ b/appengine/swarming/elements/res/imp/taskpage/task-page-demo.html
@@ -7,7 +7,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>bot-page Demo</title>
+ <title>task-page Demo</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1, user-scalable=yes">
@@ -16,19 +16,19 @@
<script src="/res/js/common.js"></script>
<script src="/res/js/alias.js"></script>
<script src="../../../node_modules/sinon/pkg/sinon-1.17.5.js"></script>
- <!-- Makes a var called bots. It's an array of things that could be returned-->
- <script type="text/javascript" src="bot-demo.json"></script>
- <!-- Makes a var called events. It's an array of things that could be returned-->
- <script type="text/javascript" src="bot-events-demo.json"></script>
- <!-- Makes a var called tasks. It's an array of things that could be returned-->
- <script type="text/javascript" src="bot-tasks-demo.json"></script>
+ <!-- Makes a var called requests. It's an array of things that could be returned-->
+ <script type="text/javascript" src="task-request-demo.json"></script>
+ <!-- Makes a var called results. It's an array of things that could be returned-->
+ <script type="text/javascript" src="task-result-demo.json"></script>
+ <!-- Makes a var called stdouts. It's an array of things that could be returned-->
+ <script type="text/javascript" src="task-stdout-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 = 1000;
+ server.autoRespondAfter = 700;
var genResponse = function(arr) {
return function(request){
@@ -40,7 +40,7 @@
sinon.log("User authenticated :) "+ request.requestHeaders.authorization);
sinon.log("Bot Request: "+sinon.format(request));
// If the user changes bot id, show them some of the other sample data.
- var idx = request.url.indexOf("-00");
+ var idx = request.url.indexOf("f00");
var item = 0;
if (idx !=-1) {
var name = request.url.substring(idx+1, idx+4);
@@ -49,25 +49,22 @@
name = Math.min(name, arr.length-1);
}
-
request.respond(200, {"Content-Type":"application/json"}, JSON.stringify(arr[name]));
}
}
- server.respondWith("GET", /^\/_ah\/api\/swarming\/v1\/bot\/test-bot-\d+\/get.*/, genResponse(bots));
- server.respondWith("GET", /^\/api\/swarming\/v1\/bot\/test-bot-\d+\/get.*/, genResponse(bots));
+ server.respondWith("GET", /^\/_ah\/api\/swarming\/v1\/task\/abcdef\d+\/request.*/, genResponse(requests));
+ server.respondWith("GET", /^\/api\/swarming\/v1\/task\/abcdef\d+\/request.*/, genResponse(requests));
- server.respondWith("GET", /^\/_ah\/api\/swarming\/v1\/bot\/test-bot-\d+\/events.*/, genResponse(events));
- server.respondWith("GET", /^\/api\/swarming\/v1\/bot\/test-bot-\d+\/events.*/, genResponse(events));
+ server.respondWith("GET", /^\/_ah\/api\/swarming\/v1\/task\/abcdef\d+\/result.*/, genResponse(results));
+ server.respondWith("GET", /^\/api\/swarming\/v1\/task\/abcdef\d+\/result.*/, genResponse(results));
- server.respondWith("GET", /^\/_ah\/api\/swarming\/v1\/bot\/test-bot-\d+\/tasks.*/, genResponse(tasks));
- server.respondWith("GET", /^\/api\/swarming\/v1\/bot\/test-bot-\d+\/tasks.*/, genResponse(tasks));
+ server.respondWith("GET", /^\/_ah\/api\/swarming\/v1\/task\/abcdef\d+\/stdout.*/, genResponse(stdouts));
+ server.respondWith("GET", /^\/api\/swarming\/v1\/task\/abcdef\d+\/stdout.*/, genResponse(stdouts));
var permissions = {
cancel_task: true,
- delete_bot: true,
- terminate_bot: true,
};
server.respondWith("GET", /^\/_ah\/api\/swarming\/v1\/server\/permissions/, JSON.stringify(permissions));
server.respondWith("GET", /^\/api\/swarming\/v1\/server\/permissions/, JSON.stringify(permissions));
@@ -77,42 +74,17 @@
};
server.respondWith("GET", /^\/_ah\/api\/swarming\/v1\/server\/details/, JSON.stringify(details));
server.respondWith("GET", /^\/api\/swarming\/v1\/server\/details/, JSON.stringify(details));
-
- var deleteRequest = function(request) {
- console.log("Deleting", request);
- if (!request.requestHeaders.authorization) {
- sinon.log("You must be logged in (check your Oauth?)");
- request.respond(403, {}, "You must be logged in (check your Oauth?)");
- return;
- }
- request.respond(200, {}, "Bot has been deleted.");
- }
-
- server.respondWith("POST", /^\/_ah\/api\/swarming\/v1\/bot\/.+\/delete/, deleteRequest);
- server.respondWith("POST", /^\/api\/swarming\/v1\/bot\/.+\/delete/, deleteRequest);
-
- var terminateRequest = function(request) {
- console.log("Terminating", request);
- if (!request.requestHeaders.authorization) {
- sinon.log("You must be logged in (check your Oauth?)");
- request.respond(403, {}, "You must be logged in (check your Oauth?)");
- return;
- }
- request.respond(200, {}, "Bot has been terminated.");
- }
-
- server.respondWith("POST", /^\/_ah\/api\/swarming\/v1\/bot\/.+\/terminate/, terminateRequest);
- server.respondWith("POST", /^\/api\/swarming\/v1\/bot\/.+\/terminate/, terminateRequest);
</script>
- <link rel="import" href="bot-page.html">
+ <link rel="import" href="task-page.html">
</head>
<body>
-<bot-page
- bot_id="test-bot-001"
- client_id="20770472288-t5smpbpjptka4nd888fv0ctd23ftba2o.apps.googleusercontent.com">
-</bot-page>
+<task-page
+ task_id="abcdef001"
+ client_id="20770472288-t5smpbpjptka4nd888fv0ctd23ftba2o.apps.googleusercontent.com"
+ milo_prefix="/res/imp/taskpage/milo-sample.html?">
+</task-page>
</body>
</html>
« no previous file with comments | « appengine/swarming/elements/res/imp/taskpage/task-page-data.html ('k') | appengine/swarming/templates/public_task_index.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698