Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
151 changes: 82 additions & 69 deletions packages/dashboard-api/internal/api/api.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

94 changes: 59 additions & 35 deletions packages/dashboard-api/internal/handlers/builds_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ func (s *APIStore) GetBuilds(c *gin.Context, params api.GetBuildsParams) {
StatusMessage: dashboardutils.MapBuildStatusMessageFromDBStatusGroup(row.StatusGroup, row.Reason),
CreatedAt: row.CreatedAt,
FinishedAt: row.FinishedAt,
CpuCount: row.Vcpu,
MemoryMB: row.RamMb,
DiskSizeMB: row.TotalDiskSizeMb,
EnvdVersion: row.EnvdVersion,
})
}

Expand All @@ -89,13 +93,17 @@ func (s *APIStore) GetBuilds(c *gin.Context, params api.GetBuildsParams) {
}

type listBuildRow struct {
ID uuid.UUID
StatusGroup dbtypes.BuildStatusGroup
Reason dbtypes.BuildReason
CreatedAt time.Time
FinishedAt *time.Time
TemplateID string
TemplateAlias string
ID uuid.UUID
StatusGroup dbtypes.BuildStatusGroup
Reason dbtypes.BuildReason
CreatedAt time.Time
FinishedAt *time.Time
Vcpu int64
RamMb int64
TotalDiskSizeMb *int64
EnvdVersion *string
TemplateID string
TemplateAlias string
}

func (s *APIStore) listBuildRows(
Expand Down Expand Up @@ -238,13 +246,17 @@ func mapBuildRows(rows []queries.GetTeamBuildsPageRow) []listBuildRow {
out := make([]listBuildRow, 0, len(rows))
for _, row := range rows {
out = append(out, listBuildRow{
ID: row.ID,
StatusGroup: row.StatusGroup,
Reason: row.Reason,
CreatedAt: row.CreatedAt,
FinishedAt: row.FinishedAt,
TemplateID: row.TemplateID,
TemplateAlias: row.TemplateAlias,
ID: row.ID,
StatusGroup: row.StatusGroup,
Reason: row.Reason,
CreatedAt: row.CreatedAt,
FinishedAt: row.FinishedAt,
Vcpu: row.Vcpu,
RamMb: row.RamMb,
TotalDiskSizeMb: row.TotalDiskSizeMb,
EnvdVersion: row.EnvdVersion,
TemplateID: row.TemplateID,
TemplateAlias: row.TemplateAlias,
})
}

Expand All @@ -255,13 +267,17 @@ func mapBuildRowsByBuildID(rows []queries.GetTeamBuildsPageByBuildIDRow) []listB
out := make([]listBuildRow, 0, len(rows))
for _, row := range rows {
out = append(out, listBuildRow{
ID: row.ID,
StatusGroup: row.StatusGroup,
Reason: row.Reason,
CreatedAt: row.CreatedAt,
FinishedAt: row.FinishedAt,
TemplateID: row.TemplateID,
TemplateAlias: row.TemplateAlias,
ID: row.ID,
StatusGroup: row.StatusGroup,
Reason: row.Reason,
CreatedAt: row.CreatedAt,
FinishedAt: row.FinishedAt,
Vcpu: row.Vcpu,
RamMb: row.RamMb,
TotalDiskSizeMb: row.TotalDiskSizeMb,
EnvdVersion: row.EnvdVersion,
TemplateID: row.TemplateID,
TemplateAlias: row.TemplateAlias,
})
}

Expand All @@ -272,13 +288,17 @@ func mapBuildRowsByTemplateID(rows []queries.GetTeamBuildsPageByTemplateIDRow) [
out := make([]listBuildRow, 0, len(rows))
for _, row := range rows {
out = append(out, listBuildRow{
ID: row.ID,
StatusGroup: row.StatusGroup,
Reason: row.Reason,
CreatedAt: row.CreatedAt,
FinishedAt: row.FinishedAt,
TemplateID: row.TemplateID,
TemplateAlias: row.TemplateAlias,
ID: row.ID,
StatusGroup: row.StatusGroup,
Reason: row.Reason,
CreatedAt: row.CreatedAt,
FinishedAt: row.FinishedAt,
Vcpu: row.Vcpu,
RamMb: row.RamMb,
TotalDiskSizeMb: row.TotalDiskSizeMb,
EnvdVersion: row.EnvdVersion,
TemplateID: row.TemplateID,
TemplateAlias: row.TemplateAlias,
})
}

Expand All @@ -289,13 +309,17 @@ func mapBuildRowsByTemplateAlias(rows []queries.GetTeamBuildsPageByTemplateAlias
out := make([]listBuildRow, 0, len(rows))
for _, row := range rows {
out = append(out, listBuildRow{
ID: row.ID,
StatusGroup: row.StatusGroup,
Reason: row.Reason,
CreatedAt: row.CreatedAt,
FinishedAt: row.FinishedAt,
TemplateID: row.TemplateID,
TemplateAlias: row.TemplateAlias,
ID: row.ID,
StatusGroup: row.StatusGroup,
Reason: row.Reason,
CreatedAt: row.CreatedAt,
FinishedAt: row.FinishedAt,
Vcpu: row.Vcpu,
RamMb: row.RamMb,
TotalDiskSizeMb: row.TotalDiskSizeMb,
EnvdVersion: row.EnvdVersion,
TemplateID: row.TemplateID,
TemplateAlias: row.TemplateAlias,
})
}

Expand Down
16 changes: 16 additions & 0 deletions packages/db/queries/builds/get_builds_paginated.sql
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ SELECT
b.reason,
b.created_at,
b.finished_at,
b.vcpu,
b.ram_mb,
b.total_disk_size_mb,
b.envd_version,
eba.env_id AS template_id,
COALESCE(ea.alias, '') AS template_alias
FROM public.env_builds b
Expand Down Expand Up @@ -38,6 +42,10 @@ SELECT
b.reason,
b.created_at,
b.finished_at,
b.vcpu,
b.ram_mb,
b.total_disk_size_mb,
b.envd_version,
eba.env_id AS template_id,
COALESCE(ea.alias, '') AS template_alias
FROM public.env_builds b
Expand Down Expand Up @@ -72,6 +80,10 @@ SELECT
b.reason,
b.created_at,
b.finished_at,
b.vcpu,
b.ram_mb,
b.total_disk_size_mb,
b.envd_version,
eba.env_id AS template_id,
COALESCE(ea.alias, '') AS template_alias
FROM public.env_builds b
Expand Down Expand Up @@ -106,6 +118,10 @@ SELECT
b.reason,
b.created_at,
b.finished_at,
b.vcpu,
b.ram_mb,
b.total_disk_size_mb,
b.envd_version,
eba.env_id AS template_id,
COALESCE(ea.alias, '') AS template_alias
FROM public.env_builds b
Expand Down
Loading
Loading