Skip to content

Commit 4c11c4c

Browse files
Created Individual EWS Pages
https://bugs.webkit.org/show_bug.cgi?id=174477 Patch by obinna obike <[email protected]> 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. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@220434 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 5a46ef0 commit 4c11c4c

File tree

6 files changed

+37
-6
lines changed

6 files changed

+37
-6
lines changed

Tools/ChangeLog

+20
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
2017-08-08 obinna obike <[email protected]>
2+
3+
Created Individual EWS Pages
4+
https://bugs.webkit.org/show_bug.cgi?id=174477
5+
6+
Reviewed by Aakash Jain.
7+
8+
Created individual pages for each EWS. Changed the link within each status bubble
9+
to go directly to the individual EWS page. Also added a link to original status page showing all EWSes.
10+
11+
* QueueStatusServer/handlers/patch.py:
12+
(Patch.get): Handles the case for individual ews queue as well as for all EWS queues.
13+
* QueueStatusServer/handlers/statusbubble.py:
14+
(StatusBubble._build_bubble): Updated url for specific EWS.
15+
* QueueStatusServer/main.py: Added a link to the individual ews in the routes dictionary.
16+
* QueueStatusServer/templates/patch.html: Added a link to go directly to the page with
17+
all ews queues.
18+
* QueueStatusServer/templates/statusbubble.html: If you click on a statusbubble it
19+
takes you directly to the individual ews page.
20+
121
2017-08-08 Stephan Szabo <[email protected]>
222

323
Separate jsc stress test script writer from run-jsc-stress-tests

Tools/QueueStatusServer/handlers/patch.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,18 @@
3333

3434

3535
class Patch(webapp.RequestHandler):
36-
def get(self, attachment_id_string):
36+
def get(self, attachment_id_string, queue_name=None):
3737
attachment_id = int(attachment_id_string)
3838
statuses = QueueStatus.all().filter("active_patch_id =", attachment_id).order("-date")
3939

4040
bug_id = None
4141
queue_status = {}
4242
for status in statuses:
4343
bug_id = status.active_bug_id # Should be the same for every status.
44-
per_queue_statuses = queue_status.get(status.queue_name, [])
45-
per_queue_statuses.append(status)
46-
queue_status[status.queue_name] = per_queue_statuses
44+
if status.queue_name == queue_name or queue_name is None:
45+
per_queue_statuses = queue_status.get(status.queue_name, [])
46+
per_queue_statuses.append(status)
47+
queue_status[status.queue_name] = per_queue_statuses
4748
queue_status = sorted(queue_status.items())
4849
template_values = {
4950
"attachment_id" : attachment_id,

Tools/QueueStatusServer/handlers/statusbubble.py

+1
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ def _build_bubble(self, queue, attachment, queue_position):
113113
bubble = {
114114
"name": queue.short_name().lower(),
115115
"attachment_id": attachment.id,
116+
"queue_name": queue.name(),
116117
}
117118
# 10 recent statuses is enough to always include a resultative one, if there were any at all.
118119
statuses = QueueStatus.all().filter('queue_name =', queue.name()).filter('active_patch_id =', attachment.id).order('-date').fetch(limit=10)

Tools/QueueStatusServer/main.py

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
('/gc', GC),
6565
('/sync-queue-logs', SyncQueueLogs),
6666
(r'/patch-status/(.*)/(.*)', PatchStatus),
67+
(r'/patch/(.*)/(.*)', Patch),
6768
(r'/patch/(.*)', Patch),
6869
('/submit-to-ews', SubmitToEWS),
6970
(r'/results/(.*)', ShowResults),

Tools/QueueStatusServer/templates/patch.html

+9-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
<body>
88
<h1>
99
Patch {{ attachment_id|force_escape|webkit_attachment_id|safe }} (Bug {{ bug_id|force_escape|webkit_bug_id|safe }})
10-
</h1>{% for queue_name, statuses in queue_status %}
10+
</h1>
11+
{% if queue_status|length == 0 %}
12+
<p>Waiting in Queue, Processing has not started yet.</p>
13+
{% endif %}
14+
{% for queue_name, statuses in queue_status %}
1115
<div class="status-details">
1216
<h2>{{ queue_name }}</h2>
1317
<ul>{% for status in statuses %}
@@ -19,4 +23,8 @@ <h2>{{ queue_name }}</h2>
1923
</li>{% endfor %}
2024
</ul>
2125
</div>{% endfor %}
26+
{% if queue_status|length <= 1 %}
27+
<br>
28+
<a href="/patch/{{ attachment_id }}">All EWS Queues</a>
29+
{% endif %}
2230
</html>

Tools/QueueStatusServer/templates/statusbubble.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
{% else %}
7878
{% for bubble in bubbles %}
7979
<a class="status {{ bubble.state }}" target="_top"
80-
href="/patch/{{ bubble.attachment_id }}"
80+
href="/patch/{{ bubble.attachment_id }}/{{ bubble.queue_name }}"
8181
{% if bubble.details_message %}
8282
title="{{ bubble.details_message }}"
8383
{% endif %}

0 commit comments

Comments
 (0)