From cfb38b158775eedd9850105b340d9ab712abadda Mon Sep 17 00:00:00 2001
From: derailed <fernand.galiana@gmail.com>
Date: Sat, 25 Jan 2020 22:36:13 -0700
Subject: [PATCH] updates

---
 cmd/root.go              |  4 ++--
 internal/dao/registry.go |  2 ++
 internal/ui/table.go     | 22 +++++++++++++---------
 internal/view/alias.go   |  2 --
 internal/view/app.go     |  4 ++--
 internal/view/command.go |  6 ++++--
 internal/view/table.go   |  2 --
 7 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/cmd/root.go b/cmd/root.go
index f69d50a6..957cedc3 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -45,10 +45,10 @@ func init() {
 
 	// Klogs (of course) want to print stuff to the screen ;(
 	klog.InitFlags(nil)
-	if err := flag.Set("log_file", config.K9sLogs); err != nil {
+	if err := flag.Set("log_file", "/dev/null"); err != nil {
 		log.Error().Err(err)
 	}
-	if err := flag.Set("stderrthreshold", "error"); err != nil {
+	if err := flag.Set("stderrthreshold", "fatal"); err != nil {
 		log.Error().Err(err)
 	}
 	if err := flag.Set("alsologtostderr", falseFlag); err != nil {
diff --git a/internal/dao/registry.go b/internal/dao/registry.go
index 138b0b2a..438f18ea 100644
--- a/internal/dao/registry.go
+++ b/internal/dao/registry.go
@@ -123,6 +123,7 @@ func loadK9s(m ResourceMetas) {
 		Name:         "aliases",
 		Kind:         "Aliases",
 		SingularName: "alias",
+		Verbs:        []string{},
 		Categories:   []string{"k9s"},
 	}
 	m[client.NewGVR("contexts")] = metav1.APIResource{
@@ -130,6 +131,7 @@ func loadK9s(m ResourceMetas) {
 		Kind:         "Contexts",
 		SingularName: "context",
 		ShortNames:   []string{"ctx"},
+		Verbs:        []string{},
 		Categories:   []string{"k9s"},
 	}
 	m[client.NewGVR("screendumps")] = metav1.APIResource{
diff --git a/internal/ui/table.go b/internal/ui/table.go
index cad520b8..abf52e71 100644
--- a/internal/ui/table.go
+++ b/internal/ui/table.go
@@ -98,6 +98,17 @@ func (t *Table) SendKey(evt *tcell.EventKey) {
 	t.keyboard(evt)
 }
 
+func (t *Table) filterInput(r rune) {
+	if !t.cmdBuff.IsActive() {
+		return
+	}
+	t.cmdBuff.Add(r)
+	t.ClearSelection()
+	t.doUpdate(t.filtered(t.GetModel().Peek()))
+	t.UpdateTitle()
+	t.SelectFirstRow()
+}
+
 func (t *Table) keyboard(evt *tcell.EventKey) *tcell.EventKey {
 	key := evt.Key()
 	if key == tcell.KeyUp || key == tcell.KeyDown {
@@ -105,14 +116,7 @@ func (t *Table) keyboard(evt *tcell.EventKey) *tcell.EventKey {
 	}
 
 	if key == tcell.KeyRune {
-		if t.SearchBuff().IsActive() {
-			t.SearchBuff().Add(evt.Rune())
-			t.ClearSelection()
-			t.doUpdate(t.filtered(t.GetModel().Peek()))
-			t.UpdateTitle()
-			t.SelectFirstRow()
-			return nil
-		}
+		t.filterInput(evt.Rune())
 		key = asKey(evt)
 	}
 
@@ -365,7 +369,7 @@ func (t *Table) styleTitle() string {
 		}
 	}
 
-	buff := t.SearchBuff().String()
+	buff := t.cmdBuff.String()
 	var title string
 	if ns == client.ClusterScope {
 		title = SkinTitle(fmt.Sprintf(TitleFmt, base, rc), t.styles.Frame())
diff --git a/internal/view/alias.go b/internal/view/alias.go
index 8ae01453..6b6b7b43 100644
--- a/internal/view/alias.go
+++ b/internal/view/alias.go
@@ -9,7 +9,6 @@ import (
 	"github.com/derailed/k9s/internal/render"
 	"github.com/derailed/k9s/internal/ui"
 	"github.com/gdamore/tcell"
-	"github.com/rs/zerolog/log"
 )
 
 const aliasTitle = "Aliases"
@@ -48,7 +47,6 @@ func (a *Alias) bindKeys(aa ui.KeyActions) {
 }
 
 func (a *Alias) gotoCmd(evt *tcell.EventKey) *tcell.EventKey {
-	log.Debug().Msgf("GOTO CMD")
 	r, _ := a.GetTable().GetSelection()
 	if r != 0 {
 		s := ui.TrimCell(a.GetTable().SelectTable, r, 1)
diff --git a/internal/view/app.go b/internal/view/app.go
index d7fc1f9f..e9c64dab 100644
--- a/internal/view/app.go
+++ b/internal/view/app.go
@@ -222,7 +222,7 @@ func (a *App) refreshCluster() {
 
 	// Reload alias
 	go func() {
-		if err := a.command.Reset(); err != nil {
+		if err := a.command.Reset(false); err != nil {
 			log.Error().Err(err).Msgf("Command reset failed")
 		}
 	}()
@@ -256,7 +256,7 @@ func (a *App) switchCtx(name string, loadPods bool) error {
 		}
 		a.initFactory(ns)
 
-		if err := a.command.Reset(); err != nil {
+		if err := a.command.Reset(true); err != nil {
 			return err
 		}
 		a.Config.Reset()
diff --git a/internal/view/command.go b/internal/view/command.go
index 41158e5b..eab353c5 100644
--- a/internal/view/command.go
+++ b/internal/view/command.go
@@ -46,11 +46,13 @@ func (c *Command) Init() error {
 }
 
 // Reset resets Command and reload aliases.
-func (c *Command) Reset() error {
+func (c *Command) Reset(clear bool) error {
 	c.mx.Lock()
 	defer c.mx.Unlock()
 
-	c.alias.Clear()
+	if clear {
+		c.alias.Clear()
+	}
 	if _, err := c.alias.Ensure(); err != nil {
 		return err
 	}
diff --git a/internal/view/table.go b/internal/view/table.go
index b6c4ae02..faa62541 100644
--- a/internal/view/table.go
+++ b/internal/view/table.go
@@ -191,9 +191,7 @@ func (t *Table) eraseCmd(evt *tcell.EventKey) *tcell.EventKey {
 }
 
 func (t *Table) activateCmd(evt *tcell.EventKey) *tcell.EventKey {
-	log.Debug().Msgf("Table filter activated!")
 	if t.app.InCmdMode() {
-		log.Debug().Msgf("App Is in Command mode!")
 		return evt
 	}
 	t.app.Flash().Info("Filter mode activated.")