Merge branch 'main' of https://github.com/TNK-Studio/lazykube into main

TNK-Studio · Nov 26, 2020 · 13b4d59 · 13b4d59
2 parents 8842dbc + c40d565
commit 13b4d59
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 29 deletions.
diff --git a/pkg/app/action.go b/pkg/app/action.go
@@ -9,12 +9,10 @@ import (
 )
 
 var (
-	cyclicViews = []string{clusterInfoViewName, namespaceViewName, serviceViewName, deploymentViewName, podViewName}
-
-	nextCyclicView = &guilib.Action{
-		Name:    nextCyclicViewAction,
-		Keys:    keyMap[nextCyclicViewAction],
-		Handler: nextCyclicViewHandler,
+	nextFunctionView = &guilib.Action{
+		Name:    nextFunctionViewAction,
+		Keys:    keyMap[nextFunctionViewAction],
+		Handler: nextFunctionViewHandler,
 		Mod:     gocui.ModNone,
 	}
 

diff --git a/pkg/app/dialog.go b/pkg/app/dialog.go
@@ -192,7 +192,7 @@ func newFilterDialog(
 		Title:        title,
 		CanNotReturn: true,
 		AlwaysOnTop:  true,
-		ZIndex:       0,
+		ZIndex:       10,
 		Clickable:    true,
 		Editable:     true,
 		MouseDisable: true,
@@ -260,7 +260,7 @@ func newFilterDialog(
 	}
 	filtered := &guilib.View{
 		Name:         filteredViewName,
-		ZIndex:       1,
+		ZIndex:       20,
 		Clickable:    true,
 		CanNotReturn: true,
 		AlwaysOnTop:  true,

diff --git a/pkg/app/handler.go b/pkg/app/handler.go
@@ -22,21 +22,21 @@ const (
 	defaultCommand = "/bin/sh"
 )
 
-func nextCyclicViewHandler(gui *guilib.Gui, _ *guilib.View) error {
+func nextFunctionViewHandler(gui *guilib.Gui, _ *guilib.View) error {
 	currentView := gui.CurrentView()
 	if currentView == nil {
 		return nil
 	}
 
 	var nextViewName string
-	for index, viewName := range cyclicViews {
+	for index, viewName := range functionViews {
 		if currentView.Name == viewName {
 			nextIndex := index + 1
-			if nextIndex >= len(cyclicViews) {
+			if nextIndex >= len(functionViews) {
 				nextIndex = 0
 			}
-			nextViewName = cyclicViews[nextIndex]
-			log.Logger.Debugf("nextCyclicViewHandler - nextViewName: %s", nextViewName)
+			nextViewName = functionViews[nextIndex]
+			log.Logger.Debugf("nextFunctionViewHandler - nextViewName: %s", nextViewName)
 			break
 		}
 	}
@@ -598,6 +598,7 @@ func runPodCommandInput(gui *guilib.Gui, namespace, podName, image string) error
 				return err
 			}
 			gui.Config.Mouse = false
+			gui.Config.Cursor = true
 			gui.Configure()
 			_ = termbox.Flush()
 
@@ -625,6 +626,8 @@ func runPodCommandInput(gui *guilib.Gui, namespace, podName, image string) error
 				return err
 			}
 			gui.Config.Mouse = true
+			gui.Config.Cursor = false
+			gui.Configure()
 			gui.Configure()
 			if err := gui.ReturnPreviousView(); err != nil {
 				return err

diff --git a/pkg/app/keymap.go b/pkg/app/keymap.go
@@ -10,7 +10,7 @@ import (
 
 const (
 	// All common actions name
-	nextCyclicViewAction       = "nextCyclicView"
+	nextFunctionViewAction     = "nextFunctionView"
 	backToPreviousViewAction   = "backToPreviousView"
 	toNavigationAction         = "toNavigation"
 	navigationArrowLeft        = "navigationArrowLeft"
@@ -54,7 +54,7 @@ const (
 var (
 	// All common actions key map.
 	keyMap = map[string][]interface{}{
-		nextCyclicViewAction:                {gocui.KeyTab},
+		nextFunctionViewAction:              {gocui.KeyTab},
 		backToPreviousViewAction:            {gocui.KeyEsc},
 		toNavigationAction:                  {gocui.KeyEnter, gocui.KeyArrowRight, 'l'},
 		navigationArrowLeft:                 {gocui.KeyArrowLeft, 'k'},

diff --git a/pkg/app/panel.go b/pkg/app/panel.go
@@ -33,7 +33,7 @@ var (
 		OnRender:             renderClusterInfo,
 		Actions: guilib.ToActionInterfaceArr([]*guilib.Action{
 			toNavigation,
-			nextCyclicView,
+			nextFunctionView,
 			changeContext,
 			newMoreActions(moreActionsMap[clusterInfoViewName]),
 		}),
@@ -66,7 +66,7 @@ var (
 		),
 		Actions: guilib.ToActionInterfaceArr([]*guilib.Action{
 			toNavigation,
-			nextCyclicView,
+			nextFunctionView,
 			previousLine,
 			nextLine,
 			copySelectedLine,
@@ -198,7 +198,7 @@ var (
 		),
 		Actions: guilib.ToActionInterfaceArr([]*guilib.Action{
 			toNavigation,
-			nextCyclicView,
+			nextFunctionView,
 			previousLine,
 			nextLine,
 			copySelectedLine,
@@ -263,7 +263,7 @@ var (
 		},
 		Actions: guilib.ToActionInterfaceArr([]*guilib.Action{
 			toNavigation,
-			nextCyclicView,
+			nextFunctionView,
 			previousLine,
 			nextLine,
 			copySelectedLine,
@@ -297,7 +297,7 @@ var (
 		),
 		Actions: guilib.ToActionInterfaceArr([]*guilib.Action{
 			toNavigation,
-			nextCyclicView,
+			nextFunctionView,
 			previousLine,
 			nextLine,
 			copySelectedLine,
@@ -366,7 +366,7 @@ func newCustomResourcePanel(resource string) *guilib.View {
 		},
 		Actions: guilib.ToActionInterfaceArr([]*guilib.Action{
 			toNavigation,
-			nextCyclicView,
+			nextFunctionView,
 			previousLine,
 			nextLine,
 			filterResource,

diff --git a/pkg/app/render.go b/pkg/app/render.go
@@ -326,7 +326,7 @@ func resourceListRender(_ *guilib.Gui, view *guilib.View) error {
 }
 
 func showPleaseSelected(view io.Writer, name string) {
-	_, err := fmt.Fprintf(view, "Please select a %s. ", name)
+	_, err := fmt.Fprintf(view, "Please select a %s.\n ", name)
 	if err != nil {
 		log.Logger.Warningf("showPleaseSelected - error %s", err)
 	}

diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
@@ -61,7 +61,7 @@ func NewGui(config config.GuiConfig, views ...*View) *Gui {
 
 // ReRenderAll ReRenderAll
 func (gui *Gui) ReRenderAll() {
-	gui.renderTimes += 1
+	gui.renderTimes++
 	for _, view := range gui.views {
 		view.ReRender()
 	}
@@ -79,7 +79,6 @@ func (gui *Gui) layout(*gocui.Gui) error {
 		}
 		gui.ReRenderAll()
 		gui.SortViewsByZIndex()
-		gui.SetAlwaysOnTopViews()
 	}
 
 	if err := gui.Clear(); err != nil {
@@ -105,7 +104,7 @@ func (gui *Gui) layout(*gocui.Gui) error {
 		return err
 	}
 
-	if gui.renderTimes < 0 {
+	if gui.renderTimes > 0 {
 		if err := gui.onRender(); err != nil {
 			return err
 		}
@@ -115,13 +114,16 @@ func (gui *Gui) layout(*gocui.Gui) error {
 		return err
 	}
 
+	gui.SetAlwaysOnTopViews()
 	return nil
 }
 
 func (gui *Gui) onRender() error {
-	if gui.OnRender != nil && gui.renderTimes < 0 {
+	gui.renderTimes--
+
+	if gui.OnRender != nil {
 		if err := gui.OnRender(gui); err != nil {
-			return nil
+			return err
 		}
 	}
 
@@ -131,7 +133,6 @@ func (gui *Gui) onRender() error {
 			return err
 		}
 	}
-	gui.renderTimes += 1
 	return nil
 }
 
@@ -531,7 +532,25 @@ func (gui *Gui) SetViewOnTop(name string) (*View, error) {
 	if _, err := gui.g.SetViewOnTop(name); err != nil {
 		return nil, err
 	}
-	return gui.getView(name), nil
+
+	for i, view := range gui.views {
+		if view.Name == name {
+			s := append(gui.views[:i], gui.views[i+1:]...)
+			gui.views = append(s, view)
+			return view, nil
+		}
+	}
+
+	return nil, gocui.ErrUnknownView
+}
+
+func (gui *Gui) GetTopView() *View {
+	length := len(gui.views) - 1
+	if length < 1 {
+		return nil
+	}
+
+	return gui.views[length-1]
 }
 
 func (gui *Gui) getView(name string) *View {