Skip to content

[v14] Sort usergroups by their oktalabels if available #35729

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
avatus merged 1 commit into from
Dec 19, 2023
Merged

[v14] Sort usergroups by their oktalabels if available #35729

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
31 changes: 29 additions & 2 deletions api/types/usergroup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package types
import (
"fmt"
"sort"
"strings"

"github.com/gravitational/trace"

Expand Down Expand Up @@ -112,11 +113,37 @@ func (g UserGroups) SortByCustom(sortBy SortBy) error {
switch sortBy.Field {
case ResourceMetadataName:
sort.SliceStable(g, func(i, j int) bool {
return stringCompare(g[i].GetName(), g[j].GetName(), isDesc)
groupA := g[i]
groupB := g[j]

groupAName := FriendlyName(groupA)
groupBName := FriendlyName(groupB)

if groupAName == "" {
groupAName = groupA.GetName()
}
if groupBName == "" {
groupBName = groupB.GetName()
}

return stringCompare(strings.ToLower(groupAName), strings.ToLower(groupBName), isDesc)
})
case ResourceSpecDescription:
sort.SliceStable(g, func(i, j int) bool {
return stringCompare(g[i].GetMetadata().Description, g[j].GetMetadata().Description, isDesc)
groupA := g[i]
groupB := g[j]

groupADescription := groupA.GetMetadata().Description
groupBDescription := groupB.GetMetadata().Description

if oktaDescription, ok := groupA.GetLabel(OktaGroupDescriptionLabel); ok {
groupADescription = oktaDescription
}
if oktaDescription, ok := groupB.GetLabel(OktaGroupDescriptionLabel); ok {
groupBDescription = oktaDescription
}

return stringCompare(strings.ToLower(groupADescription), strings.ToLower(groupBDescription), isDesc)
})

default:
Expand Down