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

Author: vas3a

src/apps/dev-center/src/dev-center-pages/community-app/getting-started/GettingStartedGuide.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 
 import { Breadcrumb, BreadcrumbItemModel, ContentLayout } from '~/libs/ui'
 
-import { toolTitle } from '../../../dev-center.routes'
+import { rootRoute, toolTitle } from '../../../dev-center.routes'
 import { LayoutDocHeader, MarkdownDoc } from '../../../dev-center-lib/MarkdownDoc'
 import useMarkdown from '../../../dev-center-lib/hooks/useMarkdown'
 
@@ -12,7 +12,7 @@ import styles from './GettingStartedGuide.module.scss'
 export const GettingStartedGuide: React.FC = () => {
     const { doc, toc, title }: ReturnType<typeof useMarkdown> = useMarkdown({ uri: gettingStartedGuide })
     const breadcrumb: Array<BreadcrumbItemModel> = React.useMemo(() => [
-        { name: toolTitle, url: '/dev-center' },
+        { name: toolTitle, url: rootRoute || '/' },
         { name: title, url: '#' },
     ], [title])
 

src/apps/dev-center/src/dev-center-pages/community-app/landing-page/dev-center-get-started/GetStartedCardsContainer/GetStartedCardsContainer.tsx

@@ -4,6 +4,7 @@ import { LinkButton } from '~/libs/ui'
 
 import { ApiCornerIcon, ApiIcon, CommunityAppCornerIcon, CommunityAppIcon } from '../../../../../assets/i'
 import { DevCenterCard } from '../../dev-center-card'
+import { rootRoute } from '../../../../../dev-center.routes'
 
 import styles from './GetStartedCardsContainer.module.scss'
 
@@ -21,7 +22,7 @@ const GetStartedCardsContainer: FC = () => (
                     size='lg'
                     label='get started'
                     className={styles.button}
-                    to='/dev-center/getting-started'
+                    to={`${rootRoute}/getting-started`}
                 />
             )}
         />
@@ -37,7 +38,7 @@ const GetStartedCardsContainer: FC = () => (
                     size='lg'
                     label='get started'
                     className={styles.button}
-                    to='/dev-center/storybook'
+                    to={`${rootRoute}/storybook`}
                 />
             )}
         />

src/apps/dev-center/src/dev-center.routes.tsx

@@ -1,4 +1,4 @@
-import { ToolTitle } from '~/config'
+import { AppSubdomain, EnvironmentConfig, ToolTitle } from '~/config'
 import { lazyLoad, LazyLoadedComponent, PlatformRoute } from '~/libs/core'
 
 const Storybook: LazyLoadedComponent
@@ -12,6 +12,9 @@ const DevCenterLandingPage: LazyLoadedComponent
 
 const DevCenter: LazyLoadedComponent = lazyLoad(() => import('./DevCenter'))
 
+export const rootRoute: string = (
+    EnvironmentConfig.SUBDOMAIN === AppSubdomain.devCenter ? '' : `/${AppSubdomain.devCenter}`
+)
 export const toolTitle: string = ToolTitle.devCenter
 
 export const devCenterRoutes: ReadonlyArray<PlatformRoute> = [
@@ -30,8 +33,9 @@ export const devCenterRoutes: ReadonlyArray<PlatformRoute> = [
                 route: '/',
             },
         ],
+        domain: AppSubdomain.devCenter,
         element: <DevCenter />,
         id: toolTitle,
-        route: '/dev-center',
+        route: rootRoute,
     },
 ]

src/apps/gamification-admin/src/game-lib/hooks/use-gamification-breadcrumb.hook.tsx

@@ -1,14 +1,14 @@
 import { BreadcrumbItemModel } from '~/libs/ui'
 
-import { basePath } from '../../gamification-admin.routes'
 import { toolTitle } from '../../GamificationAdmin'
+import { rootRoute } from '../../gamification-admin.routes'
 
 export function useGamificationBreadcrumb(items: Array<BreadcrumbItemModel>): Array<BreadcrumbItemModel> {
 
     const breadcrumb: Array<BreadcrumbItemModel> = [
         {
             name: toolTitle,
-            url: basePath,
+            url: rootRoute || '/',
         },
         ...items,
     ]

src/apps/gamification-admin/src/gamification-admin.routes.tsx

@@ -1,3 +1,4 @@
+import { AppSubdomain, EnvironmentConfig } from '~/config'
 import { lazyLoad, LazyLoadedComponent, PlatformRoute, UserRole } from '~/libs/core'
 
 import { toolTitle } from './GamificationAdmin'
@@ -7,16 +8,17 @@ const BadgeDetailPage: LazyLoadedComponent = lazyLoad(() => import('./pages/badg
 const BadgeListingPage: LazyLoadedComponent = lazyLoad(() => import('./pages/badge-listing/BadgeListingPage'))
 const CreateBadgePage: LazyLoadedComponent = lazyLoad(() => import('./pages/create-badge/CreateBadgePage'))
 
+export const rootRoute: string = (
+    EnvironmentConfig.SUBDOMAIN === AppSubdomain.gamificationAdmin ? '' : `/${AppSubdomain.gamificationAdmin}`
+)
 export const baseDetailPath: string = '/badge-detail'
 export const createBadgePath: string = '/create-badge'
 
-export const basePath: string = '/gamification-admin'
-
 export function badgeDetailPath(badgeId: string, view?: 'edit' | 'award'): string {
-    return `${basePath}${baseDetailPath}/${badgeId}${!!view ? `#${view}` : ''}`
+    return `${rootRoute}${baseDetailPath}/${badgeId}${!!view ? `#${view}` : ''}`
 }
 
-export const createBadgeRoute: string = `${basePath}${createBadgePath}`
+export const createBadgeRoute: string = `${rootRoute}${createBadgePath}`
 
 export const gamificationAdminRoutes: ReadonlyArray<PlatformRoute> = [
     {
@@ -35,11 +37,12 @@ export const gamificationAdminRoutes: ReadonlyArray<PlatformRoute> = [
                 route: `${baseDetailPath}/:id`,
             },
         ],
+        domain: AppSubdomain.gamificationAdmin,
         element: <GamificationAdmin />,
         id: toolTitle,
         rolesRequired: [
             UserRole.gamificationAdmin,
         ],
-        route: basePath,
+        route: rootRoute,
     },
 ]

src/apps/gamification-admin/src/pages/create-badge/create-badge-form/create-badge-form.config.tsx

@@ -3,6 +3,7 @@ import { noop } from 'lodash'
 import { FormDefinition, IconOutline, validatorRequired } from '~/libs/ui'
 
 import { ACCEPTED_BADGE_MIME_TYPES, MAX_BADGE_IMAGE_FILE_SIZE } from '../../../config'
+import { rootRoute } from '../../../gamification-admin.routes'
 
 export enum CreateBadgeFormField {
     badgeActive = 'badgeActive',
@@ -27,7 +28,7 @@ export const createBadgeFormDef: FormDefinition = {
             {
                 buttonStyle: 'secondary',
                 icon: IconOutline.ChevronLeftIcon,
-                route: '/gamification-admin',
+                route: rootRoute || '/',
                 size: 'lg',
             },
         ],

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

@@ -1,4 +1,4 @@
-import { EnvironmentConfig, ToolTitle } from '~/config'
+import { AppSubdomain, EnvironmentConfig, ToolTitle } from '~/config'
 import {
     authUrlLogin,
     lazyLoad,
@@ -38,19 +38,20 @@ const UserCertificationView: LazyLoadedComponent
 const UserCertificationPreview: LazyLoadedComponent
     = lazyLoad(() => import('./tca-certificate'), 'UserCertificationPreview')
 
-export enum LEARN_PATHS {
-    certificate = '/certificate',
-    completed = '/learn/completed',
-    myLearning = '/learn/my-learning',
-    fcc = '/learn/fcc',
-    root = '/learn',
-    startCourseRouteFlag = 'start-course',
-    tcaCertifications = '/tca-certifications',
-    tcaEnroll = '/enroll',
+export const rootRoute: string = (
+    EnvironmentConfig.SUBDOMAIN === AppSubdomain.tcAcademy ? '' : `/${AppSubdomain.tcAcademy}`
+)
+
+export const LEARN_PATHS: { [key: string]: string } = {
+    certificate: '/certificate',
+    myLearning: `${rootRoute}/my-learning`,
+    root: rootRoute,
+    startCourseRouteFlag: 'start-course',
+    tcaCertifications: '/tca-certifications',
+    tcaEnroll: '/enroll',
 }
 
 export const toolTitle: string = ToolTitle.tcAcademy
-export const rootRoute: string = LEARN_PATHS.root
 export const absoluteRootRoute: string = `${window.location.origin}${LEARN_PATHS.root}`
 
 export function getAuthenticateAndStartCourseRoute(): string {
@@ -239,6 +240,7 @@ export const learnRoutes: ReadonlyArray<PlatformRoute> = [
                 route: 'tca-certifications/:certification/preview',
             },
         ],
+        domain: AppSubdomain.tcAcademy,
         element: <LearnAppRoot />,
         id: toolTitle,
         route: rootRoute,

src/apps/learn/src/lib/components/learn-breadcrumb-provider/useLearnBreadcrumb.provider.tsx

@@ -7,7 +7,7 @@ export function useLearnBreadcrumb(items: Array<BreadcrumbItemModel>): Array<Bre
     const breadcrumb: Array<BreadcrumbItemModel> = [
         {
             name: 'Topcoder Academy',
-            url: rootRoute,
+            url: rootRoute || '/',
         },
         ...items,
     ]

src/apps/self-service/src/config/constants/products/data-advisory.js

@@ -1,18 +1,20 @@
+import { selfServiceRootRoute } from "../../routes.config";
+
 export const CHALLENGE_FIELD_VALUES = {
     trackId: "c0f5d461-8219-4c14-878a-c3a3f356466d",
     typeId: "927abff4-7af9-4145-8ba1-577c16e64e2e",
     timelineTemplateId: "7ebf1c69-f62f-4d3a-bdfb-fe9ddb56861c",
 };
 
 export const INTAKE_FORM_ROUTES = [
-    "/self-service/wizard",
-    "/self-service/work/new/data-advisory/basic-info",
-    "/self-service",
-    "/self-service",
-    "/self-service/work/new/data-advisory/login-prompt",
-    "/self-service",
-    "/self-service/work/new/data-advisory/review",
-    "/self-service/work/new/data-advisory/thank-you",
+    `${selfServiceRootRoute}/wizard`,
+    `${selfServiceRootRoute}/new/data-advisory/basic-info`,
+    `${selfServiceRootRoute}`,
+    `${selfServiceRootRoute}`,
+    `${selfServiceRootRoute}/new/data-advisory/login-prompt`,
+    `${selfServiceRootRoute}`,
+    `${selfServiceRootRoute}/new/data-advisory/review`,
+    `${selfServiceRootRoute}/new/data-advisory/thank-you`,
 ];
 
 export const DEFAULT_TIMELINE = [

src/apps/self-service/src/config/constants/products/data-exploration.js

@@ -1,18 +1,20 @@
+import { selfServiceRootRoute } from "../../routes.config";
+
 export const CHALLENGE_FIELD_VALUES = {
     trackId: "c0f5d461-8219-4c14-878a-c3a3f356466d",
     typeId: "927abff4-7af9-4145-8ba1-577c16e64e2e",
     timelineTemplateId: "7ebf1c69-f62f-4d3a-bdfb-fe9ddb56861c",
 };
 
 export const INTAKE_FORM_ROUTES = [
-    "/self-service/wizard",
-    "/self-service/work/new/data-exploration/basic-info",
-    "/self-service",
-    "/self-service",
-    "/self-service/work/new/data-exploration/login-prompt",
-    "/self-service",
-    "/self-service/work/new/data-exploration/review",
-    "/self-service/work/new/data-exploration/thank-you",
+    `${selfServiceRootRoute}/wizard`,
+    `${selfServiceRootRoute}/new/data-exploration/basic-info`,
+    `${selfServiceRootRoute}`,
+    `${selfServiceRootRoute}`,
+    `${selfServiceRootRoute}/new/data-exploration/login-prompt`,
+    `${selfServiceRootRoute}`,
+    `${selfServiceRootRoute}/new/data-exploration/review`,
+    `${selfServiceRootRoute}/new/data-exploration/thank-you`,
 ];
 
 export const DEFAULT_TIMELINE = [