Merge lp:~pwlars/uci-engine/webui-open-tickets-fields into lp:uci-engine

[Paul Larson]

Add series and landers columns to the open tickets view

This adds a column for series and landers in the open tickets view

[Celso Providelo (cprov)]

Paul,

Thanks for working on this, having series & landers in the ticket lists is handy and will allow us to play with local/global sorting later.

The existing integration test (test_webui.py/test_home) needs fixing for the new columns, but other than that it looks good for landing.

review: Approve

[Paul Larson (pwlars)]

> The existing integration test (test_webui.py/test_home) needs fixing for the
> new columns, but other than that it looks good for landing.
The test fix went in r912, did I miss somewhere else that it needs to be fixed?

[Celso Providelo (cprov)]

No, it's there ... sorry for the misleading tip.

[Ubuntu CI Bot (uci-bot)]

The attempt to merge lp:~pwlars/uci-engine/webui-open-tickets-fields into lp:uci-engine failed. Below is the output from the failed tests.

Running cm...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
uploading webui-content.tgz to swift
Updating source dependencies...
Checking juju status
Private PPAs: disabled
Preparing local branch upload...
Uploading local branch, fingerprint a252a3d752dcb92d3684ac9fe5d8d7f9ba6b4b4a
Building charm: lander
Building charm: wsgi-app
Building charm: rabbitmq-worker
Building charm: chroot-builder
Building charm: key-secret-subordinate
Building charm: webui
Building charm: system-image-server
Installing keys from bzr+ssh://bazaar.launchpad.net/~ci-engineering-private/+junk/ci-airline-dev-keys/
Running juju-deployer -v -c /tmp/tmptYs1fc/deployer/relations.yaml -c /tmp/tmptYs1fc/deployer/services.yaml ci-airline
Tests running...
ci-utils.ci_utils.tests.test_amqp.TestAMQP.testConnectFailed ... OK (0.002 secs)
ci-utils.ci_utils.tests.test_amqp.TestAMQP.testProcessQueue ... OK (0.002 secs)
ci-utils.ci_utils.tests.test_amqp.TestAMQP.testRunForever ... OK (0.101 secs)
ci-utils.ci_utils.tests.test_amqp.TestAMQP.testSent ... OK (0.003 secs)
ci-utils.ci_utils.tests.test_amqp.TestProgressTrigger.testProgress ... OK (0.002 secs)
ci-utils.ci_utils.tests.test_amqp_worker.TestAMQPWorker.testCancel ... OK (0.106 secs)
ci-utils.ci_utils.tests.test_amqp_worker.TestAMQPWorker.testNoQueue ... OK (0.003 secs)
ci-utils.ci_utils.tests.test_amqp_worker.TestAMQPWorker.testNoTicket ... OK (0.004 secs)
ci-utils.ci_utils.tests.test_amqp_worker.TestAMQPWorker.testOnMessageCalledProcessError ... OK (0.005 secs)
ci-utils.ci_utils.tests.test_amqp_worker.TestAMQPWorker.testOnMessageFail ... OK (0.002 secs)
ci-utils.ci_utils.tests.test_amqp_worker.TestAMQPWorker.testOnMessageKilled ... OK (0.003 secs)
ci-utils.ci_utils.tests.test_amqp_worker.TestAMQPWorker.testOnMessageSimple ... OK (0.002 secs)
ci-utils.ci_utils.tests.test_amqp_worker.TestAMQPWorker.testOnMessageUnexpected ... OK (0.003 secs)
ci-utils.ci_utils.tests.test_amqp_worker.TestAMQPWorker.testSaveLastRun ... OK (0.001 secs)
ci-utils.ci_utils.tests.test_amqp_worker.TestTimer.testCBRuns ... OK (0.021 secs)
ci-utils.ci_utils.tests.test_amqp_worker.TestTimer.testCanCancel ... OK (0.001 secs)
ci-utils.ci_utils.tests.test_data_store.TestDataStoreConfig.test_invalid_auth_config ... OK (0.000 secs)
ci-utils.ci_utils.tests.test_data_store.TestDataStoreConfig.test_valid_auth_config ... OK (0.000 secs)
ci-utils.ci_utils.tests.test_data_store.TestDataStoreFileName.test_abspath ... OK (0.000 secs)
ci-utils.ci_utils.tests.test_data_store.TestDataStoreFileName.test_basename ... OK (0.000 secs)
ci-utils.ci_utils.tests.test_data_store.TestDataStoreFileName.test_relpath ... OK (0.000 secs)
ci-utils.ci_utils.tests.test_deployer.TestDeployer.test_load_empty_single_config ... OK (0.003 secs)
ci-utils.ci_utils.tests.test_deployer.TestDeployer.test_load_multiple_config ... OK (0.008 secs)
ci-utils.ci_utils.tests.test_deployer.TestDeployer.test_load_single_config .....

=== modified file 'tests/test_webui.py'
--- tests/test_webui.py	2014-12-16 20:49:10 +0000
+++ tests/test_webui.py	2014-12-18 19:10:54 +0000
@@ -66,7 +66,8 @@
         dt_header = wait_for(
             get_element_by_css, 'table.yui3-datatable-table thead')
         self.assertEqual(
-            ['Title', 'Landing Progress', 'Review Status'],
+            ['Title', 'Series', 'Landing Progress', 'Review Status',
+             'Landers'],
             [t.text for t in dt_header.find_elements_by_tag_name('th')])
 
         # A stock YUI paginator is also present.

=== modified file 'webui/tickets/static/tickets/webui.js'
--- webui/tickets/static/tickets/webui.js	2014-12-09 16:29:55 +0000
+++ webui/tickets/static/tickets/webui.js	2014-12-18 19:10:54 +0000
@@ -1016,6 +1016,14 @@
                 return link_it(o);
             };
 
+            var format_landers = function (o) {
+                return o.data.citrain_overlay.landers;
+            };
+
+            var format_series = function (o) {
+                return o.data.series;
+            };
+
             var format_step = function (o) {
                 var c = Y.Node.create('<div>');
 
@@ -1053,10 +1061,14 @@
                 columnset: [
                     {key: 'title', label: 'Title',
                      formatter: format_id, allowHTML: true},
+                    {key: 'series', label: 'Series',
+                     formatter: format_series, allowHTML: true},
                     {key: 'current_workflow_step', label: 'Landing Progress',
                      formatter: format_step, allowHTML: true},
                     {key: 'reviews', label: 'Review Status',
-                     formatter: format_reviews, allowHTML: true}
+                     formatter: format_reviews, allowHTML: true},
+                    {key: 'landers', label: 'Landers',
+                     formatter: format_landers, allowHTML: true}
                 ],
                 paginator: new Y.PaginatorView({
                     model: new Y.PaginatorModel({
@@ -1087,8 +1099,8 @@
                 schema: {
                     resultListLocator: 'objects',
                     resultFields: [
-                        'title', 'current_workflow_step', 'status', 'uuid',
-                        'reviews'
+                        'title', 'citrain_overlay', 'current_workflow_step',
+                        'series', 'status', 'uuid', 'reviews'
                     ],
                     metaFields: {
                         totalItems: 'meta.total_count'