Merge branch 'main' into feat/value-hints

internal/ui/app/app.go

@@ -163,9 +163,13 @@ type Model struct {
 	clip      Clipboard
 	clipClear time.Duration
 	openURL   func(string) error
-	getenv    func(string) string
-	nvimOpen  func(server, path string, line int) error // edit.go
-	now       func() time.Time
+	// fields is the fourth pane for anything but a secret (now: an
+	// account), with each account's groups as they load (fields.go).
+	fields   panes.Fields
+	groups   map[string]groupsState
+	getenv   func(string) string
+	nvimOpen func(server, path string, line int) error // edit.go
+	now      func() time.Time
 	// The cache file, whether the cache changed since it was saved, and
 	// when each provider's Sources list was loaded (persist.go).
 	cachePath  string
@@ -356,6 +360,8 @@ func New(providers []provider.Provider, opts Options) Model {
 		getenv:        os.Getenv,
 		nvimOpen:      nvimOpen,
 		cache:         newCache(),
+		groups:        map[string]groupsState{},
+		fields:        panes.NewFields(),
 	}
 	if m.clip == nil {
 		m.clip = clipboard.New()
@@ -563,6 +569,9 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case persistedMsg:
 		m.handlePersisted(msg)
 
+	case groupsMsg:
+		m.groups[msg.provider] = groupsState{names: msg.names, err: msg.err}
+
 	case crawlMsg:
 		cmds = append(cmds, m.handleCrawl(msg))
 
@@ -723,8 +732,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	m.askHandlerSetup()
 	m.keys.Login.SetEnabled(m.loginFor() != nil)
 	m.detail.SetMessage(m.selectedProblem())
-	acct, _ := m.selectedAccount()
-	m.detail.SetAccount(acct.Fields)
+	cmds = append(cmds, m.syncFields())
 	if m.anyLoading() && !m.spinning {
 		m.spinning = true
 		cmds = append(cmds, m.spin.Tick)
@@ -791,8 +799,14 @@ func (m *Model) handleKey(msg tea.KeyPressMsg) (cmd tea.Cmd, quit bool) {
 		m.jump(false)
 	case key.Matches(msg, k.NextPane):
 		m.focus = (m.focus + 1) % paneCount
+		if m.focus == paneContainers && m.fields.Shown() {
+			m.focus = paneDetail // an account's row: nothing between
+		}
 	case key.Matches(msg, k.PrevPane):
 		m.focus = (m.focus + paneCount - 1) % paneCount
+		if m.focus == paneSecrets && m.fields.Shown() {
+			m.focus = paneSources
+		}
 	case key.Matches(msg, k.Pane1):
 		m.focus = paneSources
 	case key.Matches(msg, k.Pane2):
@@ -914,6 +928,10 @@ func (m *Model) focusedFilter() filterable {
 		return &m.containers
 	case paneSecrets:
 		return &m.secrets
+	case paneDetail:
+		if m.fields.Shown() {
+			return &m.fields
+		}
 	}
 	return nil
 }
@@ -928,7 +946,11 @@ func (m *Model) move(delta int) {
 	case paneSecrets:
 		m.secrets.Move(delta)
 	case paneDetail:
-		m.detail.Scroll(delta)
+		if m.fields.Shown() {
+			m.fields.Move(delta)
+		} else {
+			m.detail.Scroll(delta)
+		}
 	}
 }
 
@@ -948,6 +970,10 @@ func (m *Model) jump(top bool) {
 		m.secrets.Top()
 	case m.focus == paneSecrets:
 		m.secrets.Bottom()
+	case m.focus == paneDetail && m.fields.Shown() && top:
+		m.fields.Top()
+	case m.focus == paneDetail && m.fields.Shown():
+		m.fields.Bottom()
 	case m.focus == paneDetail && top:
 		m.detail.ScrollTop()
 	case m.focus == paneDetail:
@@ -1458,6 +1484,9 @@ func (m *Model) copyValue() tea.Cmd {
 		if a, ok := m.selectedAccount(); ok && a.Copy != "" && m.focus == paneSources {
 			return m.copyText(a.CopyLabel, a.Copy, false)
 		}
+		if f, ok := m.fields.Selected(); ok && m.focus == paneDetail && m.fields.Shown() {
+			return m.copyText(fieldName(f), f.Value, false)
+		}
 		return nil
 	}
 	if v, ok := m.detail.Value(); ok {
@@ -1583,7 +1612,7 @@ func (m Model) footerView() string {
 	} else if l != nil && l.Filtering() {
 		help = m.helpBar(keys.FilterHelp{Map: m.keys}.ShortHelp(), 2)
 	} else {
-		help = m.helpBar(contextHelp{k: m.keys, focus: m.focus, commands: len(m.commandsHere()) > 0}.ShortHelp(), 2)
+		help = m.helpBar(contextHelp{k: m.keys, focus: m.focus, commands: len(m.commandsHere()) > 0, account: m.fields.Shown()}.ShortHelp(), 2)
 	}
 	var lines []string
 	if !m.clipDeadline.IsZero() {

internal/ui/app/app_test.go

@@ -1099,3 +1099,58 @@ func TestAccountInDetails(t *testing.T) {
 		t.Errorf("still shown on a subscription:\n%s", d.screen())
 	}
 }
+
+// grouped is an account in two groups.
+type grouped struct{ described }
+
+func (grouped) Groups(context.Context) ([]string, error) {
+	return []string{"Platform team", "Vault readers"}, nil
+}
+
+func TestAccountPane(t *testing.T) {
+	t.Parallel()
+	d := newDriver(t, grouped{described{fake.Azure(0)}})
+	d.keys("g", "tab") // the account's row, then straight to its pane
+	if d.m.focus != paneDetail {
+		t.Fatalf("focus %v, want the fourth pane", d.m.focus)
+	}
+	scr := d.screen()
+	for _, want := range []string{"Alice Example", "groups 2", "Platform team", "Vault readers"} {
+		if !strings.Contains(scr, want) {
+			t.Errorf("missing %q:\n%s", want, scr)
+		}
+	}
+	bar := lastLine(scr)
+	if !strings.Contains(bar, "copy") || strings.Contains(bar, "reveal") || strings.Contains(bar, "versions") {
+		t.Errorf("help bar: %q", bar)
+	}
+	d.keys("j", "y")
+	if got := d.clip().content; got != "oid-123" {
+		t.Errorf("y on the object ID copied %q", got)
+	}
+	d.keys("G", "y")
+	if got := d.clip().content; got != "Vault readers" {
+		t.Errorf("y on a group copied %q", got)
+	}
+
+	// / filters it, labels too.
+	d.keys("/")
+	d.typeText("vault")
+	d.keys("enter")
+	if scr := d.screen(); !strings.Contains(scr, "Vault readers") || strings.Contains(scr, "Platform team") {
+		t.Errorf("filtered:\n%s", scr)
+	}
+	d.keys("y")
+	if got := d.clip().content; got != "Vault readers" {
+		t.Errorf("y in the filtered pane copied %q", got)
+	}
+	d.keys("esc")
+	if !strings.Contains(d.screen(), "Platform team") {
+		t.Errorf("filter not cleared:\n%s", d.screen())
+	}
+
+	d.keys("shift+tab")
+	if d.m.focus != paneSources {
+		t.Errorf("back to %v, want Sources", d.m.focus)
+	}
+}

internal/ui/app/fields.go

@@ -0,0 +1,90 @@
+package app
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"strings"
+
+	tea "charm.land/bubbletea/v2"
+
+	"git.kebcloud.no/keb/lazysecrets/internal/provider"
+	"git.kebcloud.no/keb/lazysecrets/internal/ui/panes"
+)
+
+// The fourth pane shows Fields for anything but a secret. On a provider's
+// row: its account, from what the provider knows locally, then the
+// groups the account is in, loaded once a session when first shown.
+
+type groupsState struct {
+	names   []string
+	err     error
+	loading bool
+}
+
+type groupsMsg struct {
+	provider string
+	names    []string
+	err      error
+}
+
+// syncFields fills the Fields pane for what's selected, loading an
+// account's groups the first time.
+func (m *Model) syncFields() tea.Cmd {
+	acct, ok := m.selectedAccount()
+	if !ok {
+		m.fields.Set("", nil)
+		return nil
+	}
+	r, _ := m.sources.Selected()
+	var fields []panes.Field
+	for _, f := range acct.Fields {
+		fields = append(fields, panes.Field{Label: f.Label, Value: f.Value})
+	}
+	var cmd tea.Cmd
+	if g, ok := m.byID[r.provider].(provider.AccountGroups); ok {
+		st, seen := m.groups[r.provider]
+		if !seen {
+			st = groupsState{loading: true}
+			m.groups[r.provider] = st
+			id, timeout := r.provider, m.timeout
+			cmd = func() tea.Msg {
+				ctx, cancel := context.WithTimeout(context.Background(), timeout)
+				defer cancel()
+				names, err := g.Groups(ctx)
+				return groupsMsg{provider: id, names: names, err: err}
+			}
+		}
+		fields = append(fields, groupFields(st)...)
+	}
+	m.fields.Set(m.byID[r.provider].Label(), fields)
+	return cmd
+}
+
+// fieldName names a copied field: its label, or for a group, the group.
+func fieldName(f panes.Field) string {
+	if f.Label == "" || strings.HasPrefix(f.Label, "groups") {
+		return "group " + f.Value
+	}
+	return f.Label
+}
+
+// groupFields are the groups' rows: labelled on the first.
+func groupFields(st groupsState) []panes.Field {
+	switch {
+	case st.loading:
+		return []panes.Field{{Label: "groups", Value: "loading…", Info: true}}
+	case errors.Is(st.err, provider.ErrUnsupported):
+		return nil
+	case st.err != nil:
+		return []panes.Field{{Label: "groups", Value: "couldn't list them: " + st.err.Error(), Info: true}}
+	case len(st.names) == 0:
+		return []panes.Field{{Label: "groups", Value: "none", Info: true}}
+	}
+	out := make([]panes.Field, len(st.names))
+	for i, n := range st.names {
+		out[i] = panes.Field{Value: n}
+	}
+	out[0].Label = fmt.Sprintf("groups %d", len(st.names))
+	return out
+}

internal/ui/app/help.go

@@ -36,6 +36,7 @@ type contextHelp struct {
 	k        keys.Map
 	focus    pane
 	commands bool // custom commands apply here
+	account  bool // the fourth pane describes an account (fields.go)
 }
 
 func (c contextHelp) ShortHelp() []key.Binding {
@@ -44,6 +45,10 @@ func (c contextHelp) ShortHelp() []key.Binding {
 	if k.Login.Enabled() {
 		b = append(b, k.Login)
 	}
+	if c.focus == paneDetail && c.account {
+		copyField := key.NewBinding(key.WithKeys(k.Copy.Keys()...), key.WithHelp(k.Copy.Help().Key, "copy"))
+		return append(b, k.Up, k.Down, copyField, k.Filter, k.Help, k.Quit)
+	}
 	switch c.focus {
 	case paneSources:
 		b = append(b, k.Enter, k.Search, k.Share, k.ShareMenu, k.Favourite, k.Favourites, k.Note, k.Filter)

internal/ui/app/layout.go

@@ -166,6 +166,7 @@ func (m *Model) layout() {
 	m.containers.SetSize(leftW, h[1])
 	m.secrets.SetSize(leftW, h[2])
 	m.detail.SetSize(m.w-leftW, avail)
+	m.fields.SetSize(m.w-leftW, avail)
 }
 
 // active reports whether p is drawn focused: it has focus and the terminal
@@ -179,7 +180,12 @@ func (m Model) panesView() string {
 		func() string { return m.sources.View(m.st, m.active(paneSources), spin) },
 		func() string { return m.containers.View(m.st, m.active(paneContainers), spin) },
 		func() string { return m.secrets.View(m.st, m.active(paneSecrets), spin) },
-		func() string { return m.detail.View(m.st, m.active(paneDetail), spin) },
+		func() string {
+			if m.fields.Shown() {
+				return m.fields.View(m.st, m.active(paneDetail), spin)
+			}
+			return m.detail.View(m.st, m.active(paneDetail), spin)
+		},
 	}
 	if m.zoom == zoomFull {
 		return views[m.focus]()