@@ -55,7 +55,6 @@ WITH latest_prebuilds AS (
5555workspaces .name ,
5656workspaces .template_id ,
5757workspace_latest_builds .template_version_id ,
58- workspace_latest_builds .template_version_preset_id ,
5958workspace_latest_builds .job_id ,
6059workspaces .created_at
6160FROM workspace_latest_builds
@@ -65,6 +64,16 @@ WITH latest_prebuilds AS (
6564AND workspaces .owner_id = ' c42fdf75-3097-471c-8c33-fb52454d81c0'
6665AND NOTworkspaces .deleted
6766),
67+ workspace_latest_presetsAS (
68+ SELECT DISTINCT ON (latest_prebuilds .id )
69+ latest_prebuilds .id AS workspace_id,
70+ workspace_builds .template_version_preset_id AS current_preset_id
71+ FROM latest_prebuilds
72+ JOIN workspace_buildsON workspace_builds .workspace_id = latest_prebuilds .id
73+ WHERE workspace_builds .transition = ' start'
74+ AND workspace_builds .template_version_preset_id IS NOT NULL
75+ ORDER BY latest_prebuilds .id ,workspace_builds .build_number DESC
76+ ),
6877ready_agentsAS (
6978SELECT
7079latest_prebuilds .job_id ,
@@ -81,12 +90,12 @@ SELECT
8190latest_prebuilds .name ,
8291latest_prebuilds .template_id ,
8392latest_prebuilds .template_version_id ,
84- -- TODO(cian): this can be null, which differs from prebuilt_workspaces view.
85- latest_prebuilds .template_version_preset_id AS current_preset_id,
93+ workspace_latest_presets .current_preset_id ,
8694COALESCE(ready_agents .ready , false)::boolean AS ready,
8795latest_prebuilds .created_at
8896FROM latest_prebuilds
8997LEFT JOIN ready_agentsON ready_agents .job_id = latest_prebuilds .job_id
98+ LEFT JOIN workspace_latest_presetsON workspace_latest_presets .workspace_id = latest_prebuilds .id
9099;
91100
92101-- name: CountInProgressPrebuilds :many