From 674cb24f2ae06a97cdcb67e41282cde2d6025fa0 Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom@weave.works>
Date: Thu, 7 Apr 2016 12:23:06 +0100
Subject: [PATCH] Review feedback

---
 .../utils/__tests__/topology-utils-test.js      | 10 +++++-----
 render/filters.go                               | 17 ++++++++---------
 render/topologies.go                            |  6 +++---
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/client/app/scripts/utils/__tests__/topology-utils-test.js b/client/app/scripts/utils/__tests__/topology-utils-test.js
index 7010bb414..7d2e5bc14 100644
--- a/client/app/scripts/utils/__tests__/topology-utils-test.js
+++ b/client/app/scripts/utils/__tests__/topology-utils-test.js
@@ -108,12 +108,12 @@ describe('TopologyUtils', () => {
   });
 
   describe('filterHiddenTopologies', () => {
-    it('should filter out empty topos that set hidden_if_empty=true', () => {
+    it('should filter out empty topos that set hide_if_empty=true', () => {
       const topos = [
-        {id: 'a', hidden_if_empty: true, stats: {node_count: 0, filtered_nodes:0}},
-        {id: 'b', hidden_if_empty: true, stats: {node_count: 1, filtered_nodes:0}},
-        {id: 'c', hidden_if_empty: true, stats: {node_count: 0, filtered_nodes:1}},
-        {id: 'd', hidden_if_empty: false, stats: {node_count: 0, filtered_nodes:0}}
+        {id: 'a', hide_if_empty: true, stats: {node_count: 0, filtered_nodes:0}},
+        {id: 'b', hide_if_empty: true, stats: {node_count: 1, filtered_nodes:0}},
+        {id: 'c', hide_if_empty: true, stats: {node_count: 0, filtered_nodes:1}},
+        {id: 'd', hide_if_empty: false, stats: {node_count: 0, filtered_nodes:0}}
       ];
 
       const res = TopologyUtils.filterHiddenTopologies(topos);
diff --git a/render/filters.go b/render/filters.go
index 0d3077455..9aa35642b 100644
--- a/render/filters.go
+++ b/render/filters.go
@@ -58,25 +58,24 @@ func ColorConnected(r Renderer) Renderer {
 // Filter removes nodes from a view based on a predicate.
 type Filter struct {
 	Renderer
-	FilterFunc     func(report.Node) bool
-	ReportFiltered bool // false means we don't report stats for how many are filtered
+	FilterFunc func(report.Node) bool
+	Silent     bool // true means we don't report stats for how many are filtered
 }
 
 // MakeFilter makes a new Filter.
 func MakeFilter(f func(report.Node) bool, r Renderer) Renderer {
 	return Memoise(&Filter{
-		Renderer:       r,
-		FilterFunc:     f,
-		ReportFiltered: true,
+		Renderer:   r,
+		FilterFunc: f,
 	})
 }
 
 // MakeSilentFilter makes a new Filter which does not report how many nodes it filters in Stats.
 func MakeSilentFilter(f func(report.Node) bool, r Renderer) Renderer {
 	return Memoise(&Filter{
-		Renderer:       r,
-		FilterFunc:     f,
-		ReportFiltered: false,
+		Renderer:   r,
+		FilterFunc: f,
+		Silent:     true,
 	})
 }
 
@@ -130,7 +129,7 @@ func (f *Filter) render(rpt report.Report) (report.Nodes, int) {
 // Stats implements Renderer
 func (f Filter) Stats(rpt report.Report) Stats {
 	var upstream = f.Renderer.Stats(rpt)
-	if f.ReportFiltered {
+	if !f.Silent {
 		_, filtered := f.render(rpt)
 		upstream.FilteredNodes += filtered
 	}
diff --git a/render/topologies.go b/render/topologies.go
index 103920852..beca05974 100644
--- a/render/topologies.go
+++ b/render/topologies.go
@@ -228,10 +228,10 @@ var PodRenderer = MakeReduce(
 			_, isConnected := n.Latest.Lookup(IsConnected)
 			return n.Topology != Pseudo || isConnected
 		},
-		MakeMap(
+		ColorConnected(MakeMap(
 			MapContainer2Pod,
-			ColorConnected(ContainerRenderer),
-		),
+			ContainerRenderer,
+		)),
 	),
 	SelectPod,
 )