chore(tui): Simplify conditional rows

clevyr · May 1, 2024 · 2a277e6 · 2a277e6
1 parent 48abba8
commit 2a277e6
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 41 deletions.
diff --git a/internal/actions/dump/dump.go b/internal/actions/dump/dump.go
@@ -221,14 +221,10 @@ func (action Dump) summary(err error, took time.Duration, size *util.SizeWriter,
 	t := tui.MinimalTable(r).
 		Row("Context", action.Context).
 		Row("Namespace", action.Namespace).
-		Row("Pod", action.DBPod.Name)
-	if action.Username != "" {
-		t.Row("Username", action.Username)
-	}
-	if action.Database != "" {
-		t.Row("Database", action.Database)
-	}
-	t.Row("File", tui.OutPath(action.Filename, r)).
+		Row("Pod", action.DBPod.Name).
+		RowIfNotEmpty("Username", action.Username).
+		RowIfNotEmpty("Database", action.Database).
+		Row("File", tui.OutPath(action.Filename, r)).
 		Row("Took", took.String())
 	if err != nil {
 		t.Row("Error", lipgloss.NewStyle().Renderer(r).Foreground(lipgloss.Color("1")).Render(err.Error()))

diff --git a/internal/actions/portforward/portforward.go b/internal/actions/portforward/portforward.go
@@ -10,7 +10,6 @@ import (
 	"strconv"
 
 	"github.com/charmbracelet/lipgloss"
-	"github.com/charmbracelet/lipgloss/table"
 	"github.com/clevyr/kubedb/internal/config"
 	kdblog "github.com/clevyr/kubedb/internal/log"
 	"github.com/clevyr/kubedb/internal/tui"
@@ -88,18 +87,12 @@ func (a PortForward) printTable() {
 		Row("Type", a.Dialect.PrettyName()).
 		Row("Namespace", a.Namespace).
 		Row("Hostname", "localhost").
-		Row("Port", strconv.Itoa(int(a.LocalPort)))
-	if a.Username != "" {
-		params.Row("Username", a.Username)
-	}
-	if a.Password != "" {
-		params.Row("Password", a.Password[:17])
-	}
-	if a.Database != "" {
-		params.Row("Database", a.Database)
-	}
+		Row("Port", strconv.Itoa(int(a.LocalPort))).
+		RowIfNotEmpty("Username", a.Username).
+		RowIfNotEmpty("Password", a.Password[:17]).
+		RowIfNotEmpty("Database", a.Database)
 
-	tables := []*table.Table{info, params}
+	tables := []*tui.Table{info, params}
 	widths := make([]int, 0, len(tables))
 	for _, t := range tables {
 		widths = append(widths, lipgloss.Width(t.Render()))

diff --git a/internal/actions/restore/restore.go b/internal/actions/restore/restore.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/charmbracelet/huh"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/charmbracelet/lipgloss/table"
 	"github.com/clevyr/kubedb/internal/command"
 	"github.com/clevyr/kubedb/internal/config"
 	"github.com/clevyr/kubedb/internal/consts"
@@ -226,19 +225,14 @@ func (action Restore) runInDatabasePod(ctx context.Context, r *io.PipeReader, st
 	return nil
 }
 
-func (action Restore) Table() *table.Table {
-	t := tui.MinimalTable(nil).
+func (action Restore) Table() *tui.Table {
+	return tui.MinimalTable(nil).
 		Row("Context", action.Context).
 		Row("Namespace", action.Namespace).
-		Row("Pod", action.DBPod.Name)
-	if action.Username != "" {
-		t.Row("Username", action.Username)
-	}
-	if action.Database != "" {
-		t.Row("Database", action.Database)
-	}
-	t.Row("File", tui.InPath(action.Filename, nil))
-	return t
+		Row("Pod", action.DBPod.Name).
+		RowIfNotEmpty("Username", action.Username).
+		RowIfNotEmpty("Database", action.Database).
+		Row("File", tui.InPath(action.Filename, nil))
 }
 
 func (action Restore) Confirm() (bool, error) {

diff --git a/internal/tui/table.go b/internal/tui/table.go
@@ -5,21 +5,42 @@ import (
 	"github.com/charmbracelet/lipgloss/table"
 )
 
+type Table struct {
+	*table.Table
+}
+
+func (t *Table) Row(row ...string) *Table {
+	t.Table.Row(row...)
+	return t
+}
+
+func (t *Table) RowIfNotEmpty(row ...string) *Table {
+	for _, cell := range row {
+		if cell == "" {
+			return t
+		}
+	}
+	t.Table.Row(row...)
+	return t
+}
+
 func BorderStyle(r *lipgloss.Renderer) lipgloss.Style {
 	return lipgloss.NewStyle().Renderer(r).
 		Foreground(lipgloss.AdaptiveColor{Light: "", Dark: "243"})
 }
 
-func MinimalTable(r *lipgloss.Renderer) *table.Table {
+func MinimalTable(r *lipgloss.Renderer) *Table {
 	colStyle := BorderStyle(r).Padding(0, 1)
 	firstColStyle := colStyle.Copy().Align(lipgloss.Right).Bold(true)
 
-	return table.New().
-		BorderStyle(BorderStyle(r)).
-		StyleFunc(func(_, col int) lipgloss.Style {
-			if col == 0 {
-				return firstColStyle
-			}
-			return colStyle
-		})
+	return &Table{
+		Table: table.New().
+			BorderStyle(BorderStyle(r)).
+			StyleFunc(func(_, col int) lipgloss.Style {
+				if col == 0 {
+					return firstColStyle
+				}
+				return colStyle
+			}),
+	}
 }