Support use of debug --tui to render debuggable containers

Signed-off-by: Evan Harris <[email protected]>

Author: eharris128

pkg/app/master/command/debug/cli.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/mintoolkit/mint/pkg/app"
 	"github.com/mintoolkit/mint/pkg/app/master/command"
+	"github.com/mintoolkit/mint/pkg/app/master/tui"
 	"github.com/mintoolkit/mint/pkg/crt"
 )
 
@@ -172,6 +173,15 @@ var CLI = &cli.Command{
 	},
 	Action: func(ctx *cli.Context) error {
 		gcvalues := command.GlobalFlagValues(ctx)
+
+		// If we stick with this approach, the user should be communicated to
+		// use `--tui` as a standalone flag for `debug`
+		if ctx.Bool(command.FlagTUI) {
+			initialTUI := InitialTUI(true, gcvalues)
+			tui.RunTUI(initialTUI, true)
+			return nil
+		}
+
 		xc := app.NewExecutionContext(
 			Name,
 			gcvalues.QuietCLIMode,
@@ -284,7 +294,7 @@ var CLI = &cli.Command{
 			!commandParams.ActionConnectSession &&
 			commandParams.TargetRef == "" {
 			if ctx.Args().Len() < 1 {
-				if !commandParams.TUI && commandParams.Runtime != crt.KubernetesRuntime {
+				if commandParams.Runtime != crt.KubernetesRuntime {
 					xc.Out.Error("param.target", "missing target")
 					cli.ShowCommandHelp(ctx, Name)
 					return nil

pkg/app/master/command/debug/handler.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/mintoolkit/mint/pkg/app"
 	"github.com/mintoolkit/mint/pkg/app/master/command"
-	"github.com/mintoolkit/mint/pkg/app/master/tui"
 	"github.com/mintoolkit/mint/pkg/app/master/version"
 	cmd "github.com/mintoolkit/mint/pkg/command"
 	"github.com/mintoolkit/mint/pkg/crt"
@@ -84,11 +83,6 @@ func OnCommand(
 	resolved := command.ResolveAutoRuntime(commandParams.Runtime)
 	logger.Tracef("runtime.handler: rt=%s resolved=%s", commandParams.Runtime, resolved)
 
-	if commandParams.TUI { // `debug --tui``
-		initialTUI := InitialTUI(true)
-		tui.RunTUI(initialTUI, true)
-	}
-
 	switch resolved {
 	case crt.DockerRuntime:
 		client, err := dockerclient.New(gparams.ClientConfig)

pkg/app/master/command/debug/tui.go

@@ -24,6 +24,8 @@ type TUI struct {
 	table      table.Table
 
 	showDebuggableContainers bool
+
+	gcvalues *command.GenericParams
 }
 
 // Styles - move to `common`
@@ -58,11 +60,12 @@ func LoadTUI() *TUI {
 }
 
 // InitialTUI returns the initial state of the model.
-func InitialTUI(standalone bool) *TUI {
+func InitialTUI(standalone bool, gcvalues *command.GenericParams) *TUI {
 	m := &TUI{
 		standalone: standalone,
 		width:      20,
 		height:     15,
+		gcvalues:   gcvalues,
 	}
 
 	return m
@@ -156,6 +159,7 @@ func (m TUI) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		}()
 
 		<-doneCh
+		m.showDebuggableContainers = !m.showDebuggableContainers
 		return m, nil
 	case tea.KeyMsg:
 		switch {
@@ -166,6 +170,17 @@ func (m TUI) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		case key.Matches(msg, keys.Global.Back):
 			return common.TUIsInstance.Home, nil
 		case key.Matches(msg, keys.Debug.LoadDebuggableContainers):
+			// Kickoff loading of debuggable containers in standable.
+			if m.standalone {
+				loadDebuggableContainers := common.Event{
+					Type: common.LaunchDebugEvent,
+					Data: m.gcvalues,
+				}
+				m, _ := m.Update(loadDebuggableContainers)
+				return m, nil
+			}
+
+			// When used via `tui -> debug`
 			m.showDebuggableContainers = !m.showDebuggableContainers
 			return m, nil
 
@@ -215,12 +230,13 @@ func (m TUI) View() string {
 	// 4. Connect to a debug session
 	// 5. Start a new debug session
 
-	content := "Debug View"
+	content := "Debug Dashboard\n"
 
 	components = append(components, content)
 
 	if m.showDebuggableContainers {
-		components = append(components, m.table.String())
+		header := "Debuggable Containers\n"
+		components = append(components, header, m.table.String())
 	}
 
 	components = append(components, m.help())
@@ -231,8 +247,17 @@ func (m TUI) View() string {
 }
 
 func (m TUI) help() string {
+	var listOrHide string
+
+	if m.showDebuggableContainers {
+		listOrHide = "hide"
+	} else {
+		listOrHide = "list"
+	}
+
 	if m.standalone {
-		return common.HelpStyle("• l list debuggable containers • q: quit")
+		return common.HelpStyle("• l: " + listOrHide + " debuggable containers • q: quit")
 	}
-	return common.HelpStyle("• l list debuggable containers • esc: back • q: quit")
+
+	return common.HelpStyle("• l: " + listOrHide + " debuggable containers • esc: back • q: quit")
 }