Skip to content

feat: filter for running workspaces #4157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Oct 11, 2022
Merged

feat: filter for running workspaces #4157

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ad65d06
Refactor workspaces xservice
presleyp Sep 22, 2022
64b6ad0
Remove layout comment
presleyp Sep 22, 2022
0b06177
Format
presleyp Sep 22, 2022
ac75c71
Add comments
presleyp Sep 27, 2022
de87700
Merge branch 'main' into running-workspaces/presleyp/3655
presleyp Oct 3, 2022
d9d81f8
Add running workspaces filter to frontend
presleyp Oct 3, 2022
f0c53a7
Start on backend - add status to filter
presleyp Oct 4, 2022
8500dbf
Update sql and add test - wip
presleyp Oct 5, 2022
3716cef
Attempt to unconvert status for easier querying
presleyp Oct 5, 2022
0cc1024
Fix syntax
presleyp Oct 5, 2022
3841153
Join jobs table, untested
presleyp Oct 6, 2022
1a2cc6d
sql
coadler Oct 6, 2022
da658d1
Merge branch 'main' into running-workspaces/presleyp/3655
presleyp Oct 10, 2022
b7f4c92
Add Status to GetAuthorizedWorkspaces
presleyp Oct 10, 2022
71be349
Update job tests to have canceled time
presleyp Oct 10, 2022
0cb5648
Merge branch 'main' into running-workspaces/presleyp/3655
presleyp Oct 10, 2022
ae7b62f
fmt
coadler Oct 10, 2022
b330c37
Merge branch 'main' into running-workspaces/presleyp/3655
coadler Oct 10, 2022
0a9f667
add status filter to database fake
coadler Oct 10, 2022
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
Prev Previous commit
Next Next commit
Attempt to unconvert status for easier querying
  • Loading branch information
@presleyp
presleyp committed Oct 5, 2022
commit 3716cef17bd97801f2a78c1f4ae771b343883fd2
18 changes: 17 additions & 1 deletion coderd/workspaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,6 +1034,20 @@ func convertStatus(build codersdk.WorkspaceBuild) codersdk.WorkspaceStatus {
return codersdk.WorkspaceStatusFailed
}

func unconvertStatus(status codersdk.WorkspaceStatus) (codersdk.WorkspaceTransition, codersdk.ProvisionerJobStatus) {
switch status {
case codersdk.WorkspaceStatusDeleted:
return codersdk.WorkspaceTransitionDelete, codersdk.ProvisionerJobSucceeded
case codersdk.WorkspaceStatusRunning
return codersdk.WorkspaceTransitionStart, codersdk.ProvisionerJobSucceeded
case codersdk.WorkspaceStatusStopped
return codersdk.WorkspaceTransitionStop, codersdk.ProvisionerJobSucceeded
}

// it's either not a valid status, or one we can't reverse engineer with certainty
return "" ""
}

func convertWorkspaceTTLMillis(i sql.NullInt64) *int64 {
if !i.Valid {
return nil
Expand Down Expand Up @@ -1150,12 +1164,14 @@ func workspaceSearchQuery(query string) (database.GetWorkspacesParams, []codersd
// Using the query param parser here just returns consistent errors with
// other parsing.
parser := httpapi.NewQueryParamParser()
transition, job_status := unconvertStatus(parser.String(searchParams, "", "status"))
filter := database.GetWorkspacesParams{
Deleted: false,
OwnerUsername: parser.String(searchParams, "", "owner"),
TemplateName: parser.String(searchParams, "", "template"),
Name: parser.String(searchParams, "", "name"),
Status: parser.String(searchParams, "", "status"),
Transition: transition,
JobStatus: job_status,
}

return filter, parser.Errors
Expand Down