fix(ui): create delete,compact topic

Author: jonas-grgt

ui/pages/create_topic_page/create_topic_page.go

@@ -3,10 +3,6 @@ package create_topic_page
 import (
 	"errors"
 	"fmt"
-	bsp "github.com/charmbracelet/bubbles/spinner"
-	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/huh"
-	"github.com/charmbracelet/lipgloss"
 	"ktea/kadmin"
 	"ktea/kontext"
 	"ktea/styles"
@@ -18,6 +14,11 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+
+	bsp "github.com/charmbracelet/bubbles/spinner"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/huh"
+	"github.com/charmbracelet/lipgloss"
 )
 
 type formState int
@@ -209,9 +210,9 @@ func (m *Model) initForm(fs formState) {
 		Title("Cleanup Policy").
 		Value(&m.formValues.cleanupPolicy).
 		Options(
-			huh.NewOption("Retention (delete)", "delete"),
-			huh.NewOption("Compaction (compact)", "compact"),
-			huh.NewOption("Retention + Compaction", "delete-compact"))
+			huh.NewOption("delete", "delete"),
+			huh.NewOption("compact", "compact"),
+			huh.NewOption("delete,compact", "delete,compact"))
 
 	configInput := huh.NewInput().
 		Description("Enter custom topic configurations in the format config=value. Leave blank to create the topic.").

ui/pages/create_topic_page/create_topic_page_test.go

@@ -3,13 +3,14 @@ package create_topic_page
 import (
 	"errors"
 	"fmt"
-	tea "github.com/charmbracelet/bubbletea"
-	"github.com/stretchr/testify/assert"
 	"ktea/kadmin"
 	"ktea/kontext"
 	"ktea/tests"
 	"ktea/ui/pages/nav"
 	"testing"
+
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/stretchr/testify/assert"
 )
 
 func batchUpdate(m *Model, cmd tea.Cmd) {
@@ -170,6 +171,66 @@ func TestCreateTopic(t *testing.T) {
 		}
 		m := New(&mockCreator)
 
+		// topic name
+		tests.UpdateKeys(m, "topicA")
+		cmd := m.Update(tests.Key(tea.KeyEnter))
+		m.Update(cmd())
+		// partition count
+		tests.UpdateKeys(m, "2")
+		cmd = m.Update(tests.Key(tea.KeyEnter))
+		m.Update(cmd())
+		// replication factor
+		tests.UpdateKeys(m, "3")
+		cmd = m.Update(tests.Key(tea.KeyEnter))
+		m.Update(cmd())
+		// cleanup policy
+		m.Update(tests.Key(tea.KeyDown))
+		cmd = m.Update(tests.Key(tea.KeyEnter))
+		m.Update(cmd())
+		// config
+		tests.UpdateKeys(m, "delete.retention.ms=1029394")
+		cmd = m.Update(tests.Key(tea.KeyEnter))
+		// next field
+		cmd = m.Update(cmd())
+		// next group
+		m.Update(cmd())
+
+		// actual submit
+		msgs := tests.Submit(m)
+
+		var capturedDetails CapturedTopicCreationDetails
+		for _, msg := range msgs {
+			switch m := msg.(type) {
+			case CapturedTopicCreationDetails:
+				capturedDetails = m
+			}
+		}
+
+		assert.NotNil(t, capturedDetails)
+		assert.Equal(t, CapturedTopicCreationDetails{
+			TopicCreationDetails: kadmin.TopicCreationDetails{
+				"topicA",
+				2,
+				map[string]string{
+					"cleanup.policy":      "compact",
+					"delete.retention.ms": "1029394",
+				},
+				int16(3),
+			},
+		}, capturedDetails)
+	})
+
+	t.Run("create delete,compact topic", func(t *testing.T) {
+		mockCreator := MockTopicCreator{
+			CreateTopicFunc: func(details kadmin.TopicCreationDetails) tea.Msg {
+				if details.Name == "" {
+					return errors.New("topic name cannot be empty")
+				}
+				return CapturedTopicCreationDetails{details}
+			},
+		}
+		m := New(&mockCreator)
+
 		// topic name
 		tests.UpdateKeys(m, "topicA")
 		cmd := m.Update(tests.Key(tea.KeyEnter))
@@ -212,13 +273,14 @@ func TestCreateTopic(t *testing.T) {
 				"topicA",
 				2,
 				map[string]string{
-					"cleanup.policy":      "delete-compact",
+					"cleanup.policy":      "delete,compact",
 					"delete.retention.ms": "1029394",
 				},
 				int16(3),
 			},
 		}, capturedDetails)
 	})
+
 }
 
 func TestCreateTopic_Validation(t *testing.T) {