opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-10-16 14:48:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: always put user's own workspaces first (#29799)

Browse Source
This commit is contained in:
McKayla はな
2026-09-23 13:45:19 -06:00
committed by GitHub
parent 54bd34d8e3
commit 6d86cc605c
3 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coderd/database/queries.sql.go
Generated
+6 -1
View File
@@ -39841,13 +39841,18 @@ WHERE
FROM
filtered_workspaces fw
ORDER BY
-- To ensure that 'favorite' workspaces show up first in the list only for their owner.
-- Favorited workspaces should show up first only for their owner.
CASE WHEN favorite AND owner_username = (SELECT users.username FROM users WHERE users.id = $25) THEN 0 ELSE 1 END ASC,
-- Workspaces you own should show up first.
CASE WHEN owner_username = (SELECT users.username FROM users WHERE users.id = $25) THEN 0 ELSE 1 END ASC,
-- Running workspaces should show up first.
(latest_build_completed_at IS NOT NULL AND
latest_build_canceled_at IS NULL AND
latest_build_error IS NULL AND
latest_build_transition = 'start'::workspace_transition) DESC,
-- Group workspaces by owner.
LOWER(owner_username) ASC,
-- Order workspaces by name.
LOWER(name) ASC
LIMIT
CASE
coderd/database/queries/workspaces.sql
+6 -1
View File
@@ -397,13 +397,18 @@ WHERE
FROM
filtered_workspaces fw
ORDER BY
-- To ensure that 'favorite' workspaces show up first in the list only for their owner.
-- Favorited workspaces should show up first only for their owner.
CASE WHEN favorite AND owner_username = (SELECT users.username FROM users WHERE users.id = @requester_id) THEN 0 ELSE 1 END ASC,
-- Workspaces you own should show up first.
CASE WHEN owner_username = (SELECT users.username FROM users WHERE users.id = @requester_id) THEN 0 ELSE 1 END ASC,
-- Running workspaces should show up first.
(latest_build_completed_at IS NOT NULL AND
latest_build_canceled_at IS NULL AND
latest_build_error IS NULL AND
latest_build_transition = 'start'::workspace_transition) DESC,
-- Group workspaces by owner.
LOWER(owner_username) ASC,
-- Order workspaces by name.
LOWER(name) ASC
LIMIT
CASE
coderd/workspaces_test.go
+35 -43
View File
@@ -1094,57 +1094,49 @@ func TestWorkspacesSortOrder(t *testing.T) {
defer cancel()
require.NoError(t, client.FavoriteWorkspace(ctx, wsbF.Workspace.ID)) // need to do this via API call for now
// the correct sorting order is:
// 1. Favorited workspaces you own
// 2. Workspaces you own
// 2. Running workspaces
// 3. Sort by usernames
// 4. Sort by workspace names
var (
expectedOrderForFirstUser = []string{
wsbF.Workspace.Name, // favorited
wsbA.Workspace.Name, // running
wsbC.Workspace.Name, // running
wsbB.Workspace.Name, // stopped, testuser < zzz
wsbD.Workspace.Name, // stopped, zzz > testuser
wsbE.Workspace.Name, // stopped, zzz > testuser
}
expectedOrderForSecondUser = []string{
wsbD.Workspace.Name, // stopped, but owned by me
wsbE.Workspace.Name, // stopped, but owned by me
wsbA.Workspace.Name, // running
wsbC.Workspace.Name, // running
wsbB.Workspace.Name, // stopped, testuser < zzz
wsbF.Workspace.Name, // stopped, testuser < zzz, favorited but owned by someone else
}
)
// List workspaces as `firstUser`
workspacesResponse, err := client.Workspaces(ctx, codersdk.WorkspaceFilter{})
require.NoError(t, err, "(first) fetch workspaces")
workspaces := workspacesResponse.Workspaces
expectedNames := []string{
wsbF.Workspace.Name, // favorite
wsbA.Workspace.Name, // running
wsbC.Workspace.Name, // running
wsbB.Workspace.Name, // stopped, testuser < zzz
wsbD.Workspace.Name, // stopped, zzz > testuser
wsbE.Workspace.Name, // stopped, zzz > testuser
}
actualNames := make([]string, 0, len(expectedNames))
for _, w := range workspaces {
require.NoError(t, err, "(firstUser) fetch workspaces")
actualNames := make([]string, 0, len(expectedOrderForFirstUser))
for _, w := range workspacesResponse.Workspaces {
actualNames = append(actualNames, w.Name)
}
// the correct sorting order is:
// 1. Favorite workspaces (we have one, workspace-f)
// 2. Running workspaces
// 3. Sort by usernames
// 4. Sort by workspace names
assert.Equal(t, expectedNames, actualNames)
assert.Equal(t, expectedOrderForFirstUser, actualNames)
// Once again but this time as a different user. This time we do not expect to see another
// user's favorites first.
// List workspaces as `secondUser`
workspacesResponse, err = secondUserClient.Workspaces(ctx, codersdk.WorkspaceFilter{})
require.NoError(t, err, "(second) fetch workspaces")
workspaces = workspacesResponse.Workspaces
expectedNames = []string{
wsbA.Workspace.Name, // running
wsbC.Workspace.Name, // running
wsbB.Workspace.Name, // stopped, testuser < zzz
wsbF.Workspace.Name, // stopped, testuser < zzz
wsbD.Workspace.Name, // stopped, zzz > testuser
wsbE.Workspace.Name, // stopped, zzz > testuser
}
actualNames = make([]string, 0, len(expectedNames))
for _, w := range workspaces {
require.NoError(t, err, "(secondUser) fetch workspaces")
actualNames = make([]string, 0, len(expectedOrderForSecondUser))
for _, w := range workspacesResponse.Workspaces {
actualNames = append(actualNames, w.Name)
}
// the correct sorting order is:
// 1. Favorite workspaces (we have none this time)
// 2. Running workspaces
// 3. Sort by usernames
// 4. Sort by workspace names
assert.Equal(t, expectedNames, actualNames)
assert.Equal(t, expectedOrderForSecondUser, actualNames)
}
func TestPostWorkspacesByOrganization(t *testing.T) {