From de111181bfa79c63545f90579797892e88a15518 Mon Sep 17 00:00:00 2001 From: Matthew R Kasun Date: Wed, 19 Apr 2023 14:06:39 -0400 Subject: [PATCH] restore sortNetworks --- controllers/network.go | 1 + logic/networks.go | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/controllers/network.go b/controllers/network.go index fef2af43..8be03dca 100644 --- a/controllers/network.go +++ b/controllers/network.go @@ -69,6 +69,7 @@ func getNetworks(w http.ResponseWriter, r *http.Request) { } logger.Log(2, r.Header.Get("user"), "fetched networks.") + logic.SortNetworks(allnetworks[:]) w.WriteHeader(http.StatusOK) json.NewEncoder(w).Encode(allnetworks) } diff --git a/logic/networks.go b/logic/networks.go index fc8f42e8..ecdce22a 100644 --- a/logic/networks.go +++ b/logic/networks.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "net" + "sort" "strings" "github.com/c-robinson/iplib" @@ -577,4 +578,11 @@ func NetworkExists(name string) (bool, error) { return len(network) > 0, nil } +// SortNetworks - Sorts slice of Networks by their NetID alphabetically with numbers first +func SortNetworks(unsortedNetworks []models.Network) { + sort.Slice(unsortedNetworks, func(i, j int) bool { + return unsortedNetworks[i].NetID < unsortedNetworks[j].NetID + }) +} + // == Private ==