Adding constants and renaming src/course to src/active-course

src/course was confusing.  And we had no constants for the various ‘loading’ strings all over the place.

.env

@@ -3,30 +3,17 @@ ACCESS_TOKEN_COOKIE_NAME=null
 BASE_URL=null
 CREDENTIALS_BASE_URL=null
 CSRF_TOKEN_API_PATH=null
-DISCOVERY_API_BASE_URL=null
-ENTERPRISE_LEARNER_PORTAL_HOSTNAME=null
 ECOMMERCE_BASE_URL=null
-INSIGHTS_BASE_URL=null
+INSIGHTS_BASE_URL=
 LANGUAGE_PREFERENCE_COOKIE_NAME=null
 LMS_BASE_URL=null
 LOGIN_URL=null
 LOGOUT_URL=null
-LOGO_URL=null
-LOGO_TRADEMARK_URL=null
-LOGO_WHITE_URL=null
-FAVICON_URL=null
 MARKETING_SITE_BASE_URL=null
 ORDER_HISTORY_URL=null
 REFRESH_ACCESS_TOKEN_ENDPOINT=null
-SEARCH_CATALOG_URL=null
 SEGMENT_KEY=null
 SITE_NAME=null
-SOCIAL_UTM_MILESTONE_CAMPAIGN=null
-STUDIO_BASE_URL=null
-SUPPORT_URL=null
-SUPPORT_URL_CALCULATOR_MATH=null
-SUPPORT_URL_ID_VERIFICATION=null
-SUPPORT_URL_VERIFIED_CERTIFICATE=null
-TWITTER_HASHTAG=null
 TWITTER_URL=null
+STUDIO_BASE_URL=
 USER_INFO_COOKIE_NAME=null

.env.development

@@ -1,32 +1,19 @@
 NODE_ENV='development'
 ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
-BASE_URL='http://localhost:2000'
+BASE_URL='localhost:2000'
 CREDENTIALS_BASE_URL='http://localhost:18150'
 CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
-DISCOVERY_API_BASE_URL='http://localhost:18381'
 ECOMMERCE_BASE_URL='http://localhost:18130'
-ENTERPRISE_LEARNER_PORTAL_HOSTNAME='localhost:8734'
 LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
 LMS_BASE_URL='http://localhost:18000'
 LOGIN_URL='http://localhost:18000/login'
 LOGOUT_URL='http://localhost:18000/logout'
-LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
-LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
-LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
-FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
 MARKETING_SITE_BASE_URL='http://localhost:18000'
-ORDER_HISTORY_URL='http://localhost:1996/orders'
+ORDER_HISTORY_URL='localhost:1996/orders'
 PORT=2000
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
-SEARCH_CATALOG_URL='http://localhost:18000/courses'
 SEGMENT_KEY=null
 SITE_NAME='edX'
-SOCIAL_UTM_MILESTONE_CAMPAIGN='edxmilestone'
-STUDIO_BASE_URL='http://localhost:18010'
-SUPPORT_URL='https://support.edx.org'
-SUPPORT_URL_CALCULATOR_MATH='https://support.edx.org/hc/en-us/articles/360000038428-Entering-math-expressions-in-assignments-or-the-calculator'
-SUPPORT_URL_ID_VERIFICATION='https://support.edx.org/hc/en-us/articles/206503858-How-do-I-verify-my-identity'
-SUPPORT_URL_VERIFIED_CERTIFICATE='https://support.edx.org/hc/en-us/articles/206502008-What-is-a-verified-certificate'
-TWITTER_HASHTAG='myedxjourney'
 TWITTER_URL='https://twitter.com/edXOnline'
+STUDIO_BASE_URL='http://localhost:18010'
 USER_INFO_COOKIE_NAME='edx-user-info'

.env.test

@@ -1,32 +1,19 @@
 NODE_ENV='test'
 ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
-BASE_URL='http://localhost:2000'
+BASE_URL='localhost:2000'
 CREDENTIALS_BASE_URL='http://localhost:18150'
 CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
-DISCOVERY_API_BASE_URL='http://localhost:18381'
 ECOMMERCE_BASE_URL='http://localhost:18130'
-ENTERPRISE_LEARNER_PORTAL_HOSTNAME='localhost:8734'
 LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
 LMS_BASE_URL='http://localhost:18000'
 LOGIN_URL='http://localhost:18000/login'
 LOGOUT_URL='http://localhost:18000/logout'
-LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
-LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
-LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
-FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
 MARKETING_SITE_BASE_URL='http://localhost:18000'
-ORDER_HISTORY_URL='http://localhost:1996/orders'
+ORDER_HISTORY_URL='localhost:1996/orders'
 PORT=2000
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
-SEARCH_CATALOG_URL='http://localhost:18000/courses'
 SEGMENT_KEY=null
 SITE_NAME='edX'
-SOCIAL_UTM_MILESTONE_CAMPAIGN='edxmilestone'
-STUDIO_BASE_URL='http://localhost:18010'
-SUPPORT_URL='https://support.edx.org'
-SUPPORT_URL_CALCULATOR_MATH='https://support.edx.org/hc/en-us/articles/360000038428-Entering-math-expressions-in-assignments-or-the-calculator'
-SUPPORT_URL_ID_VERIFICATION='https://support.edx.org/hc/en-us/articles/206503858-How-do-I-verify-my-identity'
-SUPPORT_URL_VERIFIED_CERTIFICATE='https://support.edx.org/hc/en-us/articles/206502008-What-is-a-verified-certificate'
-TWITTER_HASHTAG='myedxjourney'
 TWITTER_URL='https://twitter.com/edXOnline'
+STUDIO_BASE_URL='http://localhost:18010'
 USER_INFO_COOKIE_NAME='edx-user-info'

.github/workflows/validate.yml

@@ -1,21 +0,0 @@
-name: validate
-on:
-- push
-- pull_request
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version:
-        - 12
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: make validate.ci
-    - name: Upload coverage
-      uses: codecov/codecov-action@v1
-      with:
-        fail_ci_if_error: true

.gitignore

@@ -12,10 +12,7 @@ temp/babel-plugin-react-intl
 ### pyenv ###
 .python-version
 
-### Editors ###
+### Emacs ###
 *~
 /temp
 /.vscode
-
-# Local package dependencies
-module.config.js

.travis.yml

@@ -0,0 +1,15 @@
+language: node_js
+node_js: 12
+before_install:
+- npm install -g npm@6
+install:
+- npm ci
+script:
+- make validate-no-uncommitted-package-lock-changes
+- npm run i18n_extract
+- npm run lint
+- npm run test
+- npm run build
+- npm run is-es5
+after_success:
+- codecov

Makefile

@@ -52,17 +52,3 @@ pull_translations:
 validate-no-uncommitted-package-lock-changes:
 	# Checking for package-lock.json changes...
 	git diff --exit-code package-lock.json
-
-.PHONY: validate
-validate:
-	make validate-no-uncommitted-package-lock-changes
-	npm run i18n_extract
-	npm run lint -- --max-warnings 0
-	npm run test
-	npm run build
-	npm run is-es5
-
-.PHONY: validate.ci
-validate.ci:
-	npm ci
-	make validate

README.rst

@@ -1,4 +1,4 @@
-|Coveralls| |npm_version| |npm_downloads| |license|
+|Build Status| |Coveralls| |npm_version| |npm_downloads| |license|
 
 frontend-app-learning
 =========================
@@ -10,6 +10,8 @@ Introduction
 
 React app for edX learning.
 
+.. |Build Status| image:: https://api.travis-ci.org/edx/frontend-app-learning.svg?branch=master
+   :target: https://travis-ci.org/edx/frontend-app-learning
 .. |Coveralls| image:: https://img.shields.io/coveralls/edx/frontend-app-learning.svg?branch=master
    :target: https://coveralls.io/github/edx/frontend-app-learning
 .. |npm_version| image:: https://img.shields.io/npm/v/@edx/frontend-app-learning.svg
@@ -41,29 +43,3 @@ In this project, install requirements and start the development server by runnin
    npm start # The server will run on port 1995
 
 Once the dev server is up, visit http://localhost:2000/course/course-v1:edX+DemoX+Demo_Course to view the demo course.  You can replace ``course-v1:edX+DemoX+Demo_Course`` with a different course key.
-
-Local module development
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-To develop locally on modules that are installed into this app, you'll need to create a ``module.config.js``
-file (which is git-ignored) that defines where to find your local modules, for instance::
-
-   module.exports = {
-     /*
-     Modules you want to use from local source code.  Adding a module here means that when this app
-     runs its build, it'll resolve the source from peer directories of this app.
-
-     moduleName: the name you use to import code from the module.
-     dir: The relative path to the module's source code.
-     dist: The sub-directory of the source code where it puts its build artifact.  Often "dist", though you
-       may want to use "src" if the module installs React as a peer/dev dependency.
-     */
-     localModules: [
-        { moduleName: '@edx/paragon/scss', dir: '../paragon', dist: 'scss' },
-        { moduleName: '@edx/paragon', dir: '../paragon', dist: 'dist' },
-        { moduleName: '@edx/frontend-enterprise', dir: '../frontend-enterprise', dist: 'src' },
-        { moduleName: '@edx/frontend-platform', dir: '../frontend-platform', dist: 'dist' },
-     ],
-   };
-
-See https://github.com/edx/frontend-build#local-module-configuration-for-webpack for more details.

docs/decisions/0002-courseware-page-decisions.md

@@ -37,9 +37,6 @@ Today, if the URL only specifies the course ID, we need to pick a sequence to sh
 
 Similarly, if the URL doesn't contain a unit ID, we use the `position` field of the sequence to determine which unit we want to display from that sequence.  If the position isn't specified in the sequence, we choose the first unit of the sequence.  After determining which unit to display, we update the URL to match.  After the URL is updated, the application will attempt to load that unit via an iFrame.
 
-_This URL scheme has been expanded upon in
-[ADR #8: Liberal courseware path handling](./0008-liberal-courseware-path-handling.md)._
-
 ## "Container" components vs. display components
 
 This application makes use of a few "container" components at the top level - CoursewareContainer and CourseHomeContainer.

docs/decisions/0004-model-store.md

@@ -4,6 +4,6 @@ Because we have a variety of models in this app (course, section, sequence, unit
 
 https://redux.js.org/faq/organizing-state#how-do-i-organize-nested-or-duplicate-data-in-my-state
 
-Different modules of the application maintain individual/lists of IDs that reference data stored in the model store.  These are akin to indices in a database, in that they allow you to quickly extract data from the model store without iteration or filtering.  
+Different modules of the application maintain individual/lists of IDs that reference data stored in the model store.  These are akin to indices in a database, in that they allow you to quickly extract data from the model store without iteration or filtering.
 
-A common pattern when loading data from an API endpoint is to use the model-store's redux actions (addModel, updateModel, etc.) to load the "models" themselves into the model store by ID, and then dispatch another action to save references elsewhere in the redux store to the data that was just added.  When adding courses, sequences, etc., to model-store, we also save the courseId and sequenceId in the 'courseware' part of redux.  This means the courseware React Components can extract the data from the model-store quickly by using the courseId as a key: `state.models.courses[state.courseware.courseId]`.  For an array, it iterates once over the ID list in order to extract the models from model-store.  This iteration is done when React components' re-render, and can be done less often through memoization as necessary.
+A common pattern when loading data from an API endpoint is to use the model-store's redux actions (addModel, updateModel, etc.) to load the "models" themselves into the model store by ID, and then dispatch another action to save references elsewhere in the redux store to the data that was just added.  When adding courses, sequences, etc., to model-store, we also save the courseId and sequenceId in the 'courseware' part of redux.  This means the courseware React Components can extract the data from the model-store quickly by using the courseId as a key: `state.models.courses[state.activeCourse.courseId]`.  For an array, it iterates once over the ID list in order to extract the models from model-store.  This iteration is done when React components' re-render, and can be done less often through memoization as necessary.

docs/decisions/0007-testing.md

@@ -1,66 +0,0 @@
-# Testing
-
-## Status
-Draft
-
-Let's live with this a bit longer before deciding it's a solid approach and marking this Approved.
-
-## Context
-We'd like to all be on the same page about how to approach testing, what is
-worth testing, and how to do it.
-
-## React Testing Library
-We'll use react-testing-library and jest as the main testing tools.
-
-This has some implications about how to test. You can read the React Testing Library's
-[Guiding Principles](https://testing-library.com/docs/guiding-principles), but the main
-takeaway is that you should be interacting with React as closely as possible to the way
-the user will interact with it.
-
-For example, they discourage using class or element name selectors to find components
-during a test. Instead, you should find them by user-oriented attributes like labels,
-text, or roles. As a last resort, by a `data-testid` tag.
-
-## Mocking data
-We'll use [Rosie](https://github.com/rosiejs/rosie) as a tool for building JavaScript objects.
-Our main use case for Rosie is to use factories in order to mock the data we'd like to fetch when rendering components.
-[axios-mock-adapter](https://www.npmjs.com/package/axios-mock-adapter) allows us to mock the response of an HTTP request.
-
-For example, we may use a factory to build a course metadata object:
-
-`const courseMetadata = Factory.build('courseMetadata');`
-
-Then we'd pass that `courseMetadata` object into an axios mock call:
-
-`axiosMock.onGet('example.com').reply(200, courseMetadata);`
-
-This way, when a component sends a GET request to `example.com` within the test's lifecycle, the request will be intercepted
-by the axios-mock-adapter, and the courseMetadata object will be returned.
-
-These factories should live within the data directories they intend to mock
-```
-courseware
-  | data
-      | __factories__
-          | courseMetadata.factory.js /* used to define the Rosie factory */
-      | api.js /* getCourseMetadata() lives here */
-```
-
-## What to Test
-We have not found exhaustive unit testing of frontend code to be worth the trouble.
-Rather, let's focus on testing non-obvious behavior.
-
-In essence: `test behavior that wouldn't present itself to a developer playing around`.
-
-Practically speaking, this means error states, interactive components, corner cases,
-or anything that wouldn't come up in a demo course. Something a developer wouldn't
-notice in the normal course of working in devstack.
-
-## Snapshots
-In practice, we've found snapshots of component trees to be too brittle to be worth it,
-as refactors occur or external libraries change.
-
-They can still be useful for data (like redux tests) or tiny isolated components.
-
-But please avoid for any "interesting" component. Prefer inspecting the explicit behavior
-under test, rather than just snapshotting the entire component tree.

docs/decisions/0008-liberal-courseware-path-handling.md

@@ -1,90 +0,0 @@
-# Liberal courseware path handling
-
-## Status
-
-Accepted
-
-_This updates some of the content in [ADR #2: Courseware page decisions](./0002-courseware-page-decisions.md)._
-
-## Context
-
-The courseware container currently accepts three path forms:
-
-1. `/course/:courseId`
-2. `/course/:courseId/:sequenceId`
-3. `/course/:courseId/:sequenceId/:unitId`
-
-Forms #1 and #2 are always redirected to Form #3 via simple set of rules:
-
-* If the sequenceId is not specified, choose the first sequence in the course.
-* If the unitId is not specified, choose the active unit in the sequence,
-  or the first unit if none are active.
-
-Thus, Form #3 is effectively the canonoical path;
-all Learning MFE units should be served from it.
-We acknowledge that the best user experience is to link directly to the canonoical
-path when possible, since it skips the redirection steps.
-Still, there are times when it is necessary or prudent to link just to a course or
-a sequence.
-
-Through recent work in the LMS, we are realizing that there are _also_ times where it
-would be simpler or more performant to link a user to an
-_entire section without specifying a squence_ or to a
-_unit without including the sequence_.
-Specifically, this capability would let as avoid further modulestore or
-block transformer queries in order to discern the course structure when trying to
-direct a learner to a section or unit.
-Futhermore, we hypothesize that being able to build a Learning MFE courseware link
-with just a unit ID or a section ID will be a nice simplifying quality for future
-development or debugging.
-
-## Decision
-
-The courseware container will accept five total path forms:
-
-1. `/course/:courseId`
-2. `/course/:courseId/:sectionId`
-3. `/course/:courseId/:sectionId/:unitId`
-4. `/course/:courseId/:sequenceId`
-5. `/course/:courseId/:unitId`
-6. `/course/:courseId/:sequenceId/:unitId`
-
-The redirection rules are as follows:
-
-* Forms #1 redirects to Form #4 by selecting the first sequence in the course.
-* Form #2 redirects to Form #4 by selecting to the first sequence in the section.
-* Form #3 redirects to Form #5 by dropping the section ID.
-* Form #4 redirects to Form #6 by choosing the active unit in the sequence
-  (or the first unit, if none are active).
-* Form #5 redirects to Form #6 by filling in the ID of the sequence that the
-  specified unit belongs to (in the edge case where the unit belongs to multiple
-  sequences, the first sequence is selected).
-
-As before, Form #5 is the canonocial courseware path, which is always redirected to
-by any of the other courseware path forms.
-
-## Consequences
-
-The above decision is implemented.
-
-## Further work
-
-At some point, we may decide to further extend the URL scheme to be
-more human-readable.
-
-We can't make UsageKeys themselves more readable because they're tied to student state,
-but we could introduce a new optional `slug` field on Sequences,
-which would be captured and propagated to the learning_sequences API.
-We could eventually do something similar to Units, since those slugs only have to be sequence-local.
-
-So eventually, URLs could look less like:
-
-```
-
-https://learning.edx.org/course/course-v1:edX+DemoX.1+2T2019/block-v1:edX+DemoX.1+2T2019+type@sequential+block@e0a61b3d5a2046949e76d12cac5df493/block-v1:edX+DemoX.1+2T2019+type@vertical+block@52dbad5a28e140f291a476f92ce11996
-```
-
-And more like:
-```
-https://learning.edx.org/course/course-v1:edX+DemoX.1+2T2019/Being_Social/Teams
-```

jest.config.js

@@ -7,6 +7,5 @@ module.exports = createConfig('jest', {
   coveragePathIgnorePatterns: [
     'src/setupTest.js',
     'src/i18n',
-    'src/.*\\.exp\\..*',
   ],
 });

package.json

@@ -15,7 +15,6 @@
     "i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
     "is-es5": "es-check es5 ./dist/*.js",
     "lint": "fedx-scripts eslint --ext .js --ext .jsx .",
-    "lint:fix": "fedx-scripts eslint --fix --ext .js --ext .jsx .",
     "snapshot": "fedx-scripts jest --updateSnapshot",
     "start": "fedx-scripts webpack-dev-server --progress",
     "test": "fedx-scripts jest --coverage --passWithNoTests"
@@ -35,47 +34,43 @@
     "url": "https://github.com/edx/frontend-app-learning/issues"
   },
   "dependencies": {
-    "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
-    "@edx/frontend-component-footer": "10.1.4",
-    "@edx/frontend-enterprise": "4.2.3",
-    "@edx/frontend-platform": "1.8.4",
-    "@edx/paragon": "13.17.3",
-    "@fortawesome/fontawesome-svg-core": "1.2.34",
+    "@edx/frontend-component-footer": "10.0.11",
+    "@edx/frontend-component-header": "2.0.5",
+    "@edx/frontend-platform": "1.5.2",
+    "@edx/paragon": "^9.1.1",
+    "@fortawesome/fontawesome-svg-core": "1.2.30",
     "@fortawesome/free-brands-svg-icons": "5.13.1",
     "@fortawesome/free-regular-svg-icons": "5.13.1",
     "@fortawesome/free-solid-svg-icons": "5.13.1",
-    "@fortawesome/react-fontawesome": "0.1.14",
+    "@fortawesome/react-fontawesome": "0.1.11",
     "@reduxjs/toolkit": "1.3.6",
     "classnames": "2.2.6",
     "core-js": "3.6.5",
-    "lodash.camelcase": "^4.3.0",
     "prop-types": "15.7.2",
     "react": "16.13.1",
     "react-break": "1.3.2",
     "react-dom": "16.13.1",
     "react-helmet": "6.0.0",
-    "react-redux": "7.2.2",
+    "react-redux": "7.2.1",
     "react-router": "5.2.0",
     "react-router-dom": "5.2.0",
     "react-share": "4.2.1",
     "redux": "4.0.5",
     "regenerator-runtime": "0.13.7",
-    "reselect": "4.0.0",
-    "truncate-html": "1.0.3"
+    "reselect": "4.0.0"
   },
   "devDependencies": {
-    "@edx/frontend-build": "5.5.5",
+    "@edx/frontend-build": "5.0.6",
     "@testing-library/dom": "7.16.3",
     "@testing-library/jest-dom": "5.10.1",
     "@testing-library/react": "10.3.0",
     "@testing-library/user-event": "12.0.17",
     "axios-mock-adapter": "1.18.2",
-    "codecov": "3.8.1",
-    "es-check": "5.1.4",
+    "codecov": "3.7.2",
+    "es-check": "5.1.0",
     "glob": "7.1.6",
     "husky": "3.1.0",
     "jest": "24.9.0",
-    "jest-chain": "1.1.5",
     "reactifex": "1.1.1",
     "rosie": "2.0.1"
   }

public/index.html

@@ -1,13 +1,10 @@
 <!doctype html>
 <html lang="en-us">
   <head>
-    <title>Course | <%= process.env.SITE_NAME %></title>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="shortcut icon" href="<%=htmlWebpackPlugin.options.FAVICON_URL%>" type="image/x-icon" />
-    <% if (htmlWebpackPlugin.options.OPTIMIZELY_PROJECT_ID) { %>
-      <script src="https://www.edx.org/optimizelyjs/<%= htmlWebpackPlugin.options.OPTIMIZELY_PROJECT_ID %>.js"></script>
-    <% } %>
+      <title>Course | <%= process.env.SITE_NAME %></title>
+      <meta charset="utf-8">
+      <meta name="viewport" content="width=device-width, initial-scale=1.0">
+      <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
   </head>
   <body>
     <div id="root"></div>

src/active-course/data/selectors.js

@@ -0,0 +1,8 @@
+/* eslint-disable import/prefer-default-export */
+import { createSelector } from 'reselect';
+
+export const activeCourseSelector = createSelector(
+  (state) => state.models.courses || {},
+  (state) => state.activeCourse.courseId,
+  (coursesById, courseId) => (coursesById[courseId] ? coursesById[courseId] : null),
+);

src/active-course/data/slice.js

@@ -0,0 +1,44 @@
+/* eslint-disable no-param-reassign */
+import { createSlice } from '@reduxjs/toolkit';
+
+export const COURSE_LOADING = 'loading';
+export const COURSE_LOADED = 'loaded';
+export const COURSE_FAILED = 'failed';
+export const COURSE_DENIED = 'denied';
+
+const slice = createSlice({
+  name: 'activeCourse',
+  initialState: {
+    courseStatus: COURSE_LOADING,
+    courseId: null,
+  },
+  reducers: {
+    fetchCourseRequest: (state, { payload }) => {
+      state.courseId = payload.courseId;
+      state.courseStatus = COURSE_LOADING;
+    },
+    fetchCourseSuccess: (state, { payload }) => {
+      state.courseId = payload.courseId;
+      state.courseStatus = COURSE_LOADED;
+    },
+    fetchCourseFailure: (state, { payload }) => {
+      state.courseId = payload.courseId;
+      state.courseStatus = COURSE_FAILED;
+    },
+    fetchCourseDenied: (state, { payload }) => {
+      state.courseId = payload.courseId;
+      state.courseStatus = COURSE_DENIED;
+    },
+  },
+});
+
+export const {
+  fetchCourseRequest,
+  fetchCourseSuccess,
+  fetchCourseFailure,
+  fetchCourseDenied,
+} = slice.actions;
+
+export const {
+  reducer,
+} = slice;

src/active-course/index.js

@@ -0,0 +1,12 @@
+export { activeCourseSelector } from './data/selectors';
+export {
+  reducer,
+  COURSE_LOADING,
+  COURSE_LOADED,
+  COURSE_FAILED,
+  COURSE_DENIED,
+  fetchCourseRequest,
+  fetchCourseSuccess,
+  fetchCourseFailure,
+  fetchCourseDenied,
+} from './data/slice';

src/alerts/access-expiration-alert/AccessExpirationAlert.jsx

@@ -1,176 +1,24 @@
-import React, { useState } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
-import {
-  FormattedMessage, FormattedDate, injectIntl, intlShape,
-} from '@edx/frontend-platform/i18n';
-import { Hyperlink } from '@edx/paragon';
 
 import { Alert, ALERT_TYPES } from '../../generic/user-messages';
-import messages from './messages';
-import AccessExpirationAlertMMP2P from './AccessExpirationAlertMMP2P';
-
-function AccessExpirationAlert({ intl, payload }) {
-  /** [MM-P2P] Experiment */
-  const [showMMP2P, setShowMMP2P] = useState(!!window.experiment__home_alert_bShowMMP2P);
-  if (window.experiment__home_alert_showMMP2P === undefined) {
-    window.experiment__home_alert_showMMP2P = (val) => {
-      window.experiment__home_alert_bShowMMP2P = !!val;
-      setShowMMP2P(!!val);
-    };
-  }
 
+function AccessExpirationAlert({ payload }) {
   const {
-    accessExpiration,
-    courseId,
-    org,
-    userTimezone,
-    analyticsPageName,
+    rawHtml,
   } = payload;
-  const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
-
-  if (!accessExpiration) {
-    return null;
-  }
-
-  const {
-    expirationDate,
-    masqueradingExpiredCourse,
-    upgradeDeadline,
-    upgradeUrl,
-  } = accessExpiration;
-
-  if (masqueradingExpiredCourse) {
-    return (
-      <Alert type={ALERT_TYPES.INFO}>
-        <FormattedMessage
-          id="learning.accessExpiration.expired"
-          defaultMessage="This learner does not have access to this course. Their access expired on {date}."
-          values={{
-            date: (
-              <FormattedDate
-                key="accessExpirationExpiredDate"
-                day="numeric"
-                month="short"
-                year="numeric"
-                value={expirationDate}
-                {...timezoneFormatArgs}
-              />
-            ),
-          }}
-        />
-      </Alert>
-    );
-  }
-
-  /** [MM-P2P] Experiment */
-  if (showMMP2P) {
-    return (
-      <AccessExpirationAlertMMP2P payload={payload} />
-    );
-  }
-
-  const logClick = () => {
-    sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
-      org_key: org,
-      courserun_key: courseId,
-      linkCategory: 'FBE_banner',
-      linkName: `${analyticsPageName}_audit_access_expires`,
-      linkType: 'link',
-      pageName: analyticsPageName,
-    });
-  };
-
-  let deadlineMessage = null;
-  if (upgradeDeadline && upgradeUrl) {
-    deadlineMessage = (
-      <>
-        <br />
-        <FormattedMessage
-          id="learning.accessExpiration.deadline"
-          defaultMessage="Upgrade by {date} to get unlimited access to the course as long as it exists on the site."
-          values={{
-            date: (
-              <FormattedDate
-                key="accessExpirationUpgradeDeadline"
-                day="numeric"
-                month="short"
-                year="numeric"
-                value={upgradeDeadline}
-                {...timezoneFormatArgs}
-              />
-            ),
-          }}
-        />
-        &nbsp;
-        <Hyperlink
-          className="font-weight-bold"
-          style={{ textDecoration: 'underline' }}
-          destination={upgradeUrl}
-          onClick={logClick}
-        >
-          {intl.formatMessage(messages.upgradeNow)}
-        </Hyperlink>
-      </>
-    );
-  }
-
-  return (
+  return rawHtml && (
     <Alert type={ALERT_TYPES.INFO}>
-      <span className="font-weight-bold">
-        <FormattedMessage
-          id="learning.accessExpiration.header"
-          defaultMessage="Audit Access Expires {date}"
-          values={{
-            date: (
-              <FormattedDate
-                key="accessExpirationHeaderDate"
-                day="numeric"
-                month="short"
-                year="numeric"
-                value={expirationDate}
-                {...timezoneFormatArgs}
-              />
-            ),
-          }}
-        />
-      </span>
-      <br />
-      <FormattedMessage
-        id="learning.accessExpiration.body"
-        defaultMessage="You lose all access to this course, including your progress, on {date}."
-        values={{
-          date: (
-            <FormattedDate
-              key="accessExpirationBodyDate"
-              day="numeric"
-              month="short"
-              year="numeric"
-              value={expirationDate}
-              {...timezoneFormatArgs}
-            />
-          ),
-        }}
-      />
-      {deadlineMessage}
+      {/* eslint-disable-next-line react/no-danger */}
+      <div dangerouslySetInnerHTML={{ __html: rawHtml }} />
     </Alert>
   );
 }
 
 AccessExpirationAlert.propTypes = {
-  intl: intlShape.isRequired,
   payload: PropTypes.shape({
-    accessExpiration: PropTypes.shape({
-      expirationDate: PropTypes.string.isRequired,
-      masqueradingExpiredCourse: PropTypes.bool.isRequired,
-      upgradeDeadline: PropTypes.string,
-      upgradeUrl: PropTypes.string,
-    }).isRequired,
-    courseId: PropTypes.string.isRequired,
-    org: PropTypes.string.isRequired,
-    userTimezone: PropTypes.string.isRequired,
-    analyticsPageName: PropTypes.string.isRequired,
+    rawHtml: PropTypes.string.isRequired,
   }).isRequired,
 };
 
-export default injectIntl(AccessExpirationAlert);
+export default AccessExpirationAlert;

src/alerts/access-expiration-alert/AccessExpirationAlertMMP2P.jsx

@@ -1,80 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { FormattedDate, injectIntl } from '@edx/frontend-platform/i18n';
-import { Hyperlink } from '@edx/paragon';
-
-import { Alert, ALERT_TYPES } from '../../generic/user-messages';
-import messages from './messages';
-
-function AccessExpirationAlertMMP2P({ payload }) {
-  const {
-    accessExpiration,
-    userTimezone,
-  } = payload;
-  const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
-
-  if (!accessExpiration) {
-    return null;
-  }
-
-  const {
-    expirationDate,
-    upgradeDeadline,
-    upgradeUrl,
-  } = accessExpiration;
-
-  let deadlineMessage = null;
-  const formatDate = (val, key) => (
-    <FormattedDate
-      key={`accessExpiration.${key}`}
-      day="numeric"
-      month="short"
-      year="numeric"
-      value={val}
-      {...timezoneFormatArgs}
-    />
-  );
-
-  if (upgradeDeadline && upgradeUrl) {
-    deadlineMessage = (
-      <>
-        Upgrade by {formatDate(upgradeDeadline, 'upgradeDesc')} to unlock unlimited access to all course activities, including graded assignments.
-        &nbsp;
-        <Hyperlink
-          className="font-weight-bold"
-          style={{ textDecoration: 'underline' }}
-          destination={upgradeUrl}
-        >
-          {messages.upgradeNow.defaultMessage}
-        </Hyperlink>
-      </>
-    );
-  }
-
-  return (
-    <Alert type={ALERT_TYPES.INFO}>
-      <span className="font-weight-bold">
-        Unlock full course content by {formatDate(upgradeDeadline, 'upgradeTitle')}
-      </span>
-      <br />
-      {deadlineMessage}
-      <br />
-      You lose all access to the first two weeks of scheduled content
-      on {formatDate(expirationDate, 'expirationBody')}.
-    </Alert>
-  );
-}
-
-AccessExpirationAlertMMP2P.propTypes = {
-  payload: PropTypes.shape({
-    accessExpiration: PropTypes.shape({
-      expirationDate: PropTypes.string.isRequired,
-      masqueradingExpiredCourse: PropTypes.bool.isRequired,
-      upgradeDeadline: PropTypes.string,
-      upgradeUrl: PropTypes.string,
-    }).isRequired,
-    userTimezone: PropTypes.string.isRequired,
-  }).isRequired,
-};
-
-export default injectIntl(AccessExpirationAlertMMP2P);

src/alerts/access-expiration-alert/hooks.js

@@ -3,19 +3,15 @@ import { useAlert } from '../../generic/user-messages';
 
 const AccessExpirationAlert = React.lazy(() => import('./AccessExpirationAlert'));
 
-function useAccessExpirationAlert(accessExpiration, courseId, org, userTimezone, topic, analyticsPageName) {
-  const isVisible = !!accessExpiration; // If it exists, show it.
-  const payload = {
-    accessExpiration,
-    courseId,
-    org,
-    userTimezone,
-    analyticsPageName,
-  };
+function useAccessExpirationAlert(courseExpiredMessage, topic) {
+  const rawHtml = courseExpiredMessage || null;
+  const isVisible = !!rawHtml; // If it exists, show it.
+
+  const payload = useMemo(() => ({ rawHtml }), [rawHtml]);
 
   useAlert(isVisible, {
     code: 'clientAccessExpirationAlert',
-    payload: useMemo(() => payload, Object.values(payload).sort()),
+    payload,
     topic,
   });
 

src/alerts/access-expiration-alert/messages.js

@@ -1,10 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  upgradeNow: {
-    id: 'learning.accessExpiration.upgradeNow',
-    defaultMessage: 'Upgrade now',
-  },
-});
-
-export default messages;

src/alerts/enrollment-alert/EnrollmentAlert.jsx

@@ -5,7 +5,6 @@ import { Button } from '@edx/paragon';
 
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faSpinner } from '@fortawesome/free-solid-svg-icons';
-import { useModel } from '../../generic/model-store';
 import { Alert, ALERT_TYPES } from '../../generic/user-messages';
 
 import messages from './messages';
@@ -19,13 +18,8 @@ function EnrollmentAlert({ intl, payload }) {
     isStaff,
   } = payload;
 
-  const {
-    org,
-  } = useModel('courseHomeMeta', courseId);
-
   const { enrollClickHandler, loading } = useEnrollClickHandler(
     courseId,
-    org,
     intl.formatMessage(messages.success),
   );
 
@@ -39,8 +33,8 @@ function EnrollmentAlert({ intl, payload }) {
   }
 
   const button = canEnroll && (
-    <Button disabled={loading} variant="link" className="p-0 border-0 align-top" style={{ textDecoration: 'underline' }} onClick={enrollClickHandler}>
-      {intl.formatMessage(messages.enrollNowSentence)}
+    <Button disabled={loading} className="btn-link p-0 border-0 align-top" onClick={enrollClickHandler}>
+      {intl.formatMessage(messages.enroll)}
     </Button>
   );
 

src/alerts/enrollment-alert/hooks.js

@@ -1,9 +1,7 @@
 /* eslint-disable import/prefer-default-export */
 import React, {
-  useContext, useState, useCallback, useMemo,
+  useContext, useState, useCallback,
 } from 'react';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
-import { AppContext } from '@edx/frontend-platform/react';
 
 import { UserMessagesContext, ALERT_TYPES, useAlert } from '../../generic/user-messages';
 import { useModel } from '../../generic/model-store';
@@ -13,35 +11,25 @@ import { postCourseEnrollment } from './data/api';
 const EnrollmentAlert = React.lazy(() => import('./EnrollmentAlert'));
 
 export function useEnrollmentAlert(courseId) {
-  const { authenticatedUser } = useContext(AppContext);
-  const course = useModel('courseHomeMeta', courseId);
+  const course = useModel('courses', courseId);
   const outline = useModel('outline', courseId);
-  const enrolledUser = course && course.isEnrolled !== undefined && course.isEnrolled;
-  const privateOutline = outline && outline.courseBlocks && !outline.courseBlocks.courses;
-  /**
-   * This alert should render if
-   *    1. the user is not enrolled,
-   *    2. the user is authenticated, AND
-   *    3. the course is private.
-   */
-  const isVisible = !enrolledUser && authenticatedUser !== null && privateOutline;
-  const payload = {
-    canEnroll: outline && outline.enrollAlert ? outline.enrollAlert.canEnroll : false,
-    courseId,
-    extraText: outline && outline.enrollAlert ? outline.enrollAlert.extraText : '',
-    isStaff: course && course.isStaff,
-  };
+  const isVisible = course && course.isEnrolled !== undefined && !course.isEnrolled;
 
   useAlert(isVisible, {
     code: 'clientEnrollmentAlert',
-    payload: useMemo(() => payload, Object.values(payload).sort()),
+    payload: {
+      canEnroll: outline.enrollAlert.canEnroll,
+      courseId,
+      extraText: outline.enrollAlert.extraText,
+      isStaff: course.isStaff,
+    },
     topic: 'outline',
   });
 
   return { clientEnrollmentAlert: EnrollmentAlert };
 }
 
-export function useEnrollClickHandler(courseId, orgId, successText) {
+export function useEnrollClickHandler(courseId, successText) {
   const [loading, setLoading] = useState(false);
   const { addFlash } = useContext(UserMessagesContext);
   const enrollClickHandler = useCallback(() => {
@@ -55,10 +43,6 @@ export function useEnrollClickHandler(courseId, orgId, successText) {
         topic: 'course',
       });
       setLoading(false);
-      sendTrackEvent('edx.bi.user.course-home.enrollment', {
-        org_key: orgId,
-        courserun_key: courseId,
-      });
       global.location.reload();
     });
   }, [courseId]);

src/alerts/enrollment-alert/messages.js

@@ -11,15 +11,9 @@ const messages = defineMessages({
     defaultMessage: 'You are viewing this course as staff, and are not enrolled.',
     description: 'Message shown to indicate that a user is not enrolled, but is able to view a course anyway because they are staff. Shown as part of an alert, along with a link to enroll.',
   },
-  enrollNowInline: {
-    id: 'learning.enrollment.enrollNow.Inline',
-    defaultMessage: 'Enroll now',
-    description: 'A link prompting the user to click on it to enroll in the currently viewed course.'
-      + 'This text is meant to be used at the beginning of a sentence (example: Enroll now to view course content.)',
-  },
-  enrollNowSentence: {
-    id: 'learning.enrollment.enrollNow.Sentence',
-    defaultMessage: 'Enroll now.',
+  enroll: {
+    id: 'learning.enrollment.enroll.now',
+    defaultMessage: 'Enroll Now',
     description: 'A link prompting the user to click on it to enroll in the currently viewed course.',
   },
   success: {

src/alerts/logistration-alert/LogistrationAlert.jsx

@@ -2,30 +2,23 @@ import React from 'react';
 import { getConfig } from '@edx/frontend-platform';
 import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
 import { getLoginRedirectUrl } from '@edx/frontend-platform/auth';
-import { Hyperlink } from '@edx/paragon';
 
 import { Alert } from '../../generic/user-messages';
-import genericMessages from '../../generic/messages';
+import messages from './messages';
 
 function LogistrationAlert({ intl }) {
   const signIn = (
-    <Hyperlink
-      style={{ textDecoration: 'underline' }}
-      destination={`${getLoginRedirectUrl(global.location.href)}`}
-    >
-      {intl.formatMessage(genericMessages.signInLowercase)}
-    </Hyperlink>
+    <a href={`${getLoginRedirectUrl(global.location.href)}`}>
+      {intl.formatMessage(messages.login)}
+    </a>
   );
 
   // TODO: Pull this registration URL building out into a function, like the login one above.
   // This is complicated by the fact that we don't have a REGISTER_URL env variable available.
   const register = (
-    <Hyperlink
-      style={{ textDecoration: 'underline' }}
-      destination={`${getConfig().LMS_BASE_URL}/register?next=${encodeURIComponent(global.location.href)}`}
-    >
-      {intl.formatMessage(genericMessages.registerLowercase)}
-    </Hyperlink>
+    <a href={`${getConfig().LMS_BASE_URL}/register?next=${encodeURIComponent(global.location.href)}`}>
+      {intl.formatMessage(messages.register)}
+    </a>
   );
 
   return (
@@ -33,7 +26,7 @@ function LogistrationAlert({ intl }) {
       <FormattedMessage
         id="learning.logistration.alert"
         description="Prompts the user to sign in or register to see course content."
-        defaultMessage="To see course content, {signIn} or {register}."
+        defaultMessage="Please {signIn} or {register} to see course content."
         values={{
           signIn,
           register,

src/alerts/logistration-alert/hooks.js

@@ -2,20 +2,12 @@
 import React, { useContext } from 'react';
 import { AppContext } from '@edx/frontend-platform/react';
 import { ALERT_TYPES, useAlert } from '../../generic/user-messages';
-import { useModel } from '../../generic/model-store';
 
 const LogistrationAlert = React.lazy(() => import('./LogistrationAlert'));
 
-export function useLogistrationAlert(courseId) {
+export function useLogistrationAlert() {
   const { authenticatedUser } = useContext(AppContext);
-  const outline = useModel('outline', courseId);
-  const privateOutline = outline && outline.courseBlocks && !outline.courseBlocks.courses;
-  /**
-   * This alert should render if
-   *    1. the user is not authenticated, AND
-   *    2. the course is private.
-   */
-  const isVisible = authenticatedUser === null && privateOutline;
+  const isVisible = authenticatedUser === null;
 
   useAlert(isVisible, {
     code: 'clientLogistrationAlert',

src/alerts/logistration-alert/messages.js

@@ -0,0 +1,16 @@
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+  login: {
+    id: 'learning.logistration.login',
+    defaultMessage: 'sign in',
+    description: 'Text in a link, prompting the user to log in.  Used in "learning.logistration.alert"',
+  },
+  register: {
+    id: 'learning.logistration.register',
+    defaultMessage: 'register',
+    description: 'Text in a link, prompting the user to create an account.  Used in "learning.logistration.alert"',
+  },
+});
+
+export default messages;

src/alerts/offer-alert/OfferAlert.jsx

@@ -1,105 +1,24 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
-import {
-  FormattedMessage, FormattedDate, injectIntl, intlShape,
-} from '@edx/frontend-platform/i18n';
-import { Hyperlink } from '@edx/paragon';
 
 import { Alert, ALERT_TYPES } from '../../generic/user-messages';
-import { FormattedPricing } from '../../generic/upgrade-button';
-import messages from './messages';
 
-function OfferAlert({ intl, payload }) {
+function OfferAlert({ payload }) {
   const {
-    analyticsPageName,
-    courseId,
-    offer,
-    org,
-    userTimezone,
+    rawHtml,
   } = payload;
-
-  if (!offer) {
-    return null;
-  }
-
-  const {
-    code,
-    expirationDate,
-    percentage,
-    upgradeUrl,
-  } = offer;
-  const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
-
-  const logClick = () => {
-    sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
-      org_key: org,
-      courserun_key: courseId,
-      linkCategory: 'welcome',
-      linkName: `${analyticsPageName}_welcome`,
-      linkType: 'link',
-      pageName: analyticsPageName,
-    });
-  };
-
-  return (
+  return rawHtml && (
     <Alert type={ALERT_TYPES.INFO}>
-      <span className="font-weight-bold">
-        <FormattedMessage
-          id="learning.offer.header"
-          defaultMessage="Upgrade by {date} and save {percentage}% [{fullPricing}]"
-          values={{
-            date: (
-              <FormattedDate
-                key="offerDate"
-                day="numeric"
-                month="long"
-                value={expirationDate}
-                {...timezoneFormatArgs}
-              />
-            ),
-            fullPricing: <FormattedPricing offer={offer} />,
-            percentage,
-          }}
-        />
-      </span>
-      <br />
-      <FormattedMessage
-        id="learning.offer.code"
-        defaultMessage="Use code {code} at checkout!"
-        values={{
-          code: (<b>{code}</b>),
-        }}
-      />
-      &nbsp;
-      <Hyperlink
-        className="font-weight-bold"
-        style={{ textDecoration: 'underline' }}
-        destination={upgradeUrl}
-        onClick={logClick}
-      >
-        {intl.formatMessage(messages.upgradeNow)}
-      </Hyperlink>
+      {/* eslint-disable-next-line react/no-danger */}
+      <div dangerouslySetInnerHTML={{ __html: rawHtml }} />
     </Alert>
   );
 }
 
 OfferAlert.propTypes = {
-  intl: intlShape.isRequired,
   payload: PropTypes.shape({
-    courseId: PropTypes.string.isRequired,
-    offer: PropTypes.shape({
-      code: PropTypes.string.isRequired,
-      discountedPrice: PropTypes.string.isRequired,
-      expirationDate: PropTypes.string.isRequired,
-      originalPrice: PropTypes.string.isRequired,
-      percentage: PropTypes.number.isRequired,
-      upgradeUrl: PropTypes.string.isRequired,
-    }).isRequired,
-    org: PropTypes.string.isRequired,
-    userTimezone: PropTypes.string.isRequired,
-    analyticsPageName: PropTypes.string.isRequired,
+    rawHtml: PropTypes.string.isRequired,
   }).isRequired,
 };
 
-export default injectIntl(OfferAlert);
+export default OfferAlert;

src/alerts/offer-alert/hooks.js

@@ -1,22 +1,16 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { useAlert } from '../../generic/user-messages';
 
 const OfferAlert = React.lazy(() => import('./OfferAlert'));
 
-export function useOfferAlert(courseId, offer, org, userTimezone, topic, analyticsPageName) {
-  const isVisible = !!offer; // if it exists, show it.
-  const payload = {
-    analyticsPageName,
-    courseId,
-    offer,
-    org,
-    userTimezone,
-  };
+export function useOfferAlert(offerHtml, topic) {
+  const rawHtml = offerHtml || null;
+  const isVisible = !!rawHtml; // if it exists, show it.
 
   useAlert(isVisible, {
     code: 'clientOfferAlert',
     topic,
-    payload: useMemo(() => payload, Object.values(payload).sort()),
+    payload: { rawHtml },
   });
 
   return { clientOfferAlert: OfferAlert };

src/alerts/offer-alert/messages.js

@@ -1,10 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  upgradeNow: {
-    id: 'learning.offer.upgradeNow',
-    defaultMessage: 'Upgrade now',
-  },
-});
-
-export default messages;

src/course-header/AnonymousUserMenu.jsx

@@ -1,34 +0,0 @@
-import React from 'react';
-
-import { getConfig } from '@edx/frontend-platform';
-import { getLoginRedirectUrl } from '@edx/frontend-platform/auth';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Button } from '@edx/paragon';
-
-import genericMessages from '../generic/messages';
-
-function AnonymousUserMenu({ intl }) {
-  return (
-    <div>
-      <Button
-        className="mr-3"
-        variant="outline-primary"
-        href={`${getConfig().LMS_BASE_URL}/register?next=${encodeURIComponent(global.location.href)}`}
-      >
-        {intl.formatMessage(genericMessages.registerSentenceCase)}
-      </Button>
-      <Button
-        variant="primary"
-        href={`${getLoginRedirectUrl(global.location.href)}`}
-      >
-        {intl.formatMessage(genericMessages.signInSentenceCase)}
-      </Button>
-    </div>
-  );
-}
-
-AnonymousUserMenu.propTypes = {
-  intl: intlShape.isRequired,
-};
-
-export default injectIntl(AnonymousUserMenu);

src/course-header/AuthenticatedUserDropdown.jsx

@@ -1,74 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faUserCircle } from '@fortawesome/free-solid-svg-icons';
-
-import { getConfig } from '@edx/frontend-platform';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Dropdown } from '@edx/paragon';
-
-import messages from './messages';
-
-function AuthenticatedUserDropdown({ enterpriseLearnerPortalLink, intl, username }) {
-  let dashboardMenuItem = (
-    <Dropdown.Item href={`${getConfig().LMS_BASE_URL}/dashboard`}>
-      {intl.formatMessage(messages.dashboard)}
-    </Dropdown.Item>
-  );
-  if (enterpriseLearnerPortalLink && Object.keys(enterpriseLearnerPortalLink).length > 0) {
-    dashboardMenuItem = (
-      <Dropdown.Item
-        href={enterpriseLearnerPortalLink.href}
-      >
-        {enterpriseLearnerPortalLink.content}
-      </Dropdown.Item>
-    );
-  }
-  return (
-    <>
-      <a className="text-gray-700 mr-3" href={`${getConfig().SUPPORT_URL}`}>{intl.formatMessage(messages.help)}</a>
-      <Dropdown className="user-dropdown">
-        <Dropdown.Toggle variant="outline-primary">
-          <FontAwesomeIcon icon={faUserCircle} className="d-md-none" size="lg" />
-          <span data-hj-suppress className="d-none d-md-inline">
-            {username}
-          </span>
-        </Dropdown.Toggle>
-        <Dropdown.Menu className="dropdown-menu-right">
-          {dashboardMenuItem}
-          <Dropdown.Item href={`${getConfig().LMS_BASE_URL}/u/${username}`}>
-            {intl.formatMessage(messages.profile)}
-          </Dropdown.Item>
-          <Dropdown.Item href={`${getConfig().LMS_BASE_URL}/account/settings`}>
-            {intl.formatMessage(messages.account)}
-          </Dropdown.Item>
-          {!enterpriseLearnerPortalLink && (
-            // Users should only see Order History if they do not have an available
-            // learner portal, because an available learner portal currently means
-            // that they access content via Subscriptions, in which context an "order"
-            // is not relevant.
-            <Dropdown.Item href={getConfig().ORDER_HISTORY_URL}>
-              {intl.formatMessage(messages.orderHistory)}
-            </Dropdown.Item>
-          )}
-          <Dropdown.Item href={getConfig().LOGOUT_URL}>
-            {intl.formatMessage(messages.signOut)}
-          </Dropdown.Item>
-        </Dropdown.Menu>
-      </Dropdown>
-    </>
-  );
-}
-
-AuthenticatedUserDropdown.propTypes = {
-  enterpriseLearnerPortalLink: PropTypes.string,
-  intl: intlShape.isRequired,
-  username: PropTypes.string.isRequired,
-};
-
-AuthenticatedUserDropdown.defaultProps = {
-  enterpriseLearnerPortalLink: '',
-};
-
-export default injectIntl(AuthenticatedUserDropdown);

src/course-header/CourseTabsNavigation.jsx

@@ -14,7 +14,7 @@ function CourseTabsNavigation({
       <div className="container-fluid">
         <Tabs
           className="nav-underline-tabs"
-          aria-label={intl.formatMessage(messages.courseMaterial)}
+          aria-label={intl.formatMessage(messages['learn.navigation.course.tabs.label'])}
         >
           {tabs.map(({ url, title, slug }) => (
             <a

src/course-header/CourseTabsNavigation.test.jsx

@@ -1,34 +0,0 @@
-import React from 'react';
-import { initializeMockApp, render, screen } from '../setupTest';
-import { CourseTabsNavigation } from './index';
-
-describe('Course Tabs Navigation', () => {
-  beforeAll(async () => {
-    initializeMockApp();
-  });
-
-  it('renders without tabs', () => {
-    render(<CourseTabsNavigation tabs={[]} />);
-    expect(screen.getByRole('button', { name: 'More...' })).toBeInTheDocument();
-  });
-
-  it('renders with tabs', () => {
-    const tabs = [
-      { url: 'http://test-url1', title: 'Item 1', slug: 'test1' },
-      { url: 'http://test-url2', title: 'Item 2', slug: 'test2' },
-    ];
-    const mockData = {
-      tabs,
-      activeTabSlug: tabs[0].slug,
-    };
-    render(<CourseTabsNavigation {...mockData} />);
-
-    expect(screen.getByRole('link', { name: tabs[0].title }))
-      .toHaveAttribute('href', tabs[0].url)
-      .toHaveClass('active');
-
-    expect(screen.getByRole('link', { name: tabs[1].title }))
-      .toHaveAttribute('href', tabs[1].url)
-      .not.toHaveClass('active');
-  });
-});

src/course-header/Header.jsx

@@ -1,13 +1,13 @@
 import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
-import { useEnterpriseConfig } from '@edx/frontend-enterprise';
+import { Dropdown } from '@edx/paragon';
 import { getConfig } from '@edx/frontend-platform';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { AppContext } from '@edx/frontend-platform/react';
 
-import AnonymousUserMenu from './AnonymousUserMenu';
-import AuthenticatedUserDropdown from './AuthenticatedUserDropdown';
-import messages from './messages';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faUserCircle } from '@fortawesome/free-solid-svg-icons';
+
+import logo from './assets/logo.svg';
 
 function LinkedLogo({
   href,
@@ -28,54 +28,40 @@ LinkedLogo.propTypes = {
   alt: PropTypes.string.isRequired,
 };
 
-function Header({
-  courseOrg, courseNumber, courseTitle, intl,
+export default function Header({
+  courseOrg, courseNumber, courseTitle,
 }) {
   const { authenticatedUser } = useContext(AppContext);
 
-  const { enterpriseLearnerPortalLink, enterpriseCustomerBrandingConfig } = useEnterpriseConfig(
-    authenticatedUser,
-    getConfig().ENTERPRISE_LEARNER_PORTAL_HOSTNAME,
-    getConfig().LMS_BASE_URL,
-  );
-
-  let headerLogo = (
-    <LinkedLogo
-      className="logo"
-      href={`${getConfig().LMS_BASE_URL}/dashboard`}
-      src={getConfig().LOGO_URL}
-      alt={getConfig().SITE_NAME}
-    />
-  );
-  if (enterpriseCustomerBrandingConfig && Object.keys(enterpriseCustomerBrandingConfig).length > 0) {
-    headerLogo = (
-      <LinkedLogo
-        className="logo"
-        href={enterpriseCustomerBrandingConfig.logoDestination}
-        src={enterpriseCustomerBrandingConfig.logo}
-        alt={enterpriseCustomerBrandingConfig.logoAltText}
-      />
-    );
-  }
-
   return (
     <header className="course-header">
-      <a className="sr-only sr-only-focusable" href="#main-content">{intl.formatMessage(messages.skipNavLink)}</a>
-      <div className="container-fluid py-2 d-flex align-items-center">
-        {headerLogo}
+      <div className="container-fluid py-2 d-flex align-items-center ">
+        <LinkedLogo
+          className="logo"
+          href={`${getConfig().LMS_BASE_URL}/dashboard`}
+          src={logo}
+          alt={getConfig().SITE_NAME}
+        />
         <div className="flex-grow-1 course-title-lockup" style={{ lineHeight: 1 }}>
           <span className="d-block small m-0">{courseOrg} {courseNumber}</span>
           <span className="d-block m-0 font-weight-bold course-title">{courseTitle}</span>
         </div>
-        {authenticatedUser && (
-          <AuthenticatedUserDropdown
-            enterpriseLearnerPortalLink={enterpriseLearnerPortalLink}
-            username={authenticatedUser.username}
-          />
-        )}
-        {!authenticatedUser && (
-          <AnonymousUserMenu />
-        )}
+
+        <Dropdown className="user-dropdown">
+          <Dropdown.Button>
+            <FontAwesomeIcon icon={faUserCircle} className="d-md-none" size="lg" />
+            <span className="d-none d-md-inline">
+              {authenticatedUser.username}
+            </span>
+          </Dropdown.Button>
+          <Dropdown.Menu className="dropdown-menu-right">
+            <Dropdown.Item href={`${getConfig().LMS_BASE_URL}/dashboard`}>Dashboard</Dropdown.Item>
+            <Dropdown.Item href={`${getConfig().LMS_BASE_URL}/u/${authenticatedUser.username}`}>Profile</Dropdown.Item>
+            <Dropdown.Item href={`${getConfig().LMS_BASE_URL}/account/settings`}>Account</Dropdown.Item>
+            <Dropdown.Item href={getConfig().ORDER_HISTORY_URL}>Order History</Dropdown.Item>
+            <Dropdown.Item href={getConfig().LOGOUT_URL}>Sign Out</Dropdown.Item>
+          </Dropdown.Menu>
+        </Dropdown>
       </div>
     </header>
   );
@@ -85,7 +71,6 @@ Header.propTypes = {
   courseOrg: PropTypes.string,
   courseNumber: PropTypes.string,
   courseTitle: PropTypes.string,
-  intl: intlShape.isRequired,
 };
 
 Header.defaultProps = {
@@ -93,5 +78,3 @@ Header.defaultProps = {
   courseNumber: null,
   courseTitle: null,
 };
-
-export default injectIntl(Header);

src/course-header/Header.test.jsx

@@ -1,29 +0,0 @@
-import React from 'react';
-import {
-  authenticatedUser, initializeMockApp, render, screen,
-} from '../setupTest';
-import { Header } from './index';
-
-describe('Header', () => {
-  beforeAll(async () => {
-    // We need to mock AuthService to implicitly use `getAuthenticatedUser` within `AppContext.Provider`.
-    await initializeMockApp();
-  });
-
-  it('displays user button', () => {
-    render(<Header />);
-    expect(screen.getByRole('button')).toHaveTextContent(authenticatedUser.username);
-  });
-
-  it('displays course data', () => {
-    const courseData = {
-      courseOrg: 'course-org',
-      courseNumber: 'course-number',
-      courseTitle: 'course-title',
-    };
-    render(<Header {...courseData} />);
-
-    expect(screen.getByText(`${courseData.courseOrg} ${courseData.courseNumber}`)).toBeInTheDocument();
-    expect(screen.getByText(courseData.courseTitle)).toBeInTheDocument();
-  });
-});

src/course-header/assets/logo.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1168px" height="540px" viewBox="0 0 1168 540" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>logo</title>
+    <desc>Created with Sketch.</desc>
+    <g id="logo" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <polygon id="Path" fill="#209FDA" fill-rule="nonzero" points="1166.81993 85.5 1166.81993 2.84217094e-14 953.759925 2.84217094e-14 953.759925 85.5 1002.17993 85.5 915.859925 191.98 829.459925 85.5 878.099925 85.5 878.099925 2.84217094e-14 718.919925 2.84217094e-14 718.919925 95.72 856.479925 265.26 718.919925 434.96 718.919925 452.02 784.499925 452.02 784.499925 539.64 878.099925 539.64 878.099925 452.02 823.919925 452.02 915.919925 338.52 915.939925 338.52 1008.03993 452.02 953.759925 452.02 953.759925 539.64 1166.81993 539.64 1166.81993 452.02 1126.85993 452.02 975.319925 265.26 1121.01993 85.5"></polygon>
+        <polygon id="Path" fill="#026BA4" fill-rule="nonzero" points="664.019925 7.10542736e-15 664.019925 85.5 710.619925 85.5 718.919925 95.72 718.919925 7.10542736e-15"></polygon>
+        <polygon id="Path" fill="#026BA4" fill-rule="nonzero" points="718.919925 452.02 718.919925 434.96 705.079925 452.02 664.019925 452.02 664.019925 539.64 784.499925 539.64 784.499925 452.02"></polygon>
+        <path d="M321.999925,411.86 L397.659925,411.86 C388.805702,433.829527 376.258024,454.122269 360.559925,471.86 C344.364089,454.216816 331.320914,433.921419 321.999925,411.86" id="Path" fill="#78212E" fill-rule="nonzero"></path>
+        <path d="M360.559925,189.28 C338.58337,213.190393 322.501981,241.908137 313.599925,273.14 C317.134915,280.039338 320.007771,287.25831 322.179925,294.7 L397.059925,294.7 C399.306706,287.354671 402.25356,280.242036 405.859925,273.46 C397.464721,242.277678 381.959326,213.464341 360.559925,189.28 Z M322.179925,294.7 C328.784599,317.438017 328.978396,341.558795 322.739925,364.4 L396.399925,364.4 C389.855554,341.597488 390.06397,317.386469 396.999925,294.7 L322.179925,294.7 Z M322.179925,294.7 L308.679925,294.7 C304.690779,317.752715 304.575868,341.309464 308.339925,364.4 L322.739925,364.4 C328.978396,341.558795 328.784599,317.438017 322.179925,294.7 L322.179925,294.7 Z" id="Shape" fill="#78212E" fill-rule="nonzero"></path>
+        <path d="M710.619925,85.5 L664.019925,85.5 L664.019925,0.02 L576.019925,0.02 L576.019925,85.5 L632.859925,85.5 L632.859925,159.2 C598.417874,134.487772 557.04992,121.286425 514.659925,121.48 C456.044663,121.405246 400.107354,146.01621 360.559925,189.28 C381.937732,213.470272 397.422343,242.283149 405.799925,273.46 C426.944121,233.500977 468.451514,208.51034 513.659925,208.52 C581.059925,208.52 632.879925,263.16 632.879925,330.52 L632.879925,331.2 C632.539925,398.28 580.879925,452.56 513.659925,452.56 C468.477451,452.593197 426.976426,427.652566 405.799925,387.74 L405.799925,387.74 C401.869213,380.340239 398.718926,372.551658 396.399925,364.5 L308.399925,364.5 C309.686934,372.450225 311.443338,380.317312 313.659925,388.06 C315.970162,396.190434 318.775397,404.171995 322.059925,411.96 L397.659925,411.96 C388.805702,433.929527 376.258024,454.222269 360.559925,471.96 C400.107354,515.22379 456.044663,539.834754 514.659925,539.76 C571.465111,540.091874 625.745998,516.316729 664.019925,474.34 L664.019925,452.04 L705.059925,452.04 L718.899925,434.96 L718.899925,95.74 L710.619925,85.5 Z M632.879925,501.9 L632.879925,539.74 L664.019925,539.74 L664.019925,474.18 C654.623775,484.469293 644.18821,493.758755 632.879925,501.9 L632.879925,501.9 Z M313.599925,273.14 C311.569597,280.231983 309.927163,287.429316 308.679925,294.7 L322.179925,294.7 C320.007771,287.25831 317.134915,280.039338 313.599925,273.14 L313.599925,273.14 Z" id="Shape" fill="#8A8C8F" fill-rule="nonzero"></path>
+        <path d="M410.399925,294.7 C409.199925,287.5 407.659925,280.4 405.799925,273.46 C402.19356,280.242036 399.246706,287.354671 396.999925,294.7 C390.06397,317.386469 389.855554,341.597488 396.399925,364.4 L410.719925,364.4 C414.264276,341.293291 414.156293,317.77319 410.399925,294.7 L410.399925,294.7 Z M209.059925,121.48 C107.422724,121.487508 20.5081632,194.571683 3.05992537,294.7 L91.3999254,294.7 C107.135726,243.467257 154.465065,208.503753 208.059925,208.52 C252.638644,208.335148 293.496156,233.351373 313.599925,273.14 C322.501981,241.908137 338.58337,213.190393 360.559925,189.28 C322.206855,145.880863 266.976617,121.163964 209.059925,121.48 L209.059925,121.48 Z M297.479925,411.86 C275.077969,437.877726 242.392659,452.761934 208.059925,452.58 C153.691226,452.598435 105.87164,416.63791 90.7999254,364.4 L308.339925,364.4 C304.575868,341.309464 304.690779,317.752715 308.679925,294.7 L3.05992537,294.7 C-0.902504563,317.755068 -1.01739385,341.307372 2.71992537,364.4 L2.71992537,364.4 C19.3292424,465.441984 106.661918,539.594765 209.059925,539.6 C266.986094,539.900862 322.217868,515.161403 360.559925,471.74 C344.364089,454.096816 331.320914,433.801419 321.999925,411.74 L297.479925,411.86 Z" id="Shape" fill="#B72768" fill-rule="nonzero"></path>
+    </g>
+</svg>

src/course-header/messages.js

@@ -1,46 +1,11 @@
 import { defineMessages } from '@edx/frontend-platform/i18n';
 
 const messages = defineMessages({
-  courseMaterial: {
+  'learn.navigation.course.tabs.label': {
     id: 'learn.navigation.course.tabs.label',
     defaultMessage: 'Course Material',
     description: 'The accessible label for course tabs navigation',
   },
-  dashboard: {
-    id: 'header.menu.dashboard.label',
-    defaultMessage: 'Dashboard',
-    description: 'The text for the user menu Dashboard navigation link.',
-  },
-  help: {
-    id: 'header.help.label',
-    defaultMessage: 'Help',
-    description: 'The text for the link to the Help Center',
-  },
-  profile: {
-    id: 'header.menu.profile.label',
-    defaultMessage: 'Profile',
-    description: 'The text for the user menu Profile navigation link.',
-  },
-  account: {
-    id: 'header.menu.account.label',
-    defaultMessage: 'Account',
-    description: 'The text for the user menu Account navigation link.',
-  },
-  orderHistory: {
-    id: 'header.menu.orderHistory.label',
-    defaultMessage: 'Order History',
-    description: 'The text for the user menu Order History navigation link.',
-  },
-  skipNavLink: {
-    id: 'header.navigation.skipNavLink',
-    defaultMessage: 'Skip to main content.',
-    description: 'A link used by screen readers to allow users to skip to the main content of the page.',
-  },
-  signOut: {
-    id: 'header.menu.signOut.label',
-    defaultMessage: 'Sign Out',
-    description: 'The label for the user menu Sign Out action.',
-  },
 });
 
 export default messages;

src/course-home/data/__factories__/courseHomeMetadata.factory.js

@@ -1,13 +1,24 @@
 import { Factory } from 'rosie'; // eslint-disable-line import/no-extraneous-dependencies
 
-import courseMetadataBase from '../../../shared/data/__factories__/courseMetadataBase.factory';
-
 Factory.define('courseHomeMetadata')
-  .extend(courseMetadataBase)
+  .sequence(
+    'course_id',
+    (courseId) => `course-v1:edX+DemoX+Demo_Course_${courseId}`,
+  )
+  .option('courseTabs', [])
   .option('host', 'http://localhost:18000')
   .attrs({
+    is_staff: false,
+    original_user_is_staff: false,
+    number: 'DemoX',
+    org: 'edX',
     title: 'Demonstration Course',
     is_self_paced: false,
-    is_enrolled: false,
-    can_load_courseware: false,
-  });
+  })
+  .attr('tabs', ['courseTabs', 'host'], (courseTabs, host) => courseTabs.map(
+    tab => ({
+      tab_id: tab.slug,
+      title: tab.title,
+      url: `${host}${tab.url}`,
+    }),
+  ));

src/course-home/data/__factories__/datesTabData.factory.js

@@ -1,223 +1,27 @@
 import { Factory } from 'rosie'; // eslint-disable-line import/no-extraneous-dependencies
 
-// Sample data helpful when developing & testing, to see a variety of configurations.
-// This set of data is not realistic (mix of having access and not), but it
-// is intended to demonstrate many UI results.
 Factory.define('datesTabData')
   .attrs({
     dates_banner_info: {
       content_type_gating_enabled: false,
       missed_gated_content: false,
       missed_deadlines: false,
-      verified_upgrade_link: 'http://localhost:18130/basket/add/?sku=8CF08E5',
     },
     course_date_blocks: [
       {
-        date: '2020-05-01T17:59:41Z',
+        assigment_type: 'Homework',
+        date: '2013-02-05T05:00:00Z',
         date_type: 'course-start-date',
         description: '',
         learner_has_access: true,
         link: '',
         title: 'Course Starts',
-        extra_info: null,
-      },
-      {
-        assignment_type: 'Homework',
-        complete: true,
-        date: '2020-05-04T02:59:40.942669Z',
-        date_type: 'assignment-due-date',
-        description: '',
-        learner_has_access: true,
-        title: 'Multi Badges Completed',
-        extra_info: null,
-      },
-      {
-        assignment_type: 'Homework',
-        date: '2020-05-05T02:59:40.942669Z',
-        date_type: 'assignment-due-date',
-        description: '',
-        learner_has_access: true,
-        title: 'Multi Badges Past Due',
-        extra_info: null,
-      },
-      {
-        assignment_type: 'Homework',
-        date: '2020-05-27T02:59:40.942669Z',
-        date_type: 'assignment-due-date',
-        description: '',
-        learner_has_access: true,
-        link: 'https://example.com/',
-        title: 'Both Past Due 1',
-        extra_info: null,
-      },
-      {
-        assignment_type: 'Homework',
-        date: '2020-05-27T02:59:40.942669Z',
-        date_type: 'assignment-due-date',
-        description: '',
-        learner_has_access: true,
-        link: 'https://example.com/',
-        title: 'Both Past Due 2',
-        extra_info: null,
-      },
-      {
-        assignment_type: 'Homework',
-        complete: true,
-        date: '2020-05-28T08:59:40.942669Z',
-        date_type: 'assignment-due-date',
-        description: '',
-        learner_has_access: true,
-        link: 'https://example.com/',
-        title: 'One Completed/Due 1',
-        extra_info: null,
-      },
-      {
-        assignment_type: 'Homework',
-        date: '2020-05-28T08:59:40.942669Z',
-        date_type: 'assignment-due-date',
-        description: '',
-        learner_has_access: true,
-        link: 'https://example.com/',
-        title: 'One Completed/Due 2',
-        extra_info: null,
-      },
-      {
-        assignment_type: 'Homework',
-        complete: true,
-        date: '2020-05-29T08:59:40.942669Z',
-        date_type: 'assignment-due-date',
-        description: '',
-        learner_has_access: true,
-        link: 'https://example.com/',
-        title: 'Both Completed 1',
-        extra_info: null,
-      },
-      {
-        assignment_type: 'Homework',
-        complete: true,
-        date: '2020-05-29T08:59:40.942669Z',
-        date_type: 'assignment-due-date',
-        description: '',
-        learner_has_access: true,
-        link: 'https://example.com/',
-        title: 'Both Completed 2',
-        extra_info: null,
-      },
-      {
-        date: '2020-06-16T17:59:40.942669Z',
-        date_type: 'verified-upgrade-deadline',
-        description: "Don't miss the opportunity to highlight your new knowledge and skills by earning a verified certificate.",
-        learner_has_access: true,
-        link: 'https://example.com/',
-        title: 'Upgrade to Verified Certificate',
-        extra_info: null,
-      },
-      {
-        assignment_type: 'Homework',
-        date: '2030-08-17T05:59:40.942669Z',
-        date_type: 'assignment-due-date',
-        description: '',
-        learner_has_access: false,
-        link: 'https://example.com/',
-        title: 'One Verified 1',
-        extra_info: null,
-      },
-      {
-        assignment_type: 'Homework',
-        date: '2030-08-17T05:59:40.942669Z',
-        date_type: 'assignment-due-date',
-        description: '',
-        learner_has_access: true,
-        link: 'https://example.com/',
-        title: 'One Verified 2',
-        extra_info: null,
-      },
-      {
-        assignment_type: 'Homework',
-        date: '2030-08-17T05:59:40.942669Z',
-        date_type: 'assignment-due-date',
-        description: '',
-        learner_has_access: true,
-        link: 'https://example.com/',
-        title: 'ORA Verified 2',
-        extra_info: "ORA Dates are set by the instructor, and can't be changed",
-      },
-      {
-        assignment_type: 'Homework',
-        date: '2030-08-18T05:59:40.942669Z',
-        date_type: 'assignment-due-date',
-        description: '',
-        learner_has_access: false,
-        link: 'https://example.com/',
-        title: 'Both Verified 1',
-        extra_info: null,
-      },
-      {
-        assignment_type: 'Homework',
-        date: '2030-08-18T05:59:40.942669Z',
-        date_type: 'assignment-due-date',
-        description: '',
-        learner_has_access: false,
-        link: 'https://example.com/',
-        title: 'Both Verified 2',
-        extra_info: null,
-      },
-      {
-        assignment_type: 'Homework',
-        date: '2030-08-19T05:59:40.942669Z',
-        date_type: 'assignment-due-date',
-        description: '',
-        learner_has_access: true,
-        title: 'One Unreleased 1',
-      },
-      {
-        assignment_type: 'Homework',
-        date: '2030-08-19T05:59:40.942669Z',
-        date_type: 'assignment-due-date',
-        description: '',
-        learner_has_access: true,
-        link: 'https://example.com/',
-        title: 'One Unreleased 2',
-        extra_info: null,
-      },
-      {
-        assignment_type: 'Homework',
-        date: '2030-08-20T05:59:40.942669Z',
-        date_type: 'assignment-due-date',
-        description: '',
-        learner_has_access: true,
-        title: 'Both Unreleased 1',
-        extra_info: null,
-      },
-      {
-        assignment_type: 'Homework',
-        date: '2030-08-20T05:59:40.942669Z',
-        date_type: 'assignment-due-date',
-        description: '',
-        learner_has_access: true,
-        title: 'Both Unreleased 2',
-        extra_info: null,
-      },
-      {
-        date: '2030-08-23T00:00:00Z',
-        date_type: 'course-end-date',
-        description: '',
-        learner_has_access: true,
-        link: '',
-        title: 'Course Ends',
-        extra_info: null,
-      },
-      {
-        date: '2030-09-01T00:00:00Z',
-        date_type: 'verification-deadline-date',
-        description: 'You must successfully complete verification before this date to qualify for a Verified Certificate.',
-        learner_has_access: false,
-        link: 'https://example.com/',
-        title: 'Verification Deadline',
-        extra_info: null,
+        extraInfo: '',
       },
     ],
-    has_ended: false,
+    missed_deadlines: false,
+    missed_gated_content: false,
     learner_is_full_access: true,
-    user_timezone: 'America/New_York',
+    user_timezone: null,
+    verified_upgrade_link: 'http://localhost:18130/basket/add/?sku=8CF08E5',
   });

src/course-home/data/__factories__/index.js

@@ -1,4 +1,3 @@
 import './courseHomeMetadata.factory';
 import './datesTabData.factory';
 import './outlineTabData.factory';
-import './progressTabData.factory';

src/course-home/data/__factories__/outlineTabData.factory.js

@@ -1,62 +1,25 @@
 import { Factory } from 'rosie'; // eslint-disable-line import/no-extraneous-dependencies
 
-import { buildMinimalCourseBlocks } from '../../../shared/data/__factories__/courseBlocks.factory';
+import buildSimpleCourseBlocks from '../../../courseware/data/__factories__/courseBlocks.factory';
 
 Factory.define('outlineTabData')
   .option('courseId', 'course-v1:edX+DemoX+Demo_Course')
   .option('host', 'http://localhost:18000')
-  .option('date_blocks', [])
+  .attr('course_expired_html', [], () => '<div>Course expired</div>')
+  .attr('course_tools', ['host', 'courseId'], (host, courseId) => ({
+    analytics_id: 'edx.bookmarks',
+    title: 'Bookmarks',
+    url: `${host}/courses/${courseId}/bookmarks/`,
+  }))
   .attr('course_blocks', ['courseId'], courseId => {
-    const { courseBlocks } = buildMinimalCourseBlocks(courseId);
+    const { courseBlocks } = buildSimpleCourseBlocks(courseId);
     return {
       blocks: courseBlocks.blocks,
     };
   })
-  .attr('dates_widget', ['date_blocks'], (dateBlocks) => ({
-    course_date_blocks: dateBlocks,
-    user_timezone: 'UTC',
-  }))
-  .attr('resume_course', ['host', 'courseId'], (host, courseId) => ({
-    has_visited_course: false,
-    url: `${host}/courses/${courseId}/jump_to/block-v1:edX+Test+Block@12345abcde`,
-  }))
-  .attr('verified_mode', ['host'], (host) => ({
-    access_expiration_date: '2050-01-01T12:00:00',
-    currency: 'USD',
-    currency_symbol: '$',
-    price: 149,
-    sku: 'ABCD1234',
-    upgrade_url: `${host}/dashboard`,
-  }))
-  .attrs({
-    access_expiration: null,
-    can_show_upgrade_sock: false,
-    course_goals: {
-      goal_options: [],
-      selected_goal: null,
-    },
-    course_tools: [
-      {
-        analytics_id: 'edx.bookmarks',
-        title: 'Bookmarks',
-        url: 'https://example.com/bookmarks',
-      },
-      {
-        analytics_id: 'edx.tool.verified_upgrade',
-        title: 'Upgrade to Verified',
-        url: 'https://example.com/upgrade',
-      },
-    ],
-    dates_banner_info: {
-      content_type_gating_enabled: false,
-      missed_gated_content: false,
-      missed_deadlines: false,
-    },
-    enroll_alert: {
-      can_enroll: true,
-      extra_text: 'Contact the administrator.',
-    },
-    handouts_html: '<ul><li>Handout 1</li></ul>',
-    offer: null,
-    welcome_message_html: '<p>Welcome to this course!</p>',
-  });
+  .attr('enroll_alert', {
+    can_enroll: true,
+    extra_text: 'Contact the administrator.',
+  })
+  .attr('handouts_html', [], () => '<ul><li>Handout 1</li></ul>')
+  .attr('offer_html', [], () => '<div>Great offer here</div>');

src/course-home/data/__factories__/progressTabData.factory.js

@@ -1,71 +0,0 @@
-import { Factory } from 'rosie'; // eslint-disable-line import/no-extraneous-dependencies
-
-// Sample data helpful when developing & testing, to see a variety of configurations.
-// This set of data may not be realistic, but it is intended to demonstrate many UI results.
-Factory.define('progressTabData')
-  .attrs({
-    certificate_data: null,
-    completion_summary: {
-      complete_count: 1,
-      incomplete_count: 1,
-      locked_count: 0,
-    },
-    course_grade: {
-      percent: 0,
-      is_passing: false,
-    },
-    section_scores: [
-      {
-        display_name: 'First section',
-        subsections: [
-          {
-            assignment_type: 'Homework',
-            display_name: 'First subsection',
-            has_graded_assignment: true,
-            num_points_earned: 0,
-            num_points_possible: 1,
-            percent_graded: 0.0,
-            show_correctness: 'always',
-            show_grades: true,
-            url: 'http://learning.edx.org/course/course-v1:edX+Test+run/first_subsection',
-          },
-        ],
-      },
-      {
-        display_name: 'Second section',
-        subsections: [
-          {
-            assignment_type: 'Homework',
-            display_name: 'Second subsection',
-            has_graded_assignment: true,
-            num_points_earned: 1,
-            num_points_possible: 1,
-            percent_graded: 1.0,
-            show_correctness: 'always',
-            show_grades: true,
-            url: 'http://learning.edx.org/course/course-v1:edX+Test+run/second_subsection',
-          },
-        ],
-      },
-    ],
-    enrollment_mode: 'audit',
-    grading_policy: {
-      assignment_policies: [
-        {
-          num_droppable: 1,
-          short_label: 'HW',
-          type: 'Homework',
-          weight: 1,
-        },
-      ],
-      grade_range: {
-        pass: 0.75,
-      },
-    },
-    studio_url: 'http://studio.edx.org/settings/grading/course-v1:edX+Test+run',
-    verification_data: {
-      link: null,
-      status: 'none',
-      status_date: null,
-    },
-  });

src/course-home/data/__snapshots__/redux.test.js.snap

@@ -1,451 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Data layer integration tests Test fetchDatesTab Should fetch, normalize, and save metadata 1`] = `
-Object {
-  "courseHome": Object {
-    "courseId": "course-v1:edX+DemoX+Demo_Course_1",
-    "courseStatus": "loaded",
-    "toastBodyLink": null,
-    "toastBodyText": null,
-    "toastHeader": "",
-  },
-  "courseware": Object {
-    "courseId": null,
-    "courseStatus": "loading",
-    "sequenceId": null,
-    "sequenceStatus": "loading",
-  },
-  "models": Object {
-    "courseHomeMeta": Object {
-      "course-v1:edX+DemoX+Demo_Course_1": Object {
-        "canLoadCourseware": false,
-        "id": "course-v1:edX+DemoX+Demo_Course_1",
-        "isEnrolled": false,
-        "isSelfPaced": false,
-        "isStaff": false,
-        "number": "DemoX",
-        "org": "edX",
-        "originalUserIsStaff": false,
-        "tabs": Array [
-          Object {
-            "slug": "outline",
-            "title": "Course",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/course/",
-          },
-          Object {
-            "slug": "discussion",
-            "title": "Discussion",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/discussion/forum/",
-          },
-          Object {
-            "slug": "wiki",
-            "title": "Wiki",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/course_wiki",
-          },
-          Object {
-            "slug": "progress",
-            "title": "Progress",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/progress",
-          },
-          Object {
-            "slug": "instructor",
-            "title": "Instructor",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/instructor",
-          },
-          Object {
-            "slug": "dates",
-            "title": "Dates",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/dates",
-          },
-        ],
-        "title": "Demonstration Course",
-      },
-    },
-    "dates": Object {
-      "course-v1:edX+DemoX+Demo_Course_1": Object {
-        "courseDateBlocks": Array [
-          Object {
-            "date": "2020-05-01T17:59:41Z",
-            "dateType": "course-start-date",
-            "description": "",
-            "extraInfo": null,
-            "learnerHasAccess": true,
-            "link": "",
-            "title": "Course Starts",
-          },
-          Object {
-            "assignmentType": "Homework",
-            "complete": true,
-            "date": "2020-05-04T02:59:40.942669Z",
-            "dateType": "assignment-due-date",
-            "description": "",
-            "extraInfo": null,
-            "learnerHasAccess": true,
-            "title": "Multi Badges Completed",
-          },
-          Object {
-            "assignmentType": "Homework",
-            "date": "2020-05-05T02:59:40.942669Z",
-            "dateType": "assignment-due-date",
-            "description": "",
-            "extraInfo": null,
-            "learnerHasAccess": true,
-            "title": "Multi Badges Past Due",
-          },
-          Object {
-            "assignmentType": "Homework",
-            "date": "2020-05-27T02:59:40.942669Z",
-            "dateType": "assignment-due-date",
-            "description": "",
-            "extraInfo": null,
-            "learnerHasAccess": true,
-            "link": "https://example.com/",
-            "title": "Both Past Due 1",
-          },
-          Object {
-            "assignmentType": "Homework",
-            "date": "2020-05-27T02:59:40.942669Z",
-            "dateType": "assignment-due-date",
-            "description": "",
-            "extraInfo": null,
-            "learnerHasAccess": true,
-            "link": "https://example.com/",
-            "title": "Both Past Due 2",
-          },
-          Object {
-            "assignmentType": "Homework",
-            "complete": true,
-            "date": "2020-05-28T08:59:40.942669Z",
-            "dateType": "assignment-due-date",
-            "description": "",
-            "extraInfo": null,
-            "learnerHasAccess": true,
-            "link": "https://example.com/",
-            "title": "One Completed/Due 1",
-          },
-          Object {
-            "assignmentType": "Homework",
-            "date": "2020-05-28T08:59:40.942669Z",
-            "dateType": "assignment-due-date",
-            "description": "",
-            "extraInfo": null,
-            "learnerHasAccess": true,
-            "link": "https://example.com/",
-            "title": "One Completed/Due 2",
-          },
-          Object {
-            "assignmentType": "Homework",
-            "complete": true,
-            "date": "2020-05-29T08:59:40.942669Z",
-            "dateType": "assignment-due-date",
-            "description": "",
-            "extraInfo": null,
-            "learnerHasAccess": true,
-            "link": "https://example.com/",
-            "title": "Both Completed 1",
-          },
-          Object {
-            "assignmentType": "Homework",
-            "complete": true,
-            "date": "2020-05-29T08:59:40.942669Z",
-            "dateType": "assignment-due-date",
-            "description": "",
-            "extraInfo": null,
-            "learnerHasAccess": true,
-            "link": "https://example.com/",
-            "title": "Both Completed 2",
-          },
-          Object {
-            "date": "2020-06-16T17:59:40.942669Z",
-            "dateType": "verified-upgrade-deadline",
-            "description": "Don't miss the opportunity to highlight your new knowledge and skills by earning a verified certificate.",
-            "extraInfo": null,
-            "learnerHasAccess": true,
-            "link": "https://example.com/",
-            "title": "Upgrade to Verified Certificate",
-          },
-          Object {
-            "assignmentType": "Homework",
-            "date": "2030-08-17T05:59:40.942669Z",
-            "dateType": "assignment-due-date",
-            "description": "",
-            "extraInfo": null,
-            "learnerHasAccess": false,
-            "link": "https://example.com/",
-            "title": "One Verified 1",
-          },
-          Object {
-            "assignmentType": "Homework",
-            "date": "2030-08-17T05:59:40.942669Z",
-            "dateType": "assignment-due-date",
-            "description": "",
-            "extraInfo": null,
-            "learnerHasAccess": true,
-            "link": "https://example.com/",
-            "title": "One Verified 2",
-          },
-          Object {
-            "assignmentType": "Homework",
-            "date": "2030-08-17T05:59:40.942669Z",
-            "dateType": "assignment-due-date",
-            "description": "",
-            "extraInfo": "ORA Dates are set by the instructor, and can't be changed",
-            "learnerHasAccess": true,
-            "link": "https://example.com/",
-            "title": "ORA Verified 2",
-          },
-          Object {
-            "assignmentType": "Homework",
-            "date": "2030-08-18T05:59:40.942669Z",
-            "dateType": "assignment-due-date",
-            "description": "",
-            "extraInfo": null,
-            "learnerHasAccess": false,
-            "link": "https://example.com/",
-            "title": "Both Verified 1",
-          },
-          Object {
-            "assignmentType": "Homework",
-            "date": "2030-08-18T05:59:40.942669Z",
-            "dateType": "assignment-due-date",
-            "description": "",
-            "extraInfo": null,
-            "learnerHasAccess": false,
-            "link": "https://example.com/",
-            "title": "Both Verified 2",
-          },
-          Object {
-            "assignmentType": "Homework",
-            "date": "2030-08-19T05:59:40.942669Z",
-            "dateType": "assignment-due-date",
-            "description": "",
-            "learnerHasAccess": true,
-            "title": "One Unreleased 1",
-          },
-          Object {
-            "assignmentType": "Homework",
-            "date": "2030-08-19T05:59:40.942669Z",
-            "dateType": "assignment-due-date",
-            "description": "",
-            "extraInfo": null,
-            "learnerHasAccess": true,
-            "link": "https://example.com/",
-            "title": "One Unreleased 2",
-          },
-          Object {
-            "assignmentType": "Homework",
-            "date": "2030-08-20T05:59:40.942669Z",
-            "dateType": "assignment-due-date",
-            "description": "",
-            "extraInfo": null,
-            "learnerHasAccess": true,
-            "title": "Both Unreleased 1",
-          },
-          Object {
-            "assignmentType": "Homework",
-            "date": "2030-08-20T05:59:40.942669Z",
-            "dateType": "assignment-due-date",
-            "description": "",
-            "extraInfo": null,
-            "learnerHasAccess": true,
-            "title": "Both Unreleased 2",
-          },
-          Object {
-            "date": "2030-08-23T00:00:00Z",
-            "dateType": "course-end-date",
-            "description": "",
-            "extraInfo": null,
-            "learnerHasAccess": true,
-            "link": "",
-            "title": "Course Ends",
-          },
-          Object {
-            "date": "2030-09-01T00:00:00Z",
-            "dateType": "verification-deadline-date",
-            "description": "You must successfully complete verification before this date to qualify for a Verified Certificate.",
-            "extraInfo": null,
-            "learnerHasAccess": false,
-            "link": "https://example.com/",
-            "title": "Verification Deadline",
-          },
-        ],
-        "datesBannerInfo": Object {
-          "contentTypeGatingEnabled": false,
-          "missedDeadlines": false,
-          "missedGatedContent": false,
-          "verifiedUpgradeLink": "http://localhost:18130/basket/add/?sku=8CF08E5",
-        },
-        "hasEnded": false,
-        "id": "course-v1:edX+DemoX+Demo_Course_1",
-        "learnerIsFullAccess": true,
-        "userTimezone": "America/New_York",
-      },
-    },
-  },
-  "recommendations": Object {
-    "recommendationsStatus": "loading",
-  },
-}
-`;
-
-exports[`Data layer integration tests Test fetchOutlineTab Should fetch, normalize, and save metadata 1`] = `
-Object {
-  "courseHome": Object {
-    "courseId": "course-v1:edX+DemoX+Demo_Course_1",
-    "courseStatus": "loaded",
-    "toastBodyLink": null,
-    "toastBodyText": null,
-    "toastHeader": "",
-  },
-  "courseware": Object {
-    "courseId": null,
-    "courseStatus": "loading",
-    "sequenceId": null,
-    "sequenceStatus": "loading",
-  },
-  "models": Object {
-    "courseHomeMeta": Object {
-      "course-v1:edX+DemoX+Demo_Course_1": Object {
-        "canLoadCourseware": false,
-        "id": "course-v1:edX+DemoX+Demo_Course_1",
-        "isEnrolled": false,
-        "isSelfPaced": false,
-        "isStaff": false,
-        "number": "DemoX",
-        "org": "edX",
-        "originalUserIsStaff": false,
-        "tabs": Array [
-          Object {
-            "slug": "outline",
-            "title": "Course",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/course/",
-          },
-          Object {
-            "slug": "discussion",
-            "title": "Discussion",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/discussion/forum/",
-          },
-          Object {
-            "slug": "wiki",
-            "title": "Wiki",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/course_wiki",
-          },
-          Object {
-            "slug": "progress",
-            "title": "Progress",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/progress",
-          },
-          Object {
-            "slug": "instructor",
-            "title": "Instructor",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/instructor",
-          },
-          Object {
-            "slug": "dates",
-            "title": "Dates",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/dates",
-          },
-        ],
-        "title": "Demonstration Course",
-      },
-    },
-    "outline": Object {
-      "course-v1:edX+DemoX+Demo_Course_1": Object {
-        "accessExpiration": null,
-        "canShowUpgradeSock": false,
-        "courseBlocks": Object {
-          "courses": Object {
-            "block-v1:edX+DemoX+Demo_Course+type@course+block@bcdabcdabcdabcdabcdabcdabcdabcd3": Object {
-              "effortActivities": undefined,
-              "effortTime": undefined,
-              "id": "course-v1:edX+DemoX+Demo_Course_1",
-              "sectionIds": Array [
-                "block-v1:edX+DemoX+Demo_Course+type@chapter+block@bcdabcdabcdabcdabcdabcdabcdabcd2",
-              ],
-              "title": "bcdabcdabcdabcdabcdabcdabcdabcd3",
-            },
-          },
-          "sections": Object {
-            "block-v1:edX+DemoX+Demo_Course+type@chapter+block@bcdabcdabcdabcdabcdabcdabcdabcd2": Object {
-              "complete": false,
-              "courseId": "course-v1:edX+DemoX+Demo_Course_1",
-              "effortActivities": 2,
-              "effortTime": 15,
-              "id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@bcdabcdabcdabcdabcdabcdabcdabcd2",
-              "resumeBlock": false,
-              "sequenceIds": Array [
-                "block-v1:edX+DemoX+Demo_Course+type@sequential+block@bcdabcdabcdabcdabcdabcdabcdabcd1",
-              ],
-              "title": "Title of Section",
-            },
-          },
-          "sequences": Object {
-            "block-v1:edX+DemoX+Demo_Course+type@sequential+block@bcdabcdabcdabcdabcdabcdabcdabcd1": Object {
-              "complete": false,
-              "description": null,
-              "due": null,
-              "effortActivities": undefined,
-              "effortTime": undefined,
-              "icon": null,
-              "id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@bcdabcdabcdabcdabcdabcdabcdabcd1",
-              "legacyWebUrl": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/jump_to/block-v1:edX+DemoX+Demo_Course+type@sequential+block@bcdabcdabcdabcdabcdabcdabcdabcd1?experience=legacy",
-              "sectionId": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@bcdabcdabcdabcdabcdabcdabcdabcd2",
-              "showLink": true,
-              "title": "Title of Sequence",
-            },
-          },
-        },
-        "courseGoals": Object {
-          "goalOptions": Array [],
-          "selectedGoal": null,
-        },
-        "courseTools": Array [
-          Object {
-            "analyticsId": "edx.bookmarks",
-            "title": "Bookmarks",
-            "url": "https://example.com/bookmarks",
-          },
-          Object {
-            "analyticsId": "edx.tool.verified_upgrade",
-            "title": "Upgrade to Verified",
-            "url": "https://example.com/upgrade",
-          },
-        ],
-        "datesBannerInfo": Object {
-          "contentTypeGatingEnabled": false,
-          "missedDeadlines": false,
-          "missedGatedContent": false,
-        },
-        "datesWidget": Object {
-          "courseDateBlocks": Array [],
-          "userTimezone": "UTC",
-        },
-        "enrollAlert": Object {
-          "canEnroll": true,
-          "extraText": "Contact the administrator.",
-        },
-        "handoutsHtml": "<ul><li>Handout 1</li></ul>",
-        "hasEnded": undefined,
-        "id": "course-v1:edX+DemoX+Demo_Course_1",
-        "offer": null,
-        "resumeCourse": Object {
-          "hasVisitedCourse": false,
-          "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/jump_to/block-v1:edX+Test+Block@12345abcde",
-        },
-        "verifiedMode": Object {
-          "accessExpirationDate": "2050-01-01T12:00:00",
-          "currency": "USD",
-          "currencySymbol": "$",
-          "price": 149,
-          "sku": "ABCD1234",
-          "upgradeUrl": "http://localhost:18000/dashboard",
-        },
-        "welcomeMessageHtml": "<p>Welcome to this course!</p>",
-      },
-    },
-  },
-  "recommendations": Object {
-    "recommendationsStatus": "loading",
-  },
-}
-`;

src/course-home/data/api.js

@@ -1,115 +1,27 @@
 import { camelCaseObject, getConfig } from '@edx/frontend-platform';
 import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
-import { logInfo } from '@edx/frontend-platform/logging';
-import { appendBrowserTimezoneToUrl } from '../../utils';
+// TODO: Pull this normalization function up so we're not reaching into courseware
+import { normalizeBlocks } from '../../courseware/data/api';
 
 function normalizeCourseHomeCourseMetadata(metadata) {
   const data = camelCaseObject(metadata);
   return {
     ...data,
     tabs: data.tabs.map(tab => ({
-      // The API uses "courseware" as a slug for both courseware and the outline tab. We switch it to "outline" here for
-      // use within the MFE to differentiate between course home and courseware.
-      slug: tab.tabId === 'courseware' ? 'outline' : tab.tabId,
+      slug: tab.tabId,
       title: tab.title,
       url: tab.url,
     })),
   };
 }
 
-export function normalizeOutlineBlocks(courseId, blocks) {
-  const models = {
-    courses: {},
-    sections: {},
-    sequences: {},
-  };
-  Object.values(blocks).forEach(block => {
-    switch (block.type) {
-      case 'course':
-        models.courses[block.id] = {
-          effortActivities: block.effort_activities,
-          effortTime: block.effort_time,
-          id: courseId,
-          title: block.display_name,
-          sectionIds: block.children || [],
-        };
-        break;
-
-      case 'chapter':
-        models.sections[block.id] = {
-          complete: block.complete,
-          effortActivities: block.effort_activities,
-          effortTime: block.effort_time,
-          id: block.id,
-          title: block.display_name,
-          resumeBlock: block.resume_block,
-          sequenceIds: block.children || [],
-        };
-        break;
-
-      case 'sequential':
-        models.sequences[block.id] = {
-          complete: block.complete,
-          description: block.description,
-          due: block.due,
-          effortActivities: block.effort_activities,
-          effortTime: block.effort_time,
-          icon: block.icon,
-          id: block.id,
-          legacyWebUrl: block.legacy_web_url,
-          // The presence of an legacy URL for the sequence indicates that we want this
-          // sequence to be a clickable link in the outline (even though, if the new
-          // courseware experience is active, we will ignore `legacyWebUrl` and build a
-          // link to the MFE ourselves).
-          showLink: !!block.legacy_web_url,
-          title: block.display_name,
-        };
-        break;
-
-      default:
-        logInfo(`Unexpected course block type: ${block.type} with ID ${block.id}.  Expected block types are course, chapter, and sequential.`);
-    }
-  });
-
-  // Next go through each list and use their child lists to decorate those children with a
-  // reference back to their parent.
-  Object.values(models.courses).forEach(course => {
-    if (Array.isArray(course.sectionIds)) {
-      course.sectionIds.forEach(sectionId => {
-        const section = models.sections[sectionId];
-        section.courseId = course.id;
-      });
-    }
-  });
-
-  Object.values(models.sections).forEach(section => {
-    if (Array.isArray(section.sequenceIds)) {
-      section.sequenceIds.forEach(sequenceId => {
-        if (sequenceId in models.sequences) {
-          models.sequences[sequenceId].sectionId = section.id;
-        } else {
-          logInfo(`Section ${section.id} has child block ${sequenceId}, but that block is not in the list of sequences.`);
-        }
-      });
-    }
-  });
-
-  return models;
-}
-
 export async function getCourseHomeCourseMetadata(courseId) {
-  let url = `${getConfig().LMS_BASE_URL}/api/course_home/v1/course_metadata/${courseId}`;
-  url = appendBrowserTimezoneToUrl(url);
+  const url = `${getConfig().LMS_BASE_URL}/api/course_home/v1/course_metadata/${courseId}`;
   const { data } = await getAuthenticatedHttpClient().get(url);
   return normalizeCourseHomeCourseMetadata(data);
 }
 
-// For debugging purposes, you might like to see a fully loaded dates tab.
-// Just uncomment the next few lines and the immediate 'return' in the function below
-// import { Factory } from 'rosie';
-// import './__factories__';
 export async function getDatesTabData(courseId) {
-  // return camelCaseObject(Factory.build('datesTabData'));
   const url = `${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`;
   try {
     const { data } = await getAuthenticatedHttpClient().get(url);
@@ -120,9 +32,6 @@ export async function getDatesTabData(courseId) {
       global.location.replace(`${getConfig().LMS_BASE_URL}/courses/${courseId}/dates`);
       return {};
     }
-    if (httpErrorStatus === 401) {
-      global.location.replace(`${getConfig().BASE_URL}/course/${courseId}/home`);
-    }
     throw error;
   }
 }
@@ -142,23 +51,6 @@ export async function getProgressTabData(courseId) {
   }
 }
 
-export async function getProctoringInfoData(courseId, username) {
-  let url = `${getConfig().LMS_BASE_URL}/api/edx_proctoring/v1/user_onboarding/status?course_id=${encodeURIComponent(courseId)}`;
-  if (username) {
-    url += `&username=${encodeURIComponent(username)}`;
-  }
-  try {
-    const { data } = await getAuthenticatedHttpClient().get(url);
-    return data;
-  } catch (error) {
-    const { httpErrorStatus } = error && error.customAttributes;
-    if (httpErrorStatus === 404) {
-      return {};
-    }
-    throw error;
-  }
-}
-
 export async function getOutlineTabData(courseId) {
   const url = `${getConfig().LMS_BASE_URL}/api/course_home/v1/outline/${courseId}`;
   let { tabData } = {};
@@ -176,50 +68,30 @@ export async function getOutlineTabData(courseId) {
   const {
     data,
   } = tabData;
-  const accessExpiration = camelCaseObject(data.access_expiration);
-  const canShowUpgradeSock = data.can_show_upgrade_sock;
-  const courseBlocks = data.course_blocks ? normalizeOutlineBlocks(courseId, data.course_blocks.blocks) : {};
-  const courseGoals = camelCaseObject(data.course_goals);
+  const courseBlocks = normalizeBlocks(courseId, data.course_blocks.blocks);
+  const courseExpiredHtml = data.course_expired_html;
   const courseTools = camelCaseObject(data.course_tools);
-  const datesBannerInfo = camelCaseObject(data.dates_banner_info);
   const datesWidget = camelCaseObject(data.dates_widget);
   const enrollAlert = camelCaseObject(data.enroll_alert);
   const handoutsHtml = data.handouts_html;
-  const hasEnded = data.has_ended;
-  const offer = camelCaseObject(data.offer);
-  const resumeCourse = camelCaseObject(data.resume_course);
-  const verifiedMode = camelCaseObject(data.verified_mode);
+  const offerHtml = data.offer_html;
   const welcomeMessageHtml = data.welcome_message_html;
 
   return {
-    accessExpiration,
-    canShowUpgradeSock,
     courseBlocks,
-    courseGoals,
+    courseExpiredHtml,
     courseTools,
-    datesBannerInfo,
     datesWidget,
     enrollAlert,
     handoutsHtml,
-    hasEnded,
-    offer,
-    resumeCourse,
-    verifiedMode,
+    offerHtml,
     welcomeMessageHtml,
   };
 }
 
-export async function postCourseDeadlines(courseId, model) {
+export async function postCourseDeadlines(courseId) {
   const url = new URL(`${getConfig().LMS_BASE_URL}/api/course_experience/v1/reset_course_deadlines`);
-  return getAuthenticatedHttpClient().post(url.href, {
-    course_key: courseId,
-    research_event_data: { location: `${model}-tab` },
-  });
-}
-
-export async function postCourseGoals(courseId, goalKey) {
-  const url = new URL(`${getConfig().LMS_BASE_URL}/api/course_home/v1/save_course_goal`);
-  return getAuthenticatedHttpClient().post(url.href, { course_id: courseId, goal_key: goalKey });
+  await getAuthenticatedHttpClient().post(url.href, { course_key: courseId });
 }
 
 export async function postDismissWelcomeMessage(courseId) {
@@ -231,11 +103,3 @@ export async function postRequestCert(courseId) {
   const url = new URL(`${getConfig().LMS_BASE_URL}/courses/${courseId}/generate_user_cert`);
   await getAuthenticatedHttpClient().post(url.href);
 }
-
-export async function executePostFromPostEvent(postData, researchEventData) {
-  const url = new URL(postData.url);
-  return getAuthenticatedHttpClient().post(url.href, {
-    course_key: postData.bodyParams.courseId,
-    research_event_data: researchEventData,
-  });
-}

src/course-home/data/index.js

@@ -3,7 +3,6 @@ export {
   fetchOutlineTab,
   fetchProgressTab,
   resetDeadlines,
-  saveCourseGoal,
 } from './thunks';
 
 export { reducer } from './slice';

src/course-home/data/redux.test.js

@@ -1,25 +1,34 @@
 import { Factory } from 'rosie';
 import MockAdapter from 'axios-mock-adapter';
-
 import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 import { getConfig } from '@edx/frontend-platform';
 
-import * as thunks from './thunks';
-
-import { appendBrowserTimezoneToUrl, executeThunk } from '../../utils';
-
-import { initializeMockApp } from '../../setupTest';
+import { COURSE_LOADED, COURSE_LOADING, COURSE_FAILED } from '../../active-course';
+import initializeMockApp from '../../setupTest';
 import initializeStore from '../../store';
+import executeThunk from '../../utils';
+
+import * as thunks from './thunks';
 
 const { loggingService } = initializeMockApp();
 
 const axiosMock = new MockAdapter(getAuthenticatedHttpClient());
 
 describe('Data layer integration tests', () => {
-  const courseHomeMetadata = Factory.build('courseHomeMetadata');
-  const { id: courseId } = courseHomeMetadata;
-  let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/course_metadata/${courseId}`;
-  courseMetadataUrl = appendBrowserTimezoneToUrl(courseMetadataUrl);
+  const courseMetadata = Factory.build('courseMetadata');
+  const courseHomeMetadata = Factory.build(
+    'courseHomeMetadata', {
+      course_id: courseMetadata.id,
+    },
+    { courseTabs: courseMetadata.tabs },
+  );
+
+  const courseId = courseMetadata.id;
+  const courseBaseUrl = `${getConfig().LMS_BASE_URL}/api/courseware/course`;
+  const courseMetadataBaseUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/course_metadata`;
+
+  const courseUrl = `${courseBaseUrl}/${courseId}`;
+  const courseMetadataUrl = `${courseMetadataBaseUrl}/${courseId}`;
 
   let store;
 
@@ -30,17 +39,23 @@ describe('Data layer integration tests', () => {
     store = initializeStore();
   });
 
+  it('Should initialize store', () => {
+    expect(store.getState().activeCourse.courseId).toBeNull();
+    expect(store.getState().activeCourse.courseStatus).toEqual(COURSE_LOADING);
+  });
+
   describe('Test fetchDatesTab', () => {
     const datesBaseUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/dates`;
 
     it('Should fail to fetch if error occurs', async () => {
+      axiosMock.onGet(courseUrl).networkError();
       axiosMock.onGet(courseMetadataUrl).networkError();
       axiosMock.onGet(`${datesBaseUrl}/${courseId}`).networkError();
 
       await executeThunk(thunks.fetchDatesTab(courseId), store.dispatch);
 
       expect(loggingService.logError).toHaveBeenCalled();
-      expect(store.getState().courseHome.courseStatus).toEqual('failed');
+      expect(store.getState().activeCourse.courseStatus).toEqual(COURSE_FAILED);
     });
 
     it('Should fetch, normalize, and save metadata', async () => {
@@ -48,14 +63,38 @@ describe('Data layer integration tests', () => {
 
       const datesUrl = `${datesBaseUrl}/${courseId}`;
 
+      axiosMock.onGet(courseUrl).reply(200, courseMetadata);
       axiosMock.onGet(courseMetadataUrl).reply(200, courseHomeMetadata);
       axiosMock.onGet(datesUrl).reply(200, datesTabData);
 
       await executeThunk(thunks.fetchDatesTab(courseId), store.dispatch);
 
       const state = store.getState();
-      expect(state.courseHome.courseStatus).toEqual('loaded');
-      expect(state).toMatchSnapshot();
+      expect(state.activeCourse.courseStatus).toEqual(COURSE_LOADED);
+      expect(state.activeCourse.courseId).toEqual(courseId);
+      expect(state.courseHome.displayResetDatesToast).toBe(false);
+
+      // Validate course
+      const course = state.models.courses[courseId];
+      const expectedFieldCount = Object.keys(course).length;
+      // If this breaks, you should consider adding assertions below for the new data.  If it's not
+      // an "interesting" addition, just bump the number anyway.
+      expect(expectedFieldCount).toBe(9);
+      expect(course.title).toEqual(courseHomeMetadata.title);
+
+      // Representative sample of data that proves data normalization and ingestion happened.
+      expect(course.id).toEqual(courseId);
+      expect(course.isStaff).toBe(courseHomeMetadata.is_staff);
+      expect(course.number).toEqual(courseHomeMetadata.number);
+      expect(Array.isArray(course.tabs)).toBe(true);
+      expect(course.tabs.length).toBe(5); // Weak assertion, but proves the array made it through.
+
+      // This proves the tab type came through as a modelType.  We don't need to assert much else
+      // here because the shape of this data is not passed through any sort of normalization scheme,
+      // it just gets camelCased.
+      const dates = state.models.dates[courseId];
+      expect(dates.id).toEqual(courseId);
+      expect(dates.verifiedUpgradeLink).toBe(datesTabData.verified_upgrade_link);
     });
   });
 
@@ -63,13 +102,14 @@ describe('Data layer integration tests', () => {
     const outlineBaseUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/outline`;
 
     it('Should result in fetch failure if error occurs', async () => {
+      axiosMock.onGet(courseUrl).networkError();
       axiosMock.onGet(courseMetadataUrl).networkError();
       axiosMock.onGet(`${outlineBaseUrl}/${courseId}`).networkError();
 
       await executeThunk(thunks.fetchOutlineTab(courseId), store.dispatch);
 
       expect(loggingService.logError).toHaveBeenCalled();
-      expect(store.getState().courseHome.courseStatus).toEqual('failed');
+      expect(store.getState().activeCourse.courseStatus).toEqual(COURSE_FAILED);
     });
 
     it('Should fetch, normalize, and save metadata', async () => {
@@ -77,43 +117,53 @@ describe('Data layer integration tests', () => {
 
       const outlineUrl = `${outlineBaseUrl}/${courseId}`;
 
+      axiosMock.onGet(courseUrl).reply(200, courseMetadata);
       axiosMock.onGet(courseMetadataUrl).reply(200, courseHomeMetadata);
       axiosMock.onGet(outlineUrl).reply(200, outlineTabData);
 
       await executeThunk(thunks.fetchOutlineTab(courseId), store.dispatch);
 
       const state = store.getState();
-      expect(state.courseHome.courseStatus).toEqual('loaded');
-      expect(state).toMatchSnapshot();
-    });
-  });
+      expect(state.activeCourse.courseStatus).toEqual(COURSE_LOADED);
+      expect(state.courseHome.displayResetDatesToast).toBe(false);
 
-  describe('Test saveCourseGoal', () => {
-    it('Should save course goal', async () => {
-      const goalUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/save_course_goal`;
-      axiosMock.onPost(goalUrl).reply(200, {});
+      // Validate course
+      const course = state.models.courses[courseId];
+      const expectedFieldCount = Object.keys(course).length;
+      // If this breaks, you should consider adding assertions below for the new data.  If it's not
+      // an "interesting" addition, just bump the number anyway.
+      expect(expectedFieldCount).toBe(9);
+      expect(course.title).toEqual(courseHomeMetadata.title);
 
-      await thunks.saveCourseGoal(courseId, 'unsure');
+      // Representative sample of data that proves data normalization and ingestion happened.
+      expect(course.id).toEqual(courseId);
+      expect(course.isStaff).toBe(courseHomeMetadata.is_staff);
+      expect(course.number).toEqual(courseHomeMetadata.number);
+      expect(Array.isArray(course.tabs)).toBe(true);
+      expect(course.tabs.length).toBe(5); // Weak assertion, but proves the array made it through.
 
-      expect(axiosMock.history.post[0].url).toEqual(goalUrl);
-      expect(axiosMock.history.post[0].data).toEqual(`{"course_id":"${courseId}","goal_key":"unsure"}`);
+      // This proves the tab type came through as a modelType.  We don't need to assert much else
+      // here because the shape of this data is not passed through any sort of normalization scheme,
+      // it just gets camelCased.
+      const outline = state.models.outline[courseId];
+      expect(outline.id).toEqual(courseId);
+      expect(outline.handoutsHtml).toBe(outlineTabData.handouts_html);
     });
   });
 
   describe('Test resetDeadlines', () => {
     it('Should reset course deadlines', async () => {
       const resetUrl = `${getConfig().LMS_BASE_URL}/api/course_experience/v1/reset_course_deadlines`;
-      const model = 'dates';
-      axiosMock.onPost(resetUrl).reply(201, {});
+      axiosMock.onPost(resetUrl).reply(201);
 
       const getTabDataMock = jest.fn(() => ({
         type: 'MOCK_ACTION',
       }));
 
-      await executeThunk(thunks.resetDeadlines(courseId, model, getTabDataMock), store.dispatch);
+      await executeThunk(thunks.resetDeadlines(courseId, getTabDataMock), store.dispatch);
 
       expect(axiosMock.history.post[0].url).toEqual(resetUrl);
-      expect(axiosMock.history.post[0].data).toEqual(`{"course_key":"${courseId}","research_event_data":{"location":"dates-tab"}}`);
+      expect(axiosMock.history.post[0].data).toEqual(`{"course_key":"${courseId}"}`);
 
       expect(getTabDataMock).toHaveBeenCalledWith(courseId);
     });

src/course-home/data/slice.js

@@ -1,50 +1,20 @@
 /* eslint-disable no-param-reassign */
 import { createSlice } from '@reduxjs/toolkit';
 
-export const LOADING = 'loading';
-export const LOADED = 'loaded';
-export const FAILED = 'failed';
-
 const slice = createSlice({
   name: 'course-home',
   initialState: {
-    courseStatus: 'loading',
-    courseId: null,
-    toastBodyText: null,
-    toastBodyLink: null,
-    toastHeader: '',
+    displayResetDatesToast: false,
   },
   reducers: {
-    fetchTabRequest: (state, { payload }) => {
-      state.courseId = payload.courseId;
-      state.courseStatus = LOADING;
-    },
-    fetchTabSuccess: (state, { payload }) => {
-      state.courseId = payload.courseId;
-      state.courseStatus = LOADED;
-    },
-    fetchTabFailure: (state, { payload }) => {
-      state.courseId = payload.courseId;
-      state.courseStatus = FAILED;
-    },
-    setCallToActionToast: (state, { payload }) => {
-      const {
-        header,
-        link,
-        linkText,
-      } = payload;
-      state.toastBodyLink = link;
-      state.toastBodyText = linkText;
-      state.toastHeader = header;
+    toggleResetDatesToast: (state, { payload }) => {
+      state.displayResetDatesToast = payload.displayResetDatesToast;
     },
   },
 });
 
 export const {
-  fetchTabRequest,
-  fetchTabSuccess,
-  fetchTabFailure,
-  setCallToActionToast,
+  toggleResetDatesToast,
 } = slice.actions;
 
 export const {

src/course-home/data/thunks.js

@@ -1,13 +1,10 @@
 import { logError } from '@edx/frontend-platform/logging';
-import { camelCaseObject } from '@edx/frontend-platform';
 import {
-  executePostFromPostEvent,
   getCourseHomeCourseMetadata,
   getDatesTabData,
   getOutlineTabData,
   getProgressTabData,
   postCourseDeadlines,
-  postCourseGoals,
   postDismissWelcomeMessage,
   postRequestCert,
 } from './api';
@@ -17,19 +14,19 @@ import {
 } from '../../generic/model-store';
 
 import {
-  fetchTabFailure,
-  fetchTabRequest,
-  fetchTabSuccess,
-  setCallToActionToast,
-} from './slice';
+  fetchCourseRequest,
+  fetchCourseSuccess,
+  fetchCourseFailure,
+} from '../../active-course';
 
-const eventTypes = {
-  POST_EVENT: 'post_event',
-};
+import {
+  toggleResetDatesToast,
+} from './slice';
 
 export function fetchTab(courseId, tab, getTabData) {
   return async (dispatch) => {
-    dispatch(fetchTabRequest({ courseId }));
+    dispatch(fetchCourseRequest({ courseId }));
+
     Promise.allSettled([
       getCourseHomeCourseMetadata(courseId),
       getTabData(courseId),
@@ -39,7 +36,7 @@ export function fetchTab(courseId, tab, getTabData) {
 
       if (fetchedCourseHomeCourseMetadata) {
         dispatch(addModel({
-          modelType: 'courseHomeMeta',
+          modelType: 'courses',
           model: {
             id: courseId,
             ...courseHomeCourseMetadataResult.value,
@@ -62,9 +59,9 @@ export function fetchTab(courseId, tab, getTabData) {
       }
 
       if (fetchedCourseHomeCourseMetadata && fetchedTabData) {
-        dispatch(fetchTabSuccess({ courseId }));
+        dispatch(fetchCourseSuccess({ courseId }));
       } else {
-        dispatch(fetchTabFailure({ courseId }));
+        dispatch(fetchCourseFailure({ courseId }));
       }
     });
   };
@@ -82,6 +79,15 @@ export function fetchOutlineTab(courseId) {
   return fetchTab(courseId, 'outline', getOutlineTabData);
 }
 
+export function resetDeadlines(courseId, getTabData) {
+  return async (dispatch) => {
+    postCourseDeadlines(courseId).then(() => {
+      dispatch(getTabData(courseId));
+      dispatch(toggleResetDatesToast({ displayResetDatesToast: true }));
+    });
+  };
+}
+
 export function dismissWelcomeMessage(courseId) {
   return async () => postDismissWelcomeMessage(courseId);
 }
@@ -89,43 +95,3 @@ export function dismissWelcomeMessage(courseId) {
 export function requestCert(courseId) {
   return async () => postRequestCert(courseId);
 }
-
-export function resetDeadlines(courseId, model, getTabData) {
-  return async (dispatch) => {
-    postCourseDeadlines(courseId, model).then(response => {
-      const { data } = response;
-      const {
-        header,
-        link,
-        link_text: linkText,
-      } = data;
-      dispatch(getTabData(courseId));
-      dispatch(setCallToActionToast({ header, link, linkText }));
-    });
-  };
-}
-
-export async function saveCourseGoal(courseId, goalKey) {
-  return postCourseGoals(courseId, goalKey);
-}
-
-export function processEvent(eventData, getTabData) {
-  return async (dispatch) => {
-    // Pulling this out early so the data doesn't get camelCased and is easier
-    // to use when it's passed to the backend
-    const { research_event_data: researchEventData } = eventData;
-    const event = camelCaseObject(eventData);
-    if (event.eventName === eventTypes.POST_EVENT) {
-      executePostFromPostEvent(event.postData, researchEventData).then(response => {
-        const { data } = response;
-        const {
-          header,
-          link,
-          link_text: linkText,
-        } = data;
-        dispatch(getTabData(event.postData.bodyParams.courseId));
-        dispatch(setCallToActionToast({ header, link, linkText }));
-      });
-    }
-  };
-}

src/course-home/dates-banner/DatesBanner.jsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Button } from '@edx/paragon';
 
 import messages from './messages';
 
@@ -15,17 +14,17 @@ function DatesBanner(props) {
   return (
     <div className="banner rounded my-4 p-4 container-fluid border border-primary-200 bg-info-100">
       <div className="row w-100 m-0 justify-content-start justify-content-sm-between">
-        <div className={name === 'datesTabInfoBanner' ? 'col-12' : 'col-12 col-lg-9'}>
+        <div className={name === 'datesTabInfoBanner' ? 'col-12' : 'col-12 col-md-9'}>
           <strong>
             {intl.formatMessage(messages[`datesBanner.${name}.header`])}
           </strong>
           {intl.formatMessage(messages[`datesBanner.${name}.body`])}
         </div>
         {bannerClickHandler && (
-          <div className="col-auto col-lg-3 p-lg-0 d-inline-flex align-items-center justify-content-start justify-content-lg-center">
-            <Button variant="outline-primary" className="align-self-center mt-3 mt-lg-0" onClick={bannerClickHandler}>
+          <div className="col-auto col-md-3 p-md-0 d-inline-flex align-items-center justify-content-start justify-content-md-center">
+            <button type="button" className="btn rounded align-self-center border border-primary bg-white mt-3 mt-md-0 font-weight-bold" onClick={bannerClickHandler}>
               {intl.formatMessage(messages[`datesBanner.${name}.button`])}
-            </Button>
+            </button>
           </div>
         )}
       </div>

src/course-home/dates-banner/DatesBannerContainer.jsx

@@ -5,19 +5,22 @@ import { useDispatch, useSelector } from 'react-redux';
 import { useModel } from '../../generic/model-store';
 
 import DatesBanner from './DatesBanner';
-import { resetDeadlines } from '../data';
+import { fetchDatesTab, resetDeadlines } from '../data/thunks';
+
+function DatesBannerContainer(props) {
+  const {
+    model,
+  } = props;
 
-function DatesBannerContainer({
-  courseDateBlocks,
-  datesBannerInfo,
-  hasEnded,
-  logUpgradeLinkClick,
-  model,
-  tabFetch,
-}) {
   const {
     courseId,
-  } = useSelector(state => state.courseHome);
+  } = useSelector(state => state.activeCourse);
+
+  const {
+    courseDateBlocks,
+    datesBannerInfo,
+    hasEnded,
+  } = useModel(model, courseId);
 
   const {
     contentTypeGatingEnabled,
@@ -28,7 +31,7 @@ function DatesBannerContainer({
 
   const {
     isSelfPaced,
-  } = useModel('courseHomeMeta', courseId);
+  } = useModel('courses', courseId);
 
   const dispatch = useDispatch();
   const hasDeadlines = courseDateBlocks.some(x => x.dateType === 'assignment-due-date');
@@ -42,26 +45,18 @@ function DatesBannerContainer({
     },
     {
       name: 'upgradeToCompleteGradedBanner',
-      // verifiedUpgradeLink can be null if we've passed the upgrade deadline
-      shouldDisplay: upgradeToCompleteGraded && verifiedUpgradeLink,
-      clickHandler: () => {
-        logUpgradeLinkClick();
-        global.location.replace(verifiedUpgradeLink);
-      },
+      shouldDisplay: upgradeToCompleteGraded,
+      clickHandler: () => window.location.replace(verifiedUpgradeLink),
     },
     {
       name: 'upgradeToResetBanner',
-      // verifiedUpgradeLink can be null if we've passed the upgrade deadline
-      shouldDisplay: upgradeToReset && verifiedUpgradeLink,
-      clickHandler: () => {
-        logUpgradeLinkClick();
-        global.location.replace(verifiedUpgradeLink);
-      },
+      shouldDisplay: upgradeToReset,
+      clickHandler: () => window.location.replace(verifiedUpgradeLink),
     },
     {
       name: 'resetDatesBanner',
       shouldDisplay: resetDates,
-      clickHandler: () => dispatch(resetDeadlines(courseId, model, tabFetch)),
+      clickHandler: () => dispatch(resetDeadlines(courseId, fetchDatesTab)),
     },
   ];
 
@@ -79,22 +74,7 @@ function DatesBannerContainer({
 }
 
 DatesBannerContainer.propTypes = {
-  courseDateBlocks: PropTypes.arrayOf(PropTypes.object).isRequired,
-  datesBannerInfo: PropTypes.shape({
-    contentTypeGatingEnabled: PropTypes.bool.isRequired,
-    missedDeadlines: PropTypes.bool.isRequired,
-    missedGatedContent: PropTypes.bool.isRequired,
-    verifiedUpgradeLink: PropTypes.string,
-  }).isRequired,
-  hasEnded: PropTypes.bool,
-  logUpgradeLinkClick: PropTypes.func,
   model: PropTypes.string.isRequired,
-  tabFetch: PropTypes.func.isRequired,
-};
-
-DatesBannerContainer.defaultProps = {
-  hasEnded: false,
-  logUpgradeLinkClick: () => {},
 };
 
 export default DatesBannerContainer;

src/course-home/dates-tab/Badge.jsx

@@ -4,10 +4,7 @@ import classNames from 'classnames';
 
 export default function Badge({ children, className }) {
   return (
-    <span
-      className={classNames('dates-badge small ml-2', className)}
-      data-testid="dates-badge"
-    >
+    <span className={classNames('dates-badge badge align-text-bottom font-italic ml-2 px-2 py-1', className)}>
       {children}
     </span>
   );

src/course-home/dates-tab/Badge.scss

@@ -1,4 +1,3 @@
 .dates-badge {
-  border-radius: 4px;
-  padding: 2px 8px 3px 8px;
+  font-size: 0.75rem;
 }

src/course-home/dates-tab/DatesTab.jsx

@@ -1,64 +1,18 @@
 import React from 'react';
-import { useSelector } from 'react-redux';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 
 import messages from './messages';
 import Timeline from './Timeline';
 import DatesBannerContainer from '../dates-banner/DatesBannerContainer';
 
-import { fetchDatesTab } from '../data';
-import { useModel } from '../../generic/model-store';
-
-/** [MM-P2P] Experiment */
-import { initDatesMMP2P } from '../../experiments/mm-p2p';
-
 function DatesTab({ intl }) {
-  const {
-    courseId,
-  } = useSelector(state => state.courseHome);
-
-  const {
-    org,
-  } = useModel('courseHomeMeta', courseId);
-
-  const {
-    courseDateBlocks,
-    datesBannerInfo,
-    hasEnded,
-  } = useModel('dates', courseId);
-
-  /** [MM-P2P] Experiment */
-  const mmp2p = initDatesMMP2P(courseId);
-
-  const logUpgradeLinkClick = () => {
-    sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
-      org_key: org,
-      courserun_key: courseId,
-      linkCategory: 'personalized_learner_schedules',
-      linkName: 'dates_upgrade',
-      linkType: 'button',
-      pageName: 'dates_tab',
-    });
-  };
-
   return (
     <>
-      <div role="heading" aria-level="1" className="h2 my-3">
+      <div role="heading" aria-level="1" className="h4 my-3">
         {intl.formatMessage(messages.title)}
       </div>
-      { /** [MM-P2P] Experiment */ }
-      { !mmp2p.state.isEnabled && (
-        <DatesBannerContainer
-          courseDateBlocks={courseDateBlocks}
-          datesBannerInfo={datesBannerInfo}
-          hasEnded={hasEnded}
-          logUpgradeLinkClick={logUpgradeLinkClick}
-          model="dates"
-          tabFetch={fetchDatesTab}
-        />
-      ) }
-      <Timeline mmp2p={mmp2p} />
+      <DatesBannerContainer model="dates" />
+      <Timeline />
     </>
   );
 }

src/course-home/dates-tab/DatesTab.test.jsx

@@ -1,299 +0,0 @@
-import React from 'react';
-import { Route } from 'react-router';
-import MockAdapter from 'axios-mock-adapter';
-import { Factory } from 'rosie';
-import { getConfig, history } from '@edx/frontend-platform';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
-import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
-import { AppProvider } from '@edx/frontend-platform/react';
-import { waitForElementToBeRemoved } from '@testing-library/dom';
-import { render, screen, within } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-
-import DatesTab from './DatesTab';
-import { fetchDatesTab } from '../data';
-import { fireEvent, initializeMockApp, waitFor } from '../../setupTest';
-import initializeStore from '../../store';
-import { TabContainer } from '../../tab-page';
-import { appendBrowserTimezoneToUrl } from '../../utils';
-import { UserMessagesProvider } from '../../generic/user-messages';
-
-initializeMockApp();
-jest.mock('@edx/frontend-platform/analytics');
-
-describe('DatesTab', () => {
-  let axiosMock;
-
-  const store = initializeStore();
-  const component = (
-    <AppProvider store={store}>
-      <UserMessagesProvider>
-        <Route path="/course/:courseId/dates">
-          <TabContainer tab="dates" fetch={fetchDatesTab} slice="courseHome">
-            <DatesTab />
-          </TabContainer>
-        </Route>
-      </UserMessagesProvider>
-    </AppProvider>
-  );
-
-  // The dates tab is largely repetitive non-interactive static data. Thus it's a little tough to follow
-  // testing-library's advice around testing the way your user uses the site (i.e. can't find form elements by label or
-  // anything). Instead, we find elements by printed date (which is what the user sees) and data-testid. Which is
-  // better than assuming anything about how the surrounding elements are organized by div and span or whatever. And
-  // better than adding non-style class names.
-  // Hence the following getDay query helper.
-  async function getDay(date) {
-    const dateNode = await screen.findByText(date);
-    let parent = dateNode.parentElement;
-    while (parent) {
-      if (parent.dataset && parent.dataset.testid === 'dates-day') {
-        return {
-          day: parent,
-          header: within(parent).getByTestId('dates-header'),
-          items: within(parent).queryAllByTestId('dates-item'),
-        };
-      }
-      parent = parent.parentElement;
-    }
-    throw new Error('Did not find day container');
-  }
-
-  describe('when receiving a full set of dates data', () => {
-    beforeEach(() => {
-      const datesTabData = Factory.build('datesTabData');
-      const courseMetadata = Factory.build('courseHomeMetadata');
-      const { id: courseId } = courseMetadata;
-      let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/course_metadata/${courseId}`;
-      courseMetadataUrl = appendBrowserTimezoneToUrl(courseMetadataUrl);
-
-      axiosMock = new MockAdapter(getAuthenticatedHttpClient());
-      axiosMock.onGet(courseMetadataUrl).reply(200, courseMetadata);
-      axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`).reply(200, datesTabData);
-      history.push(`/course/${courseId}/dates`); // so tab can pull course id from url
-
-      render(component);
-    });
-
-    it('handles unreleased & complete', async () => {
-      const { header } = await getDay('Sun, May 3, 2020');
-      const badges = within(header).getAllByTestId('dates-badge');
-      expect(badges).toHaveLength(2);
-      expect(badges[0]).toHaveTextContent('Completed');
-      expect(badges[1]).toHaveTextContent('Not yet released');
-    });
-
-    it('handles unreleased & past due', async () => {
-      const { header } = await getDay('Mon, May 4, 2020');
-      const badges = within(header).getAllByTestId('dates-badge');
-      expect(badges).toHaveLength(2);
-      expect(badges[0]).toHaveTextContent('Past due');
-      expect(badges[1]).toHaveTextContent('Not yet released');
-    });
-
-    it('handles verified only', async () => {
-      const { day } = await getDay('Sun, Aug 18, 2030');
-      const badge = within(day).getByTestId('dates-badge');
-      expect(badge).toHaveTextContent('Verified only');
-    });
-
-    it('verified only has no link', async () => {
-      const { day } = await getDay('Sun, Aug 18, 2030');
-      expect(within(day).queryByRole('link')).toBeNull();
-    });
-
-    it('same status items have header badge', async () => {
-      const { day, header } = await getDay('Tue, May 26, 2020');
-      const badge = within(header).getByTestId('dates-badge');
-      expect(badge).toHaveTextContent('Past due'); // one header badge
-      expect(within(day).getAllByTestId('dates-badge')).toHaveLength(1); // no other badges
-    });
-
-    it('different status items have individual badges', async () => {
-      const { header, items } = await getDay('Thu, May 28, 2020');
-      const headerBadges = within(header).queryAllByTestId('dates-badge');
-      expect(headerBadges).toHaveLength(0); // no header badges
-      expect(items).toHaveLength(2);
-      expect(within(items[0]).getByTestId('dates-badge')).toHaveTextContent('Completed');
-      expect(within(items[1]).getByTestId('dates-badge')).toHaveTextContent('Past due');
-    });
-
-    it('shows extra info', async () => {
-      const { items } = await getDay('Sat, Aug 17, 2030');
-      expect(items).toHaveLength(3);
-
-      const tipIcon = within(items[2]).getByTestId('dates-extra-info');
-      const tipText = "ORA Dates are set by the instructor, and can't be changed";
-
-      expect(screen.queryByText(tipText)).toBeNull(); // tooltip does not start in DOM
-      userEvent.hover(tipIcon);
-      const tooltip = screen.getByText(tipText); // now it's there
-      userEvent.unhover(tipIcon);
-      waitForElementToBeRemoved(tooltip); // and it's gone again
-    });
-  });
-
-  describe('Dates banner container ', () => {
-    const courseMetadata = Factory.build('courseHomeMetadata', { is_self_paced: true, is_enrolled: true });
-    const { id: courseId } = courseMetadata;
-    const datesTabData = Factory.build('datesTabData');
-
-    let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/course_metadata/${courseId}`;
-    courseMetadataUrl = appendBrowserTimezoneToUrl(courseMetadataUrl);
-
-    beforeEach(() => {
-      axiosMock = new MockAdapter(getAuthenticatedHttpClient());
-      axiosMock.onGet(courseMetadataUrl).reply(200, courseMetadata);
-      history.push(`/course/${courseId}/dates`);
-    });
-
-    it('renders datesTabInfoBanner', async () => {
-      datesTabData.datesBannerInfo = {
-        contentTypeGatingEnabled: false,
-        missedDeadlines: false,
-        missedGatedContent: false,
-      };
-
-      axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`).reply(200, datesTabData);
-      render(component);
-
-      await waitFor(() => expect(screen.getByText("We've built a suggested schedule to help you stay on track.")).toBeInTheDocument());
-    });
-
-    it('renders upgradeToCompleteGradedBanner', async () => {
-      datesTabData.datesBannerInfo = {
-        contentTypeGatingEnabled: true,
-        missedDeadlines: false,
-        missedGatedContent: false,
-        verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
-      };
-
-      axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`).reply(200, datesTabData);
-      render(component);
-
-      await waitFor(() => expect(screen.getByText('You are auditing this course,')).toBeInTheDocument());
-      expect(screen.getByText('which means that you are unable to participate in graded assignments. To complete graded assignments as part of this course, you can upgrade today.')).toBeInTheDocument();
-      expect(screen.getByRole('button', { name: 'Upgrade now' })).toBeInTheDocument();
-    });
-
-    it('renders upgradeToResetBanner', async () => {
-      datesTabData.datesBannerInfo = {
-        contentTypeGatingEnabled: true,
-        missedDeadlines: true,
-        missedGatedContent: true,
-        verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
-      };
-
-      axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`).reply(200, datesTabData);
-      render(component);
-
-      await waitFor(() => expect(screen.getByText('You are auditing this course,')).toBeInTheDocument());
-      expect(screen.getByText('which means that you are unable to participate in graded assignments. It looks like you missed some important deadlines based on our suggested schedule. To complete graded assignments as part of this course and shift the past due assignments into the future, you can upgrade today.')).toBeInTheDocument();
-      expect(screen.getByRole('button', { name: 'Upgrade to shift due dates' })).toBeInTheDocument();
-    });
-
-    it('renders resetDatesBanner', async () => {
-      datesTabData.datesBannerInfo = {
-        contentTypeGatingEnabled: true,
-        missedDeadlines: true,
-        missedGatedContent: false,
-        verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
-      };
-
-      axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`).reply(200, datesTabData);
-      render(component);
-
-      await waitFor(() => expect(screen.getByText('It looks like you missed some important deadlines based on our suggested schedule.')).toBeInTheDocument());
-      expect(screen.getByText('To keep yourself on track, you can update this schedule and shift the past due assignments into the future. Don’t worry—you won’t lose any of the progress you’ve made when you shift your due dates.')).toBeInTheDocument();
-      expect(screen.getByRole('button', { name: 'Shift due dates' })).toBeInTheDocument();
-    });
-
-    it('handles shift due dates click', async () => {
-      datesTabData.datesBannerInfo = {
-        contentTypeGatingEnabled: true,
-        missedDeadlines: true,
-        missedGatedContent: false,
-        verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
-      };
-
-      axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`).reply(200, datesTabData);
-      render(component);
-
-      // confirm "Shift due dates" button has rendered
-      await waitFor(() => expect(screen.getByRole('button', { name: 'Shift due dates' })).toBeInTheDocument());
-
-      // update response to reflect shifted dates
-      datesTabData.datesBannerInfo = {
-        contentTypeGatingEnabled: true,
-        missedDeadlines: false,
-        missedGatedContent: false,
-        verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
-      };
-
-      const resetDeadlinesData = {
-        header: "You've successfully shifted your dates!",
-      };
-      axiosMock.onPost(`${getConfig().LMS_BASE_URL}/api/course_experience/v1/reset_course_deadlines`).reply(200, resetDeadlinesData);
-
-      // click "Shift due dates"
-      fireEvent.click(screen.getByRole('button', { name: 'Shift due dates' }));
-
-      // wait for page to reload & Toast to render
-      await waitFor(() => expect(screen.getByText("You've successfully shifted your dates!")).toBeInTheDocument());
-      // confirm "Shift due dates" button has not rendered
-      expect(screen.queryByRole('button', { name: 'Shift due dates' })).not.toBeInTheDocument();
-    });
-
-    it('sends analytics event onClick of upgrade button in upgradeToCompleteGradedBanner', async () => {
-      sendTrackEvent.mockClear();
-      datesTabData.datesBannerInfo = {
-        contentTypeGatingEnabled: true,
-        missedDeadlines: false,
-        missedGatedContent: false,
-        verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
-      };
-
-      axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`).reply(200, datesTabData);
-      render(component);
-
-      const upgradeButton = await waitFor(() => screen.getByRole('button', { name: 'Upgrade now' }));
-      fireEvent.click(upgradeButton);
-
-      expect(sendTrackEvent).toHaveBeenCalledTimes(1);
-      expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.ecommerce.upsell_links_clicked', {
-        org_key: 'edX',
-        courserun_key: courseId,
-        linkCategory: 'personalized_learner_schedules',
-        linkName: 'dates_upgrade',
-        linkType: 'button',
-        pageName: 'dates_tab',
-      });
-    });
-
-    it('sends analytics event onClick of upgrade button in upgradeToResetBanner', async () => {
-      sendTrackEvent.mockClear();
-      datesTabData.datesBannerInfo = {
-        contentTypeGatingEnabled: true,
-        missedDeadlines: true,
-        missedGatedContent: true,
-        verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
-      };
-
-      axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`).reply(200, datesTabData);
-      render(component);
-
-      const upgradeButton = await waitFor(() => screen.getByRole('button', { name: 'Upgrade to shift due dates' }));
-      fireEvent.click(upgradeButton);
-
-      expect(sendTrackEvent).toHaveBeenCalledTimes(1);
-      expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.ecommerce.upsell_links_clicked', {
-        org_key: 'edX',
-        courserun_key: courseId,
-        linkCategory: 'personalized_learner_schedules',
-        linkName: 'dates_upgrade',
-        linkType: 'button',
-        pageName: 'dates_tab',
-      });
-    });
-  });
-});

src/course-home/dates-tab/Day.jsx

@@ -3,9 +3,6 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { useSelector } from 'react-redux';
 import { FormattedDate, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Tooltip, OverlayTrigger } from '@edx/paragon';
-import { faInfoCircle } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
 import { useModel } from '../../generic/model-store';
 
@@ -13,17 +10,11 @@ import { getBadgeListAndColor } from './badgelist';
 import { isLearnerAssignment } from './utils';
 
 function Day({
-  date,
-  first,
-  intl,
-  items,
-  last,
-  /** [MM-P2P] Example */
-  mmp2p,
+  date, first, intl, items, last,
 }) {
   const {
     courseId,
-  } = useSelector(state => state.courseHome);
+  } = useSelector(state => state.activeCourse);
 
   const {
     userTimezone,
@@ -32,13 +23,8 @@ function Day({
 
   const { color, badges } = getBadgeListAndColor(date, intl, null, items);
 
-  /** [MM-P2P] Experiment */
-  const mmp2pOverride = (
-    mmp2p.state.isEnabled
-    && items.some((item) => item.dateType === 'verified-upgrade-deadline')
-  );
   return (
-    <li className="dates-day pb-4" data-testid="dates-day">
+    <li className="dates-day pb-4">
       {/* Top Line */}
       {!first && <div className="dates-line-top border-1 border-left border-gray-900 bg-gray-900" />}
 
@@ -50,11 +36,10 @@ function Day({
 
       {/* Content */}
       <div className="d-inline-block ml-3 pl-2">
-        <div className="mb-1" data-testid="dates-header">
+        <div className="mb-1">
           <p className="d-inline text-dark-500 font-weight-bold">
             <FormattedDate
-              /** [MM-P2P] Experiment */
-              value={mmp2pOverride ? mmp2p.state.upgradeDeadline : date}
+              value={date}
               day="numeric"
               month="short"
               weekday="short"
@@ -65,43 +50,21 @@ function Day({
           {badges}
         </div>
         {items.map((item) => {
-          /** [MM-P2P] Experiment (conditional) */
-          const { badges: itemBadges } = mmp2pOverride
-            ? getBadgeListAndColor(new Date(mmp2p.state.upgradeDeadline), intl, item, items)
-            : getBadgeListAndColor(date, intl, item, items);
-
+          const { badges: itemBadges } = getBadgeListAndColor(date, intl, item, items);
           const showLink = item.link && isLearnerAssignment(item);
           const title = showLink ? (<u><a href={item.link} className="text-reset">{item.title}</a></u>) : item.title;
           const available = item.learnerHasAccess && (item.link || !isLearnerAssignment(item));
           const textColor = available ? 'text-dark-500' : 'text-dark-200';
-
           return (
-            <div key={item.title + item.date} className={textColor} data-testid="dates-item">
+            <div key={item.title + item.date} className={textColor}>
               <div>
                 <span className="font-weight-bold small mt-1">
                   {item.assignmentType && `${item.assignmentType}: `}{title}
                 </span>
                 {itemBadges}
-                {item.extraInfo && (
-                  <OverlayTrigger
-                    placement="bottom"
-                    overlay={
-                      <Tooltip>{item.extraInfo}</Tooltip>
-                    }
-                  >
-                    <FontAwesomeIcon icon={faInfoCircle} className="fa-xs ml-1 text-gray-700" data-testid="dates-extra-info" />
-                  </OverlayTrigger>
-                )}
               </div>
-              { /** [MM-P2P] Experiment (conditional) */ }
-              { mmp2pOverride
-                ? (
-                  <div className="small mb-2">
-                    You are still eligible to upgrade to a Verified Certificate!
-                    &nbsp; Unlock full course access and highlight the knowledge you&apos;ll gain.
-                  </div>
-                )
-                : (item.description && <div className="small mb-2">{item.description}</div>)}
+              {item.description && <div className="small mb-2">{item.description}</div>}
+              {item.extraInfo && <div className="small mb-2">{item.extraInfo}</div>}
             </div>
           );
         })}
@@ -124,25 +87,11 @@ Day.propTypes = {
     title: PropTypes.string,
   })).isRequired,
   last: PropTypes.bool,
-  /** [MM-P2P] Experiment */
-  mmp2p: PropTypes.shape({
-    state: PropTypes.shape({
-      isEnabled: PropTypes.bool.isRequired,
-      upgradeDeadline: PropTypes.string,
-    }),
-  }),
 };
 
 Day.defaultProps = {
   first: false,
   last: false,
-  /** [MM-P2P] Experiment */
-  mmp2p: {
-    state: {
-      isEnabled: false,
-      upgradeDeadline: '',
-    },
-  },
 };
 
 export default injectIntl(Day);

src/course-home/dates-tab/Timeline.jsx

@@ -1,6 +1,4 @@
 import React from 'react';
-/** [MM-P2P] Experiment (import) */
-import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
 
 import { useModel } from '../../generic/model-store';
@@ -8,11 +6,10 @@ import { useModel } from '../../generic/model-store';
 import Day from './Day';
 import { daycmp, isLearnerAssignment } from './utils';
 
-/** [MM-P2P] Experiment (argument) */
-export default function Timeline({ mmp2p }) {
+export default function Timeline() {
   const {
     courseId,
-  } = useSelector(state => state.courseHome);
+  } = useSelector(state => state.activeCourse);
 
   const {
     courseDateBlocks,
@@ -66,17 +63,8 @@ export default function Timeline({ mmp2p }) {
   return (
     <ul className="list-unstyled m-0">
       {groupedDates.map((groupedDate) => (
-        <Day key={groupedDate.date} {...groupedDate} mmp2p={mmp2p} />
+        <Day key={groupedDate.date} {...groupedDate} />
       ))}
     </ul>
   );
 }
-
-/** [MM-P2P] Experiment */
-Timeline.propTypes = {
-  mmp2p: PropTypes.shape({}),
-};
-
-Timeline.defaultProps = {
-  mmp2p: {},
-};

src/course-home/dates-tab/badgelist.jsx

@@ -37,22 +37,19 @@ function getBadgeListAndColor(date, intl, item, items) {
     {
       message: messages.today,
       shownForDay: isToday,
-      bg: 'bg-warning-300',
-      className: 'text-gray-900',
+      bg: 'dates-bg-today',
     },
     {
       message: messages.completed,
       shownForDay: assignments.length && assignments.every(isComplete),
       shownForItem: x => isLearnerAssignment(x) && isComplete(x),
       bg: 'bg-dark-100',
-      className: 'text-gray-900',
     },
     {
       message: messages.pastDue,
       shownForDay: assignments.length && assignments.every(isPastDue),
       shownForItem: x => isLearnerAssignment(x) && isPastDue(x),
       bg: 'bg-dark-200',
-      className: 'text-white',
     },
     {
       message: messages.dueNext,
@@ -65,7 +62,7 @@ function getBadgeListAndColor(date, intl, item, items) {
       message: messages.unreleased,
       shownForDay: assignments.length && assignments.every(isUnreleased),
       shownForItem: x => isLearnerAssignment(x) && isUnreleased(x),
-      className: 'border border-gray-500 text-gray-500',
+      className: 'border border-dark-200 text-gray-500 align-top',
     },
     {
       message: messages.verifiedOnly,

src/course-home/dates-tab/fakeData.js

@@ -0,0 +1,228 @@
+// Sample data helpful when developing, to see a variety of configurations.
+// This set of data is not realistic (mix of having access and not), but it
+// is intended to demonstrate many UI results.
+// To use, have getDatesTabData in api.js return the result of this call instead:
+/*
+import fakeDatesData from '../dates-tab/fakeData';
+export async function getDatesTabData(courseId, version) {
+  if (tab === 'dates') { return camelCaseObject(fakeDatesData()); }
+  ...
+}
+*/
+
+export default function fakeDatesData() {
+  return JSON.parse(`
+{
+  "course_date_blocks": [
+    {
+      "date": "2020-05-01T17:59:41Z",
+      "date_type": "course-start-date",
+      "description": "",
+      "learner_has_access": true,
+      "link": "",
+      "title": "Course Starts",
+      "extra_info": null
+    },
+    {
+      "assignment_type": "Homework",
+      "complete": true,
+      "date": "2020-05-04T02:59:40.942669Z",
+      "date_type": "assignment-due-date",
+      "description": "",
+      "learner_has_access": true,
+      "title": "Multi Badges Completed",
+      "extra_info": null
+    },
+    {
+      "assignment_type": "Homework",
+      "date": "2020-05-05T02:59:40.942669Z",
+      "date_type": "assignment-due-date",
+      "description": "",
+      "learner_has_access": true,
+      "title": "Multi Badges Past Due",
+      "extra_info": null
+    },
+    {
+      "assignment_type": "Homework",
+      "date": "2020-05-27T02:59:40.942669Z",
+      "date_type": "assignment-due-date",
+      "description": "",
+      "learner_has_access": true,
+      "link": "https://example.com/",
+      "title": "Both Past Due 1",
+      "extra_info": null
+    },
+    {
+      "assignment_type": "Homework",
+      "date": "2020-05-27T02:59:40.942669Z",
+      "date_type": "assignment-due-date",
+      "description": "",
+      "learner_has_access": true,
+      "link": "https://example.com/",
+      "title": "Both Past Due 2",
+      "extra_info": null
+    },
+    {
+      "assignment_type": "Homework",
+      "complete": true,
+      "date": "2020-05-28T08:59:40.942669Z",
+      "date_type": "assignment-due-date",
+      "description": "",
+      "learner_has_access": true,
+      "link": "https://example.com/",
+      "title": "One Completed/Due 1",
+      "extra_info": null
+    },
+    {
+      "assignment_type": "Homework",
+      "date": "2020-05-28T08:59:40.942669Z",
+      "date_type": "assignment-due-date",
+      "description": "",
+      "learner_has_access": true,
+      "link": "https://example.com/",
+      "title": "One Completed/Due 2",
+      "extra_info": null
+    },
+    {
+      "assignment_type": "Homework",
+      "complete": true,
+      "date": "2020-05-29T08:59:40.942669Z",
+      "date_type": "assignment-due-date",
+      "description": "",
+      "learner_has_access": true,
+      "link": "https://example.com/",
+      "title": "Both Completed 1",
+      "extra_info": null
+    },
+    {
+      "assignment_type": "Homework",
+      "complete": true,
+      "date": "2020-05-29T08:59:40.942669Z",
+      "date_type": "assignment-due-date",
+      "description": "",
+      "learner_has_access": true,
+      "link": "https://example.com/",
+      "title": "Both Completed 2",
+      "extra_info": null
+    },
+    {
+      "date": "2020-06-16T17:59:40.942669Z",
+      "date_type": "verified-upgrade-deadline",
+      "description": "Don't miss the opportunity to highlight your new knowledge and skills by earning a verified certificate.",
+      "learner_has_access": true,
+      "link": "https://example.com/",
+      "title": "Upgrade to Verified Certificate",
+      "extra_info": null
+    },
+    {
+      "assignment_type": "Homework",
+      "date": "2030-08-17T05:59:40.942669Z",
+      "date_type": "assignment-due-date",
+      "description": "",
+      "learner_has_access": false,
+      "link": "https://example.com/",
+      "title": "One Verified 1",
+      "extra_info": null
+    },
+    {
+      "assignment_type": "Homework",
+      "date": "2030-08-17T05:59:40.942669Z",
+      "date_type": "assignment-due-date",
+      "description": "",
+      "learner_has_access": true,
+      "link": "https://example.com/",
+      "title": "One Verified 2",
+      "extra_info": null
+    },
+    {
+      "assignment_type": "Homework",
+      "date": "2030-08-17T05:59:40.942669Z",
+      "date_type": "assignment-due-date",
+      "description": "",
+      "learner_has_access": true,
+      "link": "https://example.com/",
+      "title": "ORA Verified 2",
+      "extra_info": "ORA Dates are set by the instructor, and can't be changed"
+    },
+    {
+      "assignment_type": "Homework",
+      "date": "2030-08-18T05:59:40.942669Z",
+      "date_type": "assignment-due-date",
+      "description": "",
+      "learner_has_access": false,
+      "link": "https://example.com/",
+      "title": "Both Verified 1",
+      "extra_info": null
+    },
+    {
+      "assignment_type": "Homework",
+      "date": "2030-08-18T05:59:40.942669Z",
+      "date_type": "assignment-due-date",
+      "description": "",
+      "learner_has_access": false,
+      "link": "https://example.com/",
+      "title": "Both Verified 2",
+      "extra_info": null
+    },
+    {
+      "assignment_type": "Homework",
+      "date": "2030-08-19T05:59:40.942669Z",
+      "date_type": "assignment-due-date",
+      "description": "",
+      "learner_has_access": true,
+      "title": "One Unreleased 1"
+    },
+    {
+      "assignment_type": "Homework",
+      "date": "2030-08-19T05:59:40.942669Z",
+      "date_type": "assignment-due-date",
+      "description": "",
+      "learner_has_access": true,
+      "link": "https://example.com/",
+      "title": "One Unreleased 2",
+      "extra_info": null
+    },
+    {
+      "assignment_type": "Homework",
+      "date": "2030-08-20T05:59:40.942669Z",
+      "date_type": "assignment-due-date",
+      "description": "",
+      "learner_has_access": true,
+      "title": "Both Unreleased 1",
+      "extra_info": null
+    },
+    {
+      "assignment_type": "Homework",
+      "date": "2030-08-20T05:59:40.942669Z",
+      "date_type": "assignment-due-date",
+      "description": "",
+      "learner_has_access": true,
+      "title": "Both Unreleased 2",
+      "extra_info": null
+    },
+    {
+      "date": "2030-08-23T00:00:00Z",
+      "date_type": "course-end-date",
+      "description": "",
+      "learner_has_access": true,
+      "link": "",
+      "title": "Course Ends",
+      "extra_info": null
+    },
+    {
+      "date": "2030-09-01T00:00:00Z",
+      "date_type": "verification-deadline-date",
+      "description": "You must successfully complete verification before this date to qualify for a Verified Certificate.",
+      "learner_has_access": false,
+      "link": "https://example.com/",
+      "title": "Verification Deadline",
+      "extra_info": null
+    }
+  ],
+  "display_reset_dates_text": false,
+  "learner_is_verified": false,
+  "user_timezone": "America/New_York",
+  "verified_upgrade_link": "https://example.com/"
+}
+  `);
+}

src/course-home/dates-tab/messages.js

@@ -7,15 +7,15 @@ const messages = defineMessages({
   },
   dueNext: {
     id: 'learning.dates.badge.dueNext',
-    defaultMessage: 'Due next',
+    defaultMessage: 'Due Next',
   },
   pastDue: {
     id: 'learning.dates.badge.pastDue',
-    defaultMessage: 'Past due',
+    defaultMessage: 'Past Due',
   },
   title: {
     id: 'learning.dates.title',
-    defaultMessage: 'Important dates',
+    defaultMessage: 'Important Dates',
   },
   today: {
     id: 'learning.dates.badge.today',
@@ -23,11 +23,11 @@ const messages = defineMessages({
   },
   unreleased: {
     id: 'learning.dates.badge.unreleased',
-    defaultMessage: 'Not yet released',
+    defaultMessage: 'Not Yet Released',
   },
   verifiedOnly: {
     id: 'learning.dates.badge.verifiedOnly',
-    defaultMessage: 'Verified only',
+    defaultMessage: 'Verified Only',
   },
 });
 

src/course-home/index.js

@@ -0,0 +1,2 @@
+/* eslint-disable import/prefer-default-export */
+export { reducer } from './data';

src/course-home/outline-tab/DateSummary.jsx

@@ -1,52 +1,24 @@
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faCalendarAlt } from '@fortawesome/free-regular-svg-icons';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { FormattedDate } from '@edx/frontend-platform/i18n';
 import React from 'react';
-import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
-import { useModel } from '../../generic/model-store';
 import { isLearnerAssignment } from '../dates-tab/utils';
 import './DateSummary.scss';
 
 export default function DateSummary({
   dateBlock,
   userTimezone,
-  /** [MM-P2P] Experiment */
-  mmp2p,
 }) {
-  const {
-    courseId,
-  } = useSelector(state => state.courseHome);
-  const {
-    org,
-  } = useModel('courseHomeMeta', courseId);
-
   const linkedTitle = dateBlock.link && isLearnerAssignment(dateBlock);
   const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
-
-  /** [MM-P2P] Experiment */
-  const showMMP2P = mmp2p.state.isEnabled && (dateBlock.dateType === 'verified-upgrade-deadline');
-
-  const logVerifiedUpgradeClick = () => {
-    sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
-      org_key: org,
-      courserun_key: courseId,
-      linkCategory: '(none)',
-      linkName: 'course_home_dates',
-      linkType: 'link',
-      pageName: 'course_home',
-    });
-  };
-
   return (
-    <li className="container p-0 mb-3 small text-dark-500">
+    <section className="container p-0 mb-3">
       <div className="row">
-        <FontAwesomeIcon icon={faCalendarAlt} className="ml-3 mt-1 mr-1" fixedWidth />
-        <div className="ml-1 font-weight-bold">
+        <FontAwesomeIcon icon={faCalendarAlt} className="ml-3 mt-1 mr-1" style={{ width: '20px' }} />
+        <div className="ml-2 font-weight-bold">
           <FormattedDate
-            /** [MM-P2P] Experiment */
-            value={showMMP2P ? mmp2p.state.upgradeDeadline : dateBlock.date}
+            value={dateBlock.date}
             day="numeric"
             month="short"
             weekday="short"
@@ -55,46 +27,20 @@ export default function DateSummary({
           />
         </div>
       </div>
-      {/** [MM-P2P] Experiment (conditional) */}
-      { showMMP2P ? (
-        <div className="row ml-4 pr-2">
-          <div className="date-summary-text">
-            <div className="font-weight-bold mt-2">
-              Last chance to upgrade
-            </div>
-          </div>
-          <div className="date-summary-text mt-1">
-            You are still eligible to upgrade to a Verified Certificate!
-            &nbsp; Unlock full course access and highlight the knowledge you&apos;ll gain.
-          </div>
+      <div className="row ml-4 px-2">
+        <div className="date-summary-text">
+          {linkedTitle
+          && <div className="font-weight-bold mt-2"><a href={dateBlock.link}>{dateBlock.title}</a></div>}
+          {!linkedTitle
+          && <div className="font-weight-bold mt-2">{dateBlock.title}</div>}
         </div>
-      ) : (
-        <div className="row ml-4 pr-2">
-          <div className="date-summary-text">
-            {linkedTitle && (
-              <div className="font-weight-bold mt-2">
-                <a href={dateBlock.link}>{dateBlock.title}</a>
-              </div>
-            )}
-            {!linkedTitle && (
-              <div className="font-weight-bold mt-2">{dateBlock.title}</div>
-            )}
-          </div>
-          {dateBlock.description && (
-            <div className="date-summary-text mt-1">{dateBlock.description}</div>
-          )}
-          {!linkedTitle && dateBlock.link && (
-            <a
-              href={dateBlock.link}
-              onClick={dateBlock.dateType === 'verified-upgrade-deadline' ? logVerifiedUpgradeClick : () => {}}
-              className="description-link"
-            >
-              {dateBlock.linkText}
-            </a>
-          )}
-        </div>
-      )}
-    </li>
+        {dateBlock.description
+          && <div className="date-summary-text m-0 mt-1">{dateBlock.description}</div>}
+        {!linkedTitle && dateBlock.link
+          && <a href={dateBlock.link} className="description-link">{dateBlock.linkText}</a>}
+      </div>
+
+    </section>
   );
 }
 
@@ -109,22 +55,8 @@ DateSummary.propTypes = {
     learnerHasAccess: PropTypes.bool,
   }).isRequired,
   userTimezone: PropTypes.string,
-  /** [MM-P2P] Experiment */
-  mmp2p: PropTypes.shape({
-    state: PropTypes.shape({
-      isEnabled: PropTypes.bool.isRequired,
-      upgradeDeadline: PropTypes.string,
-    }),
-  }),
 };
 
 DateSummary.defaultProps = {
   userTimezone: null,
-  /** [MM-P2P] Experiment */
-  mmp2p: {
-    state: {
-      isEnabled: false,
-      upgradeDeadline: '',
-    },
-  },
 };

src/course-home/outline-tab/LmsHtmlFragment.css

@@ -1,11 +0,0 @@
-body a {
-    color: #00688D;
-}
-
-body.inline-link a {
-    text-decoration: underline;
-}
-
-body.small {
-    font-size: 0.875rem;
-}

src/course-home/outline-tab/LmsHtmlFragment.jsx

@@ -3,22 +3,16 @@ import PropTypes from 'prop-types';
 
 import { getConfig } from '@edx/frontend-platform';
 
-export default function LmsHtmlFragment({
-  className,
-  html,
-  title,
-  ...rest
-}) {
+export default function LmsHtmlFragment({ html, title, ...rest }) {
   const wholePage = `
-    <html>
-      <head>
-        <base href="${getConfig().LMS_BASE_URL}" target="_parent">
-        <link rel="stylesheet" href="/static/css/bootstrap/lms-main.css">
-        <link rel="stylesheet" type="text/css" href="${getConfig().BASE_URL}/src/course-home/outline-tab/LmsHtmlFragment.css">
-      </head>
-      <body class="${className}">${html}</body>
-    </html>
-  `;
+<html>
+  <head>
+    <base href="${getConfig().LMS_BASE_URL}" target="_parent">
+    <link rel="stylesheet" href="/static/css/bootstrap/lms-main.css">
+  </head>
+  <body>${html}</body>
+</html>
+`;
 
   const iframe = useRef(null);
   function handleLoad() {
@@ -39,12 +33,7 @@ export default function LmsHtmlFragment({
   );
 }
 
-LmsHtmlFragment.defaultProps = {
-  className: '',
-};
-
 LmsHtmlFragment.propTypes = {
-  className: PropTypes.string,
   html: PropTypes.string.isRequired,
   title: PropTypes.string.isRequired,
 };

src/course-home/outline-tab/OutlineTab.jsx

@@ -1,256 +1,118 @@
-import React, { useRef, useState } from 'react';
+import React from 'react';
 import { useSelector } from 'react-redux';
-import { sendTrackEvent, sendTrackingLogEvent } from '@edx/frontend-platform/analytics';
+import { Button } from '@edx/paragon';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 
-import { Button, Toast } from '@edx/paragon';
 import { AlertList } from '../../generic/user-messages';
 
 import CourseDates from './widgets/CourseDates';
-import CourseGoalCard from './widgets/CourseGoalCard';
 import CourseHandouts from './widgets/CourseHandouts';
-import CourseSock from '../../generic/course-sock';
 import CourseTools from './widgets/CourseTools';
-import DatesBannerContainer from '../dates-banner/DatesBannerContainer';
-import { fetchOutlineTab } from '../data';
-import genericMessages from '../../generic/messages';
 import messages from './messages';
 import Section from './Section';
-import UpdateGoalSelector from './widgets/UpdateGoalSelector';
-import UpgradeCard from './widgets/UpgradeCard';
 import useAccessExpirationAlert from '../../alerts/access-expiration-alert';
 import useCertificateAvailableAlert from './alerts/certificate-available-alert';
 import useCourseEndAlert from './alerts/course-end-alert';
 import useCourseStartAlert from './alerts/course-start-alert';
+import useEnrollmentAlert from '../../alerts/enrollment-alert';
+import useLogistrationAlert from '../../alerts/logistration-alert';
 import useOfferAlert from '../../alerts/offer-alert';
-import usePrivateCourseAlert from './alerts/private-course-alert';
 import { useModel } from '../../generic/model-store';
 import WelcomeMessage from './widgets/WelcomeMessage';
-import ProctoringInfoPanel from './widgets/ProctoringInfoPanel';
-
-/** [MM-P2P] Experiment */
-import { initHomeMMP2P, MMP2PFlyover } from '../../experiments/mm-p2p';
 
 function OutlineTab({ intl }) {
   const {
     courseId,
-  } = useSelector(state => state.courseHome);
+  } = useSelector(state => state.activeCourse);
 
   const {
-    org,
     title,
-    username,
-  } = useModel('courseHomeMeta', courseId);
+    start,
+    end,
+    enrollmentStart,
+    enrollmentEnd,
+    enrollmentMode,
+    isEnrolled,
+  } = useModel('courses', courseId);
 
   const {
-    accessExpiration,
-    canShowUpgradeSock,
     courseBlocks: {
       courses,
       sections,
     },
-    courseGoals: {
-      goalOptions,
-      selectedGoal,
-    },
-    datesBannerInfo,
-    datesWidget: {
-      courseDateBlocks,
-      userTimezone,
-    },
-    hasEnded,
-    resumeCourse: {
-      hasVisitedCourse,
-      url: resumeCourseUrl,
-    },
-    offer,
-    verifiedMode,
+    courseExpiredHtml,
+    offerHtml,
   } = useModel('outline', courseId);
 
-  const [courseGoalToDisplay, setCourseGoalToDisplay] = useState(selectedGoal);
-  const [goalToastHeader, setGoalToastHeader] = useState('');
-  const [expandAll, setExpandAll] = useState(false);
-
-  const eventProperties = {
-    org_key: org,
-    courserun_key: courseId,
-  };
-
-  const logResumeCourseClick = () => {
-    sendTrackingLogEvent('edx.course.home.resume_course.clicked', {
-      ...eventProperties,
-      event_type: hasVisitedCourse ? 'resume' : 'start',
-      url: resumeCourseUrl,
-    });
-  };
+  // Above the tab alerts (appearing in the order listed here)
+  const logistrationAlert = useLogistrationAlert();
+  const enrollmentAlert = useEnrollmentAlert(courseId);
 
   // Below the course title alerts (appearing in the order listed here)
-  const offerAlert = useOfferAlert(courseId, offer, org, userTimezone, 'outline-course-alerts', 'course_home');
-  const accessExpirationAlert = useAccessExpirationAlert(accessExpiration, courseId, org, userTimezone, 'outline-course-alerts', 'course_home');
+  const offerAlert = useOfferAlert(offerHtml, 'outline-course-alerts');
+  const accessExpirationAlert = useAccessExpirationAlert(courseExpiredHtml, 'outline-course-alerts');
   const courseStartAlert = useCourseStartAlert(courseId);
   const courseEndAlert = useCourseEndAlert(courseId);
   const certificateAvailableAlert = useCertificateAvailableAlert(courseId);
-  const privateCourseAlert = usePrivateCourseAlert(courseId);
 
-  const rootCourseId = courses && Object.keys(courses)[0];
-
-  const courseSock = useRef(null);
-
-  const logUpgradeLinkClick = () => {
-    sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
-      ...eventProperties,
-      linkCategory: 'personalized_learner_schedules',
-      linkName: 'course_home_upgrade_shift_dates',
-      linkType: 'button',
-      pageName: 'course_home',
-    });
-  };
-
-  /** [[MM-P2P] Experiment */
-  const MMP2P = initHomeMMP2P(courseId);
+  const rootCourseId = Object.keys(courses)[0];
+  const { sectionIds } = courses[rootCourseId];
 
   return (
     <>
-      <Toast
-        closeLabel={intl.formatMessage(genericMessages.close)}
-        onClose={() => setGoalToastHeader('')}
-        show={!!(goalToastHeader)}
-      >
-        {goalToastHeader}
-      </Toast>
-      <div className="row w-100 m-0 mb-3 justify-content-between">
-        <div className="col-12 col-sm-auto p-0">
-          <div role="heading" aria-level="1" className="h2">{title}</div>
-        </div>
-        {resumeCourseUrl && (
-          <div className="col-12 col-sm-auto p-0">
-            <Button block href={resumeCourseUrl} onClick={() => logResumeCourseClick()}>
-              {hasVisitedCourse ? intl.formatMessage(messages.resume) : intl.formatMessage(messages.start)}
-            </Button>
-          </div>
-        )}
+      <AlertList
+        topic="outline"
+        className="mb-3"
+        customAlerts={{
+          ...enrollmentAlert,
+          ...logistrationAlert,
+        }}
+      />
+      <div className="d-flex justify-content-between mb-3">
+        <h2>{title}</h2>
+        <Button className="btn-primary" type="button">{intl.formatMessage(messages.resume)}</Button>
       </div>
-      {/** [MM-P2P] Experiment (className for optimizely trigger) */}
-      <div className="row course-outline-tab">
-        <div className="col-12">
+      <div className="row">
+        <div className="col col-8">
+          <WelcomeMessage courseId={courseId} />
           <AlertList
-            topic="outline-private-alerts"
+            topic="outline-course-alerts"
+            className="mb-3"
             customAlerts={{
-              ...privateCourseAlert,
+              ...accessExpirationAlert,
+              ...certificateAvailableAlert,
+              ...courseEndAlert,
+              ...courseStartAlert,
+              ...offerAlert,
             }}
           />
+          {sectionIds.map((sectionId) => (
+            <Section
+              key={sectionId}
+              courseId={courseId}
+              title={sections[sectionId].title}
+              sequenceIds={sections[sectionId].sequenceIds}
+            />
+          ))}
         </div>
-        <div className="col col-12 col-md-8">
-          { /** [MM-P2P] Experiment (the conditional) */ }
-          { !MMP2P.state.isEnabled
-            && (
-            <AlertList
-              topic="outline-course-alerts"
-              className="mb-3"
-              customAlerts={{
-                ...accessExpirationAlert,
-                ...certificateAvailableAlert,
-                ...courseEndAlert,
-                ...courseStartAlert,
-                ...offerAlert,
-              }}
-            />
-            )}
-          {courseDateBlocks && (
-            <DatesBannerContainer
-              courseDateBlocks={courseDateBlocks}
-              datesBannerInfo={datesBannerInfo}
-              hasEnded={hasEnded}
-              logUpgradeLinkClick={logUpgradeLinkClick}
-              model="outline"
-              tabFetch={fetchOutlineTab}
-              /** [MM-P2P] Experiment */
-              isMMP2PEnabled={MMP2P.state.isEnabled}
-            />
-          )}
-          {!courseGoalToDisplay && goalOptions && goalOptions.length > 0 && (
-            <CourseGoalCard
-              courseId={courseId}
-              goalOptions={goalOptions}
-              title={title}
-              setGoalToDisplay={(newGoal) => { setCourseGoalToDisplay(newGoal); }}
-              setGoalToastHeader={(newHeader) => { setGoalToastHeader(newHeader); }}
-            />
-          )}
-          <WelcomeMessage courseId={courseId} />
-          {rootCourseId && (
-            <>
-              <div className="row w-100 m-0 mb-3 justify-content-end">
-                <div className="col-12 col-sm-auto p-0">
-                  <Button variant="outline-primary" block onClick={() => { setExpandAll(!expandAll); }}>
-                    {expandAll ? intl.formatMessage(messages.collapseAll) : intl.formatMessage(messages.expandAll)}
-                  </Button>
-                </div>
-              </div>
-              <ol className="list-unstyled">
-                {courses[rootCourseId].sectionIds.map((sectionId) => (
-                  <Section
-                    key={sectionId}
-                    courseId={courseId}
-                    defaultOpen={sections[sectionId].resumeBlock}
-                    expand={expandAll}
-                    section={sections[sectionId]}
-                  />
-                ))}
-              </ol>
-            </>
-          )}
+        <div className="col col-4">
+          <CourseTools
+            courseId={courseId}
+          />
+          <CourseDates
+            start={start}
+            end={end}
+            enrollmentStart={enrollmentStart}
+            enrollmentEnd={enrollmentEnd}
+            enrollmentMode={enrollmentMode}
+            isEnrolled={isEnrolled}
+            courseId={courseId}
+          />
+          <CourseHandouts
+            courseId={courseId}
+          />
         </div>
-        {rootCourseId && (
-          <div className="col col-12 col-md-4">
-            <ProctoringInfoPanel
-              courseId={courseId}
-              username={username}
-            />
-            {courseGoalToDisplay && goalOptions && goalOptions.length > 0 && (
-              <UpdateGoalSelector
-                courseId={courseId}
-                goalOptions={goalOptions}
-                selectedGoal={courseGoalToDisplay}
-                setGoalToDisplay={(newGoal) => { setCourseGoalToDisplay(newGoal); }}
-                setGoalToastHeader={(newHeader) => { setGoalToastHeader(newHeader); }}
-              />
-            )}
-            <CourseTools
-              courseId={courseId}
-            />
-            { /** [MM-P2P] Experiment (conditional) */ }
-            { MMP2P.state.isEnabled
-              ? <MMP2PFlyover isStatic options={MMP2P} />
-              : (
-                <UpgradeCard
-                  courseId={courseId}
-                  onLearnMore={
-                    canShowUpgradeSock ? () => { courseSock.current.showToUser(); } : null
-                  }
-                />
-              )}
-            <CourseDates
-              courseId={courseId}
-              /** [MM-P2P] Experiment */
-              mmp2p={MMP2P}
-            />
-            <CourseHandouts
-              courseId={courseId}
-            />
-          </div>
-        )}
       </div>
-      {canShowUpgradeSock && (
-        <CourseSock
-          courseId={courseId}
-          offer={offer}
-          orgKey={org}
-          pageLocation="Home Page"
-          ref={courseSock}
-          verifiedMode={verifiedMode}
-        />
-      )}
     </>
   );
 }

src/course-home/outline-tab/OutlineTab.test.jsx

@@ -1,967 +0,0 @@
-import React from 'react';
-import { Factory } from 'rosie';
-import { getConfig } from '@edx/frontend-platform';
-import { sendTrackEvent, sendTrackingLogEvent } from '@edx/frontend-platform/analytics';
-import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
-import MockAdapter from 'axios-mock-adapter';
-import userEvent from '@testing-library/user-event';
-
-import { buildMinimalCourseBlocks } from '../../shared/data/__factories__/courseBlocks.factory';
-import {
-  fireEvent, initializeMockApp, logUnhandledRequests, render, screen, waitFor, act,
-} from '../../setupTest';
-import { appendBrowserTimezoneToUrl, executeThunk } from '../../utils';
-import * as thunks from '../data/thunks';
-import initializeStore from '../../store';
-import OutlineTab from './OutlineTab';
-
-initializeMockApp();
-jest.mock('@edx/frontend-platform/analytics');
-
-describe('Outline Tab', () => {
-  let axiosMock;
-
-  const courseId = 'course-v1:edX+Test+run';
-  let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/course_metadata/${courseId}`;
-  courseMetadataUrl = appendBrowserTimezoneToUrl(courseMetadataUrl);
-  const enrollmentUrl = `${getConfig().LMS_BASE_URL}/api/enrollment/v1/enrollment`;
-  const goalUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/save_course_goal`;
-  const outlineUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/outline/${courseId}`;
-  const proctoringInfoUrl = `${getConfig().LMS_BASE_URL}/api/edx_proctoring/v1/user_onboarding/status?course_id=${encodeURIComponent(courseId)}`;
-
-  const store = initializeStore();
-  const defaultMetadata = Factory.build('courseHomeMetadata', { id: courseId });
-  const defaultTabData = Factory.build('outlineTabData');
-
-  function setMetadata(attributes, options) {
-    const courseMetadata = Factory.build('courseHomeMetadata', { id: courseId, ...attributes }, options);
-    axiosMock.onGet(courseMetadataUrl).reply(200, courseMetadata);
-  }
-
-  function setTabData(attributes, options) {
-    const outlineTabData = Factory.build('outlineTabData', attributes, options);
-    axiosMock.onGet(outlineUrl).reply(200, outlineTabData);
-  }
-
-  async function fetchAndRender() {
-    await executeThunk(thunks.fetchOutlineTab(courseId), store.dispatch);
-    await act(async () => render(<OutlineTab />, { store }));
-  }
-
-  beforeEach(async () => {
-    axiosMock = new MockAdapter(getAuthenticatedHttpClient());
-
-    // Set defaults for network requests
-    axiosMock.onGet(courseMetadataUrl).reply(200, defaultMetadata);
-    axiosMock.onPost(enrollmentUrl).reply(200, {});
-    axiosMock.onPost(goalUrl).reply(200, { header: 'Success' });
-    axiosMock.onGet(outlineUrl).reply(200, defaultTabData);
-    axiosMock.onGet(proctoringInfoUrl).reply(200, {
-      onboarding_status: 'created',
-      onboarding_link: 'test',
-      expiration_date: null,
-    });
-
-    logUnhandledRequests(axiosMock);
-  });
-
-  describe('Course Outline', () => {
-    it('displays link to start course', async () => {
-      await fetchAndRender();
-      expect(screen.getByRole('link', { name: 'Start Course' })).toBeInTheDocument();
-    });
-
-    it('displays link to resume course', async () => {
-      setTabData({
-        resume_course: {
-          has_visited_course: true,
-          url: `${getConfig().LMS_BASE_URL}/courses/${courseId}/jump_to/block-v1:edX+Test+Block@12345abcde`,
-        },
-      });
-      await fetchAndRender();
-      expect(screen.getByRole('link', { name: 'Resume course' })).toBeInTheDocument();
-    });
-
-    it('expands section that contains resume block', async () => {
-      const { courseBlocks } = await buildMinimalCourseBlocks(courseId, 'Title', { resumeBlock: true });
-      setTabData({
-        course_blocks: { blocks: courseBlocks.blocks },
-      });
-      await fetchAndRender();
-      const expandedSectionNode = screen.getByRole('button', { name: /Title of Section/ });
-      expect(expandedSectionNode).toHaveAttribute('aria-expanded', 'true');
-    });
-
-    it('handles expand/collapse all button click', async () => {
-      await fetchAndRender();
-      // Button renders as "Expand All"
-      const expandButton = screen.getByRole('button', { name: 'Expand all' });
-      expect(expandButton).toBeInTheDocument();
-
-      // Section initially renders collapsed
-      const collapsedSectionNode = screen.getByRole('button', { name: /section/ });
-      expect(collapsedSectionNode).toHaveAttribute('aria-expanded', 'false');
-
-      // Click to expand section
-      userEvent.click(expandButton);
-      expect(collapsedSectionNode).toHaveAttribute('aria-expanded', 'true');
-
-      // Click to collapse section
-      userEvent.click(expandButton);
-      expect(collapsedSectionNode).toHaveAttribute('aria-expanded', 'false');
-    });
-
-    it('displays correct icon for complete assignment', async () => {
-      const { courseBlocks } = await buildMinimalCourseBlocks(courseId, 'Title', { complete: true });
-      setTabData({
-        course_blocks: { blocks: courseBlocks.blocks },
-      });
-      await fetchAndRender();
-      expect(screen.getByTitle('Completed section')).toBeInTheDocument();
-    });
-
-    it('displays correct icon for incomplete assignment', async () => {
-      const { courseBlocks } = await buildMinimalCourseBlocks(courseId, 'Title', { complete: false });
-      setTabData({
-        course_blocks: { blocks: courseBlocks.blocks },
-      });
-      await fetchAndRender();
-      expect(screen.getByTitle('Incomplete section')).toBeInTheDocument();
-    });
-
-    it('SequenceLink displays points to legacy courseware', async () => {
-      const { courseBlocks } = await buildMinimalCourseBlocks(courseId, 'Title', { resumeBlock: true });
-      setMetadata({
-        can_load_courseware: false,
-      });
-      setTabData({
-        course_blocks: { blocks: courseBlocks.blocks },
-      });
-      await fetchAndRender();
-
-      const sequenceLink = screen.getByText('Title of Sequence');
-      expect(sequenceLink.getAttribute('href')).toContain(`/courses/${courseId}`);
-    });
-
-    it('SequenceLink displays points to courseware MFE', async () => {
-      const { courseBlocks } = await buildMinimalCourseBlocks(courseId, 'Title', { resumeBlock: true });
-      setMetadata({
-        can_load_courseware: true,
-      });
-      setTabData({
-        course_blocks: { blocks: courseBlocks.blocks },
-      });
-      await fetchAndRender();
-
-      const sequenceLink = screen.getByText('Title of Sequence');
-      expect(sequenceLink.getAttribute('href')).toContain(`/course/${courseId}`);
-    });
-  });
-
-  describe('Dates Banner', () => {
-    beforeEach(() => {
-      setMetadata({ is_enrolled: true });
-      setTabData({
-        dates_banner_info: {
-          content_type_gating_enabled: true,
-          missed_deadlines: true,
-          missed_gated_content: true,
-          verified_upgrade_link: 'http://localhost:18130/basket/add/?sku=8CF08E5',
-        },
-      }, {
-        date_blocks: [
-          {
-            assignment_type: 'Homework',
-            date: '2010-08-20T05:59:40.942669Z',
-            date_type: 'assignment-due-date',
-            description: '',
-            learner_has_access: true,
-            title: 'Missed assignment',
-            extra_info: null,
-          },
-        ],
-      });
-    });
-
-    it('renders upgradeToReset', async () => {
-      await fetchAndRender();
-
-      expect(screen.getByText('You are auditing this course,')).toBeInTheDocument();
-      expect(screen.getByText('which means that you are unable to participate in graded assignments. It looks like you missed some important deadlines based on our suggested schedule. To complete graded assignments as part of this course and shift the past due assignments into the future, you can upgrade today.')).toBeInTheDocument();
-      expect(screen.getByRole('button', { name: 'Upgrade to shift due dates' })).toBeInTheDocument();
-    });
-
-    it('sends analytics event onClick of upgrade button in banner', async () => {
-      await fetchAndRender();
-      sendTrackEvent.mockClear();
-
-      const upgradeButton = screen.getByRole('button', { name: 'Upgrade to shift due dates' });
-      fireEvent.click(upgradeButton);
-
-      expect(sendTrackEvent).toHaveBeenCalledTimes(1);
-      expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.ecommerce.upsell_links_clicked', {
-        org_key: 'edX',
-        courserun_key: courseId,
-        linkCategory: 'personalized_learner_schedules',
-        linkName: 'course_home_upgrade_shift_dates',
-        linkType: 'button',
-        pageName: 'course_home',
-      });
-    });
-  });
-
-  describe('Welcome Message', () => {
-    beforeEach(() => {
-      setMetadata({ is_enrolled: true });
-    });
-
-    it('does not render show more/less button under 100 words', async () => {
-      await fetchAndRender();
-      expect(screen.getByTestId('alert-container-welcome')).toBeInTheDocument();
-      expect(screen.queryByRole('button', { name: 'Show more' })).not.toBeInTheDocument();
-    });
-
-    describe('over 100 words', () => {
-      beforeEach(async () => {
-        setTabData({
-          welcome_message_html: '<p>'
-            + 'This is a test welcome message that happens to be longer than one hundred words. We hope it will be shortened.'
-            + 'This is a test welcome message that happens to be longer than one hundred words. We hope it will be shortened.'
-            + 'This is a test welcome message that happens to be longer than one hundred words. We hope it will be shortened.'
-            + 'This is a test welcome message that happens to be longer than one hundred words. We hope it will be shortened.'
-            + 'This is a test welcome message that happens to be longer than one hundred words. We hope it will be shortened.'
-            + '</p>',
-        });
-        await fetchAndRender();
-      });
-
-      it('shortens message', async () => {
-        expect(screen.getByTestId('short-welcome-message-iframe')).toBeInTheDocument();
-        const showMoreButton = screen.queryByRole('button', { name: 'Show More' });
-        expect(showMoreButton).toBeInTheDocument();
-      });
-
-      it('renders show more/less button and handles click', async () => {
-        expect(screen.getByTestId('alert-container-welcome')).toBeInTheDocument();
-        let showMoreButton = screen.getByRole('button', { name: 'Show More' });
-        expect(showMoreButton).toBeInTheDocument();
-
-        userEvent.click(showMoreButton);
-        let showLessButton = screen.getByRole('button', { name: 'Show Less' });
-        expect(showLessButton).toBeInTheDocument();
-        expect(screen.getByTestId('long-welcome-message-iframe')).toBeInTheDocument();
-
-        userEvent.click(showLessButton);
-        showLessButton = screen.queryByRole('button', { name: 'Show Less' });
-        expect(showLessButton).not.toBeInTheDocument();
-        showMoreButton = screen.getByRole('button', { name: 'Show More' });
-        expect(showMoreButton).toBeInTheDocument();
-      });
-    });
-
-    it('does not display if no update available', async () => {
-      setTabData({ welcome_message_html: null });
-      await fetchAndRender();
-      expect(screen.queryByTestId('alert-container-welcome')).not.toBeInTheDocument();
-    });
-  });
-
-  describe('Course Dates', () => {
-    it('renders when course date blocks are populated', async () => {
-      const startDate = new Date();
-      startDate.setHours(startDate.getHours() + 1);
-      setMetadata({ is_enrolled: true });
-      setTabData({}, {
-        date_blocks: [
-          {
-            date_type: 'course-start-date',
-            date: startDate.toISOString(),
-            title: 'Start',
-          },
-        ],
-      });
-      await fetchAndRender();
-      expect(screen.getByRole('heading', { name: 'Upcoming Dates' })).toBeInTheDocument();
-    });
-
-    it('does not render when course date blocks are not populated', async () => {
-      setMetadata({ is_enrolled: true });
-      await fetchAndRender();
-      expect(screen.queryByRole('heading', { name: 'Upcoming Dates' })).not.toBeInTheDocument();
-    });
-
-    it('sends analytics event onClick of upgrade link', async () => {
-      const now = new Date();
-      const tomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1);
-      setMetadata({ is_enrolled: true });
-      setTabData({}, {
-        date_blocks: [
-          {
-            date_type: 'verified-upgrade-deadline',
-            date: tomorrow.toISOString(),
-            link: 'https://example.com/upgrade',
-            link_text: 'Upgrade to Verified Certificate',
-            title: 'Verification Upgrade Deadline',
-          },
-        ],
-      });
-      await fetchAndRender();
-      sendTrackEvent.mockClear();
-
-      const upgradeLink = screen.getByRole('link', { name: 'Upgrade to Verified Certificate' });
-      fireEvent.click(upgradeLink);
-
-      expect(sendTrackEvent).toHaveBeenCalledTimes(1);
-      expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.ecommerce.upsell_links_clicked', {
-        org_key: 'edX',
-        courserun_key: courseId,
-        linkCategory: '(none)',
-        linkName: 'course_home_dates',
-        linkType: 'link',
-        pageName: 'course_home',
-      });
-    });
-  });
-
-  describe('Course Goals', () => {
-    const goalOptions = [
-      ['certify', 'Earn a certificate'],
-      ['complete', 'Complete the course'],
-      ['explore', 'Explore the course'],
-      ['unsure', 'Not sure yet'],
-    ];
-
-    it('does not render goal widgets if no goals available', async () => {
-      await fetchAndRender();
-      expect(screen.queryByTestId('course-goal-card')).not.toBeInTheDocument();
-      expect(screen.queryByLabelText('Goal')).not.toBeInTheDocument();
-      expect(screen.queryByTestId('edit-goal-selector')).not.toBeInTheDocument();
-    });
-
-    describe('goal is not set', () => {
-      beforeEach(async () => {
-        setTabData({
-          course_goals: {
-            goal_options: goalOptions,
-            selected_goal: null,
-          },
-        });
-        await fetchAndRender();
-      });
-
-      it('renders goal card', () => {
-        expect(screen.queryByLabelText('Goal')).not.toBeInTheDocument();
-        expect(screen.getByTestId('course-goal-card')).toBeInTheDocument();
-        expect(screen.getByRole('button', { name: 'Earn a certificate' })).toBeInTheDocument();
-        expect(screen.getByRole('button', { name: 'Complete the course' })).toBeInTheDocument();
-        expect(screen.getByRole('button', { name: 'Explore the course' })).toBeInTheDocument();
-        expect(screen.getByRole('button', { name: 'Not sure yet' })).toBeInTheDocument();
-      });
-
-      it('renders goal selector on goal selection', async () => {
-        const certifyGoalButton = screen.getByRole('button', { name: 'Earn a certificate' });
-        fireEvent.click(certifyGoalButton);
-
-        const goalSelector = await screen.findByTestId('edit-goal-selector');
-        expect(goalSelector).toBeInTheDocument();
-      });
-    });
-
-    describe('goal is set', () => {
-      beforeEach(async () => {
-        setTabData({
-          course_goals: {
-            goal_options: goalOptions,
-            selected_goal: { text: 'Earn a certificate', key: 'certify' },
-          },
-        });
-        await fetchAndRender();
-      });
-
-      it('renders edit goal selector', () => {
-        expect(screen.getByLabelText('Goal')).toBeInTheDocument();
-        expect(screen.getByTestId('edit-goal-selector')).toBeInTheDocument();
-        expect(screen.getByRole('button', { name: 'Earn a certificate' })).toBeInTheDocument();
-      });
-
-      it('updates goal on click', async () => {
-        // Open dropdown
-        const dropdownButtonNode = screen.getByRole('button', { name: 'Earn a certificate' });
-        await waitFor(() => {
-          expect(dropdownButtonNode).toBeInTheDocument();
-        });
-        fireEvent.click(dropdownButtonNode);
-
-        // Select a new goal
-        const unsureButtonNode = screen.getByRole('button', { name: 'Not sure yet' });
-        await waitFor(() => {
-          expect(unsureButtonNode).toBeInTheDocument();
-        });
-        fireEvent.click(unsureButtonNode);
-
-        // Verify the request was made
-        await waitFor(() => {
-          expect(axiosMock.history.post[0].url).toMatch(goalUrl);
-          expect(axiosMock.history.post[0].data).toMatch(`{"course_id":"${courseId}","goal_key":"unsure"}`);
-        });
-      });
-    });
-  });
-
-  describe('Course Handouts', () => {
-    it('renders title when handouts are available', async () => {
-      await fetchAndRender();
-      expect(screen.queryByRole('heading', { name: 'Course Handouts' })).toBeInTheDocument();
-    });
-
-    it('does not display title if no handouts available', async () => {
-      setTabData({ handouts_html: null });
-      await fetchAndRender();
-      expect(screen.queryByRole('heading', { name: 'Course Handouts' })).not.toBeInTheDocument();
-    });
-  });
-
-  describe('Course Tools', () => {
-    it('renders title when tools are available', async () => {
-      await fetchAndRender();
-      expect(screen.getByRole('heading', { name: 'Course Tools' })).toBeInTheDocument();
-      expect(screen.getByRole('link', { name: 'Bookmarks' })).toBeInTheDocument();
-    });
-
-    it('does not render title when tools are not available', async () => {
-      setTabData({
-        course_tools: [],
-      });
-      await fetchAndRender();
-      expect(screen.queryByRole('heading', { name: 'Course Tools' })).not.toBeInTheDocument();
-    });
-
-    it('analytics sent when upgrade link clicked', async () => {
-      await fetchAndRender();
-      expect(screen.getByRole('heading', { name: 'Course Tools' })).toBeInTheDocument();
-      sendTrackEvent.mockClear();
-      sendTrackingLogEvent.mockClear();
-
-      const upgradeLink = screen.getByRole('link', { name: 'Upgrade to Verified' });
-      fireEvent.click(upgradeLink);
-
-      expect(sendTrackEvent).toHaveBeenCalledTimes(1);
-      expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.ecommerce.upsell_links_clicked', {
-        org_key: 'edX',
-        courserun_key: courseId,
-        linkCategory: '(none)',
-        linkName: 'course_home_course_tools',
-        linkType: 'link',
-        pageName: 'course_home',
-      });
-
-      expect(sendTrackingLogEvent).toHaveBeenCalledTimes(1);
-      expect(sendTrackingLogEvent).toHaveBeenCalledWith('edx.course.tool.accessed', {
-        org_key: 'edX',
-        courserun_key: courseId,
-        course_id: courseId,
-        is_staff: false,
-        tool_name: 'edx.tool.verified_upgrade',
-      });
-    });
-  });
-
-  describe('Alert List', () => {
-    describe('Private Course Alert', () => {
-      it('does not display alert for enrolled user', async () => {
-        setMetadata({ is_enrolled: true });
-        await fetchAndRender();
-        expect(screen.queryByRole('button', { name: 'Enroll now' })).not.toBeInTheDocument();
-        expect(screen.queryByText('to access the full course')).not.toBeInTheDocument();
-      });
-
-      it('does not display enrollment button if enrollment is not available', async () => {
-        setTabData({
-          enroll_alert: {
-            can_enroll: false,
-          },
-        });
-        await fetchAndRender();
-
-        const alert = await screen.findByText('Welcome to Demonstration Course');
-        expect(alert.parentElement).toHaveAttribute('role', 'alert');
-
-        expect(screen.queryByRole('button', { name: 'Enroll now' })).not.toBeInTheDocument();
-        expect(screen.getByText('You must be enrolled in the course to see course content.')).toBeInTheDocument();
-      });
-
-      it('displays alert for unenrolled user', async () => {
-        await fetchAndRender();
-
-        const alert = await screen.findByText('Welcome to Demonstration Course');
-        expect(alert.parentElement).toHaveAttribute('role', 'alert');
-
-        expect(screen.getByRole('button', { name: 'Enroll now' })).toBeInTheDocument();
-      });
-
-      it('handles button click', async () => {
-        const { location } = window;
-        delete window.location;
-        window.location = {
-          reload: jest.fn(),
-        };
-        await fetchAndRender();
-
-        const button = await screen.findByRole('button', { name: 'Enroll now' });
-        fireEvent.click(button);
-        await waitFor(() => expect(axiosMock.history.post).toHaveLength(1));
-        expect(axiosMock.history.post[0].data)
-          .toEqual(JSON.stringify({ course_details: { course_id: courseId } }));
-        expect(window.location.reload).toHaveBeenCalledTimes(1);
-
-        window.location = location;
-      });
-    });
-
-    describe('Access Expiration Alert', () => {
-      it('has special masquerade text', async () => {
-        setTabData({
-          access_expiration: {
-            expiration_date: '2020-01-01T12:00:00Z',
-            masquerading_expired_course: true,
-            upgrade_deadline: null,
-            upgrade_url: null,
-          },
-        });
-        await fetchAndRender();
-        await screen.findByText('This learner does not have access to this course.', { exact: false });
-      });
-
-      it('shows expiration', async () => {
-        setTabData({
-          access_expiration: {
-            expiration_date: '2080-01-01T12:00:00Z',
-            masquerading_expired_course: false,
-            upgrade_deadline: null,
-            upgrade_url: null,
-          },
-        });
-        await fetchAndRender();
-        await screen.findByText('Audit Access Expires');
-      });
-
-      it('shows upgrade prompt', async () => {
-        setTabData({
-          access_expiration: {
-            expiration_date: '2080-01-01T12:00:00Z',
-            masquerading_expired_course: false,
-            upgrade_deadline: '2070-01-01T12:00:00Z',
-            upgrade_url: 'https://example.com/upgrade',
-          },
-        });
-        await fetchAndRender();
-        await screen.findByText('to get unlimited access to the course as long as it exists on the site.', { exact: false });
-      });
-
-      it('sends analytics event onClick of upgrade link', async () => {
-        setTabData({
-          access_expiration: {
-            expiration_date: '2080-01-01T12:00:00Z',
-            masquerading_expired_course: false,
-            upgrade_deadline: '2070-01-01T12:00:00Z',
-            upgrade_url: 'https://example.com/upgrade',
-          },
-        });
-        await fetchAndRender();
-
-        // Clearing after render to remove any events sent on view (ex. 'Promotion Viewed')
-        sendTrackEvent.mockClear();
-        const upgradeLink = screen.getByRole('link', { name: 'Upgrade now' });
-        fireEvent.click(upgradeLink);
-
-        expect(sendTrackEvent).toHaveBeenCalledTimes(1);
-        expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.ecommerce.upsell_links_clicked', {
-          org_key: 'edX',
-          courserun_key: courseId,
-          linkCategory: 'FBE_banner',
-          linkName: 'course_home_audit_access_expires',
-          linkType: 'link',
-          pageName: 'course_home',
-        });
-      });
-    });
-
-    describe('Course Start Alert', () => {
-      // Only appears if enrolled and before start of course
-      it('appears several days out', async () => {
-        const startDate = new Date();
-        startDate.setDate(startDate.getDate() + 100);
-        setMetadata({ is_enrolled: true });
-        setTabData({}, {
-          date_blocks: [
-            {
-              date_type: 'course-start-date',
-              date: startDate.toISOString(),
-              title: 'Start',
-            },
-          ],
-        });
-        await fetchAndRender();
-        const node = await screen.findByText('Course starts', { exact: false });
-        expect(node.textContent).toMatch(/.* on .*/); // several days away uses "on" before date
-      });
-
-      it('appears today', async () => {
-        const startDate = new Date();
-        startDate.setHours(startDate.getHours() + 1);
-        setMetadata({ is_enrolled: true });
-        setTabData({}, {
-          date_blocks: [
-            {
-              date_type: 'course-start-date',
-              date: startDate.toISOString(),
-              title: 'Start',
-            },
-          ],
-        });
-        await fetchAndRender();
-        const node = await screen.findByText('Course starts', { exact: false });
-        expect(node.textContent).toMatch(/.* at .*/); // same day uses "at" before date
-      });
-    });
-
-    describe('Course End Alert', () => {
-      // Only appears if enrolled and within 14 days before the end of course
-      it('appears several days out', async () => {
-        const endDate = new Date();
-        endDate.setDate(endDate.getDate() + 13);
-        setMetadata({ is_enrolled: true });
-        setTabData({}, {
-          date_blocks: [
-            {
-              date_type: 'course-end-date',
-              date: endDate.toISOString(),
-              title: 'End',
-            },
-          ],
-        });
-        await fetchAndRender();
-        const node = await screen.findByText('This course is ending', { exact: false });
-        expect(node.textContent).toMatch(/.* on .*/); // several days away uses "on" before date
-      });
-
-      it('appears today', async () => {
-        const endDate = new Date();
-        endDate.setHours(endDate.getHours() + 1);
-        setMetadata({ is_enrolled: true });
-        setTabData({}, {
-          date_blocks: [
-            {
-              date_type: 'course-end-date',
-              date: endDate.toISOString(),
-              title: 'End',
-            },
-          ],
-        });
-        await fetchAndRender();
-        const node = await screen.findByText('This course is ending', { exact: false });
-        expect(node.textContent).toMatch(/.* at .*/); // same day uses "at" before date
-      });
-    });
-
-    describe('Certificate Available Alert', () => {
-      // Must satisfy two conditions for alert to appear: enrolled and between course end and cert availability
-      it('appears', async () => {
-        const now = new Date();
-        const yesterday = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 1);
-        const tomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1);
-        setMetadata({ is_enrolled: true });
-        setTabData({}, {
-          date_blocks: [
-            {
-              date_type: 'course-end-date',
-              date: yesterday.toISOString(),
-              title: 'End',
-            },
-            {
-              date_type: 'certificate-available-date',
-              date: tomorrow.toISOString(),
-              title: 'Cert Available',
-            },
-          ],
-        });
-        await fetchAndRender();
-        await screen.findByText('We are working on generating course certificates.');
-      });
-    });
-
-    describe('Offer Alert', () => {
-      it('sends analytics event onClick of upgrade link', async () => {
-        setTabData({
-          offer: {
-            code: 'EDXWELCOME',
-            expiration_date: '2070-01-01T12:00:00Z',
-            original_price: '$100',
-            discounted_price: '$85',
-            percentage: 15,
-            upgrade_url: 'https://example.com/upgrade',
-          },
-        });
-        await fetchAndRender();
-
-        expect(screen.getByRole('link', { name: 'Upgrade now' })).toBeInTheDocument();
-      });
-
-      it('sends analytics event onClick of upgrade link', async () => {
-        setTabData({
-          offer: {
-            code: 'EDXWELCOME',
-            expiration_date: '2070-01-01T12:00:00Z',
-            original_price: '$100',
-            discounted_price: '$85',
-            percentage: 15,
-            upgrade_url: 'https://example.com/upgrade',
-          },
-        });
-        await fetchAndRender();
-
-        // Clearing after render to remove any events sent on view (ex. 'Promotion Viewed')
-        sendTrackEvent.mockClear();
-        const upgradeLink = screen.getByRole('link', { name: 'Upgrade now' });
-        fireEvent.click(upgradeLink);
-
-        expect(sendTrackEvent).toHaveBeenCalledTimes(1);
-        expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.ecommerce.upsell_links_clicked', {
-          org_key: 'edX',
-          courserun_key: courseId,
-          linkCategory: 'welcome',
-          linkName: 'course_home_welcome',
-          linkType: 'link',
-          pageName: 'course_home',
-        });
-      });
-    });
-  });
-
-  describe('Proctoring Info Panel', () => {
-    const onboardingReleaseDate = new Date();
-    onboardingReleaseDate.setDate(new Date().getDate() - 7);
-    it('appears', async () => {
-      await fetchAndRender();
-      await screen.findByText('This course contains proctored exams');
-      expect(screen.queryByRole('link', { name: 'Review instructions and system requirements' })).toBeInTheDocument();
-    });
-
-    it('appears for verified', async () => {
-      axiosMock.onGet(proctoringInfoUrl).reply(200, {
-        onboarding_status: 'verified',
-        onboarding_link: 'test',
-        expiration_date: null,
-        onboarding_release_date: onboardingReleaseDate.toISOString(),
-      });
-      await fetchAndRender();
-      await screen.findByText('This course contains proctored exams');
-      expect(screen.queryByRole('link', { name: 'Complete Onboarding' })).not.toBeInTheDocument();
-      expect(screen.queryByRole('link', { name: 'Review instructions and system requirements' })).toBeInTheDocument();
-      expect(screen.queryByText('You must complete the onboarding process prior to taking any proctored exam.')).not.toBeInTheDocument();
-      expect(screen.queryByText('Onboarding profile review can take 2+ business days.')).not.toBeInTheDocument();
-    });
-
-    it('appears for rejected', async () => {
-      axiosMock.onGet(proctoringInfoUrl).reply(200, {
-        onboarding_status: 'rejected',
-        onboarding_link: 'test',
-        expiration_date: null,
-        onboarding_release_date: onboardingReleaseDate.toISOString(),
-      });
-      await fetchAndRender();
-      await screen.findByText('This course contains proctored exams');
-      expect(screen.queryByRole('link', { name: 'Complete Onboarding' })).toBeInTheDocument();
-      expect(screen.queryByRole('link', { name: 'Review instructions and system requirements' })).toBeInTheDocument();
-      expect(screen.queryByText('You must complete the onboarding process prior to taking any proctored exam.')).toBeInTheDocument();
-      expect(screen.queryByText('Onboarding profile review can take 2+ business days.')).toBeInTheDocument();
-    });
-
-    it('appears for submitted', async () => {
-      axiosMock.onGet(proctoringInfoUrl).reply(200, {
-        onboarding_status: 'submitted',
-        onboarding_link: 'test',
-        expiration_date: null,
-        onboarding_release_date: onboardingReleaseDate.toISOString(),
-      });
-      await fetchAndRender();
-      await screen.findByText('This course contains proctored exams');
-      expect(screen.queryByText('Your submitted profile is in review.')).toBeInTheDocument();
-      expect(screen.queryByText('Onboarding profile review can take 2+ business days.')).toBeInTheDocument();
-    });
-
-    it('appears for second_review_required', async () => {
-      axiosMock.onGet(proctoringInfoUrl).reply(200, {
-        onboarding_status: 'second_review_required',
-        onboarding_link: 'test',
-        expiration_date: null,
-        onboarding_release_date: onboardingReleaseDate.toISOString(),
-      });
-      await fetchAndRender();
-      await screen.findByText('This course contains proctored exams');
-      expect(screen.queryByText('Your submitted profile is in review.')).toBeInTheDocument();
-      expect(screen.queryByText('Onboarding profile review can take 2+ business days.')).toBeInTheDocument();
-    });
-
-    it('appears for other_course_approved if not expiring soon', async () => {
-      const expirationDate = new Date();
-      // Set the expiration date 40 days in the future, so as not to trigger the 28 day expiration warning
-      expirationDate.setTime(expirationDate.getTime() + 3456900000);
-      axiosMock.onGet(proctoringInfoUrl).reply(200, {
-        onboarding_status: 'other_course_approved',
-        onboarding_link: 'test',
-        expiration_date: expirationDate.toString(),
-        onboarding_release_date: onboardingReleaseDate.toISOString(),
-      });
-      await fetchAndRender();
-      await screen.findByText('This course contains proctored exams');
-      expect(screen.queryByText('You are eligible to take proctored exams in this course.')).toBeInTheDocument();
-      expect(screen.queryByText('Onboarding profile review can take 2+ business days.')).not.toBeInTheDocument();
-    });
-
-    it('displays expiration warning', async () => {
-      const expirationDate = new Date();
-      // This message will render if the expiration date is within 28 days; set the date 10 days in future
-      expirationDate.setTime(expirationDate.getTime() + 864800000);
-      axiosMock.onGet(proctoringInfoUrl).reply(200, {
-        onboarding_status: 'other_course_approved',
-        onboarding_link: 'test',
-        expiration_date: expirationDate.toString(),
-        onboarding_release_date: onboardingReleaseDate.toISOString(),
-      });
-      await fetchAndRender();
-      await screen.findByText('This course contains proctored exams');
-      expect(screen.queryByText('Your onboarding profile has been approved in another course, so you are eligible to take proctored exams in this course. However, your onboarding status is expiring soon. Please complete onboarding again to ensure that you will be able to continue taking proctored exams.')).toBeInTheDocument();
-      expect(screen.queryByText('Onboarding profile review can take 2+ business days.')).toBeInTheDocument();
-    });
-
-    it('appears for no status', async () => {
-      axiosMock.onGet(proctoringInfoUrl).reply(200, {
-        onboarding_status: '',
-        onboarding_link: 'test',
-        expiration_date: null,
-        onboarding_release_date: onboardingReleaseDate.toISOString(),
-      });
-      await fetchAndRender();
-      await screen.findByText('This course contains proctored exams');
-      expect(screen.queryByRole('link', { name: 'Complete Onboarding' })).toBeInTheDocument();
-      expect(screen.queryByRole('link', { name: 'Review instructions and system requirements' })).toBeInTheDocument();
-      expect(screen.queryByText('You must complete the onboarding process prior to taking any proctored exam.')).toBeInTheDocument();
-      expect(screen.queryByText('Onboarding profile review can take 2+ business days.')).toBeInTheDocument();
-    });
-
-    it('does not appear for 404', async () => {
-      axiosMock.onGet(proctoringInfoUrl).reply(404);
-      expect(screen.queryByRole('link', { name: 'Review instructions and system requirements' })).not.toBeInTheDocument();
-    });
-
-    it('appears with a disabled link if onboarding not yet released', async () => {
-      const futureReleaseDate = new Date();
-      futureReleaseDate.setDate(new Date().getDate() + 7);
-      const expectedDateStr = new Intl.DateTimeFormat('en-US', {
-        day: 'numeric',
-        month: 'short',
-        year: 'numeric',
-      }).format(futureReleaseDate);
-
-      axiosMock.onGet(proctoringInfoUrl).reply(200, {
-        onboarding_status: '',
-        onboarding_link: 'test',
-        expiration_date: null,
-        onboarding_release_date: futureReleaseDate.toISOString(),
-      });
-      await fetchAndRender();
-      await screen.findByText('This course contains proctored exams');
-      expect(screen.queryByText(`Onboarding Opens: ${expectedDateStr}`)).toBeInTheDocument();
-    });
-
-    it('appears and ignores a missing release date', async () => {
-      axiosMock.onGet(proctoringInfoUrl).reply(200, {
-        onboarding_status: 'verified',
-        onboarding_link: 'test',
-        expiration_date: null,
-        onboarding_release_date: onboardingReleaseDate.toISOString(),
-      });
-      await fetchAndRender();
-      await screen.findByText('This course contains proctored exams');
-      expect(screen.queryByRole('link', { name: 'Complete Onboarding' })).not.toBeInTheDocument();
-      expect(screen.queryByRole('link', { name: 'Review instructions and system requirements' })).toBeInTheDocument();
-      expect(screen.queryByText('You must complete the onboarding process prior to taking any proctored exam.')).not.toBeInTheDocument();
-      expect(screen.queryByText('Onboarding profile review can take 2+ business days.')).not.toBeInTheDocument();
-    });
-  });
-
-  describe('Upgrade Card', () => {
-    it('renders title when upgrade is available', async () => {
-      await fetchAndRender();
-      expect(screen.queryByRole('heading', { name: 'Pursue a verified certificate' })).toBeInTheDocument();
-    });
-
-    it('displays link to upgrade', async () => {
-      await fetchAndRender();
-      expect(screen.getByRole('link', { name: 'Upgrade for $149' })).toBeInTheDocument();
-    });
-
-    it('viewing upgrade card sends analytics', async () => {
-      sendTrackEvent.mockClear();
-      sendTrackingLogEvent.mockClear();
-      await fetchAndRender();
-
-      expect(sendTrackEvent).toHaveBeenCalledTimes(1);
-      expect(sendTrackEvent).toHaveBeenCalledWith('Promotion Viewed', {
-        org_key: 'edX',
-        courserun_key: courseId,
-        creative: 'sidebarupsell',
-        name: 'In-Course Verification Prompt',
-        position: 'sidebar-message',
-        promotion_id: 'courseware_verified_certificate_upsell',
-      });
-
-      expect(sendTrackingLogEvent).toHaveBeenCalledTimes(1);
-      expect(sendTrackingLogEvent).toHaveBeenCalledWith('edx.bi.course.upgrade.sidebarupsell.displayed', {
-        org_key: 'edX',
-        courserun_key: courseId,
-      });
-    });
-
-    it('clicking upgrade link sends analytics', async () => {
-      await fetchAndRender();
-
-      // Clearing after render to remove any events sent on view (ex. 'Promotion Viewed')
-      sendTrackEvent.mockClear();
-      sendTrackingLogEvent.mockClear();
-      const upgradeButton = screen.getByRole('link', { name: 'Upgrade for $149' });
-
-      fireEvent.click(upgradeButton);
-
-      expect(sendTrackEvent).toHaveBeenCalledTimes(2);
-      expect(sendTrackEvent).toHaveBeenNthCalledWith(1, 'Promotion Clicked', {
-        org_key: 'edX',
-        courserun_key: courseId,
-        creative: 'sidebarupsell',
-        name: 'In-Course Verification Prompt',
-        position: 'sidebar-message',
-        promotion_id: 'courseware_verified_certificate_upsell',
-      });
-      expect(sendTrackEvent).toHaveBeenNthCalledWith(2, 'edx.bi.ecommerce.upsell_links_clicked', {
-        org_key: 'edX',
-        courserun_key: courseId,
-        linkCategory: 'green_upgrade',
-        linkName: 'course_home_green',
-        linkType: 'button',
-        pageName: 'course_home',
-      });
-
-      expect(sendTrackingLogEvent).toHaveBeenCalledTimes(2);
-      expect(sendTrackingLogEvent).toHaveBeenNthCalledWith(1, 'edx.bi.course.upgrade.sidebarupsell.clicked', {
-        org_key: 'edX',
-        courserun_key: courseId,
-      });
-      expect(sendTrackingLogEvent).toHaveBeenNthCalledWith(2, 'edx.course.enrollment.upgrade.clicked', {
-        org_key: 'edX',
-        courserun_key: courseId,
-        location: 'sidebar-message',
-      });
-    });
-  });
-});

src/course-home/outline-tab/Section.jsx

@@ -1,122 +1,50 @@
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Collapsible, IconButton } from '@edx/paragon';
-import { faCheckCircle as fasCheckCircle, faMinus, faPlus } from '@fortawesome/free-solid-svg-icons';
-import { faCheckCircle as farCheckCircle } from '@fortawesome/free-regular-svg-icons';
+import { Collapsible } from '@edx/paragon';
+import { faChevronRight, faChevronDown } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-
-import EffortEstimate from '../../shared/effort-estimate';
 import SequenceLink from './SequenceLink';
 import { useModel } from '../../generic/model-store';
 
-import genericMessages from '../../generic/messages';
-import messages from './messages';
-
-function Section({
-  courseId,
-  defaultOpen,
-  expand,
-  intl,
-  section,
-}) {
-  const {
-    complete,
-    sequenceIds,
-    title,
-  } = section;
+export default function Section({ courseId, title, sequenceIds }) {
   const {
     courseBlocks: {
       sequences,
     },
   } = useModel('outline', courseId);
 
-  const [open, setOpen] = useState(defaultOpen);
-
-  useEffect(() => {
-    setOpen(expand);
-  }, [expand]);
-
-  useEffect(() => {
-    setOpen(defaultOpen);
-  }, []);
-
-  const sectionTitle = (
-    <div className="row w-100 m-0">
-      <div className="col-auto p-0">
-        {complete ? (
-          <FontAwesomeIcon
-            icon={fasCheckCircle}
-            fixedWidth
-            className="float-left mt-1 text-success"
-            aria-hidden="true"
-            title={intl.formatMessage(messages.completedSection)}
-          />
-        ) : (
-          <FontAwesomeIcon
-            icon={farCheckCircle}
-            fixedWidth
-            className="float-left mt-1 text-gray-400"
-            aria-hidden="true"
-            title={intl.formatMessage(messages.incompleteSection)}
-          />
-        )}
-      </div>
-      <div className="col-10 ml-3 p-0 font-weight-bold text-dark-500">
-        <span className="align-middle">{title}</span>
-        <span className="sr-only">
-          , {intl.formatMessage(complete ? messages.completedSection : messages.incompleteSection)}
-        </span>
-        <EffortEstimate className="ml-3 align-middle" block={section} />
-      </div>
-    </div>
-  );
-
   return (
-    <li>
-      <Collapsible
-        className="mb-2"
-        styling="card-lg"
-        title={sectionTitle}
-        open={open}
-        onToggle={() => { setOpen(!open); }}
-        iconWhenClosed={(
-          <IconButton
-            alt={intl.formatMessage(messages.openSection)}
-            icon={faPlus}
-            onClick={() => { setOpen(true); }}
+    <Collapsible.Advanced className="collapsible-card mb-2">
+      <Collapsible.Trigger className="collapsible-trigger d-flex align-items-start">
+        <Collapsible.Visible whenClosed>
+          <div style={{ minWidth: '1rem' }}>
+            <FontAwesomeIcon icon={faChevronRight} />
+          </div>
+        </Collapsible.Visible>
+        <Collapsible.Visible whenOpen>
+          <div style={{ minWidth: '1rem' }}>
+            <FontAwesomeIcon icon={faChevronDown} />
+          </div>
+        </Collapsible.Visible>
+        <div className="ml-2 flex-grow-1">{title}</div>
+      </Collapsible.Trigger>
+
+      <Collapsible.Body className="collapsible-body">
+        {sequenceIds.map((sequenceId) => (
+          <SequenceLink
+            key={sequenceId}
+            id={sequenceId}
+            courseId={courseId}
+            title={sequences[sequenceId].title}
           />
-        )}
-        iconWhenOpen={(
-          <IconButton
-            alt={intl.formatMessage(genericMessages.close)}
-            icon={faMinus}
-            onClick={() => { setOpen(false); }}
-          />
-        )}
-      >
-        <ol className="list-unstyled">
-          {sequenceIds.map((sequenceId, index) => (
-            <SequenceLink
-              key={sequenceId}
-              id={sequenceId}
-              courseId={courseId}
-              sequence={sequences[sequenceId]}
-              first={index === 0}
-            />
-          ))}
-        </ol>
-      </Collapsible>
-    </li>
+        ))}
+      </Collapsible.Body>
+    </Collapsible.Advanced>
   );
 }
 
 Section.propTypes = {
   courseId: PropTypes.string.isRequired,
-  defaultOpen: PropTypes.bool.isRequired,
-  expand: PropTypes.bool.isRequired,
-  intl: intlShape.isRequired,
-  section: PropTypes.shape().isRequired,
+  title: PropTypes.string.isRequired,
+  sequenceIds: PropTypes.arrayOf(PropTypes.string).isRequired,
 };
-
-export default injectIntl(Section);

src/course-home/outline-tab/SequenceLink.jsx

@@ -1,123 +1,17 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import classNames from 'classnames';
 import { Link } from 'react-router-dom';
-import { Hyperlink } from '@edx/paragon';
-import {
-  FormattedMessage,
-  FormattedTime,
-  injectIntl,
-  intlShape,
-} from '@edx/frontend-platform/i18n';
-import { faCheckCircle as fasCheckCircle } from '@fortawesome/free-solid-svg-icons';
-import { faCheckCircle as farCheckCircle } from '@fortawesome/free-regular-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-
-import EffortEstimate from '../../shared/effort-estimate';
-import { useModel } from '../../generic/model-store';
-import messages from './messages';
-
-function SequenceLink({
-  id,
-  intl,
-  courseId,
-  first,
-  sequence,
-}) {
-  const {
-    complete,
-    description,
-    due,
-    legacyWebUrl,
-    showLink,
-    title,
-  } = sequence;
-  const {
-    datesWidget: {
-      userTimezone,
-    },
-  } = useModel('outline', courseId);
-  const {
-    canLoadCourseware,
-  } = useModel('courseHomeMeta', courseId);
-
-  const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
-
-  // canLoadCourseware is true if the Courseware MFE is enabled, false otherwise
-  const coursewareUrl = (
-    canLoadCourseware
-      ? <Link to={`/course/${courseId}/${id}`}>{title}</Link>
-      : <Hyperlink destination={legacyWebUrl}>{title}</Hyperlink>
-  );
-  const displayTitle = showLink ? coursewareUrl : title;
 
+export default function SequenceLink({ id, courseId, title }) {
   return (
-    <li>
-      <div className={classNames('', { 'mt-2 pt-2 border-top border-light': !first })}>
-        <div className="row w-100 m-0">
-          <div className="col-auto p-0">
-            {complete ? (
-              <FontAwesomeIcon
-                icon={fasCheckCircle}
-                fixedWidth
-                className="float-left text-success mt-1"
-                aria-hidden="true"
-                title={intl.formatMessage(messages.completedAssignment)}
-              />
-            ) : (
-              <FontAwesomeIcon
-                icon={farCheckCircle}
-                fixedWidth
-                className="float-left text-gray-400 mt-1"
-                aria-hidden="true"
-                title={intl.formatMessage(messages.incompleteAssignment)}
-              />
-            )}
-          </div>
-          <div className="col-10 p-0 ml-3 text-break">
-            <span className="align-middle">{displayTitle}</span>
-            <span className="sr-only">
-              , {intl.formatMessage(complete ? messages.completedAssignment : messages.incompleteAssignment)}
-            </span>
-            <EffortEstimate className="ml-3 align-middle" block={sequence} />
-          </div>
-        </div>
-        {due && (
-          <div className="row w-100 m-0 ml-3 pl-3">
-            <small className="text-body pl-2">
-              <FormattedMessage
-                id="learning.outline.sequence-due"
-                defaultMessage="{description} due {assignmentDue}"
-                description="Used below an assignment title"
-                values={{
-                  assignmentDue: (
-                    <FormattedTime
-                      key={`${id}-due`}
-                      day="numeric"
-                      month="short"
-                      year="numeric"
-                      timeZoneName="short"
-                      value={due}
-                      {...timezoneFormatArgs}
-                    />
-                  ),
-                  description: description || '',
-                }}
-              />
-            </small>
-          </div>
-        )}
-      </div>
-    </li>
+    <div className="ml-4">
+      <Link to={`/course/${courseId}/${id}`}>{title}</Link>
+    </div>
   );
 }
 
 SequenceLink.propTypes = {
   id: PropTypes.string.isRequired,
-  intl: intlShape.isRequired,
   courseId: PropTypes.string.isRequired,
-  first: PropTypes.bool.isRequired,
-  sequence: PropTypes.shape().isRequired,
+  title: PropTypes.string.isRequired,
 };
-
-export default injectIntl(SequenceLink);

src/course-home/outline-tab/alerts/certificate-available-alert/hooks.js

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
 
 import { useAlert } from '../../../../generic/user-messages';
@@ -9,30 +9,28 @@ const CertificateAvailableAlert = React.lazy(() => import('./CertificateAvailabl
 function useCertificateAvailableAlert(courseId) {
   const {
     isEnrolled,
-  } = useModel('courseHomeMeta', courseId);
+  } = useModel('courses', courseId);
   const {
     datesWidget: {
       courseDateBlocks,
       userTimezone,
     },
   } = useModel('outline', courseId);
-  const authenticatedUser = getAuthenticatedUser();
-  const username = authenticatedUser ? authenticatedUser.username : '';
+  const { username } = getAuthenticatedUser();
 
   const certBlock = courseDateBlocks.find(b => b.dateType === 'certificate-available-date');
   const endBlock = courseDateBlocks.find(b => b.dateType === 'course-end-date');
   const endDate = endBlock ? new Date(endBlock.date) : null;
   const hasEnded = endBlock ? endDate < new Date() : false;
   const isVisible = isEnrolled && certBlock && hasEnded; // only show if we're between end and cert dates
-  const payload = {
-    certDate: certBlock && certBlock.date,
-    username,
-    userTimezone,
-  };
 
   useAlert(isVisible, {
     code: 'clientCertificateAvailableAlert',
-    payload: useMemo(() => payload, Object.values(payload).sort()),
+    payload: {
+      certDate: certBlock && certBlock.date,
+      username,
+      userTimezone,
+    },
     topic: 'outline-course-alerts',
   });
 

src/course-home/outline-tab/alerts/course-end-alert/CourseEndAlert.jsx

@@ -13,6 +13,7 @@ const DAY_MS = 24 * 60 * 60 * 1000; // in ms
 
 function CourseEndAlert({ payload }) {
   const {
+    delta,
     description,
     endDate,
     userTimezone,
@@ -29,7 +30,6 @@ function CourseEndAlert({ payload }) {
   );
 
   let msg;
-  const delta = new Date(endDate) - new Date();
   if (delta < DAY_MS) {
     const courseEndTime = (
       <FormattedTime
@@ -37,6 +37,7 @@ function CourseEndAlert({ payload }) {
         day="numeric"
         month="short"
         year="numeric"
+        hour12={false}
         timeZoneName="short"
         value={endDate}
         {...timezoneFormatArgs}
@@ -87,6 +88,7 @@ function CourseEndAlert({ payload }) {
 
 CourseEndAlert.propTypes = {
   payload: PropTypes.shape({
+    delta: PropTypes.number,
     description: PropTypes.string,
     endDate: PropTypes.string,
     userTimezone: PropTypes.string,

src/course-home/outline-tab/alerts/course-end-alert/hooks.js

@@ -1,5 +1,5 @@
 /* eslint-disable import/prefer-default-export */
-import React, { useMemo } from 'react';
+import React from 'react';
 import { useAlert } from '../../../../generic/user-messages';
 import { useModel } from '../../../../generic/model-store';
 
@@ -11,7 +11,7 @@ const WARNING_PERIOD_MS = 14 * 24 * 60 * 60 * 1000; // 14 days
 export function useCourseEndAlert(courseId) {
   const {
     isEnrolled,
-  } = useModel('courseHomeMeta', courseId);
+  } = useModel('courses', courseId);
   const {
     datesWidget: {
       courseDateBlocks,
@@ -23,15 +23,15 @@ export function useCourseEndAlert(courseId) {
   const endDate = endBlock ? new Date(endBlock.date) : null;
   const delta = endBlock ? endDate - new Date() : 0;
   const isVisible = isEnrolled && endBlock && delta > 0 && delta < WARNING_PERIOD_MS;
-  const payload = {
-    description: endBlock && endBlock.description,
-    endDate: endBlock && endBlock.date,
-    userTimezone,
-  };
 
   useAlert(isVisible, {
     code: 'clientCourseEndAlert',
-    payload: useMemo(() => payload, Object.values(payload).sort()),
+    payload: {
+      delta,
+      description: endBlock && endBlock.description,
+      endDate: endBlock && endBlock.date,
+      userTimezone,
+    },
     topic: 'outline-course-alerts',
   });
 

src/course-home/outline-tab/alerts/course-start-alert/CourseStartAlert.jsx

@@ -13,6 +13,7 @@ const DAY_MS = 24 * 60 * 60 * 1000; // in ms
 
 function CourseStartAlert({ payload }) {
   const {
+    delta,
     startDate,
     userTimezone,
   } = payload;
@@ -27,7 +28,6 @@ function CourseStartAlert({ payload }) {
     />
   );
 
-  const delta = new Date(startDate) - new Date();
   if (delta < DAY_MS) {
     return (
       <Alert type={ALERT_TYPES.INFO}>
@@ -42,6 +42,7 @@ function CourseStartAlert({ payload }) {
                 day="numeric"
                 month="short"
                 year="numeric"
+                hour12={false}
                 timeZoneName="short"
                 value={startDate}
                 {...timezoneFormatArgs}
@@ -87,6 +88,7 @@ function CourseStartAlert({ payload }) {
 
 CourseStartAlert.propTypes = {
   payload: PropTypes.shape({
+    delta: PropTypes.number,
     startDate: PropTypes.string,
     userTimezone: PropTypes.string,
   }).isRequired,

src/course-home/outline-tab/alerts/course-start-alert/hooks.js

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { useAlert } from '../../../../generic/user-messages';
 import { useModel } from '../../../../generic/model-store';
 
@@ -7,7 +7,7 @@ const CourseStartAlert = React.lazy(() => import('./CourseStartAlert'));
 function useCourseStartAlert(courseId) {
   const {
     isEnrolled,
-  } = useModel('courseHomeMeta', courseId);
+  } = useModel('courses', courseId);
   const {
     datesWidget: {
       courseDateBlocks,
@@ -18,14 +18,14 @@ function useCourseStartAlert(courseId) {
   const startBlock = courseDateBlocks.find(b => b.dateType === 'course-start-date');
   const delta = startBlock ? new Date(startBlock.date) - new Date() : 0;
   const isVisible = isEnrolled && startBlock && delta > 0;
-  const payload = {
-    startDate: startBlock && startBlock.date,
-    userTimezone,
-  };
 
   useAlert(isVisible, {
     code: 'clientCourseStartAlert',
-    payload: useMemo(() => payload, Object.values(payload).sort()),
+    payload: {
+      delta,
+      startDate: startBlock && startBlock.date,
+      userTimezone,
+    },
     topic: 'outline-course-alerts',
   });
 

src/course-home/outline-tab/alerts/private-course-alert/PrivateCourseAlert.jsx

@@ -1,117 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { getConfig } from '@edx/frontend-platform';
-import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
-import { getLoginRedirectUrl } from '@edx/frontend-platform/auth';
-import { Button, Hyperlink } from '@edx/paragon';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faSpinner } from '@fortawesome/free-solid-svg-icons';
-
-import { Alert } from '../../../../generic/user-messages';
-import enrollmentMessages from '../../../../alerts/enrollment-alert/messages';
-import genericMessages from '../../../../generic/messages';
-import outlineMessages from '../../messages';
-import { useEnrollClickHandler } from '../../../../alerts/enrollment-alert/hooks';
-import { useModel } from '../../../../generic/model-store';
-
-function PrivateCourseAlert({ intl, payload }) {
-  const {
-    anonymousUser,
-    canEnroll,
-    courseId,
-  } = payload;
-
-  const {
-    org,
-    title,
-  } = useModel('courseHomeMeta', courseId);
-
-  const { enrollClickHandler, loading } = useEnrollClickHandler(
-    courseId,
-    org,
-    intl.formatMessage(enrollmentMessages.success),
-  );
-
-  const enrollNow = (
-    <Button
-      disabled={loading}
-      variant="link"
-      className="p-0 border-0 align-top"
-      style={{ textDecoration: 'underline' }}
-      onClick={enrollClickHandler}
-    >
-      {intl.formatMessage(enrollmentMessages.enrollNowInline)}
-    </Button>
-  );
-
-  const register = (
-    <Hyperlink
-      style={{ textDecoration: 'underline' }}
-      destination={`${getConfig().LMS_BASE_URL}/register?next=${encodeURIComponent(global.location.href)}`}
-    >
-      {intl.formatMessage(genericMessages.registerLowercase)}
-    </Hyperlink>
-  );
-
-  const signIn = (
-    <Hyperlink
-      style={{ textDecoration: 'underline' }}
-      destination={`${getLoginRedirectUrl(global.location.href)}`}
-    >
-      {intl.formatMessage(genericMessages.signInSentenceCase)}
-    </Hyperlink>
-  );
-
-  return (
-    <Alert type="welcome">
-      {anonymousUser && (
-        <>
-          <p className="font-weight-bold">
-            {intl.formatMessage(enrollmentMessages.alert)}
-          </p>
-          <FormattedMessage
-            id="learning.privateCourse.signInOrRegister"
-            description="Prompts the user to sign in or register to see course content."
-            defaultMessage="{signIn} or {register} and then enroll in this course."
-            values={{
-              signIn,
-              register,
-            }}
-          />
-        </>
-      )}
-      {!anonymousUser && (
-        <>
-          <p className="font-weight-bold">{intl.formatMessage(outlineMessages.welcomeTo)} {title}</p>
-          {canEnroll && (
-            <>
-              <FormattedMessage
-                id="learning.privateCourse.canEnroll"
-                description="Prompts the user to enroll in the course to see course content."
-                defaultMessage="{enrollNow} to access the full course."
-                values={{ enrollNow }}
-              />
-              {loading && <FontAwesomeIcon icon={faSpinner} spin />}
-            </>
-          )}
-          {!canEnroll && (
-            <>
-              {intl.formatMessage(enrollmentMessages.alert)}
-            </>
-          )}
-        </>
-      )}
-    </Alert>
-  );
-}
-
-PrivateCourseAlert.propTypes = {
-  intl: intlShape.isRequired,
-  payload: PropTypes.shape({
-    anonymousUser: PropTypes.bool,
-    canEnroll: PropTypes.bool,
-    courseId: PropTypes.string,
-  }).isRequired,
-};
-
-export default injectIntl(PrivateCourseAlert);

src/course-home/outline-tab/alerts/private-course-alert/hooks.js

@@ -1,36 +0,0 @@
-/* eslint-disable import/prefer-default-export */
-import React, { useContext, useMemo } from 'react';
-import { AppContext } from '@edx/frontend-platform/react';
-import { ALERT_TYPES, useAlert } from '../../../../generic/user-messages';
-import { useModel } from '../../../../generic/model-store';
-
-const PrivateCourseAlert = React.lazy(() => import('./PrivateCourseAlert'));
-
-export function usePrivateCourseAlert(courseId) {
-  const { authenticatedUser } = useContext(AppContext);
-  const course = useModel('courseHomeMeta', courseId);
-  const outline = useModel('outline', courseId);
-  const enrolledUser = course && course.isEnrolled !== undefined && course.isEnrolled;
-  const privateOutline = outline && outline.courseBlocks && !outline.courseBlocks.courses;
-  /**
-   * This alert should render if the user is not enrolled AND
-   *    1. the user is anonymous AND the outline is private, OR
-   *    2. the user is authenticated.
-   * */
-  const isVisible = !enrolledUser && (privateOutline || authenticatedUser !== null);
-  const payload = {
-    anonymousUser: authenticatedUser === null,
-    canEnroll: outline && outline.enrollAlert ? outline.enrollAlert.canEnroll : false,
-    courseId,
-  };
-
-  useAlert(isVisible, {
-    code: 'clientPrivateCourseAlert',
-    dismissible: false,
-    payload: useMemo(() => payload, Object.values(payload).sort()),
-    topic: 'outline-private-alerts',
-    type: ALERT_TYPES.WELCOME,
-  });
-
-  return { clientPrivateCourseAlert: PrivateCourseAlert };
-}

src/course-home/outline-tab/alerts/private-course-alert/index.js

@@ -1 +0,0 @@
-export { usePrivateCourseAlert as default } from './hooks';

src/course-home/outline-tab/alerts/private-course-alert/messages.js

@@ -1,11 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  enroll: {
-    id: 'alert.enroll',
-    defaultMessage: 'You must be enrolled in the course to see course content.',
-    description: 'Text instructing the learner to enroll in the course in order to see course content.',
-  },
-});
-
-export default messages;

src/course-home/outline-tab/messages.js

@@ -5,96 +5,22 @@ const messages = defineMessages({
     id: 'learning.outline.dates.all',
     defaultMessage: 'View all course dates',
   },
-  collapseAll: {
-    id: 'learning.outline.collapseAll',
-    defaultMessage: 'Collapse all',
-    description: 'Label for button to close all of the collapsible sections',
-  },
-  completedAssignment: {
-    id: 'learning.outline.completedAssignment',
-    defaultMessage: 'Completed',
-    description: 'Text used to describe the green checkmark icon in front of an assignment title',
-  },
-  completedSection: {
-    id: 'learning.outline.completedSection',
-    defaultMessage: 'Completed section',
-    description: 'Text used to describe the green checkmark icon in front of a section title',
-  },
   dates: {
     id: 'learning.outline.dates',
     defaultMessage: 'Upcoming Dates',
   },
-  editGoal: {
-    id: 'learning.outline.editGoal',
-    defaultMessage: 'Edit goal',
-    description: 'Edit course goal button',
-  },
-  expandAll: {
-    id: 'learning.outline.expandAll',
-    defaultMessage: 'Expand all',
-    description: 'Label for button to open all of the collapsible sections',
-  },
-  goal: {
-    id: 'learning.outline.goal',
-    defaultMessage: 'Goal',
-    description: 'Label for the selected course goal',
-  },
-  goalUnsure: {
-    id: 'learning.outline.goalUnsure',
-    defaultMessage: 'Not sure yet',
-  },
   handouts: {
     id: 'learning.outline.handouts',
     defaultMessage: 'Course Handouts',
   },
-  incompleteAssignment: {
-    id: 'learning.outline.incompleteAssignment',
-    defaultMessage: 'Incomplete',
-    description: 'Text used to describe the gray checkmark icon in front of an assignment title',
-  },
-  incompleteSection: {
-    id: 'learning.outline.incompleteSection',
-    defaultMessage: 'Incomplete section',
-    description: 'Text used to describe the gray checkmark icon in front of a section title',
-  },
-  learnMore: {
-    id: 'learning.outline.learnMore',
-    defaultMessage: 'Learn More',
-  },
-  openSection: {
-    id: 'learning.outline.altText.openSection',
-    defaultMessage: 'Open',
-    description: 'A button to open the given section of the course outline',
-  },
   resume: {
     id: 'learning.outline.resume',
-    defaultMessage: 'Resume course',
-  },
-  setGoal: {
-    id: 'learning.outline.setGoal',
-    defaultMessage: 'To start, set a course goal by selecting the option below that best describes your learning plan.',
-  },
-  start: {
-    id: 'learning.outline.start',
-    defaultMessage: 'Start Course',
+    defaultMessage: 'Resume Course',
   },
   tools: {
     id: 'learning.outline.tools',
     defaultMessage: 'Course Tools',
   },
-  upgradeButton: {
-    id: 'learning.outline.upgradeButton',
-    defaultMessage: 'Upgrade ({symbol}{price})',
-  },
-  upgradeTitle: {
-    id: 'learning.outline.upgradeTitle',
-    defaultMessage: 'Pursue a verified certificate',
-  },
-  certAlt: {
-    id: 'learning.outline.certificateAlt',
-    defaultMessage: 'Example Certificate',
-    description: 'Alternate text displayed when the example certificate image cannot be displayed.',
-  },
   welcomeMessage: {
     id: 'learning.outline.welcomeMessage',
     defaultMessage: 'Welcome Message',
@@ -107,115 +33,6 @@ const messages = defineMessages({
     id: 'learning.outline.welcomeMessageShowLessButton',
     defaultMessage: 'Show Less',
   },
-  welcomeTo: {
-    id: 'learning.outline.goalWelcome',
-    defaultMessage: 'Welcome to',
-    description: 'This precedes the title of the course',
-  },
-  proctoringInfoPanel: {
-    id: 'learning.proctoringPanel.header',
-    defaultMessage: 'This course contains proctored exams',
-  },
-  notStartedProctoringStatus: {
-    id: 'learning.proctoringPanel.status.notStarted',
-    defaultMessage: 'Not Started',
-  },
-  startedProctoringStatus: {
-    id: 'learning.proctoringPanel.status.started',
-    defaultMessage: 'Started',
-  },
-  submittedProctoringStatus: {
-    id: 'learning.proctoringPanel.status.submitted',
-    defaultMessage: 'Submitted',
-  },
-  verifiedProctoringStatus: {
-    id: 'learning.proctoringPanel.status.verified',
-    defaultMessage: 'Verified',
-  },
-  rejectedProctoringStatus: {
-    id: 'learning.proctoringPanel.status.rejected',
-    defaultMessage: 'Rejected',
-  },
-  errorProctoringStatus: {
-    id: 'learning.proctoringPanel.status.error',
-    defaultMessage: 'Error',
-  },
-  otherCourseApprovedProctoringStatus: {
-    id: 'learning.proctoringPanel.status.otherCourseApproved',
-    defaultMessage: 'Approved in Another Course',
-  },
-  expiringSoonProctoringStatus: {
-    id: 'learning.proctoringPanel.status.expiringSoon',
-    defaultMessage: 'Expiring Soon',
-  },
-  proctoringCurrentStatus: {
-    id: 'learning.proctoringPanel.status',
-    defaultMessage: 'Current Onboarding Status:',
-  },
-  notStartedProctoringMessage: {
-    id: 'learning.proctoringPanel.message.notStarted',
-    defaultMessage: 'You have not started your onboarding exam.',
-  },
-  startedProctoringMessage: {
-    id: 'learning.proctoringPanel.message.started',
-    defaultMessage: 'You have started your onboarding exam.',
-  },
-  submittedProctoringMessage: {
-    id: 'learning.proctoringPanel.message.submitted',
-    defaultMessage: 'You have submitted your onboarding exam.',
-  },
-  verifiedProctoringMessage: {
-    id: 'learning.proctoringPanel.message.verified',
-    defaultMessage: 'You can now take proctored exams in this course.',
-  },
-  rejectedProctoringMessage: {
-    id: 'learning.proctoringPanel.message.rejected',
-    defaultMessage: 'Your onboarding exam has been rejected. Please retry onboarding.',
-  },
-  errorProctoringMessage: {
-    id: 'learning.proctoringPanel.message.error',
-    defaultMessage: 'An error has occurred during your onboarding exam. Please retry onboarding.',
-  },
-  otherCourseApprovedProctoringMessage: {
-    id: 'learning.proctoringPanel.message.otherCourseApproved',
-    defaultMessage: 'You are eligible to take proctored exams in this course.',
-  },
-  otherCourseApprovedProctoringDetail: {
-    id: 'learning.proctoringPanel.detail.otherCourseApproved',
-    defaultMessage: 'If your device has changed, we recommend that you complete this course\'s onboarding exam in order to ensure that your setup still meets the requirements for proctoring.',
-  },
-  expiringSoonProctoringMessage: {
-    id: 'learning.proctoringPanel.message.expiringSoon',
-    defaultMessage: 'Your onboarding profile has been approved in another course, so you are eligible to take proctored exams in this course. However, your onboarding status is expiring soon. Please complete onboarding again to ensure that you will be able to continue taking proctored exams.',
-  },
-  proctoringPanelGeneralInfo: {
-    id: 'learning.proctoringPanel.generalInfo',
-    defaultMessage: 'You must complete the onboarding process prior to taking any proctored exam. ',
-  },
-  proctoringPanelGeneralInfoSubmitted: {
-    id: 'learning.proctoringPanel.generalInfoSubmitted',
-    defaultMessage: 'Your submitted profile is in review.',
-  },
-  proctoringPanelGeneralTime: {
-    id: 'learning.proctoringPanel.generalTime',
-    defaultMessage: 'Onboarding profile review can take 2+ business days.',
-  },
-  proctoringOnboardingButton: {
-    id: 'learning.proctoringPanel.onboardingButton',
-    defaultMessage: 'Complete Onboarding',
-  },
-  proctoringOnboardingPracticeButton: {
-    id: 'learning.proctoringPanel.onboardingPracticeButton',
-    defaultMessage: 'View Onboarding Exam',
-  },
-  proctoringOnboardingButtonNotOpen: {
-    id: 'learning.proctoringPanel.onboardingButtonNotOpen',
-    defaultMessage: 'Onboarding Opens: {releaseDate}',
-  },
-  proctoringReviewRequirementsButton: {
-    id: 'learning.proctoringPanel.reviewRequirementsButton',
-    defaultMessage: 'Review instructions and system requirements',
-  },
 });
 
 export default messages;

src/course-home/outline-tab/widgets/CourseDates.jsx

@@ -7,39 +7,22 @@ import DateSummary from '../DateSummary';
 import messages from '../messages';
 import { useModel } from '../../../generic/model-store';
 
-function CourseDates({
-  courseId,
-  intl,
-  /** [MM-P2P] Experiment */
-  mmp2p,
-}) {
+function CourseDates({ courseId, intl }) {
   const {
-    datesWidget: {
-      courseDateBlocks,
-      datesTabLink,
-      userTimezone,
-    },
+    datesWidget,
   } = useModel('outline', courseId);
 
-  if (courseDateBlocks.length === 0) {
-    return null;
-  }
-
   return (
-    <section className="mb-4">
-      <h2 className="h4">{intl.formatMessage(messages.dates)}</h2>
-      <ol className="list-unstyled">
-        {courseDateBlocks.map((courseDateBlock) => (
-          <DateSummary
-            key={courseDateBlock.title + courseDateBlock.date}
-            dateBlock={courseDateBlock}
-            userTimezone={userTimezone}
-            /** [MM-P2P] Experiment */
-            mmp2p={mmp2p}
-          />
-        ))}
-      </ol>
-      <a className="font-weight-bold ml-4 pl-1 small" href={datesTabLink}>
+    <section className="mb-3">
+      <h4>{intl.formatMessage(messages.dates)}</h4>
+      {datesWidget.courseDateBlocks.map((courseDateBlock) => (
+        <DateSummary
+          key={courseDateBlock.title + courseDateBlock.date}
+          dateBlock={courseDateBlock}
+          userTimezone={datesWidget.userTimezone}
+        />
+      ))}
+      <a className="font-weight-bold" href={datesWidget.datesTabLink}>
         {intl.formatMessage(messages.allDates)}
       </a>
     </section>
@@ -49,14 +32,10 @@ function CourseDates({
 CourseDates.propTypes = {
   courseId: PropTypes.string,
   intl: intlShape.isRequired,
-  /** [MM-P2P] Experiment */
-  mmp2p: PropTypes.shape({}),
 };
 
 CourseDates.defaultProps = {
   courseId: null,
-  /** [MM-P2P] Experiment */
-  mmp2p: {},
 };
 
 export default injectIntl(CourseDates);

src/course-home/outline-tab/widgets/CourseGoalCard.jsx

@@ -1,94 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { Button, Card } from '@edx/paragon';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-
-import messages from '../messages';
-
-import { saveCourseGoal } from '../../data';
-
-function CourseGoalCard({
-  courseId,
-  goalOptions,
-  intl,
-  title,
-  setGoalToDisplay,
-  setGoalToastHeader,
-}) {
-  function selectGoalHandler(event) {
-    const selectedGoal = {
-      key: event.currentTarget.getAttribute('data-goal-key'),
-      text: event.currentTarget.getAttribute('data-goal-text'),
-    };
-
-    saveCourseGoal(courseId, selectedGoal.key).then((response) => {
-      const { data } = response;
-      const {
-        header,
-      } = data;
-
-      setGoalToDisplay(selectedGoal);
-      setGoalToastHeader(header);
-    });
-  }
-
-  return (
-    <Card className="mb-3" data-testid="course-goal-card">
-      <Card.Body>
-        <div className="row w-100 m-0 justify-content-between align-items-center">
-          <div className="col col-8 p-0">
-            <h2 className="h4 m-0">{intl.formatMessage(messages.welcomeTo)} {title}</h2>
-          </div>
-          <div className="col col-auto p-0">
-            <Button
-              variant="link"
-              className="p-0"
-              size="sm"
-              block
-              data-goal-key="unsure"
-              data-goal-text={`${intl.formatMessage(messages.goalUnsure)}`}
-              onClick={(event) => { selectGoalHandler(event); }}
-            >
-              {intl.formatMessage(messages.goalUnsure)}
-            </Button>
-          </div>
-        </div>
-        <Card.Text className="my-2 mx-1 text-dark-500">{intl.formatMessage(messages.setGoal)}</Card.Text>
-        <div className="row w-100 m-0">
-          {goalOptions.map((goal) => {
-            const [goalKey, goalText] = goal;
-            return (
-              (goalKey !== 'unsure') && (
-                <div key={`goal-${goalKey}`} className="col-auto flex-grow-1 mx-1 my-2 p-0">
-                  <Button
-                    variant="outline-primary"
-                    block
-                    data-goal-key={goalKey}
-                    data-goal-text={goalText}
-                    onClick={(event) => { selectGoalHandler(event); }}
-                  >
-                    {goalText}
-                  </Button>
-                </div>
-              )
-            );
-          })}
-        </div>
-      </Card.Body>
-    </Card>
-  );
-}
-
-CourseGoalCard.propTypes = {
-  courseId: PropTypes.string.isRequired,
-  goalOptions: PropTypes.arrayOf(
-    PropTypes.arrayOf(PropTypes.string),
-  ).isRequired,
-  intl: intlShape.isRequired,
-  title: PropTypes.string.isRequired,
-  setGoalToDisplay: PropTypes.func.isRequired,
-  setGoalToastHeader: PropTypes.func.isRequired,
-};
-
-export default injectIntl(CourseGoalCard);

src/course-home/outline-tab/widgets/CourseHandouts.jsx

@@ -17,10 +17,9 @@ function CourseHandouts({ courseId, intl }) {
   }
 
   return (
-    <section className="mb-4">
-      <h2 className="h4">{intl.formatMessage(messages.handouts)}</h2>
+    <section className="mb-3">
+      <h4>{intl.formatMessage(messages.handouts)}</h4>
       <LmsHtmlFragment
-        className="small"
         html={handoutsHtml}
         title={intl.formatMessage(messages.handouts)}
       />

src/course-home/outline-tab/widgets/CourseTools.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { sendTrackEvent, sendTrackingLogEvent } from '@edx/frontend-platform/analytics';
+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -14,38 +14,17 @@ import messages from '../messages';
 import { useModel } from '../../../generic/model-store';
 
 function CourseTools({ courseId, intl }) {
-  const { org } = useModel('courseHomeMeta', courseId);
   const {
     courseTools,
   } = useModel('outline', courseId);
 
-  if (courseTools.length === 0) {
-    return null;
-  }
-
-  const eventProperties = {
-    org_key: org,
-    courserun_key: courseId,
-  };
-
   const logClick = (analyticsId) => {
     const { administrator } = getAuthenticatedUser();
-    sendTrackingLogEvent('edx.course.tool.accessed', {
-      ...eventProperties,
-      course_id: courseId, // should only be courserun_key, but left as-is for historical reasons
+    sendTrackEvent('edx.course.tool.accessed', {
+      course_id: courseId,
       is_staff: administrator,
       tool_name: analyticsId,
     });
-
-    if (analyticsId === 'edx.tool.verified_upgrade') {
-      sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
-        ...eventProperties,
-        linkCategory: '(none)',
-        linkName: 'course_home_course_tools',
-        linkType: 'link',
-        pageName: 'course_home',
-      });
-    }
   };
 
   const renderIcon = (iconClasses) => {
@@ -68,18 +47,16 @@ function CourseTools({ courseId, intl }) {
   };
 
   return (
-    <section className="mb-4">
-      <h2 className="h4">{intl.formatMessage(messages.tools)}</h2>
-      <ul className="list-unstyled">
-        {courseTools.map((courseTool) => (
-          <li key={courseTool.analyticsId} className="small">
-            <a href={courseTool.url} onClick={() => logClick(courseTool.analyticsId)}>
-              <FontAwesomeIcon icon={renderIcon(courseTool.analyticsId)} className="mr-2" fixedWidth />
-              {courseTool.title}
-            </a>
-          </li>
-        ))}
-      </ul>
+    <section className="mb-3">
+      <h4>{intl.formatMessage(messages.tools)}</h4>
+      {courseTools.map((courseTool) => (
+        <div key={courseTool.analyticsId}>
+          <a href={courseTool.url} onClick={() => logClick(courseTool.analyticsId)}>
+            <FontAwesomeIcon icon={renderIcon(courseTool.analyticsId)} className="mr-2" style={{ width: '20px' }} />
+            {courseTool.title}
+          </a>
+        </div>
+      ))}
     </section>
   );
 }

src/course-home/outline-tab/widgets/ProctoringInfoPanel.jsx

@@ -1,183 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import camelCase from 'lodash.camelcase';
-import PropTypes from 'prop-types';
-
-import { getConfig } from '@edx/frontend-platform';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Button } from '@edx/paragon';
-
-import messages from '../messages';
-import { getProctoringInfoData } from '../../data/api';
-
-function ProctoringInfoPanel({ courseId, username, intl }) {
-  const [status, setStatus] = useState('');
-  const [link, setLink] = useState('');
-  const [releaseDate, setReleaseDate] = useState(null);
-  const [readableStatus, setReadableStatus] = useState('');
-
-  const readableStatuses = {
-    notStarted: 'notStarted',
-    started: 'started',
-    submitted: 'submitted',
-    verified: 'verified',
-    rejected: 'rejected',
-    error: 'error',
-    otherCourseApproved: 'otherCourseApproved',
-    expiringSoon: 'expiringSoon',
-  };
-
-  function getReadableStatusClass(examStatus) {
-    let readableClass = '';
-    if (['created', 'download_software_clicked', 'ready_to_start'].includes(examStatus) || !examStatus) {
-      readableClass = readableStatuses.notStarted;
-    } else if (['started', 'ready_to_submit'].includes(examStatus)) {
-      readableClass = readableStatuses.started;
-    } else if (['second_review_required', 'submitted'].includes(examStatus)) {
-      readableClass = readableStatuses.submitted;
-    } else {
-      const examStatusCamelCase = camelCase(examStatus);
-      if (examStatusCamelCase in readableStatuses) {
-        readableClass = readableStatuses[examStatusCamelCase];
-      }
-    }
-    return readableClass;
-  }
-
-  function isNotYetSubmitted(examStatus) {
-    const NO_SHOW_STATES = ['submitted', 'second_review_required', 'verified'];
-    return !NO_SHOW_STATES.includes(examStatus);
-  }
-
-  function isNotYetReleased(examReleaseDate) {
-    if (!examReleaseDate) {
-      return false;
-    }
-    const now = new Date();
-    return now < examReleaseDate;
-  }
-
-  function getBorderClass() {
-    let borderClass = '';
-    if (readableStatus === readableStatuses.submitted) {
-      borderClass = 'proctoring-onboarding-submitted';
-    } else if (readableStatus === readableStatuses.verified) {
-      borderClass = 'proctoring-onboarding-success';
-    }
-    return borderClass;
-  }
-
-  function isExpiringSoon(dateString) {
-    // Returns true if the expiration date is within 28 days
-    const today = new Date();
-    const expirationDateObject = new Date(dateString);
-    return today > expirationDateObject.getTime() - 2419200000;
-  }
-
-  useEffect(() => {
-    getProctoringInfoData(courseId, username)
-      .then(
-        response => {
-          if (response) {
-            setStatus(response.onboarding_status);
-            setLink(response.onboarding_link);
-            const expirationDate = response.expiration_date;
-            if (expirationDate && isExpiringSoon(expirationDate)) {
-              setReadableStatus(getReadableStatusClass('expiringSoon'));
-            } else {
-              setReadableStatus(getReadableStatusClass(response.onboarding_status));
-            }
-            setReleaseDate(new Date(response.onboarding_release_date));
-          }
-        },
-      );
-  }, []);
-
-  return (
-    <>
-      { link && (
-        <section className={`mb-4 p-3 outline-sidebar-proctoring-panel ${getBorderClass()}`}>
-          <h2 className="h4" id="outline-sidebar-upgrade-header">{intl.formatMessage(messages.proctoringInfoPanel)}</h2>
-          <div>
-            {readableStatus && (
-              <>
-                <p className="h6">
-                  {intl.formatMessage(messages.proctoringCurrentStatus)} {intl.formatMessage(messages[`${readableStatus}ProctoringStatus`])}
-                </p>
-                <p>
-                  {intl.formatMessage(messages[`${readableStatus}ProctoringMessage`])}
-                </p>
-                <p>
-                  {readableStatus === readableStatuses.otherCourseApproved && intl.formatMessage(messages[`${readableStatus}ProctoringDetail`])}
-                </p>
-              </>
-            )}
-            {![readableStatuses.verified, readableStatuses.otherCourseApproved].includes(readableStatus) && (
-              <>
-                <p>
-                  {isNotYetSubmitted(status) && (
-                    <>
-                      {intl.formatMessage(messages.proctoringPanelGeneralInfo)}
-                    </>
-                  )}
-                  {!isNotYetSubmitted(status) && (
-                    <>
-                      {intl.formatMessage(messages.proctoringPanelGeneralInfoSubmitted)}
-                    </>
-                  )}
-                </p>
-                <p>{intl.formatMessage(messages.proctoringPanelGeneralTime)}</p>
-              </>
-            )}
-            {isNotYetSubmitted(status) && (
-              <>
-                {!isNotYetReleased(releaseDate) && (
-                  <Button variant="primary" block href={`${getConfig().LMS_BASE_URL}${link}`}>
-                    {readableStatus === readableStatuses.otherCourseApproved && (
-                      <>
-                        {intl.formatMessage(messages.proctoringOnboardingPracticeButton)}
-                      </>
-                    )}
-                    {readableStatus !== readableStatuses.otherCourseApproved && (
-                      <>
-                        {intl.formatMessage(messages.proctoringOnboardingButton)}
-                      </>
-                    )}
-                  </Button>
-                )}
-                {isNotYetReleased(releaseDate) && (
-                  <Button variant="secondary" block disabled aria-disabled="true">
-                    {intl.formatMessage(
-                      messages.proctoringOnboardingButtonNotOpen,
-                      {
-                        releaseDate: intl.formatDate(releaseDate, {
-                          day: 'numeric',
-                          month: 'short',
-                          year: 'numeric',
-                        }),
-                      },
-                    )}
-                  </Button>
-                )}
-              </>
-            )}
-            <Button variant="outline-primary" block href="https://support.edx.org/hc/en-us/sections/115004169247-Taking-Timed-and-Proctored-Exams">
-              {intl.formatMessage(messages.proctoringReviewRequirementsButton)}
-            </Button>
-          </div>
-        </section>
-      )}
-    </>
-  );
-}
-
-ProctoringInfoPanel.propTypes = {
-  courseId: PropTypes.string.isRequired,
-  username: PropTypes.string,
-  intl: intlShape.isRequired,
-};
-
-ProctoringInfoPanel.defaultProps = {
-  username: null,
-};
-
-export default injectIntl(ProctoringInfoPanel);

src/course-home/outline-tab/widgets/ProctoringInfoPanel.scss

@@ -1,10 +0,0 @@
-.outline-sidebar-proctoring-panel {
-  border: 1px solid $dark-500;
-  border-top: 5px solid $brand-600;
-}
-.proctoring-onboarding-success {
-  border-top: 5px solid $primary-500;
-}
-.proctoring-onboarding-submitted {
-  border-top: 5px solid $dark-500;
-}

src/course-home/outline-tab/widgets/UpdateGoalSelector.jsx

@@ -1,85 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Dropdown } from '@edx/paragon';
-
-import messages from '../messages';
-import { saveCourseGoal } from '../../data';
-
-function UpdateGoalSelector({
-  courseId,
-  goalOptions,
-  intl,
-  selectedGoal,
-  setGoalToDisplay,
-  setGoalToastHeader,
-}) {
-  function selectGoalHandler(event) {
-    const key = event.currentTarget.id;
-    const text = event.currentTarget.innerText;
-    const newGoal = {
-      key,
-      text,
-    };
-
-    setGoalToDisplay(newGoal);
-    saveCourseGoal(courseId, key).then((response) => {
-      const { data } = response;
-      const {
-        header,
-      } = data;
-
-      setGoalToastHeader(header);
-    });
-  }
-
-  return (
-    <>
-      <section className="mb-4">
-        <div className="row w-100 m-0">
-          <div className="col-12 p-0">
-            <label className="h4 m-0" htmlFor="edit-goal-selector">
-              {intl.formatMessage(messages.goal)}
-            </label>
-          </div>
-          <div className="col-12 p-0">
-            <Dropdown className="py-2">
-              <Dropdown.Toggle variant="outline-primary" block id="edit-goal-selector" data-testid="edit-goal-selector">
-                {selectedGoal.text}
-              </Dropdown.Toggle>
-              <Dropdown.Menu>
-                {goalOptions.map(([goalKey, goalText]) => (
-                  <Dropdown.Item
-                    id={goalKey}
-                    key={goalKey}
-                    onClick={(event) => { selectGoalHandler(event); }}
-                    role="button"
-                  >
-                    {goalText}
-                  </Dropdown.Item>
-                ))}
-              </Dropdown.Menu>
-            </Dropdown>
-          </div>
-        </div>
-      </section>
-    </>
-  );
-}
-
-UpdateGoalSelector.propTypes = {
-  courseId: PropTypes.string.isRequired,
-  goalOptions: PropTypes.arrayOf(
-    PropTypes.arrayOf(PropTypes.string),
-  ).isRequired,
-  intl: intlShape.isRequired,
-  selectedGoal: PropTypes.shape({
-    key: PropTypes.string,
-    text: PropTypes.string,
-  }).isRequired,
-  setGoalToDisplay: PropTypes.func.isRequired,
-  setGoalToastHeader: PropTypes.func.isRequired,
-};
-
-export default injectIntl(UpdateGoalSelector);

src/course-home/outline-tab/widgets/UpgradeCard.jsx

@@ -1,107 +0,0 @@
-import React, { useEffect } from 'react';
-import PropTypes from 'prop-types';
-
-import { sendTrackEvent, sendTrackingLogEvent } from '@edx/frontend-platform/analytics';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Button } from '@edx/paragon';
-
-import messages from '../messages';
-import { useModel } from '../../../generic/model-store';
-import { UpgradeButton } from '../../../generic/upgrade-button';
-import VerifiedCert from '../../../generic/assets/edX_certificate.png';
-
-function UpgradeCard({ courseId, intl, onLearnMore }) {
-  const { org } = useModel('courseHomeMeta', courseId);
-  const {
-    offer,
-    verifiedMode,
-  } = useModel('outline', courseId);
-
-  if (!verifiedMode) {
-    return null;
-  }
-
-  const eventProperties = {
-    org_key: org,
-    courserun_key: courseId,
-  };
-
-  const promotionEventProperties = {
-    creative: 'sidebarupsell',
-    name: 'In-Course Verification Prompt',
-    position: 'sidebar-message',
-    promotion_id: 'courseware_verified_certificate_upsell',
-    ...eventProperties,
-  };
-
-  useEffect(() => {
-    sendTrackingLogEvent('edx.bi.course.upgrade.sidebarupsell.displayed', eventProperties);
-    sendTrackEvent('Promotion Viewed', promotionEventProperties);
-  }, []);
-
-  const logClick = () => {
-    sendTrackingLogEvent('edx.bi.course.upgrade.sidebarupsell.clicked', eventProperties);
-    sendTrackingLogEvent('edx.course.enrollment.upgrade.clicked', {
-      ...eventProperties,
-      location: 'sidebar-message',
-    });
-    sendTrackEvent('Promotion Clicked', promotionEventProperties);
-    sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
-      ...eventProperties,
-      linkCategory: 'green_upgrade',
-      linkName: 'course_home_green',
-      linkType: 'button',
-      pageName: 'course_home',
-    });
-  };
-
-  return (
-    <section className="mb-4 p-3 outline-sidebar-upgrade-card">
-      <h2 className="h4" id="outline-sidebar-upgrade-header">{intl.formatMessage(messages.upgradeTitle)}</h2>
-      <div className="row w-100 m-0">
-        <div className="col-6 col-md-12 col-lg-3 col-xl-4 p-0 text-md-center text-lg-left">
-          <img
-            alt={intl.formatMessage(messages.certAlt)}
-            className="w-100"
-            src={VerifiedCert}
-            style={{ maxWidth: '10rem' }}
-          />
-        </div>
-        <div className="col-6 col-md-12 col-lg-9 col-xl-8 p-0 pl-lg-2 text-center mt-md-2 mt-lg-0">
-          <div className="row w-100 m-0 justify-content-center">
-            <UpgradeButton
-              offer={offer}
-              onClick={logClick}
-              verifiedMode={verifiedMode}
-            />
-            {onLearnMore && (
-              <div className="col-12">
-                <Button
-                  variant="link"
-                  size="sm"
-                  className="pb-0"
-                  onClick={onLearnMore}
-                  aria-labelledby="outline-sidebar-upgrade-header"
-                >
-                  {intl.formatMessage(messages.learnMore)}
-                </Button>
-              </div>
-            )}
-          </div>
-        </div>
-      </div>
-    </section>
-  );
-}
-
-UpgradeCard.propTypes = {
-  courseId: PropTypes.string.isRequired,
-  intl: intlShape.isRequired,
-  onLearnMore: PropTypes.func,
-};
-
-UpgradeCard.defaultProps = {
-  onLearnMore: null,
-};
-
-export default injectIntl(UpgradeCard);

src/course-home/outline-tab/widgets/UpgradeCard.scss

@@ -1,4 +0,0 @@
-.outline-sidebar-upgrade-card {
-  border: 1px solid $dark-500;
-  border-top: 5px solid $dark-500;
-}

src/course-home/outline-tab/widgets/WelcomeMessage.jsx

@@ -2,8 +2,6 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Button, TransitionReplace } from '@edx/paragon';
-import truncate from 'truncate-html';
 
 import { useDispatch } from 'react-redux';
 import LmsHtmlFragment from '../LmsHtmlFragment';
@@ -23,9 +21,8 @@ function WelcomeMessage({ courseId, intl }) {
 
   const [display, setDisplay] = useState(true);
 
-  const shortWelcomeMessageHtml = truncate(welcomeMessageHtml, 100, { byWords: true, keepWhitespaces: true });
-  const messageCanBeShortened = shortWelcomeMessageHtml.length < welcomeMessageHtml.length;
-  const [showShortMessage, setShowShortMessage] = useState(messageCanBeShortened);
+  const shortWelcomeMessageHtml = welcomeMessageHtml.length > 200 && `${welcomeMessageHtml.substring(0, 199)}...`;
+  const [showShortMessage, setShowShortMessage] = useState(!!shortWelcomeMessageHtml);
   const dispatch = useDispatch();
 
   return (
@@ -37,40 +34,27 @@ function WelcomeMessage({ courseId, intl }) {
           setDisplay(false);
           dispatch(dismissWelcomeMessage(courseId));
         }}
-        footer={messageCanBeShortened && (
-          <div className="row w-100 m-0">
-            <div className="col-12 col-sm-auto p-0">
-              <Button
-                block
+      >
+        <div className="my-3">
+          <LmsHtmlFragment
+            html={showShortMessage ? shortWelcomeMessageHtml : welcomeMessageHtml}
+            title={intl.formatMessage(messages.welcomeMessage)}
+          />
+        </div>
+        {
+          shortWelcomeMessageHtml && (
+            <div className="d-flex justify-content-end">
+              <button
+                type="button"
+                className="btn rounded align-self-center border border-primary bg-white font-weight-bold mb-3"
                 onClick={() => setShowShortMessage(!showShortMessage)}
-                variant="outline-primary"
               >
                 {showShortMessage ? intl.formatMessage(messages.welcomeMessageShowMoreButton)
                   : intl.formatMessage(messages.welcomeMessageShowLessButton)}
-              </Button>
+              </button>
             </div>
-          </div>
-        )}
-      >
-        <TransitionReplace className="mb-3" enterDuration={200} exitDuration={200}>
-          {showShortMessage ? (
-            <LmsHtmlFragment
-              className="inline-link"
-              data-testid="short-welcome-message-iframe"
-              key="short-html"
-              html={shortWelcomeMessageHtml}
-              title={intl.formatMessage(messages.welcomeMessage)}
-            />
-          ) : (
-            <LmsHtmlFragment
-              className="inline-link"
-              data-testid="long-welcome-message-iframe"
-              key="full-html"
-              html={welcomeMessageHtml}
-              title={intl.formatMessage(messages.welcomeMessage)}
-            />
-          )}
-        </TransitionReplace>
+          )
+        }
       </Alert>
     )
   );

src/course-home/progress-tab/CertificateBanner.jsx

@@ -0,0 +1,73 @@
+import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { requestCert } from '../data/thunks';
+
+import { useModel } from '../../generic/model-store';
+import messages from './messages';
+import VerifiedCert from '../../courseware/course/sequence/lock-paywall/assets/edx-verified-mini-cert.png';
+
+function CertificateBanner({ intl }) {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);
+
+  const {
+    certificateData,
+    enrollmentMode,
+  } = useModel('progress', courseId);
+  if (certificateData === null || enrollmentMode === 'audit') { return null; }
+  const { certUrl, certDownloadUrl } = certificateData;
+  const dispatch = useDispatch();
+  function requestHandler() {
+    dispatch(requestCert(courseId));
+  }
+  return (
+    <section className="banner rounded my-4 p-4 container-fluid border border-primary-200 bg-info-100 row">
+      <div className="col-12 col-sm-9">
+        <div>
+          <div className="font-weight-bold">{certificateData.title}</div>
+          <div className="mt-1">{certificateData.msg}</div>
+        </div>
+        {certUrl && (
+          <div>
+            <a className="btn btn-primary my-3" href={certUrl} rel="noopener noreferrer" target="_blank">
+              {intl.formatMessage(messages.viewCert)}
+              <span className="sr-only">{intl.formatMessage(messages.opensNewWindow)}</span>
+            </a>
+          </div>
+        )}
+        {!certUrl && certificateData.isDownloadable && (
+          <div>
+            <a className="btn btn-primary my-3" href={certDownloadUrl} rel="noopener noreferrer" target="_blank">
+              {intl.formatMessage(messages.downloadCert)}
+              <span className="sr-only">{intl.formatMessage(messages.opensNewWindow)}</span>
+            </a>
+          </div>
+        )}
+        {!certUrl && !certificateData.isDownloadable && certificateData.isRequestable && (
+          <div className="my-3">
+            <button className="btn btn-primary" type="button" onClick={requestHandler}>
+              {intl.formatMessage(messages.requestCert)}
+            </button>
+          </div>
+        )}
+      </div>
+      <div className="col-0 col-sm-3 d-none d-sm-block">
+        <img
+          alt={intl.formatMessage(messages.certAlt)}
+          src={VerifiedCert}
+          className="float-right"
+          style={{ height: '120px' }}
+        />
+      </div>
+    </section>
+  );
+}
+
+CertificateBanner.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(CertificateBanner);

src/course-home/progress-tab/Chapter.jsx

@@ -0,0 +1,36 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Subsection from './Subsection';
+
+export default function Chapter({
+  chapter,
+}) {
+  if (chapter.displayName === 'hidden') { return null; }
+  const { subsections } = chapter;
+  return (
+    <section className="border-top border-light-500">
+      <div className="row">
+        <div className="lead font-weight-normal col-12 col-sm-3 my-3 border-right border-light-500">
+          {chapter.displayName}
+        </div>
+        <div className="col-12 col-sm-9">
+          {subsections.map((subsection) => (
+            <Subsection
+              key={subsection.url}
+              subsection={subsection}
+            />
+          ))}
+        </div>
+      </div>
+    </section>
+  );
+}
+
+Chapter.propTypes = {
+  chapter: PropTypes.shape({
+    displayName: PropTypes.string,
+    subsections: PropTypes.arrayOf(PropTypes.shape({
+      url: PropTypes.string,
+    })),
+  }).isRequired,
+};

src/course-home/progress-tab/DueDateTime.jsx

@@ -0,0 +1,36 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useSelector } from 'react-redux';
+import { FormattedDate, FormattedTime } from '@edx/frontend-platform/i18n';
+import { useModel } from '../../generic/model-store';
+
+export default function DueDateTime({
+  due,
+}) {
+  const {
+    courseId,
+  } = useSelector(state => state.activeCourse);
+  const {
+    userTimezone,
+  } = useModel('progress', courseId);
+  const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
+
+  return (
+    <em className="ml-0">
+      due <FormattedDate
+        value={due}
+        day="numeric"
+        month="short"
+        weekday="short"
+        year="numeric"
+        {...timezoneFormatArgs}
+      /> <FormattedTime
+        value={due}
+      />
+    </em>
+  );
+}
+
+DueDateTime.propTypes = {
+  due: PropTypes.string.isRequired,
+};

src/course-home/progress-tab/ProblemScores.jsx

@@ -0,0 +1,37 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import messages from './messages';
+
+function ProblemScores({
+  intl,
+  scoreName,
+  problemScores,
+}) {
+  return (
+    <div className="row mt-1">
+      <dl className="d-flex flex-wrap small text-gray-500">
+        <dt className="mr-3">{intl.formatMessage(messages[`${scoreName}`])}</dt>
+        {problemScores.map((problem, index) => {
+          const key = scoreName + index;
+          return (
+            <dd className="mr-3" key={key}>{problem.earned}/{problem.possible}</dd>
+          );
+        })}
+      </dl>
+    </div>
+  );
+}
+
+ProblemScores.propTypes = {
+  intl: intlShape.isRequired,
+  scoreName: PropTypes.string.isRequired,
+  problemScores: PropTypes.arrayOf(PropTypes.shape({
+    possible: PropTypes.number,
+    earned: PropTypes.number,
+    id: PropTypes.string,
+  })).isRequired,
+};
+
+export default injectIntl(ProblemScores);

src/course-home/progress-tab/ProgressHeader.jsx

@@ -1,39 +0,0 @@
-import React from 'react';
-import { useSelector } from 'react-redux';
-
-import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Button } from '@edx/paragon';
-
-import { useModel } from '../../generic/model-store';
-
-import messages from './messages';
-
-function ProgressHeader({ intl }) {
-  const {
-    courseId,
-  } = useSelector(state => state.courseHome);
-
-  const { administrator } = getAuthenticatedUser();
-
-  const { studioUrl } = useModel('progress', courseId);
-
-  return (
-    <>
-      <div className="row w-100 m-0 mb-4 justify-content-between">
-        <h1>{intl.formatMessage(messages.progressHeader)}</h1>
-        {administrator && studioUrl && (
-          <Button variant="outline-primary" size="sm" className="align-self-center" href={studioUrl}>
-            {intl.formatMessage(messages.studioLink)}
-          </Button>
-        )}
-      </div>
-    </>
-  );
-}
-
-ProgressHeader.propTypes = {
-  intl: intlShape.isRequired,
-};
-
-export default injectIntl(ProgressHeader);

src/course-home/progress-tab/ProgressTab.jsx

@@ -1,36 +1,46 @@
 import React from 'react';
+import { useSelector } from 'react-redux';
+import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { useModel } from '../../generic/model-store';
+import Chapter from './Chapter';
+import CertificateBanner from './CertificateBanner';
+import messages from './messages';
 
-import CertificateStatus from './certificate-status/CertificateStatus';
-import CourseCompletion from './course-completion/CourseCompletion';
-import CourseGrade from './grades/course-grade/CourseGrade';
-import DetailedGrades from './grades/detailed-grades/DetailedGrades';
-import GradeSummary from './grades/grade-summary/GradeSummary';
-import ProgressHeader from './ProgressHeader';
-import RelatedLinks from './related-links/RelatedLinks';
+function ProgressTab({ intl }) {
+  const {
+    courseId,
+  } = useSelector(state => state.activeCourse);
+
+  const { administrator } = getAuthenticatedUser();
+
+  const {
+    coursewareSummary,
+    studioUrl,
+  } = useModel('progress', courseId);
 
-function ProgressTab() {
   return (
-    <>
-      <ProgressHeader />
-      <div className="row w-100 m-0">
-        {/* Main body */}
-        <div className="col-12 col-lg-8 p-0">
-          <CourseCompletion />
-          <CourseGrade />
-          <div className="my-4 p-4 rounded shadow-sm">
-            <GradeSummary />
-            <DetailedGrades />
-          </div>
+    <section>
+      {administrator && studioUrl && (
+        <div className="row mb-3 mr-3 justify-content-end">
+          <a className="btn-sm border border-info" href={studioUrl}>
+            {intl.formatMessage(messages.studioLink)}
+          </a>
         </div>
-
-        {/* Side panel */}
-        <div className="col-12 col-lg-4 p-0 px-lg-4">
-          <CertificateStatus />
-          <RelatedLinks />
-        </div>
-      </div>
-    </>
+      )}
+      <CertificateBanner />
+      {coursewareSummary.map((chapter) => (
+        <Chapter
+          key={chapter.displayName}
+          chapter={chapter}
+        />
+      ))}
+    </section>
   );
 }
 
-export default ProgressTab;
+ProgressTab.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(ProgressTab);

src/course-home/progress-tab/ProgressTab.test.jsx

@@ -1,85 +0,0 @@
-import React from 'react';
-import { Factory } from 'rosie';
-import { getConfig } from '@edx/frontend-platform';
-import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
-import MockAdapter from 'axios-mock-adapter';
-
-import {
-  initializeMockApp, logUnhandledRequests, render, screen, act,
-} from '../../setupTest';
-import { appendBrowserTimezoneToUrl, executeThunk } from '../../utils';
-import * as thunks from '../data/thunks';
-import initializeStore from '../../store';
-import ProgressTab from './ProgressTab';
-
-initializeMockApp();
-jest.mock('@edx/frontend-platform/analytics');
-
-describe('Progress Tab', () => {
-  let axiosMock;
-
-  const courseId = 'course-v1:edX+Test+run';
-  let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/course_metadata/${courseId}`;
-  courseMetadataUrl = appendBrowserTimezoneToUrl(courseMetadataUrl);
-  const progressUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/progress/${courseId}`;
-
-  const store = initializeStore();
-  const defaultMetadata = Factory.build('courseHomeMetadata', { id: courseId });
-  const defaultTabData = Factory.build('progressTabData');
-
-  function setTabData(attributes, options) {
-    const progressTabData = Factory.build('progressTabData', attributes, options);
-    axiosMock.onGet(progressUrl).reply(200, progressTabData);
-  }
-
-  async function fetchAndRender() {
-    await executeThunk(thunks.fetchProgressTab(courseId), store.dispatch);
-    await act(async () => render(<ProgressTab />, { store }));
-  }
-
-  beforeEach(async () => {
-    axiosMock = new MockAdapter(getAuthenticatedHttpClient());
-
-    // Set defaults for network requests
-    axiosMock.onGet(courseMetadataUrl).reply(200, defaultMetadata);
-    axiosMock.onGet(progressUrl).reply(200, defaultTabData);
-
-    logUnhandledRequests(axiosMock);
-  });
-
-  describe('Grade Summary', () => {
-    it('renders Grade Summary table when assignment policies are populated', async () => {
-      await fetchAndRender();
-      expect(screen.getByText('Grade summary')).toBeInTheDocument();
-    });
-
-    it('does not render Grade Summary when assignment policies are not populated', async () => {
-      setTabData({
-        grading_policy: {
-          assignment_policies: [],
-        },
-      });
-      await fetchAndRender();
-      expect(screen.queryByText('Grade summary')).not.toBeInTheDocument();
-    });
-  });
-
-  describe('Detailed Grades', () => {
-    it('renders Detailed Grades table when section scores are populated', async () => {
-      await fetchAndRender();
-      expect(screen.getByText('Detailed grades')).toBeInTheDocument();
-
-      expect(screen.getByRole('link', { name: 'First subsection' }));
-      expect(screen.getByRole('link', { name: 'Second subsection' }));
-    });
-
-    it('render message when section scores are not populated', async () => {
-      setTabData({
-        section_scores: [],
-      });
-      await fetchAndRender();
-      expect(screen.getByText('Detailed grades')).toBeInTheDocument();
-      expect(screen.getByText('You currently have no graded problem scores.')).toBeInTheDocument();
-    });
-  });
-});

src/course-home/progress-tab/Subsection.jsx

@@ -0,0 +1,76 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import messages from './messages';
+
+import DueDateTime from './DueDateTime';
+import ProblemScores from './ProblemScores';
+
+function Subsection({
+  intl,
+  subsection,
+}) {
+  const scoreName = subsection.graded ? 'problem' : 'practice';
+
+  const { earned, possible } = subsection.gradedTotal;
+
+  const showTotalScore = ((possible > 0) || (earned > 0)) && subsection.showGrades;
+
+  // screen reader information
+  const totalScoreSr = intl.formatMessage(messages.pointsEarned, { earned, total: possible });
+
+  return (
+    <section className="my-3 ml-3">
+      <div className="row">
+        <a className="h6" href={subsection.url}>
+          <div dangerouslySetInnerHTML={{ __html: subsection.displayName }} />
+          {showTotalScore && <span className="sr-only">{totalScoreSr}</span>}
+        </a>
+        {showTotalScore && <span className="small ml-1 mb-2">({earned}/{possible}) {subsection.percentGraded}%</span>}
+      </div>
+      <div className="row small">
+        {subsection.format && <div className="mr-1">{subsection.format}</div>}
+        {subsection.due !== null && <DueDateTime due={subsection.due} />}
+      </div>
+      {subsection.problemScores.length > 0 && subsection.showGrades && (
+        <ProblemScores scoreName={scoreName} problemScores={subsection.problemScores} />
+      )}
+      {subsection.problemScores.length > 0 && !subsection.showGrades && subsection.showCorrectness === 'past_due' && (
+        <div className="row small">{intl.formatMessage(messages[`${scoreName}HiddenUntil`])}</div>
+      )}
+      {subsection.problemScores.length > 0 && !subsection.showGrades && !(subsection.showCorrectness === 'past_due')
+      && <div className="row small">{intl.formatMessage(messages[`${scoreName}Hidden`])}</div>}
+      {(subsection.problemScores.length === 0) && (
+        <div className="row small">{intl.formatMessage(messages.noScores)}</div>
+      )}
+    </section>
+  );
+}
+
+Subsection.propTypes = {
+  intl: intlShape.isRequired,
+  subsection: PropTypes.shape({
+    graded: PropTypes.bool.isRequired,
+    url: PropTypes.string.isRequired,
+    showGrades: PropTypes.bool.isRequired,
+    gradedTotal: PropTypes.shape({
+      possible: PropTypes.number,
+      earned: PropTypes.number,
+      graded: PropTypes.bool,
+    }).isRequired,
+    showCorrectness: PropTypes.string.isRequired,
+    due: PropTypes.string,
+    problemScores: PropTypes.arrayOf(PropTypes.shape({
+      possible: PropTypes.number,
+      earned: PropTypes.number,
+      id: PropTypes.string,
+    })).isRequired,
+    format: PropTypes.string,
+    // override: PropTypes.object,
+    displayName: PropTypes.string.isRequired,
+    percentGraded: PropTypes.number.isRequired,
+  }).isRequired,
+};
+
+export default injectIntl(Subsection);