@@ -199,28 +199,39 @@ type tasksListResponse struct {
199
199
}
200
200
201
201
func mapTaskStatus (ws codersdk.Workspace ) codersdk.TaskStatus {
202
- if ws .LatestAppStatus != nil {
203
- switch ws .LatestAppStatus .State {
204
- case codersdk .WorkspaceAppStatusStateWorking :
205
- return codersdk .TaskStatusWorking
206
- case codersdk .WorkspaceAppStatusStateIdle :
207
- return codersdk .TaskStatusIdle
208
- case codersdk .WorkspaceAppStatusStateComplete :
209
- return codersdk .TaskStatusCompleted
210
- case codersdk .WorkspaceAppStatusStateFailure :
211
- return codersdk .TaskStatusFailed
202
+ switch ws .LatestBuild .Status {
203
+ case codersdk .WorkspaceStatusPending :
204
+ return codersdk .TaskStatusPending
205
+
206
+ case codersdk .WorkspaceStatusStarting :
207
+ return codersdk .TaskStatusStarting
208
+
209
+ case codersdk .WorkspaceStatusRunning :
210
+ if ws .LatestAppStatus != nil {
211
+ switch ws .LatestAppStatus .State {
212
+ case codersdk .WorkspaceAppStatusStateWorking :
213
+ return codersdk .TaskStatusWorking
214
+ case codersdk .WorkspaceAppStatusStateIdle :
215
+ return codersdk .TaskStatusIdle
216
+ case codersdk .WorkspaceAppStatusStateComplete :
217
+ return codersdk .TaskStatusCompleted
218
+ case codersdk .WorkspaceAppStatusStateFailure :
219
+ return codersdk .TaskStatusFailed
220
+ }
212
221
}
213
- }
222
+ return codersdk .TaskStatusStarting
223
+
224
+ case codersdk .WorkspaceStatusStopping , codersdk .WorkspaceStatusStopped :
225
+ return codersdk .TaskStatusStopping
226
+
227
+ case codersdk .WorkspaceStatusDeleting , codersdk .WorkspaceStatusDeleted :
228
+ return codersdk .TaskStatusDeleting
214
229
215
- switch ws .LatestBuild .Status {
216
- case codersdk .WorkspaceStatusPending , codersdk .WorkspaceStatusStarting , codersdk .WorkspaceStatusRunning :
217
- return codersdk .TaskStatusWorking
218
- case codersdk .WorkspaceStatusStopping , codersdk .WorkspaceStatusStopped , codersdk .WorkspaceStatusDeleting , codersdk .WorkspaceStatusDeleted :
219
- return codersdk .TaskStatusCompleted
220
230
case codersdk .WorkspaceStatusFailed , codersdk .WorkspaceStatusCanceling , codersdk .WorkspaceStatusCanceled :
221
231
return codersdk .TaskStatusFailed
232
+
222
233
default :
223
- return codersdk .TaskStatusWorking
234
+ return codersdk .TaskStatusPending
224
235
}
225
236
}
226
237
0 commit comments