- Revision
- 220434
- Author
- commit-qu...@webkit.org
- Date
- 2017-08-08 18:24:25 -0700 (Tue, 08 Aug 2017)
Log Message
Created Individual EWS Pages
https://bugs.webkit.org/show_bug.cgi?id=174477
Patch by obinna obike <oob...@apple.com> on 2017-08-08
Reviewed by Aakash Jain.
Created individual pages for each EWS. Changed the link within each status bubble
to go directly to the individual EWS page. Also added a link to original status page showing all EWSes.
* QueueStatusServer/handlers/patch.py:
(Patch.get): Handles the case for individual ews queue as well as for all EWS queues.
* QueueStatusServer/handlers/statusbubble.py:
(StatusBubble._build_bubble): Updated url for specific EWS.
* QueueStatusServer/main.py: Added a link to the individual ews in the routes dictionary.
* QueueStatusServer/templates/patch.html: Added a link to go directly to the page with
all ews queues.
* QueueStatusServer/templates/statusbubble.html: If you click on a statusbubble it
takes you directly to the individual ews page.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (220433 => 220434)
--- trunk/Tools/ChangeLog 2017-08-09 01:01:44 UTC (rev 220433)
+++ trunk/Tools/ChangeLog 2017-08-09 01:24:25 UTC (rev 220434)
@@ -1,3 +1,23 @@
+2017-08-08 obinna obike <oob...@apple.com>
+
+ Created Individual EWS Pages
+ https://bugs.webkit.org/show_bug.cgi?id=174477
+
+ Reviewed by Aakash Jain.
+
+ Created individual pages for each EWS. Changed the link within each status bubble
+ to go directly to the individual EWS page. Also added a link to original status page showing all EWSes.
+
+ * QueueStatusServer/handlers/patch.py:
+ (Patch.get): Handles the case for individual ews queue as well as for all EWS queues.
+ * QueueStatusServer/handlers/statusbubble.py:
+ (StatusBubble._build_bubble): Updated url for specific EWS.
+ * QueueStatusServer/main.py: Added a link to the individual ews in the routes dictionary.
+ * QueueStatusServer/templates/patch.html: Added a link to go directly to the page with
+ all ews queues.
+ * QueueStatusServer/templates/statusbubble.html: If you click on a statusbubble it
+ takes you directly to the individual ews page.
+
2017-08-08 Stephan Szabo <stephan.sz...@sony.com>
Separate jsc stress test script writer from run-jsc-stress-tests
Modified: trunk/Tools/QueueStatusServer/handlers/patch.py (220433 => 220434)
--- trunk/Tools/QueueStatusServer/handlers/patch.py 2017-08-09 01:01:44 UTC (rev 220433)
+++ trunk/Tools/QueueStatusServer/handlers/patch.py 2017-08-09 01:24:25 UTC (rev 220434)
@@ -33,7 +33,7 @@
class Patch(webapp.RequestHandler):
- def get(self, attachment_id_string):
+ def get(self, attachment_id_string, queue_name=None):
attachment_id = int(attachment_id_string)
statuses = QueueStatus.all().filter("active_patch_id =", attachment_id).order("-date")
@@ -41,9 +41,10 @@
queue_status = {}
for status in statuses:
bug_id = status.active_bug_id # Should be the same for every status.
- per_queue_statuses = queue_status.get(status.queue_name, [])
- per_queue_statuses.append(status)
- queue_status[status.queue_name] = per_queue_statuses
+ if status.queue_name == queue_name or queue_name is None:
+ per_queue_statuses = queue_status.get(status.queue_name, [])
+ per_queue_statuses.append(status)
+ queue_status[status.queue_name] = per_queue_statuses
queue_status = sorted(queue_status.items())
template_values = {
"attachment_id" : attachment_id,
Modified: trunk/Tools/QueueStatusServer/handlers/statusbubble.py (220433 => 220434)
--- trunk/Tools/QueueStatusServer/handlers/statusbubble.py 2017-08-09 01:01:44 UTC (rev 220433)
+++ trunk/Tools/QueueStatusServer/handlers/statusbubble.py 2017-08-09 01:24:25 UTC (rev 220434)
@@ -113,6 +113,7 @@
bubble = {
"name": queue.short_name().lower(),
"attachment_id": attachment.id,
+ "queue_name": queue.name(),
}
# 10 recent statuses is enough to always include a resultative one, if there were any at all.
statuses = QueueStatus.all().filter('queue_name =', queue.name()).filter('active_patch_id =', attachment.id).order('-date').fetch(limit=10)
Modified: trunk/Tools/QueueStatusServer/main.py (220433 => 220434)
--- trunk/Tools/QueueStatusServer/main.py 2017-08-09 01:01:44 UTC (rev 220433)
+++ trunk/Tools/QueueStatusServer/main.py 2017-08-09 01:24:25 UTC (rev 220434)
@@ -64,6 +64,7 @@
('/gc', GC),
('/sync-queue-logs', SyncQueueLogs),
(r'/patch-status/(.*)/(.*)', PatchStatus),
+ (r'/patch/(.*)/(.*)', Patch),
(r'/patch/(.*)', Patch),
('/submit-to-ews', SubmitToEWS),
(r'/results/(.*)', ShowResults),
Modified: trunk/Tools/QueueStatusServer/templates/patch.html (220433 => 220434)
--- trunk/Tools/QueueStatusServer/templates/patch.html 2017-08-09 01:01:44 UTC (rev 220433)
+++ trunk/Tools/QueueStatusServer/templates/patch.html 2017-08-09 01:24:25 UTC (rev 220434)
@@ -7,7 +7,11 @@
<body>
<h1>
Patch {{ attachment_id|force_escape|webkit_attachment_id|safe }} (Bug {{ bug_id|force_escape|webkit_bug_id|safe }})
-</h1>{% for queue_name, statuses in queue_status %}
+</h1>
+{% if queue_status|length == 0 %}
+<p>Waiting in Queue, Processing has not started yet.</p>
+{% endif %}
+{% for queue_name, statuses in queue_status %}
<div class="status-details">
<h2>{{ queue_name }}</h2>
<ul>{% for status in statuses %}
@@ -19,4 +23,8 @@
</li>{% endfor %}
</ul>
</div>{% endfor %}
+{% if queue_status|length <= 1 %}
+<br>
+<a href="" attachment_id }}">All EWS Queues</a>
+{% endif %}
</html>
Modified: trunk/Tools/QueueStatusServer/templates/statusbubble.html (220433 => 220434)
--- trunk/Tools/QueueStatusServer/templates/statusbubble.html 2017-08-09 01:01:44 UTC (rev 220433)
+++ trunk/Tools/QueueStatusServer/templates/statusbubble.html 2017-08-09 01:24:25 UTC (rev 220434)
@@ -77,7 +77,7 @@
{% else %}
{% for bubble in bubbles %}
<a class="status {{ bubble.state }}" target="_top"
- href="" bubble.attachment_id }}"
+ href="" bubble.attachment_id }}/{{ bubble.queue_name }}"
{% if bubble.details_message %}
title="{{ bubble.details_message }}"
{% endif %}
