sort

mtojek · mtojek · commit 09ed8fd785b3 · 2024-02-09T16:02:42.000+01:00
diff --git a/coderd/database/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/url"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -414,6 +415,16 @@ func AppSubdomain(dbApp database.WorkspaceApp, agentName, workspaceName, ownerNa
 }
 
 func Apps(dbApps []database.WorkspaceApp, agent database.WorkspaceAgent, ownerName string, workspace database.Workspace) []codersdk.WorkspaceApp {
+	sort.Slice(dbApps, func(i, j int) bool {
+		if dbApps[i].DisplayOrder != dbApps[j].DisplayOrder {
+			return dbApps[i].DisplayOrder < dbApps[j].DisplayOrder
+		}
+		if dbApps[i].DisplayName != dbApps[j].DisplayName {
+			return dbApps[i].DisplayName < dbApps[j].DisplayName
+		}
+		return dbApps[i].Slug < dbApps[j].Slug
+	})
+
 	apps := make([]codersdk.WorkspaceApp, 0)
 	for _, dbApp := range dbApps {
 		apps = append(apps, codersdk.WorkspaceApp{
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -5826,6 +5826,7 @@ func (q *FakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertW
 		HealthcheckInterval:  arg.HealthcheckInterval,
 		HealthcheckThreshold: arg.HealthcheckThreshold,
 		Health:               arg.Health,
+		DisplayOrder:         arg.DisplayOrder,
 	}
 	q.workspaceApps = append(q.workspaceApps, workspaceApp)
 	return workspaceApp, nil

Original file line number	Diff line number	Diff line change
`@@ -5826,6 +5826,7 @@ func (q *FakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertW`
`5826`	`5826`	`HealthcheckInterval: arg.HealthcheckInterval,`
`5827`	`5827`	`HealthcheckThreshold: arg.HealthcheckThreshold,`
`5828`	`5828`	`Health: arg.Health,`
	`5829`	`+ DisplayOrder: arg.DisplayOrder,`
`5829`	`5830`	`}`
`5830`	`5831`	`q.workspaceApps = append(q.workspaceApps, workspaceApp)`
`5831`	`5832`	`return workspaceApp, nil`