blackroad-os/backroad
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch natural sort lib for a better one (#6863)

Browse Source 
Switched to better natural sorting package
This commit is contained in:
Matt Hook
2022-05-02 12:37:37 +12:00
committed by GitHub
parent 8214119137
commit 6423a7bd17
4 changed files with 6 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/http/handler/endpoints/sort.go
View File

@@ -3,8 +3,8 @@ package endpoints
import (
"strings"
"github.com/fvbommel/sortorder"
portainer "github.com/portainer/portainer/api"
"github.com/portainer/portainer/api/internal/natsort"
)
type EndpointsByName []portainer.Endpoint
@@ -18,7 +18,7 @@ func (e EndpointsByName) Swap(i, j int) {
}
func (e EndpointsByName) Less(i, j int) bool {
return natsort.Compare(strings.ToLower(e[i].Name), strings.ToLower(e[j].Name))
return sortorder.NaturalLess(strings.ToLower(e[i].Name), strings.ToLower(e[j].Name))
}
type EndpointsByGroup []portainer.Endpoint
@@ -39,5 +39,5 @@ func (e EndpointsByGroup) Less(i, j int) bool {
groupA := endpointGroupNames[e[i].GroupID]
groupB := endpointGroupNames[e[j].GroupID]
return natsort.Compare(strings.ToLower(groupA), strings.ToLower(groupB))
return sortorder.NaturalLess(strings.ToLower(groupA), strings.ToLower(groupB))
}