Introduce navigation-menu option in up

Signed-off-by: Joana Hrotko <[email protected]>

Author: jhrotko

Diff for: cmd/compose/up.go

@@ -55,6 +55,7 @@ type upOptions struct {
 	wait               bool
 	waitTimeout        int
 	watch              bool
+	navigationBar      bool
 }
 
 func (opts upOptions) apply(project *types.Project, services []string) (*types.Project, error) {
@@ -127,6 +128,7 @@ func upCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *c
 	flags.BoolVar(&up.wait, "wait", false, "Wait for services to be running|healthy. Implies detached mode.")
 	flags.IntVar(&up.waitTimeout, "wait-timeout", 0, "Maximum duration to wait for the project to be running|healthy")
 	flags.BoolVarP(&up.watch, "watch", "w", false, "Watch source code and rebuild/refresh containers when files are updated.")
+	flags.BoolVar(&up.navigationBar, "navigation-menu", true, "While running in attach mode, enable shortcuts and shortcuts info bar.")
 
 	return upCmd
 }
@@ -251,15 +253,16 @@ func runUp(
 	return backend.Up(ctx, project, api.UpOptions{
 		Create: create,
 		Start: api.StartOptions{
-			Project:      project,
-			Attach:       consumer,
-			AttachTo:     attach,
-			ExitCodeFrom: upOptions.exitCodeFrom,
-			CascadeStop:  upOptions.cascadeStop,
-			Wait:         upOptions.wait,
-			WaitTimeout:  timeout,
-			Watch:        upOptions.watch,
-			Services:     services,
+			Project:       project,
+			Attach:        consumer,
+			AttachTo:      attach,
+			ExitCodeFrom:  upOptions.exitCodeFrom,
+			CascadeStop:   upOptions.cascadeStop,
+			Wait:          upOptions.wait,
+			WaitTimeout:   timeout,
+			Watch:         upOptions.watch,
+			Services:      services,
+			NavigationBar: upOptions.navigationBar,
 		},
 	})
 }

Diff for: cmd/formatter/shortcut.go

@@ -38,12 +38,13 @@ var KeyboardManager *LogKeyboard
 
 var errorColor = "\x1b[1;33m"
 
-func NewKeyboardManager(isDockerDesktopActive, isWatchConfigured bool, watchFn func(ctx context.Context, project *types.Project, services []string, options api.WatchOptions) error) {
+func NewKeyboardManager(isDockerDesktopActive, isWatchConfigured, startWatch bool, watchFn func(ctx context.Context, project *types.Project, services []string, options api.WatchOptions) error) {
 	km := LogKeyboard{}
 	KeyboardManager = &km
-	KeyboardManager.Watch.Watching = true
 	KeyboardManager.IsDockerDesktopActive = isDockerDesktopActive
 	KeyboardManager.IsWatchConfigured = isWatchConfigured
+	// if up --watch and there is a watch config, we should start with watch running
+	KeyboardManager.Watch.Watching = isWatchConfigured && startWatch
 	KeyboardManager.Watch.WatchFn = watchFn
 }
 
@@ -144,8 +145,6 @@ func (lk *LogKeyboard) openDockerDesktop(project *types.Project) {
 		err := open.Run(link)
 		if err != nil {
 			lk.Error("View", fmt.Errorf("could not open Docker Desktop"))
-		} else {
-			lk.Error("", nil)
 		}
 	}
 }
@@ -189,9 +188,5 @@ func (lk *LogKeyboard) HandleKeyEvents(ctx context.Context, event keyboard.KeyEv
 		handleTearDown()
 	case keyboard.KeyEnter:
 		lk.PrintEnter()
-	default:
-		if key != 0 { // If some key is pressed
-			fmt.Println("key pressed: ", key)
-		}
 	}
 }

Diff for: pkg/api/api.go

@@ -217,8 +217,9 @@ type StartOptions struct {
 	Wait        bool
 	WaitTimeout time.Duration
 	// Services passed in the command line to be started
-	Services []string
-	Watch    bool
+	Services      []string
+	Watch         bool
+	NavigationBar bool
 }
 
 // RestartOptions group options of the Restart API

Diff for: pkg/compose/up.go

@@ -73,15 +73,6 @@ func (s *composeService) Up(ctx context.Context, project *types.Project, options
 
 	doneCh := make(chan bool)
 	eg.Go(func() error {
-		kEvents, err := keyboard.GetKeys(100)
-		if err != nil {
-			panic(err)
-		}
-		formatter.NewKeyboardManager(true, false, s.Watch) // change after test
-		// kManager.IsDockerDesktopActive = s.isDesktopIntegrationActive()
-		// kManager.IsWatchConfigured = s.shouldWatch(project)
-		defer keyboard.Close()
-
 		first := true
 		gracefulTeardown := func() {
 			printer.Cancel()
@@ -97,27 +88,60 @@ func (s *composeService) Up(ctx context.Context, project *types.Project, options
 			})
 			first = false
 		}
-		for {
-			select {
-			case event := <-kEvents:
-				formatter.KeyboardManager.HandleKeyEvents(ctx, event, project, options, gracefulTeardown)
-			case <-doneCh:
-				return nil
-			case <-ctx.Done():
-				if first {
-					gracefulTeardown()
-				}
-			case <-signalChan:
-				if first {
-					gracefulTeardown()
-				} else {
-					eg.Go(func() error {
-						return s.Kill(context.Background(), project.Name, api.KillOptions{
-							Services: options.Create.Services,
-							Project:  project,
+
+		if options.Start.NavigationBar {
+			kEvents, err := keyboard.GetKeys(100)
+			if err != nil {
+				panic(err)
+			}
+			formatter.NewKeyboardManager(true, false, options.Start.Watch, s.Watch) // change after test
+			// formatter.NewKeyboardManager(s.isDesktopIntegrationActive(), s.shouldWatch(project), s.Watch)
+			defer keyboard.Close()
+			for {
+				select {
+				case event := <-kEvents:
+					formatter.KeyboardManager.HandleKeyEvents(ctx, event, project, options, gracefulTeardown)
+				case <-doneCh:
+					return nil
+				case <-ctx.Done():
+					if first {
+						gracefulTeardown()
+					}
+				case <-signalChan:
+					if first {
+						gracefulTeardown()
+					} else {
+						eg.Go(func() error {
+							return s.Kill(context.Background(), project.Name, api.KillOptions{
+								Services: options.Create.Services,
+								Project:  project,
+							})
 						})
-					})
+						return nil
+					}
+				}
+			}
+		} else {
+			for {
+				select {
+				case <-doneCh:
 					return nil
+				case <-ctx.Done():
+					if first {
+						gracefulTeardown()
+					}
+				case <-signalChan:
+					if first {
+						gracefulTeardown()
+					} else {
+						eg.Go(func() error {
+							return s.Kill(context.Background(), project.Name, api.KillOptions{
+								Services: options.Create.Services,
+								Project:  project,
+							})
+						})
+						return nil
+					}
 				}
 			}
 		}
@@ -138,7 +162,7 @@ func (s *composeService) Up(ctx context.Context, project *types.Project, options
 		return err
 	})
 
-	if options.Start.Watch {
+	if options.Start.Watch && !options.Start.NavigationBar {
 		eg.Go(func() error {
 			buildOpts := *options.Create.Build
 			buildOpts.Quiet = true