May 27, 2025 · May 27, 2025
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go
 Threshold: dbApp.HealthcheckThreshold,
 },
 Health:   codersdk.WorkspaceAppHealth(dbApp.Health),
 Group:    dbApp.DisplayGroup.String,
 Hidden:   dbApp.Hidden,
 OpenIn:   codersdk.WorkspaceAppOpenIn(dbApp.OpenIn),
 Statuses: WorkspaceAppStatuses(statuses),
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
 HealthcheckThreshold: takeFirst(orig.HealthcheckThreshold, 60),
 Health:               takeFirst(orig.Health, database.WorkspaceAppHealthHealthy),
 DisplayOrder:         takeFirst(orig.DisplayOrder, 1),
 DisplayGroup:         orig.DisplayGroup,
 Hidden:               orig.Hidden,
 OpenIn:               takeFirst(orig.OpenIn, database.WorkspaceAppOpenInSlimWindow),
 })
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000331_app_group.down.sql b/coderd/database/migrations/000331_app_group.down.sql
 alter table workspace_apps drop column display_group;
diff --git a/coderd/database/migrations/000331_app_group.up.sql b/coderd/database/migrations/000331_app_group.up.sql
 alter table workspace_apps add column display_group text;
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/workspaceapps.sql b/coderd/database/queries/workspaceapps.sql
        health,
        display_order,
        hidden,
        open_in
        open_in,
        display_group
    )
 VALUES
    ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18) RETURNING *;
    ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19) RETURNING *;

 -- name: UpdateWorkspaceAppHealthByID :exec
 UPDATE
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
 sharingLevel = database.AppSharingLevelPublic
 }

 displayGroup := sql.NullString{
 Valid:  app.Group != "",
 String: app.Group,
 }

 openIn := database.WorkspaceAppOpenInSlimWindow
 switch app.OpenIn {
 case sdkproto.AppOpenIn_TAB:
 Health:               health,
 // #nosec G115 - Order represents a display order value that's always small and fits in int32
 DisplayOrder: int32(app.Order),
 DisplayGroup: displayGroup,
 Hidden:       app.Hidden,
 OpenIn:       openIn,
 })
diff --git a/codersdk/workspaceapps.go b/codersdk/workspaceapps.go
 // Healthcheck specifies the configuration for checking app health.
 Healthcheck Healthcheck        `json:"healthcheck,omitempty"`
 Health      WorkspaceAppHealth `json:"health"`
 Group       string             `json:"group,omitempty"`
 Hidden      bool               `json:"hidden"`
 OpenIn      WorkspaceAppOpenIn `json:"open_in"`
Original file line number	Diff line number	Diff line change
Expand Up		@@ -525,6 +525,7 @@ func Apps(dbApps []database.WorkspaceApp, statuses []database.WorkspaceAppStatus
		Threshold: dbApp.HealthcheckThreshold,
		},
		Health: codersdk.WorkspaceAppHealth(dbApp.Health),
		Group: dbApp.DisplayGroup.String,
		Hidden: dbApp.Hidden,
		OpenIn: codersdk.WorkspaceAppOpenIn(dbApp.OpenIn),
		Statuses: WorkspaceAppStatuses(statuses),
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -748,6 +748,7 @@ func WorkspaceApp(t testing.TB, db database.Store, orig database.WorkspaceApp) d
		HealthcheckThreshold: takeFirst(orig.HealthcheckThreshold, 60),
		Health: takeFirst(orig.Health, database.WorkspaceAppHealthHealthy),
		DisplayOrder: takeFirst(orig.DisplayOrder, 1),
		DisplayGroup: orig.DisplayGroup,
		Hidden: orig.Hidden,
		OpenIn: takeFirst(orig.OpenIn, database.WorkspaceAppOpenInSlimWindow),
		})
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		alter table workspace_apps drop column display_group;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		alter table workspace_apps add column display_group text;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,10 +30,11 @@ INSERT INTO
		health,
		display_order,
		hidden,
		open_in
		open_in,
		display_group
		)
		VALUES
		($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18) RETURNING *;
		($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19) RETURNING *;

		-- name: UpdateWorkspaceAppHealthByID :exec
		UPDATE
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2419,6 +2419,11 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
		sharingLevel = database.AppSharingLevelPublic
		}

		displayGroup := sql.NullString{
		Valid: app.Group != "",
		String: app.Group,
		}

		openIn := database.WorkspaceAppOpenInSlimWindow
		switch app.OpenIn {
		case sdkproto.AppOpenIn_TAB:
Expand DownExpand Up		@@ -2451,6 +2456,7 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
		Health: health,
		// #nosec G115 - Order represents a display order value that's always small and fits in int32
		DisplayOrder: int32(app.Order),
		DisplayGroup: displayGroup,
		Hidden: app.Hidden,
		OpenIn: openIn,
		})
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -83,6 +83,7 @@ type WorkspaceApp struct {
		// Healthcheck specifies the configuration for checking app health.
		Healthcheck Healthcheck `json:"healthcheck,omitempty"`
		Health WorkspaceAppHealth `json:"health"`
		Group string `json:"group,omitempty"`
		Hidden bool `json:"hidden"`
		OpenIn WorkspaceAppOpenIn `json:"open_in"`

Expand Down