Merge branch 'openedx:master' into jci/issue#1509

package.json

@@ -36,7 +36,7 @@
     "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
     "@edx/browserslist-config": "1.2.0",
     "@edx/frontend-component-header": "^5.6.0",
-    "@edx/frontend-lib-learning-assistant": "^2.2.4",
+    "@edx/frontend-lib-learning-assistant": "^2.4.1",
     "@edx/frontend-lib-special-exams": "^3.1.3",
     "@edx/frontend-platform": "^8.0.0",
     "@edx/openedx-atlas": "^0.6.0",

src/courseware/course/sequence/Unit/ContentIFrame.jsx

@@ -20,7 +20,7 @@ import * as hooks from './hooks';
  * Changes to it should be vetted by them ([email protected]).
  */
 export const IFRAME_FEATURE_POLICY = (
-  'microphone *; camera *; midi *; geolocation *; encrypted-media *, clipboard-write *'
+  'microphone *; camera *; midi *; geolocation *; encrypted-media *; clipboard-write *'
 );
 
 export const testIDs = StrictDict({

src/generic/PageNotFound.jsx

@@ -0,0 +1,49 @@
+import { getConfig } from '@edx/frontend-platform';
+import { Hyperlink } from '@openedx/paragon';
+import { useIntl } from '@edx/frontend-platform/i18n';
+import { logError } from '@edx/frontend-platform/logging';
+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
+import FooterSlot from '@openedx/frontend-slot-footer';
+
+import HeaderSlot from '../plugin-slots/HeaderSlot';
+import messages from './messages';
+
+const PageNotFound = () => {
+  const { formatMessage } = useIntl();
+  const location = window.location.href;
+
+  logError('Page failed to load, probably an invalid URL.', location);
+  sendTrackEvent('edx.ui.lms.page_not_found', { location });
+
+  return (
+    <>
+      <HeaderSlot />
+      <main
+        id="main-content"
+        className="main-content d-flex justify-content-center align-items-center flex-column"
+        style={{
+          height: '50vh',
+        }}
+      >
+        <h1 className="h3">
+          {formatMessage(messages.pageNotFoundHeader)}
+        </h1>
+        <p>
+          {formatMessage(
+            messages.pageNotFoundBody,
+            {
+              homepageLink: (
+                <Hyperlink destination={getConfig().LMS_BASE_URL}>
+                  {formatMessage(messages.homepageLink)}
+                </Hyperlink>
+              ),
+            },
+          )}
+        </p>
+      </main>
+      <FooterSlot />
+    </>
+  );
+};
+
+export default PageNotFound;

src/generic/PageNotFound.test.jsx

@@ -0,0 +1,41 @@
+import { getConfig, history } from '@edx/frontend-platform';
+import { Routes, Route } from 'react-router-dom';
+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
+
+import {
+  initializeTestStore,
+  render,
+  screen,
+} from '../setupTest';
+import PageNotFound from './PageNotFound';
+import messages from './messages';
+
+jest.mock('@edx/frontend-platform/analytics');
+
+describe('PageNotFound', () => {
+  beforeEach(async () => {
+    await initializeTestStore();
+    const invalidUrl = '/new/course';
+    history.push(invalidUrl);
+    render(
+      <Routes>
+        <Route path="*" element={<PageNotFound />} />
+      </Routes>,
+      { wrapWithRouter: true },
+    );
+  });
+
+  it('displays page not found header', () => {
+    expect(screen.getByText(messages.pageNotFoundHeader.defaultMessage)).toBeVisible();
+  });
+
+  it('displays link back to learner dashboard', () => {
+    const expected = getConfig().LMS_BASE_URL;
+    const homepageLink = screen.getByRole('link', { name: messages.homepageLink.defaultMessage });
+    expect(homepageLink).toHaveAttribute('href', expected);
+  });
+
+  it('calls tracking events', () => {
+    expect(sendTrackEvent).toHaveBeenCalled();
+  });
+});

src/generic/messages.ts

@@ -21,6 +21,21 @@ const messages = defineMessages({
     defaultMessage: 'Sign in',
     description: 'Text in a button, prompting the user to log in.',
   },
+  pageNotFoundHeader: {
+    id: 'learning.pageNotFound.header',
+    defaultMessage: 'Page not found',
+    description: 'Text for header notifying them that the page is not found',
+  },
+  pageNotFoundBody: {
+    id: 'learning.pageNotFound.body',
+    defaultMessage: 'The page you you were looking for was not found. Go back to the {homepageLink}.',
+    description: 'Text for body, prompting the user to go back to the home page',
+  },
+  homepageLink: {
+    id: 'learning.pageNotFound.body.homepageLink.label',
+    defaultMessage: 'homepage',
+    description: 'Text for url, telling them the page they will be navigated to',
+  },
 });
 
 export default messages;

src/index.jsx

@@ -4,7 +4,6 @@ import {
   getConfig,
 } from '@edx/frontend-platform';
 import { AppProvider, ErrorPage, PageWrap } from '@edx/frontend-platform/react';
-import React from 'react';
 import ReactDOM from 'react-dom';
 import { Routes, Route } from 'react-router-dom';
 
@@ -35,6 +34,7 @@ import CourseAccessErrorPage from './generic/CourseAccessErrorPage';
 import DecodePageRoute from './decode-page-route';
 import { DECODE_ROUTES, ROUTES } from './constants';
 import PreferencesUnsubscribe from './preferences-unsubscribe';
+import PageNotFound from './generic/PageNotFound';
 
 subscribe(APP_READY, () => {
   ReactDOM.render(
@@ -46,6 +46,7 @@ subscribe(APP_READY, () => {
         <NoticesProvider>
           <UserMessagesProvider>
             <Routes>
+              <Route path="*" element={<PageWrap><PageNotFound /></PageWrap>} />
               <Route path={ROUTES.UNSUBSCRIBE} element={<PageWrap><GoalUnsubscribe /></PageWrap>} />
               <Route path={ROUTES.REDIRECT} element={<PageWrap><CoursewareRedirectLandingPage /></PageWrap>} />
               <Route path={ROUTES.PREFERENCES_UNSUBSCRIBE} element={<PageWrap><PreferencesUnsubscribe /></PageWrap>} />

src/tab-page/LoadedTabPage.jsx

@@ -69,7 +69,7 @@ const LoadedTabPage = ({
         streakDiscountCouponEnabled={streakDiscountCouponEnabled}
         verifiedMode={verifiedMode}
       />
-      <main id="main-content" className="d-flex flex-column flex-grow-1">
+      <main className="d-flex flex-column flex-grow-1">
         <AlertList
           topic="outline"
           className="mx-5 mt-3"
@@ -79,7 +79,7 @@ const LoadedTabPage = ({
           }}
         />
         <CourseTabsNavigation tabs={tabs} className="mb-3" activeTabSlug={activeTabSlug} />
-        <div className="container-xl">
+        <div id="main-content" className="container-xl">
           {children}
         </div>
       </main>