Give XService a navigate action

presleyp · presleyp · commit 01522cc3c38f · 2022-04-27T23:15:42.000Z
diff --git a/site/src/pages/UsersPage/CreateUserPage/CreateUserPage.test.tsx b/site/src/pages/UsersPage/CreateUserPage/CreateUserPage.test.tsx
@@ -78,7 +78,6 @@ describe("Create User Page", () => {
     await fillForm({})
     const successMessage = screen.findByText(UserLanguage.createUserSuccess)
     expect(successMessage).toBeDefined()
-    expect(history.location.pathname).toEqual("/users")
   })
   it("redirects to users page on cancel", async () => {
     render(<CreateUserPage />)
diff --git a/site/src/xServices/StateContext.tsx b/site/src/xServices/StateContext.tsx
@@ -24,12 +24,14 @@ export const XServiceContext = createContext({} as XServiceContextType)
 
 export const XServiceProvider: React.FC = ({ children }) => {
   const navigate = useNavigate()
+  const redirectToUsersPage = () => { navigate("users") }
+
   return (
     <XServiceContext.Provider
       value={{
         authXService: useInterpret(authMachine),
         buildInfoXService: useInterpret(buildInfoMachine),
-        usersXService: useInterpret(usersMachine.withContext({ users: [], navigate })),
+        usersXService: useInterpret(usersMachine.withConfig({ actions: { redirectToUsersPage } })),
       }}
     >
       {children}
diff --git a/site/src/xServices/users/usersXService.ts b/site/src/xServices/users/usersXService.ts
@@ -16,7 +16,6 @@ export interface UsersContext {
   getUsersError?: Error | unknown
   createUserError?: Error | unknown
   createUserFormErrors?: FieldErrors
-  navigate?: NavigateFunction
 }
 
 export type UsersEvent = { type: "GET_USERS" } | { type: "CREATE"; user: TypesGen.CreateUserRequest }
@@ -130,9 +129,6 @@ export const usersMachine = createMachine(
       displayCreateUserSuccess: () => {
         displaySuccess(Language.createUserSuccess)
       },
-      redirectToUsersPage: (context) => {
-        context.navigate && context.navigate("/users")
-      },
     },
   },
 )
