From be4f3f72224e953cefedb0c2223119ebd7279f7a Mon Sep 17 00:00:00 2001 From: derailed Date: Sat, 16 Feb 2019 22:28:31 -0700 Subject: [PATCH] clean up type assertions --- views/context.go | 7 ++++--- views/resource.go | 9 +++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/views/context.go b/views/context.go index fe77264e..9b2ef1b4 100644 --- a/views/context.go +++ b/views/context.go @@ -3,9 +3,9 @@ package views import ( "strings" + "github.com/derailed/k9s/config" "github.com/derailed/k9s/resource" "github.com/derailed/k9s/resource/k8s" - "github.com/derailed/k9s/config" "github.com/gdamore/tcell" ) @@ -46,8 +46,9 @@ func (v *contextView) useContext(*tcell.EventKey) { v.app.flash(flashInfo, "Switching context to", ctx) v.refresh() - tv := v.GetPrimitive("ctx").(*tableView) - tv.table.Select(0, 0) + if tv, ok := v.GetPrimitive("ctx").(*tableView); ok { + tv.table.Select(0, 0) + } } func (v *contextView) extraActions(aa keyActions) { diff --git a/views/resource.go b/views/resource.go index 41eeaf32..ef93d55f 100644 --- a/views/resource.go +++ b/views/resource.go @@ -102,7 +102,9 @@ func (v *resourceView) init(ctx context.Context, ns string) { } }(ctx) v.refreshActions() - v.CurrentPage().Item.(*tableView).table.Select(0, 0) + if tv, ok := v.CurrentPage().Item.(*tableView); ok { + tv.table.Select(0, 0) + } } func (v *resourceView) getTitle() string { @@ -247,7 +249,10 @@ func (v *resourceView) refresh() { } func (v *resourceView) getTV() *tableView { - return v.GetPrimitive(v.list.GetName()).(*tableView) + if tv, ok := v.GetPrimitive(v.list.GetName()).(*tableView); ok { + return tv + } + return nil } func (v *resourceView) getSelectedItem() string {