Skip to content

Commit dd09b0b

Browse files
committed
feat: add icon and description to preset
1 parent fb00cd2 commit dd09b0b

23 files changed

+855
-666
lines changed

coderd/apidoc/docs.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/apidoc/swagger.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/dump.sql

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ALTER TABLE template_version_presets
2+
DROP COLUMN IF EXISTS description,
3+
DROP COLUMN IF EXISTS icon;
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ALTER TABLE template_version_presets
2+
ADD COLUMN IF NOT EXISTS description text NOT NULL DEFAULT '',
3+
ADD COLUMN IF NOT EXISTS icon text NOT NULL DEFAULT '';

coderd/database/models.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/queries.sql.go

Lines changed: 24 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/queries/presets.sql

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ INSERT INTO template_version_presets (
77
desired_instances,
88
invalidate_after_secs,
99
scheduling_timezone,
10-
is_default
10+
is_default,
11+
description,
12+
icon
1113
)
1214
VALUES (
1315
@id,
@@ -17,7 +19,9 @@ VALUES (
1719
@desired_instances,
1820
@invalidate_after_secs,
1921
@scheduling_timezone,
20-
@is_default
22+
@is_default,
23+
@description,
24+
@icon
2125
) RETURNING *;
2226

2327
-- name: InsertPresetParameters :many

coderd/presets.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ func (api *API) templateVersionPresets(rw http.ResponseWriter, r *http.Request)
4141
var res []codersdk.Preset
4242
for _, preset := range presets {
4343
sdkPreset := codersdk.Preset{
44-
ID: preset.ID,
45-
Name: preset.Name,
46-
Default: preset.IsDefault,
44+
ID: preset.ID,
45+
Name: preset.Name,
46+
Default: preset.IsDefault,
47+
Description: preset.Description,
48+
Icon: preset.Icon,
4749
}
4850
for _, presetParam := range presetParams {
4951
if presetParam.TemplateVersionPresetID != preset.ID {

coderd/provisionerdserver/provisionerdserver.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2264,6 +2264,7 @@ func InsertWorkspacePresetAndParameters(ctx context.Context, db database.Store,
22642264
prebuildSchedules = protoPreset.Prebuild.Scheduling.Schedule
22652265
}
22662266
}
2267+
22672268
dbPreset, err := tx.InsertPreset(ctx, database.InsertPresetParams{
22682269
ID: uuid.New(),
22692270
TemplateVersionID: templateVersionID,
@@ -2273,6 +2274,8 @@ func InsertWorkspacePresetAndParameters(ctx context.Context, db database.Store,
22732274
InvalidateAfterSecs: ttl,
22742275
SchedulingTimezone: schedulingTimezone,
22752276
IsDefault: protoPreset.GetDefault(),
2277+
Description: protoPreset.Description,
2278+
Icon: protoPreset.Icon,
22762279
})
22772280
if err != nil {
22782281
return xerrors.Errorf("insert preset: %w", err)

0 commit comments

Comments
 (0)