Links and menus generally work with portal

Author: RoyEJohnson

src/app/components/shell/router-helpers/use-link-handler.ts

@@ -1,5 +1,6 @@
 import {useCallback} from 'react';
 import {useNavigate, NavigateOptions} from 'react-router-dom';
+import usePortalContext from '~/contexts/portal';
 import linkHelper from '~/helpers/link';
 import $ from '~/helpers/$';
 import retry from '~/helpers/retry';
@@ -10,9 +11,12 @@ export type TrackingInfo = {
     book_format?: string;
     contact_id?: string;
     resource_name?: string;
-}
+};
 
-export type TrackedMouseEvent = React.MouseEvent<HTMLAnchorElement, MouseEvent> & {
+export type TrackedMouseEvent = React.MouseEvent<
+    HTMLAnchorElement,
+    MouseEvent
+> & {
     trackingInfo: TrackingInfo;
 };
 
@@ -32,12 +36,18 @@ function handleExternalLink(href: Location['href'], el: HTMLElement) {
 type State = NavigateOptions & {x: number; y: number};
 
 export default function useLinkHandler() {
+    const {portal} = usePortalContext();
     const navigate = useNavigate();
     const navigateTo = useCallback(
         (path: Location['href'], state: State = {x: 0, y: 0}) => {
-            navigate(linkHelper.stripOpenStaxDomain(path), state);
+            let adjustedPath = linkHelper.stripOpenStaxDomain(path);
+
+            if (portal && !adjustedPath.startsWith(`/${portal}`)) {
+                adjustedPath = `/${portal}${adjustedPath}`;
+            }
+            navigate(adjustedPath, state);
         },
-        [navigate]
+        [navigate, portal]
     );
     const linkHandler = useCallback(
         // eslint-disable-next-line complexity

src/app/components/shell/router.js

@@ -132,32 +132,9 @@ function MainRoutes() {
         <Layout>
             <Routes>
                 <Route path="/" element={<ImportedPage name="home" />} />
-                {
-                    FOOTER_PAGES.map(
-                        (path) => <Route path={path} key={path} element={<ImportedPage name="footer-page" />} />
-                    )
-                }
-                <Route path="/errata/" element={<ImportedPage name="errata-summary" />} />
-                <Route path="/errata/form/" element={<ImportedPage name="errata-form" />} />
-                <Route path="/errata/*" element={<ImportedPage name="errata-detail" />} />
-                <Route path="/details/books/:title" element={<ImportedPage name="details" />} />
-                <Route path="/details/:title" element={<RedirectToCanonicalDetailsPage />} />
-                <Route path="/details/" element={<Navigate to="/subjects" replace />} />
-                <Route path="/books/:title" element={<RedirectToCanonicalDetailsPage />} />
-                <Route path="/textbooks/:title" element={<RedirectToCanonicalDetailsPage />} />
-                <Route path="/subjects/*" element={<ImportedPage name="subjects" />} />
-                <Route path="/k12/*" element={<ImportedPage name="k12" />} />
-                <Route path="/blog/*" element={<ImportedPage name="blog" />} />
-                <Route path="/webinars/*" element={<ImportedPage name="webinars" />} />
-                <Route path="/general/*" element={<ImportedPage name="general" />} />
-                <Route path="/confirmation/*" element={<ImportedPage name="confirmation" />} />
-                <Route path="/campaign/*" element={<ImportedPage name="campaign" />} />
-                <Route path="/press/*" element={<ImportedPage name="press" />} />
-                <Route
-                    path="/edtech-partner-program"
-                    element={<ImportedPage name="/openstax-ally-technology-partner-program" />}
-                />
-                <Route path="/:name/" element={<TopLevelPage />} />
+            </Routes>
+            <RoutesAlsoInPortal />
+            <Routes>
                 <Route path="/:portal/*" element={<PortalRouter />} />
                 <Route element={<h1>Fell through</h1>} />
             </Routes>