From 332b62f4c1096be0f33251a1db9fc2961a4c1491 Mon Sep 17 00:00:00 2001
From: derailed <fernand.galiana@gmail.com>
Date: Thu, 3 Oct 2019 14:23:47 -0600
Subject: [PATCH] ensure the correct active ns is listed when in node view

---
 internal/views/no.go       | 6 ++++--
 internal/views/resource.go | 1 +
 internal/watch/informer.go | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/internal/views/no.go b/internal/views/no.go
index 6a0f63f1..01981c2a 100644
--- a/internal/views/no.go
+++ b/internal/views/no.go
@@ -35,8 +35,8 @@ func (v *nodeView) sortColCmd(col int, asc bool) func(evt *tcell.EventKey) *tcel
 	}
 }
 
-func (v *nodeView) showPods(app *appView, _, res, sel string) {
-	showPods(app, "", "", "spec.nodeName="+sel, v.backCmd)
+func (v *nodeView) showPods(app *appView, _, _, sel string) {
+	showPods(app, app.Config.ActiveNamespace(), "", "spec.nodeName="+sel, v.backCmd)
 }
 
 func (v *nodeView) backCmd(evt *tcell.EventKey) *tcell.EventKey {
@@ -46,6 +46,8 @@ func (v *nodeView) backCmd(evt *tcell.EventKey) *tcell.EventKey {
 }
 
 func showPods(app *appView, ns, labelSel, fieldSel string, a ui.ActionHandler) {
+	app.switchNS(ns)
+
 	list := resource.NewPodList(app.Conn(), ns)
 	list.SetLabelSelector(labelSel)
 	list.SetFieldSelector(fieldSel)
diff --git a/internal/views/resource.go b/internal/views/resource.go
index d962bf04..61d429e3 100644
--- a/internal/views/resource.go
+++ b/internal/views/resource.go
@@ -313,6 +313,7 @@ func (v *resourceView) switchNamespaceCmd(evt *tcell.EventKey) *tcell.EventKey {
 		return nil
 	}
 
+	v.app.switchNS(ns)
 	v.setNamespace(ns)
 	v.app.Flash().Infof("Viewing `%s` namespace...", ns)
 	v.refresh()
diff --git a/internal/watch/informer.go b/internal/watch/informer.go
index 24959a20..08992675 100644
--- a/internal/watch/informer.go
+++ b/internal/watch/informer.go
@@ -63,7 +63,10 @@ type Informer struct {
 
 // NewInformer creates a new cluster resource informer
 func NewInformer(client k8s.Connection, ns string) (*Informer, error) {
-	i := Informer{client: client, informers: map[string]StoreInformer{}}
+	i := Informer{
+		client:    client,
+		informers: map[string]StoreInformer{},
+	}
 	if err := client.CheckNSAccess(ns); err != nil {
 		log.Error().Err(err).Msg("Checking NS Access")
 		return nil, err