refactor: the account pane becomes Fields, the pane for anything but a secret
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
0a80073aad
commit
e64748e85d
5 files changed
+46
-44
No files matched your search
+21
-21
@@ -163,13 +163,13 @@ type Model struct {
|
||||
clip Clipboard
|
||||
clipClear time.Duration
|
||||
openURL func(string) error
|
||||
// srcDetail is the fourth pane on a provider's row, with the groups
|
||||
// of each provider's account as they load (source_detail.go).
|
||||
srcDetail panes.SourceDetail
|
||||
groups map[string]groupsState
|
||||
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
|
||||
@@ -361,7 +361,7 @@ func New(providers []provider.Provider, opts Options) Model {
|
||||
nvimOpen: nvimOpen,
|
||||
cache: newCache(),
|
||||
groups: map[string]groupsState{},
|
||||
srcDetail: panes.NewSourceDetail(),
|
||||
fields: panes.NewFields(),
|
||||
}
|
||||
if m.clip == nil {
|
||||
m.clip = clipboard.New()
|
||||
@@ -732,7 +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())
|
||||
cmds = append(cmds, m.syncSourceDetail())
|
||||
cmds = append(cmds, m.syncFields())
|
||||
if m.anyLoading() && !m.spinning {
|
||||
m.spinning = true
|
||||
cmds = append(cmds, m.spin.Tick)
|
||||
@@ -799,12 +799,12 @@ 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.srcDetail.Shown() {
|
||||
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.srcDetail.Shown() {
|
||||
if m.focus == paneSecrets && m.fields.Shown() {
|
||||
m.focus = paneSources
|
||||
}
|
||||
case key.Matches(msg, k.Pane1):
|
||||
@@ -929,8 +929,8 @@ func (m *Model) focusedFilter() filterable {
|
||||
case paneSecrets:
|
||||
return &m.secrets
|
||||
case paneDetail:
|
||||
if m.srcDetail.Shown() {
|
||||
return &m.srcDetail
|
||||
if m.fields.Shown() {
|
||||
return &m.fields
|
||||
}
|
||||
}
|
||||
return nil
|
||||
@@ -946,8 +946,8 @@ func (m *Model) move(delta int) {
|
||||
case paneSecrets:
|
||||
m.secrets.Move(delta)
|
||||
case paneDetail:
|
||||
if m.srcDetail.Shown() {
|
||||
m.srcDetail.Move(delta)
|
||||
if m.fields.Shown() {
|
||||
m.fields.Move(delta)
|
||||
} else {
|
||||
m.detail.Scroll(delta)
|
||||
}
|
||||
@@ -970,10 +970,10 @@ func (m *Model) jump(top bool) {
|
||||
m.secrets.Top()
|
||||
case m.focus == paneSecrets:
|
||||
m.secrets.Bottom()
|
||||
case m.focus == paneDetail && m.srcDetail.Shown() && top:
|
||||
m.srcDetail.Top()
|
||||
case m.focus == paneDetail && m.srcDetail.Shown():
|
||||
m.srcDetail.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:
|
||||
@@ -1484,7 +1484,7 @@ 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.srcDetail.Selected(); ok && m.focus == paneDetail && m.srcDetail.Shown() {
|
||||
if f, ok := m.fields.Selected(); ok && m.focus == paneDetail && m.fields.Shown() {
|
||||
return m.copyText(fieldName(f), f.Value, false)
|
||||
}
|
||||
return nil
|
||||
@@ -1612,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, account: m.srcDetail.Shown()}.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() {
|
||||
|
||||
Reference in new issue
Block a user