From cf4c0914652956e99f621fd5f791b4081514833f Mon Sep 17 00:00:00 2001
From: Ken Hibino <ken.hibino7@gmail.com>
Date: Sat, 28 May 2022 15:29:32 -0700
Subject: [PATCH] (cli): Remove unnecessary views from dash command

---
 tools/asynq/cmd/dash/dash.go      |  7 +---
 tools/asynq/cmd/dash/draw.go      | 40 ++-------------------
 tools/asynq/cmd/dash/fetch.go     |  2 --
 tools/asynq/cmd/dash/key_event.go | 60 -------------------------------
 4 files changed, 3 insertions(+), 106 deletions(-)

diff --git a/tools/asynq/cmd/dash/dash.go b/tools/asynq/cmd/dash/dash.go
index 422550c..7f6761e 100644
--- a/tools/asynq/cmd/dash/dash.go
+++ b/tools/asynq/cmd/dash/dash.go
@@ -20,9 +20,6 @@ type viewType int
 const (
 	viewTypeQueues viewType = iota
 	viewTypeQueueDetails
-	viewTypeServers
-	viewTypeSchedulers
-	viewTypeRedis
 	viewTypeHelp
 )
 
@@ -143,6 +140,7 @@ func Run(opts Options) {
 			}
 
 		case <-ticker.C:
+			// TODO: this should be just the call to fetcher.Fetch(state)
 			switch state.view {
 			case viewTypeQueues:
 				go fetchQueues(inspector, queuesCh, errorCh, opts)
@@ -161,9 +159,6 @@ func Run(opts Options) {
 				if state.taskID != "" {
 					go fetchTaskInfo(inspector, state.selectedQueue.Queue, state.taskID, taskCh, errorCh)
 				}
-
-			case viewTypeRedis:
-				go fetchRedisInfo(redisInfoCh, errorCh)
 			}
 
 		case queues := <-queuesCh:
diff --git a/tools/asynq/cmd/dash/draw.go b/tools/asynq/cmd/dash/draw.go
index 7881eb2..384b8e2 100644
--- a/tools/asynq/cmd/dash/draw.go
+++ b/tools/asynq/cmd/dash/draw.go
@@ -57,21 +57,6 @@ func (dd *dashDrawer) Draw(state *State) {
 		d.NL()
 		drawTaskTable(d, state)
 		drawTaskModal(d, state)
-	case viewTypeServers:
-		d.Println("=== Servers ===", baseStyle.Bold(true))
-		d.NL()
-		// TODO: Draw body
-	case viewTypeSchedulers:
-		d.Println("=== Schedulers === ", baseStyle.Bold(true))
-		d.NL()
-		// TODO: Draw body
-	case viewTypeRedis:
-		d.Println("=== Redis Info === ", baseStyle.Bold(true))
-		d.NL()
-		d.Println(fmt.Sprintf("Version: %s", state.redisInfo.version), baseStyle)
-		d.Println(fmt.Sprintf("Uptime: %s", state.redisInfo.uptime), baseStyle)
-		d.Println(fmt.Sprintf("Memory Usage: %s", byteCount(int64(state.redisInfo.memoryUsage))), baseStyle)
-		d.Println(fmt.Sprintf("Peak Memory Usage: %s", byteCount(int64(state.redisInfo.peakMemoryUsage))), baseStyle)
 	case viewTypeHelp:
 		d.Println("=== HELP ===", baseStyle.Bold(true))
 		d.NL()
@@ -161,30 +146,9 @@ func drawFooter(d *ScreenDrawer, state *State) {
 	style := baseStyle.Background(tcell.ColorDarkSlateGray)
 	switch state.view {
 	case viewTypeHelp:
-		d.Print("Esc=GoBack", style)
+		d.Print("<Esc>: GoBack", style)
 	default:
-		type menu struct {
-			label string
-			view  viewType
-		}
-		menus := []*menu{
-			{"F1=Queues", viewTypeQueues},
-			{"F2=Servers", viewTypeServers},
-			{"F3=Schedulers", viewTypeSchedulers},
-			{"F4=Redis", viewTypeRedis},
-			{"?=Help", viewTypeHelp},
-		}
-		var b strings.Builder
-		for _, m := range menus {
-			b.WriteString(m.label)
-			// Add * for the current view
-			if m.view == state.view {
-				b.WriteString("* ")
-			} else {
-				b.WriteString("  ")
-			}
-		}
-		d.Print(b.String(), style)
+		d.Print("<?>: Help    <Ctrl+C>: Exit ", style)
 	}
 	d.FillLine(' ', style)
 }
diff --git a/tools/asynq/cmd/dash/fetch.go b/tools/asynq/cmd/dash/fetch.go
index 8f7c2b5..137fe25 100644
--- a/tools/asynq/cmd/dash/fetch.go
+++ b/tools/asynq/cmd/dash/fetch.go
@@ -46,8 +46,6 @@ func (f *dataFetcher) Fetch(state *State) {
 		if state.taskID != "" {
 			f.fetchTaskInfo(state.selectedQueue.Queue, state.taskID)
 		}
-	case viewTypeRedis:
-		f.fetchRedisInfo()
 	}
 }
 
diff --git a/tools/asynq/cmd/dash/key_event.go b/tools/asynq/cmd/dash/key_event.go
index 740306d..4a331a8 100644
--- a/tools/asynq/cmd/dash/key_event.go
+++ b/tools/asynq/cmd/dash/key_event.go
@@ -51,14 +51,6 @@ func (h *keyEventHandler) HandleKeyEvent(ev *tcell.EventKey) {
 		h.handleEnterKey()
 	} else if ev.Rune() == '?' {
 		h.showHelp()
-	} else if ev.Key() == tcell.KeyF1 {
-		h.showQueues()
-	} else if ev.Key() == tcell.KeyF2 {
-		h.showServers()
-	} else if ev.Key() == tcell.KeyF3 {
-		h.showSchedulers()
-	} else if ev.Key() == tcell.KeyF4 {
-		h.showRedisInfo()
 	} else if ev.Rune() == 'n' {
 		h.nextPage()
 	} else if ev.Rune() == 'p' {
@@ -307,58 +299,6 @@ func (h *keyEventHandler) prevPage() {
 	}
 }
 
-func (h *keyEventHandler) showQueues() {
-	var (
-		state = h.state
-		f     = h.fetcher
-		d     = h.drawer
-	)
-	if state.view != viewTypeQueues {
-		state.view = viewTypeQueues
-		f.Fetch(state)
-		h.resetTicker()
-		d.Draw(state)
-	}
-}
-
-func (h *keyEventHandler) showServers() {
-	var (
-		state = h.state
-		d     = h.drawer
-	)
-	if state.view != viewTypeServers {
-		//TODO Start data fetch and reset ticker
-		state.view = viewTypeServers
-		d.Draw(state)
-	}
-}
-
-func (h *keyEventHandler) showSchedulers() {
-	var (
-		state = h.state
-		d     = h.drawer
-	)
-	if state.view != viewTypeSchedulers {
-		//TODO Start data fetch and reset ticker
-		state.view = viewTypeSchedulers
-		d.Draw(state)
-	}
-}
-
-func (h *keyEventHandler) showRedisInfo() {
-	var (
-		state = h.state
-		f     = h.fetcher
-		d     = h.drawer
-	)
-	if state.view != viewTypeRedis {
-		state.view = viewTypeRedis
-		f.Fetch(state)
-		h.resetTicker()
-		d.Draw(state)
-	}
-}
-
 func (h *keyEventHandler) showHelp() {
 	var (
 		state = h.state