Skip to content

fix: track cursor by resource ID across all list views #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
larkly merged 1 commit into from
Mar 29, 2026
Merged

fix: track cursor by resource ID across all list views #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions src/internal/ui/floatingiplist/floatingiplist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,25 @@ func (m Model) SelectedFIP() *network.FloatingIP {
func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
switch msg := msg.(type) {
case fipsLoadedMsg:
var cursorID string
if m.cursor >= 0 && m.cursor < len(m.fips) {
cursorID = m.fips[m.cursor].ID
}
m.loading = false
m.fips = msg.fips
m.err = ""
m.sortFIPs()
if cursorID != "" {
for i, f := range m.fips {
if f.ID == cursorID {
m.cursor = i
break
}
}
}
if m.cursor >= len(m.fips) {
m.cursor = max(0, len(m.fips)-1)
}
return m, nil

case fipsErrMsg:
Expand Down Expand Up @@ -106,19 +121,43 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
case tea.KeyMsg:
switch {
case key.Matches(msg, shared.Keys.Sort):
var cursorID string
if m.cursor >= 0 && m.cursor < len(m.fips) {
cursorID = m.fips[m.cursor].ID
}
m.sortCol = (m.sortCol + 1) % len(fipSortColumns)
m.sortAsc = true
m.sortHighlight = true
m.sortClearAt = time.Now().Add(1500 * time.Millisecond)
m.sortFIPs()
if cursorID != "" {
for i, f := range m.fips {
if f.ID == cursorID {
m.cursor = i
break
}
}
}
return m, tea.Tick(1500*time.Millisecond, func(time.Time) tea.Msg {
return sortClearMsg{}
})
case key.Matches(msg, shared.Keys.ReverseSort):
var cursorID string
if m.cursor >= 0 && m.cursor < len(m.fips) {
cursorID = m.fips[m.cursor].ID
}
m.sortAsc = !m.sortAsc
m.sortHighlight = true
m.sortClearAt = time.Now().Add(1500 * time.Millisecond)
m.sortFIPs()
if cursorID != "" {
for i, f := range m.fips {
if f.ID == cursorID {
m.cursor = i
break
}
}
}
return m, tea.Tick(1500*time.Millisecond, func(time.Time) tea.Msg {
return sortClearMsg{}
})
Expand Down
39 changes: 39 additions & 0 deletions src/internal/ui/imagelist/imagelist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,25 @@ func (m Model) SelectedImage() *image.Image {
func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
switch msg := msg.(type) {
case imagesLoadedMsg:
var cursorID string
if m.cursor >= 0 && m.cursor < len(m.images) {
cursorID = m.images[m.cursor].ID
}
m.loading = false
m.images = msg.images
m.err = ""
m.sortImages()
if cursorID != "" {
for i, img := range m.images {
if img.ID == cursorID {
m.cursor = i
break
}
}
}
if m.cursor >= len(m.images) {
m.cursor = max(0, len(m.images)-1)
}
return m, nil

case imagesErrMsg:
Expand Down Expand Up @@ -207,21 +222,45 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
case key.Matches(msg, shared.Keys.Sort):
visibleCount := m.visibleColCount()
if visibleCount > 0 {
var cursorID string
if m.cursor >= 0 && m.cursor < len(m.images) {
cursorID = m.images[m.cursor].ID
}
m.sortCol = (m.sortCol + 1) % visibleCount
m.sortAsc = true
m.sortHighlight = true
m.sortClearAt = time.Now().Add(1500 * time.Millisecond)
m.sortImages()
if cursorID != "" {
for i, img := range m.images {
if img.ID == cursorID {
m.cursor = i
break
}
}
}
return m, tea.Tick(1500*time.Millisecond, func(time.Time) tea.Msg {
return sortClearMsg{}
})
}
case key.Matches(msg, shared.Keys.ReverseSort):
if m.visibleColCount() > 0 {
var cursorID string
if m.cursor >= 0 && m.cursor < len(m.images) {
cursorID = m.images[m.cursor].ID
}
m.sortAsc = !m.sortAsc
m.sortHighlight = true
m.sortClearAt = time.Now().Add(1500 * time.Millisecond)
m.sortImages()
if cursorID != "" {
for i, img := range m.images {
if img.ID == cursorID {
m.cursor = i
break
}
}
}
return m, tea.Tick(1500*time.Millisecond, func(time.Time) tea.Msg {
return sortClearMsg{}
})
Expand Down
39 changes: 39 additions & 0 deletions src/internal/ui/keypairlist/keypairlist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,25 @@ func (m Model) Init() tea.Cmd {
func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
switch msg := msg.(type) {
case keypairsLoadedMsg:
var cursorName string
if m.cursor >= 0 && m.cursor < len(m.pairs) {
cursorName = m.pairs[m.cursor].Name
}
m.loading = false
m.pairs = msg.keypairs
m.err = ""
m.sortPairs()
if cursorName != "" {
for i, kp := range m.pairs {
if kp.Name == cursorName {
m.cursor = i
break
}
}
}
if m.cursor >= len(m.pairs) {
m.cursor = max(0, len(m.pairs)-1)
}
return m, nil

case keypairsErrMsg:
Expand Down Expand Up @@ -96,19 +111,43 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
case tea.KeyMsg:
switch {
case key.Matches(msg, shared.Keys.Sort):
var cursorName string
if m.cursor >= 0 && m.cursor < len(m.pairs) {
cursorName = m.pairs[m.cursor].Name
}
m.sortCol = (m.sortCol + 1) % len(kpSortColumns)
m.sortAsc = true
m.sortHighlight = true
m.sortClearAt = time.Now().Add(1500 * time.Millisecond)
m.sortPairs()
if cursorName != "" {
for i, kp := range m.pairs {
if kp.Name == cursorName {
m.cursor = i
break
}
}
}
return m, tea.Tick(1500*time.Millisecond, func(time.Time) tea.Msg {
return sortClearMsg{}
})
case key.Matches(msg, shared.Keys.ReverseSort):
var cursorName string
if m.cursor >= 0 && m.cursor < len(m.pairs) {
cursorName = m.pairs[m.cursor].Name
}
m.sortAsc = !m.sortAsc
m.sortHighlight = true
m.sortClearAt = time.Now().Add(1500 * time.Millisecond)
m.sortPairs()
if cursorName != "" {
for i, kp := range m.pairs {
if kp.Name == cursorName {
m.cursor = i
break
}
}
}
return m, tea.Tick(1500*time.Millisecond, func(time.Time) tea.Msg {
return sortClearMsg{}
})
Expand Down
39 changes: 39 additions & 0 deletions src/internal/ui/lblist/lblist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,25 @@ func (m Model) Init() tea.Cmd {
func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
switch msg := msg.(type) {
case lbsLoadedMsg:
var cursorID string
if m.cursor >= 0 && m.cursor < len(m.lbs) {
cursorID = m.lbs[m.cursor].ID
}
m.loading = false
m.lbs = msg.lbs
m.err = ""
m.sortLBs()
if cursorID != "" {
for i, lb := range m.lbs {
if lb.ID == cursorID {
m.cursor = i
break
}
}
}
if m.cursor >= len(m.lbs) {
m.cursor = max(0, len(m.lbs)-1)
}
return m, nil

case lbsErrMsg:
Expand Down Expand Up @@ -98,19 +113,43 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
case tea.KeyMsg:
switch {
case key.Matches(msg, shared.Keys.Sort):
var cursorID string
if m.cursor >= 0 && m.cursor < len(m.lbs) {
cursorID = m.lbs[m.cursor].ID
}
m.sortCol = (m.sortCol + 1) % len(lbSortColumns)
m.sortAsc = true
m.sortHighlight = true
m.sortClearAt = time.Now().Add(1500 * time.Millisecond)
m.sortLBs()
if cursorID != "" {
for i, lb := range m.lbs {
if lb.ID == cursorID {
m.cursor = i
break
}
}
}
return m, tea.Tick(1500*time.Millisecond, func(time.Time) tea.Msg {
return sortClearMsg{}
})
case key.Matches(msg, shared.Keys.ReverseSort):
var cursorID string
if m.cursor >= 0 && m.cursor < len(m.lbs) {
cursorID = m.lbs[m.cursor].ID
}
m.sortAsc = !m.sortAsc
m.sortHighlight = true
m.sortClearAt = time.Now().Add(1500 * time.Millisecond)
m.sortLBs()
if cursorID != "" {
for i, lb := range m.lbs {
if lb.ID == cursorID {
m.cursor = i
break
}
}
}
return m, tea.Tick(1500*time.Millisecond, func(time.Time) tea.Msg {
return sortClearMsg{}
})
Expand Down
19 changes: 18 additions & 1 deletion src/internal/ui/networklist/networklist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,29 @@ func (m Model) ForceRefresh() tea.Cmd {
func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
switch msg := msg.(type) {
case networksLoadedMsg:
var cursorID string
if m.cursor >= 0 && m.cursor < len(m.networks) {
cursorID = m.networks[m.cursor].ID
}
m.loading = false
m.networks = msg.networks
m.subnets = msg.subnets
m.ports = msg.ports
m.err = ""
if m.cursor >= len(m.networks) && len(m.networks) > 0 {
if cursorID != "" {
found := false
for i, n := range m.networks {
if n.ID == cursorID {
m.cursor = i
found = true
break
}
}
if !found && m.cursor >= len(m.networks) && len(m.networks) > 0 {
m.cursor = len(m.networks) - 1
m.inSubnets = false
}
} else if m.cursor >= len(m.networks) && len(m.networks) > 0 {
m.cursor = len(m.networks) - 1
m.inSubnets = false
}
Expand Down
39 changes: 39 additions & 0 deletions src/internal/ui/routerlist/routerlist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,25 @@ func (m Model) Init() tea.Cmd {
func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
switch msg := msg.(type) {
case routersLoadedMsg:
var cursorID string
if m.cursor >= 0 && m.cursor < len(m.routers) {
cursorID = m.routers[m.cursor].ID
}
m.loading = false
m.routers = msg.routers
m.err = ""
m.sortRouters()
if cursorID != "" {
for i, r := range m.routers {
if r.ID == cursorID {
m.cursor = i
break
}
}
}
if m.cursor >= len(m.routers) {
m.cursor = max(0, len(m.routers)-1)
}
return m, nil

case routersErrMsg:
Expand Down Expand Up @@ -98,19 +113,43 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
case tea.KeyMsg:
switch {
case key.Matches(msg, shared.Keys.Sort):
var cursorID string
if m.cursor >= 0 && m.cursor < len(m.routers) {
cursorID = m.routers[m.cursor].ID
}
m.sortCol = (m.sortCol + 1) % len(routerSortColumns)
m.sortAsc = true
m.sortHighlight = true
m.sortClearAt = time.Now().Add(1500 * time.Millisecond)
m.sortRouters()
if cursorID != "" {
for i, r := range m.routers {
if r.ID == cursorID {
m.cursor = i
break
}
}
}
return m, tea.Tick(1500*time.Millisecond, func(time.Time) tea.Msg {
return sortClearMsg{}
})
case key.Matches(msg, shared.Keys.ReverseSort):
var cursorID string
if m.cursor >= 0 && m.cursor < len(m.routers) {
cursorID = m.routers[m.cursor].ID
}
m.sortAsc = !m.sortAsc
m.sortHighlight = true
m.sortClearAt = time.Now().Add(1500 * time.Millisecond)
m.sortRouters()
if cursorID != "" {
for i, r := range m.routers {
if r.ID == cursorID {
m.cursor = i
break
}
}
}
return m, tea.Tick(1500*time.Millisecond, func(time.Time) tea.Msg {
return sortClearMsg{}
})
Expand Down
Loading