Use default navigation for links in Assigned, and open them in new ta…

…bs (#1919) * Use default navigation for links in Assigned, and open them in new tabs * Code review changes * Move function to contentDOMTransformations Revert test data and snapshot updates * Fix code coverage * Update routes.spec.tsx.snap * use basic dynos on heroku --------- Co-authored-by: tom <[email protected]> Co-authored-by: staxly[bot] <35789409+staxly[bot]@users.noreply.github.com>
openstax · Jun 21, 2023 · 9040a4c · 9040a4c
1 parent 2f93b13
commit 9040a4c
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 6 deletions.
diff --git a/app.json b/app.json
@@ -11,7 +11,7 @@
   },
   "formation": {
     "web": {
-      "size": "hobby"
+      "size": "basic"
     }
   },
   "addons": [

diff --git a/src/app/content/__snapshots__/routes.spec.tsx.snap b/src/app/content/__snapshots__/routes.spec.tsx.snap
diff --git a/src/app/content/components/Assigned.tsx b/src/app/content/components/Assigned.tsx
@@ -90,7 +90,7 @@ export default () => {
     <ErrorModal />
     <ErrorBoundary>
       <AssignedTopBar section={section} />
-      <Page>
+      <Page lockNavigation={true} >
         {prevNext
           ? <PrevNextBar
             book={book}

diff --git a/src/app/content/components/Page/PageComponent.tsx b/src/app/content/components/Page/PageComponent.tsx
@@ -10,7 +10,7 @@ import { preloadedPageIdIs } from '../../utils';
 import getCleanContent from '../../utils/getCleanContent';
 import PageToasts from '../Page/PageToasts';
 import { PagePropTypes } from './connector';
-import { transformContent } from './contentDOMTransformations';
+import { transformContent, linksToOtherPagesOpenInNewTab } from './contentDOMTransformations';
 import * as contentLinks from './contentLinkHandler';
 import highlightManager, { stubHighlightManager, UpdateOptions as HighlightUpdateOptions } from './highlightManager';
 import * as lazyResources from './lazyResourceManager';
@@ -47,6 +47,10 @@ export default class PageComponent extends Component<PagePropTypes> {
 
       transformContent(parsedContent, parsedContent.body, this.props.intl);
 
+      if (this.props.lockNavigation) {
+        linksToOtherPagesOpenInNewTab(parsedContent.body, this.props.currentPath);
+      }
+
       /* this will be removed when all the books are in good order */
       /* istanbul ignore else */
       if (APP_ENV !== 'production') {

diff --git a/src/app/content/components/Page/connector.ts b/src/app/content/components/Page/connector.ts
@@ -31,6 +31,7 @@ export interface PagePropTypes {
   addToast: typeof addToast;
   systemQueryParams: SystemQueryParams;
   textSize: TextResizerValue;
+  lockNavigation: boolean;
 }
 
 export default connect(

diff --git a/src/app/content/components/Page/contentDOMTransformations.ts b/src/app/content/components/Page/contentDOMTransformations.ts
@@ -2,6 +2,19 @@ import { Document, HTMLElement } from '@openstax/types/lib.dom';
 import { IntlShape } from 'react-intl';
 import { assertNotNull } from '../../../utils';
 import { expandClosestSolution } from '../../utils/domUtils';
+import { fromRelativeUrl } from '../../utils/urlUtils';
+
+export function linksToOtherPagesOpenInNewTab(rootEl: HTMLElement, currentPath: string) {
+  rootEl.querySelectorAll('a[href]').forEach(
+    (link) => {
+      const pathname = fromRelativeUrl(currentPath, link.getAttribute('href') as string);
+
+      if (pathname !== currentPath) {
+        link.setAttribute('target', '_blank');
+      }
+    }
+  );
+}
 
 // from https://github.com/openstax/webview/blob/f95b1d0696a70f0b61d83a85c173102e248354cd
 // .../src/scripts/modules/media/body/body.coffee#L123

diff --git a/src/app/content/components/Page/contentLinkHandler.ts b/src/app/content/components/Page/contentLinkHandler.ts
@@ -117,8 +117,9 @@ export const contentLinkHandler = (anchor: HTMLAnchorElement, getProps: () => Co
       hasUnsavedHighlight,
     } = getProps();
     const href = anchor.getAttribute('href');
+    const target = anchor.getAttribute('target');
 
-    if (!href || !book || !page || isClickWithModifierKeys(e)) {
+    if (!href || !book || !page || target === '_blank' || isClickWithModifierKeys(e)) {
       return;
     }
 

diff --git a/src/test/fixtures/apps/archive/codeversion/contents/testbook1-shortid:testpage1-shortid.json b/src/test/fixtures/apps/archive/codeversion/contents/testbook1-shortid:testpage1-shortid.json