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

Show file tree
Hide file tree
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
fmt
  • Loading branch information
@coadler
coadler committed Oct 10, 2022
commit ae7b62fd3a3135152d51e62a89c2692dba4a2b2c
5 changes: 4 additions & 1 deletion site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ export const WorkspacesPageView: FC<
const presetFilters = [
{ query: workspaceFilterQuery.me, name: Language.yourWorkspacesButton },
{ query: workspaceFilterQuery.all, name: Language.allWorkspacesButton },
{ query: workspaceFilterQuery.running, name: Language.runningWorkspacesButton },
{
query: workspaceFilterQuery.running,
name: Language.runningWorkspacesButton,
},
]

return (
Expand Down
15 changes: 11 additions & 4 deletions site/src/xServices/workspaces/workspacesXService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,18 +321,24 @@ export const workspacesMachine = createMachine(
assignUpdatedWorkspaceRefs: assign({
workspaceRefs: (_, event) => {
const newWorkspaceRefs = event.data.newWorkspaces.map((workspace) =>
spawn(workspaceItemMachine.withContext({ data: workspace }), workspace.id),
spawn(
workspaceItemMachine.withContext({ data: workspace }),
workspace.id,
),
)
return event.data.refsToKeep.concat(newWorkspaceRefs)
},
}),
},
services: {
getWorkspaces: (context) => API.getWorkspaces(queryToFilter(context.filter)),
getWorkspaces: (context) =>
API.getWorkspaces(queryToFilter(context.filter)),
updateWorkspaceRefs: (context, event) => {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I can understand what is happening here but I would add a comment about the refsToKeep and what the ref.stop is doing. Also, do we need to make this a service since it does not run any async ops.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I made it a service because we don't want to do stop and send in an assign action, and it's okay in another action, but then it's harder to send data from one action to the next (which is by design, I think). I think I would need to save refsToKeep and newWorkspaces in context, and that felt like clutter.

const refsToKeep: WorkspaceItemMachineRef[] = []
context.workspaceRefs?.forEach((ref) => {
const matchingWorkspace = event.data.find((workspace) => ref.id === workspace.id)
const matchingWorkspace = event.data.find(
(workspace) => ref.id === workspace.id,
)
if (matchingWorkspace) {
// if a workspace machine reference describes a workspace that has not been deleted,
// update its data and mark it as a refToKeep
Expand All @@ -345,7 +351,8 @@ export const workspacesMachine = createMachine(
})

const newWorkspaces = event.data.filter(
(workspace) => !context.workspaceRefs?.find((ref) => ref.id === workspace.id),
(workspace) =>
!context.workspaceRefs?.find((ref) => ref.id === workspace.id),
)

return Promise.resolve({
Expand Down