Skip to content

fix(tui): show source path suffix for duplicate context names #128

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

Draft
MichaelSp wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(tui): show source path suffix for duplicate context names #128

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
27 changes: 27 additions & 0 deletions pkg/tui/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package tui
import (
"fmt"
"os"
"path/filepath"
"strings"

storetypes "github.com/MichaelSp/kswitch/pkg/store/types"
Expand Down Expand Up @@ -126,6 +127,21 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

case discoveryDoneMsg:
m.loading = false
// Disambiguate items that share a contextName by showing the source path.
nameCounts := make(map[string]int)
for _, it := range m.allItems {
nameCounts[it.contextName]++
}
changed := false
for i, it := range m.allItems {
if nameCounts[it.contextName] > 1 && it.dimSuffix == "" {
m.allItems[i].dimSuffix = shortPath(it.path)
changed = true
}
}
if changed {
m.filtered = filterItems(m.query, m.allItems)
}
return m, nil

case previewMsg:
Expand Down Expand Up @@ -423,3 +439,14 @@ func truncate(s string, max int) string {
}
return string(r[:max-2]) + ".."
}

// shortPath returns up to the last 2 path components of p (e.g. "configs/prod.yaml").
func shortPath(p string) string {
dir := filepath.Dir(p)
base := filepath.Base(p)
parent := filepath.Base(dir)
if parent == "." || parent == "/" {
return base
}
return parent + "/" + base
}