Skip to content

fix: disable setup page once setup has been completed #9198

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 12 commits into from
Aug 22, 2023
Merged

fix: disable setup page once setup has been completed #9198

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a036479
fix: disable setup page once setup has been completed
aslilac Aug 18, 2023
550d741
I think I just need to mock this...
aslilac Aug 18, 2023
7c8e3e6
provide router during tests
aslilac Aug 18, 2023
3a0b36f
even better
aslilac Aug 18, 2023
42ab082
wait
aslilac Aug 18, 2023
089ea8f
am I getting warmer?
aslilac Aug 18, 2023
82f08a4
try a simpler approach
aslilac Aug 22, 2023
d52b6b7
this is still failing but I just need to see a diff
aslilac Aug 22, 2023
ea70289
I'm good at testing I swear!!
aslilac Aug 22, 2023
166b98f
I'm silly!!!!
aslilac Aug 22, 2023
1777275
Merge branch 'main' into disable-setup-page-after-setup
aslilac Aug 22, 2023
3e0976d
YAY
aslilac Aug 22, 2023
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
try a simpler approach
  • Loading branch information
@aslilac
aslilac committed Aug 22, 2023
commit 82f08a40dba870cf1e14c6e1761c644c6cdab7fc
28 changes: 9 additions & 19 deletions site/src/pages/SetupPage/SetupPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import { fireEvent, screen, waitFor } from "@testing-library/react"
import userEvent from "@testing-library/user-event"
import { rest } from "msw"
import {
renderWithAuth,
waitForLoaderToBeRemoved,
} from "testHelpers/renderHelpers"
import { render, waitForLoaderToBeRemoved } from "testHelpers/renderHelpers"
import { server } from "testHelpers/server"
import { SetupPage } from "./SetupPage"
import { Language as PageViewLanguage } from "./SetupPageView"
Expand All @@ -19,13 +16,9 @@ const fillForm = async ({
email?: string
password?: string
} = {}) => {
const usernameField = await screen.findByLabelText(
PageViewLanguage.usernameLabel,
)
const emailField = await screen.findByLabelText(PageViewLanguage.emailLabel)
const passwordField = await screen.findByLabelText(
PageViewLanguage.passwordLabel,
)
const usernameField = screen.getByLabelText(PageViewLanguage.usernameLabel)
const emailField = screen.getByLabelText(PageViewLanguage.emailLabel)
const passwordField = screen.getByLabelText(PageViewLanguage.passwordLabel)
await userEvent.type(usernameField, username)
await userEvent.type(emailField, email)
await userEvent.type(passwordField, password)
Expand All @@ -52,8 +45,7 @@ describe("Setup Page", () => {
})

it("shows validation error message", async () => {
renderWithAuth(<SetupPage />, { route: "/setup", path: "/setup" })
await waitForLoaderToBeRemoved()
render(<SetupPage />)
await fillForm({ email: "test" })
const errorMessage = await screen.findByText(PageViewLanguage.emailInvalid)
expect(errorMessage).toBeDefined()
Expand All @@ -78,8 +70,7 @@ describe("Setup Page", () => {
}),
)

renderWithAuth(<SetupPage />, { route: "/setup", path: "/setup" })
await waitForLoaderToBeRemoved()
render(<SetupPage />)
await fillForm()
const errorMessage = await screen.findByText(fieldErrorMessage)
expect(errorMessage).toBeDefined()
Expand All @@ -93,7 +84,7 @@ describe("Setup Page", () => {
}),
)

renderWithAuth(<SetupPage />, { route: "/setup", path: "/setup" })
render(<SetupPage />)
await waitForLoaderToBeRemoved()
await waitFor(() => expect(window.location).toBeAt("/login"))
})
Expand All @@ -109,10 +100,9 @@ describe("Setup Page", () => {
}),
)

renderWithAuth(<SetupPage />, { route: "/setup", path: "/setup" })
await waitForLoaderToBeRemoved()

render(<SetupPage />)
await fillForm()
await waitForLoaderToBeRemoved()
await waitFor(() => expect(window.location).toBeAt("/workspaces"))
})
})
31 changes: 15 additions & 16 deletions site/src/pages/SetupPage/SetupPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { useMachine } from "@xstate/react"
import { useAuth } from "components/AuthProvider/AuthProvider"
import { FC, useEffect } from "react"
import { FC } from "react"
import { Helmet } from "react-helmet-async"
import { pageTitle } from "utils/page"
import { setupMachine } from "xServices/setup/setupXService"
import { SetupPageView } from "./SetupPageView"
import { useNavigate } from "react-router-dom"
import { Navigate } from "react-router-dom"

export const SetupPage: FC = () => {
const [authState, authSend] = useAuth()
Expand All @@ -24,22 +24,21 @@ export const SetupPage: FC = () => {
},
})
const { error } = setupState.context
const navigate = useNavigate()

useEffect(() => {
// If the user is logged in, navigate to the app
if (authState.matches("signedIn")) {
navigate("/", { state: { isRedirect: true } })
}
const userIsSignedIn = authState.matches("signedIn")
const setupIsComplete =
!authState.matches("loadingInitialAuthData") &&
!authState.matches("configuringTheFirstUser")

// If we've already completed setup, navigate to the login page
if (
!authState.matches("loadingInitialAuthData") &&
!authState.matches("configuringTheFirstUser")
) {
navigate("/login", { state: { isRedirect: true } })
}
}, [authState, navigate])
// If the user is logged in, navigate to the app
if (userIsSignedIn) {
return <Navigate to="/" state={{ isRedirect: true }} />
}

// If we've already completed setup, navigate to the login page
if (setupIsComplete) {
return <Navigate to="/login" state={{ isRedirect: true }} />
}

return (
<>
Expand Down