Merge lp:~robru/bileto/colorize-statuses into lp:bileto

[Robert Bruce Park]

Colorize statuses like the dashboard.

[Robert Bruce Park (robru)]

Looking great in staging.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:238
http://jenkins.qa.ubuntu.com/job/bileto-ci/44/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bileto-ci/44/rebuild

review: Approve (continuous-integration)

=== modified file 'tickets/static/app.js'
--- tickets/static/app.js	2015-08-27 01:47:49 +0000
+++ tickets/static/app.js	2015-08-27 21:25:34 +0000
@@ -10,6 +10,38 @@
 
 var app = angular.module('Bileto', ['ngSanitize']);
 
+var COLORS = {
+    'red': ['caught', 'exception', 'fail', 'can\'t', 'error', 'unacceptable'],
+    'green': ['landed', 'merging', 'migrating'],
+    'grey': ['abandoned'],
+    'purple': ['ready'],
+    'olive': ['dirty'],
+    'blue': ['needs'],
+};
+
+function colorize(text, qa) {
+    text = (text || '').toLowerCase();
+    qa = (qa || '').toLowerCase();
+    if (qa == 'publish without qa' || qa == 'qa granted') {
+        if (text.indexOf('packages built') > -1) {
+            return 'blue';
+        }
+    } else if (qa == 'qa failed') {
+        return 'red';
+    }
+    for (var color in COLORS) {
+        if (COLORS.hasOwnProperty(color)) {
+            var keywords = COLORS[color];
+            for (var i=0; i < keywords.length; i++) {
+                if (text.indexOf(keywords[i]) > -1) {
+                    return color;
+                }
+            }
+        }
+    }
+    return 'black';
+}
+
 function a(href, text) {
     return '<a target="_blank" href="' + href + '">' + text + '</a> ';
 }
@@ -42,6 +74,9 @@
     if (text) {
         var words = text.split(/[\s,]+/);
         switch (field) {
+            case 'status':
+                text = linkify(text);
+                break;
             case 'siloname':
                 // TODO: Make PPA link link to correct staging/production PPA team
                 text = a('https://launchpad.net/~ci-train-ppa-service/+archive/' + text, text)
@@ -73,12 +108,13 @@
     $scope.short_fields = ['siloname', 'status', 'landers', 'sync_request', 'dest', 'sources'];
     $scope.dropdowns = ['distribution', 'series', 'qa_signoff'];
 
+    $scope.colorize = colorize;
     $scope.linkify = linkify;
     $scope.process = process;
     $scope.editing = null;
     $scope.commenting = null;
 
-    $scope.data = {'requests': {}};
+    $scope.data = {'requests': {}, 'assigned': 0};
 
     $http.get('/v1/metadata').success(function(data, status, headers, config) {
         $scope.docs = data.docs;

=== modified file 'tickets/static/index.html'
--- tickets/static/index.html	2015-08-27 18:55:39 +0000
+++ tickets/static/index.html	2015-08-27 21:25:34 +0000
@@ -68,7 +68,7 @@
 </td>
 </tr>
 <tr ng-hide="display_this(req)">
-<td ng-repeat="field in short_fields"><p ng-bind-html="process(req[field], field)"></p></td>
+<td ng-repeat="field in short_fields"><p class="{{colorize(req.status, req.qa_signoff)}}" ng-bind-html="process(req[field], field)"></p></td>
 <td ng-repeat="field in dropdowns"><p ng-bind-html="process(req[field], field)"></p></td>
 <td class="nowrap"><p><strong><a href="#/ticket/{{req.request_id}}">{{req.request_id}}.&nbsp;{{req.date | date:'yyyy-MM-dd'}}</a></strong></p></td>
 </tr>

=== modified file 'tickets/static/style.css'
--- tickets/static/style.css	2015-08-26 23:32:40 +0000
+++ tickets/static/style.css	2015-08-27 21:25:34 +0000
@@ -152,3 +152,29 @@
 tbody:hover ul {
     display: block;
 }
+
+.red {
+    color: red;
+    font-weight: bold;
+}
+
+.green {
+    color: green;
+}
+
+.olive {
+    color: olive;
+    font-weight: bold;
+}
+
+.blue {
+    color: blue;
+}
+
+.purple {
+    color: purple;
+}
+
+.grey {
+    color: #888;
+}

=== modified file 'tickets/v1.py'
--- tickets/v1.py	2015-08-27 19:47:38 +0000
+++ tickets/v1.py	2015-08-27 21:25:34 +0000
@@ -30,6 +30,8 @@
 PUBLISHABLE = ('Publish without QA', 'QA Granted')
 HID = [Request.status != hide for hide in HIDDEN]
 LC = func.lower
+FAILURES = ('can\'t', 'caught', 'error', 'exception',
+            'fail', 'needs', 'unacceptable')
 
 
 def assert_json():
@@ -141,10 +143,11 @@
 @app.route('/v1/failures', methods=['GET'])
 def list_requests_in_failed_states():
     """Show requests that are in failure states."""
-    cant = Request.query.filter(LC(Request.status).contains("can't")).all()
-    fail = Request.query.filter(LC(Request.status).contains('fail')).all()
-    err = Request.query.filter(LC(Request.status).contains('error')).all()
-    return return_reqs(sorted(set(cant + fail + err)))
+    reqs = set()
+    for word in FAILURES:
+        reqs.update(Request.query.filter(
+            LC(Request.status).contains(word)).all())
+    return return_reqs(sorted(reqs))
 
 
 @app.route('/v1/user/<nickname>', methods=['GET'])