fix: always show a newly created workspace at the top of the list (#6984)

kylecarbs · web-flow · commit c12bc398210f · 2023-04-04T08:24:04.000-05:00
Fixes #5795.
diff --git a/coderd/database/dbfake/databasefake.go b/coderd/database/dbfake/databasefake.go
@@ -3361,6 +3361,7 @@ func (q *fakeQuerier) InsertWorkspace(_ context.Context, arg database.InsertWork
 		Name:              arg.Name,
 		AutostartSchedule: arg.AutostartSchedule,
 		Ttl:               arg.Ttl,
+		LastUsedAt:        arg.LastUsedAt,
 	}
 	q.workspaces = append(q.workspaces, workspace)
 	return workspace, nil
diff --git a/coderd/database/dbgen/generator.go b/coderd/database/dbgen/generator.go
@@ -145,6 +145,7 @@ func Workspace(t testing.TB, db database.Store, orig database.Workspace) databas
 		UpdatedAt:         takeFirst(orig.UpdatedAt, database.Now()),
 		OrganizationID:    takeFirst(orig.OrganizationID, uuid.New()),
 		TemplateID:        takeFirst(orig.TemplateID, uuid.New()),
+		LastUsedAt:        takeFirst(orig.LastUsedAt, database.Now()),
 		Name:              takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
 		AutostartSchedule: orig.AutostartSchedule,
 		Ttl:               orig.Ttl,
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/workspaces.sql b/coderd/database/queries/workspaces.sql
@@ -270,10 +270,11 @@ INSERT INTO
 		template_id,
 		name,
 		autostart_schedule,
-		ttl
+		ttl,
+		last_used_at
 	)
 VALUES
-	($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING *;
+	($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING *;
 
 -- name: UpdateWorkspaceDeletedByID :exec
 UPDATE
diff --git a/coderd/insights_test.go b/coderd/insights_test.go
@@ -58,13 +58,9 @@ func TestDeploymentInsights(t *testing.T) {
 	daus, err := client.DeploymentDAUs(context.Background())
 	require.NoError(t, err)
 
-	require.Equal(t, &codersdk.DeploymentDAUsResponse{
-		Entries: []codersdk.DAUEntry{},
-	}, daus, "no DAUs when stats are empty")
-
 	res, err := client.Workspaces(ctx, codersdk.WorkspaceFilter{})
 	require.NoError(t, err)
-	assert.Zero(t, res.Workspaces[0].LastUsedAt)
+	assert.NotZero(t, res.Workspaces[0].LastUsedAt)
 
 	conn, err := client.DialWorkspaceAgent(ctx, resources[0].Agents[0].ID, &codersdk.DialWorkspaceAgentOptions{
 		Logger: slogtest.Make(t, nil).Named("tailnet"),
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -480,6 +480,9 @@ func (api *API) postWorkspacesByOrganization(rw http.ResponseWriter, r *http.Req
 			Name:              createWorkspace.Name,
 			AutostartSchedule: dbAutostartSchedule,
 			Ttl:               dbTTL,
+			// The workspaces page will sort by last used at, and it's useful to
+			// have the newly created workspace at the top of the list!
+			LastUsedAt: database.Now(),
 		})
 		if err != nil {
 			return xerrors.Errorf("insert workspace: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -3361,6 +3361,7 @@ func (q *fakeQuerier) InsertWorkspace(_ context.Context, arg database.InsertWork`
`3361`	`3361`	`Name: arg.Name,`
`3362`	`3362`	`AutostartSchedule: arg.AutostartSchedule,`
`3363`	`3363`	`Ttl: arg.Ttl,`
	`3364`	`+ LastUsedAt: arg.LastUsedAt,`
`3364`	`3365`	`}`
`3365`	`3366`	`q.workspaces = append(q.workspaces, workspace)`
`3366`	`3367`	`return workspace, nil`