cesnimda
acf60c2a07
Wave 6. Swaps react-scripts' build/dev tooling for Next.js while keeping the app's actual routing/rendering model unchanged -- the app is almost entirely behind auth with no proven SSR/SEO need, so a real App Router rewrite would touch ~90 files for zero user-visible benefit. - next.config.js: output:'export' (static HTML+JS, same "single index.html served by nginx with try_files fallback" deploy as CRA). - app/layout.tsx + app/page.tsx: root shell ports public/index.html's <head>, mounts the whole existing App tree client-only (ssr:false) since it reads window/localStorage during initial render and Next's static prerender would otherwise execute that on the server. - Renamed src/pages/ -> src/views/ (Next's Pages Router auto-detects any `pages/` dir under the app root and tried to build our React Router page components as its own routes). - REACT_APP_* -> NEXT_PUBLIC_* across code, .env.development, Dockerfile, docker-compose.yml build args. - Replaced the CRA SVGR import (`ReactComponent` from .svg, unsupported under Turbopack) with a small inline JobbjaktMark component. - TypeScript 4.9 -> 5.9 (MUI v8's type-checked build needs syntax 4.9's parser rejects; CRA never hit this because babel doesn't type-check). - Dropped CRA-only files (index.tsx, reportWebVitals, react-app-env.d.ts, public/index.html); kept react-scripts as the Jest test runner only (next/jest migration not needed -- the existing config already works). Verified: `next build` static export succeeds, `next dev` serves the landing page and client-side routes (login etc.) correctly, all 57 frontend tests + 172 backend tests still green. Known caveat: deep-linking straight to a sub-route (e.g. /login) 404s in `next dev` since there's no server route for it -- the app only ever mounts at "/". Production is unaffected: nginx's existing try_files fallback still serves index.html for any path.
50 lines
1.8 KiB
TypeScript
50 lines
1.8 KiB
TypeScript
import React from "react";
|
|
import "@testing-library/jest-dom";
|
|
import { render, screen, waitFor } from "@testing-library/react";
|
|
import userEvent from "@testing-library/user-event";
|
|
import { MemoryRouter, Route, Routes, useLocation } from "react-router-dom";
|
|
import { api } from "./api";
|
|
import LandingPage from "./views/LandingPage";
|
|
|
|
jest.mock("./api", () => ({
|
|
api: {
|
|
get: jest.fn(),
|
|
post: jest.fn(),
|
|
interceptors: { request: { use: jest.fn() }, response: { use: jest.fn() } },
|
|
},
|
|
}));
|
|
|
|
const mockedApi = api as jest.Mocked<typeof api>;
|
|
|
|
function LoginStub() {
|
|
const location = useLocation() as { state?: { from?: string } };
|
|
return <div>login page, from={location.state?.from ?? "none"}</div>;
|
|
}
|
|
|
|
// Regression check for the auth-guard fix: a protected route bounces an
|
|
// unauthenticated visitor to "/" with `state.from` set to the page they
|
|
// wanted. The home page must forward that state to /login so sign-in
|
|
// returns them to the originally-requested page instead of dropping them
|
|
// on /jobs.
|
|
describe("LandingPage forwards deep-link intent to /login", () => {
|
|
it("preserves location.state.from through the Sign in CTA", async () => {
|
|
mockedApi.get.mockRejectedValueOnce(new Error("401")); // /auth/me: not signed in
|
|
|
|
render(
|
|
<MemoryRouter initialEntries={[{ pathname: "/", state: { from: "/jobs/42" } }]}>
|
|
<Routes>
|
|
<Route path="/" element={<LandingPage />} />
|
|
<Route path="/login" element={<LoginStub />} />
|
|
</Routes>
|
|
</MemoryRouter>,
|
|
);
|
|
|
|
await waitFor(() => expect(mockedApi.get).toHaveBeenCalledWith("/auth/me"));
|
|
|
|
const signInButtons = await screen.findAllByText("Sign in", { selector: "button" });
|
|
await userEvent.click(signInButtons[0]);
|
|
|
|
expect(await screen.findByText("login page, from=/jobs/42")).toBeInTheDocument();
|
|
});
|
|
});
|