Skip to content
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

fix manual sorting not working when sortColumn is configured #2253

Merged
merged 3 commits into from
Nov 5, 2023
Merged

fix manual sorting not working when sortColumn is configured #2253

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e6a2fe
fix manual sorting not working when sortColumn is configured
wjiec Oct 18, 2023
034aad7
using manualSort to indicate has modified the sort col
wjiec Oct 19, 2023
256d936
make user changes to the sortColumn take effect
wjiec Oct 23, 2023
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
9 changes: 7 additions & 2 deletions internal/ui/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ type Table struct {
wide bool
toast bool
hasMetrics bool
manualSort bool
}

// NewTable returns a new table view.
Expand Down Expand Up @@ -85,6 +86,7 @@ func (t *Table) GVR() client.GVR { return t.gvr }

// ViewSettingsChanged notifies listener the view configuration changed.
func (t *Table) ViewSettingsChanged(settings config.ViewSetting) {
t.manualSort = false // make user changes to the sortColumn take effect
t.viewSetting = &settings
t.Refresh()
}
Expand Down Expand Up @@ -202,9 +204,11 @@ func (t *Table) doUpdate(data *render.TableData) {
cols = t.viewSetting.Columns
}
custData := data.Customize(cols, t.wide)
if t.viewSetting != nil && t.viewSetting.SortColumn != "" {
// The sortColumn settings in the configuration file are only used
// if the sortCol has not been modified manually
if t.viewSetting != nil && t.viewSetting.SortColumn != "" && !t.manualSort {
tokens := strings.Split(t.viewSetting.SortColumn, ":")
if custData.Header.IndexOf(tokens[0], false) >= 0 && custData.Header.IndexOf(t.sortCol.name, false) < 0 {
if custData.Header.IndexOf(tokens[0], false) >= 0 {
t.sortCol.name, t.sortCol.asc = tokens[0], true
if len(tokens) == 2 && tokens[1] == "desc" {
t.sortCol.asc = false
Expand Down Expand Up @@ -315,6 +319,7 @@ func (t *Table) SortColCmd(name string, asc bool) func(evt *tcell.EventKey) *tce
t.sortCol.asc = asc
}
t.sortCol.name = name
t.manualSort = true
t.Refresh()
return nil
}
Expand Down