fix(*): minor improvements

Author: AnatolyRugalev

Diff for: app/client/client.go

@@ -64,8 +64,7 @@ type client struct {
 	config  commander.Config
 	timeout time.Duration
 
-	resources commander.ResourceMap
-	factory   util.Factory
+	factory util.Factory
 }
 
 func (c client) CurrentNamespace() (string, error) {
@@ -103,37 +102,35 @@ func (c client) NewRequest(resource *commander.Resource) (*rest.Request, error)
 }
 
 func (c client) Resources() (commander.ResourceMap, error) {
-	if c.resources == nil {
-		discoveryClient, err := c.factory.ToDiscoveryClient()
-		if err != nil {
-			return nil, err
-		}
-		lists, err := discoveryClient.ServerPreferredResources()
-		if err != nil {
-			return nil, err
-		}
-		resources := make(commander.ResourceMap)
-
-		for _, list := range lists {
-			for _, res := range list.APIResources {
-				gv, err := schema.ParseGroupVersion(list.GroupVersion)
-				if err != nil {
-					return nil, err
-				}
-
-				gk := schema.GroupKind{Group: gv.Group, Kind: res.Kind}
-				resources[gk] = &commander.Resource{
-					Namespaced: res.Namespaced,
-					Resource:   res.Name,
-					Gk:         gk,
-					Gvk:        schema.GroupVersionKind{Group: gv.Group, Version: gv.Version, Kind: res.Kind},
-					Verbs:      res.Verbs,
-				}
+	discoveryClient, err := c.factory.ToDiscoveryClient()
+	if err != nil {
+		return nil, err
+	}
+	lists, err := discoveryClient.ServerPreferredResources()
+	if err != nil {
+		return nil, err
+	}
+	resources := make(commander.ResourceMap)
+
+	for _, list := range lists {
+		for _, res := range list.APIResources {
+			gv, err := schema.ParseGroupVersion(list.GroupVersion)
+			if err != nil {
+				return nil, err
+			}
+
+			gk := schema.GroupKind{Group: gv.Group, Kind: res.Kind}
+			resources[gk] = &commander.Resource{
+				Namespaced: res.Namespaced,
+				Resource:   res.Name,
+				Gk:         gk,
+				Gvk:        schema.GroupVersionKind{Group: gv.Group, Version: gv.Version, Kind: res.Kind},
+				Verbs:      res.Verbs,
 			}
 		}
-		c.resources = resources
 	}
-	return c.resources, nil
+
+	return resources, nil
 }
 
 func (c client) Get(ctx context.Context, resource *commander.Resource, namespace string, name string, out runtime.Object) error {

Diff for: app/ui/resourceMenu/resource_menu.go

@@ -149,8 +149,6 @@ func NewResourcesMenu(workspace commander.Workspace, onSelect SelectFunc, select
 }
 
 func (r *ResourceMenu) UpdateMenu(items []*pb.Resource) ([]commander.Operation, error) {
-	r.Lock()
-	defer r.Unlock()
 	var ops []commander.Operation
 
 	ops = append(ops,
@@ -162,6 +160,8 @@ func (r *ResourceMenu) UpdateMenu(items []*pb.Resource) ([]commander.Operation,
 	if err != nil {
 		return nil, err
 	}
+	r.Lock()
+	defer r.Unlock()
 	r.items = []*resourceItem{}
 	r.clusterItems = 0
 	var clusterItems, namespacedItems []*resourceItem
@@ -245,6 +245,7 @@ func (r *ResourceMenu) OnKeyPress(row commander.Row, event *tcell.EventKey) bool
 					}
 				}
 				r.saveItems()
+				r.workspace.Status().Info("Deleted.")
 			} else {
 				r.workspace.Status().Info("Cancelled.")
 			}
@@ -272,7 +273,7 @@ func (r *ResourceMenu) OnKeyPress(row commander.Row, event *tcell.EventKey) bool
 				r.items = append(r.items, add)
 			} else {
 				newItems := append(r.items[:r.clusterItems], add)
-				newItems = append(newItems, r.items[r.clusterItems:]...)
+				newItems = append(newItems, r.items[r.clusterItems+1:]...)
 				r.items = newItems
 			}
 			r.saveItems()

Diff for: app/ui/resourceMenu/resource_picker.go

@@ -38,7 +38,7 @@ func newResourcePicker(container commander.ResourceContainer, f GroupKindFunc) (
 		}, true))
 		resMap[res.Gk.String()] = res
 	}
-	lt := listTable.NewStaticListTable(columns, rows, listTable.NoHorizontalScroll|listTable.WithFilter|listTable.WithHeaders, container.ScreenHandler())
+	lt := listTable.NewStaticListTable(columns, rows, listTable.NoHorizontalScroll|listTable.WithFilter|listTable.WithHeaders|listTable.StartFilter, container.ScreenHandler())
 	lt.BindOnKeyPress(func(row commander.Row, event *tcell.EventKey) bool {
 		if row == nil {
 			return false

Diff for: app/ui/resources/namespace/namespace_picker.go

@@ -22,7 +22,7 @@ func PickNamespace(workspace commander.Workspace, resource *commander.Resource,
 }
 
 func NewNamespacePicker(container commander.ResourceContainer, resource *commander.Resource, f NamespaceFunc) (*listTable.ResourceListTable, error) {
-	rlt := listTable.NewResourceListTable(container, resource, listTable.NameOnly|listTable.NoActions|listTable.NoWatch)
+	rlt := listTable.NewResourceListTable(container, resource, listTable.NameOnly|listTable.NoActions|listTable.NoWatch|listTable.WithFilter|listTable.StartFilter)
 	rlt.BindOnKeyPress(func(row commander.Row, event *tcell.EventKey) bool {
 		if event.Key() == tcell.KeyEnter {
 			go func() {

Diff for: app/ui/widgets/listTable/listTable.go

@@ -45,6 +45,7 @@ const (
 	NoActions
 	NoWatch
 	WithFilter
+	StartFilter
 )
 
 func (tf TableFormat) Has(flag TableFormat) bool {
@@ -102,6 +103,7 @@ func NewListTable(prov commander.RowProvider, format TableFormat, screen command
 		preloader:    NewPreloader(screen),
 		rowProvider:  prov,
 		screen:       screen,
+		filterMode:   format.Has(StartFilter),
 	}
 	lt.Render()
 	return lt
@@ -292,7 +294,7 @@ func (lt *ListTable) BindOnChange(rowFunc RowFunc) {
 }
 
 func (lt *ListTable) resetFilter() {
-	lt.filterMode = false
+	lt.filterMode = lt.format.Has(StartFilter)
 	lt.filter = ""
 	lt.Render()
 	lt.reindexSelection()

Diff for: app/ui/workspace/workspace.go

@@ -151,15 +151,6 @@ func (w *workspace) HandleEvent(e tcell.Event) bool {
 		switch ev.Key() {
 		case tcell.KeyCtrlN, tcell.KeyF2:
 			namespace.PickNamespace(w, w.namespaceResource, w.SwitchNamespace)
-		case tcell.KeyCtrlP:
-			w.focus.Focus(w.menu)
-			w.menu.SelectItem(schema.GroupKind{Kind: "Pod"}.String())
-		case tcell.KeyCtrlD:
-			w.focus.Focus(w.menu)
-			w.menu.SelectItem(schema.GroupKind{Kind: "Deployment", Group: "apps"}.String())
-		case tcell.KeyCtrlI:
-			w.focus.Focus(w.menu)
-			w.menu.SelectItem(schema.GroupKind{Kind: "Ingress", Group: "networking.k8s.io"}.String())
 		default:
 			if ev.Rune() == '?' {
 				help.ShowHelpPopup(w)