chore(codersdk): remove NeedsUserAttention and Icon from WorkspaceAppStatus

johnstcn · johnstcn · commit caebbac87073 · 2025-04-11T11:52:22.000+01:00
diff --git a/coderd/database/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go
@@ -537,16 +537,14 @@ func WorkspaceAppStatuses(statuses []database.WorkspaceAppStatus) []codersdk.Wor
 
 func WorkspaceAppStatus(status database.WorkspaceAppStatus) codersdk.WorkspaceAppStatus {
 	return codersdk.WorkspaceAppStatus{
-		ID:                 status.ID,
-		CreatedAt:          status.CreatedAt,
-		WorkspaceID:        status.WorkspaceID,
-		AgentID:            status.AgentID,
-		AppID:              status.AppID,
-		NeedsUserAttention: status.NeedsUserAttention,
-		URI:                status.Uri.String,
-		Icon:               status.Icon.String,
-		Message:            status.Message,
-		State:              codersdk.WorkspaceAppStatusState(status.State),
+		ID:          status.ID,
+		CreatedAt:   status.CreatedAt,
+		WorkspaceID: status.WorkspaceID,
+		AgentID:     status.AgentID,
+		AppID:       status.AppID,
+		URI:         status.Uri.String,
+		Message:     status.Message,
+		State:       codersdk.WorkspaceAppStatusState(status.State),
 	}
 }
 
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -9783,16 +9783,14 @@ func (q *FakeQuerier) InsertWorkspaceAppStatus(_ context.Context, arg database.I
 	defer q.mutex.Unlock()
 
 	status := database.WorkspaceAppStatus{
-		ID:                 arg.ID,
-		CreatedAt:          arg.CreatedAt,
-		WorkspaceID:        arg.WorkspaceID,
-		AgentID:            arg.AgentID,
-		AppID:              arg.AppID,
-		NeedsUserAttention: arg.NeedsUserAttention,
-		State:              arg.State,
-		Message:            arg.Message,
-		Uri:                arg.Uri,
-		Icon:               arg.Icon,
+		ID:          arg.ID,
+		CreatedAt:   arg.CreatedAt,
+		WorkspaceID: arg.WorkspaceID,
+		AgentID:     arg.AgentID,
+		AppID:       arg.AppID,
+		State:       arg.State,
+		Message:     arg.Message,
+		Uri:         arg.Uri,
 	}
 	q.workspaceAppStatuses = append(q.workspaceAppStatuses, status)
 	return status, nil
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000317_workspace_app_status_drop_fields.down.sql b/coderd/database/migrations/000317_workspace_app_status_drop_fields.down.sql
@@ -0,0 +1,3 @@
+ALTER TABLE ONLY workspace_app_statuses
+		ADD COLUMN IF NOT EXISTS needs_user_attention BOOLEAN NOT NULL DEFAULT FALSE,
+		ADD COLUMN IF NOT EXISTS icon TEXT;
diff --git a/coderd/database/migrations/000317_workspace_app_status_drop_fields.up.sql b/coderd/database/migrations/000317_workspace_app_status_drop_fields.up.sql
@@ -0,0 +1,3 @@
+ALTER TABLE ONLY workspace_app_statuses
+	DROP COLUMN IF EXISTS needs_user_attention,
+	DROP COLUMN IF EXISTS icon;
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
@@ -44,8 +44,8 @@ WHERE
 	id = $1;
 
 -- name: InsertWorkspaceAppStatus :one
-INSERT INTO workspace_app_statuses (id, created_at, workspace_id, agent_id, app_id, state, message, needs_user_attention, uri, icon)
-VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
+INSERT INTO workspace_app_statuses (id, created_at, workspace_id, agent_id, app_id, state, message, uri)
+VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
 RETURNING *;
 
 -- name: GetWorkspaceAppStatusesByAppIDs :many
@@ -54,6 +54,6 @@ SELECT * FROM workspace_app_statuses WHERE app_id = ANY(@ids :: uuid [ ]);
 -- name: GetLatestWorkspaceAppStatusesByWorkspaceIDs :many
 SELECT DISTINCT ON (workspace_id)
   *
-FROM workspace_app_statuses 
+FROM workspace_app_statuses
 WHERE workspace_id = ANY(@ids :: uuid[])
 ORDER BY workspace_id, created_at DESC;
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -366,11 +366,6 @@ func (api *API) patchWorkspaceAgentAppStatus(rw http.ResponseWriter, r *http.Req
 			String: req.URI,
 			Valid:  req.URI != "",
 		},
-		Icon: sql.NullString{
-			String: req.Icon,
-			Valid:  req.Icon != "",
-		},
-		NeedsUserAttention: req.NeedsUserAttention,
 	})
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
diff --git a/codersdk/workspaceapps.go b/codersdk/workspaceapps.go
@@ -100,18 +100,15 @@ type Healthcheck struct {
 }
 
 type WorkspaceAppStatus struct {
-	ID                 uuid.UUID               `json:"id" format:"uuid"`
-	CreatedAt          time.Time               `json:"created_at" format:"date-time"`
-	WorkspaceID        uuid.UUID               `json:"workspace_id" format:"uuid"`
-	AgentID            uuid.UUID               `json:"agent_id" format:"uuid"`
-	AppID              uuid.UUID               `json:"app_id" format:"uuid"`
-	State              WorkspaceAppStatusState `json:"state"`
-	NeedsUserAttention bool                    `json:"needs_user_attention"`
-	Message            string                  `json:"message"`
+	ID          uuid.UUID               `json:"id" format:"uuid"`
+	CreatedAt   time.Time               `json:"created_at" format:"date-time"`
+	WorkspaceID uuid.UUID               `json:"workspace_id" format:"uuid"`
+	AgentID     uuid.UUID               `json:"agent_id" format:"uuid"`
+	AppID       uuid.UUID               `json:"app_id" format:"uuid"`
+	State       WorkspaceAppStatusState `json:"state"`
+	Message     string                  `json:"message"`
 	// URI is the URI of the resource that the status is for.
 	// e.g. https://github.com/org/repo/pull/123
 	// e.g. file:///path/to/file
 	URI string `json:"uri"`
-	// Icon is an external URL to an icon that will be rendered in the UI.
-	Icon string `json:"icon"`
 }
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -984,8 +984,6 @@ export const MockWorkspaceAppStatus: TypesGen.WorkspaceAppStatus = {
 	agent_id: "test-workspace-agent",
 	workspace_id: "test-workspace",
 	app_id: MockWorkspaceApp.id,
-	needs_user_attention: false,
-	icon: "/emojis/1f957.png",
 	uri: "https://github.com/coder/coder/pull/1234",
 	message: "Your competitors page is completed!",
 	state: "complete",

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+ALTER TABLE ONLY workspace_app_statuses`
	`2`	`+ ADD COLUMN IF NOT EXISTS needs_user_attention BOOLEAN NOT NULL DEFAULT FALSE,`
	`3`	`+ ADD COLUMN IF NOT EXISTS icon TEXT;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+ALTER TABLE ONLY workspace_app_statuses`
	`2`	`+ DROP COLUMN IF EXISTS needs_user_attention,`
	`3`	`+ DROP COLUMN IF EXISTS icon;`