Improved log management in the TUI

Author: gmolto

pkg/tui/app.go

@@ -40,6 +40,7 @@ func Run(ctx context.Context, conf *config.Config) error {
 		mode:               modeServices,
 		bucketObjects:      make(map[string]*bucketObjectState),
 		serviceDefinitions: make(map[string]string),
+		logDetails:         make(map[string]string),
 	}
 
 	state.statusView.SetBorder(false)
@@ -215,7 +216,7 @@ func Run(ctx context.Context, conf *config.Config) error {
 				return nil
 			}
 		case 'd', 'D':
-			if app.GetFocus() == state.serviceTable {
+			if app.GetFocus() == state.serviceTable && state.modeIsServices() {
 				state.requestDeletion()
 				return nil
 			}
@@ -224,7 +225,7 @@ func Run(ctx context.Context, conf *config.Config) error {
 			return nil
 		case 'l', 'L':
 			if app.GetFocus() == state.serviceTable {
-				state.showServiceLogs()
+				state.switchToLogs(ctx)
 				return nil
 			}
 		case '?':
@@ -298,6 +299,14 @@ func (s *uiState) selectCluster(ctx context.Context, name string) {
 	}
 	s.lastSelection = ""
 	s.currentBucketObjectsKey = ""
+	s.logEntries = nil
+	s.currentLogsKey = ""
+	s.currentLogJobKey = ""
+	s.currentLogService = ""
+	s.currentLogCluster = ""
+	if s.mode == modeLogs {
+		s.mode = modeServices
+	}
 	s.currentCluster = name
 	mode := s.mode
 	errMsg, blocked := s.failedClusters[name]
@@ -350,6 +359,8 @@ func (s *uiState) refreshCurrent(ctx context.Context) {
 	}
 	if mode == modeBuckets {
 		go s.loadBuckets(ctx, name, true)
+	} else if mode == modeLogs {
+		go s.loadLogs(ctx, name, s.currentLogService, true)
 	} else {
 		go s.loadServices(ctx, name, true)
 	}
@@ -385,6 +396,13 @@ func (s *uiState) modeIsBuckets() bool {
 	return mode == modeBuckets
 }
 
+func (s *uiState) modeIsLogs() bool {
+	s.mutex.Lock()
+	mode := s.mode
+	s.mutex.Unlock()
+	return mode == modeLogs
+}
+
 func (s *uiState) focusDetailsPane() {
 	s.queueUpdate(func() {
 		s.app.SetFocus(s.detailsView)
@@ -428,6 +446,10 @@ func (s *uiState) handleSelection(row int, immediate bool) {
 		s.handleBucketSelection(row, immediate)
 		return
 	}
+	if mode == modeLogs {
+		s.handleLogSelection(row, immediate)
+		return
+	}
 	s.handleServiceSelection(row, immediate)
 }