Merge lp:~robru/bileto/dashboard-colors into lp:bileto

[Robert Bruce Park]

Make QA states highlighted in dashboard.

[lp:~robru/bileto/dashboard-colors]

214. By Robert Bruce Park on 2015-08-03

More test fixes.

215. By Robert Bruce Park on 2015-08-03

MOAR.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~robru/bileto/dashboard-colors]

216. By Robert Bruce Park on 2015-08-03

Linkify destination PPA.

217. By Robert Bruce Park on 2015-08-03

Missing semicolon.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Looks great in staging.

review: Approve

=== modified file 'tickets/static/app.js'
--- tickets/static/app.js	2015-07-31 20:21:45 +0000
+++ tickets/static/app.js	2015-08-03 19:46:18 +0000
@@ -34,6 +34,10 @@
             text += '<a target="_blank" href="/static/dashboard.html#?q=' + names[i] + '">' + names[i] + '</a> ';
         }
     }
+    if (text && field == 'dest') {
+        var parts = text.split(/\//);
+        text = '<a target="_blank" href="https://launchpad.net/~' + parts[0] + '/+archive/' + parts[1] + '/' + parts[2] + '">' + parts[2] + '</a>';
+    }
     return text;
 }
 

=== modified file 'tickets/static/dashboard.js'
--- tickets/static/dashboard.js	2015-08-03 16:31:40 +0000
+++ tickets/static/dashboard.js	2015-08-03 19:46:18 +0000
@@ -20,9 +20,6 @@
 
 var KNOWN_DISTROS = [ 'ubuntu' ];
 
-// red statuses are error conditions that need to be resolved.
-// blue statuses are non-error conditions that require action.
-// green are good things that don't require action.
 STATUS_COLORS = {
     'caught signal': 'red',
     'uncaught exception': 'red',
@@ -40,10 +37,16 @@
     'publication failed': 'red',
     'publication needs': 'blue',
     'reconfigure failed': 'red',
-    'silo ready': 'blue',
+    'silo ready': 'purple',
     'silo dirty': 'olive',
 };
 
+BILETO_COLORS = {
+    'qa granted': 'blue',
+    'publish without qa': 'blue',
+    'qa failed': 'red',
+};
+
 
 function getStatusColor(status) {
     return STATUS_COLORS[nWords(status, 2).toLowerCase()] || 'black';
@@ -207,6 +210,7 @@
     return function(data) {
         bileto.reqs = {};
         data.requests.forEach(function(req) {
+            req.color = BILETO_COLORS[(req.qa_signoff || '').toLowerCase()] || '';
             bileto.reqs[req.request_id] = req;
         });
     }
@@ -260,8 +264,18 @@
     })
 
     $scope.getSiloColor = function(siloname) {
-        var siloColor = ($scope.silos[siloname] || {}).statusColor || '';
-        return siloColor || 'black';
+        var req = $scope.silos[siloname] || {};
+        if (!req.requestid || !req.shortStatus) {
+            return 'black';
+        }
+        var siloColor = req.statusColor || 'black';
+        var bileto = $scope.bileto.reqs || {};
+        var qaColor = (bileto[req.requestid] || {}).color || 'black';
+        if (req.shortStatus.match(/packages built/i)) {
+            return qaColor;
+        } else {
+            return siloColor;
+        }
     };
 
     function getQuery() {

=== modified file 'tickets/static/test/test.js'
--- tickets/static/test/test.js	2015-06-24 23:43:17 +0000
+++ tickets/static/test/test.js	2015-08-03 19:46:18 +0000
@@ -22,10 +22,12 @@
     it('should know what statuses are blue.', function() {
         expect(getStatusColor('Migration: All birds have flown home.'))
         .toBe('blue');
+        expect(getStatusColor('Publication needs: a swift kick in the pants.'))
+        .toBe('blue');
+    });
+    it('should know what statuses are purple.', function() {
         expect(getStatusColor('Silo ready to be filled with grain.'))
-        .toBe('blue');
-    });
-    it('should know what statuses are purple.', function() {
+        .toBe('purple');
         expect(getStatusColor('Free'))
         .toBe('purple');
     });
@@ -468,15 +470,18 @@
         appController(scopeMock, locationMock, httpMock);
         expect(httpMock.get).toHaveBeenCalled();
         var getCalls = httpMock.get.calls.all();
-        expect(getCalls.length).toBe(61);
+        expect(getCalls.length).toBe(62);
         getCalls.forEach(function(call, index) {
-            index = index % 61;
+            index = index % 62;
             index = ('000' + index).slice(-3);
             expect(call.args.length).toBe(1);
-            expect(call.args[0]).toMatch(
-                '^(http://people.canonical.com)?/static/json/ubuntu(-rtm)?/landing-'
-                + index
-                + '\\?nocache=\\d+$');
+            if (call.args[0] != '/v1/tickets') {
+                expect(call.args[0]).toMatch(
+                    '^/static/json/ubuntu(-rtm)?/landing-'
+                    + index + '\\?nocache=\\d+$');
+            } else {
+                expect(call.args[0]).toBe('/v1/tickets');
+            }
         });
     });
 });