Merge remote-tracking branch 'origin/dev' into uof-dev-merge

Author: vas3a

src/apps/earn/src/earn.routes.tsx

@@ -1,6 +1,6 @@
 import { Navigate } from 'react-router-dom'
 
-import { ToolTitle } from '~/config'
+import { AppSubdomain, EnvironmentConfig, ToolTitle } from '~/config'
 import { lazyLoad, LazyLoadedComponent, PlatformRoute } from '~/libs/core'
 
 const EarnAppRoot: LazyLoadedComponent = lazyLoad(() => import('./EarnApp'))
@@ -36,19 +36,26 @@ const MyGigs: LazyLoadedComponent = lazyLoad(
     () => import('./routes/MyGigsPage'),
 )
 
-export enum EARN_APP_PATHS {
-    root = '/earn',
-    gigs = '/earn/gigs',
-    challenges = '/earn/challenges',
+export const rootRoute: string = (
+    EnvironmentConfig.SUBDOMAIN === AppSubdomain.earn ? '' : `/${AppSubdomain.earn}`
+)
+
+export const EARN_APP_PATHS: { [key: string]: string } = {
+    root: rootRoute,
+    gigs: `${rootRoute}/gigs`,
+    challenges: `${rootRoute}/challenges`,
 }
 
 export const toolTitle: string = ToolTitle.earn
-export const rootRoute: string = EARN_APP_PATHS.root
 export const absoluteRootRoute: string = `${window.location.origin}${EARN_APP_PATHS.root}`
 
 export const earnRoutes: ReadonlyArray<PlatformRoute> = [
     {
         children: [
+            {
+                element: <Navigate to={EARN_APP_PATHS.challenges} />,
+                route: '/',
+            },
             {
                 children: [],
                 element: <ChallengeList />,
@@ -92,12 +99,9 @@ export const earnRoutes: ReadonlyArray<PlatformRoute> = [
                 route: 'my-gigs',
             },
         ],
+        domain: AppSubdomain.earn,
         element: <EarnAppRoot />,
         id: toolTitle,
         route: rootRoute,
     },
-    {
-        element: <Navigate to={EARN_APP_PATHS.challenges} />,
-        route: rootRoute,
-    },
 ]

src/apps/learn/src/course-page-wrapper/CoursePage.context.tsx

@@ -48,7 +48,7 @@ export const CoursePageContextProvider: FC<CoursePageContextProviderProps> = pro
             const breadcrumbs: BreadcrumbItemModel[] = [
                 {
                     name: 'Topcoder Academy',
-                    url: rootRoute,
+                    url: rootRoute || '/',
                 },
                 ...(!parentTcaCert ? [] : [parentTcaCert]),
                 ...items,

src/apps/learn/src/learn.routes.tsx

@@ -4,6 +4,7 @@ import {
     lazyLoad,
     LazyLoadedComponent,
     PlatformRoute,
+    Rewrite,
 } from '~/libs/core'
 
 import { LearnConfig } from './config'
@@ -137,7 +138,7 @@ export function getTCACertificateUrl(
 export function getTCACertificationValidationUrl(
     completionUuid: string,
 ): string {
-    return `${EnvironmentConfig.PLATFORMUI_URL}${LEARN_PATHS.root}/${completionUuid}`
+    return `${absoluteRootRoute}/certificate/${completionUuid}`
 }
 
 export function getTCAUserCertificationUrl(
@@ -157,6 +158,15 @@ export function getAuthenticateAndEnrollRoute(): string {
     return `${authUrlLogin()}${encodeURIComponent(LEARN_PATHS.tcaEnroll)}`
 }
 
+const oldUrlRedirectRoute: ReadonlyArray<PlatformRoute> = EnvironmentConfig.SUBDOMAIN === AppSubdomain.tcAcademy ? [
+    {
+        children: [],
+        element: <Rewrite to='/*' />,
+        id: 'redirect-old-url',
+        route: '/learn/*',
+    },
+] : []
+
 export const learnRoutes: ReadonlyArray<PlatformRoute> = [
     {
         children: [
@@ -225,7 +235,7 @@ export const learnRoutes: ReadonlyArray<PlatformRoute> = [
                 children: [],
                 element: <ValidateTCACertificate />,
                 id: 'Hiring manager view - uuid param',
-                route: ':completionUuid',
+                route: 'certificate/:completionUuid',
             },
             {
                 children: [],
@@ -239,6 +249,7 @@ export const learnRoutes: ReadonlyArray<PlatformRoute> = [
                 id: 'Giring manager preview',
                 route: 'tca-certifications/:certification/preview',
             },
+            ...oldUrlRedirectRoute,
         ],
         domain: AppSubdomain.tcAcademy,
         element: <LearnAppRoot />,

src/apps/self-service/src/self-service.routes.tsx

@@ -1,8 +1,8 @@
 /* eslint-disable max-len */
 import { Navigate } from 'react-router-dom'
 
-import { ToolTitle } from '~/config'
-import { lazyLoad, LazyLoadedComponent, PlatformRoute } from '~/libs/core'
+import { AppSubdomain, EnvironmentConfig, ToolTitle } from '~/config'
+import { lazyLoad, LazyLoadedComponent, PlatformRoute, Rewrite } from '~/libs/core'
 
 import { Work, WorkIntakeFormRoutes, WorkStatus, WorkType } from './lib'
 import { bugHuntRoute, selfServiceRootRoute, selfServiceStartRoute, workDashboardRoute, workRootRoute } from './config'
@@ -54,6 +54,15 @@ export function workDetailRoute(workId: string, tab?: 'solutions' | 'messages'):
     return `${selfServiceRootRoute}/work-items/${workId}${!!tab ? `?tab=${tab}` : ''}`
 }
 
+const oldUrlRedirectRoute: ReadonlyArray<PlatformRoute> = EnvironmentConfig.SUBDOMAIN === AppSubdomain.work ? [
+    {
+        children: [],
+        element: <Rewrite to='/*' />,
+        id: 'redirect-old-url',
+        route: '/work/*',
+    },
+] : []
+
 export const selfServiceRoutes: ReadonlyArray<PlatformRoute> = [
     {
         element: <NotLoggedIn />,
@@ -85,6 +94,10 @@ export const selfServiceRoutes: ReadonlyArray<PlatformRoute> = [
     },
     {
         children: [
+            {
+                element: <Navigate to={selfServiceStartRoute} />,
+                route: '/',
+            },
             // Edit work item
             {
                 element: <SelfServiceWorkItem />,
@@ -159,4 +172,5 @@ export const selfServiceRoutes: ReadonlyArray<PlatformRoute> = [
         element: <Navigate to={workDashboardRoute} />,
         route: `${selfServiceRootRoute}/dashboard`,
     },
+    ...oldUrlRedirectRoute,
 ]

src/config/constants.ts

@@ -1,5 +1,6 @@
 export enum AppSubdomain {
     devCenter = 'devcenter',
+    earn = 'earn',
     gamificationAdmin = 'gamification-admin',
     tcAcademy = 'academy',
     work = 'work',

src/libs/core/lib/router/index.ts

@@ -2,3 +2,4 @@ export * from './router-context'
 export * from './routes-functions'
 export * from './platform-route.model'
 export * from './router.utils'
+export * from './rewrite-route'

src/libs/core/lib/router/rewrite-route.tsx

@@ -0,0 +1,24 @@
+import { get } from 'lodash'
+import { FC } from 'react'
+import { Navigate, Params, useParams } from 'react-router-dom'
+
+export interface RewriteProps {
+    to: string
+}
+
+/**
+ * Extends react-router-dom Navigate component to support rewriting of urls
+ * Eg. or rewrite rules:
+ * - /learn/* -> /* (redirects all learn pages to root)
+ */
+export const Rewrite: FC<RewriteProps> = props => {
+    const params: Params = useParams()
+    const rewriteTo: string = props.to.replace(
+        /(:[a-z0-9*]+)|\*/ig,
+        (match: string) => get(params, match.replace(':', ''), ''),
+    )
+
+    return (
+        <Navigate to={rewriteTo} />
+    )
+}