synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-15 22:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: order workspaces by running first (#7656)

Browse Source 
* wip

* use updated sql

* wip

* Implement sorting in databasefake.go

* More fixes

* sql fmt

---------

Co-authored-by: Marcin Tojek <marcin@coder.com>
This commit is contained in:
Rodrigo Maia
2023-05-25 13:35:47 -03:00
committed by GitHub
parent 96a2e63809
commit d9299caa12
6 changed files with 134 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
coderd/workspaces.go
View File

@ -7,7 +7,6 @@ import (
"errors"
"fmt"
"net/http"
"sort"
"strconv"
"time"
@ -1015,36 +1014,9 @@ func convertWorkspaces(workspaces []database.Workspace, data workspaceData) ([]c
&owner,
))
}
sortWorkspaces(apiWorkspaces)
return apiWorkspaces, nil
}
func sortWorkspaces(workspaces []codersdk.Workspace) {
sort.Slice(workspaces, func(i, j int) bool {
iw := workspaces[i]
jw := workspaces[j]
if iw.LatestBuild.Status == codersdk.WorkspaceStatusRunning && jw.LatestBuild.Status != codersdk.WorkspaceStatusRunning {
return true
}
if jw.LatestBuild.Status == codersdk.WorkspaceStatusRunning && iw.LatestBuild.Status != codersdk.WorkspaceStatusRunning {
return false
}
if iw.OwnerID != jw.OwnerID {
return iw.OwnerName < jw.OwnerName
}
if jw.LastUsedAt.IsZero() && iw.LastUsedAt.IsZero() {
return iw.Name < jw.Name
}
return iw.LastUsedAt.After(jw.LastUsedAt)
})
}
func convertWorkspace(
workspace database.Workspace,
workspaceBuild codersdk.WorkspaceBuild,