fix: Workspace default filter on search bar (#4111)

BrunoQuaresma · web-flow · commit 3e4b67893e9d · 2022-09-19T13:27:41.000-03:00
diff --git a/site/src/pages/WorkspacesPage/WorkspacesPage.tsx b/site/src/pages/WorkspacesPage/WorkspacesPage.tsx
@@ -8,18 +8,22 @@ import { workspacesMachine } from "xServices/workspaces/workspacesXService"
 import { WorkspacesPageView } from "./WorkspacesPageView"
 
 const WorkspacesPage: FC = () => {
-  const [workspacesState, send] = useMachine(workspacesMachine)
   const [searchParams, setSearchParams] = useSearchParams()
+  const filter = searchParams.get("filter")
+  const defaultFilter = filter ?? workspaceFilterQuery.me
+  const [workspacesState, send] = useMachine(workspacesMachine, {
+    context: {
+      filter: defaultFilter,
+    },
+  })
+
   const { workspaceRefs } = workspacesState.context
 
   // On page load, populate the table with workspaces
   useEffect(() => {
-    const filter = searchParams.get("filter")
-    const query = filter ?? workspaceFilterQuery.me
-
     send({
       type: "GET_WORKSPACES",
-      query,
+      query: defaultFilter,
     })
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
diff --git a/site/src/xServices/workspaces/workspacesXService.ts b/site/src/xServices/workspaces/workspacesXService.ts
@@ -187,7 +187,7 @@ export type WorkspaceItemMachineRef = ActorRefFrom<typeof workspaceItemMachine>
 
 interface WorkspacesContext {
   workspaceRefs?: WorkspaceItemMachineRef[]
-  filter?: string
+  filter: string
   getWorkspacesError?: Error | unknown
 }
 

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ export type WorkspaceItemMachineRef = ActorRefFrom<typeof workspaceItemMachine>`
`187`	`187`
`188`	`188`	`interface WorkspacesContext {`
`189`	`189`	`workspaceRefs?: WorkspaceItemMachineRef[]`
`190`		`- filter?: string`
	`190`	`+ filter: string`
`191`	`191`	`getWorkspacesError?: Error \| unknown`
`192`	`192`	`}`
`193`	`193`