fix(ui): fix popup ESC key and add popup mutex

Author: Anatoly Rugalev

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|listTable.StartFilter, container.ScreenHandler())
+	lt := listTable.NewStaticListTable(columns, rows, listTable.NoHorizontalScroll|listTable.WithFilter|listTable.WithHeaders|listTable.AlwaysFilter, container.ScreenHandler())
 	lt.BindOnKeyPress(func(row commander.Row, event *tcell.EventKey) bool {
 		if row == nil {
 			return false

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|listTable.WithFilter|listTable.StartFilter)
+	rlt := listTable.NewResourceListTable(container, resource, listTable.NameOnly|listTable.NoActions|listTable.NoWatch|listTable.WithFilter|listTable.AlwaysFilter)
 	rlt.BindOnKeyPress(func(row commander.Row, event *tcell.EventKey) bool {
 		if event.Key() == tcell.KeyEnter {
 			go func() {

app/ui/widgets/listTable/listTable.go

@@ -45,7 +45,7 @@ const (
 	NoActions
 	NoWatch
 	WithFilter
-	StartFilter
+	AlwaysFilter
 )
 
 func (tf TableFormat) Has(flag TableFormat) bool {
@@ -103,7 +103,7 @@ func NewListTable(prov commander.RowProvider, format TableFormat, screen command
 		preloader:    NewPreloader(screen),
 		rowProvider:  prov,
 		screen:       screen,
-		filterMode:   format.Has(StartFilter),
+		filterMode:   format.Has(AlwaysFilter),
 	}
 	lt.Render()
 	return lt
@@ -294,7 +294,7 @@ func (lt *ListTable) BindOnChange(rowFunc RowFunc) {
 }
 
 func (lt *ListTable) resetFilter() {
-	lt.filterMode = lt.format.Has(StartFilter)
+	lt.filterMode = lt.format.Has(AlwaysFilter)
 	lt.filter = ""
 	lt.Render()
 	lt.reindexSelection()
@@ -589,7 +589,7 @@ func (lt *ListTable) HandleEvent(ev tcell.Event) bool {
 			return true
 		}
 		if lt.format.Has(WithFilter) {
-			if (lt.filterMode || lt.filter != "") && ev.Key() == tcell.KeyEsc && lt.IsFocused() {
+			if (lt.filterMode || lt.filter != "") && ev.Key() == tcell.KeyEsc && lt.IsFocused() && !lt.format.Has(AlwaysFilter) {
 				lt.resetFilter()
 				return true
 			}
@@ -603,7 +603,7 @@ func (lt *ListTable) HandleEvent(ev tcell.Event) bool {
 					}
 					return true
 				case tcell.KeyEnter:
-					if !lt.format.Has(StartFilter) {
+					if !lt.format.Has(AlwaysFilter) {
 						lt.filterMode = false
 						lt.Render()
 						lt.reindexSelection()

app/ui/workspace/workspace.go

@@ -12,6 +12,7 @@ import (
 	"github.com/gdamore/tcell"
 	"github.com/gdamore/tcell/views"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"sync"
 )
 
 type workspace struct {
@@ -22,9 +23,10 @@ type workspace struct {
 	container commander.Container
 	focus     commander.FocusManager
 
-	popup  commander.Popup
-	menu   *resourceMenu.ResourceMenu
-	widget commander.Widget
+	popupMu sync.Mutex
+	popup   commander.Popup
+	menu    *resourceMenu.ResourceMenu
+	widget  commander.Widget
 
 	namespace         string
 	namespaceResource *commander.Resource
@@ -34,10 +36,12 @@ type workspace struct {
 
 func (w *workspace) Resize() {
 	w.BoxLayout.Resize()
+	w.popupMu.Lock()
 	if w.popup != nil {
 		w.popup.Reposition(w.view)
 		w.popup.Resize()
 	}
+	w.popupMu.Unlock()
 }
 
 func (w *workspace) SetView(view views.View) {
@@ -93,21 +97,27 @@ func (w *workspace) FocusManager() commander.FocusManager {
 }
 
 func (w *workspace) ShowPopup(title string, widget commander.MaxSizeWidget) {
+	w.popupMu.Lock()
 	w.popup = popup.NewPopup(w.view, w.Theme(), title, widget, func() {
+		w.popupMu.Lock()
 		w.popup.OnHide()
 		w.popup = nil
+		w.popupMu.Unlock()
 		w.UpdateScreen()
 	})
 	w.popup.OnShow()
 	w.focus.Focus(w.popup)
+	w.popupMu.Unlock()
 	w.UpdateScreen()
 }
 
 func (w *workspace) UpdateScreen() {
+	w.popupMu.Lock()
 	if w.popup != nil {
 		w.popup.Reposition(w.container.Screen().View())
 		w.popup.Resize()
 	}
+	w.popupMu.Unlock()
 	if screen := w.container.Screen(); screen != nil {
 		screen.UpdateScreen()
 	}
@@ -131,19 +141,24 @@ func (w *workspace) Status() commander.StatusReporter {
 
 func (w *workspace) Draw() {
 	w.BoxLayout.Draw()
+	w.popupMu.Lock()
 	if w.popup != nil {
 		w.popup.Draw()
 	}
+	w.popupMu.Unlock()
 }
 
 func (w *workspace) HandleEvent(e tcell.Event) bool {
 	if w.Status().HandleEvent(e) {
 		return true
 	}
-	if w.focus.HandleEvent(e, w.popup == nil) {
+	w.popupMu.Lock()
+	hasPopup := w.popup != nil
+	w.popupMu.Unlock()
+	if w.focus.HandleEvent(e, !hasPopup) {
 		return true
 	}
-	if w.popup != nil {
+	if hasPopup {
 		return false
 	}
 	switch ev := e.(type) {