Added user sorting and fixed error

controllers/dns.go

@@ -70,9 +70,9 @@ func getAllDNS(w http.ResponseWriter, r *http.Request) {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
-	sortedDns := logic.SortDNSEntrys(dns)
+	logic.SortDNSEntrys(dns[:])
 	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(sortedDns)
+	json.NewEncoder(w).Encode(dns)
 }
 
 // swagger:route GET /api/dns/adm/{network}/custom dns getCustomDNS

controllers/ext_client.go

@@ -117,9 +117,9 @@ func getAllExtClients(w http.ResponseWriter, r *http.Request) {
 	}
 
 	//Return all the extclients in JSON format
-	sortedClients := logic.SortExtClient(clients)
+	logic.SortExtClient(clients[:])
 	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(sortedClients)
+	json.NewEncoder(w).Encode(clients)
 }
 
 // swagger:route GET /api/extclients/{network}/{clientid} ext_client getExtClient

controllers/hosts.go

@@ -51,9 +51,9 @@ func getHosts(w http.ResponseWriter, r *http.Request) {
 	// return JSON/API formatted hosts
 	apiHosts := logic.GetAllHostsAPI(currentHosts[:])
 	logger.Log(2, r.Header.Get("user"), "fetched all hosts")
-	sortedApiHosts := logic.SortApiHosts(apiHosts)
+	logic.SortApiHosts(apiHosts[:])
 	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(sortedApiHosts)
+	json.NewEncoder(w).Encode(apiHosts)
 }
 
 // swagger:route GET /api/v1/host pull pullHost

controllers/network.go

@@ -71,9 +71,9 @@ func getNetworks(w http.ResponseWriter, r *http.Request) {
 	}
 
 	logger.Log(2, r.Header.Get("user"), "fetched networks.")
-	sortedAllNetworks := logic.SortNetworks(allnetworks)
+	logic.SortNetworks(allnetworks[:])
 	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(sortedAllNetworks)
+	json.NewEncoder(w).Encode(allnetworks)
 }
 
 // swagger:route GET /api/networks/{networkname} networks getNetwork

controllers/node.go

@@ -340,9 +340,9 @@ func getAllNodes(w http.ResponseWriter, r *http.Request) {
 	// return all the nodes in JSON/API format
 	apiNodes := logic.GetAllNodesAPI(nodes[:])
 	logger.Log(3, r.Header.Get("user"), "fetched all nodes they have access to")
-	sortedApiNodes := logic.SortApiNodes(apiNodes)
+	logic.SortApiNodes(apiNodes[:])
 	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(sortedApiNodes)
+	json.NewEncoder(w).Encode(apiNodes)
 }
 
 func getUsersNodes(user models.User) ([]models.Node, error) {

controllers/user.go

@@ -187,6 +187,7 @@ func getUsers(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	logic.SortUsers(users[:])
 	logger.Log(2, r.Header.Get("user"), "fetched users")
 	json.NewEncoder(w).Encode(users)
 }

logic/clients.go

@@ -57,9 +57,8 @@ func IsClientNodeAllowedByID(clientID, networkName, clientOrNodeID string) bool
 }
 
 // SortExtClient - Sorts slice of ExtClients by their ClientID alphabetically with numbers first
-func SortExtClient(unsortedExtClient []models.ExtClient) []models.ExtClient {
+func SortExtClient(unsortedExtClient []models.ExtClient) {
 	sort.Slice(unsortedExtClient, func(i, j int) bool {
 		return unsortedExtClient[i].ClientID < unsortedExtClient[j].ClientID
 	})
-	return nil
 }

logic/dns.go

@@ -196,11 +196,10 @@ func GetDNSEntryNum(domain string, network string) (int, error) {
 }
 
 // SortDNSEntrys - Sorts slice of DNSEnteys by their Address alphabetically with numbers first
-func SortDNSEntrys(unsortedDNSEntrys []models.DNSEntry) []models.DNSEntry {
+func SortDNSEntrys(unsortedDNSEntrys []models.DNSEntry) {
 	sort.Slice(unsortedDNSEntrys, func(i, j int) bool {
 		return unsortedDNSEntrys[i].Address < unsortedDNSEntrys[j].Address
 	})
-	return nil
 }
 
 // ValidateDNSCreate - checks if an entry is valid

logic/hosts.go

@@ -427,9 +427,8 @@ func GetHostByNodeID(id string) *models.Host {
 }
 
 // SortApiHosts - Sorts slice of ApiHosts by their ID alphabetically with numbers first
-func SortApiHosts(unsortedHosts []models.ApiHost) []models.ApiHost {
+func SortApiHosts(unsortedHosts []models.ApiHost) {
 	sort.Slice(unsortedHosts, func(i, j int) bool {
 		return unsortedHosts[i].ID < unsortedHosts[j].ID
 	})
-	return nil
 }

logic/networks.go

@@ -625,9 +625,8 @@ func networkNodesUpdateAction(networkName string, action string) error {
 }
 
 // SortNetworks - Sorts slice of Networks by their NetID alphabetically with numbers first
-func SortNetworks(unsortedNetworks []models.Network) []models.Network {
+func SortNetworks(unsortedNetworks []models.Network) {
 	sort.Slice(unsortedNetworks, func(i, j int) bool {
 		return unsortedNetworks[i].NetID < unsortedNetworks[j].NetID
 	})
-	return nil
 }

logic/nodes.go

@@ -548,11 +548,10 @@ func createNode(node *models.Node) error {
 }
 
 // SortApiNodes - Sorts slice of ApiNodes by their ID alphabetically with numbers first
-func SortApiNodes(unsortedNodes []models.ApiNode) []models.ApiNode {
+func SortApiNodes(unsortedNodes []models.ApiNode) {
 	sort.Slice(unsortedNodes, func(i, j int) bool {
 		return unsortedNodes[i].ID < unsortedNodes[j].ID
 	})
-	return nil
 }
 
 // == END PRO ==

logic/users.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"encoding/json"
+	"sort"
 
 	"github.com/gravitl/netmaker/database"
 	"github.com/gravitl/netmaker/logger"
@@ -77,3 +78,10 @@ func SetUserDefaults(user *models.User) {
 		user.Groups = []string{pro.DEFAULT_ALLOWED_GROUPS}
 	}
 }
+
+// SortUsers - Sorts slice of Users by username
+func SortUsers(unsortedUsers []models.ReturnUser) {
+	sort.Slice(unsortedUsers, func(i, j int) bool {
+		return unsortedUsers[i].UserName < unsortedUsers[j].UserName
+	})
+}