fix: streamline navigation and remove useless cleanup function

pidanou · Dec 23, 2024 · 9060dca · 9060dca
1 parent a2fc71e
commit 9060dca
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 17 deletions.
diff --git a/helpers/keymaps.go b/helpers/keymaps.go
@@ -24,7 +24,7 @@ func (k keyMap) FullHelp() [][]key.Binding {
 }
 
 var CommonKeys = keyMap{
-	MenuNext: key.NewBinding(key.WithKeys("tab"), key.WithHelp("←/→", "Change panel")),
+	MenuNext: key.NewBinding(key.WithKeys("[", "]"), key.WithHelp("[/]", "Change panel")),
 	Quit:     key.NewBinding(key.WithKeys("ctrl+c"), key.WithHelp("ctrl+c", "Quit")),
 }
 

diff --git a/releases/overview.go b/releases/overview.go
@@ -261,15 +261,15 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				m.historyTable.Focus()
 				cmds = append(cmds, m.history, m.getNotes, m.getMetadata, m.getHooks, m.getValues, m.getManifest)
 			}
-		case "tab":
+		case "l", "right":
 			switch m.selectedView {
 			case releasesView:
 			case manifestView:
 				m.selectedView = historyView
 			default:
 				m.selectedView++
 			}
-		case "shift+tab":
+		case "h", "left":
 			switch m.selectedView {
 			case releasesView:
 			case historyView:

diff --git a/releases/overview_keymap.go b/releases/overview_keymap.go
@@ -49,7 +49,7 @@ var historyKeys = keyMap{
 		key.WithHelp("D", "Delete release"),
 	),
 	Upgrade:   key.NewBinding(key.WithKeys("u"), key.WithHelp("u", "Upgrade release")),
-	ChangeTab: key.NewBinding(key.WithKeys("tab", "shift+tab"), key.WithHelp("tab/shift+tab", "Navigate tabs")),
+	ChangeTab: key.NewBinding(key.WithKeys("h", "l", "right", "left"), key.WithHelp("hl/←→", "Navigate tabs")),
 	Back:      key.NewBinding(key.WithKeys("esc"), key.WithHelp("esc", "Back")),
 }
 
@@ -60,7 +60,7 @@ var readOnlyKeys = keyMap{
 		key.WithHelp("D", "Delete release"),
 	),
 	Upgrade:   key.NewBinding(key.WithKeys("u"), key.WithHelp("u", "Upgrade release")),
-	ChangeTab: key.NewBinding(key.WithKeys("tab", "shift+tab"), key.WithHelp("tab/shift+tab", "Navigate tabs")),
+	ChangeTab: key.NewBinding(key.WithKeys("h", "l", "right", "left"), key.WithHelp("hl/←→", "Navigate tabs")),
 	Back:      key.NewBinding(key.WithKeys("esc"), key.WithHelp("esc", "Back")),
 }
 

diff --git a/repositories/overview.go b/repositories/overview.go
@@ -177,7 +177,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			case packagesView:
 				cmds = append(cmds, m.searchPackageVersions)
 			}
-		case "tab", "l", "enter":
+		case "l", "right":
 			switch m.selectedView {
 			case versionsView:
 			default:
@@ -186,7 +186,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.FocusOnlyTable(m.selectedView)
 		case "D":
 			cmds = append(cmds, m.remove)
-		case "shift+tab", "h":
+		case "h", "left":
 			switch m.selectedView {
 			case listView:
 			default:

diff --git a/repositories/overview_keymap.go b/repositories/overview_keymap.go
@@ -37,7 +37,7 @@ var repoListKeys = keyMap{
 		key.WithKeys("D"),
 		key.WithHelp("D", "Delete repo"),
 	),
-	Move:    key.NewBinding(key.WithKeys("h", "	j", "k", "l", "tab", "shift+tab", "up", "down"), key.WithHelp("hjkl/Tab/Shit+Tab/↑/↓/", "Move")),
+	Move:    key.NewBinding(key.WithKeys("h", "	j", "k", "l", "up", "down"), key.WithHelp("hjkl/←↑↓→", "Move")),
 	Refresh: key.NewBinding(key.WithKeys("r"), key.WithHelp("r", "Refresh")),
 	Select:  key.NewBinding(key.WithKeys("enter"), key.WithHelp("enter", "Select")),
 	Update:  key.NewBinding(key.WithKeys("u"), key.WithHelp("u", "Update repo")),
@@ -49,7 +49,7 @@ var chartsListKeys = keyMap{
 		key.WithKeys("D"),
 		key.WithHelp("D", "Delete repo"),
 	),
-	Move:    key.NewBinding(key.WithKeys("h", "	j", "k", "l", "tab", "shift+tab", "up", "down"), key.WithHelp("hjkl/Tab/Shit+Tab/↑/↓/", "Move")),
+	Move:    key.NewBinding(key.WithKeys("h", "	j", "k", "l", "left", "right", "up", "down"), key.WithHelp("hjkl/←/↑/↓/→", "Move")),
 	Select:  key.NewBinding(key.WithKeys("enter"), key.WithHelp("enter", "Select")),
 	Update:  key.NewBinding(key.WithKeys("u"), key.WithHelp("u", "Update repo")),
 	Install: key.NewBinding(key.WithKeys("i"), key.WithHelp("i", "Install version")),
@@ -60,7 +60,7 @@ var versionsKeys = keyMap{
 		key.WithKeys("D"),
 		key.WithHelp("D", "Delete repo"),
 	),
-	Move:    key.NewBinding(key.WithKeys("h", "	j", "k", "l", "tab", "shift+tab", "up", "down"), key.WithHelp("hjkl/Tab/Shit+Tab/↑/↓/", "Move")),
+	Move:    key.NewBinding(key.WithKeys("h", "	j", "k", "l", "left", "right", "up", "down"), key.WithHelp("hjkl/←↑↓→", "Move")),
 	Update:  key.NewBinding(key.WithKeys("u"), key.WithHelp("u", "Upgrade repo")),
 	Install: key.NewBinding(key.WithKeys("i"), key.WithHelp("i", "Install version")),
 }

diff --git a/ui.go b/ui.go
@@ -86,15 +86,14 @@ func (m mainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case tea.KeyMsg:
 		switch msg.String() {
 		case "ctrl+c":
-			cleanup()
 			return m, tea.Quit
-		case "right":
+		case "]":
 			if m.state == pluginsTab {
 				m.state = 0
 			} else {
 				m.state++
 			}
-		case "left":
+		case "[":
 			if m.state == releasesTab {
 				m.state = pluginsTab
 			} else {
@@ -175,7 +174,3 @@ func createWorkingDir() tea.Msg {
 	helpers.UserDir = workingDir
 	return types.InitAppMsg{Err: nil}
 }
-
-func cleanup() {
-	_ = os.RemoveAll(helpers.UserDir)
-}