fix: delete popup when no topic selected

Author: jonas-grgt

tests/keys.go

@@ -118,6 +118,11 @@ func (k *KeyBoard) F5() *KeyBoard {
 	return k
 }
 
+func (k *KeyBoard) F2() *KeyBoard {
+	k.view.Update(Key(tea.KeyF2))
+	return k
+}
+
 func NewKeyboard(view ui.View) *KeyBoard {
 	return &KeyBoard{
 		view: view,

ui/pages/nav/nav.go

@@ -11,7 +11,9 @@ type LoadTopicsPageMsg struct {
 
 type LoadCreateTopicPageMsg struct{}
 
-type LoadTopicConfigPageMsg struct{}
+type LoadTopicConfigPageMsg struct {
+	Topic string
+}
 
 type LoadPublishPageMsg struct {
 	Topic *kadmin.ListedTopic

ui/pages/topics_page/topics_page.go

@@ -3,11 +3,6 @@ package topics_page
 import (
 	"context"
 	"fmt"
-	"github.com/charmbracelet/bubbles/spinner"
-	"github.com/charmbracelet/bubbles/table"
-	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/lipgloss"
-	"github.com/charmbracelet/log"
 	"ktea/kadmin"
 	"ktea/kontext"
 	"ktea/styles"
@@ -24,6 +19,12 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+
+	"github.com/charmbracelet/bubbles/spinner"
+	"github.com/charmbracelet/bubbles/table"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/charmbracelet/log"
 )
 
 const name = "topics-page"
@@ -98,10 +99,11 @@ func (m *Model) Update(msg tea.Msg) tea.Cmd {
 		case "ctrl+n":
 			return ui.PublishMsg(nav.LoadCreateTopicPageMsg{})
 		case "ctrl+o":
-			if m.SelectedTopic() == nil {
+			topic := m.SelectedTopic()
+			if topic == nil {
 				return nil
 			}
-			return ui.PublishMsg(nav.LoadTopicConfigPageMsg{})
+			return ui.PublishMsg(nav.LoadTopicConfigPageMsg{Topic: topic.Name})
 		case "ctrl+p":
 			if m.SelectedTopic() == nil {
 				return nil
@@ -143,7 +145,7 @@ func (m *Model) Update(msg tea.Msg) tea.Cmd {
 		}
 	case spinner.TickMsg:
 		selectedTopic := m.SelectedTopicName()
-		_, c := m.tcb.Update(msg, &selectedTopic)
+		_, c := m.tcb.Update(msg, selectedTopic)
 		if c != nil {
 			cmds = append(cmds, c)
 		}
@@ -165,7 +167,7 @@ func (m *Model) Update(msg tea.Msg) tea.Cmd {
 
 	var cmd tea.Cmd
 	name := m.SelectedTopicName()
-	msg, cmd = m.tcb.Update(msg, &name)
+	msg, cmd = m.tcb.Update(msg, name)
 	m.tableFocussed = !m.tcb.IsFocussed()
 	cmds = append(cmds, cmd)
 
@@ -254,20 +256,19 @@ func (m *Model) createRows() []table.Row {
 func (m *Model) SelectedTopic() *kadmin.ListedTopic {
 	selectedTopic := m.SelectedTopicName()
 	for _, t := range m.topics {
-		if t.Name == selectedTopic {
+		if selectedTopic != nil && t.Name == *selectedTopic {
 			return &t
 		}
 	}
 	return nil
 }
 
-func (m *Model) SelectedTopicName() string {
+func (m *Model) SelectedTopicName() *string {
 	selectedRow := m.table.SelectedRow()
-	var selectedTopic string
 	if selectedRow != nil {
-		selectedTopic = selectedRow[0]
+		return &selectedRow[0]
 	}
-	return selectedTopic
+	return nil
 }
 
 func (m *Model) Title() string {

ui/pages/topics_page/topics_page_test.go

@@ -2,13 +2,14 @@ package topics_page
 
 import (
 	"fmt"
-	tea "github.com/charmbracelet/bubbletea"
-	"github.com/stretchr/testify/assert"
 	"ktea/kadmin"
 	"ktea/tests"
 	"ktea/ui/tabs"
 	"strings"
 	"testing"
+
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestTopicsPage(t *testing.T) {
@@ -435,4 +436,28 @@ func TestTopicsPage(t *testing.T) {
 		page.View(tests.NewKontext(), tests.Renderer)
 		assert.Equal(t, 3, page.hiddenInternalTopicsCount)
 	})
+
+	t.Run("Do not show deletion cmdbar when no topic is selected", func(t *testing.T) {
+		page, _ := New(
+			kadmin.NewMockKadmin(),
+			tabs.NewMockTopicsTabNavigator(),
+		)
+
+		kb := tests.NewKeyboard(page)
+		kb.F2()
+
+		render := page.View(tests.NewKontext(), tests.Renderer)
+		assert.NotContains(t, render, "will be deleted permanently")
+	})
+
+	t.Run("Do not navigate to topic config page when no topic is selected", func(t *testing.T) {
+		page, _ := New(
+			kadmin.NewMockKadmin(),
+			tabs.NewMockTopicsTabNavigator(),
+		)
+
+		cmd := page.Update(tests.Key(tea.KeyCtrlO))
+
+		assert.Nil(t, cmd)
+	})
 }

ui/tabs/topics_tab/topics_tab.go

@@ -2,9 +2,6 @@ package topics_tab
 
 import (
 	"context"
-	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/lipgloss"
-	"github.com/charmbracelet/log"
 	"ktea/kadmin"
 	"ktea/kontext"
 	"ktea/ui"
@@ -21,6 +18,10 @@ import (
 	"ktea/ui/pages/topics_page"
 	"ktea/ui/tabs"
 	"reflect"
+
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/charmbracelet/log"
 )
 
 type Model struct {
@@ -66,7 +67,7 @@ func (m *Model) Update(msg tea.Msg) tea.Cmd {
 		m.active = m.topicsPage
 
 	case nav.LoadTopicConfigPageMsg:
-		page, cmd := configs_page.New(m.ka, m.ka, m.topicsPage.SelectedTopicName())
+		page, cmd := configs_page.New(m.ka, m.ka, msg.Topic)
 		cmds = append(cmds, cmd)
 		m.active = page