Skip to content

feat(workspaces): change sorting order of the workspace list #7594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 22, 2023
Merged

feat(workspaces): change sorting order of the workspace list #7594

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a1cb9e3
feat(workspaces): implement sorting order on workspace list
rodrimaia May 18, 2023
da9de66
split slice into its own function and test it
rodrimaia May 19, 2023
2e82d26
use require instead of assert
rodrimaia May 19, 2023
d84902a
Update coderd/workspaces_internal_test.go
rodrimaia May 19, 2023
3033bdd
refactor tests into table tests
rodrimaia May 19, 2023
a19228d
fix test
rodrimaia May 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use require instead of assert
  • Loading branch information
@rodrimaia
rodrimaia committed May 19, 2023
commit 2e82d2689b2ebda8047f6802253aae6564d1825b
23 changes: 11 additions & 12 deletions coderd/workspaces_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"time"

"github.com/google/uuid"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/coder/coder/coderd/database"
Expand Down Expand Up @@ -98,10 +97,10 @@ func TestSortWorkspaces(t *testing.T) {

sortWorkspaces(workspaces)

assert.Equal(t, workspaces[0].LatestBuild.Status, codersdk.WorkspaceStatusRunning)
assert.Equal(t, workspaces[1].LatestBuild.Status, codersdk.WorkspaceStatusRunning)
assert.Equal(t, workspaces[2].LatestBuild.Status, codersdk.WorkspaceStatusPending)
assert.Equal(t, workspaces[3].LatestBuild.Status, codersdk.WorkspaceStatusPending)
require.Equal(t, workspaces[0].LatestBuild.Status, codersdk.WorkspaceStatusRunning)
require.Equal(t, workspaces[1].LatestBuild.Status, codersdk.WorkspaceStatusRunning)
require.Equal(t, workspaces[2].LatestBuild.Status, codersdk.WorkspaceStatusPending)
require.Equal(t, workspaces[3].LatestBuild.Status, codersdk.WorkspaceStatusPending)
})

t.Run("Then sort by owner Name", func(t *testing.T) {
Expand All @@ -117,9 +116,9 @@ func TestSortWorkspaces(t *testing.T) {
t.Log("uuid ", uuid.New().String())
t.Log("uuid ", uuid.New().String())

assert.Equal(t, "userA", workspaces[0].OwnerName)
assert.Equal(t, "userB", workspaces[1].OwnerName)
assert.Equal(t, "userZ", workspaces[2].OwnerName)
require.Equal(t, "userA", workspaces[0].OwnerName)
require.Equal(t, "userB", workspaces[1].OwnerName)
require.Equal(t, "userZ", workspaces[2].OwnerName)
})

t.Run("Then sort by last used at (recent first)", func(t *testing.T) {
Expand All @@ -135,10 +134,10 @@ func TestSortWorkspaces(t *testing.T) {
sortWorkspaces(workspaces)

// in this case, the last used at is the creation time
assert.Equal(t, workspaces[0].Name, "test-workspace-sort-4")
assert.Equal(t, workspaces[1].Name, "test-workspace-sort-3")
assert.Equal(t, workspaces[2].Name, "test-workspace-sort-2")
assert.Equal(t, workspaces[3].Name, "test-workspace-sort-1")
require.Equal(t, workspaces[0].Name, "test-workspace-sort-4")
require.Equal(t, workspaces[1].Name, "test-workspace-sort-3")
require.Equal(t, workspaces[2].Name, "test-workspace-sort-2")
require.Equal(t, workspaces[3].Name, "test-workspace-sort-1")
})
}

Expand Down
9 changes: 3 additions & 6 deletions coderd/workspaces_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,15 +234,12 @@ func TestWorkspacesSortOrder(t *testing.T) {
require.NoError(t, err, "(first) fetch workspaces")
require.Equal(t, 3, len(workspacesResponse.Workspaces), "should be 3 workspaces present")

require.Equal(t, codersdk.WorkspaceStatusRunning, workspacesResponse.Workspaces[0].LatestBuild.Status, "first should be running ones")
require.Equal(t, codersdk.WorkspaceStatusRunning, workspacesResponse.Workspaces[1].LatestBuild.Status, "Running workspaces should be first")
require.Equal(t, codersdk.WorkspaceStatusStopped, workspacesResponse.Workspaces[2].LatestBuild.Status, "The stopped one should be last")
require.Equal(t, codersdk.WorkspaceStatusRunning, workspacesResponse.Workspaces[0].LatestBuild.Status, "should be the first item in the list because it is running")
require.Equal(t, codersdk.WorkspaceStatusRunning, workspacesResponse.Workspaces[1].LatestBuild.Status)
require.Equal(t, codersdk.WorkspaceStatusStopped, workspacesResponse.Workspaces[2].LatestBuild.Status, "The stopped workspace should be last")

require.Equal(t, workspace3.ID, workspacesResponse.Workspaces[0].ID, "If both are running, and have the same owner, sort by last used (in this case, the last one created)")
<<<<<<< Updated upstream
=======

>>>>>>> Stashed changes
}

func TestPostWorkspacesByOrganization(t *testing.T) {
Expand Down