Merge lp:~rvb/maas/dashboard-bug-1390434-1.7 into lp:maas/1.7

[Raphaël Badin]

Backport 3350: Fix the dashboard: we missed a callsite when we refactored the dashboard to move away from longpoll and this broke the message that gets displayed when hovering over the dashboard.

[Raphaël Badin (rvb)]

Simple backport, self-approving.

review: Approve

[Christian Reis (kiko)]

Thanks! I wish we had functional testing for this, but since it's going away..

=== modified file 'src/maasserver/static/js/nodes_chart.js'
--- src/maasserver/static/js/nodes_chart.js	2014-09-29 14:07:13 +0000
+++ src/maasserver/static/js/nodes_chart.js	2014-11-07 17:10:33 +0000
@@ -128,7 +128,7 @@
         var outer_nodes = [
             {
                 nodes: stats.allocated,
-                name: 'allocated_nodes',
+                name: 'allocated',
                 colour: OUTER_COLOURS[0],
                 events: {
                     over: 'hover.allocated.over',
@@ -137,7 +137,7 @@
                 },
             {
                 nodes: stats.commissioned,
-                name: 'commissioned_nodes',
+                name: 'commissioned',
                 colour: OUTER_COLOURS[2],
                 events: {
                     over: 'hover.commissioned.over',
@@ -146,7 +146,7 @@
                 },
             {
                 nodes: stats.queued,
-                name: 'queued_nodes',
+                name: 'queued',
                 colour: OUTER_COLOURS[1],
                 events: {
                     over: 'hover.queued.over',
@@ -186,7 +186,8 @@
                     Y.one(slice.node).on(
                         'hover',
                         function(e, over, out, name, widget) {
-                            widget.fire(over, {nodes: widget.get(name)});
+                            widget.fire(over, {
+                                nodes: widget.get('stats').get(name)});
                         },
                         function(e, over, out, nodes, widget) {
                             widget.fire(out);

=== modified file 'src/maasserver/static/js/tests/test_nodes_chart.js'
--- src/maasserver/static/js/tests/test_nodes_chart.js	2014-09-27 17:06:02 +0000
+++ src/maasserver/static/js/tests/test_nodes_chart.js	2014-11-07 17:10:33 +0000
@@ -59,6 +59,7 @@
                 event: 'hover.allocated.over',
                 action: 'mouseover',
                 fired: false,
+                nodes: initialStats.allocated,
                 node: this.chart._outer_paths[0].node
                 },
             {
@@ -71,6 +72,7 @@
                 event: 'hover.commissioned.over',
                 action: 'mouseover',
                 fired: false,
+                nodes: initialStats.commissioned,
                 node: this.chart._outer_paths[1].node
                 },
             {
@@ -83,6 +85,7 @@
                 event: 'hover.queued.over',
                 action: 'mouseover',
                 fired: false,
+                nodes: initialStats.queued,
                 node: this.chart._outer_paths[2].node
                 },
             {
@@ -95,6 +98,7 @@
                 event: 'hover.offline.over',
                 action: 'mouseover',
                 fired: false,
+                nodes: initialStats.offline,
                 node: this.chart._offline_circle[0].node
                 },
             {
@@ -107,6 +111,7 @@
                 event: 'hover.added.over',
                 action: 'mouseover',
                 fired: false,
+                nodes: initialStats.added,
                 node: this.chart._added_circle[0].node
                 },
             {
@@ -120,11 +125,15 @@
         Y.Array.each(events, function(event) {
             this.chart.on(event.event, function(e, event) {
                 event.fired = true;
+                event.e = e;
             }, null, event);
             Y.one(event.node).simulate(event.action);
             Y.Assert.isTrue(
                 event.fired,
                 'Event ' + event.event + ' should have fired');
+            if (event.nodes) {
+                Y.Assert.areEqual(event.e.nodes, event.nodes);
+            }
         }, this);
     },