synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-15 22:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Setup redirect state (#5759)

Browse Source
This commit is contained in:
Bruno Quaresma
2023-01-18 12:28:46 -03:00
committed by GitHub
parent 501cfa9e8d
commit 6252f782d8
5 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
site/jest.setup.ts
View File

@ -3,6 +3,7 @@ import { cleanup } from "@testing-library/react"
import crypto from "crypto" import crypto from "crypto"
import * as util from "util" import * as util from "util"
import { server } from "./src/testHelpers/server" import { server } from "./src/testHelpers/server"
import "jest-location-mock"
// Polyfill the getRandomValues that is used on utils/random.ts // Polyfill the getRandomValues that is used on utils/random.ts
Object.defineProperty(global.self, "crypto", { Object.defineProperty(global.self, "crypto", {

1
site/package.json
View File

@ -55,6 +55,7 @@
"front-matter": "4.0.2", "front-matter": "4.0.2",
"history": "5.3.0", "history": "5.3.0",
"i18next": "21.9.1", "i18next": "21.9.1",
"jest-location-mock": "1.0.9",
"js-untar": "2.0.0", "js-untar": "2.0.0",
"just-debounce-it": "3.1.1", "just-debounce-it": "3.1.1",
"playwright": "^1.29.2", "playwright": "^1.29.2",

4
site/src/pages/SetupPage/SetupPage.test.tsx
View File

@ -94,8 +94,6 @@ describe("Setup Page", () => {
) )
await fillForm() await fillForm()
await waitFor(() => await waitFor(() => expect(window.location).toBeAt("/workspaces"))
expect(history.location.pathname).toEqual("/workspaces"),
)
}) })
}) })

6
site/src/pages/SetupPage/SetupPage.tsx
View File

@ -1,14 +1,12 @@
import { useActor, useMachine } from "@xstate/react" import { useActor, useMachine } from "@xstate/react"
import { FC, useContext, useEffect } from "react" import { FC, useContext, useEffect } from "react"
import { Helmet } from "react-helmet-async" import { Helmet } from "react-helmet-async"
import { useNavigate } from "react-router-dom"
import { pageTitle } from "util/page" import { pageTitle } from "util/page"
import { setupMachine } from "xServices/setup/setupXService" import { setupMachine } from "xServices/setup/setupXService"
import { XServiceContext } from "xServices/StateContext" import { XServiceContext } from "xServices/StateContext"
import { SetupPageView } from "./SetupPageView" import { SetupPageView } from "./SetupPageView"
export const SetupPage: FC = () => { export const SetupPage: FC = () => {
const navigate = useNavigate()
const xServices = useContext(XServiceContext) const xServices = useContext(XServiceContext)
const [authState, authSend] = useActor(xServices.authXService) const [authState, authSend] = useActor(xServices.authXService)
const [setupState, setupSend] = useMachine(setupMachine, { const [setupState, setupSend] = useMachine(setupMachine, {
@ -30,9 +28,9 @@ export const SetupPage: FC = () => {
useEffect(() => { useEffect(() => {
if (authState.matches("signedIn")) { if (authState.matches("signedIn")) {
return navigate("/workspaces") window.location.assign("/workspaces")
} }
}, [authState, navigate]) }, [authState])
return ( return (
<> <>

15
site/yarn.lock
View File

@ -1378,6 +1378,11 @@
resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
"@jedmao/location@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@jedmao/location/-/location-3.0.0.tgz#f2b24e937386f95252f3a1fefbf7ca2e0a4b87e9"
integrity sha512-p7mzNlgJbCioUYLUEKds3cQG4CHONVFJNYqMe6ocEtENCL/jYmMo1Q3ApwsMmU+L0ZkaDJEyv4HokaByLoPwlQ==
"@jest/console@^27.5.1": "@jest/console@^27.5.1":
version "27.5.1" version "27.5.1"
resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.5.1.tgz#260fe7239602fe5130a94f1aa386eff54b014bba" resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.5.1.tgz#260fe7239602fe5130a94f1aa386eff54b014bba"
@ -8671,7 +8676,7 @@ jest-config@^27.5.1:
slash "^3.0.0" slash "^3.0.0"
strip-json-comments "^3.1.1" strip-json-comments "^3.1.1"
jest-diff@^27.5.1: jest-diff@^27.0.1, jest-diff@^27.5.1:
version "27.5.1" version "27.5.1"
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz#a07f5011ac9e6643cf8a95a462b7b1ecf6680def" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz#a07f5011ac9e6643cf8a95a462b7b1ecf6680def"
integrity sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw== integrity sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==
@ -8839,6 +8844,14 @@ jest-leak-detector@^27.5.1:
jest-get-type "^27.5.1" jest-get-type "^27.5.1"
pretty-format "^27.5.1" pretty-format "^27.5.1"
jest-location-mock@1.0.9:
version "1.0.9"
resolved "https://registry.yarnpkg.com/jest-location-mock/-/jest-location-mock-1.0.9.tgz#f4466362423b273e12ca3716467a3d478ce78fa8"
integrity sha512-DN/v7Zsa3N4uGgWTCrMrPPxhZORr/4N5gi+u7Tk6sLdORYplrC0//wfFN5FOtx4ZdQzDVfY6rLa4d+wfTKzQHw==
dependencies:
"@jedmao/location" "^3.0.0"
jest-diff "^27.0.1"
jest-matcher-utils@^27.0.0, jest-matcher-utils@^27.5.1: jest-matcher-utils@^27.0.0, jest-matcher-utils@^27.5.1:
version "27.5.1" version "27.5.1"
resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz#9c0cdbda8245bc22d2331729d1091308b40cf8ab" resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz#9c0cdbda8245bc22d2331729d1091308b40cf8ab"