Merge lp:~robru/bileto/kill-dashboard-dead into lp:bileto

[Robert Bruce Park]

THIS! IS! SPARTAN!

(don't merge or go live with this before monday the 31st)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~robru/bileto/kill-dashboard-dead]

238. By Robert Bruce Park on 2015-08-28

Redirect dashboard to homepage.

239. By Robert Bruce Park on 2015-08-28

Import redirect.

[Robert Bruce Park (robru)]

Looks good in staging.

review: Approve

[lp:~robru/bileto/kill-dashboard-dead]

240. By Robert Bruce Park on 2015-08-28

Test.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'tests/test_v1.py'
--- tests/test_v1.py	2015-08-28 04:38:56 +0000
+++ tests/test_v1.py	2015-08-28 20:11:22 +0000
@@ -32,6 +32,12 @@
             sesh['teams'] = 'ubuntu-core-dev'
             sesh['nickname'] = 'fritz'
 
+    def test_dashboard_redirect(self):
+        """Ensure dashboard redirects to front page."""
+        ret = self.app.get('/static/dashboard.html', follow_redirects=False)
+        self.assertIn(b'<a href="/">/</a>.', ret.data)
+        self.assertEqual(ret.status_code, 302)
+
     def test_models(self):
         """Ensure Request.update works as expected."""
         req = Request()

=== removed file 'tickets/static/dashboard.css'
--- tickets/static/dashboard.css	2015-08-26 05:21:29 +0000
+++ tickets/static/dashboard.css	1970-01-01 00:00:00 +0000
@@ -1,176 +0,0 @@
-html, body {
-    background-color: white;
-    color: black;
-    margin: 0;
-    padding: 0;
-    text-align: center;
-    font-size: small;
-    font-family: Ubuntu, sans-serif;
-}
-
-a {
-    color: #dd4814;
-    font-weight: bold;
-    text-decoration: none;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-.tiny {
-    font-size: x-small;
-}
-
-.nowrap {
-    white-space: nowrap;
-}
-
-#nav {
-    display: block;
-    width: 100%;
-    background-color: #dd4814;
-    color: white;
-    padding: 1em;
-    position: fixed;
-}
-
-#nav a {
-    background-color: #dd4814;
-    color: white;
-    margin: 0 5px;
-}
-
-#nav li {
-    display: inline-block;
-}
-
-#bubble_wrap {
-    padding-top: 8em;
-}
-
-.bubble {
-    text-align: left;
-    width: 400px;
-    display: inline-block;
-    margin: .5em;
-    vertical-align: top;
-}
-
-.buttons {
-    text-align: center;
-    border-top: 1px solid black;
-    border-bottom: 1px solid black;
-}
-
-.buttons a {
-    padding: 3px;
-    margin: 1px;
-    display: inline-block;
-    border-radius: 5px;
-}
-
-.contents {
-    margin: 10px 0 1em 10px;
-}
-
-p, ul, li {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-}
-
-.mp_list_show {
-    padding-left: 1em;
-}
-
-.mp_list_show a {
-    font-weight: normal;
-}
-
-.hover_mp .mp_list_hide a {
-    background-color: #dd4814;
-    color: white;
-}
-
-.hover_mp .mp_list_hide {
-    margin-left: 2em;
-    display: none;
-    position: absolute;
-    background-color: #dd4814;
-    padding: 10px;
-    border-radius: 0 10px 10px 10px;
-    z-index: 200;
-}
-
-.hover_mp:hover .mp_list_hide {
-    display: block;
-}
-
-.details {
-    background-color: white;
-    border-radius: 5px;
-    padding: 0 0 3px 3px;
-    float: right;
-    margin: 10px 10px 1em 0;
-}
-
-.details a {
-    display: block;
-}
-
-.status {
-    font-weight: bold;
-    clear: left;
-    margin: 1em;
-    border-radius: 5px;
-    padding: 3px;
-}
-
-.description {
-    font-size: xx-small;
-}
-
-.comments {
-    font-size: xx-small;
-    color: red;
-}
-
-.comment_author {
-    font-weight: bold;
-}
-
-#svgbox {
-    display: none;
-    position: absolute;
-    background-color: white;
-    border: 1px solid black;
-    border-radius: 10px;
-}
-
-.hover_svg:hover #svgbox {
-    display: block;
-}
-
-#footer {
-    margin-top: 1em;
-}
-
-#footer li {
-    display: inline-block;
-    margin: 1em;
-}
-
-#deprecation {
-    font-weight: bold;
-    background-color: red;
-    color: white;
-    width: 100%;
-    padding: 1em;
-}
-
-#deprecation a {
-    background-color: red;
-    color: white;
-    text-decoration: underline;
-}

=== removed file 'tickets/static/dashboard.html'
--- tickets/static/dashboard.html	2015-08-26 21:53:17 +0000
+++ tickets/static/dashboard.html	1970-01-01 00:00:00 +0000
@@ -1,146 +0,0 @@
-<!DOCTYPE html>
-<html ng-app="CITrainWeb" ng-controller="appController">
-<head>
-<meta charset="utf-8" />
-<title>CI Train Silo Dashboard</title>
-<link rel="stylesheet" type="text/css" href="dashboard.css">
-<link rel="icon" type="image/gif" href="train.gif">
-<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.13/angular.min.js"></script>
-<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.13/angular-sanitize.min.js"></script>
-<script src="dashboard.js" charset="utf-8"></script>
-</head>
-<body>
-
-<ul id="nav">
-  <li ng-repeat="series in header.foundSeries"><a href="#?q={{series}}">{{series}}</a></li>
-  <li ng-repeat="(distro, v) in distros"><a href="#?q={{distro}}/">{{distro}}</a></li>
-  <li class="hover_svg">
-  <span class="tiny">
-      <a href="#?q=">
-      {{header.activeSilos}} silos in use as of
-      {{header.lastUpdated | date : 'yyyy-MM-dd HH:mm:ss'}}
-    </a>
-  </span>
-  <div id="svgbox">
-    <svg ng-attr-width="{{(header.uniqueStats + 2) * 36}}"
-         height="200"
-         preserveAspectRatio="xMidYMid meet">
-      <g ng-repeat="status in header.statusStats">
-        <circle ng-attr-cx="{{svgPlaceX($index)}}"
-                cy="30"
-                ng-attr-r="{{(status[1] + 2) * 6}}"
-                ng-attr-fill="{{getStatusColor(status[0])}}"
-                opacity=".2">
-        </circle>
-        <text ng-attr-x="{{svgPlaceX($index)}}"
-              y="35"
-              text-anchor="middle"
-              fill="black">
-          {{status[1]}}
-        </text>
-      </g>
-      <g ng-repeat="status in header.statusStats">
-        <a xlink:href="#?q=" ng-xlink-href="#?q={{status[0]}}">
-          <text ng-attr-x="{{svgPlaceX($index) - 10}}"
-                y="50"
-                fill="{{getStatusColor(status[0])}}"
-                transform="rotate(45 {{svgPlaceX($index)}},50)">
-            {{status[0]}}...
-          </text>
-        </a>
-      </g>
-    </svg>
-  </div>
-  </li>
-  <li><input type="search" ng-model="q" placeholder="Filter silos..." /></li>
-  <li ng-repeat="link in links">
-  <a target="_blank" href="{{link[1]}}">{{link[0]}}</a>
-  </li>
-<div id="deprecation"> <p>This dashboard page is now deprecated. Please use <a
-href="/">The Requests Page</a> exclusively, and please inform <a
-href="mailto:[e-mail]">robru</a> if there are any features
-missing from the request page that you need.</p> </div>
-</ul>
-
-<div id="bubble_wrap">
-  <div ng-repeat="siloname in silonames | filter:siloSearchFilter"
-       id="{{siloname}}"
-       class="bubble">
-    <div class="buttons">
-      <a href="#?q={{siloname}}" class="button">{{siloname}}</a>
-      <a target="_blank"
-         href="{{j.ppa_url}}/{{siloname}}"
-         class="button">PPA</a>
-      <a target="_blank"
-         href="{{j.domain}}/{{j.root}}{{siloname.replace('/', '-')}}{{j.build}}{{j.suffix}}"
-         class="button">Build</a>
-      <a target="_blank"
-         href="{{j.domain}}/{{j.root}}{{siloname.replace('/', '-')}}{{j.publish}}{{j.suffix}}"
-         class="button">Publish</a>
-      <a target="_blank"
-         href="{{j.domain}}/{{j.root}}{{siloname.replace('/', '-')}}{{j.clean}}{{j.suffix}}"
-         class="button">Clean</a>
-    </div>
-    <div class="details">
-      <a ng-repeat="lander in silos[siloname].landers"
-         href="#?q={{lander}}">{{lander}}</a>
-      <div class="tiny">
-        {{silos[siloname].displaySeries}} {{silos[siloname].dual}}<br />
-        {{silos[siloname].displayDest}}<br />
-        <a target="_blank" href="/#/?req={{silos[siloname].requestid}}">{{silos[siloname].requestid}}</a><br />
-      </div>
-    </div>
-    <div class="contents">
-      <div ng-repeat="package in silos[siloname].sources">
-        <p>
-          <a target="_blank" href="{{lp_url}}{{siloname.split('/')[0]}}/+source/{{package}}">{{package}}</a>
-          <a href="#?q={{package}}">…</a>
-        </p>
-      </div>
-      <div class="hover_mp" ng-repeat="package in silos[siloname].pkgNames">
-        <p>
-          <a target="_blank" href="{{lp_url}}{{siloname.split('/')[0]}}/+source/{{package}}">{{package}}</a>
-          <a href="#?q={{package}}">…</a>
-        </p>
-        <ul class="mp_list_{{ q ? 'show' : 'hide' }}">
-          <li ng-repeat="mp in silos[siloname].mps[package]">
-            <a target="_blank" href="{{fixMergeURL(mp)}}">{{shortURL(mp)}}</a>
-          </li>
-        </ul>
-      </div>
-    </div>
-    <div class="status" style="color: {{getSiloColor(siloname)}};">
-      <div class="jenkins_status">
-        <p ng-repeat="status in silos[siloname].longStatus"
-           ng-bind-html="status"></p>
-      </div>
-      <div class="jenkins_url">
-        <a target="_blank" href="{{silos[siloname].global.status.url}}">
-          {{silos[siloname].displayLink}}
-        </a>
-      </div>
-      <div class="tiny">
-        <span ng-show="silos[siloname] !== undefined">
-          {{silos[siloname].bileto.qa_signoff}}
-        </span>
-      </div>
-    </div>
-    <div class="description" ng-bind-html="silos[siloname].bileto.description"
-         ng-show="silos[siloname] !== undefined"></div>
-    <div class="comments" ng-show="silos[siloname] !== undefined">
-        <div ng-repeat="comment in silos[siloname].bileto.comments">
-            <span class="comment_author">{{comment.author}}: </span>
-            <span ng-bind-html="linkify(comment.text)"></span>
-        </div>
-    </div>
-</div>
-</div>
-
-<ul id="footer">
-  <li ng-repeat="link in footerLinks">
-    <a target="_blank" href="{{link[1]}}">{{link[0]}}</a>
-  </li>
-</ul>
-
-</body>
-</html>

=== removed file 'tickets/static/dashboard.js'
--- tickets/static/dashboard.js	2015-08-06 02:13:54 +0000
+++ tickets/static/dashboard.js	1970-01-01 00:00:00 +0000
@@ -1,328 +0,0 @@
-var ROOT = '/static/json/';
-var BILETO = '/v1/ticket/';
-if (window.location.origin == 'file://') {
-    var domain = 'https://requests.ci-train.ubuntu.com';
-    ROOT = domain + ROOT;
-    BILETO = domain + BILETO;
-}
-
-// Figure out which browser's page visibility API we have.
-var visibilitychange = null;
-var hidden = null;
-['h', 'mozH', 'webkitH', 'msH', 'oH'].some(function(prefix) {
-    hidden = prefix + 'idden';
-    if (hidden in document) {
-        visibilitychange = prefix.slice(0, -1) + 'visibilitychange';
-        return true; // Found it, break loop!
-    }
-});
-
-STATUS_COLORS = {
-    'caught signal': 'red',
-    'uncaught exception': 'red',
-    'build failed': 'red',
-    'can t': 'red',
-    'failed to': 'red',
-    'free': 'purple',
-    'gave up': 'green',
-    'landed without': 'green',
-    'landed cleaning': 'green',
-    'merge failed': 'red',
-    'merging': 'green',
-    'migration all': 'blue',
-    'packages migrating': 'green',
-    'publication failed': 'red',
-    'publication needs': 'blue',
-    'reconfigure failed': 'red',
-    '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';
-};
-
-var app = angular.module('CITrainWeb', ['ngSanitize']);
-
-// This bit allows dynamic links inside SVGs. See
-// http://stackoverflow.com/questions/15895483/angular-ng-href-and-svg-xlink
-app.directive('ngXlinkHref', function () {
-    return {
-        priority: 99,
-        link: function (scope, element, attrs) {
-            attrs.$observe('ngXlinkHref', function(value) {
-                if (!value) return;
-                attrs.$set('xlink:href', value);
-            });
-        }
-    }
-});
-
-function linkify(str) {
-    return str.replace(/(https?:\/\/[^\s)]+)/ig,  '<a target="_blank" href="$1">$1</a>')
-              .replace(/>https?:\/\/([^<\/]+\/)?/g, ">");
-}
-
-function excusify(str) {
-    return str.replace(
-        /^(Migration: )?(\S+)(.*is in the Proposed pocket)/,
-        '<a target="_blank" href="http://people.canonical.com/~ubuntu-archive' +
-        '/proposed-migration/update_excuses.html#$2">$2</a>$3');
-}
-
-function fixMergeURL(url) {
-    return url.replace('https://api.launchpad.net/devel/',
-                       'https://code.launchpad.net/');
-}
-
-function shortURL(url) {
-    // Just the branch name from the merge URL
-    return url.replace(/https?:\/\/[^\/]+\//, '')
-              .replace(/^.*~([^\/]+\/){2}([^\/]+).*$/, "$2")
-              .replace(/[_-]/g, ' ');
-}
-
-// Append this to AJAX URLs to prevent browser caching.
-function noCache() {
-    return 'nocache=' + new Date().getTime();
-}
-
-// Return first N words of a string.
-function nWords(phrase, n, regex) {
-    return phrase.split(regex || /\W+/).splice(0, n).join(' ');
-}
-
-function searchFactory(getQuery, silos) {
-    // If this function returns true, it means 'display this search result'
-    // returning false hides that result from the list.
-    return function(siloname) {
-        var query = getQuery();
-        var regex = new RegExp(query, 'i');
-
-        if (siloname.match(regex)) {
-            // Always display silos when referenced by name. This is necessary
-            // because empty silos don't have the search strings, and therefore
-            // empty silos don't show up at their own permalinks.
-            return true;
-        } else if (query) {
-            var silo = silos[siloname];
-            if (silo) {
-                // If a silo exists, show it only when it matches the search
-                return !!silo.searchString.match(regex);
-            } else if (query.match(/^free$/i)) {
-                // If the search is for 'free' silos, show only free ones.
-                return true;
-            } else {
-                // Hide empty silos when the search term isn't 'free'
-                return false;
-            }
-        } else {
-            // Show all silos when there is no search term.
-            return true;
-        }
-    }
-}
-
-function setHeaderStatus(header, silos) {
-    var silonames = Object.keys(silos);
-    var stats = { };
-    header.activeSilos = silonames.length;
-    header.lastUpdated = new Date();
-    header.foundSeries = {};
-    silonames.forEach(function(siloname) {
-        var status = silos[siloname].shortStatus;
-        var count = stats[status];
-        stats[status] = (count || 0) + 1;
-        var series = silos[siloname].displaySeries;
-        header.foundSeries[series] = series;
-    });
-    header.uniqueStats = Object.keys(stats).length;
-    var sortable = [];
-    for (var stat in stats) {
-        sortable.push([stat, stats[stat]]);
-    }
-    sortable.sort(function(a, b) { return b[1] - a[1]; });
-    header.statusStats = sortable;
-}
-
-function blankSiloStatus(silos) {
-    return function(name) {
-        return function() {
-            delete silos[name];
-        }
-    }
-}
-
-function setSiloStatus($http, silos, j) {
-    return function(data) {
-        var data = data || {};
-        var siloname = (data.siloname || '');
-        var global = data.global || {};
-        var series = global.series || '';
-        var dest = global.dest || '';
-        var mps = data.mps || {};
-        var requestid = data.requestid || 0;
-        var status = global.status || {};
-        var message = status.message || '';
-        var url = status.url || '';
-        var ppa = global.ppa || '';
-
-        // Poll Bileto as well.
-        data.bileto = (silos[siloname] || {}).bileto || {};
-        $http.get(BILETO + requestid).success(setBiletoStatus(data));
-
-        // Pre-compute some useful values for display in the template.
-        data.displaySeries = series.replace(/^.*\//, '');
-        data.displayDest = dest.split('/').slice(-1)[0];
-        data.displayLink = shortURL(global.status.url);
-        data.pkgNames = Object.keys(mps).sort();
-        data.shortStatus = nWords(message, 3, /\s/);
-        data.longStatus = message.split('. ').map(linkify).map(excusify);
-        data.statusColor = getStatusColor(data.shortStatus);
-
-        // Discover what jenkins instance we are monitoring.
-        j.ppa_url = ppa.split('/').slice(0, 6).join('/')
-                       .replace('api.', '').replace('/devel', '');
-        if (url.substring(0, 4) == 'http') {
-            j.domain = url.split('/').slice(0, 3).join('/');
-        }
-
-        // Build a string containing most relevant info to easily search against
-        data.searchString = [ siloname, data.displaySeries, message ].join(' ');
-        function searchAppender(string) { data.searchString += ' ' + string; }
-        data.landers.forEach(searchAppender);
-        data.pkgNames.forEach(searchAppender);
-        data.sources.forEach(searchAppender);
-
-        // Save the silo state for displaying in the template.
-        silos[siloname] = data;
-    }
-}
-
-function setBiletoStatus(silo) {
-    return function(data) {
-        data.requests.forEach(function(req) {
-            req.color = BILETO_COLORS[(req.qa_signoff || '').toLowerCase()] || '';
-            silo.bileto = req;
-        });
-    }
-}
-
-function svgPlaceX(i) {
-    return (i + 1) * 30;
-}
-
-function appController($scope, $location, $http) {
-    $scope.silos = {};
-    $scope.silonames = [];
-    $scope.distros = {};
-    $scope.statusStats = {};
-    $scope.header = { uniqueStats: 0 };
-    $scope.linkify = linkify;
-
-    $scope.lp_url = 'https://launchpad.net/';
-
-    // Jenkins URL components
-    $scope.j = {
-        root: '/job/',
-        recon: '-0-reconfigure',
-        build: '-1-build',
-        publish: '-2-publish',
-        clean: '-3-merge-clean',
-        suffix: '/build?delay=0sec'
-    };
-
-    // Handy links
-    $scope.links = [
-        ['Team', 'https://wiki.ubuntu.com/citrain/LandingTeam'],
-        ['Excuses', 'http://people.canonical.com/~ubuntu-archive/proposed-migration/update_excuses.html'],
-        ['SRU', 'http://people.canonical.com/~ubuntu-archive/pending-sru.html'],
-        ['Uploads', 'http://people.canonical.com/~ubuntu-archive/pending-sru.html#upload-queues'],
-        ['RAW', '/static/json/index.txt'],
-        ['Bileto', '/'],
-        ['Jenkins', 'https://ci-train.ubuntu.com/'],
-    ];
-
-    $scope.footerLinks = [
-        ['Get the Source', 'http://bazaar.launchpad.net/+branch/bileto/changes'],
-        ['Run Unit Tests', 'test/index.html'],
-    ];
-
-    $scope.getSiloColor = function(siloname) {
-        var req = $scope.silos[siloname] || {};
-        if (!req.requestid || !req.shortStatus) {
-            return 'black';
-        }
-        var siloColor = req.statusColor || 'black';
-        var bileto = req.bileto || {};
-        var qaColor = bileto.color || 'black';
-        if (req.shortStatus.match(/packages built/i)) {
-            return qaColor;
-        } else {
-            return siloColor;
-        }
-    };
-
-    function getQuery() {
-        return $scope.q || '';
-    }
-
-    function URLParams() {
-        return $location.search();
-    }
-
-    function URLWatcher(queryParams) {
-        $scope.q = queryParams.q;
-    }
-
-    function URLSetter(newQ) {
-        $location.search('q', newQ);
-    }
-
-    $scope.$watch(URLParams, URLWatcher);
-    $scope.$watch('q', URLSetter);
-
-    $scope.$watchCollection('silos', function() {
-        setHeaderStatus($scope.header, $scope.silos);
-    });
-
-    function fetchSilo(name) {
-        $scope.distros[name.split(/\//)[0]] = true;
-        $http.get(ROOT + name + '?' + noCache())
-             .success(setSiloStatus($http, $scope.silos, $scope.j))
-             .error(blankSiloStatus($scope.silos)(name));
-    }
-
-    function fetchAllSilos() {
-        // Abort refresh if nobody is looking.
-        if (document[hidden]) return;
-        $http.get(ROOT + 'index.txt' + '?' + noCache())
-             .success(function(data) {
-                 $scope.silonames = data.trim().split(/\n/);
-                 $scope.silonames.forEach(fetchSilo);
-             })
-             .error(function(data, status, headers, config) {
-                 alert('Failed to fetch assigned silo index: ' + status);
-             });
-    }
-
-    fetchAllSilos();
-    setInterval(fetchAllSilos, 2 * 60 * 1000);
-    if (visibilitychange) {
-        document.addEventListener(visibilitychange, fetchAllSilos);
-    }
-
-    // Expose some functions to the scope for use in the template.
-    $scope.fixMergeURL = fixMergeURL;
-    $scope.getStatusColor = getStatusColor;
-    $scope.shortURL = shortURL;
-    $scope.siloSearchFilter = searchFactory(getQuery, $scope.silos);
-    $scope.svgPlaceX = svgPlaceX;
-}

=== removed directory 'tickets/static/test'
=== removed file 'tickets/static/test/index.html'
--- tickets/static/test/index.html	2015-06-18 20:45:11 +0000
+++ tickets/static/test/index.html	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8" />
-<title>Unit Tests for CI Train Silo Dashboard</title>
-<link rel="shortcut icon" type="image/png" href="https://cdnjs.cloudflare.com/ajax/libs/jasmine/2.0.0/jasmine_favicon.png">
-<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/jasmine/2.0.0/jasmine.css">
-
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jasmine/2.0.0/jasmine.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jasmine/2.0.0/jasmine-html.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jasmine/2.0.0/boot.js"></script>
-<script src="jenkins_silo_mock.js" charset="utf-8"></script>
-<script src="../dashboard.js" charset="utf-8"></script>
-<script src="test.js" charset="utf-8"></script>
-</head>
-</html>

=== removed file 'tickets/static/test/jenkins_silo_mock.js'
--- tickets/static/test/jenkins_silo_mock.js	2015-06-19 17:12:06 +0000
+++ tickets/static/test/jenkins_silo_mock.js	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-var JENKINS_SILO_MOCK = {"siloname": "landing-008", "global": {"dest": "https://api.launchpad.net/devel/ubuntu/+archive/primary", "series": "https://api.launchpad.net/devel/ubuntu/utopic", "step": 1, "status": {"url": "https://ci-train.ubuntu.com/some/status/stuff", "message": "Packages built", "ping": true, "state": 3}, "ppa": "https://api.launchpad.net/devel/~ci-train-ppa-service/+archive/ubuntu/landing-008"}, "sources": [], "landers": ["tvoss", "slangasek"], "requestid": "1403854490728", "mps": {"indicator-datetime": ["https://api.launchpad.net/devel/~charlesk/indicator-datetime/make-gcc-version-explicit/+merge/224467"], "mediascanner2": ["https://api.launchpad.net/devel/~jpakkane/mediascanner2/gcc49/+merge/224648"], "unity-api": ["https://api.launchpad.net/devel/~unity-team/unity-api/require-g++-4.9/+merge/227299"], "process-cpp": ["https://api.launchpad.net/devel/~vorlon/process-cpp/explicit-gcc-version/+merge/226594"], "pay-service": ["https://api.launchpad.net/devel/~thomas-voss/pay-service/explicit-gcc-version/+merge/224763"], "dbus-cpp": ["https://api.launchpad.net/devel/~thomas-voss/dbus-cpp/explicit-gcc-version/+merge/224756"], "indicator-transfer": ["https://api.launchpad.net/devel/~charlesk/indicator-transfer/make-gcc-version-explicit/+merge/224473"], "unity-scopes-api": ["https://api.launchpad.net/devel/~unity-team/unity-scopes-api/require-g++-4.9-take-2/+merge/227391"], "trust-store": ["https://api.launchpad.net/devel/~thomas-voss/trust-store/explicit-gcc-version/+merge/224769"], "indicator-location": ["https://api.launchpad.net/devel/~charlesk/indicator-location/make-gcc-version-explicit/+merge/224474"], "platform-api": ["https://api.launchpad.net/devel/~vorlon/platform-api/explicit-gcc-version/+merge/226566"], "location-service": ["https://api.launchpad.net/devel/~thomas-voss/location-service/explicit-gcc-version/+merge/224776"], "unity-mir": ["https://api.launchpad.net/devel/~thomas-voss/unity-mir/explicit-gcc-version/+merge/224771"], "media-hub": ["https://api.launchpad.net/devel/~vorlon/media-hub/explicit-gcc-version/+merge/226567"], "net-cpp": ["https://api.launchpad.net/devel/~thomas-voss/net-cpp/explicit-gcc-version/+merge/224760"], "unity-scope-mediascanner": ["https://api.launchpad.net/devel/~jpakkane/unity-scope-mediascanner/gcc49/+merge/224650"]}};

=== removed file 'tickets/static/test/test.js'
--- tickets/static/test/test.js	2015-08-04 06:45:24 +0000
+++ tickets/static/test/test.js	1970-01-01 00:00:00 +0000
@@ -1,426 +0,0 @@
-if (visibilitychange) {
-    describe('The page visibility API', function() {
-        it('should be correctly detected.', function() {
-            expect(hidden in document).toBe(true);
-        });
-    });
-}
-
-describe('The getStatusColor functon', function() {
-    it('should know what statuses are red.', function() {
-        expect(getStatusColor('Build failed: incorrect planetary alignment.'))
-        .toBe('red');
-        expect(getStatusColor("Can't build: I don't like you."))
-        .toBe('red');
-    });
-    it('should know what statuses are green.', function() {
-        expect(getStatusColor('Gave up on life.'))
-        .toBe('green');
-        expect(getStatusColor('Landed: Cleaning out your bank account.'))
-        .toBe('green');
-    });
-    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('purple');
-        expect(getStatusColor('Free'))
-        .toBe('purple');
-    });
-    it('should be case insensitive.', function() {
-        expect(getStatusColor('BUILD fAiled')).toBe('red');
-        expect(getStatusColor('miGRATion all')).toBe('blue');
-    });
-});
-
-describe('The linkify function', function() {
-    it('should linkify URLs.', function() {
-        expect(linkify('http://example.com'))
-        .toBe('<a target="_blank" href="http://example.com">example.com</a>');
-        expect(linkify('http://example.com/foo'))
-        .toBe('<a target="_blank" href="http://example.com/foo">foo</a>');
-    });
-    it('should handle multiple URLs.', function() {
-        expect(linkify('Visit http://example.com today, but avoid http://example.com/badness at all costs.'))
-        .toBe('Visit <a target="_blank" href="http://example.com">example.com</a> today, but avoid ' +
-              '<a target="_blank" href="http://example.com/badness">badness</a> at all costs.');
-    });
-    it('should not touch ordinary strings.', function() {
-        expect(linkify('No URL here!')).toBe('No URL here!');
-    });
-    it('should not linkify parenthesis.', function() {
-        expect(linkify('(http://example.com)'))
-        .toBe('(<a target="_blank" href="http://example.com">example.com</a>)');
-    });
-});
-
-describe('The excusify function', function() {
-    it('should link to excuses directly.', function() {
-        expect(excusify('')).toBe('');
-        expect(excusify('whargarble is in the Proposed pocket'))
-        .toBe('<a target="_blank" href="http://people.canonical.com/~ubuntu-archive/'
-              + 'proposed-migration/update_excuses.html#whargarble">whargarble</a>'
-              + ' is in the Proposed pocket');
-    });
-});
-
-describe('The fixMergeURL function', function() {
-    it('should link to the right place.', function() {
-        expect(fixMergeURL('https://api.launchpad.net/devel/foobar'))
-        .toBe('https://code.launchpad.net/foobar');
-    });
-    it('should not harm other URLs.', function() {
-        expect(fixMergeURL('http://example.com'))
-        .toBe('http://example.com');
-    });
-});
-
-describe('The shortURL function', function() {
-    it('should drop the protocol and domain.', function() {
-        expect(shortURL('http://example.com/foo')).toBe('foo');
-        expect(shortURL('http://example.com/bar/baz')).toBe('bar/baz');
-    });
-    it('should extract branch names from merges.', function() {
-        expect(shortURL('https://code.launchpad.net/~vorlon/platform-api/explicit-gcc-version/+merge/226566'))
-        .toBe('explicit gcc version');
-        expect(shortURL('https://code.launchpad.net/~compiz-team/compiz/compiz-0.9.11.2-version-bump/+merge/226511'))
-        .toBe('compiz 0.9.11.2 version bump');
-    });
-    it('should convert underscores to spaces.', function() {
-        expect(shortURL('well_hello_there-handsome')).toBe('well hello there handsome');
-    });
-});
-
-describe('The noCache function', function() {
-    it('should return some numbers.', function() {
-        expect(noCache()).toMatch(/^nocache=\d+$/);
-    });
-});
-
-describe('The nWords function', function() {
-    it('should ignore punctuation by default.', function() {
-        expect(nWords('Ready? Set? Go!', 1)).toBe('Ready');
-    });
-    it('should let you override its regex.', function() {
-        expect(nWords('Ready? Set? Go!', 1, /\s/)).toBe('Ready?');
-    });
-    it('should return the right number of words.', function() {
-        var example = 'One two three four';
-        expect(nWords(example, 0)).toBe('');
-        expect(nWords(example, 1)).toBe('One');
-        expect(nWords(example, 2)).toBe('One two');
-        expect(nWords(example, 3)).toBe('One two three');
-        expect(nWords(example, 4)).toBe('One two three four');
-        expect(nWords(example, 5)).toBe('One two three four');
-    });
-});
-
-describe('The searchFactory function', function() {
-    var silos = {
-        'landing-015': {
-            searchString: 'foo bar baz'
-        },
-        'landing-010': {
-            searchString: 'apple banana orange'
-        },
-    };
-    function getQuery(q) {
-        return function() {
-            return q;
-        }
-    }
-    it('should match only silo 1 when we search for silo 1.', function() {
-        var search = searchFactory(getQuery('landing-001'), silos);
-        expect(search('landing-001')).toBe(true);
-        expect(search('landing-002')).toBe(false);
-        var search = searchFactory(getQuery('001'), silos);
-        expect(search('landing-001')).toBe(true);
-        expect(search('landing-020')).toBe(false);
-    });
-    it('should match the silos that have the stuff we are looking for.', function() {
-        var search = searchFactory(getQuery('foo'), silos);
-        expect(search('landing-003')).toBe(false); // false because it's empty
-        expect(search('landing-010')).toBe(false); // false because it doesn't match
-        expect(search('landing-015')).toBe(true);
-        var search = searchFactory(getQuery('grill'), silos);
-        expect(search('landing-003')).toBe(false); // false because it's empty
-        expect(search('landing-010')).toBe(false); // false because it doesn't match
-        expect(search('landing-015')).toBe(false);
-    });
-    it('should be able to find free silos.', function() {
-        var search = searchFactory(getQuery('Free'), silos);
-        expect(search('landing-004')).toBe(true);
-        expect(search('landing-015')).toBe(false);
-        var search = searchFactory(getQuery('free'), silos);
-        expect(search('landing-004')).toBe(true);
-        expect(search('landing-015')).toBe(false);
-    });
-    it('should show all silos when there is no search term.', function() {
-        var search = searchFactory(getQuery(''), silos);
-        expect(search('landing-001')).toBe(true); // true even though empty
-        expect(search('landing-010')).toBe(true); // not empty, still true
-    });
-    it('should allow regex search terms.', function() {
-        var search = searchFactory(getQuery('foo|apple'), silos);
-        expect(search('landing-010')).toBe(true);
-        expect(search('landing-015')).toBe(true);
-        expect(search('landing-011')).toBe(false);
-    });
-});
-
-describe('The setHeaderStatus function', function() {
-    var silos = {
-        'landing-001': { shortStatus: 'Hello' },
-        'landing-003': { shortStatus: 'Goodbye' },
-        'landing-005': { shortStatus: 'Error. Error.' },
-        'landing-007': { shortStatus: 'Error. Error.' },
-    };
-    it('should calculate header stats accurately.', function() {
-        var header = {};
-        setHeaderStatus(header, silos);
-        expect(header.activeSilos).toBe(4);
-        expect(header.lastUpdated instanceof Date).toBe(true);
-        expect(header.statusStats).toEqual(
-            [['Error. Error.', 2], ['Hello', 1], ['Goodbye', 1]]);
-    });
-});
-
-describe('The blankSiloStatus function', function() {
-    var silos = {
-        'landing-001': {},
-        'landing-007': {},
-        'landing-020': {},
-    };
-    var spreadsheet = silos;
-    it('should delete stale statuses.', function() {
-        expect(Object.keys(silos).length).toBe(3);
-        blankSiloStatus(silos, spreadsheet)('landing-002')();
-        expect(Object.keys(silos).length).toBe(3);
-        blankSiloStatus(silos, spreadsheet)('landing-001')();
-        expect(Object.keys(silos).length).toBe(2);
-        blankSiloStatus(silos, spreadsheet)('landing-007')();
-        expect(Object.keys(silos).length).toBe(1);
-        blankSiloStatus(silos, spreadsheet)('landing-020')();
-        expect(Object.keys(silos).length).toBe(0);
-        blankSiloStatus(silos, spreadsheet)('landing-020')();
-        expect(Object.keys(silos).length).toBe(0);
-    });
-});
-
-describe('The setSiloStatus function', function() {
-    var httpMock = {
-        'get': function () {
-            return {
-                success: function() { return this },
-                error: function() { return this }
-            }
-        }
-    };
-    var silos = {};
-    var j = {};
-    it('should precompute a bunch of stuff.', function() {
-        spyOn(httpMock, 'get').and.callThrough();
-        setSiloStatus(httpMock, silos, j)(JENKINS_SILO_MOCK);
-        var expected = {
-            'siloname': 'landing-008',
-            'global': {
-                'dest': 'https://api.launchpad.net/devel/ubuntu/+archive/primary',
-                'series': 'https://api.launchpad.net/devel/ubuntu/utopic',
-                'step': 1,
-                'status': {
-                    'url': 'https://ci-train.ubuntu.com/some/status/stuff',
-                    'message': 'Packages built',
-                    'ping': true,
-                    'state': 3
-                },
-                'ppa': 'https://api.launchpad.net/devel/~ci-train-ppa-service/+archive/ubuntu/landing-008'
-            },
-            'sources': [],
-            'landers': [
-                'tvoss',
-                'slangasek'
-            ],
-            'requestid': '1403854490728',
-            'mps': {
-                'indicator-datetime': [
-                    'https://api.launchpad.net/devel/~charlesk/indicator-datetime/make-gcc-version-explicit/+merge/224467'
-                ],
-                'mediascanner2': [
-                    'https://api.launchpad.net/devel/~jpakkane/mediascanner2/gcc49/+merge/224648'
-                ],
-                'unity-api': [
-                    'https://api.launchpad.net/devel/~unity-team/unity-api/require-g++-4.9/+merge/227299'
-                ],
-                'process-cpp': [
-                    'https://api.launchpad.net/devel/~vorlon/process-cpp/explicit-gcc-version/+merge/226594'
-                ],
-                'pay-service': [
-                    'https://api.launchpad.net/devel/~thomas-voss/pay-service/explicit-gcc-version/+merge/224763'
-                ],
-                'dbus-cpp': [
-                    'https://api.launchpad.net/devel/~thomas-voss/dbus-cpp/explicit-gcc-version/+merge/224756'
-                ],
-                'indicator-transfer': [
-                    'https://api.launchpad.net/devel/~charlesk/indicator-transfer/make-gcc-version-explicit/+merge/224473'
-                ],
-                'unity-scopes-api': [
-                    'https://api.launchpad.net/devel/~unity-team/unity-scopes-api/require-g++-4.9-take-2/+merge/227391'
-                ],
-                'trust-store': [
-                    'https://api.launchpad.net/devel/~thomas-voss/trust-store/explicit-gcc-version/+merge/224769'
-                ],
-                'indicator-location': [
-                    'https://api.launchpad.net/devel/~charlesk/indicator-location/make-gcc-version-explicit/+merge/224474'
-                ],
-                'platform-api': [
-                    'https://api.launchpad.net/devel/~vorlon/platform-api/explicit-gcc-version/+merge/226566'
-                ],
-                'location-service': [
-                    'https://api.launchpad.net/devel/~thomas-voss/location-service/explicit-gcc-version/+merge/224776'
-                ],
-                'unity-mir': [
-                    'https://api.launchpad.net/devel/~thomas-voss/unity-mir/explicit-gcc-version/+merge/224771'
-                ],
-                'media-hub': [
-                    'https://api.launchpad.net/devel/~vorlon/media-hub/explicit-gcc-version/+merge/226567'
-                ],
-                'net-cpp': [
-                    'https://api.launchpad.net/devel/~thomas-voss/net-cpp/explicit-gcc-version/+merge/224760'
-                ],
-                'unity-scope-mediascanner': [
-                    'https://api.launchpad.net/devel/~jpakkane/unity-scope-mediascanner/gcc49/+merge/224650'
-                ]
-            },
-            'displaySeries': 'utopic',
-            'displayLink': 'some/status/stuff',
-            'pkgNames': [
-                'dbus-cpp',
-                'indicator-datetime',
-                'indicator-location',
-                'indicator-transfer',
-                'location-service',
-                'media-hub',
-                'mediascanner2',
-                'net-cpp',
-                'pay-service',
-                'platform-api',
-                'process-cpp',
-                'trust-store',
-                'unity-api',
-                'unity-mir',
-                'unity-scope-mediascanner',
-                'unity-scopes-api'
-            ],
-            'shortStatus': 'Packages built',
-            'longStatus': ['Packages built'],
-            'statusColor': 'black',
-            'searchString': 'landing-008 utopic Packages built tvoss slangasek dbus-cpp indicator-datetime indicator-location indicator-transfer location-service media-hub mediascanner2 net-cpp pay-service platform-api process-cpp trust-store unity-api unity-mir unity-scope-mediascanner unity-scopes-api'
-        };
-        expect(j.ppa_url).toEqual('https://launchpad.net/~ci-train-ppa-service/+archive');
-        expect(j.domain).toEqual('https://ci-train.ubuntu.com');
-        for (attr in expected) {
-            expect(silos['landing-008'][attr]).toEqual(expected[attr]);
-        }
-        expect(httpMock.get).toHaveBeenCalled();
-        var getCalls = httpMock.get.calls.all();
-        expect(getCalls.length).toBe(1);
-        expect(getCalls[0].args).toEqual(['/v1/ticket/1403854490728']);
-    });
-});
-
-describe('The svgPlaceX function', function() {
-    it('should do some math.', function() {
-        expect(svgPlaceX(0)).toBe(30);
-        expect(svgPlaceX(1)).toBe(60);
-        expect(svgPlaceX(2)).toBe(90);
-        expect(svgPlaceX(3)).toBe(120);
-        expect(svgPlaceX(4)).toBe(150);
-        expect(svgPlaceX(5)).toBe(180);
-        expect(svgPlaceX(6)).toBe(210);
-        expect(svgPlaceX(7)).toBe(240);
-        expect(svgPlaceX(8)).toBe(270);
-        expect(svgPlaceX(9)).toBe(300);
-    });
-});
-
-describe('The appController function', function() {
-    var scopeMock = {
-        '$watch': function() {},
-        '$watchCollection': function () {},
-    };
-    var locationMock = {};
-    var httpMock = {
-        'get': function () {
-            return {
-                success: function() { return this },
-                error: function() { return this }
-            }
-        }
-    };
-    httpMock.jsonp = httpMock.get;
-    it('should initialize some data structures.', function() {
-        appController(scopeMock, locationMock, httpMock);
-        expect(scopeMock.silos).toBeDefined();
-        expect(scopeMock.statusStats).toBeDefined();
-        expect(scopeMock.header.uniqueStats).toBe(0);
-        expect(scopeMock.silonames).toEqual([]);
-    });
-    it('should know about jenkins.', function() {
-        appController(scopeMock, locationMock, httpMock);
-        expect(scopeMock.j.root).toBe('/job/');
-        expect(scopeMock.j.recon).toBe('-0-reconfigure');
-        expect(scopeMock.j.build).toBe('-1-build');
-        expect(scopeMock.j.suffix).toBe('/build?delay=0sec');
-    });
-    it('should have some handy links for the header and footer bars.', function() {
-        appController(scopeMock, locationMock, httpMock);
-        expect(scopeMock.links).toBeDefined();
-        expect(scopeMock.links.length).toBeGreaterThan(5);
-        expect(scopeMock.footerLinks).toBeDefined();
-        expect(scopeMock.footerLinks.length).toBeGreaterThan(1);
-    });
-    it('should be able to determine silo coloring.', function() {
-        appController(scopeMock, locationMock, httpMock);
-        expect(scopeMock.getSiloColor).toBeDefined();
-        expect(scopeMock.getSiloColor('landing-001')).toBe('black');
-        expect(scopeMock.getSiloColor('landing-002')).toBe('black');
-    });
-    it('should expose some functions to the template scope.', function() {
-        expect(scopeMock.fixMergeURL).toBe(fixMergeURL);
-        expect(scopeMock.getStatusColor).toBe(getStatusColor);
-        expect(scopeMock.shortURL).toBe(shortURL);
-        expect(scopeMock.svgPlaceX).toBe(svgPlaceX);
-        expect(scopeMock.siloSearchFilter).toBeDefined();
-    });
-    it('should call $watch twice.', function() {
-        spyOn(scopeMock, '$watch');
-        appController(scopeMock, locationMock, httpMock);
-        expect(scopeMock.$watch).toHaveBeenCalled();
-        var watchCalls = scopeMock.$watch.calls.all();
-        expect(watchCalls[0].args[0].name).toBe('URLParams');
-        expect(watchCalls[0].args[1].name).toBe('URLWatcher');
-        expect(watchCalls[1].args[0]).toBe('q');
-        expect(watchCalls[1].args[1].name).toBe('URLSetter');
-    });
-    it('should call $watchCollection.', function() {
-        spyOn(scopeMock, '$watchCollection');
-        appController(scopeMock, locationMock, httpMock);
-        expect(scopeMock.$watchCollection).toHaveBeenCalled();
-        var calls = scopeMock.$watchCollection.calls.all();
-        expect(calls[0].args[0]).toBe('silos');
-        expect(calls[0].args[1] instanceof Function).toBe(true);
-    });
-    it('should call $http methods.', function() {
-        spyOn(httpMock, 'get').and.callThrough();
-        spyOn(httpMock, 'jsonp').and.callThrough();
-        appController(scopeMock, locationMock, httpMock);
-        expect(httpMock.get).toHaveBeenCalled();
-        var getCalls = httpMock.get.calls.all();
-        expect(getCalls.length).toBe(1);
-        expect(getCalls[0].args[0]).toMatch('^/static/json/index.txt\\?nocache=');
-    });
-});

=== modified file 'tickets/v1.py'
--- tickets/v1.py	2015-08-28 04:38:56 +0000
+++ tickets/v1.py	2015-08-28 20:11:22 +0000
@@ -13,7 +13,7 @@
 /v1/errors:         Dump error log (authenticated users only).
 """
 
-from flask import abort, jsonify, request, session
+from flask import abort, jsonify, redirect, request, session
 from urllib.parse import urlencode
 from sqlalchemy import func, desc
 from contextlib import suppress
@@ -77,6 +77,12 @@
     return app.send_static_file('index.html')
 
 
[e-mail]('/static/dashboard.html', methods=['GET'])
+def dashboard_redirect():
+    """Redirect to the front page."""
+    return redirect('/')
+
+
 @app.route('/v1/tickets', methods=['POST'])
 def create_or_update():
     """Inject given JSON into db; either creating or updating a record."""