Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions frontends/main/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,16 @@ const nextConfig = {
},
]
},
async redirects() {
return [
{
// can be removed once fastly redirect is in place
source: "/attach/:code",
destination: "/enrollmentcode/:code",
permanent: true,
},
]
},

async headers() {
return [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from "api/mitxonline-test-utils"
import * as commonUrls from "@/common/urls"
import { Permission } from "api/hooks/user"
import B2BAttachPage from "./B2BAttachPage"
import EnrollmentCodePage from "./EnrollmentCodePage"
import invariant from "tiny-invariant"

// Mock next-nprogress-bar for App Router
Expand All @@ -19,7 +19,7 @@ jest.mock("next-nprogress-bar", () => ({
}),
}))

describe("B2BAttachPage", () => {
describe("EnrollmentCodePage", () => {
beforeEach(() => {
jest.clearAllMocks()
mockPush.mockClear()
Expand All @@ -33,7 +33,7 @@ describe("B2BAttachPage", () => {
setMockResponse.get(mitxOnlineUrls.userMe.get(), null)
setMockResponse.post(b2bUrls.b2bAttach.b2bAttachView("test-code"), [])

renderWithProviders(<B2BAttachPage code="test-code" />, {
renderWithProviders(<EnrollmentCodePage code="test-code" />, {
url: commonUrls.B2B_ATTACH_VIEW,
})

Expand Down Expand Up @@ -64,7 +64,7 @@ describe("B2BAttachPage", () => {

setMockResponse.post(b2bUrls.b2bAttach.b2bAttachView("test-code"), [])

renderWithProviders(<B2BAttachPage code="test-code" />, {
renderWithProviders(<EnrollmentCodePage code="test-code" />, {
url: commonUrls.B2B_ATTACH_VIEW,
})
})
Expand Down Expand Up @@ -92,7 +92,7 @@ describe("B2BAttachPage", () => {

setMockResponse.post(b2bUrls.b2bAttach.b2bAttachView("test-code"), [])

renderWithProviders(<B2BAttachPage code="test-code" />, {
renderWithProviders(<EnrollmentCodePage code="test-code" />, {
url: commonUrls.B2B_ATTACH_VIEW,
})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { userQueries } from "api/hooks/user"
import { useQuery } from "@tanstack/react-query"
import { useRouter } from "next-nprogress-bar"

type B2BAttachPageProps = {
type EnrollmentCodePage = {
code: string
}

Expand All @@ -17,7 +17,7 @@ const InterstitialMessage = styled(Typography)(({ theme }) => ({
textAlign: "center",
}))

const B2BAttachPage: React.FC<B2BAttachPageProps> = ({ code }) => {
const EnrollmentCodePage: React.FC<EnrollmentCodePage> = ({ code }) => {
const {
mutate: attach,
isSuccess,
Expand Down Expand Up @@ -79,4 +79,4 @@ const B2BAttachPage: React.FC<B2BAttachPageProps> = ({ code }) => {
)
}

export default B2BAttachPage
export default EnrollmentCodePage
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@ import React from "react"
import { Metadata } from "next"
import { standardizeMetadata } from "@/common/metadata"
import invariant from "tiny-invariant"
import B2BAttachPage from "@/app-pages/B2BAttachPage/B2BAttachPage"
import EnrollmentCodePage from "@/app-pages/EnrollmentCodePage/EnrollmentCodePage"

export const metadata: Metadata = standardizeMetadata({
title: "Use Enrollment Code",
})

const Page: React.FC<PageProps<"/attach/[code]">> = async ({ params }) => {
const Page: React.FC<PageProps<"/enrollmentcode/[code]">> = async ({
params,
}) => {
const resolved = await params
invariant(resolved?.code, "code is required")
return <B2BAttachPage code={resolved?.code} />
return <EnrollmentCodePage code={resolved?.code} />
}

export default Page
2 changes: 1 addition & 1 deletion frontends/main/src/common/urls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ export const auth = (opts: LoginUrlOpts) => {

export const ECOMMERCE_CART = "/cart/" as const

export const B2B_ATTACH_VIEW = "/attach/[code]"
export const B2B_ATTACH_VIEW = "/enrollmentcode/[code]"
export const b2bAttachView = (code: string) =>
generatePath(B2B_ATTACH_VIEW, { code: code })

Expand Down
Loading