Get rid of webkit-queues dashboard
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 26 Sep 2014 18:49:30 +0000 (18:49 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 26 Sep 2014 18:49:30 +0000 (18:49 +0000)
https://bugs.webkit.org/show_bug.cgi?id=137141

Reviewed by Ryosuke Niwa.

* QueueStatusServer/app.yaml: Updated version.

* QueueStatusServer/templates/dashboard.html: Removed.
* QueueStatusServer/handlers/dashboard.py: Removed.
* QueueStatusServer/main.py:
Kill it!

* QueueStatusServer/stylesheets/common.css: Copied from Tools/QueueStatusServer/stylesheets/dashboard.css.
(.status-cell): Deleted.
(.status-cell:hover): Deleted.
(.status-cell.pass): Deleted.
(.status-cell.fail): Deleted.
(.status-cell.pending): Deleted.
(.status-cell.error): Deleted.
* QueueStatusServer/stylesheets/dashboard.css: Removed.
* QueueStatusServer/templates/activebots.html:
* QueueStatusServer/templates/patch.html:
* QueueStatusServer/templates/queuestatus.html:
* QueueStatusServer/templates/recentstatus.html:
Renamed dashboard.css to common.css, and removed dashboard-only rules.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@174015 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/QueueStatusServer/app.yaml
Tools/QueueStatusServer/handlers/dashboard.py [deleted file]
Tools/QueueStatusServer/main.py
Tools/QueueStatusServer/stylesheets/common.css [moved from Tools/QueueStatusServer/stylesheets/dashboard.css with 69% similarity]
Tools/QueueStatusServer/templates/activebots.html
Tools/QueueStatusServer/templates/dashboard.html [deleted file]
Tools/QueueStatusServer/templates/patch.html
Tools/QueueStatusServer/templates/queuestatus.html
Tools/QueueStatusServer/templates/recentstatus.html

index 0072176..86de63d 100644 (file)
@@ -1,5 +1,33 @@
 2014-09-26  Alexey Proskuryakov  <ap@apple.com>
 
+        Get rid of webkit-queues dashboard
+        https://bugs.webkit.org/show_bug.cgi?id=137141
+
+        Reviewed by Ryosuke Niwa.
+
+        * QueueStatusServer/app.yaml: Updated version.
+
+        * QueueStatusServer/templates/dashboard.html: Removed.
+        * QueueStatusServer/handlers/dashboard.py: Removed.
+        * QueueStatusServer/main.py:
+        Kill it!
+
+        * QueueStatusServer/stylesheets/common.css: Copied from Tools/QueueStatusServer/stylesheets/dashboard.css.
+        (.status-cell): Deleted.
+        (.status-cell:hover): Deleted.
+        (.status-cell.pass): Deleted.
+        (.status-cell.fail): Deleted.
+        (.status-cell.pending): Deleted.
+        (.status-cell.error): Deleted.
+        * QueueStatusServer/stylesheets/dashboard.css: Removed.
+        * QueueStatusServer/templates/activebots.html:
+        * QueueStatusServer/templates/patch.html:
+        * QueueStatusServer/templates/queuestatus.html:
+        * QueueStatusServer/templates/recentstatus.html:
+        Renamed dashboard.css to common.css, and removed dashboard-only rules.
+
+2014-09-26  Alexey Proskuryakov  <ap@apple.com>
+
         Get rid of Retry status in webkit-queues
         https://bugs.webkit.org/show_bug.cgi?id=137135
 
index 7b6f3dc..34c4cc8 100644 (file)
@@ -1,5 +1,5 @@
 application: webkit-queues
-version: 174009 # Bugzilla bug ID of last major change
+version: 174015 # Bugzilla bug ID of last major change
 runtime: python
 api_version: 1
 
diff --git a/Tools/QueueStatusServer/handlers/dashboard.py b/Tools/QueueStatusServer/handlers/dashboard.py
deleted file mode 100644 (file)
index 660c595..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (C) 2009 Google Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# 
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import operator
-
-from google.appengine.ext import webapp
-from google.appengine.ext.webapp import template
-
-from model.attachment import Attachment
-from model.queues import Queue
-
-
-class Dashboard(webapp.RequestHandler):
-    # We may want to sort these?
-    _ordered_queues = Queue.all()
-    _header_names = [queue.short_name() for queue in _ordered_queues]
-
-    def _build_bubble(self, attachment, queue):
-        queue_status = attachment.status_for_queue(queue)
-        bubble = {
-            "status_class": attachment.state_from_queue_status(queue_status) if queue_status else "none",
-            "status_date": queue_status.date if queue_status else None,
-        }
-        return bubble
-
-    def _build_row(self, attachment):
-        row = {
-            "bug_id": attachment.bug_id(),
-            "attachment_id": attachment.id,
-            "bubbles": [self._build_bubble(attachment, queue) for queue in self._ordered_queues],
-        }
-        return row
-
-    def get(self):
-        template_values = {
-            "headers": self._header_names,
-            "rows": [self._build_row(attachment) for attachment in Attachment.recent(limit=25)],
-        }
-        self.response.out.write(template.render("templates/dashboard.html", template_values))
index dbe663a..2a7d318 100644 (file)
@@ -34,7 +34,6 @@ from google.appengine.ext import webapp
 from google.appengine.ext.webapp.util import run_wsgi_app
 
 from handlers.activebots import ActiveBots
-from handlers.dashboard import Dashboard
 from handlers.gc import GC
 from handlers.nextpatch import NextPatch
 from handlers.patch import Patch
@@ -60,7 +59,6 @@ webapp.template.register_template_library('filters.webkit_extras')
 
 routes = [
     ('/', QueuesOverview),
-    ('/dashboard', Dashboard),
     ('/gc', GC),
     ('/sync-queue-logs', SyncQueueLogs),
     (r'/patch-status/(.*)/(.*)', PatchStatus),
@@ -72,35 +72,6 @@ tr:hover, li:hover {
   font-size: 8pt;
 }
 
-.status-cell {
-  margin: 1px;
-  padding: 1px 2px;
-  font-size: 9pt;
-  border: 1px solid transparent;
-}
-.status-cell:hover {
-  border: 1px solid black;
-}
-.status-cell.pass {
-  background-color: #8FDF5F;
-  cursor: pointer;
-  /* border: 1px solid #4F8530; */
-}
-.status-cell.fail {
-  background-color: #E98080;
-  cursor: pointer;
-  /* border: 1px solid #A77272; */
-}
-.status-cell.pending {
-  background-color: #FFFC6C;
-  cursor: pointer;
-  /* border: 1px solid #C5C56D; */
-}
-.status-cell.error {
-  background-color: #E0B0FF;
-  cursor: pointer;
-  /* border: 1px solid #ACA0B3; */
-}
 .queue_bubble {
     border: 1px solid black;
     margin-bottom: 10px;
@@ -124,4 +95,4 @@ tr:hover, li:hover {
 }
 .dead {
     background-color: #E98080;
-}
\ No newline at end of file
+}
index 8c79d73..6d5498f 100644 (file)
@@ -2,9 +2,9 @@
 <html>
 <head>
 <title>WebKit Queues</title>
-<link type="text/css" rel="stylesheet" href="/stylesheets/dashboard.css" />
+<link type="text/css" rel="stylesheet" href="/stylesheets/common.css" />
 <style>
-/* Override the generic table styles from dashboard.css */
+/* Override the generic table styles from common.css */
 td {
   text-align: left;
 }
diff --git a/Tools/QueueStatusServer/templates/dashboard.html b/Tools/QueueStatusServer/templates/dashboard.html
deleted file mode 100644 (file)
index 3a4df49..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>WebKit Bot Status</title>
-<link type="text/css" rel="stylesheet" href="/stylesheets/dashboard.css" />
-<script>
-function statusDetail(patch_id) {
-  // FIXME: We'd like to use AJAX to show the details on this page.
-  window.location = "/patch/" + patch_id
-}
-</script>
-</head>
-<body>
-<h1>WebKit Bot Status</h1>
-<table>
-  <thead>
-    <tr>
-      <th>Bug</th>
-      <th>Attachment</th>
-      {% for header in headers %}
-      <th>{{ header }}</th>
-      {% endfor %}
-    </tr>
-  </thead>
-  <tbody>{% for row in rows %}
-    <tr>
-      <td class="status-cell">
-        {{ row.bug_id|force_escape|webkit_bug_id|safe }}
-      </td>
-      <td class="status-cell">
-        {{ row.attachment_id|force_escape|webkit_attachment_id|safe }}
-      </td>
-      {% for bubble in row.bubbles %}
-      <td class="status-cell {{ bubble.status_class }}"
-        {% if bubble.status %}
-          onclick="statusDetail({{ row.attachment_id }})"
-          title="{{ bubble.status_date|timesince }}"
-        {% endif %}>
-      </td>
-      {% endfor %}
-    </tr>{% endfor %}
-  </tbody>
-</table>
-</html>
index de334a5..0af051a 100644 (file)
@@ -2,7 +2,7 @@
 <html>
 <head>
 <title>Patch Status</title>
-<link type="text/css" rel="stylesheet" href="/stylesheets/dashboard.css" />
+<link type="text/css" rel="stylesheet" href="/stylesheets/common.css" />
 </head>
 <body>
 <h1>
index aafafbd..ba56b0f 100644 (file)
@@ -2,7 +2,7 @@
 <html>
 <head>
 <title>{{ page_title }}</title>
-<link type="text/css" rel="stylesheet" href="/stylesheets/dashboard.css" />
+<link type="text/css" rel="stylesheet" href="/stylesheets/common.css" />
 </head>
 <body>
 <h1>{{ page_title }}</h1>
index 32fc030..6749bf4 100644 (file)
@@ -2,7 +2,7 @@
 <html>
 <head>
 <title>WebKit Queue Status</title>
-<link type="text/css" rel="stylesheet" href="/stylesheets/dashboard.css" />
+<link type="text/css" rel="stylesheet" href="/stylesheets/common.css" />
 </head>
 <body>
 <h1>WebKit Queue Status</h1>