Show user email in render workspaces header, pre-select current workspace (#272)

Replace the workspace name with the user email in the breadcrumb
header for the workspaces view only. Additionally, the current
workspace is pre-selected in `render workspaces` and
`render workspace set` interactive views.

Author: metonym

cmd/workspaces.go

@@ -7,9 +7,12 @@ import (
 
 	"github.com/render-oss/cli/pkg/client"
 	"github.com/render-oss/cli/pkg/command"
+	"github.com/render-oss/cli/pkg/config"
 	"github.com/render-oss/cli/pkg/owner"
 	"github.com/render-oss/cli/pkg/text"
+	"github.com/render-oss/cli/pkg/tui"
 	"github.com/render-oss/cli/pkg/tui/views"
+	"github.com/render-oss/cli/pkg/user"
 )
 
 var workspacesCmd = &cobra.Command{
@@ -29,9 +32,31 @@ func loadWorkspaces(ctx context.Context) ([]*client.Owner, error) {
 }
 
 func interactiveWorkspaces(ctx context.Context, input views.ListWorkspaceInput) {
+	stack := tui.GetStackFromContext(ctx)
+	stack.SetWorkspaceOverride(userEmail(ctx))
 	command.AddToStackFunc(ctx, workspacesCmd, "Workspaces", &input, views.NewWorkspaceView(ctx, input))
 }
 
+func userEmail(ctx context.Context) string {
+	email, _ := config.UserEmail()
+	if email != "" {
+		return email
+	}
+
+	c, err := client.NewDefaultClient()
+	if err != nil {
+		return ""
+	}
+
+	u, err := user.NewRepo(c).CurrentUser(ctx)
+	if err != nil {
+		return ""
+	}
+
+	_ = config.SetUserEmail(u.Email)
+	return u.Email
+}
+
 func init() {
 	rootCmd.AddCommand(workspacesCmd)
 

pkg/config/config.go

@@ -26,6 +26,7 @@ type Config struct {
 	Version       int    `yaml:"version"`
 	Workspace     string `yaml:"workspace"`
 	WorkspaceName string `yaml:"workspace_name"`
+	UserEmail     string `yaml:"user_email,omitempty"`
 	ProjectFilter string `yaml:"project_filter,omitempty"` // Project ID for filtering
 	ProjectName   string `yaml:"project_name,omitempty"`   // Project name for display
 
@@ -147,6 +148,23 @@ func WorkspaceName() (string, error) {
 	return cfg.WorkspaceName, nil
 }
 
+func UserEmail() (string, error) {
+	cfg, err := Load()
+	if err != nil {
+		return "", err
+	}
+	return cfg.UserEmail, nil
+}
+
+func SetUserEmail(email string) error {
+	cfg, err := Load()
+	if err != nil {
+		return err
+	}
+	cfg.UserEmail = email
+	return cfg.Persist()
+}
+
 func GetProjectFilter() (projectID string, projectName string, err error) {
 	cfg, err := Load()
 	if err != nil {

pkg/tui/stack.go

@@ -39,10 +39,11 @@ type StackModel struct {
 	loadingSpinner *spinner.Model
 	stack          []ModelWithCmd
 
-	width      int
-	height     int
-	done       func(msg tea.Msg) (tea.Model, tea.Cmd)
-	loadingMsg string
+	width             int
+	height            int
+	done              func(msg tea.Msg) (tea.Model, tea.Cmd)
+	loadingMsg        string
+	workspaceOverride *string
 }
 
 type ModelWithCmd struct {
@@ -88,6 +89,10 @@ func (m *StackModel) WithDone(f func(tea.Msg) (tea.Model, tea.Cmd)) {
 	m.done = f
 }
 
+func (m *StackModel) SetWorkspaceOverride(label string) {
+	m.workspaceOverride = &label
+}
+
 func newSpinner() *spinner.Model {
 	spin := spinner.New()
 	spin.Spinner = spinner.Dot
@@ -257,7 +262,12 @@ func (m *StackModel) View() string {
 func (m *StackModel) header() string {
 	var breadCrumbs []string
 
-	workspace, _ := config.WorkspaceName()
+	var workspace string
+	if m.workspaceOverride != nil {
+		workspace = *m.workspaceOverride
+	} else {
+		workspace, _ = config.WorkspaceName()
+	}
 	if workspace != "" {
 		breadCrumbs = append(breadCrumbs, stackInfoStyle.Render(workspace))
 	}

pkg/tui/stack_test.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"os"
 	"testing"
 	"time"
 
@@ -157,3 +158,74 @@ func TestStack(t *testing.T) {
 		require.NoError(t, err)
 	})
 }
+
+func setupTestConfig(t *testing.T, content string) {
+	t.Helper()
+	f, err := os.CreateTemp("", "render-config")
+	require.NoError(t, err)
+	t.Cleanup(func() { _ = os.Remove(f.Name()) })
+
+	_, err = f.WriteString(content)
+	require.NoError(t, err)
+	require.NoError(t, f.Close())
+
+	t.Setenv("RENDER_CLI_CONFIG_PATH", f.Name())
+}
+
+func TestStackHeader(t *testing.T) {
+	t.Run("shows workspace name from config when no override set", func(t *testing.T) {
+		setupTestConfig(t, "version: 1\nworkspace: tea-123\nworkspace_name: MyTeam\n")
+
+		stack := tui.NewStack()
+		stack.Push(tui.ModelWithCmd{Model: &testhelper.SimpleModel{Str: "content"}, Breadcrumb: "Services"})
+		tm := teatest.NewTestModel(t, stack)
+
+		tm.Send(tea.WindowSizeMsg{Width: 80, Height: 24})
+
+		teatest.WaitFor(t, tm.Output(), func(bts []byte) bool {
+			return bytes.Contains(bts, []byte("MyTeam")) && bytes.Contains(bts, []byte("Services"))
+		}, teatest.WithCheckInterval(time.Millisecond*1), teatest.WithDuration(time.Second*3))
+
+		err := tm.Quit()
+		require.NoError(t, err)
+	})
+
+	t.Run("shows workspace override instead of config workspace name", func(t *testing.T) {
+		setupTestConfig(t, "version: 1\nworkspace: tea-123\nworkspace_name: MyTeam\n")
+
+		stack := tui.NewStack()
+		stack.SetWorkspaceOverride("[email protected]")
+		stack.Push(tui.ModelWithCmd{Model: &testhelper.SimpleModel{Str: "content"}, Breadcrumb: "Workspaces"})
+		tm := teatest.NewTestModel(t, stack)
+
+		tm.Send(tea.WindowSizeMsg{Width: 80, Height: 24})
+
+		teatest.WaitFor(t, tm.Output(), func(bts []byte) bool {
+			return bytes.Contains(bts, []byte("[email protected]")) &&
+				bytes.Contains(bts, []byte("Workspaces")) &&
+				!bytes.Contains(bts, []byte("MyTeam"))
+		}, teatest.WithCheckInterval(time.Millisecond*1), teatest.WithDuration(time.Second*3))
+
+		err := tm.Quit()
+		require.NoError(t, err)
+	})
+
+	t.Run("shows only breadcrumb when override is empty string", func(t *testing.T) {
+		setupTestConfig(t, "version: 1\nworkspace: tea-123\nworkspace_name: MyTeam\n")
+
+		stack := tui.NewStack()
+		stack.SetWorkspaceOverride("")
+		stack.Push(tui.ModelWithCmd{Model: &testhelper.SimpleModel{Str: "content"}, Breadcrumb: "Workspaces"})
+		tm := teatest.NewTestModel(t, stack)
+
+		tm.Send(tea.WindowSizeMsg{Width: 80, Height: 24})
+
+		teatest.WaitFor(t, tm.Output(), func(bts []byte) bool {
+			return bytes.Contains(bts, []byte("Workspaces")) &&
+				!bytes.Contains(bts, []byte("MyTeam"))
+		}, teatest.WithCheckInterval(time.Millisecond*1), teatest.WithDuration(time.Second*3))
+
+		err := tm.Quit()
+		require.NoError(t, err)
+	})
+}

pkg/tui/views/workspacelist.go

@@ -159,7 +159,19 @@ func (v *WorkspaceView) Init() tea.Cmd {
 }
 
 func (v *WorkspaceView) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	return v.table.Update(msg)
+	model, cmd := v.table.Update(msg)
+
+	if _, ok := msg.(tui.LoadDataMsg[[]*client.Owner]); ok {
+		currentID, _ := config.WorkspaceID()
+		for i, row := range v.table.Model.GetVisibleRows() {
+			if id, _ := row.Data["ID"].(string); id == currentID {
+				v.table.Model = v.table.Model.WithHighlightedRow(i)
+				break
+			}
+		}
+	}
+
+	return model, cmd
 }
 
 func (v *WorkspaceView) View() string {

pkg/tui/views/workspacelist_test.go

@@ -0,0 +1,68 @@
+package views_test
+
+import (
+	"context"
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/render-oss/cli/pkg/client"
+	"github.com/render-oss/cli/pkg/tui"
+	"github.com/render-oss/cli/pkg/tui/views"
+)
+
+func setupTestConfig(t *testing.T, content string) {
+	t.Helper()
+	f, err := os.CreateTemp("", "render-config")
+	require.NoError(t, err)
+	t.Cleanup(func() { _ = os.Remove(f.Name()) })
+
+	_, err = f.WriteString(content)
+	require.NoError(t, err)
+	require.NoError(t, f.Close())
+
+	t.Setenv("RENDER_CLI_CONFIG_PATH", f.Name())
+}
+
+func TestWorkspaceViewHighlightsCurrentWorkspace(t *testing.T) {
+	owners := []*client.Owner{
+		{Id: "tea-111", Name: "Team1", Email: "[email protected]", Type: "team"},
+		{Id: "tea-222", Name: "Team2", Email: "[email protected]", Type: "team"},
+		{Id: "tea-333", Name: "Team3", Email: "[email protected]", Type: "team"},
+	}
+
+	t.Run("highlights the current workspace", func(t *testing.T) {
+		setupTestConfig(t, "version: 1\nworkspace: tea-222\nworkspace_name: Team2\n")
+
+		view := views.NewWorkspaceView(context.Background(), views.ListWorkspaceInput{})
+		model, _ := view.Update(tui.LoadDataMsg[[]*client.Owner]{Data: owners})
+
+		table, ok := model.(*tui.Table[*client.Owner])
+		require.True(t, ok)
+		assert.Equal(t, 1, table.Model.GetHighlightedRowIndex())
+	})
+
+	t.Run("highlights first row when no workspace is set", func(t *testing.T) {
+		setupTestConfig(t, "version: 1\n")
+
+		view := views.NewWorkspaceView(context.Background(), views.ListWorkspaceInput{})
+		model, _ := view.Update(tui.LoadDataMsg[[]*client.Owner]{Data: owners})
+
+		table, ok := model.(*tui.Table[*client.Owner])
+		require.True(t, ok)
+		assert.Equal(t, 0, table.Model.GetHighlightedRowIndex())
+	})
+
+	t.Run("highlights first row when workspace ID has no match", func(t *testing.T) {
+		setupTestConfig(t, "version: 1\nworkspace: tea-999\nworkspace_name: Missing\n")
+
+		view := views.NewWorkspaceView(context.Background(), views.ListWorkspaceInput{})
+		model, _ := view.Update(tui.LoadDataMsg[[]*client.Owner]{Data: owners})
+
+		table, ok := model.(*tui.Table[*client.Owner])
+		require.True(t, ok)
+		assert.Equal(t, 0, table.Model.GetHighlightedRowIndex())
+	})
+}