feat: add user id parameter to progress page

.env

@@ -1,6 +1,3 @@
-# See README.rst for explanations of these.
-# If you add a new learning MFE-specific variable, please note it there!
-
 NODE_ENV='production'
 ACCESS_TOKEN_COOKIE_NAME=''
 BASE_URL=''
@@ -35,4 +32,4 @@ TERMS_OF_SERVICE_URL=''
 TWITTER_HASHTAG=''
 TWITTER_URL=''
 USER_INFO_COOKIE_NAME=''
-SESSION_COOKIE_DOMAIN=''
+SESSION_COOKIE_DOMAIN=''

.env.development

@@ -1,6 +1,3 @@
-# See README.rst for explanations of these.
-# If you add a new learning MFE-specific variable, please note it there!
-
 NODE_ENV='development'
 ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
 BASE_URL='http://localhost:2000'
@@ -35,4 +32,4 @@ TERMS_OF_SERVICE_URL='https://www.edx.org/edx-terms-service'
 TWITTER_HASHTAG='myedxjourney'
 TWITTER_URL='https://twitter.com/edXOnline'
 USER_INFO_COOKIE_NAME='edx-user-info'
-SESSION_COOKIE_DOMAIN='localhost'
+SESSION_COOKIE_DOMAIN='localhost'

.env.test

@@ -1,6 +1,3 @@
-# See README.rst for explanations of these.
-# If you add a new learning MFE-specific variable, please note it there!
-
 NODE_ENV='test'
 ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
 BASE_URL='http://localhost:2000'

.github/workflows/validate.yml

@@ -11,11 +11,11 @@ jobs:
         - 12
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
+    - uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
     - run: make validate.ci
     - name: Upload coverage
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v1
       with:
         fail_ci_if_error: true

.gitignore

@@ -8,7 +8,6 @@ coverage
 dist/
 src/i18n/transifex_input.json
 temp/babel-plugin-react-intl
-logs
 
 ### pyenv ###
 .python-version

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npm run lint

README.rst

@@ -1,21 +1,23 @@
-|codecov| |license|
+|Coveralls| |npm_version| |npm_downloads| |license|
 
 frontend-app-learning
 =========================
 
+Please tag **@edx/teaching-and-learning** on any PRs or issues.  Thanks.
+
 Introduction
 ------------
 
-This is the Learning MFE (micro-frontend application), which renders all
-learner-facing course pages (like the course outline, the progress page,
-actual course content, etc).
+React app for edX learning.
 
-Please tag **@edx/engage-squad** on any PRs or issues.  Thanks.
-
-.. |codecov| image:: https://codecov.io/gh/edx/frontend-app-learning/branch/master/graph/badge.svg?token=3z7XvuzTq3
-   :target: https://codecov.io/gh/edx/frontend-app-learning
-.. |license| image:: https://img.shields.io/badge/license-AGPL-informational
-   :target: https://github.com/edx/frontend-app-account/blob/master/LICENSE
+.. |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
+   :target: @edx/frontend-app-learning
+.. |npm_downloads| image:: https://img.shields.io/npm/dt/@edx/frontend-app-learning.svg
+   :target: @edx/frontend-app-learning
+.. |license| image:: https://img.shields.io/npm/l/@edx/frontend-app-learning.svg
+   :target: @edx/frontend-app-learning
 
 Development
 -----------
@@ -23,10 +25,22 @@ Development
 Start Devstack
 ^^^^^^^^^^^^^^
 
-To use this application, `devstack <https://github.com/edx/devstack>`__ must be running and you must be logged into it.
+To use this application `devstack <https://github.com/edx/devstack>`__ must be running and you must be logged into it.
 
-- Run ``make dev.up.lms``
-- 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.
+-  Start devstack
+-  Log in (http://localhost:18000/login)
+
+Start the development server
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In this project, install requirements and start the development server by running:
+
+.. code:: bash
+
+   npm install
+   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
 ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -53,59 +67,3 @@ file (which is git-ignored) that defines where to find your local modules, for i
    };
 
 See https://github.com/edx/frontend-build#local-module-configuration-for-webpack for more details.
-
-Deployment
-----------
-
-The Learning MFE is similar to all the other Open edX MFEs. Read the Open
-edX Developer Guide's section on
-`MFE applications <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html>`_.
-
-Environment Variables
-^^^^^^^^^^^^^^^^^^^^^
-
-This MFE is configured via environment variables supplied at build time.
-All micro-frontends have a shared set of required environment variables,
-as documented in the Open edX Developer Guide under
-`Required Environment Variables <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html#required-environment-variables>`_.
-
-The learning micro-frontend also supports the following additional variables:
-
-SOCIAL_UTM_MILESTONE_CAMPAIGN
-  This value is passed as the ``utm_campaign`` parameter for social-share
-  links when celebrating learning milestones in the course. Optional.
-
-  Example: ``milestone``
-
-SUPPORT_URL_CALCULATOR_MATH
-  A link that explains how to use the in-course calculator. You can use the
-  one in the example below, if you don't want to have your own branded version.
-
-  Example: https://support.edx.org/hc/en-us/articles/360000038428-Entering-math-expressions-in-assignments-or-the-calculator
-
-SUPPORT_URL_ID_VERIFICATION
-  A link that explains how to verify your ID. Shown in contexts where you need
-  to verify yourself to earn a certificate. The example link below is probably too
-  edx.org-specific to use for your own site.
-
-  Example: https://support.edx.org/hc/en-us/articles/206503858-How-do-I-verify-my-identity
-
-SUPPORT_URL_VERIFIED_CERTIFICATE
-  A link that explains what a verified certificate is.  You can use the
-  one in the example below, if you don't want to have your own branded version.
-  Optional.
-
-  Example: https://support.edx.org/hc/en-us/articles/206502008-What-is-a-verified-certificate
-
-TWITTER_HASHTAG
-  This value is used in the Twitter social-share link when celebrating learning
-  milestones in the course. Will prefill the suggested post with this hashtag.
-  Optional.
-
-  Example: ``brandedhashtag``
-
-TWITTER_URL
-  A link to your Twitter account. The Twitter social-share link won't appear
-  unless this is set. Optional.
-
-  Example: https://twitter.com/edXOnline

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

@@ -88,6 +88,3 @@ And more like:
 ```
 https://learning.edx.org/course/course-v1:edX+DemoX.1+2T2019/Being_Social/Teams
 ```
-
-_This further work has been expanded upon in
-[ADR #9: Courseware URL shortening](./0009-courseware-url-shortening.md)._

docs/decisions/0009-courseware-url-shortening.md

@@ -1,58 +0,0 @@
-# Courseware URL shortening
-
-## Status
-
-Accepted
-
-_This updates some of the content in [ADR #8: Liberal courseware path handling](./0008-liberal-courseware-path-handling.md)._
-
-## Context
-
-The current URL is not human-readable. The URL is composed of the UsageKeys for the current sequence and unit. We can't make UsageKeys themselves more readable because they're tied to student state.
-
-This is what the URLs currently look 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
-
-```
-
-After exploring different URL patterns and possible redundancies in the current URL format, the following key points were noticed. The course, run, and organization are stated in every portion of the URL. We also do not need the URL to tell us the type of block since it has been determined that all URLs will follow the path` /course/:courseId/:sequenceId/:unitId`.
-
-## Decision
-
-The courseware URL will format to the following structure:
-
-```
-
-https://learning.edx.org/c/:courseId/:sequenceHash/:unitHash/:sectionSlug/:sequenceSlug/:unitSlug/
-
-```
-
-Example URL:
-
-```
-
-https://learning.edx.org/c/course-v1:edX+DemoX.1+2T2019/YmxvY2/njuRCq/optional-example-problem-types/stem-problems/code-grader
-
-```
-
-The fields definition and requirements ar as follows:
-
-* :courseId (required) - same as the previous `courseId`.
-* :sequenceHash (required) - a `blake2b` version of the `sequenceId`'s `urlsafe_b64encode` .
-* :unitHash (required) - a `blake2b` version of the `unitId`'s `urlsafe_b64encode`.
-* :sectionSlug (optional) - `display_name` of the current sequence's parent section.
-* :sequenceSlug (optional) - `display_name` of the current sequence.
-* :unitSlug (optional) - `display_name` of the current unit
-
-Partial paths will update with the required parameters as dicussed in [ADR #8: Liberal courseware path handling](./0008-liberal-courseware-path-handling.md). The `sequenceHash` and `unitHash` will shorten their respective ids using `hashlib.blake2b` with `digest_size` of 6 bytes. `Blake2b` will reduce the length of the id so the encoded version can also be short. Hashing will be handled by `blake2b` because it is the fastest hashing function in the `hashlib` library. The hash will be generated and mapped in LMS. The slugs based on `display_name` are optional because not all blocks have an associated `display_name` attributes, most likely to occur in OLX imports. The `display_name` will be pulled from the current section, sequence, and unit attribute, and if there is not an attribute `display`, the url will use the attribute `display_name_with_default`. The `display_name` will be formatted safely for a url using Django's [slugify](https://docs.djangoproject.com/en/3.2/ref/utils/#django.utils.text.slugify). Slugify allows unicode identifiers in the slug. If the slugs are omitted, it will redirect to the canonical version without the slugs.
-
-## Consequences
-
-If old URLs are not properly routed then the content and those links will no longer be accessible to the user. The old URLs could include, but not limited to, bookmarks and exams.
-
-## Further work
-
-At some point, we may decide to further extend the URL shortening to the entire platform. At the moment, the hashes for the sequences and units are generated when the sequences and units are being called. In the future, it would be better if the hashes would be generated and stored when the sequences and units are originally created. This would require `learning_sequences` to include a class for unit storage, which is not being stored at the moment.

package.json

@@ -16,11 +16,15 @@
     "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 .",
-    "prepare": "husky install",
     "snapshot": "fedx-scripts jest --updateSnapshot",
     "start": "fedx-scripts webpack-dev-server --progress",
     "test": "fedx-scripts jest --coverage --passWithNoTests"
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "npm run lint"
+    }
+  },
   "author": "edX",
   "license": "AGPL-3.0",
   "homepage": "https://github.com/edx/frontend-app-learning#readme",
@@ -32,51 +36,49 @@
   },
   "dependencies": {
     "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
-    "@edx/frontend-component-footer": "10.1.6",
-    "@edx/frontend-enterprise-utils": "0.1.7",
-    "@edx/frontend-lib-special-exams": "1.12.0",
-    "@edx/frontend-platform": "1.12.3",
-    "@edx/paragon": "16.7.0",
-    "@fortawesome/fontawesome-svg-core": "1.2.36",
-    "@fortawesome/free-brands-svg-icons": "5.15.4",
-    "@fortawesome/free-regular-svg-icons": "5.15.4",
-    "@fortawesome/free-solid-svg-icons": "5.15.4",
-    "@fortawesome/react-fontawesome": "0.1.15",
-    "@pact-foundation/pact": "9.16.0",
-    "@reduxjs/toolkit": "1.6.1",
-    "classnames": "2.3.1",
-    "core-js": "3.16.1",
+    "@edx/frontend-component-footer": "10.1.4",
+    "@edx/frontend-enterprise": "4.2.3",
+    "@edx/frontend-lib-special-exams": "1.0.0",
+    "@edx/frontend-platform": "1.11.0",
+    "@edx/paragon": "14.8.0",
+    "@fortawesome/fontawesome-svg-core": "1.2.34",
+    "@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",
+    "@reduxjs/toolkit": "1.3.6",
+    "classnames": "2.2.6",
+    "core-js": "3.6.5",
     "js-cookie": "2.2.1",
-    "lodash.camelcase": "4.3.0",
+    "lodash.camelcase": "^4.3.0",
     "prop-types": "15.7.2",
-    "react": "17.0.2",
+    "react": "16.13.1",
     "react-break": "1.3.2",
-    "react-dom": "17.0.2",
-    "react-helmet": "6.1.0",
+    "react-dom": "16.13.1",
+    "react-helmet": "6.0.0",
     "react-redux": "7.2.4",
     "react-router": "5.2.0",
     "react-router-dom": "5.2.0",
-    "react-share": "4.4.0",
-    "redux": "4.1.1",
-    "regenerator-runtime": "0.13.9",
+    "react-share": "4.2.1",
+    "redux": "4.0.5",
+    "regenerator-runtime": "0.13.7",
     "reselect": "4.0.0",
-    "truncate-html": "1.0.4",
-    "util": "0.12.4"
+    "truncate-html": "1.0.3"
   },
   "devDependencies": {
-    "@edx/frontend-build": "8.0.0",
+    "@edx/frontend-build": "5.5.5",
     "@testing-library/dom": "7.16.3",
-    "@testing-library/jest-dom": "5.14.1",
+    "@testing-library/jest-dom": "5.10.1",
     "@testing-library/react": "10.3.0",
-    "@testing-library/user-event": "12.8.3",
-    "axios-mock-adapter": "1.19.0",
-    "codecov": "3.8.3",
-    "es-check": "5.2.4",
+    "@testing-library/user-event": "12.0.17",
+    "axios-mock-adapter": "1.18.2",
+    "codecov": "3.8.2",
+    "es-check": "5.1.4",
     "glob": "7.1.7",
-    "husky": "7.0.1",
-    "jest": "27.0.6",
+    "husky": "3.1.0",
+    "jest": "24.9.0",
     "jest-chain": "1.1.5",
     "reactifex": "1.1.1",
-    "rosie": "2.1.0"
+    "rosie": "2.0.1"
   }
 }

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

@@ -4,12 +4,11 @@ import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import {
   FormattedMessage, FormattedDate, injectIntl, intlShape,
 } from '@edx/frontend-platform/i18n';
-import { Alert, Hyperlink } from '@edx/paragon';
-import { Info } from '@edx/paragon/icons';
+import { Hyperlink } from '@edx/paragon';
 
+import { Alert, ALERT_TYPES } from '../../generic/user-messages';
 import messages from './messages';
 import AccessExpirationAlertMMP2P from './AccessExpirationAlertMMP2P';
-import AccessExpirationAlertMasquerade from './AccessExpirationAlertMasquerade';
 
 function AccessExpirationAlert({ intl, payload }) {
   /** [MM-P2P] Experiment */
@@ -43,7 +42,24 @@ function AccessExpirationAlert({ intl, payload }) {
 
   if (masqueradingExpiredCourse) {
     return (
-      <AccessExpirationAlertMasquerade payload={payload} />
+      <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>
     );
   }
 
@@ -100,7 +116,7 @@ function AccessExpirationAlert({ intl, payload }) {
   }
 
   return (
-    <Alert variant="info" icon={Info}>
+    <Alert type={ALERT_TYPES.INFO}>
       <span className="font-weight-bold">
         <FormattedMessage
           id="learning.accessExpiration.header"

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

@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { FormattedDate, injectIntl } from '@edx/frontend-platform/i18n';
-import { Alert, Hyperlink } from '@edx/paragon';
-import { Info } from '@edx/paragon/icons';
+import { Hyperlink } from '@edx/paragon';
 
+import { Alert, ALERT_TYPES } from '../../generic/user-messages';
 import messages from './messages';
 
 function AccessExpirationAlertMMP2P({ payload }) {
@@ -52,7 +52,7 @@ function AccessExpirationAlertMMP2P({ payload }) {
   }
 
   return (
-    <Alert variant="info" icon={Info}>
+    <Alert type={ALERT_TYPES.INFO}>
       <span className="font-weight-bold">
         Unlock full course content by {formatDate(upgradeDeadline, 'upgradeTitle')}
       </span>

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

@@ -1,60 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { FormattedMessage, FormattedDate } from '@edx/frontend-platform/i18n';
-import { Alert } from '@edx/paragon';
-import { Info } from '@edx/paragon/icons';
-
-function AccessExpirationAlertMasquerade({ payload }) {
-  const {
-    accessExpiration,
-    userTimezone,
-  } = payload;
-
-  if (!accessExpiration) {
-    return null;
-  }
-
-  const {
-    expirationDate,
-    masqueradingExpiredCourse,
-  } = accessExpiration;
-
-  if (!masqueradingExpiredCourse) {
-    return null;
-  }
-
-  const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
-
-  return (
-    <Alert variant="info" icon={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>
-  );
-}
-
-AccessExpirationAlertMasquerade.propTypes = {
-  payload: PropTypes.shape({
-    accessExpiration: PropTypes.shape({
-      expirationDate: PropTypes.string.isRequired,
-      masqueradingExpiredCourse: PropTypes.bool.isRequired,
-    }).isRequired,
-    userTimezone: PropTypes.string.isRequired,
-  }).isRequired,
-};
-
-export default AccessExpirationAlertMasquerade;

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

@@ -2,7 +2,6 @@ import React, { useMemo } from 'react';
 import { useAlert } from '../../generic/user-messages';
 
 const AccessExpirationAlert = React.lazy(() => import('./AccessExpirationAlert'));
-const AccessExpirationAlertMasquerade = React.lazy(() => import('./AccessExpirationAlertMasquerade'));
 
 function useAccessExpirationAlert(accessExpiration, courseId, org, userTimezone, topic, analyticsPageName) {
   const isVisible = !!accessExpiration; // If it exists, show it.
@@ -23,20 +22,4 @@ function useAccessExpirationAlert(accessExpiration, courseId, org, userTimezone,
   return { clientAccessExpirationAlert: AccessExpirationAlert };
 }
 
-export function useAccessExpirationAlertMasquerade(accessExpiration, userTimezone, topic) {
-  const isVisible = !!accessExpiration; // If it exists, show it.
-  const payload = {
-    accessExpiration,
-    userTimezone,
-  };
-
-  useAlert(isVisible, {
-    code: 'clientAccessExpirationAlertMasquerade',
-    payload: useMemo(() => payload, Object.values(payload).sort()),
-    topic,
-  });
-
-  return { clientAccessExpirationAlertMasquerade: AccessExpirationAlertMasquerade };
-}
-
 export default useAccessExpirationAlert;

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

@@ -1 +1 @@
-export { default, useAccessExpirationAlertMasquerade } from './hooks';
+export { default } from './hooks';

src/alerts/enrollment-alert/EnrollmentAlert.jsx

@@ -1,15 +1,15 @@
 import React from 'react';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import PropTypes from 'prop-types';
-import { Alert, Button } from '@edx/paragon';
-import { Info, WarningFilled } from '@edx/paragon/icons';
+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';
-import useEnrollClickHandler from './clickHook';
+import { useEnrollClickHandler } from './hooks';
 
 function EnrollmentAlert({ intl, payload }) {
   const {
@@ -30,29 +30,27 @@ function EnrollmentAlert({ intl, payload }) {
   );
 
   let text = intl.formatMessage(messages.alert);
-  let type = 'warning';
-  let icon = WarningFilled;
+  let type = ALERT_TYPES.ERROR;
   if (isStaff) {
     text = intl.formatMessage(messages.staffAlert);
-    type = 'info';
-    icon = Info;
+    type = ALERT_TYPES.INFO;
   } else if (extraText) {
     text = `${text} ${extraText}`;
   }
 
   const button = canEnroll && (
-    <Button disabled={loading} variant="link" className="p-0 border-0 align-top mx-1" size="sm" style={{ textDecoration: 'underline' }} onClick={enrollClickHandler}>
+    <Button disabled={loading} variant="link" className="p-0 border-0 align-top" style={{ textDecoration: 'underline' }} onClick={enrollClickHandler}>
       {intl.formatMessage(messages.enrollNowSentence)}
     </Button>
   );
 
   return (
-    <Alert variant={type} icon={icon}>
-      <div className="d-flex">
-        {text}
-        {button}
-        {loading && <FontAwesomeIcon icon={faSpinner} spin />}
-      </div>
+    <Alert type={type}>
+      {text}
+      {' '}
+      {button}
+      {' '}
+      {loading && <FontAwesomeIcon icon={faSpinner} spin />}
     </Alert>
   );
 }

src/alerts/enrollment-alert/clickHook.js

@@ -1,35 +0,0 @@
-import { useContext, useState, useCallback } from 'react';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
-
-import { UserMessagesContext, ALERT_TYPES } from '../../generic/user-messages';
-
-import { postCourseEnrollment } from './data/api';
-
-// Separated into its own file to avoid a circular dependency inside this directory
-
-function useEnrollClickHandler(courseId, orgId, successText) {
-  const [loading, setLoading] = useState(false);
-  const { addFlash } = useContext(UserMessagesContext);
-  const enrollClickHandler = useCallback(() => {
-    setLoading(true);
-    postCourseEnrollment(courseId).then(() => {
-      addFlash({
-        dismissible: true,
-        flash: true,
-        text: successText,
-        type: ALERT_TYPES.SUCCESS,
-        topic: 'course',
-      });
-      setLoading(false);
-      sendTrackEvent('edx.bi.user.course-home.enrollment', {
-        org_key: orgId,
-        courserun_key: courseId,
-      });
-      global.location.reload();
-    });
-  }, [courseId]);
-
-  return { enrollClickHandler, loading };
-}
-
-export default useEnrollClickHandler;

src/alerts/enrollment-alert/hooks.js

@@ -1,12 +1,15 @@
 /* eslint-disable import/prefer-default-export */
 import React, {
-  useContext, useMemo,
+  useContext, useState, useCallback, useMemo,
 } from 'react';
+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { AppContext } from '@edx/frontend-platform/react';
 
-import { useAlert } from '../../generic/user-messages';
+import { UserMessagesContext, ALERT_TYPES, useAlert } from '../../generic/user-messages';
 import { useModel } from '../../generic/model-store';
 
+import { postCourseEnrollment } from './data/api';
+
 const EnrollmentAlert = React.lazy(() => import('./EnrollmentAlert'));
 
 export function useEnrollmentAlert(courseId) {
@@ -37,3 +40,28 @@ export function useEnrollmentAlert(courseId) {
 
   return { clientEnrollmentAlert: EnrollmentAlert };
 }
+
+export function useEnrollClickHandler(courseId, orgId, successText) {
+  const [loading, setLoading] = useState(false);
+  const { addFlash } = useContext(UserMessagesContext);
+  const enrollClickHandler = useCallback(() => {
+    setLoading(true);
+    postCourseEnrollment(courseId).then(() => {
+      addFlash({
+        dismissible: true,
+        flash: true,
+        text: successText,
+        type: ALERT_TYPES.SUCCESS,
+        topic: 'course',
+      });
+      setLoading(false);
+      sendTrackEvent('edx.bi.user.course-home.enrollment', {
+        org_key: orgId,
+        courserun_key: courseId,
+      });
+      global.location.reload();
+    });
+  }, [courseId]);
+
+  return { enrollClickHandler, loading };
+}

src/alerts/logistration-alert/LogistrationAlert.jsx

@@ -2,9 +2,9 @@ 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 { Alert, Hyperlink } from '@edx/paragon';
-import { WarningFilled } from '@edx/paragon/icons';
+import { Hyperlink } from '@edx/paragon';
 
+import { Alert } from '../../generic/user-messages';
 import genericMessages from '../../generic/messages';
 
 function LogistrationAlert({ intl }) {
@@ -29,7 +29,7 @@ function LogistrationAlert({ intl }) {
   );
 
   return (
-    <Alert variant="warning" icon={WarningFilled}>
+    <Alert type="error">
       <FormattedMessage
         id="learning.logistration.alert"
         description="Prompts the user to sign in or register to see course content."

src/alerts/offer-alert/OfferAlert.jsx

@@ -0,0 +1,105 @@
+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 }) {
+  const {
+    analyticsPageName,
+    courseId,
+    offer,
+    org,
+    userTimezone,
+  } = 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 (
+    <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>
+    </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,
+  }).isRequired,
+};
+
+export default injectIntl(OfferAlert);

src/alerts/offer-alert/hooks.js

@@ -0,0 +1,25 @@
+import React, { useMemo } 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,
+  };
+
+  useAlert(isVisible, {
+    code: 'clientOfferAlert',
+    topic,
+    payload: useMemo(() => payload, Object.values(payload).sort()),
+  });
+
+  return { clientOfferAlert: OfferAlert };
+}
+
+export default useOfferAlert;

src/alerts/offer-alert/messages.js

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

src/course-header/AuthenticatedUserDropdown.jsx

@@ -18,7 +18,9 @@ function AuthenticatedUserDropdown({ enterpriseLearnerPortalLink, intl, username
   );
   if (enterpriseLearnerPortalLink && Object.keys(enterpriseLearnerPortalLink).length > 0) {
     dashboardMenuItem = (
-      <Dropdown.Item href={enterpriseLearnerPortalLink.href}>
+      <Dropdown.Item
+        href={enterpriseLearnerPortalLink.href}
+      >
         {enterpriseLearnerPortalLink.content}
       </Dropdown.Item>
     );
@@ -60,17 +62,13 @@ function AuthenticatedUserDropdown({ enterpriseLearnerPortalLink, intl, username
 }
 
 AuthenticatedUserDropdown.propTypes = {
+  enterpriseLearnerPortalLink: PropTypes.string,
   intl: intlShape.isRequired,
   username: PropTypes.string.isRequired,
-  enterpriseLearnerPortalLink: PropTypes.shape({
-    type: PropTypes.string,
-    href: PropTypes.string,
-    content: PropTypes.string,
-  }),
 };
 
 AuthenticatedUserDropdown.defaultProps = {
-  enterpriseLearnerPortalLink: undefined,
+  enterpriseLearnerPortalLink: '',
 };
 
 export default injectIntl(AuthenticatedUserDropdown);

src/course-header/CourseTabsNavigation.jsx

@@ -11,7 +11,7 @@ function CourseTabsNavigation({
 }) {
   return (
     <div className={classNames('course-tabs-navigation', className)}>
-      <div className="container-xl">
+      <div className="container-fluid">
         <Tabs
           className="nav-underline-tabs"
           aria-label={intl.formatMessage(messages.courseMaterial)}

src/course-header/Header.jsx

@@ -1,6 +1,6 @@
 import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
-import { useEnterpriseConfig } from '@edx/frontend-enterprise-utils';
+import { useEnterpriseConfig } from '@edx/frontend-enterprise';
 import { getConfig } from '@edx/frontend-platform';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { AppContext } from '@edx/frontend-platform/react';
@@ -61,7 +61,7 @@ function Header({
   return (
     <header className="course-header">
       <a className="sr-only sr-only-focusable" href="#main-content">{intl.formatMessage(messages.skipNavLink)}</a>
-      <div className="container-xl py-2 d-flex align-items-center">
+      <div className="container-fluid py-2 d-flex align-items-center">
         {headerLogo}
         <div className="flex-grow-1 course-title-lockup" style={{ lineHeight: 1 }}>
           <span className="d-block small m-0">{courseOrg} {courseNumber}</span>

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

@@ -10,13 +10,4 @@ Factory.define('courseHomeMetadata')
     is_self_paced: false,
     is_enrolled: false,
     can_load_courseware: false,
-    course_access: {
-      additional_context_user_message: null,
-      developer_message: null,
-      error_code: null,
-      has_access: true,
-      user_fragment: null,
-      user_message: null,
-    },
-    start: '2013-02-05T05:00:00Z',
   });

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

@@ -2,4 +2,4 @@ import './courseHomeMetadata.factory';
 import './datesTabData.factory';
 import './outlineTabData.factory';
 import './progressTabData.factory';
-import './upgradeNotificationData.factory';
+import './upgradeCardData.factory';

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

@@ -29,7 +29,6 @@ Factory.define('outlineTabData')
     upgrade_url: `${host}/dashboard`,
   }))
   .attrs({
-    has_scheduled_content: null,
     access_expiration: null,
     can_show_upgrade_sock: false,
     cert_data: {
@@ -66,5 +65,4 @@ Factory.define('outlineTabData')
     handouts_html: '<ul><li>Handout 1</li></ul>',
     offer: null,
     welcome_message_html: '<p>Welcome to this course!</p>',
-    mfe_short_url_is_active: true,
   });

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

@@ -24,12 +24,10 @@ Factory.define('progressTabData')
             assignment_type: 'Homework',
             block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345',
             display_name: 'First subsection',
-            learner_has_access: true,
             has_graded_assignment: true,
             num_points_earned: 0,
-            num_points_possible: 3,
+            num_points_possible: 1,
             percent_graded: 0.0,
-            problem_scores: [{ earned: 0, possible: 1 }, { earned: 0, possible: 1 }, { earned: 0, possible: 1 }],
             show_correctness: 'always',
             show_grades: true,
             url: 'http://learning.edx.org/course/course-v1:edX+Test+run/first_subsection',
@@ -46,7 +44,6 @@ Factory.define('progressTabData')
             num_points_earned: 1,
             num_points_possible: 1,
             percent_graded: 1.0,
-            problem_scores: [{ earned: 1, possible: 1 }],
             show_correctness: 'always',
             show_grades: true,
             url: 'http://learning.edx.org/course/course-v1:edX+Test+run/second_subsection',

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

@@ -1,6 +1,6 @@
 import { Factory } from 'rosie'; // eslint-disable-line import/no-extraneous-dependencies
 
-Factory.define('upgradeNotificationData')
+Factory.define('upgradeCardData')
   .option('host', 'http://localhost:18000')
   .option('dateBlocks', [])
   .option('offer', null)
@@ -8,7 +8,6 @@ Factory.define('upgradeNotificationData')
   .option('accessExpiration', null)
   .option('contentTypeGatingEnabled', false)
   .attr('courseId', 'course-v1:edX+DemoX+Demo_Course')
-  .attr('upsellPageName', 'test')
   .attr('verifiedMode', ['host'], (host) => ({
     access_expiration_date: '2050-01-01T12:00:00',
     currency: 'USD',

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

@@ -5,7 +5,6 @@ Object {
   "courseHome": Object {
     "courseId": "course-v1:edX+DemoX+Demo_Course_1",
     "courseStatus": "loaded",
-    "targetUserId": undefined,
     "toastBodyLink": null,
     "toastBodyText": null,
     "toastHeader": "",
@@ -16,21 +15,12 @@ Object {
     "proctoredExamsEnabledWaffleFlag": false,
     "sequenceId": null,
     "sequenceStatus": "loading",
-    "shortLinkFeatureFlag": false,
     "specialExamsEnabledWaffleFlag": false,
   },
   "models": Object {
     "courseHomeMeta": Object {
       "course-v1:edX+DemoX+Demo_Course_1": Object {
         "canLoadCourseware": false,
-        "courseAccess": Object {
-          "additionalContextUserMessage": null,
-          "developerMessage": null,
-          "errorCode": null,
-          "hasAccess": true,
-          "userFragment": null,
-          "userMessage": null,
-        },
         "id": "course-v1:edX+DemoX+Demo_Course_1",
         "isEnrolled": false,
         "isSelfPaced": false,
@@ -38,7 +28,6 @@ Object {
         "number": "DemoX",
         "org": "edX",
         "originalUserIsStaff": false,
-        "start": "2013-02-05T05:00:00Z",
         "tabs": Array [
           Object {
             "slug": "outline",
@@ -311,7 +300,6 @@ Object {
   "courseHome": Object {
     "courseId": "course-v1:edX+DemoX+Demo_Course_1",
     "courseStatus": "loaded",
-    "targetUserId": undefined,
     "toastBodyLink": null,
     "toastBodyText": null,
     "toastHeader": "",
@@ -322,21 +310,12 @@ Object {
     "proctoredExamsEnabledWaffleFlag": false,
     "sequenceId": null,
     "sequenceStatus": "loading",
-    "shortLinkFeatureFlag": false,
     "specialExamsEnabledWaffleFlag": false,
   },
   "models": Object {
     "courseHomeMeta": Object {
       "course-v1:edX+DemoX+Demo_Course_1": Object {
         "canLoadCourseware": false,
-        "courseAccess": Object {
-          "additionalContextUserMessage": null,
-          "developerMessage": null,
-          "errorCode": null,
-          "hasAccess": true,
-          "userFragment": null,
-          "userMessage": null,
-        },
         "id": "course-v1:edX+DemoX+Demo_Course_1",
         "isEnrolled": false,
         "isSelfPaced": false,
@@ -344,7 +323,6 @@ Object {
         "number": "DemoX",
         "org": "edX",
         "originalUserIsStaff": false,
-        "start": "2013-02-05T05:00:00Z",
         "tabs": Array [
           Object {
             "slug": "outline",
@@ -398,7 +376,8 @@ Object {
         "courseBlocks": Object {
           "courses": Object {
             "block-v1:edX+DemoX+Demo_Course+type@course+block@bcdabcdabcdabcdabcdabcdabcdabcd3": Object {
-              "hasScheduledContent": false,
+              "effortActivities": undefined,
+              "effortTime": undefined,
               "id": "course-v1:edX+DemoX+Demo_Course_1",
               "sectionIds": Array [
                 "block-v1:edX+DemoX+Demo_Course+type@chapter+block@bcdabcdabcdabcdabcdabcdabcdabcd2",
@@ -410,6 +389,8 @@ 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 [
@@ -423,9 +404,8 @@ Object {
               "complete": false,
               "description": null,
               "due": null,
-              "effortActivities": 2,
-              "effortTime": 15,
-              "hash_key": "abcdabcd1",
+              "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",
@@ -464,19 +444,15 @@ Object {
           "canEnroll": true,
           "extraText": "Contact the administrator.",
         },
-        "enrollmentMode": undefined,
         "handoutsHtml": "<ul><li>Handout 1</li></ul>",
         "hasEnded": undefined,
-        "hasScheduledContent": null,
         "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",
         },
-        "shortLinkFeatureFlag": true,
         "timeOffsetMillis": 0,
-        "userHasPassingGrade": undefined,
         "verifiedMode": Object {
           "accessExpirationDate": "2050-01-01T12:00:00",
           "currency": "USD",
@@ -500,7 +476,6 @@ Object {
   "courseHome": Object {
     "courseId": "course-v1:edX+DemoX+Demo_Course_1",
     "courseStatus": "loaded",
-    "targetUserId": undefined,
     "toastBodyLink": null,
     "toastBodyText": null,
     "toastHeader": "",
@@ -511,21 +486,12 @@ Object {
     "proctoredExamsEnabledWaffleFlag": false,
     "sequenceId": null,
     "sequenceStatus": "loading",
-    "shortLinkFeatureFlag": false,
     "specialExamsEnabledWaffleFlag": false,
   },
   "models": Object {
     "courseHomeMeta": Object {
       "course-v1:edX+DemoX+Demo_Course_1": Object {
         "canLoadCourseware": false,
-        "courseAccess": Object {
-          "additionalContextUserMessage": null,
-          "developerMessage": null,
-          "errorCode": null,
-          "hasAccess": true,
-          "userFragment": null,
-          "userMessage": null,
-        },
         "id": "course-v1:edX+DemoX+Demo_Course_1",
         "isEnrolled": false,
         "isSelfPaced": false,
@@ -533,7 +499,6 @@ Object {
         "number": "DemoX",
         "org": "edX",
         "originalUserIsStaff": false,
-        "start": "2013-02-05T05:00:00Z",
         "tabs": Array [
           Object {
             "slug": "outline",
@@ -591,8 +556,6 @@ Object {
         "courseId": "course-v1:edX+DemoX+Demo_Course_1",
         "end": "3027-03-31T00:00:00Z",
         "enrollmentMode": "audit",
-        "gradesFeatureIsFullyLocked": false,
-        "gradesFeatureIsPartiallyLocked": false,
         "gradingPolicy": Object {
           "assignmentPolicies": Array [
             Object {
@@ -619,24 +582,9 @@ Object {
                 "blockKey": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345",
                 "displayName": "First subsection",
                 "hasGradedAssignment": true,
-                "learnerHasAccess": true,
                 "numPointsEarned": 0,
-                "numPointsPossible": 3,
+                "numPointsPossible": 1,
                 "percentGraded": 0,
-                "problemScores": Array [
-                  Object {
-                    "earned": 0,
-                    "possible": 1,
-                  },
-                  Object {
-                    "earned": 0,
-                    "possible": 1,
-                  },
-                  Object {
-                    "earned": 0,
-                    "possible": 1,
-                  },
-                ],
                 "showCorrectness": "always",
                 "showGrades": true,
                 "url": "http://learning.edx.org/course/course-v1:edX+Test+run/first_subsection",
@@ -653,12 +601,6 @@ Object {
                 "numPointsEarned": 1,
                 "numPointsPossible": 1,
                 "percentGraded": 1,
-                "problemScores": Array [
-                  Object {
-                    "earned": 1,
-                    "possible": 1,
-                  },
-                ],
                 "showCorrectness": "always",
                 "showGrades": true,
                 "url": "http://learning.edx.org/course/course-v1:edX+Test+run/second_subsection",

src/course-home/data/api.js

@@ -111,16 +111,19 @@ export function normalizeOutlineBlocks(courseId, blocks) {
     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 || [],
-          hasScheduledContent: block.has_scheduled_content,
         };
         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,
@@ -144,7 +147,6 @@ export function normalizeOutlineBlocks(courseId, blocks) {
           // link to the MFE ourselves).
           showLink: !!block.legacy_web_url,
           title: block.display_name,
-          hash_key: block.hash_key,
         };
         break;
 
@@ -200,26 +202,20 @@ export async function getDatesTabData(courseId) {
     const { httpErrorStatus } = error && error.customAttributes;
     if (httpErrorStatus === 404) {
       global.location.replace(`${getConfig().LMS_BASE_URL}/courses/${courseId}/dates`);
-      return {};
     }
+    // 401 can be returned for unauthenticated users or users who are not enrolled
     if (httpErrorStatus === 401) {
-      // The backend sends this for unenrolled and unauthenticated learners, but we handle those cases by examining
-      // courseAccess in the metadata call, so just ignore this status for now.
-      return {};
+      global.location.replace(`${getConfig().BASE_URL}/course/${courseId}/home`);
     }
     throw error;
   }
 }
 
-export async function getProgressTabData(courseId, targetUserId) {
+export async function getProgressTabData(courseId, userId) {
   let url = `${getConfig().LMS_BASE_URL}/api/course_home/v1/progress/${courseId}`;
-
-  // If targetUserId is passed in, we will get the progress page data
-  // for the user with the provided id, rather than the requesting user.
-  if (targetUserId) {
-    url += `/${targetUserId}/`;
+  if (userId) {
+    url += `/${userId}/`;
   }
-
   try {
     const { data } = await getAuthenticatedHttpClient().get(url);
     const camelCasedData = camelCaseObject(data);
@@ -244,44 +240,22 @@ export async function getProgressTabData(courseId, targetUserId) {
     // in order to preserve a course team's desired grade formatting.
     camelCasedData.gradingPolicy.gradeRange = data.grading_policy.grade_range;
 
-    camelCasedData.gradesFeatureIsFullyLocked = camelCasedData.completionSummary.lockedCount > 0;
-
-    camelCasedData.gradesFeatureIsPartiallyLocked = false;
-    if (camelCasedData.gradesFeatureIsFullyLocked) {
-      camelCasedData.sectionScores.forEach((chapter) => {
-        chapter.subsections.forEach((subsection) => {
-          // If something is eligible to be gated by content type gating and would show up on the progress page
-          if (subsection.assignmentType !== null && subsection.hasGradedAssignment && subsection.showGrades
-            && (subsection.numPointsPossible > 0 || subsection.numPointsEarned > 0)) {
-            // but the learner still has access to it, then we are in a partially locked, rather than fully locked state
-            // since the learner has access to some (but not all) content that would normally be locked
-            if (subsection.learnerHasAccess) {
-              camelCasedData.gradesFeatureIsPartiallyLocked = true;
-              camelCasedData.gradesFeatureIsFullyLocked = false;
-            }
-          }
-        });
-      });
-    }
-
     return camelCasedData;
   } catch (error) {
     const { httpErrorStatus } = error && error.customAttributes;
     if (httpErrorStatus === 404) {
       global.location.replace(`${getConfig().LMS_BASE_URL}/courses/${courseId}/progress`);
-      return {};
     }
+    // 401 can be returned for unauthenticated users or users who are not enrolled
     if (httpErrorStatus === 401) {
-      // The backend sends this for unenrolled and unauthenticated learners, but we handle those cases by examining
-      // courseAccess in the metadata call, so just ignore this status for now.
-      return {};
+      global.location.replace(`${getConfig().BASE_URL}/course/${courseId}/home`);
     }
     throw error;
   }
 }
 
 export async function getProctoringInfoData(courseId, username) {
-  let url = `${getConfig().LMS_BASE_URL}/api/edx_proctoring/v1/user_onboarding/status?is_learning_mfe=true&course_id=${encodeURIComponent(courseId)}`;
+  let url = `${getConfig().LMS_BASE_URL}/api/edx_proctoring/v1/user_onboarding/status?course_id=${encodeURIComponent(courseId)}`;
   if (username) {
     url += `&username=${encodeURIComponent(username)}`;
   }
@@ -344,17 +318,13 @@ export async function getOutlineTabData(courseId) {
   const datesBannerInfo = camelCaseObject(data.dates_banner_info);
   const datesWidget = camelCaseObject(data.dates_widget);
   const enrollAlert = camelCaseObject(data.enroll_alert);
-  const enrollmentMode = data.enrollment_mode;
   const handoutsHtml = data.handouts_html;
-  const hasScheduledContent = data.has_scheduled_content;
   const hasEnded = data.has_ended;
   const offer = camelCaseObject(data.offer);
   const resumeCourse = camelCaseObject(data.resume_course);
   const timeOffsetMillis = getTimeOffsetMillis(headers && headers.date, requestTime, responseTime);
-  const userHasPassingGrade = data.user_has_passing_grade;
   const verifiedMode = camelCaseObject(data.verified_mode);
   const welcomeMessageHtml = data.welcome_message_html;
-  const shortLinkFeatureFlag = data.mfe_short_url_is_active;
 
   return {
     accessExpiration,
@@ -366,17 +336,13 @@ export async function getOutlineTabData(courseId) {
     datesBannerInfo,
     datesWidget,
     enrollAlert,
-    enrollmentMode,
     handoutsHtml,
-    hasScheduledContent,
     hasEnded,
     offer,
     resumeCourse,
     timeOffsetMillis, // This should move to a global time correction reference
-    userHasPassingGrade,
     verifiedMode,
     welcomeMessageHtml,
-    shortLinkFeatureFlag,
   };
 }
 

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

@@ -115,20 +115,6 @@ describe('Data layer integration tests', () => {
       expect(state.courseHome.courseStatus).toEqual('loaded');
       expect(state).toMatchSnapshot();
     });
-
-    it('Should handle the url including a targetUserId', async () => {
-      const progressTabData = Factory.build('progressTabData', { courseId });
-      const targetUserId = 2;
-      const progressUrl = `${progressBaseUrl}/${courseId}/${targetUserId}/`;
-
-      axiosMock.onGet(courseMetadataUrl).reply(200, courseHomeMetadata);
-      axiosMock.onGet(progressUrl).reply(200, progressTabData);
-
-      await executeThunk(thunks.fetchProgressTab(courseId, 2), store.dispatch);
-
-      const state = store.getState();
-      expect(state.courseHome.targetUserId).toEqual(2);
-    });
   });
 
   describe('Test saveCourseGoal', () => {

src/course-home/data/slice.js

@@ -4,7 +4,6 @@ import { createSlice } from '@reduxjs/toolkit';
 export const LOADING = 'loading';
 export const LOADED = 'loaded';
 export const FAILED = 'failed';
-export const DENIED = 'denied';
 
 const slice = createSlice({
   name: 'course-home',
@@ -16,23 +15,18 @@ const slice = createSlice({
     toastHeader: '',
   },
   reducers: {
-    fetchTabDenied: (state, { payload }) => {
-      state.courseId = payload.courseId;
-      state.courseStatus = DENIED;
-    },
-    fetchTabFailure: (state, { payload }) => {
-      state.courseId = payload.courseId;
-      state.courseStatus = FAILED;
-    },
     fetchTabRequest: (state, { payload }) => {
       state.courseId = payload.courseId;
       state.courseStatus = LOADING;
     },
     fetchTabSuccess: (state, { payload }) => {
       state.courseId = payload.courseId;
-      state.targetUserId = payload.targetUserId;
       state.courseStatus = LOADED;
     },
+    fetchTabFailure: (state, { payload }) => {
+      state.courseId = payload.courseId;
+      state.courseStatus = FAILED;
+    },
     setCallToActionToast: (state, { payload }) => {
       const {
         header,
@@ -47,10 +41,9 @@ const slice = createSlice({
 });
 
 export const {
-  fetchTabDenied,
-  fetchTabFailure,
   fetchTabRequest,
   fetchTabSuccess,
+  fetchTabFailure,
   setCallToActionToast,
 } = slice.actions;
 

src/course-home/data/thunks.js

@@ -17,7 +17,6 @@ import {
 } from '../../generic/model-store';
 
 import {
-  fetchTabDenied,
   fetchTabFailure,
   fetchTabRequest,
   fetchTabSuccess,
@@ -28,12 +27,12 @@ const eventTypes = {
   POST_EVENT: 'post_event',
 };
 
-export function fetchTab(courseId, tab, getTabData, targetUserId) {
+export function fetchTab(courseId, tab, getTabData, userId) {
   return async (dispatch) => {
     dispatch(fetchTabRequest({ courseId }));
     Promise.allSettled([
       getCourseHomeCourseMetadata(courseId),
-      getTabData(courseId, targetUserId),
+      getTabData(courseId, userId),
     ]).then(([courseHomeCourseMetadataResult, tabDataResult]) => {
       const fetchedCourseHomeCourseMetadata = courseHomeCourseMetadataResult.status === 'fulfilled';
       const fetchedTabData = tabDataResult.status === 'fulfilled';
@@ -62,11 +61,8 @@ export function fetchTab(courseId, tab, getTabData, targetUserId) {
         logError(tabDataResult.reason);
       }
 
-      // Disable the access-denied path for now - it caused a regression
-      if (fetchedCourseHomeCourseMetadata && !courseHomeCourseMetadataResult.value.courseAccess.hasAccess) {
-        dispatch(fetchTabDenied({ courseId }));
-      } else if (fetchedCourseHomeCourseMetadata && fetchedTabData) {
-        dispatch(fetchTabSuccess({ courseId, targetUserId }));
+      if (fetchedCourseHomeCourseMetadata && fetchedTabData) {
+        dispatch(fetchTabSuccess({ courseId }));
       } else {
         dispatch(fetchTabFailure({ courseId }));
       }
@@ -78,8 +74,8 @@ export function fetchDatesTab(courseId) {
   return fetchTab(courseId, 'dates', getDatesTabData);
 }
 
-export function fetchProgressTab(courseId, targetUserId) {
-  return fetchTab(courseId, 'progress', getProgressTabData, parseInt(targetUserId, 10) || targetUserId);
+export function fetchProgressTab(courseId, userId) {
+  return fetchTab(courseId, 'progress', getProgressTabData, userId);
 }
 
 export function fetchOutlineTab(courseId) {

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

@@ -0,0 +1,46 @@
+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';
+
+function DatesBanner(props) {
+  const {
+    intl,
+    name,
+    bannerClickHandler,
+  } = 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'}>
+          <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}>
+              {intl.formatMessage(messages[`datesBanner.${name}.button`])}
+            </Button>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
+
+DatesBanner.propTypes = {
+  intl: intlShape.isRequired,
+  name: PropTypes.string.isRequired,
+  bannerClickHandler: PropTypes.func,
+};
+
+DatesBanner.defaultProps = {
+  bannerClickHandler: null,
+};
+
+export default injectIntl(DatesBanner);

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

@@ -0,0 +1,100 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useDispatch, useSelector } from 'react-redux';
+
+import { useModel } from '../../generic/model-store';
+
+import DatesBanner from './DatesBanner';
+import { resetDeadlines } from '../data';
+
+function DatesBannerContainer({
+  courseDateBlocks,
+  datesBannerInfo,
+  hasEnded,
+  logUpgradeLinkClick,
+  model,
+  tabFetch,
+}) {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);
+
+  const {
+    contentTypeGatingEnabled,
+    missedDeadlines,
+    missedGatedContent,
+    verifiedUpgradeLink,
+  } = datesBannerInfo;
+
+  const {
+    isSelfPaced,
+  } = useModel('courseHomeMeta', courseId);
+
+  const dispatch = useDispatch();
+  const hasDeadlines = courseDateBlocks.some(x => x.dateType === 'assignment-due-date');
+  const upgradeToCompleteGraded = model === 'dates' && contentTypeGatingEnabled && !missedDeadlines;
+  const upgradeToReset = !upgradeToCompleteGraded && missedDeadlines && missedGatedContent;
+  const resetDates = !upgradeToCompleteGraded && missedDeadlines && !missedGatedContent;
+  const datesBanners = [
+    {
+      name: 'datesTabInfoBanner',
+      shouldDisplay: model === 'dates' && hasDeadlines && !missedDeadlines && isSelfPaced,
+    },
+    {
+      name: 'upgradeToCompleteGradedBanner',
+      // verifiedUpgradeLink can be null if we've passed the upgrade deadline
+      shouldDisplay: upgradeToCompleteGraded && verifiedUpgradeLink,
+      clickHandler: () => {
+        logUpgradeLinkClick();
+        global.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);
+      },
+    },
+    {
+      name: 'resetDatesBanner',
+      shouldDisplay: resetDates,
+      clickHandler: () => dispatch(resetDeadlines(courseId, model, tabFetch)),
+    },
+  ];
+
+  return (
+    <>
+      {!hasEnded && datesBanners.map((banner) => banner.shouldDisplay && (
+        <DatesBanner
+          name={banner.name}
+          bannerClickHandler={banner.clickHandler}
+          key={banner.name}
+        />
+      ))}
+    </>
+  );
+}
+
+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-banner/index.js

@@ -0,0 +1,3 @@
+import DatesBannerContainer from './DatesBannerContainer';
+
+export default DatesBannerContainer;

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

@@ -0,0 +1,66 @@
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+  'datesBanner.datesTabInfoBanner.header': {
+    id: 'datesBanner.datesTabInfoBanner.header',
+    defaultMessage: "We've built a suggested schedule to help you stay on track. ",
+    description: 'Strong text in Dates Tab Info Banner',
+  },
+  'datesBanner.datesTabInfoBanner.body': {
+    id: 'datesBanner.datesTabInfoBanner.body',
+    defaultMessage: `But don't worry—it's flexible so you can learn at your own pace. If you happen to fall behind on
+      our suggested dates, you'll be able to adjust them to keep yourself on track.`,
+    description: 'Body in Dates Tab Info Banner',
+  },
+  'datesBanner.upgradeToCompleteGradedBanner.header': {
+    id: 'datesBanner.upgradeToCompleteGradedBanner.header',
+    defaultMessage: 'You are auditing this course, ',
+    description: 'Strong text in Upgrade To Complete Graded Banner',
+  },
+  'datesBanner.upgradeToCompleteGradedBanner.body': {
+    id: 'datesBanner.upgradeToCompleteGradedBanner.body',
+    defaultMessage: `which means that you are unable to participate in graded assignments. To complete graded
+      assignments as part of this course, you can upgrade today.`,
+    description: 'Body in Upgrade To Complete Graded Banner',
+  },
+  'datesBanner.upgradeToCompleteGradedBanner.button': {
+    id: 'datesBanner.upgradeToCompleteGradedBanner.button',
+    defaultMessage: 'Upgrade now',
+    description: 'Button in Upgrade To Complete Graded Banner',
+  },
+  'datesBanner.upgradeToResetBanner.header': {
+    id: 'datesBanner.upgradeToResetBanner.header',
+    defaultMessage: 'You are auditing this course, ',
+    description: 'Strong text in Upgrade To Reset Banner',
+  },
+  'datesBanner.upgradeToResetBanner.body': {
+    id: 'datesBanner.upgradeToResetBanner.body',
+    defaultMessage: `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.`,
+    description: 'Body in Upgrade To Reset Banner',
+  },
+  'datesBanner.upgradeToResetBanner.button': {
+    id: 'datesBanner.upgradeToResetBanner.button',
+    defaultMessage: 'Upgrade to shift due dates',
+    description: 'Button in Upgrade To Reset Banner',
+  },
+  'datesBanner.resetDatesBanner.header': {
+    id: 'datesBanner.resetDatesBanner.header',
+    defaultMessage: 'It looks like you missed some important deadlines based on our suggested schedule. ',
+    description: 'Strong text in Reset Dates Banner',
+  },
+  'datesBanner.resetDatesBanner.body': {
+    id: 'datesBanner.resetDatesBanner.body',
+    defaultMessage: `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.`,
+    description: 'Body in Reset Dates Banner',
+  },
+  'datesBanner.resetDatesBanner.button': {
+    id: 'datesBanner.resetDatesBanner.button',
+    defaultMessage: 'Shift due dates',
+    description: 'Button in Reset Dates Banner',
+  },
+});
+
+export default messages;

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

@@ -0,0 +1,25 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+
+export default function Badge({ children, className, ...rest }) {
+  return (
+    <span
+      className={classNames('dates-badge x-small ml-2 position-absolute', className)}
+      data-testid="dates-badge"
+      {...rest}
+    >
+      {children}
+    </span>
+  );
+}
+
+Badge.propTypes = {
+  children: PropTypes.node,
+  className: PropTypes.string,
+};
+
+Badge.defaultProps = {
+  children: null,
+  className: null,
+};

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

@@ -0,0 +1,4 @@
+.dates-badge {
+  border-radius: 4px;
+  padding: 1px 8px;
+}

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

@@ -4,17 +4,14 @@ import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 
 import messages from './messages';
-import Timeline from './timeline/Timeline';
+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';
-import SuggestedScheduleHeader from '../suggested-schedule-messaging/SuggestedScheduleHeader';
-import ShiftDatesAlert from '../suggested-schedule-messaging/ShiftDatesAlert';
-import UpgradeToCompleteAlert from '../suggested-schedule-messaging/UpgradeToCompleteAlert';
-import UpgradeToShiftDatesAlert from '../suggested-schedule-messaging/UpgradeToShiftDatesAlert';
 
 function DatesTab({ intl }) {
   const {
@@ -22,19 +19,18 @@ function DatesTab({ intl }) {
   } = useSelector(state => state.courseHome);
 
   const {
-    isSelfPaced,
     org,
   } = useModel('courseHomeMeta', courseId);
 
   const {
     courseDateBlocks,
+    datesBannerInfo,
+    hasEnded,
   } = useModel('dates', courseId);
 
   /** [MM-P2P] Experiment */
   const mmp2p = initDatesMMP2P(courseId);
 
-  const hasDeadlines = courseDateBlocks && courseDateBlocks.some(x => x.dateType === 'assignment-due-date');
-
   const logUpgradeLinkClick = () => {
     sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
       org_key: org,
@@ -52,14 +48,16 @@ function DatesTab({ intl }) {
         {intl.formatMessage(messages.title)}
       </div>
       { /** [MM-P2P] Experiment */ }
-      {isSelfPaced && hasDeadlines && !mmp2p.state.isEnabled && (
-        <>
-          <ShiftDatesAlert model="dates" fetch={fetchDatesTab} />
-          <SuggestedScheduleHeader />
-          <UpgradeToCompleteAlert logUpgradeLinkClick={logUpgradeLinkClick} />
-          <UpgradeToShiftDatesAlert logUpgradeLinkClick={logUpgradeLinkClick} model="dates" />
-        </>
-      )}
+      { !mmp2p.state.isEnabled && (
+        <DatesBannerContainer
+          courseDateBlocks={courseDateBlocks}
+          datesBannerInfo={datesBannerInfo}
+          hasEnded={hasEnded}
+          logUpgradeLinkClick={logUpgradeLinkClick}
+          model="dates"
+          tabFetch={fetchDatesTab}
+        />
+      ) }
       <Timeline mmp2p={mmp2p} />
     </>
   );

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

@@ -23,37 +23,19 @@ jest.mock('@edx/frontend-platform/analytics');
 
 describe('DatesTab', () => {
   let axiosMock;
-  let store;
-  let component;
 
-  beforeEach(() => {
-    axiosMock = new MockAdapter(getAuthenticatedHttpClient());
-    store = initializeStore();
-    component = (
-      <AppProvider store={store}>
-        <UserMessagesProvider>
-          <Route path="/c/:courseId/dates">
-            <TabContainer tab="dates" fetch={fetchDatesTab} slice="courseHome">
-              <DatesTab />
-            </TabContainer>
-          </Route>
-        </UserMessagesProvider>
-      </AppProvider>
-    );
-  });
-
-  const datesTabData = Factory.build('datesTabData');
-  let courseMetadata = Factory.build('courseHomeMetadata');
-  const { id: courseId } = courseMetadata;
-
-  const datesUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`;
-  let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/course_metadata/${courseId}`;
-  courseMetadataUrl = appendBrowserTimezoneToUrl(courseMetadataUrl);
-
-  function setMetadata(attributes, options) {
-    courseMetadata = Factory.build('courseHomeMetadata', { id: courseId, ...attributes }, options);
-    axiosMock.onGet(courseMetadataUrl).reply(200, courseMetadata);
-  }
+  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
@@ -79,9 +61,16 @@ describe('DatesTab', () => {
 
   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(datesUrl).reply(200, datesTabData);
-      history.push(`/c/${courseId}/dates`); // so tab can pull course id from url
+      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);
     });
@@ -144,26 +133,34 @@ describe('DatesTab', () => {
     });
   });
 
-  describe('Suggested schedule messaging', () => {
+  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(() => {
-      setMetadata({ is_self_paced: true, is_enrolled: true });
-      history.push(`/c/${courseId}/dates`);
+      axiosMock = new MockAdapter(getAuthenticatedHttpClient());
+      axiosMock.onGet(courseMetadataUrl).reply(200, courseMetadata);
+      history.push(`/course/${courseId}/dates`);
     });
 
-    it('renders SuggestedScheduleHeader', async () => {
+    it('renders datesTabInfoBanner', async () => {
       datesTabData.datesBannerInfo = {
         contentTypeGatingEnabled: false,
         missedDeadlines: false,
         missedGatedContent: false,
       };
 
-      axiosMock.onGet(datesUrl).reply(200, datesTabData);
+      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. But don’t worry—it’s flexible so you can learn at your own pace.')).toBeInTheDocument());
+      await waitFor(() => expect(screen.getByText("We've built a suggested schedule to help you stay on track.")).toBeInTheDocument());
     });
 
-    it('renders UpgradeToCompleteAlert', async () => {
+    it('renders upgradeToCompleteGradedBanner', async () => {
       datesTabData.datesBannerInfo = {
         contentTypeGatingEnabled: true,
         missedDeadlines: false,
@@ -171,14 +168,15 @@ describe('DatesTab', () => {
         verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
       };
 
-      axiosMock.onGet(datesUrl).reply(200, datesTabData);
+      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, 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());
+      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 UpgradeToShiftDatesAlert', async () => {
+    it('renders upgradeToResetBanner', async () => {
       datesTabData.datesBannerInfo = {
         contentTypeGatingEnabled: true,
         missedDeadlines: true,
@@ -186,15 +184,15 @@ describe('DatesTab', () => {
         verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
       };
 
-      axiosMock.onGet(datesUrl).reply(200, datesTabData);
+      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();
+      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 ShiftDatesAlert', async () => {
+    it('renders resetDatesBanner', async () => {
       datesTabData.datesBannerInfo = {
         contentTypeGatingEnabled: true,
         missedDeadlines: true,
@@ -202,7 +200,7 @@ describe('DatesTab', () => {
         verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
       };
 
-      axiosMock.onGet(datesUrl).reply(200, datesTabData);
+      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());
@@ -218,7 +216,7 @@ describe('DatesTab', () => {
         verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
       };
 
-      axiosMock.onGet(datesUrl).reply(200, datesTabData);
+      axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`).reply(200, datesTabData);
       render(component);
 
       // confirm "Shift due dates" button has rendered
@@ -246,7 +244,7 @@ describe('DatesTab', () => {
       expect(screen.queryByRole('button', { name: 'Shift due dates' })).not.toBeInTheDocument();
     });
 
-    it('sends analytics event onClick of upgrade button in UpgradeToCompleteAlert', async () => {
+    it('sends analytics event onClick of upgrade button in upgradeToCompleteGradedBanner', async () => {
       sendTrackEvent.mockClear();
       datesTabData.datesBannerInfo = {
         contentTypeGatingEnabled: true,
@@ -255,7 +253,7 @@ describe('DatesTab', () => {
         verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
       };
 
-      axiosMock.onGet(datesUrl).reply(200, datesTabData);
+      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' }));
@@ -272,7 +270,7 @@ describe('DatesTab', () => {
       });
     });
 
-    it('sends analytics event onClick of upgrade button in UpgradeToShiftDatesAlert', async () => {
+    it('sends analytics event onClick of upgrade button in upgradeToResetBanner', async () => {
       sendTrackEvent.mockClear();
       datesTabData.datesBannerInfo = {
         contentTypeGatingEnabled: true,
@@ -281,7 +279,7 @@ describe('DatesTab', () => {
         verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
       };
 
-      axiosMock.onGet(datesUrl).reply(200, datesTabData);
+      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' }));
@@ -298,55 +296,4 @@ describe('DatesTab', () => {
       });
     });
   });
-
-  describe('when receiving an access denied error', () => {
-    // These tests could go into any particular tab, as they all go through the same flow. But dates tab works.
-
-    async function renderDenied(errorCode) {
-      setMetadata({
-        course_access: {
-          has_access: false,
-          error_code: errorCode,
-          additional_context_user_message: 'uhoh oh no', // only used by audit_expired
-        },
-      });
-      render(component);
-      await waitForElementToBeRemoved(screen.getByRole('status'));
-    }
-
-    beforeEach(() => {
-      axiosMock.onGet(datesUrl).reply(200, datesTabData);
-      history.push(`/c/${courseId}/dates`); // so tab can pull course id from url
-    });
-
-    it('redirects to course survey for a survey_required error code', async () => {
-      await renderDenied('survey_required');
-      expect(global.location.href).toEqual(`http://localhost/redirect/survey/${courseMetadata.id}`);
-    });
-
-    it('redirects to dashboard for an unfulfilled_milestones error code', async () => {
-      await renderDenied('unfulfilled_milestones');
-      expect(global.location.href).toEqual('http://localhost/redirect/dashboard');
-    });
-
-    it('redirects to the dashboard with an attached access_response_error for an audit_expired error code', async () => {
-      await renderDenied('audit_expired');
-      expect(global.location.href).toEqual('http://localhost/redirect/dashboard?access_response_error=uhoh%20oh%20no');
-    });
-
-    it('redirects to the dashboard with a notlive start date for a course_not_started error code', async () => {
-      await renderDenied('course_not_started');
-      expect(global.location.href).toEqual('http://localhost/redirect/dashboard?notlive=2/5/2013'); // date from factory
-    });
-
-    it('redirects to the home page when unauthenticated', async () => {
-      await renderDenied('authentication_required');
-      expect(global.location.href).toEqual(`http://localhost/redirect/course-home/${courseMetadata.id}`);
-    });
-
-    it('redirects to the home page when unenrolled', async () => {
-      await renderDenied('enrollment_required');
-      expect(global.location.href).toEqual(`http://localhost/redirect/course-home/${courseMetadata.id}`);
-    });
-  });
 });

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

@@ -12,10 +12,10 @@ 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';
+import { useModel } from '../../generic/model-store';
 
 import { getBadgeListAndColor } from './badgelist';
-import { isLearnerAssignment } from '../utils';
+import { isLearnerAssignment } from './utils';
 
 function Day({
   date,
@@ -55,16 +55,18 @@ function Day({
 
       {/* Content */}
       <div className="d-inline-block ml-3 pl-2">
-        <div className="row w-100 m-0 mb-1 align-items-center text-primary-700" data-testid="dates-header">
-          <FormattedDate
-            /** [MM-P2P] Experiment */
-            value={mmp2pOverride ? mmp2p.state.upgradeDeadline : date}
-            day="numeric"
-            month="short"
-            weekday="short"
-            year="numeric"
-            {...timezoneFormatArgs}
-          />
+        <div className="mb-1" data-testid="dates-header">
+          <p className="d-inline text-dark-400">
+            <FormattedDate
+              /** [MM-P2P] Experiment */
+              value={mmp2pOverride ? mmp2p.state.upgradeDeadline : date}
+              day="numeric"
+              month="short"
+              weekday="short"
+              year="numeric"
+              {...timezoneFormatArgs}
+            />
+          </p>
           {badges}
         </div>
         {items.map((item) => {
@@ -80,7 +82,7 @@ function Day({
           const textColor = available ? 'text-primary-700' : 'text-gray-500';
 
           return (
-            <div key={item.title + item.date} className={classNames(textColor, 'small pb-1')} data-testid="dates-item">
+            <div key={item.title + item.date} className={classNames(textColor, 'small')} data-testid="dates-item">
               <div>
                 <span className="small">
                   <span className="font-weight-bold">{item.assignmentType && `${item.assignmentType}: `}{title}</span>

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

@@ -3,10 +3,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
 
-import { useModel } from '../../../generic/model-store';
+import { useModel } from '../../generic/model-store';
 
 import Day from './Day';
-import { daycmp, isLearnerAssignment } from '../utils';
+import { daycmp, isLearnerAssignment } from './utils';
 
 /** [MM-P2P] Experiment (argument) */
 export default function Timeline({ mmp2p }) {
@@ -64,7 +64,7 @@ export default function Timeline({ mmp2p }) {
   }
 
   return (
-    <ul className="list-unstyled m-0 mt-4 pt-2">
+    <ul className="list-unstyled m-0">
       {groupedDates.map((groupedDate) => (
         <Day key={groupedDate.date} {...groupedDate} mmp2p={mmp2p} />
       ))}

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

@@ -2,10 +2,10 @@ import React from 'react';
 import classNames from 'classnames';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faLock } from '@fortawesome/free-solid-svg-icons';
-import { Badge } from '@edx/paragon';
 
-import messages from '../messages';
-import { daycmp, isLearnerAssignment } from '../utils';
+import Badge from './Badge';
+import messages from './messages';
+import { daycmp, isLearnerAssignment } from './utils';
 
 function hasAccess(item) {
   return item.learnerHasAccess;
@@ -38,14 +38,14 @@ function getBadgeListAndColor(date, intl, item, items) {
       message: messages.today,
       shownForDay: isToday,
       bg: 'bg-warning-300',
-      className: 'text-black',
+      className: 'text-gray-900',
     },
     {
       message: messages.completed,
       shownForDay: assignments.length && assignments.every(isComplete),
       shownForItem: x => isLearnerAssignment(x) && isComplete(x),
-      bg: 'bg-light-500',
-      className: 'text-black',
+      bg: 'bg-dark-100',
+      className: 'text-gray-900',
     },
     {
       message: messages.pastDue,
@@ -72,11 +72,12 @@ function getBadgeListAndColor(date, intl, item, items) {
       shownForDay: items.length && items.every(x => !hasAccess(x)),
       shownForItem: x => !hasAccess(x),
       icon: faLock,
-      bg: 'bg-dark-700',
+      bg: 'bg-dark-500',
       className: 'text-white',
     },
   ];
   let color = null; // first color of any badge
+  const marginTopStyle = item ? { marginTop: 0 } : { marginTop: '2px' };
   const badges = (
     <>
       {badgesInfo.map(b => {
@@ -96,7 +97,7 @@ function getBadgeListAndColor(date, intl, item, items) {
           color = b.bg;
         }
         return (
-          <Badge key={b.message.id} className={classNames('ml-2', b.bg, b.className)} data-testid="dates-badge">
+          <Badge key={b.message.id} style={marginTopStyle} className={classNames(b.bg, b.className)}>
             {b.icon && <FontAwesomeIcon icon={b.icon} className="mr-1" />}
             {intl.formatMessage(b.message)}
           </Badge>

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

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useRef, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { sendTrackEvent, sendTrackingLogEvent } from '@edx/frontend-platform/analytics';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
@@ -9,21 +9,20 @@ 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 ShiftDatesAlert from '../suggested-schedule-messaging/ShiftDatesAlert';
 import UpdateGoalSelector from './widgets/UpdateGoalSelector';
-import UpgradeNotification from '../../generic/upgrade-notification/UpgradeNotification';
-import { useAccessExpirationAlertMasquerade } from '../../alerts/access-expiration-alert';
-import UpgradeToShiftDatesAlert from '../suggested-schedule-messaging/UpgradeToShiftDatesAlert';
+import UpgradeCard from './widgets/UpgradeCard';
+import useAccessExpirationAlert from '../../alerts/access-expiration-alert';
 import useCertificateAvailableAlert from './alerts/certificate-status-alert';
 import useCourseEndAlert from './alerts/course-end-alert';
 import useCourseStartAlert from './alerts/course-start-alert';
 import usePrivateCourseAlert from './alerts/private-course-alert';
-import useScheduledContentAlert from './alerts/scheduled-content-alert';
 import { useModel } from '../../generic/model-store';
 import WelcomeMessage from './widgets/WelcomeMessage';
 import ProctoringInfoPanel from './widgets/ProctoringInfoPanel';
@@ -38,7 +37,6 @@ function OutlineTab({ intl }) {
   } = useSelector(state => state.courseHome);
 
   const {
-    isSelfPaced,
     org,
     title,
     username,
@@ -46,6 +44,7 @@ function OutlineTab({ intl }) {
 
   const {
     accessExpiration,
+    canShowUpgradeSock,
     courseBlocks: {
       courses,
       sections,
@@ -59,6 +58,7 @@ function OutlineTab({ intl }) {
       courseDateBlocks,
       userTimezone,
     },
+    hasEnded,
     resumeCourse: {
       hasVisitedCourse,
       url: resumeCourseUrl,
@@ -86,18 +86,17 @@ function OutlineTab({ intl }) {
   };
 
   // Below the course title alerts (appearing in the order listed here)
-  const accessExpirationAlertMasquerade = useAccessExpirationAlertMasquerade(accessExpiration, userTimezone, 'outline-course-alerts');
+  const accessExpirationAlert = useAccessExpirationAlert(accessExpiration, courseId, org, userTimezone, 'outline-course-alerts', 'course_home');
   const courseStartAlert = useCourseStartAlert(courseId);
   const courseEndAlert = useCourseEndAlert(courseId);
   const certificateAvailableAlert = useCertificateAvailableAlert(courseId);
   const privateCourseAlert = usePrivateCourseAlert(courseId);
-  const scheduledContentAlert = useScheduledContentAlert(courseId);
 
   const rootCourseId = courses && Object.keys(courses)[0];
 
-  const hasDeadlines = courseDateBlocks && courseDateBlocks.some(x => x.dateType === 'assignment-due-date');
+  const courseSock = useRef(null);
 
-  const logUpgradeToShiftDatesLinkClick = () => {
+  const logUpgradeLinkClick = () => {
     sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
       ...eventProperties,
       linkCategory: 'personalized_learner_schedules',
@@ -150,19 +149,24 @@ function OutlineTab({ intl }) {
               topic="outline-course-alerts"
               className="mb-3"
               customAlerts={{
-                ...accessExpirationAlertMasquerade,
+                ...accessExpirationAlert,
                 ...certificateAvailableAlert,
                 ...courseEndAlert,
                 ...courseStartAlert,
-                ...scheduledContentAlert,
               }}
             />
             )}
-          {isSelfPaced && hasDeadlines && !MMP2P.state.isEnabled && (
-            <>
-              <ShiftDatesAlert model="outline" fetch={fetchOutlineTab} />
-              <UpgradeToShiftDatesAlert model="outline" logUpgradeLinkClick={logUpgradeToShiftDatesLinkClick} />
-            </>
+          {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
@@ -219,14 +223,12 @@ function OutlineTab({ intl }) {
             { MMP2P.state.isEnabled
               ? <MMP2PFlyover isStatic options={MMP2P} />
               : (
-                <UpgradeNotification
+                <UpgradeCard
                   offer={offer}
                   verifiedMode={verifiedMode}
                   accessExpiration={accessExpiration}
                   contentTypeGatingEnabled={datesBannerInfo.contentTypeGatingEnabled}
-                  upsellPageName="course_home"
                   userTimezone={userTimezone}
-                  shouldDisplayBorder
                   timeOffsetMillis={timeOffsetMillis}
                   courseId={courseId}
                   org={org}
@@ -243,6 +245,16 @@ function OutlineTab({ intl }) {
           </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

@@ -29,7 +29,7 @@ describe('Outline Tab', () => {
   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?is_learning_mfe=true&course_id=${encodeURIComponent(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 });
@@ -156,13 +156,13 @@ describe('Outline Tab', () => {
       await fetchAndRender();
 
       const sequenceLink = screen.getByText('Title of Sequence');
-      expect(sequenceLink.getAttribute('href')).toContain(`/c/${courseId}`);
+      expect(sequenceLink.getAttribute('href')).toContain(`/course/${courseId}`);
     });
   });
 
-  describe('Suggested schedule alerts', () => {
+  describe('Dates Banner', () => {
     beforeEach(() => {
-      setMetadata({ is_enrolled: true, is_self_paced: true });
+      setMetadata({ is_enrolled: true });
       setTabData({
         dates_banner_info: {
           content_type_gating_enabled: true,
@@ -185,15 +185,15 @@ describe('Outline Tab', () => {
       });
     });
 
-    it('renders UpgradeToShiftDatesAlert', async () => {
+    it('renders upgradeToReset', async () => {
       await fetchAndRender();
 
-      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.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 UpgradeToShiftDatesAlert', async () => {
+    it('sends analytics event onClick of upgrade button in banner', async () => {
       await fetchAndRender();
       sendTrackEvent.mockClear();
 
@@ -485,8 +485,8 @@ describe('Outline Tab', () => {
         });
         await fetchAndRender();
 
-        const alert = await screen.findByTestId('private-course-alert');
-        expect(alert).toHaveAttribute('role', 'alert');
+        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();
@@ -495,8 +495,8 @@ describe('Outline Tab', () => {
       it('displays alert for unenrolled user', async () => {
         await fetchAndRender();
 
-        const alert = await screen.findByTestId('private-course-alert');
-        expect(alert).toHaveAttribute('role', 'alert');
+        const alert = await screen.findByText('Welcome to Demonstration Course');
+        expect(alert.parentElement).toHaveAttribute('role', 'alert');
 
         expect(screen.getByRole('button', { name: 'Enroll now' })).toBeInTheDocument();
       });
@@ -531,22 +531,60 @@ describe('Outline Tab', () => {
           },
         });
         await fetchAndRender();
-        const check = await screen.queryByText('This learner does not have access to this course.', { exact: false });
-        expect(check).toBeInTheDocument();
+        await screen.findByText('This learner does not have access to this course.', { exact: false });
       });
 
-      it('does not have special masquerade text', async () => {
+      it('shows expiration', async () => {
         setTabData({
           access_expiration: {
-            expiration_date: '2020-01-01T12:00:00Z',
+            expiration_date: '2080-01-01T12:00:00Z',
             masquerading_expired_course: false,
             upgrade_deadline: null,
             upgrade_url: null,
           },
         });
         await fetchAndRender();
-        const check = await screen.queryByText('This learner does not have access to this course.', { exact: false });
-        expect(check).not.toBeInTheDocument();
+        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',
+        });
       });
     });
 
@@ -659,247 +697,6 @@ describe('Outline Tab', () => {
         await fetchAndRender();
         expect(screen.queryByText('Your grade and certificate will be ready soon!')).toBeInTheDocument();
       });
-      it('renders verification alert', 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({
-          cert_data: {
-            cert_status: CERT_STATUS_TYPE.UNVERIFIED,
-            cert_web_view_url: null,
-            download_url: null,
-          },
-        }, {
-          date_blocks: [
-            {
-              date_type: 'course-end-date',
-              date: yesterday.toISOString(),
-              title: 'End',
-            },
-            {
-              date_type: 'certificate-available-date',
-              date: tomorrow.toISOString(),
-              title: 'Cert Available',
-            },
-            {
-              date_type: 'verification-deadline-date',
-              date: tomorrow.toISOString(),
-              link_text: 'Verify',
-              title: 'Verification Upgrade Deadline',
-            },
-          ],
-        });
-        await fetchAndRender();
-        expect(screen.queryByText('Verify your identity to earn a certificate!')).toBeInTheDocument();
-      });
-      it('renders non passing grade', 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({
-          cert_data: {},
-          user_has_passing_grade: false,
-          has_ended: true,
-          enrollment_mode: 'verified',
-        }, {
-          date_blocks: [
-            {
-              date_type: 'course-end-date',
-              date: yesterday.toISOString(),
-              title: 'End',
-            },
-            {
-              date_type: 'certificate-available-date',
-              date: tomorrow.toISOString(),
-              title: 'Cert Available',
-            },
-            {
-              date_type: 'verification-deadline-date',
-              date: tomorrow.toISOString(),
-              link_text: 'Verify',
-              title: 'Verification Upgrade Deadline',
-            },
-          ],
-        });
-        await fetchAndRender();
-        screen.getAllByText('You are not eligible for a certificate');
-        expect(screen.queryByText('You are not eligible for a certificate')).toBeInTheDocument();
-      });
-      it('tracks request cert button', async () => {
-        sendTrackEvent.mockClear();
-        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({
-          cert_data: {
-            cert_status: CERT_STATUS_TYPE.REQUESTING,
-            cert_web_view_url: null,
-            download_url: null,
-          },
-        }, {
-          date_blocks: [
-            {
-              date_type: 'course-end-date',
-              date: yesterday.toISOString(),
-              title: 'End',
-            },
-            {
-              date_type: 'certificate-available-date',
-              date: tomorrow.toISOString(),
-              title: 'Cert Available',
-            },
-            {
-              date_type: 'verification-deadline-date',
-              date: tomorrow.toISOString(),
-              link_text: 'Verify',
-              title: 'Verification Upgrade Deadline',
-            },
-          ],
-        });
-        await fetchAndRender();
-        sendTrackEvent.mockClear();
-        const requestingButton = screen.getByRole('button', { name: 'Request certificate' });
-        fireEvent.click(requestingButton);
-        expect(sendTrackEvent).toHaveBeenCalledTimes(1);
-        expect(sendTrackEvent).toHaveBeenCalledWith('edx.ui.lms.course_outline.certificate_alert_request_cert_button.clicked',
-          {
-            courserun_key: 'course-v1:edX+Test+run',
-            is_staff: false,
-            org_key: 'edX',
-          });
-      });
-      it('tracks download cert button', async () => {
-        sendTrackEvent.mockClear();
-        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({
-          cert_data: {
-            cert_status: CERT_STATUS_TYPE.DOWNLOADABLE,
-            cert_web_view_url: null,
-            download_url: null,
-          },
-        }, {
-          date_blocks: [
-            {
-              date_type: 'course-end-date',
-              date: yesterday.toISOString(),
-              title: 'End',
-            },
-            {
-              date_type: 'certificate-available-date',
-              date: tomorrow.toISOString(),
-              title: 'Cert Available',
-            },
-            {
-              date_type: 'verification-deadline-date',
-              date: tomorrow.toISOString(),
-              link_text: 'Verify',
-              title: 'Verification Upgrade Deadline',
-            },
-          ],
-        });
-        await fetchAndRender();
-        sendTrackEvent.mockClear();
-        const requestingButton = screen.getByRole('button', { name: 'View my certificate' });
-        fireEvent.click(requestingButton);
-        expect(sendTrackEvent).toHaveBeenCalledTimes(1);
-        expect(sendTrackEvent).toHaveBeenCalledWith('edx.ui.lms.course_outline.certificate_alert_downloadable_button.clicked',
-          {
-            courserun_key: 'course-v1:edX+Test+run',
-            is_staff: false,
-            org_key: 'edX',
-          });
-      });
-      it('tracks unverified cert button', async () => {
-        sendTrackEvent.mockClear();
-        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({
-          cert_data: {
-            cert_status: CERT_STATUS_TYPE.UNVERIFIED,
-            cert_web_view_url: null,
-            download_url: null,
-          },
-        }, {
-          date_blocks: [
-            {
-              date_type: 'course-end-date',
-              date: yesterday.toISOString(),
-              title: 'End',
-            },
-            {
-              date_type: 'certificate-available-date',
-              date: tomorrow.toISOString(),
-              title: 'Cert Available',
-            },
-            {
-              date_type: 'verification-deadline-date',
-              date: tomorrow.toISOString(),
-              link_text: 'Verify',
-              title: 'Verification Upgrade Deadline',
-            },
-          ],
-        });
-        await fetchAndRender();
-        sendTrackEvent.mockClear();
-        const requestingButton = screen.getByRole('link', { name: 'Verify my ID' });
-        fireEvent.click(requestingButton);
-        expect(sendTrackEvent).toHaveBeenCalledTimes(1);
-        expect(sendTrackEvent).toHaveBeenCalledWith('edx.ui.lms.course_outline.certificate_alert_unverified_button.clicked',
-          {
-            courserun_key: 'course-v1:edX+Test+run',
-            is_staff: false,
-            org_key: 'edX',
-          });
-      });
-    });
-
-    describe('Scheduled Content Alert', () => {
-      it('appears correctly', async () => {
-        const now = new Date();
-        const { courseBlocks } = await buildMinimalCourseBlocks(courseId, 'Title', { hasScheduledContent: true });
-        const tomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1);
-        setMetadata({ is_enrolled: true });
-        setTabData({
-          course_blocks: { blocks: courseBlocks.blocks },
-          date_blocks: [
-            {
-              date_type: 'course-end-date',
-              date: tomorrow.toISOString(),
-              title: 'End',
-            },
-          ],
-        });
-        await fetchAndRender();
-        expect(screen.queryByText('More content is coming soon!')).toBeInTheDocument();
-      });
-    });
-    describe('Scheduled Content Alert not present without courseBlocks', () => {
-      it('appears correctly', async () => {
-        const now = new Date();
-        const tomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1);
-        setMetadata({ is_enrolled: true });
-        setTabData({
-          course_blocks: null,
-          date_blocks: [
-            {
-              date_type: 'course-end-date',
-              date: tomorrow.toISOString(),
-              title: 'End',
-            },
-          ],
-        });
-        await fetchAndRender();
-        expect(screen.getByRole('link', { name: 'Start Course' })).toBeInTheDocument();
-        expect(screen.queryByText('More content is coming soon!')).not.toBeInTheDocument();
-      });
     });
   });
 
@@ -929,33 +726,6 @@ describe('Outline Tab', () => {
     });
   });
 
-  describe('Requesting Certificate Alert', () => {
-    it('appears', async () => {
-      const now = new Date();
-      const yesterday = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 1);
-      setMetadata({ is_enrolled: true });
-      setTabData({
-        cert_data: {
-          cert_status: CERT_STATUS_TYPE.REQUESTING,
-          cert_web_view_url: null,
-          certificate_available_date: null,
-          download_url: null,
-        },
-      }, {
-        date_blocks: [
-          {
-            date_type: 'course-end-date',
-            date: yesterday.toISOString(),
-            title: 'End',
-          },
-        ],
-      });
-      await fetchAndRender();
-      expect(screen.queryByText('Congratulations! Your certificate is ready.')).toBeInTheDocument();
-      expect(screen.queryByText('Request certificate')).toBeInTheDocument();
-    });
-  });
-
   describe('Certificate (pdf) Complete Alert', () => {
     it('appears', async () => {
       const now = new Date();

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

@@ -6,6 +6,7 @@ import { faCheckCircle as fasCheckCircle, faMinus, faPlus } from '@fortawesome/f
 import { faCheckCircle as farCheckCircle } from '@fortawesome/free-regular-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
+import EffortEstimate from '../../shared/effort-estimate';
 import SequenceLink from './SequenceLink';
 import { useModel } from '../../generic/model-store';
 
@@ -28,7 +29,6 @@ function Section({
     courseBlocks: {
       sequences,
     },
-    shortLinkFeatureFlag,
   } = useModel('outline', courseId);
 
   const [open, setOpen] = useState(defaultOpen);
@@ -40,28 +40,6 @@ function Section({
   useEffect(() => {
     setOpen(defaultOpen);
   }, []);
-  let sequenceLinks;
-  if (shortLinkFeatureFlag) {
-    sequenceLinks = sequenceIds.map((sequenceId, index) => (
-      <SequenceLink
-        key={sequenceId}
-        id={sequences[sequenceId].hash_key}
-        courseId={courseId}
-        sequence={sequences[sequenceId]}
-        first={index === 0}
-      />
-    ));
-  } else {
-    sequenceLinks = sequenceIds.map((sequenceId, index) => (
-      <SequenceLink
-        key={sequenceId}
-        id={sequenceId}
-        courseId={courseId}
-        sequence={sequences[sequenceId]}
-        first={index === 0}
-      />
-    ));
-  }
 
   const sectionTitle = (
     <div className="row w-100 m-0">
@@ -89,6 +67,7 @@ function Section({
         <span className="sr-only">
           , {intl.formatMessage(complete ? messages.completedSection : messages.incompleteSection)}
         </span>
+        <EffortEstimate className="ml-3 align-middle" block={section} />
       </div>
     </div>
   );
@@ -119,7 +98,15 @@ function Section({
         )}
       >
         <ol className="list-unstyled">
-          {sequenceLinks}
+          {sequenceIds.map((sequenceId, index) => (
+            <SequenceLink
+              key={sequenceId}
+              id={sequenceId}
+              courseId={courseId}
+              sequence={sequences[sequenceId]}
+              first={index === 0}
+            />
+          ))}
         </ol>
       </Collapsible>
     </li>

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

@@ -46,7 +46,7 @@ function SequenceLink({
   // canLoadCourseware is true if the Courseware MFE is enabled, false otherwise
   const coursewareUrl = (
     canLoadCourseware
-      ? <Link to={`/c/${courseId}/${id}`}>{title}</Link>
+      ? <Link to={`/course/${courseId}/${id}`}>{title}</Link>
       : <Hyperlink destination={legacyWebUrl}>{title}</Hyperlink>
   );
   const displayTitle = showLink ? coursewareUrl : title;

src/course-home/outline-tab/alerts/certificate-status-alert/CertificateStatusAlert.jsx

@@ -7,192 +7,85 @@ import {
   intlShape,
 } from '@edx/frontend-platform/i18n';
 import { Alert, Button } from '@edx/paragon';
-import { useDispatch } from 'react-redux';
-
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faCheckCircle, faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
-import { getConfig } from '@edx/frontend-platform';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
-import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
+import { faCheckCircle } from '@fortawesome/free-solid-svg-icons';
 import certMessages from './messages';
 import certStatusMessages from '../../../progress-tab/certificate-status/messages';
-import { requestCert } from '../../../data/thunks';
 
 export const CERT_STATUS_TYPE = {
   EARNED_NOT_AVAILABLE: 'earned_but_not_available',
   DOWNLOADABLE: 'downloadable',
-  REQUESTING: 'requesting',
-  UNVERIFIED: 'unverified',
 };
 
 function CertificateStatusAlert({ intl, payload }) {
-  const dispatch = useDispatch();
   const {
     certificateAvailableDate,
-    certStatus,
+    certStatusType,
     courseEndDate,
-    courseId,
     certURL,
     isWebCert,
     userTimezone,
-    org,
-    notPassingCourseEnded,
-    tabs,
   } = payload;
 
-  // eslint-disable-next-line react/prop-types
-  const AlertWrapper = (props) => props.children(props);
-
-  const sendAlertClickTracking = (id) => {
-    const { administrator } = getAuthenticatedUser();
-    sendTrackEvent(id, {
-      org_key: org,
-      courserun_key: courseId,
-      is_staff: administrator,
-    });
-  };
-
-  const renderCertAwardedStatus = () => {
-    const alertProps = {
-      variant: 'success',
-      icon: faCheckCircle,
-      iconClassName: 'alert-icon text-success-500',
-    };
-    if (certStatus === CERT_STATUS_TYPE.EARNED_NOT_AVAILABLE) {
-      const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
-      const certificateAvailableDateFormatted = <FormattedDate value={certificateAvailableDate} day="numeric" month="long" year="numeric" />;
-      const courseEndDateFormatted = <FormattedDate value={courseEndDate} day="numeric" month="long" year="numeric" />;
-      alertProps.header = intl.formatMessage(certMessages.certStatusEarnedNotAvailableHeader);
-      alertProps.body = (
-        <p>
-          <FormattedMessage
-            id="learning.outline.alert.cert.when"
-            defaultMessage="This course ends on {courseEndDateFormatted}. Final grades and certificates are
-            scheduled to be available after {certificateAvailableDate}."
-            values={{
-              courseEndDateFormatted,
-              certificateAvailableDate: certificateAvailableDateFormatted,
-            }}
-            {...timezoneFormatArgs}
-          />
-        </p>
-      );
-    } else if (certStatus === CERT_STATUS_TYPE.DOWNLOADABLE) {
-      alertProps.header = intl.formatMessage(certMessages.certStatusDownloadableHeader);
-      if (isWebCert) {
-        alertProps.buttonMessage = intl.formatMessage(certStatusMessages.viewableButton);
-      } else {
-        alertProps.buttonMessage = intl.formatMessage(certStatusMessages.downloadableButton);
-      }
-      alertProps.buttonVisible = true;
-      alertProps.buttonLink = certURL;
-      alertProps.buttonAction = () => {
-        sendAlertClickTracking('edx.ui.lms.course_outline.certificate_alert_downloadable_button.clicked');
-      };
-    } else if (certStatus === CERT_STATUS_TYPE.REQUESTING) {
-      alertProps.header = intl.formatMessage(certMessages.certStatusDownloadableHeader);
-      alertProps.buttonMessage = intl.formatMessage(certStatusMessages.requestableButton);
-      alertProps.buttonVisible = true;
-      alertProps.buttonLink = '';
-      alertProps.buttonAction = () => {
-        sendAlertClickTracking('edx.ui.lms.course_outline.certificate_alert_request_cert_button.clicked');
-        dispatch(requestCert(courseId));
-      };
-    }
-    return alertProps;
-  };
-
-  const renderNotIDVerifiedStatus = () => {
-    const alertProps = {
-      variant: 'warning',
-      icon: faExclamationTriangle,
-      iconClassName: 'alert-icon text-warning-500',
-      header: intl.formatMessage(certStatusMessages.unverifiedHomeHeader),
-      buttonMessage: intl.formatMessage(certStatusMessages.unverifiedHomeButton),
-      body: intl.formatMessage(certStatusMessages.unverifiedHomeBody),
-      buttonVisible: true,
-      buttonLink: getConfig().SUPPORT_URL_ID_VERIFICATION,
-      buttonAction: () => {
-        sendAlertClickTracking('edx.ui.lms.course_outline.certificate_alert_unverified_button.clicked');
-      },
-    };
-
-    return alertProps;
-  };
-
-  const renderNotPassingCourseEnded = () => {
-    const progressTab = tabs.find(tab => tab.slug === 'progress');
-    const progressLink = progressTab && progressTab.url;
-
-    const alertProps = {
-      header: intl.formatMessage(certMessages.certStatusNotPassingHeader),
-      buttonMessage: intl.formatMessage(certMessages.certStatusNotPassingButton),
-      body: intl.formatMessage(certStatusMessages.notPassingBody),
-      buttonVisible: true,
-      buttonLink: progressLink,
-      buttonAction: () => {
-        sendAlertClickTracking('edx.ui.lms.course_outline.certificate_alert_view_grades_button.clicked');
-      },
-    };
-
-    return alertProps;
-  };
-
-  let alertProps = {};
-  switch (certStatus) {
-    case CERT_STATUS_TYPE.EARNED_NOT_AVAILABLE:
-    case CERT_STATUS_TYPE.DOWNLOADABLE:
-    case CERT_STATUS_TYPE.REQUESTING:
-      alertProps = renderCertAwardedStatus();
-      break;
-    case CERT_STATUS_TYPE.UNVERIFIED:
-      alertProps = renderNotIDVerifiedStatus();
-      break;
-    default:
-      if (notPassingCourseEnded) {
-        alertProps = renderNotPassingCourseEnded();
-      }
-      break;
+  let variant = '';
+  if (certStatusType === CERT_STATUS_TYPE.EARNED_NOT_AVAILABLE || certStatusType === CERT_STATUS_TYPE.DOWNLOADABLE) {
+    variant = 'success';
   }
 
-  return (
-    <AlertWrapper {...alertProps}>
-      {({
-        variant,
-        buttonVisible,
-        iconClassName,
-        icon,
-        header,
-        body,
-        buttonAction,
-        buttonLink,
-        buttonMessage,
-      }) => (
-        <Alert variant={variant}>
-          <div className="d-flex flex-column flex-lg-row justify-content-between align-items-center">
-            <div className={buttonVisible ? 'col-lg-8' : 'col-auto'}>
-              <FontAwesomeIcon icon={icon} className={iconClassName} />
-              <Alert.Heading>{header}</Alert.Heading>
-              {body}
-            </div>
-            {buttonVisible && (
-              <div className="flex-grow-0 pt-3 pt-lg-0">
-                <Button
-                  variant="primary"
-                  href={buttonLink}
-                  onClick={() => {
-                    if (buttonAction) { buttonAction(); }
-                  }}
-                >
-                  {buttonMessage}
-                </Button>
-              </div>
-            )}
-          </div>
-        </Alert>
+  let header = '';
+  let body = '';
+  let buttonVisible = false;
+  let buttonMessage = '';
 
-      )}
-    </AlertWrapper>
+  if (certStatusType === CERT_STATUS_TYPE.EARNED_NOT_AVAILABLE) {
+    const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
+    const certificateAvailableDateFormatted = <FormattedDate value={certificateAvailableDate} day="numeric" month="long" year="numeric" />;
+    const courseEndDateFormatted = <FormattedDate value={courseEndDate} day="numeric" month="long" year="numeric" />;
+
+    header = intl.formatMessage(certMessages.certStatusEarnedNotAvailableHeader);
+    body = (
+      <p>
+        <FormattedMessage
+          id="learning.outline.alert.cert.when"
+          defaultMessage="This course ended on {courseEndDateFormatted}. Final grades and certificates are
+          scheduled to be available after {certificateAvailableDate}."
+          values={{
+            courseEndDateFormatted,
+            certificateAvailableDate: certificateAvailableDateFormatted,
+          }}
+          {...timezoneFormatArgs}
+        />
+      </p>
+    );
+  } else if (certStatusType === CERT_STATUS_TYPE.DOWNLOADABLE) {
+    header = intl.formatMessage(certMessages.certStatusDownloadableHeader);
+    if (isWebCert) {
+      buttonMessage = intl.formatMessage(certStatusMessages.viewableButton);
+    } else {
+      buttonMessage = intl.formatMessage(certStatusMessages.downloadableButton);
+    }
+    buttonVisible = true;
+  }
+  return (
+    <Alert variant={variant}>
+      <div className="row justify-content-between align-items-center">
+        <div className={buttonVisible ? '' : 'col-auto'}>
+          <FontAwesomeIcon icon={faCheckCircle} className="alert-icon text-success-500" />
+          <Alert.Heading>{header}</Alert.Heading>
+          {body}
+        </div>
+        {buttonVisible && (
+          <div className="m-auto m-lg-0 pr-lg-3">
+            <Button
+              variant="primary"
+              href={certURL}
+            >
+              {buttonMessage}
+            </Button>
+          </div>
+        )}
+      </div>
+    </Alert>
   );
 }
 
@@ -200,19 +93,11 @@ CertificateStatusAlert.propTypes = {
   intl: intlShape.isRequired,
   payload: PropTypes.shape({
     certificateAvailableDate: PropTypes.string,
-    certStatus: PropTypes.string,
+    certStatusType: PropTypes.string,
     courseEndDate: PropTypes.string,
-    courseId: PropTypes.string,
     certURL: PropTypes.string,
     isWebCert: PropTypes.bool,
     userTimezone: PropTypes.string,
-    org: PropTypes.string,
-    notPassingCourseEnded: PropTypes.bool,
-    tabs: PropTypes.arrayOf(PropTypes.shape({
-      tab_id: PropTypes.string,
-      title: PropTypes.string,
-      url: PropTypes.string,
-    })),
   }).isRequired,
 };
 

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

@@ -3,48 +3,32 @@ import React, { useMemo } from 'react';
 import { getConfig } from '@edx/frontend-platform';
 import { useAlert } from '../../../../generic/user-messages';
 import { useModel } from '../../../../generic/model-store';
-
 import { CERT_STATUS_TYPE } from './CertificateStatusAlert';
 
 const CertificateStatusAlert = React.lazy(() => import('./CertificateStatusAlert'));
 
 function verifyCertStatusType(status) {
-  switch (status) {
-    case CERT_STATUS_TYPE.DOWNLOADABLE:
-    case CERT_STATUS_TYPE.EARNED_NOT_AVAILABLE:
-    case CERT_STATUS_TYPE.REQUESTING:
-    case CERT_STATUS_TYPE.UNVERIFIED:
-      return true;
-    default:
-      return false;
+  // This method will only return cert statuses when we want to alert on them.
+  // It should be modified when we want to alert on a new status type.
+  if (status === CERT_STATUS_TYPE.DOWNLOADABLE) {
+    return CERT_STATUS_TYPE.DOWNLOADABLE;
   }
+  if (status === CERT_STATUS_TYPE.EARNED_NOT_AVAILABLE) {
+    return CERT_STATUS_TYPE.EARNED_NOT_AVAILABLE;
+  }
+  return '';
 }
 
 function useCertificateStatusAlert(courseId) {
-  const VERIFIED_MODES = {
-    PROFESSIONAL: 'professional',
-    VERIFIED: 'verified',
-    NO_ID_PROFESSIONAL_MODE: 'no-id-professional',
-    CREDIT_MODE: 'credit',
-    MASTERS: 'masters',
-    EXECUTIVE_EDUCATION: 'executive-education',
-  };
-
   const {
     isEnrolled,
-    org,
-    tabs,
   } = useModel('courseHomeMeta', courseId);
-
   const {
     datesWidget: {
       courseDateBlocks,
       userTimezone,
     },
     certData,
-    hasEnded,
-    userHasPassingGrade,
-    enrollmentMode,
   } = useModel('outline', courseId);
 
   const {
@@ -53,13 +37,12 @@ function useCertificateStatusAlert(courseId) {
     certificateAvailableDate,
     downloadUrl,
   } = certData || {};
+
   const endBlock = courseDateBlocks.find(b => b.dateType === 'course-end-date');
+
+  const certStatusType = verifyCertStatusType(certStatus);
   const isWebCert = downloadUrl === null;
-  const isVerifiedEnrollmentMode = (
-    enrollmentMode !== null
-    && enrollmentMode !== undefined
-    && !!Object.values(VERIFIED_MODES).find(mode => mode === enrollmentMode)
-  );
+
   let certURL = '';
   if (certWebViewUrl) {
     certURL = `${getConfig().LMS_BASE_URL}${certWebViewUrl}`;
@@ -67,33 +50,20 @@ function useCertificateStatusAlert(courseId) {
     // PDF Certificate
     certURL = downloadUrl;
   }
-  const hasAlertingCertStatus = verifyCertStatusType(certStatus);
+  const hasCertStatus = certStatusType !== '';
 
-  // Only show if:
-  // - there is a known cert status that we want provide status on.
-  // - Or the course has ended and the learner does not have a passing grade.
-  const isVisible = isEnrolled && hasAlertingCertStatus;
-  const notPassingCourseEnded = (
-    isEnrolled
-    && isVerifiedEnrollmentMode
-    && !hasAlertingCertStatus
-    && hasEnded
-    && !userHasPassingGrade
-  );
+  // Only show if there is a known cert status that we want provide status on.
+  const isVisible = isEnrolled && hasCertStatus;
   const payload = {
     certificateAvailableDate,
     certURL,
-    certStatus,
-    courseId,
+    certStatusType,
     courseEndDate: endBlock && endBlock.date,
     userTimezone,
     isWebCert,
-    org,
-    notPassingCourseEnded,
-    tabs,
   };
 
-  useAlert(isVisible || notPassingCourseEnded, {
+  useAlert(isVisible, {
     code: 'clientCertificateStatusAlert',
     payload: useMemo(() => payload, Object.values(payload).sort()),
     topic: 'outline-course-alerts',

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

@@ -11,14 +11,6 @@ const messages = defineMessages({
     defaultMessage: 'Congratulations! Your certificate is ready.',
     description: 'Header alerting the user that their certificate is ready.',
   },
-  certStatusNotPassingHeader: {
-    id: 'cert.alert.notPassing.header',
-    defaultMessage: 'You are not eligible for a certificate',
-  },
-  certStatusNotPassingButton: {
-    id: 'cert.alert.notPassing.button',
-    defaultMessage: 'View grades',
-  },
 });
 
 export default messages;

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

@@ -6,8 +6,8 @@ import {
   FormattedRelative,
   FormattedTime,
 } from '@edx/frontend-platform/i18n';
-import { Alert } from '@edx/paragon';
-import { Info } from '@edx/paragon/icons';
+
+import { Alert, ALERT_TYPES } from '../../../../generic/user-messages';
 
 const DAY_MS = 24 * 60 * 60 * 1000; // in ms
 
@@ -78,7 +78,7 @@ function CourseEndAlert({ payload }) {
   }
 
   return (
-    <Alert variant="info" icon={Info}>
+    <Alert type={ALERT_TYPES.INFO}>
       <strong>{msg}</strong><br />
       {description}
     </Alert>

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

@@ -6,8 +6,8 @@ import {
   FormattedRelative,
   FormattedTime,
 } from '@edx/frontend-platform/i18n';
-import { Alert } from '@edx/paragon';
-import { Info } from '@edx/paragon/icons';
+
+import { Alert, ALERT_TYPES } from '../../../../generic/user-messages';
 
 const DAY_MS = 24 * 60 * 60 * 1000; // in ms
 
@@ -30,7 +30,7 @@ function CourseStartAlert({ payload }) {
   const delta = new Date(startDate) - new Date();
   if (delta < DAY_MS) {
     return (
-      <Alert variant="info" icon={Info}>
+      <Alert type={ALERT_TYPES.INFO}>
         <FormattedMessage
           id="learning.outline.alert.start.short"
           defaultMessage="Course starts {timeRemaining} at {courseStartTime}."
@@ -55,7 +55,7 @@ function CourseStartAlert({ payload }) {
   }
 
   return (
-    <Alert variant="info" icon={Info}>
+    <Alert type={ALERT_TYPES.INFO}>
       <strong>
         <FormattedMessage
           id="learning.outline.alert.end.long"

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

@@ -3,15 +3,15 @@ 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 { Alert, Button, Hyperlink } from '@edx/paragon';
+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 messages from './messages';
 import outlineMessages from '../../messages';
-import useEnrollClickHandler from '../../../../alerts/enrollment-alert/clickHook';
+import { useEnrollClickHandler } from '../../../../alerts/enrollment-alert/hooks';
 import { useModel } from '../../../../generic/model-store';
 
 function PrivateCourseAlert({ intl, payload }) {
@@ -32,13 +32,12 @@ function PrivateCourseAlert({ intl, payload }) {
     intl.formatMessage(enrollmentMessages.success),
   );
 
-  const enrollNowButton = (
+  const enrollNow = (
     <Button
       disabled={loading}
       variant="link"
-      className="p-0 border-0 align-top mr-1"
+      className="p-0 border-0 align-top"
       style={{ textDecoration: 'underline' }}
-      size="sm"
       onClick={enrollClickHandler}
     >
       {intl.formatMessage(enrollmentMessages.enrollNowInline)}
@@ -64,7 +63,7 @@ function PrivateCourseAlert({ intl, payload }) {
   );
 
   return (
-    <Alert variant="light" data-testid="private-course-alert">
+    <Alert type="welcome">
       {anonymousUser && (
         <>
           <p className="font-weight-bold">
@@ -85,11 +84,15 @@ function PrivateCourseAlert({ intl, payload }) {
         <>
           <p className="font-weight-bold">{intl.formatMessage(outlineMessages.welcomeTo)} {title}</p>
           {canEnroll && (
-            <div className="d-flex">
-              {enrollNowButton}
-              {intl.formatMessage(messages.toAccess)}
+            <>
+              <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 />}
-            </div>
+            </>
           )}
           {!canEnroll && (
             <>

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

@@ -1,11 +1,10 @@
 import { defineMessages } from '@edx/frontend-platform/i18n';
 
 const messages = defineMessages({
-  toAccess: {
+  enroll: {
     id: 'alert.enroll',
-    defaultMessage: ' to access the full course.',
-    description: 'Text instructing the learner to enroll in the course in order to see course content. The full string'
-      + 'would say "Enroll now to access the full course", where "Enroll now" is a button.',
+    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.',
   },
 });
 

src/course-home/outline-tab/alerts/scheduled-content-alert/ScheduledCotentAlert.jsx

@@ -1,49 +0,0 @@
-import { FormattedMessage } from '@edx/frontend-platform/i18n';
-import { Alert, Button } from '@edx/paragon';
-import React from 'react';
-import PropTypes from 'prop-types';
-
-function ScheduledContentAlert({ payload }) {
-  const {
-    datesTabLink,
-  } = payload;
-
-  return (
-    <Alert variant="info">
-      <div className="d-flex flex-column flex-lg-row justify-content-between align-items-center">
-        <div className="col-lg-7">
-          <Alert.Heading>
-            <FormattedMessage
-              id="learning.outline.alert.scheduled-content.heading"
-              defaultMessage="More content is coming soon!"
-            />
-          </Alert.Heading>
-          <FormattedMessage
-            id="learning.outline.alert.scheduled-content.body"
-            defaultMessage="This course will have more content released at a future date. Look out for email updates or check back on this course for updates."
-          />
-        </div>
-        <div className="flex-grow-0 pt-3 pt-lg-0">
-          {datesTabLink && (
-            <Button
-              href={datesTabLink}
-            >
-              <FormattedMessage
-                id="learning.outline.alert.scheduled-content.button"
-                defaultMessage="View Course Schedule"
-              />
-            </Button>
-          )}
-        </div>
-      </div>
-    </Alert>
-  );
-}
-
-ScheduledContentAlert.propTypes = {
-  payload: PropTypes.shape({
-    datesTabLink: PropTypes.string,
-  }).isRequired,
-};
-
-export default ScheduledContentAlert;

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

@@ -1,35 +0,0 @@
-import React, { useMemo } from 'react';
-
-import { useAlert } from '../../../../generic/user-messages';
-import { useModel } from '../../../../generic/model-store';
-
-const ScheduledContentAlert = React.lazy(() => import('./ScheduledCotentAlert'));
-
-const useScheduledContentAlert = (courseId) => {
-  const {
-    courseBlocks: {
-      courses,
-    },
-    datesWidget: {
-      datesTabLink,
-    },
-  } = useModel('outline', courseId);
-
-  const hasScheduledContent = (
-    !!courses
-    && !!Object.values(courses).find(course => course.hasScheduledContent === true)
-  );
-  const { isEnrolled } = useModel('courseHomeMeta', courseId);
-  const payload = {
-    datesTabLink,
-  };
-  useAlert(hasScheduledContent && isEnrolled, {
-    code: 'ScheduledContentAlert',
-    payload: useMemo(() => payload, Object.values(payload).sort()),
-    topic: 'outline-course-alerts',
-  });
-
-  return { ScheduledContentAlert };
-};
-
-export default useScheduledContentAlert;

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

@@ -2,6 +2,7 @@ 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';
 
@@ -130,7 +131,7 @@ function ProctoringInfoPanel({ courseId, username, intl }) {
             {isNotYetSubmitted(status) && (
               <>
                 {!isNotYetReleased(releaseDate) && (
-                  <Button variant="primary" block href={link}>
+                  <Button variant="primary" block href={`${getConfig().LMS_BASE_URL}${link}`}>
                     {readableStatus === readableStatuses.otherCourseApproved && (
                       <>
                         {intl.formatMessage(messages.proctoringOnboardingPracticeButton)}

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

@@ -1,6 +1,5 @@
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
-import classNames from 'classnames';
 import { faCheck } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
@@ -8,32 +7,32 @@ import { sendTrackEvent, sendTrackingLogEvent } from '@edx/frontend-platform/ana
 import { FormattedDate, FormattedMessage, injectIntl } from '@edx/frontend-platform/i18n';
 import { getConfig } from '@edx/frontend-platform';
 
-import { UpgradeButton } from '../upgrade-button';
+import { UpgradeButton } from '../../../generic/upgrade-button';
 
 function UpsellNoFBECardContent() {
   const verifiedCertLink = (
     <a className="inline-link-underline font-weight-bold" rel="noopener noreferrer" target="_blank" href={`${getConfig().MARKETING_SITE_BASE_URL}/verified-certificate`}>
       <FormattedMessage
-        id="learning.generic.upgradeNotification.verifiedCertLink"
+        id="learning.outline.widgets.upgradeCard.verifiedCertLink"
         defaultMessage="verified certificate"
       />
     </a>
   );
 
   return (
-    <ul className="fa-ul upgrade-notification-ul pt-0">
+    <ul className="fa-ul upgrade-card-ul pt-0">
       <li>
-        <span className="fa-li upgrade-notification-li"><FontAwesomeIcon icon={faCheck} /></span>
+        <span className="fa-li upgrade-card-li"><FontAwesomeIcon icon={faCheck} /></span>
         <FormattedMessage
-          id="learning.generic.upgradeNotification.verifiedCertMessage"
+          id="learning.outline.widgets.upgradeCard.verifiedCertMessage"
           defaultMessage="Earn a {verifiedCertLink} of completion to showcase on your resume"
           values={{ verifiedCertLink }}
         />
       </li>
       <li>
-        <span className="fa-li upgrade-notification-li"><FontAwesomeIcon icon={faCheck} /></span>
+        <span className="fa-li upgrade-card-li"><FontAwesomeIcon icon={faCheck} /></span>
         <FormattedMessage
-          id="learning.generic.upgradeNotification.noFBE.nonProfitMission"
+          id="learning.outline.widgets.upgradeCard.nonProfitMission"
           defaultMessage="Support our {nonProfitMission} at edX"
           values={{
             nonProfitMission: (
@@ -50,7 +49,7 @@ function UpsellFBEFarAwayCardContent() {
   const verifiedCertLink = (
     <a className="inline-link-underline font-weight-bold" rel="noopener noreferrer" target="_blank" href={`${getConfig().MARKETING_SITE_BASE_URL}/verified-certificate`}>
       <FormattedMessage
-        id="learning.generic.upgradeNotification.verifiedCertLink"
+        id="learning.outline.widgets.upgradeCard.verifiedCertLink"
         defaultMessage="verified certificate"
       />
     </a>
@@ -59,7 +58,7 @@ function UpsellFBEFarAwayCardContent() {
   const gradedAssignments = (
     <span className="font-weight-bold">
       <FormattedMessage
-        id="learning.generic.upgradeNotification.gradedAssignments"
+        id="learning.outline.widgets.upgradeCard.gradedAssignments"
         defaultMessage="graded assignments"
       />
     </span>
@@ -68,7 +67,7 @@ function UpsellFBEFarAwayCardContent() {
   const fullAccess = (
     <span className="font-weight-bold">
       <FormattedMessage
-        id="learning.generic.upgradeNotification.verifiedCertLink.fullAccess"
+        id="learning.upgradeCard.verifiedCertLink"
         defaultMessage="Full access"
       />
     </span>
@@ -77,42 +76,42 @@ function UpsellFBEFarAwayCardContent() {
   const nonProfitMission = (
     <span className="font-weight-bold">
       <FormattedMessage
-        id="learning.generic.upgradeNotification.FBE.nonProfitMission"
+        id="learning.upgradeCard.nonProfitMission"
         defaultMessage="non-profit mission"
       />
     </span>
   );
 
   return (
-    <ul className="fa-ul upgrade-notification-ul">
+    <ul className="fa-ul upgrade-card-ul">
       <li>
-        <span className="fa-li upgrade-notification-li"><FontAwesomeIcon icon={faCheck} /></span>
+        <span className="fa-li upgrade-card-li"><FontAwesomeIcon icon={faCheck} /></span>
         <FormattedMessage
-          id="learning.generic.upgradeNotification.verifiedCertMessage"
+          id="learning.outline.widgets.upgradeCard.verifiedCertMessage"
           defaultMessage="Earn a {verifiedCertLink} of completion to showcase on your resume"
           values={{ verifiedCertLink }}
         />
       </li>
       <li>
-        <span className="fa-li upgrade-notification-li"><FontAwesomeIcon icon={faCheck} /></span>
+        <span className="fa-li upgrade-card-li"><FontAwesomeIcon icon={faCheck} /></span>
         <FormattedMessage
-          id="learning.generic.upgradeNotification.unlockGraded"
+          id="learning.outline.widgets.upgradeCard.unlockGraded"
           defaultMessage="Unlock your access to all course activities, including {gradedAssignments}"
           values={{ gradedAssignments }}
         />
       </li>
       <li>
-        <span className="fa-li upgrade-notification-li"><FontAwesomeIcon icon={faCheck} /></span>
+        <span className="fa-li upgrade-card-li"><FontAwesomeIcon icon={faCheck} /></span>
         <FormattedMessage
-          id="learning.generic.upgradeNotification.fullAccess"
+          id="learning.outline.widgets.upgradeCard.fullAccess"
           defaultMessage="{fullAccess} to course content and materials, even after the course ends"
           values={{ fullAccess }}
         />
       </li>
       <li>
-        <span className="fa-li upgrade-notification-li"><FontAwesomeIcon icon={faCheck} /></span>
+        <span className="fa-li upgrade-card-li"><FontAwesomeIcon icon={faCheck} /></span>
         <FormattedMessage
-          id="learning.generic.upgradeNotification.nonProfitMission"
+          id="learning.outline.widgets.upgradeCard.nonProfitMission"
           defaultMessage="Support our {nonProfitMission} at edX"
           values={{ nonProfitMission }}
         />
@@ -125,7 +124,7 @@ function UpsellFBESoonCardContent({ accessExpirationDate, timezoneFormatArgs })
   const includingAnyProgress = (
     <span className="font-weight-bold">
       <FormattedMessage
-        id="learning.generic.upgradeNotification.expirationAccessLoss.progress"
+        id="learning.upgradeCard.expirationAccessLoss.progress"
         defaultMessage="including any progress"
       />
     </span>
@@ -144,17 +143,17 @@ function UpsellFBESoonCardContent({ accessExpirationDate, timezoneFormatArgs })
   const benefitsOfUpgrading = (
     <a className="inline-link-underline font-weight-bold" rel="noopener noreferrer" target="_blank" href="https://support.edx.org/hc/en-us/articles/360013426573-What-are-the-differences-between-audit-free-and-verified-paid-courses-">
       <FormattedMessage
-        id="learning.generic.upgradeNotification.expirationVerifiedCert.benefits"
+        id="learning.outline.widgets.upgradeCard.expirationVerifiedCert.benefits"
         defaultMessage="benefits of upgrading"
       />
     </a>
   );
 
   return (
-    <div className="upgrade-notification-text">
+    <div className="upgrade-card-text">
       <p>
         <FormattedMessage
-          id="learning.generic.upgradeNotification.expirationAccessLoss"
+          id="learning.outline.widgets.upgradeCard.expirationAccessLoss"
           defaultMessage="You will lose all access to this course, {includingAnyProgress}, on {date}."
           values={{
             includingAnyProgress,
@@ -164,7 +163,7 @@ function UpsellFBESoonCardContent({ accessExpirationDate, timezoneFormatArgs })
       </p>
       <p>
         <FormattedMessage
-          id="learning.generic.upgradeNotification.expirationVerifiedCert"
+          id="learning.outline.widgets.upgradeCard.expirationVerifiedCert"
           defaultMessage="Upgrading your course enables you to pursue a verified certificate and unlocks numerous features. Learn more about the {benefitsOfUpgrading}."
           values={{ benefitsOfUpgrading }}
         />
@@ -190,7 +189,7 @@ function ExpirationCountdown({ hoursToExpiration }) {
   if (hoursToExpiration >= 24) {
     expirationText = (
       <FormattedMessage
-        id="learning.generic.upgradeNotification.expirationDays"
+        id="learning.outline.widgets.upgradeCard.expirationDays"
         defaultMessage={`{dayCount, number} {dayCount, plural, 
           one {day}
           other {days}} left`}
@@ -202,7 +201,7 @@ function ExpirationCountdown({ hoursToExpiration }) {
   } else if (hoursToExpiration >= 1) {
     expirationText = (
       <FormattedMessage
-        id="learning.generic.upgradeNotification.expirationHours"
+        id="learning.outline.widgets.upgradeCard.expirationHours"
         defaultMessage={`{hourCount, number} {hourCount, plural,
           one {hour}
           other {hours}} left`}
@@ -214,7 +213,7 @@ function ExpirationCountdown({ hoursToExpiration }) {
   } else {
     expirationText = (
       <FormattedMessage
-        id="learning.generic.upgradeNotification.expirationMinutes"
+        id="learning.outline.widgets.upgradeCard.expirationMinutes"
         defaultMessage="Less than 1 hour left"
       />
     );
@@ -230,7 +229,7 @@ function AccessExpirationDateBanner({ accessExpirationDate, timezoneFormatArgs }
   return (
     <div className="upsell-warning-light">
       <FormattedMessage
-        id="learning.generic.upgradeNotification.expiration"
+        id="learning.outline.widgets.upgradeCard.expiration"
         defaultMessage="Course access will expire {date}"
         values={{
           date: (
@@ -259,15 +258,13 @@ AccessExpirationDateBanner.defaultProps = {
   timezoneFormatArgs: {},
 };
 
-function UpgradeNotification({
+function UpgradeCard({
   accessExpiration,
   contentTypeGatingEnabled,
   courseId,
   offer,
   org,
-  shouldDisplayBorder,
   timeOffsetMillis,
-  upsellPageName,
   userTimezone,
   verifiedMode,
 }) {
@@ -306,20 +303,20 @@ function UpgradeNotification({
     sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
       ...eventProperties,
       linkCategory: 'green_upgrade',
-      linkName: `${upsellPageName}_green`,
+      linkName: 'course_home_green',
       linkType: 'button',
-      pageName: upsellPageName,
+      pageName: 'course_home',
     });
   };
 
   /*
   There are 4 parts that change in the upgrade card:
-    upgradeNotificationHeaderText
+    upgradeCardHeaderText
     expirationBanner
     upsellMessage
     offerCode
   */
-  let upgradeNotificationHeaderText;
+  let upgradeCardHeaderText;
   let expirationBanner;
   let upsellMessage;
   let offerCode;
@@ -328,12 +325,26 @@ function UpgradeNotification({
     const accessExpirationDate = new Date(accessExpiration.expirationDate);
     const hoursToAccessExpiration = Math.floor((accessExpirationDate - correctedTime) / 1000 / 60 / 60);
 
+    if (offer) { // if there's a first purchase discount, message the code at the bottom
+      offerCode = (
+        <div className="text-center discount-info">
+          <FormattedMessage
+            id="learning.outline.widgets.upgradeCard.code"
+            defaultMessage="Use code {code} at checkout"
+            values={{
+              code: (<span className="font-weight-bold">{offer.code}</span>),
+            }}
+          />
+        </div>
+      );
+    }
+
     if (hoursToAccessExpiration >= (7 * 24)) {
       if (offer) { // countdown to the first purchase discount if there is one
         const hoursToDiscountExpiration = Math.floor((new Date(offer.expirationDate) - correctedTime) / 1000 / 60 / 60);
-        upgradeNotificationHeaderText = (
+        upgradeCardHeaderText = (
           <FormattedMessage
-            id="learning.generic.upgradeNotification.firstTimeLearnerDiscount"
+            id="learning.outline.widgets.upgradeCard.firstTimeLearnerDiscount"
             defaultMessage="{percentage}% First-Time Learner Discount"
             values={{
               percentage: (offer.percentage),
@@ -342,9 +353,9 @@ function UpgradeNotification({
         );
         expirationBanner = <ExpirationCountdown hoursToExpiration={hoursToDiscountExpiration} />;
       } else {
-        upgradeNotificationHeaderText = (
+        upgradeCardHeaderText = (
           <FormattedMessage
-            id="learning.generic.upgradeNotification.accessExpiration"
+            id="learning.outline.widgets.upgradeCard.accessExpiration"
             defaultMessage="Upgrade your course today"
           />
         );
@@ -357,9 +368,9 @@ function UpgradeNotification({
       }
       upsellMessage = <UpsellFBEFarAwayCardContent />;
     } else { // more urgent messaging if there's less than 7 days left to access expiration
-      upgradeNotificationHeaderText = (
+      upgradeCardHeaderText = (
         <FormattedMessage
-          id="learning.generic.upgradeNotification.accessExpirationUrgent"
+          id="learning.outline.widgets.upgradeCard.accessExpirationUrgent"
           defaultMessage="Course Access Expiration"
         />
       );
@@ -372,51 +383,36 @@ function UpgradeNotification({
       );
     }
   } else { // FBE is turned off
-    upgradeNotificationHeaderText = (
+    upgradeCardHeaderText = (
       <FormattedMessage
-        id="learning.generic.upgradeNotification.pursueAverifiedCertificate"
+        id="learning.outline.widgets.upgradeCard.pursueAverifiedCertificate"
         defaultMessage="Pursue a verified certificate"
       />
     );
     upsellMessage = (<UpsellNoFBECardContent />);
   }
 
-  if (offer) { // if there's a first purchase discount, message the code at the bottom
-    offerCode = (
-      <div className="text-center discount-info">
-        <FormattedMessage
-          id="learning.generic.upgradeNotification.code"
-          defaultMessage="Use code {code} at checkout"
-          values={{
-            code: (<span className="font-weight-bold">{offer.code}</span>),
-          }}
-        />
-      </div>
-    );
-  }
-
   return (
-    <section className={classNames('upgrade-notification small', { 'card mb-4': shouldDisplayBorder })}>
-      <h2 className="h5 upgrade-notification-header" id="outline-sidebar-upgrade-header">
-        {upgradeNotificationHeaderText}
+    <section className="mb-4 card upgrade-card small">
+      <h2 className="h5 upgrade-card-header" id="outline-sidebar-upgrade-header">
+        {upgradeCardHeaderText}
       </h2>
       {expirationBanner}
-      <div className="upgrade-notification-message">
+      <div className="upgrade-card-message">
         {upsellMessage}
       </div>
       <UpgradeButton
         offer={offer}
         onClick={logClick}
         verifiedMode={verifiedMode}
-        className="upgrade-notification-button"
-        block
+        className="upgrade-card-button"
       />
       {offerCode}
     </section>
   );
 }
 
-UpgradeNotification.propTypes = {
+UpgradeCard.propTypes = {
   courseId: PropTypes.string.isRequired,
   org: PropTypes.string.isRequired,
   accessExpiration: PropTypes.shape({
@@ -428,9 +424,7 @@ UpgradeNotification.propTypes = {
     percentage: PropTypes.number,
     code: PropTypes.string,
   }),
-  shouldDisplayBorder: PropTypes.bool,
   timeOffsetMillis: PropTypes.number,
-  upsellPageName: PropTypes.string.isRequired,
   userTimezone: PropTypes.string,
   verifiedMode: PropTypes.shape({
     currencySymbol: PropTypes.string.isRequired,
@@ -439,14 +433,13 @@ UpgradeNotification.propTypes = {
   }),
 };
 
-UpgradeNotification.defaultProps = {
+UpgradeCard.defaultProps = {
   accessExpiration: null,
   contentTypeGatingEnabled: false,
   offer: null,
-  shouldDisplayBorder: null,
   timeOffsetMillis: 0,
   userTimezone: null,
   verifiedMode: null,
 };
 
-export default injectIntl(UpgradeNotification);
+export default injectIntl(UpgradeCard);

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

@@ -0,0 +1,59 @@
+.upgrade-card {
+  border-radius: 0 !important;
+}
+
+.upgrade-card-header{
+  margin: 1.25rem;
+}
+
+.upsell-warning{
+  background-color: $danger-100;
+}
+
+.upsell-warning-light{
+  background-color: $warning-100;
+}
+
+.upsell-warning, .upsell-warning-light{
+  padding-left: 1.25rem;
+  padding-right: 1.25rem;
+  padding-top: 0.5rem;
+  padding-bottom: 0.5rem;
+}
+
+.upgrade-card-ul{
+  margin-left: 3rem;
+  padding-top: 0.875rem;
+  padding-right: 1.25rem;
+}
+
+.upgrade-card-li{
+  left: -2.125rem;
+  top: 0 !important;
+}
+
+.upgrade-card-text{
+  padding-top: 0.875rem;
+  padding-right: 1.25rem;
+  padding-left: 1.25rem;
+}
+
+.upgrade-card-button{
+  margin-left: 1.25rem;
+  margin-right: 1.25rem;
+  margin-bottom: 1.25rem;
+}
+
+.discount-info {
+  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  padding-top: .75rem;
+  padding-bottom: .75rem;
+}
+
+.inline-link-underline {
+  text-decoration: underline;
+}
+
+.upgrade-card .upgrade-card-message a{
+  color: $primary-500;
+}

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

@@ -1,15 +1,8 @@
 import React from 'react';
 import { Factory } from 'rosie';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 
-import {
-  fireEvent,
-  initializeMockApp,
-  render,
-  screen,
-  waitFor,
-} from '../../setupTest';
-import UpgradeNotification from './UpgradeNotification';
+import { initializeMockApp, render, screen } from '../../../setupTest';
+import UpgradeCard from './UpgradeCard';
 
 initializeMockApp();
 jest.mock('@edx/frontend-platform/analytics');
@@ -18,30 +11,12 @@ jest
   .spyOn(global.Date, 'now')
   .mockImplementation(() => dateNow.valueOf());
 
-describe('Upgrade Notification', () => {
+describe('Upgrade Card', () => {
   function buildAndRender(attributes) {
-    const upgradeNotificationData = Factory.build('upgradeNotificationData', { ...attributes });
-    render(<UpgradeNotification {...upgradeNotificationData} />);
+    const upgradeCardData = Factory.build('upgradeCardData', { ...attributes });
+    render(<UpgradeCard {...upgradeCardData} />);
   }
 
-  it('sends upgrade click info to segment', async () => {
-    sendTrackEvent.mockClear();
-    buildAndRender({ pageName: 'test' });
-
-    const upgradeButton = await waitFor(() => screen.queryByRole('link', { name: 'Upgrade for $149' }));
-    fireEvent.click(upgradeButton);
-
-    expect(sendTrackEvent).toHaveBeenCalledTimes(3);
-    expect(sendTrackEvent).toHaveBeenNthCalledWith(3, 'edx.bi.ecommerce.upsell_links_clicked', {
-      org_key: 'edX',
-      courserun_key: 'course-v1:edX+DemoX+Demo_Course',
-      linkCategory: 'green_upgrade',
-      linkName: 'test_green',
-      linkType: 'button',
-      pageName: 'test',
-    });
-  });
-
   it('does not render when there is no verified mode', async () => {
     buildAndRender({ verifiedMode: null });
     expect(screen.queryByRole('link', { name: 'Upgrade for $149' })).not.toBeInTheDocument();
@@ -79,26 +54,6 @@ describe('Upgrade Notification', () => {
     expect(screen.getByRole('link', { name: 'Upgrade for $149' })).toBeInTheDocument();
   });
 
-  it('renders non-FBE with a discount properly', async () => {
-    const discountExpirationDate = new Date(dateNow);
-    discountExpirationDate.setDate(discountExpirationDate.getDate() + 6);
-    buildAndRender({
-      offer: {
-        expirationDate: discountExpirationDate.toString(),
-        percentage: 15,
-        code: 'Welcome15',
-        discountedPrice: '$126.65',
-        originalPrice: '$149',
-        upgradeUrl: 'www.exampleUpgradeUrl.com',
-      },
-    });
-    expect(screen.getByRole('heading', { name: 'Pursue a verified certificate' })).toBeInTheDocument();
-    expect(screen.getByText(/Earn a.*?of completion to showcase on your resume/s).textContent).toMatch('Earn a verified certificate of completion to showcase on your resume');
-    expect(screen.getByText(/Support our.*?at edX/s).textContent).toMatch('Support our non-profit mission at edX');
-    expect(screen.getByText(/Upgrade for/).textContent).toMatch('$126.65 ($149)');
-    expect(screen.getByText(/Use code.*?at checkout/s).textContent).toMatch('Use code Welcome15 at checkout');
-  });
-
   it('renders FBE expiration within an hour properly', async () => {
     const expirationDate = new Date(dateNow);
     expirationDate.setMinutes(expirationDate.getMinutes() + 45);

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

@@ -2,13 +2,14 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Alert, Button, TransitionReplace } from '@edx/paragon';
+import { Button, TransitionReplace } from '@edx/paragon';
 import truncate from 'truncate-html';
 
 import { useDispatch } from 'react-redux';
 import LmsHtmlFragment from '../LmsHtmlFragment';
 import messages from '../messages';
 import { useModel } from '../../../generic/model-store';
+import { Alert } from '../../../generic/user-messages';
 import { dismissWelcomeMessage } from '../../data/thunks';
 
 function WelcomeMessage({ courseId, intl }) {
@@ -26,47 +27,52 @@ function WelcomeMessage({ courseId, intl }) {
   const messageCanBeShortened = shortWelcomeMessageHtml.length < welcomeMessageHtml.length;
   const [showShortMessage, setShowShortMessage] = useState(messageCanBeShortened);
   const dispatch = useDispatch();
+
   return (
-    <Alert
-      data-testid="alert-container-welcome"
-      variant="light"
-      stacked
-      dismissible
-      show={display}
-      onClose={() => {
-        setDisplay(false);
-        dispatch(dismissWelcomeMessage(courseId));
-      }}
-      actions={messageCanBeShortened ? [
-        <Button
-          onClick={() => setShowShortMessage(!showShortMessage)}
-          variant="outline-primary"
-        >
-          {showShortMessage ? intl.formatMessage(messages.welcomeMessageShowMoreButton)
-            : intl.formatMessage(messages.welcomeMessageShowLessButton)}
-        </Button>,
-      ] : []}
-    >
-      <TransitionReplace className="mb-3" enterDuration={400} 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)}
-          />
+    display && (
+      <Alert
+        type="welcome"
+        dismissible
+        onDismiss={() => {
+          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
+                onClick={() => setShowShortMessage(!showShortMessage)}
+                variant="outline-primary"
+              >
+                {showShortMessage ? intl.formatMessage(messages.welcomeMessageShowMoreButton)
+                  : intl.formatMessage(messages.welcomeMessageShowLessButton)}
+              </Button>
+            </div>
+          </div>
         )}
-      </TransitionReplace>
-    </Alert>
+      >
+        <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/ProgressHeader.jsx

@@ -12,23 +12,16 @@ import messages from './messages';
 function ProgressHeader({ intl }) {
   const {
     courseId,
-    targetUserId,
   } = useSelector(state => state.courseHome);
 
-  const { administrator, userId } = getAuthenticatedUser();
+  const { administrator } = getAuthenticatedUser();
 
-  const { studioUrl, username } = useModel('progress', courseId);
-
-  const viewingOtherStudentsProgressPage = (targetUserId && targetUserId !== userId);
-
-  const pageTitle = viewingOtherStudentsProgressPage
-    ? intl.formatMessage(messages.progressHeaderForTargetUser, { username })
-    : intl.formatMessage(messages.progressHeader);
+  const { studioUrl } = useModel('progress', courseId);
 
   return (
     <>
       <div className="row w-100 m-0 mt-3 mb-4 justify-content-between">
-        <h1>{pageTitle}</h1>
+        <h1>{intl.formatMessage(messages.progressHeader)}</h1>
         {administrator && studioUrl && (
           <Button variant="outline-primary" size="sm" className="align-self-center" href={studioUrl}>
             {intl.formatMessage(messages.studioLink)}

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

@@ -18,10 +18,12 @@ function ProgressTab() {
   } = useSelector(state => state.courseHome);
 
   const {
-    gradesFeatureIsFullyLocked,
+    completionSummary: {
+      lockedCount,
+    },
   } = useModel('progress', courseId);
-
-  const applyLockedOverlay = gradesFeatureIsFullyLocked ? 'locked-overlay' : '';
+  const isLocked = lockedCount > 0;
+  const applyLockedOverlay = isLocked ? 'locked-overlay' : '';
 
   const layout = layoutGenerator({
     mobile: 0,
@@ -41,7 +43,7 @@ function ProgressTab() {
             <CertificateStatus />
           </OnMobile>
           <CourseGrade />
-          <div className={`grades my-4 p-4 rounded shadow-sm ${applyLockedOverlay}`} aria-hidden={gradesFeatureIsFullyLocked}>
+          <div className={`grades my-4 p-4 rounded shadow-sm ${applyLockedOverlay}`} aria-hidden={isLocked}>
             <GradeSummary />
             <DetailedGrades />
           </div>

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

@@ -22,7 +22,7 @@ describe('Progress Tab', () => {
   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 = new RegExp(`${getConfig().LMS_BASE_URL}/api/course_home/v1/progress/*`);
+  const progressUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/progress/${courseId}`;
 
   const store = initializeStore();
   const defaultMetadata = Factory.build('courseHomeMetadata', { id: courseId });
@@ -111,7 +111,6 @@ describe('Progress Tab', () => {
                 assignment_type: 'Homework',
                 block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345',
                 display_name: 'First subsection',
-                learner_has_access: true,
                 has_graded_assignment: true,
                 num_points_earned: 1,
                 num_points_possible: 2,
@@ -177,7 +176,6 @@ describe('Progress Tab', () => {
                 assignment_type: 'Homework',
                 block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345',
                 display_name: 'First subsection',
-                learner_has_access: true,
                 has_graded_assignment: true,
                 num_points_earned: 8,
                 num_points_possible: 10,
@@ -254,26 +252,6 @@ describe('Progress Tab', () => {
           sku: 'ABCD1234',
           upgrade_url: 'edx.org/upgrade',
         },
-        section_scores: [
-          {
-            display_name: 'First section',
-            subsections: [
-              {
-                assignment_type: 'Homework',
-                block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345',
-                display_name: 'First subsection',
-                learner_has_access: false,
-                has_graded_assignment: true,
-                num_points_earned: 8,
-                num_points_possible: 10,
-                percent_graded: 1.0,
-                show_correctness: 'always',
-                show_grades: true,
-                url: 'http://learning.edx.org/course/course-v1:edX+Test+run/first_subsection',
-              },
-            ],
-          },
-        ],
       });
       await fetchAndRender();
       expect(screen.getByText('locked feature')).toBeInTheDocument();
@@ -281,7 +259,7 @@ describe('Progress Tab', () => {
       expect(screen.getAllByRole('link', 'Unlock now')).toHaveLength(3);
     });
 
-    it('sends events on click of upgrade button in locked content header (CourseGradeHeader)', async () => {
+    it('sends event on click of upgrade button in locked content header (CourseGradeHeader)', async () => {
       sendTrackEvent.mockClear();
       setTabData({
         completion_summary: {
@@ -297,26 +275,6 @@ describe('Progress Tab', () => {
           sku: 'ABCD1234',
           upgrade_url: 'edx.org/upgrade',
         },
-        section_scores: [
-          {
-            display_name: 'First section',
-            subsections: [
-              {
-                assignment_type: 'Homework',
-                block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345',
-                display_name: 'First subsection',
-                learner_has_access: false,
-                has_graded_assignment: true,
-                num_points_earned: 8,
-                num_points_possible: 10,
-                percent_graded: 1.0,
-                show_correctness: 'always',
-                show_grades: true,
-                url: 'http://learning.edx.org/course/course-v1:edX+Test+run/first_subsection',
-              },
-            ],
-          },
-        ],
       });
       await fetchAndRender();
       expect(screen.getByText('locked feature')).toBeInTheDocument();
@@ -325,20 +283,12 @@ describe('Progress Tab', () => {
       const upgradeButton = screen.getAllByRole('link', 'Unlock now')[0];
       fireEvent.click(upgradeButton);
 
-      expect(sendTrackEvent).toHaveBeenCalledTimes(2);
+      expect(sendTrackEvent).toHaveBeenCalledTimes(1);
       expect(sendTrackEvent).toHaveBeenCalledWith('edx.ui.lms.course_progress.grades_upgrade.clicked', {
         org_key: 'edX',
         courserun_key: courseId,
         is_staff: false,
       });
-      expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.ecommerce.upsell_links_clicked', {
-        org_key: 'edX',
-        courserun_key: courseId,
-        linkCategory: '(none)',
-        linkName: 'progress_locked',
-        linkType: 'button',
-        pageName: 'progress',
-      });
     });
 
     it('renders locked feature preview with no upgrade button when user has locked content but cannot upgrade', async () => {
@@ -348,26 +298,6 @@ describe('Progress Tab', () => {
           incomplete_count: 1,
           locked_count: 1,
         },
-        section_scores: [
-          {
-            display_name: 'First section',
-            subsections: [
-              {
-                assignment_type: 'Homework',
-                block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345',
-                display_name: 'First subsection',
-                learner_has_access: false,
-                has_graded_assignment: true,
-                num_points_earned: 1,
-                num_points_possible: 2,
-                percent_graded: 1.0,
-                show_correctness: 'always',
-                show_grades: true,
-                url: 'http://learning.edx.org/course/course-v1:edX+Test+run/first_subsection',
-              },
-            ],
-          },
-        ],
       });
       await fetchAndRender();
       expect(screen.getByText('locked feature')).toBeInTheDocument();
@@ -379,62 +309,6 @@ describe('Progress Tab', () => {
       expect(screen.queryByText('locked feature')).not.toBeInTheDocument();
     });
 
-    it('renders limited feature preview with upgrade button when user has access to some content that would typically be locked', async () => {
-      setTabData({
-        completion_summary: {
-          complete_count: 1,
-          incomplete_count: 1,
-          locked_count: 1,
-        },
-        verified_mode: {
-          access_expiration_date: '2050-01-01T12:00:00',
-          currency: 'USD',
-          currency_symbol: '$',
-          price: 149,
-          sku: 'ABCD1234',
-          upgrade_url: 'edx.org/upgrade',
-        },
-        section_scores: [
-          {
-            display_name: 'First section',
-            subsections: [
-              {
-                assignment_type: 'Homework',
-                block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@123456',
-                display_name: 'First subsection',
-                learner_has_access: false,
-                has_graded_assignment: true,
-                num_points_earned: 8,
-                num_points_possible: 10,
-                percent_graded: 1.0,
-                show_correctness: 'always',
-                show_grades: true,
-                url: 'http://learning.edx.org/course/course-v1:edX+Test+run/first_subsection',
-              },
-              {
-                assignment_type: 'Exam',
-                display_name: 'Second subsection',
-                learner_has_access: true,
-                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',
-              },
-            ],
-          },
-        ],
-      });
-      await fetchAndRender();
-      expect(screen.getByText('limited feature')).toBeInTheDocument();
-      expect(screen.getByText('Unlock to work towards a certificate.')).toBeInTheDocument();
-      expect(screen.queryAllByText('You have limited access to graded assignments as part of the audit track in this course.')).toHaveLength(2);
-
-      expect(screen.queryAllByTestId('blocked-icon')).toHaveLength(4);
-    });
-
     it('renders correct current grade tooltip when showGrades is false', async () => {
       // The learner has a 50% on the first assignment and a 100% on the second, making their grade a 75%
       // The second assignment has showGrades set to false, so the grade reflected to the learner should be 50%.
@@ -447,7 +321,6 @@ describe('Progress Tab', () => {
                 assignment_type: 'Homework',
                 block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345',
                 display_name: 'First subsection',
-                learner_has_access: true,
                 has_graded_assignment: true,
                 num_points_earned: 1,
                 num_points_possible: 2,
@@ -464,7 +337,6 @@ describe('Progress Tab', () => {
               {
                 assignment_type: 'Homework',
                 display_name: 'Second subsection',
-                learner_has_access: true,
                 has_graded_assignment: true,
                 num_points_earned: 1,
                 num_points_possible: 1,
@@ -659,7 +531,6 @@ describe('Progress Tab', () => {
               {
                 assignment_type: 'Homework',
                 display_name: 'Second subsection',
-                learner_has_access: true,
                 has_graded_assignment: true,
                 num_points_earned: 1,
                 num_points_possible: 1,
@@ -683,8 +554,8 @@ describe('Progress Tab', () => {
       await fetchAndRender();
       expect(screen.getByText('Detailed grades')).toBeInTheDocument();
 
-      expect(screen.getByText('First subsection'));
-      expect(screen.getByText('Second subsection'));
+      expect(screen.getByRole('link', { name: 'First subsection' }));
+      expect(screen.getByRole('link', { name: 'Second subsection' }));
     });
 
     it('sends event on click of subsection link', async () => {
@@ -720,20 +591,6 @@ describe('Progress Tab', () => {
       });
     });
 
-    it('renders individual problem score drawer', async () => {
-      sendTrackEvent.mockClear();
-      await fetchAndRender();
-      expect(screen.getByText('Detailed grades')).toBeInTheDocument();
-
-      const problemScoreDrawerToggle = screen.getByRole('button', { name: 'Toggle individual problem scores for First subsection' });
-      expect(problemScoreDrawerToggle).toBeInTheDocument();
-
-      // Open the problem score drawer
-      fireEvent.click(problemScoreDrawerToggle);
-      expect(screen.getByText('Problem Scores:')).toBeInTheDocument();
-      expect(screen.getAllByText('0/1')).toHaveLength(3);
-    });
-
     it('render message when section scores are not populated', async () => {
       setTabData({
         section_scores: [],
@@ -1101,21 +958,13 @@ describe('Progress Tab', () => {
         const upgradeLink = screen.getByRole('link', { name: 'Upgrade now' });
         fireEvent.click(upgradeLink);
 
-        expect(sendTrackEvent).toHaveBeenCalledTimes(3);
+        expect(sendTrackEvent).toHaveBeenCalledTimes(2);
         expect(sendTrackEvent).toHaveBeenNthCalledWith(2, 'edx.ui.lms.course_progress.certificate_status.clicked', {
           org_key: 'edX',
           courserun_key: courseId,
           is_staff: false,
           certificate_status_variant: 'audit_passing',
         });
-        expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.ecommerce.upsell_links_clicked', {
-          org_key: 'edX',
-          courserun_key: courseId,
-          linkCategory: '(none)',
-          linkName: 'progress_certificate',
-          linkType: 'button',
-          pageName: 'progress',
-        });
       });
 
       it('Displays nothing if audit only', async () => {
@@ -1185,16 +1034,4 @@ describe('Progress Tab', () => {
       expect(screen.queryByTestId('certificate-status-component')).not.toBeInTheDocument();
     });
   });
-
-  describe('Viewing progress page of other students by changing url', () => {
-    it('Changing the url changes the header', async () => {
-      setMetadata({ is_enrolled: true });
-      setTabData({ username: 'otherstudent' });
-
-      await executeThunk(thunks.fetchProgressTab(courseId, 10), store.dispatch);
-      await act(async () => render(<ProgressTab />, { store }));
-
-      expect(screen.getByText('Course progress for otherstudent')).toBeInTheDocument();
-    });
-  });
 });

src/course-home/progress-tab/certificate-status/CertificateStatus.jsx

@@ -36,9 +36,6 @@ function CertificateStatus({ intl }) {
     verificationData,
     verifiedMode,
   } = useModel('progress', courseId);
-  const {
-    certificateAvailableDate,
-  } = certificateData || {};
 
   const mode = getCourseExitMode(
     certificateData,
@@ -46,12 +43,6 @@ function CertificateStatus({ intl }) {
     isEnrolled,
     userHasPassingGrade,
   );
-
-  const eventProperties = {
-    org_key: org,
-    courserun_key: courseId,
-  };
-
   const dispatch = useDispatch();
   const { administrator } = getAuthenticatedUser();
 
@@ -72,7 +63,6 @@ function CertificateStatus({ intl }) {
   let buttonLocation;
   let buttonText;
   let endDate;
-  let certAvailabilityDate;
 
   let gradeEventName = 'not_passing';
   if (userHasPassingGrade) {
@@ -83,21 +73,17 @@ function CertificateStatus({ intl }) {
   const idVerificationSupportLink = <IdVerificationSupportLink />;
   const profileLink = <ProfileLink />;
 
-  // Some learners have a valid ("downloadable") certificate without being in a passing
-  // state (e.g. learners who have been added to a course's allowlist), so we need to
-  // skip grade validation for these learners
-  const certIsDownloadable = certStatus === 'downloadable';
   if (mode === COURSE_EXIT_MODES.disabled) {
     certEventName = 'certificate_status_disabled';
-  } else if (mode === COURSE_EXIT_MODES.nonPassing && !certIsDownloadable) {
+  } else if (mode === COURSE_EXIT_MODES.nonPassing) {
     certCase = 'notPassing';
     certEventName = 'not_passing';
     body = intl.formatMessage(messages[`${certCase}Body`]);
-  } else if (mode === COURSE_EXIT_MODES.inProgress && !certIsDownloadable) {
+  } else if (mode === COURSE_EXIT_MODES.inProgress) {
     certCase = 'inProgress';
     certEventName = 'has_scheduled_content';
     body = intl.formatMessage(messages[`${certCase}Body`]);
-  } else if (mode === COURSE_EXIT_MODES.celebration || certIsDownloadable) {
+  } else if (mode === COURSE_EXIT_MODES.celebration) {
     switch (certStatus) {
       case 'requesting':
         certCase = 'requestable';
@@ -151,13 +137,12 @@ function CertificateStatus({ intl }) {
       case 'earned_but_not_available':
         certCase = 'notAvailable';
         endDate = <FormattedDate value={end} day="numeric" month="long" year="numeric" />;
-        certAvailabilityDate = <FormattedDate value={certificateAvailableDate} day="numeric" month="long" year="numeric" />;
         body = (
           <FormattedMessage
             id="courseCelebration.certificateBody.notAvailable.endDate"
-            defaultMessage="This course ends on {endDate}. Final grades and certificates are
-            scheduled to be available after {certAvailabilityDate}."
-            values={{ endDate, certAvailabilityDate }}
+            defaultMessage="Your certificate will be available soon! After this course officially ends on {endDate}, you will receive an
+              email notification with your certificate."
+            values={{ endDate }}
           />
         );
         break;
@@ -208,15 +193,6 @@ function CertificateStatus({ intl }) {
       is_staff: administrator,
       certificate_status_variant: certEventName,
     });
-    if (certCase === 'upgrade') {
-      sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
-        ...eventProperties,
-        linkCategory: '(none)',
-        linkName: 'progress_certificate',
-        linkType: 'button',
-        pageName: 'progress',
-      });
-    }
   };
 
   return (

src/course-home/progress-tab/certificate-status/messages.js

@@ -61,6 +61,10 @@ const messages = defineMessages({
     id: 'progress.certificateStatus.notAvailableHeader',
     defaultMessage: 'Certificate status',
   },
+  notAvailableBody: {
+    id: 'progress.certificateStatus.notAvailableBody',
+    defaultMessage: 'Your certificate will be available soon! After this course officially ends on {end_date}, you will receive an email notification with your certificate.',
+  },
   upgradeHeader: {
     id: 'progress.certificateStatus.upgradeHeader',
     defaultMessage: 'Earn a certificate',
@@ -73,18 +77,6 @@ const messages = defineMessages({
     id: 'progress.certificateStatus.upgradeButton',
     defaultMessage: 'Upgrade now',
   },
-  unverifiedHomeHeader: {
-    id: 'progress.certificateStatus.unverifiedHomeHeader',
-    defaultMessage: 'Verify your identity to earn a certificate!',
-  },
-  unverifiedHomeButton: {
-    id: 'progress.certificateStatus.unverifiedHomeButton',
-    defaultMessage: 'Verify my ID',
-  },
-  unverifiedHomeBody: {
-    id: 'progress.certificateStatus.unverifiedHomeBody',
-    defaultMessage: 'In order to generate a certificate for this course, you must complete the ID verification process.',
-  },
 });
 
 export default messages;

src/course-home/progress-tab/course-completion/CompleteDonutSegment.jsx

@@ -7,10 +7,6 @@ import { OverlayTrigger, Popover } from '@edx/paragon';
 import messages from './messages';
 
 function CompleteDonutSegment({ completePercentage, intl, lockedPercentage }) {
-  if (!completePercentage) {
-    return null;
-  }
-
   const [showCompletePopover, setShowCompletePopover] = useState(false);
 
   const completeSegmentOffset = (3.6 * completePercentage) / 8;
@@ -28,6 +24,15 @@ function CompleteDonutSegment({ completePercentage, intl, lockedPercentage }) {
       onFocus={() => setShowCompletePopover(true)}
       tabIndex="-1"
     >
+      <circle
+        className="donut-segment complete-stroke"
+        cx="21"
+        cy="21"
+        r="15.91549430918954"
+        strokeDasharray={`${completePercentage} ${100 - completePercentage}`}
+        strokeDashoffset={lockedSegmentOffset + completePercentage}
+      />
+
       {/* Tooltip */}
       <OverlayTrigger
         show={showCompletePopover}
@@ -44,33 +49,16 @@ function CompleteDonutSegment({ completePercentage, intl, lockedPercentage }) {
         <rect x="19" y="3" style={{ transform: `rotate(${completeTooltipDegree}deg)` }} />
       </OverlayTrigger>
 
-      {/* Complete segment */}
-      <circle
-        className="donut-segment complete-stroke"
-        cx="21"
-        cy="21"
-        r="15.91549430918954"
-        strokeDasharray={`${completePercentage} ${100 - completePercentage}`}
-        strokeDashoffset={lockedSegmentOffset + completePercentage}
-      />
-
       {/* Segment dividers */}
       {lockedPercentage > 0 && lockedPercentage < 100 && (
         <circle
-          cx="21"
-          cy="21"
-          r="15.91549430918954"
           className="donut-segment divider-stroke"
           strokeDasharray="0.3 99.7"
           strokeDashoffset={0.15 + lockedSegmentOffset}
         />
       )}
-      {completePercentage < 100 && lockedPercentage > 0 && lockedPercentage < 100
-      && lockedPercentage + completePercentage === 100 && (
+      {completePercentage < 100 && lockedPercentage < 100 && lockedPercentage + completePercentage === 100 && (
         <circle
-          cx="21"
-          cy="21"
-          r="15.91549430918954"
           className="donut-segment divider-stroke"
           strokeDasharray="0.3 99.7"
           strokeDashoffset="25.15"

src/course-home/progress-tab/course-completion/IncompleteDonutSegment.jsx

@@ -7,10 +7,6 @@ import { OverlayTrigger, Popover } from '@edx/paragon';
 import messages from './messages';
 
 function IncompleteDonutSegment({ incompletePercentage, intl }) {
-  if (!incompletePercentage) {
-    return null;
-  }
-
   const [showIncompletePopover, setShowIncompletePopover] = useState(false);
 
   const incompleteSegmentOffset = (3.6 * incompletePercentage) / 16;

src/course-home/progress-tab/course-completion/LockedDonutSegment.jsx

@@ -9,7 +9,7 @@ import messages from './messages';
 function LockedDonutSegment({ intl, lockedPercentage }) {
   const [showLockedPopover, setShowLockedPopover] = useState(false);
 
-  if (!lockedPercentage) {
+  if (!lockedPercentage > 0) {
     return null;
   }
 

src/course-home/progress-tab/grades/course-grade/CourseGrade.jsx

@@ -16,8 +16,9 @@ function CourseGrade({ intl }) {
   } = useSelector(state => state.courseHome);
 
   const {
-    gradesFeatureIsFullyLocked,
-    gradesFeatureIsPartiallyLocked,
+    completionSummary: {
+      lockedCount,
+    },
     gradingPolicy: {
       gradeRange,
     },
@@ -25,12 +26,13 @@ function CourseGrade({ intl }) {
 
   const passingGrade = Number((Math.min(...Object.values(gradeRange)) * 100).toFixed(0));
 
-  const applyLockedOverlay = gradesFeatureIsFullyLocked ? 'locked-overlay' : '';
+  const isLocked = lockedCount > 0;
+  const applyLockedOverlay = isLocked ? 'locked-overlay' : '';
 
   return (
     <section className="text-dark-700 my-4 rounded shadow-sm">
-      {(gradesFeatureIsFullyLocked || gradesFeatureIsPartiallyLocked) && <CourseGradeHeader />}
-      <div className={applyLockedOverlay} aria-hidden={gradesFeatureIsFullyLocked}>
+      {isLocked && <CourseGradeHeader />}
+      <div className={applyLockedOverlay}>
         <div className="row w-100 m-0 p-4">
           <div className="col-12 col-sm-6 p-0 pr-sm-2">
             <h2>{intl.formatMessage(messages.grades)}</h2>

src/course-home/progress-tab/grades/course-grade/CourseGradeHeader.jsx

@@ -19,14 +19,8 @@ function CourseGradeHeader({ intl }) {
   } = useModel('courseHomeMeta', courseId);
   const {
     verifiedMode,
-    gradesFeatureIsFullyLocked,
   } = useModel('progress', courseId);
 
-  const eventProperties = {
-    org_key: org,
-    courserun_key: courseId,
-  };
-
   const { administrator } = getAuthenticatedUser();
   const logUpgradeButtonClick = () => {
     sendTrackEvent('edx.ui.lms.course_progress.grades_upgrade.clicked', {
@@ -34,22 +28,7 @@ function CourseGradeHeader({ intl }) {
       courserun_key: courseId,
       is_staff: administrator,
     });
-    sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
-      ...eventProperties,
-      linkCategory: '(none)',
-      linkName: 'progress_locked',
-      linkType: 'button',
-      pageName: 'progress',
-    });
   };
-  let previewText;
-  if (verifiedMode) {
-    previewText = gradesFeatureIsFullyLocked
-      ? intl.formatMessage(messages.courseGradePreviewUnlockCertificateBody)
-      : intl.formatMessage(messages.courseGradePartialPreviewUnlockCertificateBody);
-  } else {
-    previewText = intl.formatMessage(messages.courseGradePreviewUpgradeDeadlinePassedBody);
-  }
   return (
     <div className="row w-100 m-0 p-4 rounded-top bg-primary-500 text-white">
       <div className={`col-12 ${verifiedMode ? 'col-md-9' : ''} p-0`}>
@@ -61,14 +40,13 @@ function CourseGradeHeader({ intl }) {
             <span aria-hidden="true">
               {intl.formatMessage(messages.courseGradePreviewHeaderAriaHidden)}
             </span>
-            {gradesFeatureIsFullyLocked
-              ? intl.formatMessage(messages.courseGradePreviewHeaderLocked)
-              : intl.formatMessage(messages.courseGradePreviewHeaderLimited)}
+            {intl.formatMessage(messages.courseGradePreviewHeader)}
           </div>
         </div>
         <div className="row w-100 m-0 p-0 justify-content-end">
           <div className="col-11 px-2 p-sm-0 small">
-            {previewText}
+            {verifiedMode ? intl.formatMessage(messages.courseGradePreviewUnlockCertificateBody)
+              : intl.formatMessage(messages.courseGradePreviewUpgradeDeadlinePassedBody)}
           </div>
         </div>
       </div>

src/course-home/progress-tab/grades/course-grade/GradeBar.jsx

@@ -15,16 +15,19 @@ function GradeBar({ intl, passingGrade }) {
   } = useSelector(state => state.courseHome);
 
   const {
+    completionSummary: {
+      lockedCount,
+    },
     courseGrade: {
       isPassing,
       visiblePercent,
     },
-    gradesFeatureIsFullyLocked,
   } = useModel('progress', courseId);
 
   const currentGrade = Number((visiblePercent * 100).toFixed(0));
 
-  const lockedTooltipClassName = gradesFeatureIsFullyLocked ? 'locked-overlay' : '';
+  const isLocked = lockedCount > 0;
+  const lockedTooltipClassName = isLocked ? 'locked-overlay' : '';
 
   return (
     <div className="col-12 col-sm-6 align-self-center">

src/course-home/progress-tab/grades/course-grade/GradeRangeTooltip.jsx

@@ -17,7 +17,6 @@ function GradeRangeTooltip({ intl, iconButtonClassName, passingGrade }) {
   } = useSelector(state => state.courseHome);
 
   const {
-    gradesFeatureIsFullyLocked,
     gradingPolicy: {
       gradeRange,
     },
@@ -68,7 +67,6 @@ function GradeRangeTooltip({ intl, iconButtonClassName, passingGrade }) {
         src={InfoOutline}
         iconAs={Icon}
         size="inline"
-        disabled={gradesFeatureIsFullyLocked}
       />
     </OverlayTrigger>
   );

src/course-home/progress-tab/grades/detailed-grades/DetailedGrades.jsx

@@ -5,8 +5,7 @@ import { getConfig } from '@edx/frontend-platform';
 import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
 import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Blocked } from '@edx/paragon/icons';
-import { Icon, Hyperlink } from '@edx/paragon';
+import { Hyperlink } from '@edx/paragon';
 import { useModel } from '../../../../generic/model-store';
 
 import DetailedGradesTable from './DetailedGradesTable';
@@ -22,8 +21,6 @@ function DetailedGrades({ intl }) {
     org,
   } = useModel('courseHomeMeta', courseId);
   const {
-    gradesFeatureIsFullyLocked,
-    gradesFeatureIsPartiallyLocked,
     sectionScores,
   } = useModel('progress', courseId);
 
@@ -42,7 +39,6 @@ function DetailedGrades({ intl }) {
       className="muted-link inline-link"
       destination={`${getConfig().LMS_BASE_URL}/courses/${courseId}/course`}
       onClick={logOutlineLinkClick}
-      tabIndex={gradesFeatureIsFullyLocked ? '-1' : '0'}
     >
       {intl.formatMessage(messages.courseOutline)}
     </Hyperlink>
@@ -51,14 +47,8 @@ function DetailedGrades({ intl }) {
   return (
     <section className="text-dark-700">
       <h3 className="h4 mb-3">{intl.formatMessage(messages.detailedGrades)}</h3>
-      {gradesFeatureIsPartiallyLocked && (
-        <div className="mb-3 small ml-0 d-inline">
-          <Icon className="mr-1 mt-1 d-inline-flex" style={{ height: '1rem', width: '1rem' }} src={Blocked} data-testid="blocked-icon" />
-          {intl.formatMessage(messages.gradeSummaryLimitedAccessExplanation)}
-        </div>
-      )}
       {hasSectionScores && (
-        <DetailedGradesTable />
+        <DetailedGradesTable sectionScores={sectionScores} />
       )}
       {!hasSectionScores && (
         <p className="small">{intl.formatMessage(messages.detailedGradesEmpty)}</p>

src/course-home/progress-tab/grades/detailed-grades/DetailedGradesTable.jsx

@@ -1,22 +1,31 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
+import PropTypes from 'prop-types';
 
+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
+import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { DataTable } from '@edx/paragon';
 
-import { useModel } from '../../../../generic/model-store';
 import messages from '../messages';
-import SubsectionTitleCell from './SubsectionTitleCell';
+import { useModel } from '../../../../generic/model-store';
 
-function DetailedGradesTable({ intl }) {
+function DetailedGradesTable({ intl, sectionScores }) {
   const {
     courseId,
   } = useSelector(state => state.courseHome);
-
   const {
-    sectionScores,
-  } = useModel('progress', courseId);
-
+    org,
+  } = useModel('courseHomeMeta', courseId);
+  const { administrator } = getAuthenticatedUser();
+  const logSubsectionClicked = (blockKey) => {
+    sendTrackEvent('edx.ui.lms.course_progress.detailed_grades_assignment.clicked', {
+      org_key: org,
+      courserun_key: courseId,
+      is_staff: administrator,
+      assignment_block_key: blockKey,
+    });
+  };
   return (
     sectionScores.map((chapter) => {
       const subsectionScores = chapter.subsections.filter(
@@ -30,10 +39,23 @@ function DetailedGradesTable({ intl }) {
         return null;
       }
 
-      const detailedGradesData = subsectionScores.map((subsection) => ({
-        subsectionTitle: <SubsectionTitleCell subsection={subsection} />,
-        score: <span className={subsection.learnerHasAccess ? '' : 'greyed-out'}>{subsection.numPointsEarned}/{subsection.numPointsPossible}</span>,
-      }));
+      const detailedGradesData = subsectionScores.map((subsection) => {
+        const title = (
+          <a
+            href={subsection.url}
+            className="text-dark-700 small"
+            onClick={() => {
+              logSubsectionClicked(subsection.blockKey);
+            }}
+          >
+            {subsection.displayName}
+          </a>
+        );
+        return {
+          subsectionTitle: title,
+          score: `${subsection.numPointsEarned}/${subsection.numPointsPossible}`,
+        };
+      });
 
       return (
         <div className="my-3" key={`${chapter.displayName}-grades-table`}>
@@ -65,6 +87,21 @@ function DetailedGradesTable({ intl }) {
 
 DetailedGradesTable.propTypes = {
   intl: intlShape.isRequired,
+  sectionScores: PropTypes.arrayOf(PropTypes.shape({
+    displayName: PropTypes.string.isRequired,
+    subsections: PropTypes.arrayOf(PropTypes.shape({
+      displayName: PropTypes.string.isRequired,
+      numPointsEarned: PropTypes.number.isRequired,
+      numPointsPossible: PropTypes.number.isRequired,
+      url: PropTypes.string.isRequired,
+    })),
+  })).isRequired,
+};
+
+DetailedGradesTable.defaultProps = {
+  sectionScores: {
+    subsections: [],
+  },
 };
 
 export default injectIntl(DetailedGradesTable);

src/course-home/progress-tab/grades/detailed-grades/ProblemScoreDrawer.jsx

@@ -1,33 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
-
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-
-import messages from '../messages';
-
-function ProblemScoreDrawer({ intl, problemScores, subsection }) {
-  return (
-    <span className="row w-100 m-0 x-small ml-4 pt-2 pl-1 text-gray-700 flex-nowrap">
-      <span id="problem-score-label" className="col-auto p-0">{intl.formatMessage(messages.problemScoreLabel)}</span>
-      <div className={classNames('col', 'p-0', { 'greyed-out': !subsection.learnerHasAccess })}>
-        <ul className="list-unstyled row w-100 m-0" aria-labelledby="problem-score-label">
-          {problemScores.map(problemScore => (
-            <li className="ml-3">{problemScore.earned}/{problemScore.possible}</li>
-          ))}
-        </ul>
-      </div>
-    </span>
-  );
-}
-
-ProblemScoreDrawer.propTypes = {
-  intl: intlShape.isRequired,
-  problemScores: PropTypes.arrayOf(PropTypes.shape({
-    earned: PropTypes.number.isRequired,
-    possible: PropTypes.number.isRequired,
-  })).isRequired,
-  subsection: PropTypes.shape({ learnerHasAccess: PropTypes.bool }).isRequired,
-};
-
-export default injectIntl(ProblemScoreDrawer);

src/course-home/progress-tab/grades/detailed-grades/SubsectionTitleCell.jsx

@@ -1,83 +0,0 @@
-import React from 'react';
-import { useSelector } from 'react-redux';
-import PropTypes from 'prop-types';
-
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
-import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Collapsible, Icon, Row } from '@edx/paragon';
-import { ArrowDropDown, ArrowDropUp, Blocked } from '@edx/paragon/icons';
-
-import messages from '../messages';
-import { useModel } from '../../../../generic/model-store';
-import ProblemScoreDrawer from './ProblemScoreDrawer';
-
-function SubsectionTitleCell({ intl, subsection }) {
-  const {
-    courseId,
-  } = useSelector(state => state.courseHome);
-  const {
-    org,
-  } = useModel('courseHomeMeta', courseId);
-  const {
-    gradesFeatureIsFullyLocked,
-  } = useModel('progress', courseId);
-
-  const {
-    blockKey,
-    displayName,
-    problemScores,
-    url,
-  } = subsection;
-
-  const { administrator } = getAuthenticatedUser();
-  const logSubsectionClicked = () => {
-    sendTrackEvent('edx.ui.lms.course_progress.detailed_grades_assignment.clicked', {
-      org_key: org,
-      courserun_key: courseId,
-      is_staff: administrator,
-      assignment_block_key: blockKey,
-    });
-  };
-
-  return (
-    <Collapsible.Advanced>
-      <Row className="w-100 m-0">
-        <Collapsible.Trigger
-          className="mr-1 position-absolute"
-          aria-label={intl.formatMessage(messages.problemScoreToggleAltText, { subsectionTitle: displayName })}
-          tabIndex={gradesFeatureIsFullyLocked ? '-1' : '0'}
-        >
-          <Collapsible.Visible whenClosed><Icon src={ArrowDropDown} /></Collapsible.Visible>
-          <Collapsible.Visible whenOpen><Icon src={ArrowDropUp} /></Collapsible.Visible>
-        </Collapsible.Trigger>
-        <span className="small d-inline ml-4 pl-1">
-          {gradesFeatureIsFullyLocked || subsection.learnerHasAccess ? '' : <Icon id={`detailedGradesBlockedIcon${subsection.blockKey}`} aria-label={intl.formatMessage(messages.noAcessToSubsection, { displayName })} className="mr-1 mt-1 d-inline-flex" style={{ height: '1rem', width: '1rem' }} src={Blocked} data-testid="blocked-icon" />}
-          {url ? (
-            <a
-              href={url}
-              className="muted-link small"
-              onClick={logSubsectionClicked}
-              tabIndex={gradesFeatureIsFullyLocked ? '-1' : '0'}
-              aria-labelledby={`detailedGradesBlockedIcon${subsection.blockKey}`}
-            >
-              {displayName}
-            </a>
-          ) : (
-            <span className="greyed-out small">{displayName}</span>
-          )}
-        </span>
-      </Row>
-      <Collapsible.Body>
-        <ProblemScoreDrawer problemScores={problemScores} subsection={subsection} />
-      </Collapsible.Body>
-    </Collapsible.Advanced>
-  );
-}
-
-SubsectionTitleCell.propTypes = {
-  intl: intlShape.isRequired,
-  subsection: PropTypes.shape.isRequired,
-};
-
-export default injectIntl(SubsectionTitleCell);

src/course-home/progress-tab/grades/grade-summary/AssignmentTypeCell.jsx

@@ -1,38 +1,13 @@
 import React from 'react';
-import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Blocked } from '@edx/paragon/icons';
-import { Icon } from '@edx/paragon';
-import { useModel } from '../../../../generic/model-store';
-import messages from '../messages';
-
-function AssignmentTypeCell({
-  intl, assignmentType, footnoteMarker, footnoteId, locked,
-}) {
-  const {
-    courseId,
-  } = useSelector(state => state.courseHome);
-
-  const {
-    gradesFeatureIsFullyLocked,
-  } = useModel('progress', courseId);
-
-  const lockedIcon = locked ? <Icon id={`assignmentTypeBlockedIcon${assignmentType}`} aria-label={intl.formatMessage(messages.noAcessToAssignmentType, { assignmentType })} className="mr-1 mt-1 d-inline-flex" style={{ height: '1rem', width: '1rem' }} src={Blocked} data-testid="blocked-icon" /> : '';
 
+function AssignmentTypeCell({ assignmentType, footnoteMarker, footnoteId }) {
   return (
     <div className="small">
-      <span className="d-inline-flex">{lockedIcon}{assignmentType}</span>
+      {assignmentType}
       {footnoteId && footnoteMarker && (
         <sup>
-          <a
-            id={`${footnoteId}-ref`}
-            className="muted-link"
-            href={`#${footnoteId}-footnote`}
-            aria-describedby="grade-summary-footnote-label"
-            tabIndex={gradesFeatureIsFullyLocked ? '-1' : '0'}
-            aria-labelledby={`assignmentTypeBlockedIcon${assignmentType}`}
-          >
+          <a id={`${footnoteId}-ref`} className="text-dark-700" href={`#${footnoteId}-footnote`} aria-describedby="grade-summary-footnote-label">
             {footnoteMarker}
           </a>
         </sup>
@@ -42,17 +17,14 @@ function AssignmentTypeCell({
 }
 
 AssignmentTypeCell.propTypes = {
-  intl: intlShape.isRequired,
   assignmentType: PropTypes.string.isRequired,
   footnoteId: PropTypes.string,
   footnoteMarker: PropTypes.number,
-  locked: PropTypes.bool,
 };
 
 AssignmentTypeCell.defaultProps = {
   footnoteId: '',
   footnoteMarker: null,
-  locked: false,
 };
 
-export default injectIntl(AssignmentTypeCell);
+export default AssignmentTypeCell;

src/course-home/progress-tab/grades/grade-summary/DroppableAssignmentFootnote.jsx

@@ -1,19 +1,11 @@
 import React from 'react';
-import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 
 import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 
 import messages from '../messages';
-import { useModel } from '../../../../generic/model-store';
 
 function DroppableAssignmentFootnote({ footnotes, intl }) {
-  const {
-    courseId,
-  } = useSelector(state => state.courseHome);
-  const {
-    gradesFeatureIsFullyLocked,
-  } = useModel('progress', courseId);
   return (
     <>
       <span id="grade-summary-footnote-label" className="sr-only">{intl.formatMessage(messages.footnotesTitle)}</span>
@@ -29,9 +21,7 @@ function DroppableAssignmentFootnote({ footnotes, intl }) {
                 assignmentType: footnote.assignmentType,
               }}
             />
-            <a className="sr-only" href={`#${footnote.id}-ref`} tabIndex={gradesFeatureIsFullyLocked ? '-1' : '0'}>
-              {intl.formatMessage(messages.backToContent)}
-            </a>
+            <a className="sr-only" href={`#${footnote.id}-ref`}>{intl.formatMessage(messages.backToContent)}</a>
           </li>
         ))}
       </ul>

src/course-home/progress-tab/grades/grade-summary/GradeSummary.jsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { useSelector } from 'react-redux';
 import { useModel } from '../../../../generic/model-store';
 
@@ -16,16 +16,14 @@ function GradeSummary() {
     },
   } = useModel('progress', courseId);
 
-  const [allOfSomeAssignmentTypeIsLocked, setAllOfSomeAssignmentTypeIsLocked] = useState(false);
-
   if (assignmentPolicies.length === 0) {
     return null;
   }
 
   return (
     <section className="text-dark-700 mb-4">
-      <GradeSummaryHeader allOfSomeAssignmentTypeIsLocked={allOfSomeAssignmentTypeIsLocked} />
-      <GradeSummaryTable setAllOfSomeAssignmentTypeIsLocked={setAllOfSomeAssignmentTypeIsLocked} />
+      <GradeSummaryHeader />
+      <GradeSummaryTable />
     </section>
   );
 }

src/course-home/progress-tab/grades/grade-summary/GradeSummaryHeader.jsx

@@ -1,25 +1,15 @@
 import React, { useState } from 'react';
-import { useSelector } from 'react-redux';
-import PropTypes from 'prop-types';
 
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import {
   Icon, IconButton, OverlayTrigger, Popover,
 } from '@edx/paragon';
-import { Blocked, InfoOutline } from '@edx/paragon/icons';
+import { InfoOutline } from '@edx/paragon/icons';
 
 import messages from '../messages';
-import { useModel } from '../../../../generic/model-store';
 
-function GradeSummaryHeader({ intl, allOfSomeAssignmentTypeIsLocked }) {
-  const {
-    courseId,
-  } = useSelector(state => state.courseHome);
-  const {
-    gradesFeatureIsFullyLocked,
-  } = useModel('progress', courseId);
+function GradeSummaryHeader({ intl }) {
   const [showTooltip, setShowTooltip] = useState(false);
-
   return (
     <div className="row w-100 m-0 align-items-center">
       <h3 className="h4 mb-3 mr-1">{intl.formatMessage(messages.gradeSummary)}</h3>
@@ -43,22 +33,14 @@ function GradeSummaryHeader({ intl, allOfSomeAssignmentTypeIsLocked }) {
           iconAs={Icon}
           className="mb-3"
           size="sm"
-          disabled={gradesFeatureIsFullyLocked}
         />
       </OverlayTrigger>
-      {!gradesFeatureIsFullyLocked && allOfSomeAssignmentTypeIsLocked && (
-        <div className="mb-3 small ml-0 d-inline">
-          <Icon className="mr-1 mt-1 d-inline-flex" style={{ height: '1rem', width: '1rem' }} src={Blocked} data-testid="blocked-icon" />
-          {intl.formatMessage(messages.gradeSummaryLimitedAccessExplanation)}
-        </div>
-      )}
     </div>
   );
 }
 
 GradeSummaryHeader.propTypes = {
   intl: intlShape.isRequired,
-  allOfSomeAssignmentTypeIsLocked: PropTypes.bool.isRequired,
 };
 
 export default injectIntl(GradeSummaryHeader);

src/course-home/progress-tab/grades/grade-summary/GradeSummaryTable.jsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
 
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
@@ -12,7 +11,7 @@ import GradeSummaryTableFooter from './GradeSummaryTableFooter';
 
 import messages from '../messages';
 
-function GradeSummaryTable({ intl, setAllOfSomeAssignmentTypeIsLocked }) {
+function GradeSummaryTable({ intl }) {
   const {
     courseId,
   } = useSelector(state => state.courseHome);
@@ -21,8 +20,6 @@ function GradeSummaryTable({ intl, setAllOfSomeAssignmentTypeIsLocked }) {
     gradingPolicy: {
       assignmentPolicies,
     },
-    gradesFeatureIsFullyLocked,
-    sectionScores,
   } = useModel('progress', courseId);
 
   const footnotes = [];
@@ -32,23 +29,6 @@ function GradeSummaryTable({ intl, setAllOfSomeAssignmentTypeIsLocked }) {
     return footnoteId.replace(/[^A-Za-z0-9.-_]+/g, '-');
   };
 
-  const hasNoAccessToAssignmentsOfType = (assignmentType) => {
-    const subsectionAssignmentsOfType = sectionScores.map((chapter) => chapter.subsections.filter((subsection) => (
-      subsection.assignmentType === assignmentType && subsection.hasGradedAssignment
-      && (subsection.numPointsPossible > 0 || subsection.numPointsEarned > 0)
-    ))).flat();
-    if (subsectionAssignmentsOfType.length) {
-      const noAccessToAssignmentsOfType = !subsectionAssignmentsOfType.some((subsection) => (
-        subsection.learnerHasAccess === true
-      ));
-      if (noAccessToAssignmentsOfType) {
-        setAllOfSomeAssignmentTypeIsLocked(true);
-        return true;
-      }
-    }
-    return false;
-  };
-
   const gradeSummaryData = assignmentPolicies.map((assignment) => {
     let footnoteId = '';
     let footnoteMarker;
@@ -64,15 +44,11 @@ function GradeSummaryTable({ intl, setAllOfSomeAssignmentTypeIsLocked }) {
       footnoteMarker = footnotes.length;
     }
 
-    const locked = !gradesFeatureIsFullyLocked && hasNoAccessToAssignmentsOfType(assignment.type) ? 'greyed-out' : '';
-
     return {
-      type: {
-        footnoteId, footnoteMarker, type: assignment.type, locked,
-      },
-      weight: { weight: `${(assignment.weight * 100).toFixed(0)}%`, locked },
-      grade: { grade: `${(assignment.averageGrade * 100).toFixed(0)}%`, locked },
-      weightedGrade: { weightedGrade: `${(assignment.weightedGrade * 100).toFixed(0)}%`, locked },
+      type: { footnoteId, footnoteMarker, type: assignment.type },
+      weight: `${assignment.weight * 100}%`,
+      grade: `${(assignment.averageGrade * 100).toFixed(0)}%`,
+      weightedGrade: `${(assignment.weightedGrade * 100).toFixed(0)}%`,
     };
   });
 
@@ -91,7 +67,6 @@ function GradeSummaryTable({ intl, setAllOfSomeAssignmentTypeIsLocked }) {
                 assignmentType={value.type} // eslint-disable-line react/prop-types
                 footnoteId={value.footnoteId} // eslint-disable-line react/prop-types
                 footnoteMarker={value.footnoteMarker} // eslint-disable-line react/prop-types
-                locked={value.locked} // eslint-disable-line react/prop-types
               />
             ),
             headerClassName: 'h5 mb-0',
@@ -100,30 +75,18 @@ function GradeSummaryTable({ intl, setAllOfSomeAssignmentTypeIsLocked }) {
             Header: `${intl.formatMessage(messages.weight)}`,
             accessor: 'weight',
             headerClassName: 'justify-content-end h5 mb-0',
-            // eslint-disable-next-line react/prop-types
-            Cell: ({ value }) => (
-              <span className={value.locked ? 'greyed-out' : ''}>{value.weight}</span> // eslint-disable-line react/prop-types
-            ),
             cellClassName: 'float-right small',
           },
           {
             Header: `${intl.formatMessage(messages.grade)}`,
             accessor: 'grade',
             headerClassName: 'justify-content-end h5 mb-0',
-            // eslint-disable-next-line react/prop-types
-            Cell: ({ value }) => (
-              <span className={value.locked ? 'greyed-out' : ''}>{value.grade}</span> // eslint-disable-line react/prop-types
-            ),
             cellClassName: 'float-right small',
           },
           {
             Header: `${intl.formatMessage(messages.weightedGrade)}`,
             accessor: 'weightedGrade',
             headerClassName: 'justify-content-end h5 mb-0 text-right',
-            // eslint-disable-next-line react/prop-types
-            Cell: ({ value }) => (
-              <span className={value.locked ? 'greyed-out' : ''}>{value.weightedGrade}</span> // eslint-disable-line react/prop-types
-            ),
             cellClassName: 'float-right font-weight-bold small',
           },
         ]}
@@ -141,7 +104,6 @@ function GradeSummaryTable({ intl, setAllOfSomeAssignmentTypeIsLocked }) {
 
 GradeSummaryTable.propTypes = {
   intl: intlShape.isRequired,
-  setAllOfSomeAssignmentTypeIsLocked: PropTypes.func.isRequired,
 };
 
 export default injectIntl(GradeSummaryTable);

src/course-home/progress-tab/grades/messages.js

@@ -29,14 +29,10 @@ const messages = defineMessages({
     id: 'progress.courseGrade.footer.passing',
     defaultMessage: 'You’re currently passing this course with a grade of {letterGrade} ({minGrade}-{maxGrade}%)',
   },
-  courseGradePreviewHeaderLocked: {
-    id: 'progress.courseGrade.preview.headerLocked',
+  courseGradePreviewHeader: {
+    id: 'progress.courseGrade.preview.header',
     defaultMessage: 'locked feature',
   },
-  courseGradePreviewHeaderLimited: {
-    id: 'progress.courseGrade.preview.headerLimited',
-    defaultMessage: 'limited feature',
-  },
   courseGradePreviewHeaderAriaHidden: {
     id: 'progress.courseGrade.preview.header.ariaHidden',
     defaultMessage: 'Preview of a ',
@@ -45,10 +41,6 @@ const messages = defineMessages({
     id: 'progress.courseGrade.preview.body.unlockCertificate',
     defaultMessage: 'Unlock to view grades and work towards a certificate.',
   },
-  courseGradePartialPreviewUnlockCertificateBody: {
-    id: 'progress.courseGrade.partialpreview.body.unlockCertificate',
-    defaultMessage: 'Unlock to work towards a certificate.',
-  },
   courseGradePreviewUpgradeDeadlinePassedBody: {
     id: 'progress.courseGrade.preview.body.upgradeDeadlinePassed',
     defaultMessage: 'The deadline to upgrade in this course has passed.',
@@ -97,10 +89,6 @@ const messages = defineMessages({
     id: 'progress.gradeSummary',
     defaultMessage: 'Grade summary',
   },
-  gradeSummaryLimitedAccessExplanation: {
-    id: 'progress.gradeSummary.limitedAccessExplanation',
-    defaultMessage: 'You have limited access to graded assignments as part of the audit track in this course.',
-  },
   gradeSummaryTooltipAlt: {
     id: 'progress.gradeSummary.tooltip.alt',
     defaultMessage: 'Grade summary tooltip',
@@ -115,14 +103,6 @@ const messages = defineMessages({
     id: 'progress.courseGrade.label.passingGrade',
     defaultMessage: 'Passing grade',
   },
-  problemScoreLabel: {
-    id: 'progress.detailedGrades.problemScore.label',
-    defaultMessage: 'Problem Scores:',
-  },
-  problemScoreToggleAltText: {
-    id: 'progress.detailedGrades.problemScore.toggleButton',
-    defaultMessage: 'Toggle individual problem scores for {subsectionTitle}',
-  },
   score: {
     id: 'progress.score',
     defaultMessage: 'Score',
@@ -139,14 +119,6 @@ const messages = defineMessages({
     id: 'progress.weightedGradeSummary',
     defaultMessage: 'Your current weighted grade summary',
   },
-  noAcessToAssignmentType: {
-    id: 'progress.noAcessToAssignmentType',
-    defaultMessage: 'You do not have access to assignments of type {assignmentType}',
-  },
-  noAcessToSubsection: {
-    id: 'progress.noAcessToSubsection',
-    defaultMessage: 'You do not have access to subsection {displayName}',
-  },
 });
 
 export default messages;

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

@@ -5,11 +5,6 @@ const messages = defineMessages({
     id: 'progress.header',
     defaultMessage: 'Your progress',
   },
-  progressHeaderForTargetUser: {
-    id: 'progress.header.targetUser',
-    defaultMessage: 'Course progress for {username}',
-    description: 'Header when displaying the progress for a different user',
-  },
   studioLink: {
     id: 'progress.link.studio',
     defaultMessage: 'View grading in Studio',

src/course-home/suggested-schedule-messaging/ShiftDatesAlert.jsx

@@ -1,66 +0,0 @@
-import React from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import PropTypes from 'prop-types';
-
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import {
-  Alert,
-  Button,
-  Row,
-  Col,
-} from '@edx/paragon';
-
-import { resetDeadlines } from '../data';
-import { useModel } from '../../generic/model-store';
-import messages from './messages';
-
-function ShiftDatesAlert({ fetch, intl, model }) {
-  const {
-    courseId,
-  } = useSelector(state => state.courseHome);
-
-  const {
-    datesBannerInfo,
-    hasEnded,
-  } = useModel(model, courseId);
-
-  const {
-    missedDeadlines,
-    missedGatedContent,
-  } = datesBannerInfo;
-
-  if (!missedDeadlines || missedGatedContent || hasEnded) {
-    return null;
-  }
-
-  const dispatch = useDispatch();
-
-  return (
-    <Alert variant="warning">
-      <Row className="w-100 m-0">
-        <Col xs={12} md={9} className="small p-0 pr-md-2">
-          <strong>{intl.formatMessage(messages.missedDeadlines)}</strong>
-          {' '}{intl.formatMessage(messages.shiftDatesBody)}
-        </Col>
-        <Col xs={12} md={3} className="align-self-center text-right mt-3 mt-md-0 p-0">
-          <Button
-            variant="primary"
-            size="sm"
-            className="w-xs-100 w-md-auto"
-            onClick={() => dispatch(resetDeadlines(courseId, model, fetch))}
-          >
-            {intl.formatMessage(messages.shiftDatesButton)}
-          </Button>
-        </Col>
-      </Row>
-    </Alert>
-  );
-}
-
-ShiftDatesAlert.propTypes = {
-  fetch: PropTypes.func.isRequired,
-  intl: intlShape.isRequired,
-  model: PropTypes.string.isRequired,
-};
-
-export default injectIntl(ShiftDatesAlert);

src/course-home/suggested-schedule-messaging/SuggestedScheduleHeader.jsx

@@ -1,18 +0,0 @@
-import React from 'react';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-
-import messages from './messages';
-
-function SuggestedScheduleHeader({ intl }) {
-  return (
-    <p className="large">
-      {intl.formatMessage(messages.suggestedSchedule)}
-    </p>
-  );
-}
-
-SuggestedScheduleHeader.propTypes = {
-  intl: intlShape.isRequired,
-};
-
-export default injectIntl(SuggestedScheduleHeader);

src/course-home/suggested-schedule-messaging/UpgradeToCompleteAlert.jsx

@@ -1,69 +0,0 @@
-import React from 'react';
-import { useSelector } from 'react-redux';
-import PropTypes from 'prop-types';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import {
-  Alert,
-  Button,
-  Col,
-  Row,
-} from '@edx/paragon';
-
-import { useModel } from '../../generic/model-store';
-import messages from './messages';
-
-function UpgradeToCompleteAlert({ intl, logUpgradeLinkClick }) {
-  const {
-    courseId,
-  } = useSelector(state => state.courseHome);
-
-  const {
-    datesBannerInfo,
-    hasEnded,
-  } = useModel('dates', courseId);
-
-  const {
-    contentTypeGatingEnabled,
-    missedDeadlines,
-    verifiedUpgradeLink,
-  } = datesBannerInfo;
-
-  if (!contentTypeGatingEnabled || missedDeadlines || hasEnded || !verifiedUpgradeLink) {
-    return null;
-  }
-
-  return (
-    <Alert className="bg-light-200">
-      <Row className="w-100 m-0">
-        <Col xs={12} md={9} className="small p-0 pr-md-2">
-          <Alert.Heading>{intl.formatMessage(messages.upgradeToCompleteHeader)}</Alert.Heading>
-          {intl.formatMessage(messages.upgradeToCompleteBody)}
-        </Col>
-        <Col xs={12} md={3} className="align-self-center text-right mt-3 mt-md-0 p-0">
-          <Button
-            variant="brand"
-            size="sm"
-            className="w-xs-100 w-md-auto"
-            onClick={() => {
-              logUpgradeLinkClick();
-              global.location.replace(verifiedUpgradeLink);
-            }}
-          >
-            {intl.formatMessage(messages.upgradeToCompleteButton)}
-          </Button>
-        </Col>
-      </Row>
-    </Alert>
-  );
-}
-
-UpgradeToCompleteAlert.propTypes = {
-  intl: intlShape.isRequired,
-  logUpgradeLinkClick: PropTypes.func,
-};
-
-UpgradeToCompleteAlert.defaultProps = {
-  logUpgradeLinkClick: () => {},
-};
-
-export default injectIntl(UpgradeToCompleteAlert);

src/course-home/suggested-schedule-messaging/UpgradeToShiftDatesAlert.jsx

@@ -1,72 +0,0 @@
-import React from 'react';
-import { useSelector } from 'react-redux';
-import PropTypes from 'prop-types';
-
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import {
-  Alert,
-  Button,
-  Row,
-  Col,
-} from '@edx/paragon';
-
-import { useModel } from '../../generic/model-store';
-import messages from './messages';
-
-function UpgradeToShiftDatesAlert({ intl, logUpgradeLinkClick, model }) {
-  const {
-    courseId,
-  } = useSelector(state => state.courseHome);
-
-  const {
-    datesBannerInfo,
-    hasEnded,
-  } = useModel(model, courseId);
-
-  const {
-    contentTypeGatingEnabled,
-    missedDeadlines,
-    missedGatedContent,
-    verifiedUpgradeLink,
-  } = datesBannerInfo;
-
-  if (!(contentTypeGatingEnabled && missedDeadlines && missedGatedContent && verifiedUpgradeLink) || hasEnded) {
-    return null;
-  }
-
-  return (
-    <Alert className="bg-light-200">
-      <Row className="w-100 m-0">
-        <Col xs={12} md={9} className="small p-0 pr-md-2">
-          <strong>{intl.formatMessage(messages.missedDeadlines)}</strong>
-          {' '}{intl.formatMessage(messages.upgradeToShiftBody)}
-        </Col>
-        <Col xs={12} md={3} className="align-self-center text-right mt-3 mt-md-0 p-0">
-          <Button
-            variant="brand"
-            size="sm"
-            className="w-xs-100 w-md-auto"
-            onClick={() => {
-              logUpgradeLinkClick();
-              global.location.replace(verifiedUpgradeLink);
-            }}
-          >
-            {intl.formatMessage(messages.upgradeToShiftButton)}
-          </Button>
-        </Col>
-      </Row>
-    </Alert>
-  );
-}
-
-UpgradeToShiftDatesAlert.propTypes = {
-  intl: intlShape.isRequired,
-  logUpgradeLinkClick: PropTypes.func,
-  model: PropTypes.string.isRequired,
-};
-
-UpgradeToShiftDatesAlert.defaultProps = {
-  logUpgradeLinkClick: () => {},
-};
-
-export default injectIntl(UpgradeToShiftDatesAlert);

src/course-home/suggested-schedule-messaging/index.js

@@ -1,11 +0,0 @@
-import ShiftDatesAlert from './ShiftDatesAlert';
-import SuggestedScheduleHeader from './SuggestedScheduleHeader';
-import UpgradeToCompleteAlert from './UpgradeToCompleteAlert';
-import UpgradeToShiftDatesAlert from './UpgradeToShiftDatesAlert';
-
-export {
-  ShiftDatesAlert,
-  SuggestedScheduleHeader,
-  UpgradeToCompleteAlert,
-  UpgradeToShiftDatesAlert,
-};

src/course-home/suggested-schedule-messaging/messages.js

@@ -1,51 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  suggestedSchedule: {
-    id: 'datesBanner.suggestedSchedule',
-    defaultMessage: 'We’ve built a suggested schedule to help you stay on track. But don’t worry—it’s flexible so you'
-      + ' can learn at your own pace.',
-  },
-  upgradeToCompleteHeader: {
-    id: 'datesBanner.upgradeToCompleteGradedBanner.header',
-    defaultMessage: 'Upgrade to unlock',
-    description: 'Messaging that prompts users to upgrade their course status in order to access locked course content',
-  },
-  upgradeToCompleteBody: {
-    id: 'datesBanner.upgradeToCompleteGradedBanner.body',
-    defaultMessage: 'You are auditing this course, which means that you are unable to participate in graded'
-      + ' assignments. To complete graded assignments as part of this course, you can upgrade today.',
-  },
-  upgradeToCompleteButton: {
-    id: 'datesBanner.upgradeToCompleteGradedBanner.button',
-    defaultMessage: 'Upgrade now',
-    description: 'Button that prompts users to upgrade their course status',
-  },
-  upgradeToShiftBody: {
-    id: 'datesBanner.upgradeToResetBanner.body',
-    defaultMessage: '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.',
-  },
-  upgradeToShiftButton: {
-    id: 'datesBanner.upgradeToResetBanner.button',
-    defaultMessage: 'Upgrade to shift due dates',
-    description: 'Button that prompts users to upgrade their course status before they can shift their due dates into'
-      + ' the future',
-  },
-  missedDeadlines: {
-    id: 'datesBanner.resetDatesBanner.header',
-    defaultMessage: 'It looks like you missed some important deadlines based on our suggested schedule.',
-  },
-  shiftDatesBody: {
-    id: 'datesBanner.resetDatesBanner.body',
-    defaultMessage: '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.',
-  },
-  shiftDatesButton: {
-    id: 'datesBanner.resetDatesBanner.button',
-    defaultMessage: 'Shift due dates',
-    description: 'Button that prompts users to move their due dates into the future',
-  },
-});
-
-export default messages;

src/courseware/CoursewareContainer.jsx

@@ -2,6 +2,8 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { history } from '@edx/frontend-platform';
+import { getLocale } from '@edx/frontend-platform/i18n';
+import { Redirect } from 'react-router';
 import { createSelector } from '@reduxjs/toolkit';
 import { defaultMemoize as memoize } from 'reselect';
 
@@ -17,21 +19,15 @@ import { TabPage } from '../tab-page';
 import Course from './course';
 import { handleNextSectionCelebration } from './course/celebration';
 
-const checkUrlLength = memoize((shortLinkFeatureFlag, courseStatus, courseId, sequence, unitHashKey) => {
-  if (shortLinkFeatureFlag && courseStatus === 'loaded' && sequence && unitHashKey) {
-    history.replace(`/c/${courseId}/${sequence.hash_key}/${unitHashKey}`);
-  }
-});
-
 const checkResumeRedirect = memoize((courseStatus, courseId, sequenceId, firstSequenceId) => {
   if (courseStatus === 'loaded' && !sequenceId) {
     // Note that getResumeBlock is just an API call, not a redux thunk.
     getResumeBlock(courseId).then((data) => {
       // This is a replace because we don't want this change saved in the browser's history.
       if (data.sectionId && data.unitId) {
-        history.replace(`/c/${courseId}/${data.sectionId}/${data.unitId}`);
+        history.replace(`/course/${courseId}/${data.sectionId}/${data.unitId}`);
       } else if (firstSequenceId) {
-        history.replace(`/c/${courseId}/${firstSequenceId}`);
+        history.replace(`/course/${courseId}/${firstSequenceId}`);
       }
     });
   }
@@ -39,7 +35,7 @@ const checkResumeRedirect = memoize((courseStatus, courseId, sequenceId, firstSe
 
 const checkSectionUnitToUnitRedirect = memoize((courseStatus, courseId, sequenceStatus, section, unitId) => {
   if (courseStatus === 'loaded' && sequenceStatus === 'failed' && section && unitId) {
-    history.replace(`/c/${courseId}/${unitId}`);
+    history.replace(`/course/${courseId}/${unitId}`);
   }
 });
 
@@ -47,10 +43,10 @@ const checkSectionToSequenceRedirect = memoize((courseStatus, courseId, sequence
   if (courseStatus === 'loaded' && sequenceStatus === 'failed' && section && !unitId) {
     // If the section is non-empty, redirect to its first sequence.
     if (section.sequenceIds && section.sequenceIds[0]) {
-      history.replace(`/c/${courseId}/${section.sequenceIds[0]}`);
+      history.replace(`/course/${courseId}/${section.sequenceIds[0]}`);
     // Otherwise, just go to the course root, letting the resume redirect take care of things.
     } else {
-      history.replace(`/c/${courseId}`);
+      history.replace(`/course/${courseId}`);
     }
   }
 });
@@ -59,15 +55,13 @@ const checkUnitToSequenceUnitRedirect = memoize((courseStatus, courseId, sequenc
   if (courseStatus === 'loaded' && sequenceStatus === 'failed' && unit) {
     // If the sequence failed to load as a sequence, but it *did* load as a unit, then
     // insert the unit's parent sequenceId into the URL.
-    history.replace(`/c/${courseId}/${unit.sequenceId}/${unit.id}`);
+    history.replace(`/course/${courseId}/${unit.sequenceId}/${unit.id}`);
   }
 });
 
-const checkSpecialExamRedirect = memoize((sequenceStatus, sequence, specialExamsEnabled, proctoredExamsEnabled) => {
+const checkSpecialExamRedirect = memoize((sequenceStatus, sequence) => {
   if (sequenceStatus === 'loaded') {
-    const shouldRedirectTimeLimited = sequence.isTimeLimited && !specialExamsEnabled;
-    const shouldRedirectProctored = sequence.isProctored && !proctoredExamsEnabled;
-    if ((shouldRedirectTimeLimited || shouldRedirectProctored) && sequence.legacyWebUrl !== undefined) {
+    if (sequence.isTimeLimited && sequence.legacyWebUrl !== undefined) {
       global.location.assign(sequence.legacyWebUrl);
     }
   }
@@ -78,7 +72,7 @@ const checkSequenceToSequenceUnitRedirect = memoize((courseId, sequenceStatus, s
     if (sequence.unitIds !== undefined && sequence.unitIds.length > 0) {
       const nextUnitId = sequence.unitIds[sequence.activeUnitIndex];
       // This is a replace because we don't want this change saved in the browser's history.
-      history.replace(`/c/${courseId}/${sequence.id}/${nextUnitId}`);
+      history.replace(`/course/${courseId}/${sequence.id}/${nextUnitId}`);
     }
   }
 });
@@ -112,13 +106,13 @@ class CoursewareContainer extends Component {
       match: {
         params: {
           courseId: routeCourseId,
-          sequenceId: routeSequenceHash,
+          sequenceId: routeSequenceId,
         },
       },
     } = this.props;
     // Load data whenever the course or sequence ID changes.
     this.checkFetchCourse(routeCourseId);
-    this.checkFetchSequence(routeSequenceHash);
+    this.checkFetchSequence(routeSequenceId);
   }
 
   componentDidUpdate() {
@@ -133,28 +127,18 @@ class CoursewareContainer extends Component {
       firstSequenceId,
       unitViaSequenceId,
       sectionViaSequenceId,
-      unitIdHashKeyMap,
-      shortLinkFeatureFlag,
       match: {
         params: {
           courseId: routeCourseId,
-          sequenceId: routeSequenceHash,
+          sequenceId: routeSequenceId,
           unitId: routeUnitId,
         },
       },
     } = this.props;
+
     // Load data whenever the course or sequence ID changes.
     this.checkFetchCourse(routeCourseId);
-    this.checkFetchSequence(routeSequenceHash);
-    if (sequence && routeSequenceHash.includes('block') && unitIdHashKeyMap) {
-      let unitHashKey;
-      Object.values(unitIdHashKeyMap).forEach(id => {
-        if (id === routeUnitId) {
-          unitHashKey = Object.keys(unitIdHashKeyMap).find(key => unitIdHashKeyMap[key] === id);
-        }
-      });
-      checkUrlLength(shortLinkFeatureFlag, courseStatus, courseId, sequence, unitHashKey);
-    }
+    this.checkFetchSequence(routeSequenceId);
 
     // All courseware URLs should normalize to the format /course/:courseId/:sequenceId/:unitId
     // via the series of redirection rules below.
@@ -194,7 +178,11 @@ class CoursewareContainer extends Component {
     // Check special exam redirect:
     //    /course/:courseId/:sequenceId(/:unitId) -> :legacyWebUrl
     // because special exams are currently still served in the legacy LMS frontend.
-    checkSpecialExamRedirect(sequenceStatus, sequence, specialExamsEnabledWaffleFlag, proctoredExamsEnabledWaffleFlag);
+    const shouldRedirectProctoredExams = specialExamsEnabledWaffleFlag && sequence.isProctored
+      && !proctoredExamsEnabledWaffleFlag;
+    if (!specialExamsEnabledWaffleFlag || shouldRedirectProctoredExams) {
+      checkSpecialExamRedirect(sequenceStatus, sequence);
+    }
 
     // Check to sequence to sequence-unit redirect:
     //    /course/:courseId/:sequenceId -> /course/:courseId/:sequenceId/:unitId
@@ -217,7 +205,7 @@ class CoursewareContainer extends Component {
     } = this.props;
 
     this.props.checkBlockCompletion(courseId, sequenceId, routeUnitId);
-    history.push(`/c/${courseId}/${sequenceId}/${nextUnitId}`);
+    history.push(`/course/${courseId}/${sequenceId}/${nextUnitId}`);
   }
 
   handleNextSequenceClick = () => {
@@ -227,20 +215,16 @@ class CoursewareContainer extends Component {
       nextSequence,
       sequence,
       sequenceId,
-      shortLinkFeatureFlag,
     } = this.props;
+
     if (nextSequence !== null) {
-      let nextSequenceParam = nextSequence.id;
-      if (shortLinkFeatureFlag) {
-        nextSequenceParam = nextSequence.hash_key;
-      }
       let nextUnitId = null;
       if (nextSequence.unitIds.length > 0) {
         [nextUnitId] = nextSequence.unitIds;
-        history.push(`/c/${courseId}/${nextSequenceParam}/${nextUnitId}`);
+        history.push(`/course/${courseId}/${nextSequence.id}/${nextUnitId}`);
       } else {
         // Some sequences have no units.  This will show a blank page with prev/next buttons.
-        history.push(`/c/${courseId}/${nextSequenceParam}`);
+        history.push(`/course/${courseId}/${nextSequence.id}`);
       }
 
       const celebrateFirstSection = course && course.celebrations && course.celebrations.firstSection;
@@ -251,34 +235,59 @@ class CoursewareContainer extends Component {
   }
 
   handlePreviousSequenceClick = () => {
-    const {
-      previousSequence,
-      courseId,
-      shortLinkFeatureFlag,
-    } = this.props;
+    const { previousSequence, courseId } = this.props;
     if (previousSequence !== null) {
-      let previousSequenceParam = previousSequence.id;
-      if (shortLinkFeatureFlag) {
-        previousSequenceParam = previousSequence.hash_key;
-      }
       if (previousSequence.unitIds.length > 0) {
         const previousUnitId = previousSequence.unitIds[previousSequence.unitIds.length - 1];
-        history.push(`/c/${courseId}/${previousSequenceParam}/${previousUnitId}`);
+        history.push(`/course/${courseId}/${previousSequence.id}/${previousUnitId}`);
       } else {
         // Some sequences have no units.  This will show a blank page with prev/next buttons.
-        history.push(`/c/${courseId}/${previousSequenceParam}`);
+        history.push(`/course/${courseId}/${previousSequence.id}`);
       }
     }
   }
 
+  renderDenied() {
+    const {
+      course,
+      courseId,
+      match: {
+        params: {
+          unitId: routeUnitId,
+        },
+      },
+    } = this.props;
+    let url = `/redirect/course-home/${courseId}`;
+    switch (course.canLoadCourseware.errorCode) {
+      case 'audit_expired':
+        url = `/redirect/dashboard?access_response_error=${course.canLoadCourseware.additionalContextUserMessage}`;
+        break;
+      case 'course_not_started':
+        // eslint-disable-next-line no-case-declarations
+        const startDate = (new Intl.DateTimeFormat(getLocale())).format(new Date(course.start));
+        url = `/redirect/dashboard?notlive=${startDate}`;
+        break;
+      case 'survey_required': // TODO: Redirect to the course survey
+      case 'unfulfilled_milestones':
+        url = '/redirect/dashboard';
+        break;
+      case 'microfrontend_disabled':
+        url = `/redirect/courseware/${courseId}/unit/${routeUnitId}`;
+        break;
+      case 'authentication_required':
+      case 'enrollment_required':
+      default:
+    }
+    return (
+      <Redirect to={url} />
+    );
+  }
+
   render() {
     const {
       courseStatus,
       courseId,
       sequenceId,
-      sequence,
-      shortLinkFeatureFlag,
-      unitIdHashKeyMap,
       match: {
         params: {
           unitId: routeUnitId,
@@ -286,30 +295,22 @@ class CoursewareContainer extends Component {
       },
     } = this.props;
 
-    // This helps process old URLS that still use a blocks usage key in the URL.
-    let updatedSequenceId;
-    let updatedUnitId;
-    if (shortLinkFeatureFlag && sequence) {
-      if (!sequenceId.includes('block')) {
-        updatedSequenceId = sequence.id;
-      }
-      if (routeUnitId && !routeUnitId.includes('block')) {
-        updatedUnitId = unitIdHashKeyMap[routeUnitId];
-      }
+    if (courseStatus === 'denied') {
+      return this.renderDenied();
     }
 
     return (
       <TabPage
         activeTabSlug="courseware"
         courseId={courseId}
-        unitId={updatedUnitId || routeUnitId}
+        unitId={routeUnitId}
         courseStatus={courseStatus}
         metadataModel="coursewareMeta"
       >
         <Course
           courseId={courseId}
-          sequenceId={updatedSequenceId || sequenceId}
-          unitId={updatedUnitId || routeUnitId}
+          sequenceId={sequenceId}
+          unitId={routeUnitId}
           nextSequenceHandler={this.handleNextSequenceClick}
           previousSequenceHandler={this.handlePreviousSequenceClick}
           unitNavigationHandler={this.handleUnitNavigationClick}
@@ -328,7 +329,6 @@ const sequenceShape = PropTypes.shape({
   id: PropTypes.string.isRequired,
   unitIds: PropTypes.arrayOf(PropTypes.string).isRequired,
   sectionId: PropTypes.string.isRequired,
-  hash_key: PropTypes.string.isRequired,
   isTimeLimited: PropTypes.bool,
   isProctored: PropTypes.bool,
   legacyWebUrl: PropTypes.string,
@@ -340,9 +340,10 @@ const sectionShape = PropTypes.shape({
 });
 
 const courseShape = PropTypes.shape({
-  celebrations: PropTypes.shape({
-    firstSection: PropTypes.bool,
-  }),
+  canLoadCourseware: PropTypes.shape({
+    errorCode: PropTypes.string,
+    additionalContextUserMessage: PropTypes.string,
+  }).isRequired,
 });
 
 CoursewareContainer.propTypes = {
@@ -362,7 +363,6 @@ CoursewareContainer.propTypes = {
   previousSequence: sequenceShape,
   unitViaSequenceId: unitShape,
   sectionViaSequenceId: sectionShape,
-  unitIdHashKeyMap: unitShape,
   course: courseShape,
   sequence: sequenceShape,
   saveSequencePosition: PropTypes.func.isRequired,
@@ -371,7 +371,6 @@ CoursewareContainer.propTypes = {
   fetchSequence: PropTypes.func.isRequired,
   specialExamsEnabledWaffleFlag: PropTypes.bool.isRequired,
   proctoredExamsEnabledWaffleFlag: PropTypes.bool.isRequired,
-  shortLinkFeatureFlag: PropTypes.bool.isRequired,
 };
 
 CoursewareContainer.defaultProps = {
@@ -384,7 +383,6 @@ CoursewareContainer.defaultProps = {
   sectionViaSequenceId: null,
   course: null,
   sequence: null,
-  unitIdHashKeyMap: null,
 };
 
 const currentCourseSelector = createSelector(
@@ -396,16 +394,7 @@ const currentCourseSelector = createSelector(
 const currentSequenceSelector = createSelector(
   (state) => state.models.sequences || {},
   (state) => state.courseware.sequenceId,
-  (state) => state.models.sequenceIdToHashKeyMap,
-  (sequencesById, sequenceId, sequenceMap) => {
-    if (!sequencesById[sequenceId] && Object.keys(sequencesById).length > 0 && sequenceMap) {
-      if (sequenceId in sequenceMap) {
-        const updatedSequenceId = sequenceMap[sequenceId];
-        return sequencesById[updatedSequenceId];
-      }
-    }
-    return sequencesById[sequenceId] ? sequencesById[sequenceId] : null;
-  },
+  (sequencesById, sequenceId) => (sequencesById[sequenceId] ? sequencesById[sequenceId] : null),
 );
 
 const sequenceIdsSelector = createSelector(
@@ -425,18 +414,11 @@ const previousSequenceSelector = createSelector(
   sequenceIdsSelector,
   (state) => state.models.sequences || {},
   (state) => state.courseware.sequenceId,
-  (state) => state.models.sequenceIdToHashKeyMap,
-  (sequenceIds, sequencesById, sequenceId, sequenceMap) => {
+  (sequenceIds, sequencesById, sequenceId) => {
     if (!sequenceId || sequenceIds.length === 0) {
       return null;
     }
-    let sequenceIndex = sequenceIds.indexOf(sequenceId);
-    if (!sequencesById[sequenceId] && Object.keys(sequencesById).length > 0 && sequenceMap) {
-      if (sequenceId in sequenceMap) {
-        const updatedSequenceId = sequenceMap[sequenceId];
-        sequenceIndex = sequenceIds.indexOf(updatedSequenceId);
-      }
-    }
+    const sequenceIndex = sequenceIds.indexOf(sequenceId);
     const previousSequenceId = sequenceIndex > 0 ? sequenceIds[sequenceIndex - 1] : null;
     return previousSequenceId !== null ? sequencesById[previousSequenceId] : null;
   },
@@ -446,18 +428,11 @@ const nextSequenceSelector = createSelector(
   sequenceIdsSelector,
   (state) => state.models.sequences || {},
   (state) => state.courseware.sequenceId,
-  (state) => state.models.sequenceIdToHashKeyMap,
-  (sequenceIds, sequencesById, sequenceId, sequenceMap) => {
+  (sequenceIds, sequencesById, sequenceId) => {
     if (!sequenceId || sequenceIds.length === 0) {
       return null;
     }
-    let sequenceIndex = sequenceIds.indexOf(sequenceId);
-    if (!sequencesById[sequenceId] && Object.keys(sequencesById).length > 0 && sequenceMap) {
-      if (sequenceId in sequenceMap) {
-        const updatedSequenceId = sequenceMap[sequenceId];
-        sequenceIndex = sequenceIds.indexOf(updatedSequenceId);
-      }
-    }
+    const sequenceIndex = sequenceIds.indexOf(sequenceId);
     const nextSequenceId = sequenceIndex < sequenceIds.length - 1 ? sequenceIds[sequenceIndex + 1] : null;
     return nextSequenceId !== null ? sequencesById[nextSequenceId] : null;
   },
@@ -490,21 +465,7 @@ const sectionViaSequenceIdSelector = createSelector(
 const unitViaSequenceIdSelector = createSelector(
   (state) => state.models.units || {},
   (state) => state.courseware.sequenceId,
-  (state) => state.models.unitIdHashKeyMap,
-  (unitsById, sequenceId, unitMap) => {
-    if (!unitsById[sequenceId] && Object.keys(unitsById).length > 0 && unitMap) {
-      if (sequenceId in unitMap) {
-        const updatedSequenceId = unitMap[sequenceId];
-        return unitsById[updatedSequenceId];
-      }
-    }
-    return unitsById[sequenceId] ? unitsById[sequenceId] : null;
-  },
-);
-
-const unitIdHashKeyMapSelector = createSelector(
-  (state) => state.models.unitIdToHashKeyMap,
-  (unitIdToHashKeyMap) => (unitIdToHashKeyMap),
+  (unitsById, sequenceId) => (unitsById[sequenceId] ? unitsById[sequenceId] : null),
 );
 
 const mapStateToProps = (state) => {
@@ -515,7 +476,6 @@ const mapStateToProps = (state) => {
     sequenceStatus,
     specialExamsEnabledWaffleFlag,
     proctoredExamsEnabledWaffleFlag,
-    shortLinkFeatureFlag,
   } = state.courseware;
 
   return {
@@ -525,7 +485,6 @@ const mapStateToProps = (state) => {
     sequenceStatus,
     specialExamsEnabledWaffleFlag,
     proctoredExamsEnabledWaffleFlag,
-    shortLinkFeatureFlag,
     course: currentCourseSelector(state),
     sequence: currentSequenceSelector(state),
     previousSequence: previousSequenceSelector(state),
@@ -533,7 +492,6 @@ const mapStateToProps = (state) => {
     firstSequenceId: firstSequenceIdSelector(state),
     sectionViaSequenceId: sectionViaSequenceIdSelector(state),
     unitViaSequenceId: unitViaSequenceIdSelector(state),
-    unitIdHashKeyMap: unitIdHashKeyMapSelector(state),
   };
 };
 

src/courseware/CoursewareContainer.test.jsx

@@ -85,9 +85,9 @@ describe('CoursewareContainer', () => {
           <Switch>
             <Route
               path={[
-                '/c/:courseId/:sequenceId/:unitId',
-                '/c/:courseId/:sequenceId',
-                '/c/:courseId',
+                '/course/:courseId/:sequenceId/:unitId',
+                '/course/:courseId/:sequenceId',
+                '/course/:courseId',
               ]}
               component={CoursewareContainer}
             />
@@ -121,17 +121,12 @@ describe('CoursewareContainer', () => {
     const courseBlocksUrlRegExp = new RegExp(`${getConfig().LMS_BASE_URL}/api/courses/v2/blocks/*`);
     axiosMock.onGet(courseBlocksUrlRegExp).reply(200, courseBlocks);
 
-    const learningSequencesUrlRegExp = new RegExp(`${getConfig().LMS_BASE_URL}/api/learning_sequences/v1/course_outline/*`);
-    axiosMock.onGet(learningSequencesUrlRegExp).reply(403, {});
-
     const courseMetadataUrl = appendBrowserTimezoneToUrl(`${getConfig().LMS_BASE_URL}/api/courseware/course/${courseId}`);
     axiosMock.onGet(courseMetadataUrl).reply(200, courseMetadata);
 
     sequenceMetadatas.forEach(sequenceMetadata => {
-      const sequenceMetadataUrl = `${getConfig().LMS_BASE_URL}/api/courseware/sequence/${sequenceMetadata.hash_key}`;
+      const sequenceMetadataUrl = `${getConfig().LMS_BASE_URL}/api/courseware/sequence/${sequenceMetadata.item_id}`;
       axiosMock.onGet(sequenceMetadataUrl).reply(200, sequenceMetadata);
-      const sequenceMetadataUrlFull = `${getConfig().LMS_BASE_URL}/api/courseware/sequence/${sequenceMetadata.item_id}`;
-      axiosMock.onGet(sequenceMetadataUrlFull).reply(200, sequenceMetadata);
       const proctoredExamApiUrl = `${getConfig().LMS_BASE_URL}/api/edx_proctoring/v1/proctored_exam/attempt/course_id/${courseId}/content_id/${sequenceMetadata.item_id}?is_learning_mfe=true`;
       axiosMock.onGet(proctoredExamApiUrl).reply(200, { exam: {}, active_attempt: {} });
     });
@@ -146,7 +141,7 @@ describe('CoursewareContainer', () => {
   }
 
   it('should initialize to show a spinner', () => {
-    history.push('/c/abc123');
+    history.push('/course/abc123');
     render(component);
 
     const spinner = screen.getByRole('status');
@@ -192,11 +187,11 @@ describe('CoursewareContainer', () => {
 
       it('should use the resume block repsonse to pick a unit if it contains one', async () => {
         axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/courseware/resume/${courseId}`).reply(200, {
-          sectionId: sequenceBlock.hash_key,
-          unitId: unitBlocks[1].hash_key,
+          sectionId: sequenceBlock.id,
+          unitId: unitBlocks[1].id,
         });
 
-        history.push(`/c/${courseId}`);
+        history.push(`/course/${courseId}`);
         const container = await loadContainer();
 
         assertLoadedHeader(container);
@@ -204,7 +199,7 @@ describe('CoursewareContainer', () => {
 
         expect(container.querySelector('.fake-unit')).toHaveTextContent('Unit Contents');
         expect(container.querySelector('.fake-unit')).toHaveTextContent(courseId);
-        expect(container.querySelector('.fake-unit')).toHaveTextContent(unitBlocks[1].hash_key);
+        expect(container.querySelector('.fake-unit')).toHaveTextContent(unitBlocks[1].id);
       });
 
       it('should use the first sequence ID and activeUnitIndex if the resume block response is empty', async () => {
@@ -219,7 +214,7 @@ describe('CoursewareContainer', () => {
         // Note how there is no sectionId/unitId returned in this mock response!
         axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/courseware/resume/${courseId}`).reply(200, {});
 
-        history.push(`/c/${courseId}`);
+        history.push(`/course/${courseId}`);
         const container = await loadContainer();
 
         assertLoadedHeader(container);
@@ -239,11 +234,11 @@ describe('CoursewareContainer', () => {
       );
 
       function setUrl(urlSequenceId, urlUnitId = null) {
-        history.push(`/c/${courseId}/${urlSequenceId}/${urlUnitId || ''}`);
+        history.push(`/course/${courseId}/${urlSequenceId}/${urlUnitId || ''}`);
       }
 
       function assertLocation(container, sequenceId, unitId) {
-        const expectedUrl = `http://localhost/c/${courseId}/${sequenceId}/${unitId}`;
+        const expectedUrl = `http://localhost/course/${courseId}/${sequenceId}/${unitId}`;
         expect(global.location.href).toEqual(expectedUrl);
         expect(container.querySelector('.fake-unit')).toHaveTextContent(unitId);
       }
@@ -259,7 +254,7 @@ describe('CoursewareContainer', () => {
           const container = await loadContainer();
           assertLoadedHeader(container);
           assertSequenceNavigation(container, 2);
-          assertLocation(container, sequenceTree[1][1].hash_key, urlUnit.hash_key);
+          assertLocation(container, sequenceTree[1][1].id, urlUnit.id);
         });
       });
 
@@ -269,7 +264,7 @@ describe('CoursewareContainer', () => {
           const container = await loadContainer();
           assertLoadedHeader(container);
           assertSequenceNavigation(container, 2);
-          assertLocation(container, sequenceTree[1][0].hash_key, unitTree[1][0][0].hash_key);
+          assertLocation(container, sequenceTree[1][0].id, unitTree[1][0][0].id);
         });
       });
 
@@ -295,14 +290,14 @@ describe('CoursewareContainer', () => {
         it('should ignore the section ID and instead redirect to the course root', async () => {
           setUrl(sectionTree[1].id);
           await loadContainer();
-          expect(global.location.href).toEqual(`http://localhost/c/${courseId}`);
+          expect(global.location.href).toEqual(`http://localhost/course/${courseId}`);
         });
 
         it('should ignore the section and unit IDs and instead to the course root', async () => {
           // Specific unit ID used here shouldn't matter; is ignored due to empty section.
           setUrl(sectionTree[1].id, unitTree[0][0][0]);
           await loadContainer();
-          expect(global.location.href).toEqual(`http://localhost/c/${courseId}`);
+          expect(global.location.href).toEqual(`http://localhost/course/${courseId}`);
         });
       });
     });
@@ -316,15 +311,15 @@ describe('CoursewareContainer', () => {
 
       it('should insert the sequence ID into the URL', async () => {
         const unit = unitTree[1][0][1];
-        history.push(`/c/${courseId}/${unit.id}`);
+        history.push(`/course/${courseId}/${unit.id}`);
         const container = await loadContainer();
 
         assertLoadedHeader(container);
         assertSequenceNavigation(container, 2);
-        const expectedSequenceId = sequenceTree[1][0].hash_key;
-        const expectedUrl = `http://localhost/c/${courseId}/${expectedSequenceId}/${unit.hash_key}`;
+        const expectedSequenceId = sequenceTree[1][0].id;
+        const expectedUrl = `http://localhost/course/${courseId}/${expectedSequenceId}/${unit.id}`;
         expect(global.location.href).toEqual(expectedUrl);
-        expect(container.querySelector('.fake-unit')).toHaveTextContent(unit.hash_key);
+        expect(container.querySelector('.fake-unit')).toHaveTextContent(unit.id);
       });
     });
 
@@ -333,7 +328,7 @@ describe('CoursewareContainer', () => {
       const unitBlocks = defaultUnitBlocks;
 
       it('should pick the first unit if position was not defined (activeUnitIndex becomes 0)', async () => {
-        history.push(`/c/${courseId}/${sequenceBlock.hash_key}`);
+        history.push(`/course/${courseId}/${sequenceBlock.id}`);
         const container = await loadContainer();
 
         assertLoadedHeader(container);
@@ -341,7 +336,7 @@ describe('CoursewareContainer', () => {
 
         expect(container.querySelector('.fake-unit')).toHaveTextContent('Unit Contents');
         expect(container.querySelector('.fake-unit')).toHaveTextContent(courseId);
-        expect(container.querySelector('.fake-unit')).toHaveTextContent(unitBlocks[0].hash_key);
+        expect(container.querySelector('.fake-unit')).toHaveTextContent(unitBlocks[0].id);
       });
 
       it('should use activeUnitIndex to pick a unit from the sequence', async () => {
@@ -352,7 +347,7 @@ describe('CoursewareContainer', () => {
         );
         setUpMockRequests({ sequenceMetadatas: [sequenceMetadata] });
 
-        history.push(`/c/${courseId}/${sequenceBlock.hash_key}`);
+        history.push(`/course/${courseId}/${sequenceBlock.id}`);
         const container = await loadContainer();
 
         assertLoadedHeader(container);
@@ -360,7 +355,7 @@ describe('CoursewareContainer', () => {
 
         expect(container.querySelector('.fake-unit')).toHaveTextContent('Unit Contents');
         expect(container.querySelector('.fake-unit')).toHaveTextContent(courseId);
-        expect(container.querySelector('.fake-unit')).toHaveTextContent(unitBlocks[2].hash_key);
+        expect(container.querySelector('.fake-unit')).toHaveTextContent(unitBlocks[2].id);
       });
     });
 
@@ -369,7 +364,7 @@ describe('CoursewareContainer', () => {
       const unitBlocks = defaultUnitBlocks;
 
       it('should load the specified unit', async () => {
-        history.push(`/c/${courseId}/${sequenceBlock.hash_key}/${unitBlocks[2].hash_key}`);
+        history.push(`/course/${courseId}/${sequenceBlock.id}/${unitBlocks[2].id}`);
         const container = await loadContainer();
 
         assertLoadedHeader(container);
@@ -377,7 +372,7 @@ describe('CoursewareContainer', () => {
 
         expect(container.querySelector('.fake-unit')).toHaveTextContent('Unit Contents');
         expect(container.querySelector('.fake-unit')).toHaveTextContent(courseId);
-        expect(container.querySelector('.fake-unit')).toHaveTextContent(unitBlocks[2].hash_key);
+        expect(container.querySelector('.fake-unit')).toHaveTextContent(unitBlocks[2].id);
       });
 
       it('should navigate between units and check block completion', async () => {
@@ -385,7 +380,7 @@ describe('CoursewareContainer', () => {
           complete: true,
         });
 
-        history.push(`/c/${courseId}/${sequenceBlock.hash_key}/${unitBlocks[0].id}`);
+        history.push(`/course/${courseId}/${sequenceBlock.id}/${unitBlocks[0].id}`);
         const container = await loadContainer();
 
         const sequenceNavButtons = container.querySelectorAll('nav.sequence-navigation button');
@@ -393,7 +388,7 @@ describe('CoursewareContainer', () => {
         expect(sequenceNextButton).toHaveTextContent('Next');
         fireEvent.click(sequenceNavButtons[4]);
 
-        expect(global.location.href).toEqual(`http://localhost/c/${courseId}/${sequenceBlock.hash_key}/${unitBlocks[1].id}`);
+        expect(global.location.href).toEqual(`http://localhost/course/${courseId}/${sequenceBlock.id}/${unitBlocks[1].id}`);
       });
     });
 
@@ -421,7 +416,7 @@ describe('CoursewareContainer', () => {
         );
         setUpMockRequests({ sequenceMetadatas: [sequenceMetadata] });
 
-        history.push(`/c/${courseId}/${sequenceBlock.hash_key}/${unitBlocks[2].hash_key}`);
+        history.push(`/course/${courseId}/${sequenceBlock.id}/${unitBlocks[2].id}`);
         await loadContainer();
 
         expect(global.location.assign).toHaveBeenCalledWith(sequenceBlock.legacy_web_url);
@@ -429,46 +424,31 @@ describe('CoursewareContainer', () => {
     });
   });
 
-  describe('when receiving a course_access error_code', () => {
+  describe('when receiving a can_load_courseware error_code', () => {
     function setUpWithDeniedStatus(errorCode) {
       const courseMetadata = Factory.build('courseMetadata', {
-        course_access: {
+        can_load_courseware: {
           has_access: false,
           error_code: errorCode,
           additional_context_user_message: 'uhoh oh no', // only used by audit_expired
         },
       });
       const courseId = courseMetadata.id;
-
-      const { courseBlocks, sequenceBlocks, unitBlocks } = buildSimpleCourseBlocks(courseId, courseMetadata.name);
+      const { courseBlocks } = buildSimpleCourseBlocks(courseId, courseMetadata.name);
       setUpMockRequests({ courseBlocks, courseMetadata });
-      history.push(`/c/${courseId}/${sequenceBlocks[0].hash_key}/${unitBlocks[0].hash_key}`);
-      return { courseMetadata, unitBlocks };
+      history.push(`/course/${courseId}`);
+      return courseMetadata;
     }
 
     it('should go to course home for an enrollment_required error code', async () => {
-      const { courseMetadata } = setUpWithDeniedStatus('enrollment_required');
+      const courseMetadata = setUpWithDeniedStatus('enrollment_required');
       await loadContainer();
 
       expect(global.location.href).toEqual(`http://localhost/redirect/course-home/${courseMetadata.id}`);
     });
 
-    it('should go to course survey for a survey_required error code', async () => {
-      const { courseMetadata } = setUpWithDeniedStatus('survey_required');
-      await loadContainer();
-
-      expect(global.location.href).toEqual(`http://localhost/redirect/survey/${courseMetadata.id}`);
-    });
-
-    it('should go to legacy courseware for a microfrontend_disabled error code', async () => {
-      const { courseMetadata, unitBlocks } = setUpWithDeniedStatus('microfrontend_disabled');
-      await loadContainer();
-
-      expect(global.location.href).toEqual(`http://localhost/redirect/courseware/${courseMetadata.id}/unit/${unitBlocks[0].id}`);
-    });
-
     it('should go to course home for an authentication_required error code', async () => {
-      const { courseMetadata } = setUpWithDeniedStatus('authentication_required');
+      const courseMetadata = setUpWithDeniedStatus('authentication_required');
       await loadContainer();
 
       expect(global.location.href).toEqual(`http://localhost/redirect/course-home/${courseMetadata.id}`);

src/courseware/CoursewareRedirectLandingPage.jsx

@@ -25,24 +25,12 @@ export default () => {
           path={`${path}/courseware/:courseId/unit/:unitId`}
           component={CoursewareRedirect}
         />
-        <PageRoute
-          path={`${path}/:courseId/:sequenceId/:unitId`}
-          render={({ match }) => {
-            global.location.assign(`/c/${match.params.courseId}/${match.params.sequenceId}/${match.params.unitId}`);
-          }}
-        />
         <PageRoute
           path={`${path}/course-home/:courseId`}
           render={({ match }) => {
             global.location.assign(`${getConfig().LMS_BASE_URL}/courses/${match.params.courseId}/course/`);
           }}
         />
-        <PageRoute
-          path={`${path}/survey/:courseId`}
-          render={({ match }) => {
-            global.location.assign(`${getConfig().LMS_BASE_URL}/courses/${match.params.courseId}/survey`);
-          }}
-        />
         <PageRoute
           path={`${path}/dashboard`}
           render={({ location }) => {

src/courseware/course/Course.jsx

@@ -2,17 +2,21 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { Helmet } from 'react-helmet';
 import { useDispatch } from 'react-redux';
+import Cookies from 'js-cookie';
 import { getConfig } from '@edx/frontend-platform';
 
 import { AlertList } from '../../generic/user-messages';
+import useAccessExpirationAlert from '../../alerts/access-expiration-alert';
+import useOfferAlert from '../../alerts/offer-alert';
 
 import Sequence from './sequence';
 
 import { CelebrationModal, shouldCelebrateOnSectionLoad } from './celebration';
 import ContentTools from './content-tools';
 import CourseBreadcrumbs from './CourseBreadcrumbs';
-import NotificationTrigger from './NotificationTrigger';
+import SidebarNotificationButton from './SidebarNotificationButton';
 
+import CourseSock from '../../generic/course-sock';
 import { useModel } from '../../generic/model-store';
 import useWindowSize, { responsiveBreakpoints } from '../../generic/tabs/useWindowSize';
 
@@ -38,26 +42,36 @@ function Course({
   ].filter(element => element != null).map(element => element.title);
 
   const {
+    accessExpiration,
+    canShowUpgradeSock,
     celebrations,
+    offer,
+    org,
+    userTimezone,
     verifiedMode,
   } = course;
 
   // Below the tabs, above the breadcrumbs alerts (appearing in the order listed here)
+  const offerAlert = useOfferAlert(courseId, offer, org, userTimezone, 'course', 'in_course');
+  const accessExpirationAlert = useAccessExpirationAlert(accessExpiration, courseId, org, userTimezone, 'course', 'in_course');
+
   const dispatch = useDispatch();
   const celebrateFirstSection = celebrations && celebrations.firstSection;
   const celebrationOpen = shouldCelebrateOnSectionLoad(
     courseId, sequenceId, unitId, celebrateFirstSection, dispatch, celebrations,
   );
 
-  const shouldDisplayNotificationTrigger = useWindowSize().width >= responsiveBreakpoints.small.minWidth;
+  // REV-2130 TODO: temporary cookie code that should be removed.
+  // In order to see the Value Prop sidebar in prod, a cookie should be set in
+  // the browser console and refresh: document.cookie = 'value_prop_cookie=true';
+  const isValuePropCookieSet = Cookies.get('value_prop_cookie') === 'true';
 
-  const shouldDisplayNotificationTrayOpen = useWindowSize().width > responsiveBreakpoints.medium.minWidth;
+  const shouldDisplaySidebarButton = useWindowSize().width >= responsiveBreakpoints.small.minWidth;
 
-  const [notificationTrayVisible, setNotificationTray] = verifiedMode
-    && shouldDisplayNotificationTrayOpen ? useState(true) : useState(false);
-  const isNotificationTrayVisible = () => notificationTrayVisible && setNotificationTray;
-  const toggleNotificationTray = () => {
-    if (notificationTrayVisible) { setNotificationTray(false); } else { setNotificationTray(true); }
+  const [sidebarVisible, setSidebar] = useState(false);
+  const isSidebarVisible = () => sidebarVisible && setSidebar;
+  const toggleSidebar = () => {
+    if (sidebarVisible) { setSidebar(false); } else { setSidebar(true); }
   };
 
   /** [MM-P2P] Experiment */
@@ -68,6 +82,17 @@ function Course({
       <Helmet>
         <title>{`${pageTitleBreadCrumbs.join(' | ')} | ${getConfig().SITE_NAME}`}</title>
       </Helmet>
+      { /** This conditional is for the [MM-P2P] Experiment */}
+      { !MMP2P.state.isEnabled && (
+        <AlertList
+          className="my-3"
+          topic="course"
+          customAlerts={{
+            ...accessExpirationAlert,
+            ...offerAlert,
+          }}
+        />
+      )}
       <div className="position-relative">
         <CourseBreadcrumbs
           courseId={courseId}
@@ -77,10 +102,10 @@ function Course({
           mmp2p={MMP2P}
         />
 
-        { shouldDisplayNotificationTrigger ? (
-          <NotificationTrigger
-            toggleNotificationTray={toggleNotificationTray}
-            isNotificationTrayVisible={isNotificationTrayVisible}
+        { isValuePropCookieSet && shouldDisplaySidebarButton ? (
+          <SidebarNotificationButton
+            toggleSidebar={toggleSidebar}
+            isSidebarVisible={isSidebarVisible}
           />
         ) : null}
       </div>
@@ -93,9 +118,10 @@ function Course({
         unitNavigationHandler={unitNavigationHandler}
         nextSequenceHandler={nextSequenceHandler}
         previousSequenceHandler={previousSequenceHandler}
-        toggleNotificationTray={toggleNotificationTray}
-        isNotificationTrayVisible={isNotificationTrayVisible}
-        notificationTrayVisible={notificationTrayVisible}
+        toggleSidebar={toggleSidebar}
+        isSidebarVisible={isSidebarVisible}
+        sidebarVisible={sidebarVisible}
+        isValuePropCookieSet={isValuePropCookieSet}
         //* * [MM-P2P] Experiment */
         mmp2p={MMP2P}
       />
@@ -105,6 +131,15 @@ function Course({
           open
         />
       )}
+      {canShowUpgradeSock && (
+        <CourseSock
+          courseId={courseId}
+          offer={offer}
+          orgKey={org}
+          pageLocation="Course Content Page"
+          verifiedMode={verifiedMode}
+        />
+      )}
       <ContentTools course={course} />
       { /** [MM-P2P] Experiment */ }
       { MMP2P.meta.modalLock && <MMP2PBlockModal options={MMP2P} /> }