chore: bump frontend-platform (#1209)

* feat: upgrade react router to v6

* fix: all test cases affected by react router upgrade

* refactor: fix navigations

* fix: test cases affectewd due to lib-special-exams

* refactor: improve code coverage

.env

@@ -1,31 +1,49 @@
+# 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=null
-BASE_URL=null
-CREDENTIALS_BASE_URL=null
-CSRF_TOKEN_API_PATH=null
-ENTERPRISE_LEARNER_PORTAL_HOSTNAME=null
-ECOMMERCE_BASE_URL=null
-INSIGHTS_BASE_URL=null
-LANGUAGE_PREFERENCE_COOKIE_NAME=null
-LMS_BASE_URL=null
-LOGIN_URL=null
-LOGOUT_URL=null
-LOGO_URL=null
-LOGO_TRADEMARK_URL=null
-LOGO_WHITE_URL=null
-FAVICON_URL=null
-MARKETING_SITE_BASE_URL=null
-ORDER_HISTORY_URL=null
-REFRESH_ACCESS_TOKEN_ENDPOINT=null
-SEARCH_CATALOG_URL=null
-SEGMENT_KEY=null
-SITE_NAME=null
-SOCIAL_UTM_MILESTONE_CAMPAIGN=null
-STUDIO_BASE_URL=null
-SUPPORT_URL=null
-SUPPORT_URL_CALCULATOR_MATH=null
-SUPPORT_URL_ID_VERIFICATION=null
-SUPPORT_URL_VERIFIED_CERTIFICATE=null
-TWITTER_HASHTAG=null
-TWITTER_URL=null
-USER_INFO_COOKIE_NAME=null
+
+ACCESS_TOKEN_COOKIE_NAME=''
+BASE_URL=''
+CONTACT_URL=''
+CREDENTIALS_BASE_URL=''
+CREDIT_HELP_LINK_URL=''
+CSRF_TOKEN_API_PATH=''
+DISCOVERY_API_BASE_URL=''
+DISCUSSIONS_MFE_BASE_URL=''
+ECOMMERCE_BASE_URL=''
+ENABLE_JUMPNAV='true'
+ENABLE_NOTICES=''
+ENTERPRISE_LEARNER_PORTAL_HOSTNAME=''
+EXAMS_BASE_URL=''
+FAVICON_URL=''
+IGNORED_ERROR_REGEX=''
+INSIGHTS_BASE_URL=''
+LANGUAGE_PREFERENCE_COOKIE_NAME=''
+LMS_BASE_URL=''
+LOGIN_URL=''
+LOGOUT_URL=''
+LOGO_URL=''
+LOGO_TRADEMARK_URL=''
+LOGO_WHITE_URL=''
+LEGACY_THEME_NAME=''
+MARKETING_SITE_BASE_URL=''
+ORDER_HISTORY_URL=''
+PROCTORED_EXAM_FAQ_URL=''
+PROCTORED_EXAM_RULES_URL=''
+REFRESH_ACCESS_TOKEN_ENDPOINT=''
+SEARCH_CATALOG_URL=''
+SEGMENT_KEY=''
+SESSION_COOKIE_DOMAIN=''
+SITE_NAME=''
+SOCIAL_UTM_MILESTONE_CAMPAIGN=''
+STUDIO_BASE_URL=''
+SUPPORT_URL=''
+SUPPORT_URL_CALCULATOR_MATH=''
+SUPPORT_URL_ID_VERIFICATION=''
+SUPPORT_URL_VERIFIED_CERTIFICATE=''
+TERMS_OF_SERVICE_URL=''
+TWITTER_HASHTAG=''
+TWITTER_URL=''
+USER_INFO_COOKIE_NAME=''
+OPTIMIZELY_FULL_STACK_SDK_KEY=''

.env.development

@@ -1,10 +1,23 @@
+# 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'
+CONTACT_URL='http://localhost:18000/contact'
 CREDENTIALS_BASE_URL='http://localhost:18150'
+CREDIT_HELP_LINK_URL='https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_credit_courses.html#keep-track-of-credit-requirements'
 CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
+DISCOVERY_API_BASE_URL='http://localhost:18381'
+DISCUSSIONS_MFE_BASE_URL='http://localhost:2002'
 ECOMMERCE_BASE_URL='http://localhost:18130'
+ENABLE_JUMPNAV='true'
+ENABLE_NOTICES=''
 ENTERPRISE_LEARNER_PORTAL_HOSTNAME='localhost:8734'
+EXAMS_BASE_URL=''
+FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
+IGNORED_ERROR_REGEX=''
 LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
 LMS_BASE_URL='http://localhost:18000'
 LOGIN_URL='http://localhost:18000/login'
@@ -12,13 +25,15 @@ LOGOUT_URL='http://localhost:18000/logout'
 LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
 LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
 LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
-FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
+LEGACY_THEME_NAME=''
 MARKETING_SITE_BASE_URL='http://localhost:18000'
 ORDER_HISTORY_URL='http://localhost:1996/orders'
 PORT=2000
+PROCTORED_EXAM_FAQ_URL=''
+PROCTORED_EXAM_RULES_URL=''
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
 SEARCH_CATALOG_URL='http://localhost:18000/courses'
-SEGMENT_KEY=null
+SEGMENT_KEY=''
 SITE_NAME='edX'
 SOCIAL_UTM_MILESTONE_CAMPAIGN='edxmilestone'
 STUDIO_BASE_URL='http://localhost:18010'
@@ -26,6 +41,11 @@ SUPPORT_URL='https://support.edx.org'
 SUPPORT_URL_CALCULATOR_MATH='https://support.edx.org/hc/en-us/articles/360000038428-Entering-math-expressions-in-assignments-or-the-calculator'
 SUPPORT_URL_ID_VERIFICATION='https://support.edx.org/hc/en-us/articles/206503858-How-do-I-verify-my-identity'
 SUPPORT_URL_VERIFIED_CERTIFICATE='https://support.edx.org/hc/en-us/articles/206502008-What-is-a-verified-certificate'
+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'
+CHAT_RESPONSE_URL='http://localhost:18000/api/learning_assistant/v1/course_id'
+PRIVACY_POLICY_URL='http://localhost:18000/privacy'
+OPTIMIZELY_FULL_STACK_SDK_KEY=''

.env.test

@@ -1,10 +1,23 @@
+# 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'
+CONTACT_URL='http://localhost:18000/contact'
 CREDENTIALS_BASE_URL='http://localhost:18150'
+CREDIT_HELP_LINK_URL='https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_credit_courses.html#keep-track-of-credit-requirements'
 CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
+DISCOVERY_API_BASE_URL='http://localhost:18381'
+DISCUSSIONS_MFE_BASE_URL='http://localhost:2002'
 ECOMMERCE_BASE_URL='http://localhost:18130'
+ENABLE_JUMPNAV='true'
+ENABLE_NOTICES=''
 ENTERPRISE_LEARNER_PORTAL_HOSTNAME='localhost:8734'
+EXAMS_BASE_URL='http://localhost:18740'
+FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
+IGNORED_ERROR_REGEX=''
 LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
 LMS_BASE_URL='http://localhost:18000'
 LOGIN_URL='http://localhost:18000/login'
@@ -12,13 +25,15 @@ LOGOUT_URL='http://localhost:18000/logout'
 LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
 LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
 LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
-FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
+LEGACY_THEME_NAME=''
 MARKETING_SITE_BASE_URL='http://localhost:18000'
 ORDER_HISTORY_URL='http://localhost:1996/orders'
 PORT=2000
+PROCTORED_EXAM_FAQ_URL=''
+PROCTORED_EXAM_RULES_URL=''
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
 SEARCH_CATALOG_URL='http://localhost:18000/courses'
-SEGMENT_KEY=null
+SEGMENT_KEY=''
 SITE_NAME='edX'
 SOCIAL_UTM_MILESTONE_CAMPAIGN='edxmilestone'
 STUDIO_BASE_URL='http://localhost:18010'
@@ -26,6 +41,8 @@ SUPPORT_URL='https://support.edx.org'
 SUPPORT_URL_CALCULATOR_MATH='https://support.edx.org/hc/en-us/articles/360000038428-Entering-math-expressions-in-assignments-or-the-calculator'
 SUPPORT_URL_ID_VERIFICATION='https://support.edx.org/hc/en-us/articles/206503858-How-do-I-verify-my-identity'
 SUPPORT_URL_VERIFIED_CERTIFICATE='https://support.edx.org/hc/en-us/articles/206502008-What-is-a-verified-certificate'
+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'
+PRIVACY_POLICY_URL='http://localhost:18000/privacy'

.eslintignore

@@ -1,4 +1,5 @@
 coverage/*
 dist/
+packages/
 node_modules/
-jest.config.js
+jest.config.js

.eslintrc.js

@@ -1,11 +1,17 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
 const { createConfig } = require('@edx/frontend-build');
 
-module.exports = createConfig('eslint', {
-  overrides: [{
-    files: ["**/__tests__/**/*.[jt]s?(x)", "**/?(*.)+(spec|test).[jt]s?(x)", "setupTest.js"],
-    rules: {
-      'import/named': 'off',
-      'import/no-extraneous-dependencies': 'off',
-    },
-  }],
+const config = createConfig('eslint', {
+  rules: {
+    // TODO: all these rules should be renabled/addressed. temporarily turned off to unblock a release.
+    'react-hooks/rules-of-hooks': 'off',
+    'react-hooks/exhaustive-deps': 'off',
+    'import/no-extraneous-dependencies': 'off',
+    'no-restricted-exports': 'off',
+    'react/jsx-no-useless-fragment': 'off',
+    'react/no-unknown-property': 'off',
+    'func-names': 'off',
+  },
 });
+
+module.exports = config;

.github/workflows/add-depr-ticket-to-depr-board.yml

@@ -0,0 +1,19 @@
+# Run the workflow that adds new tickets that are either:
+# - labelled "DEPR"
+# - title starts with "[DEPR]"
+# - body starts with "Proposal Date" (this is the first template field)
+# to the org-wide DEPR project board
+
+name: Add newly created DEPR issues to the DEPR project board
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  routeissue:
+    uses: openedx/.github/.github/workflows/add-depr-ticket-to-depr-board.yml@master
+    secrets:
+      GITHUB_APP_ID: ${{ secrets.GRAPHQL_AUTH_APP_ID }}
+      GITHUB_APP_PRIVATE_KEY: ${{ secrets.GRAPHQL_AUTH_APP_PEM }}
+      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}

.github/workflows/add-remove-label-on-comment.yml

@@ -0,0 +1,20 @@
+# This workflow runs when a comment is made on the ticket
+# If the comment starts with "label: " it tries to apply
+# the label indicated in rest of comment.
+# If the comment starts with "remove label: ", it tries
+# to remove the indicated label.
+# Note: Labels are allowed to have spaces and this script does
+# not parse spaces (as often a space is legitimate), so the command
+# "label: really long lots of words label" will apply the
+# label "really long lots of words label"
+
+name: Allows for the adding and removing of labels via comment
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  add_remove_labels:
+    uses: openedx/.github/.github/workflows/add-remove-label-on-comment.yml@master
+

.github/workflows/commitlint.yml

@@ -0,0 +1,10 @@
+# Run commitlint on the commit messages in a pull request.
+
+name: Lint Commit Messages
+
+on:
+  - pull_request
+
+jobs:
+  commitlint:
+    uses: openedx/.github/.github/workflows/commitlint.yml@master

.github/workflows/lockfileversion-check.yml

@@ -0,0 +1,13 @@
+#check package-lock file version
+
+name: Lockfile Version check
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+
+jobs:
+  version-check:
+    uses: openedx/.github/.github/workflows/lockfileversion-check-v3.yml@master

.github/workflows/self-assign-issue.yml

@@ -0,0 +1,12 @@
+# This workflow runs when a comment is made on the ticket
+# If the comment starts with "assign me" it assigns the author to the
+# ticket (case insensitive)
+
+name: Assign comment author to ticket if they say "assign me"
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  self_assign_by_comment:
+    uses: openedx/.github/.github/workflows/self-assign-issue.yml@master

.github/workflows/update-browserslist-db.yml

@@ -0,0 +1,12 @@
+name: Update Browserslist DB
+on:
+  schedule:
+    - cron:  '0 0 * * 1'
+  workflow_dispatch:
+
+jobs:
+  update-browserslist:
+    uses: openedx/.github/.github/workflows/update-browserslist-db.yml@master
+
+    secrets:
+        requirements_bot_github_token: ${{ secrets.requirements_bot_github_token }}

.github/workflows/validate.yml

@@ -1,21 +1,23 @@
 name: validate
 on:
-- push
-- pull_request
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - '**'
 jobs:
-  build:
+  tests:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version:
-        - 12
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
+    - uses: actions/checkout@v3
+    - name: Setup Nodejs Env
+      run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
+    - uses: actions/setup-node@v3
       with:
-        node-version: ${{ matrix.node-version }}
+        node-version: ${{ env.NODE_VER }}
     - run: make validate.ci
     - name: Upload coverage
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v3
       with:
         fail_ci_if_error: true

.gitignore

@@ -1,6 +1,8 @@
 .DS_Store
 .eslintcache
 .idea
+*.swp
+*.swo
 node_modules
 npm-debug.log
 coverage
@@ -8,6 +10,7 @@ coverage
 dist/
 src/i18n/transifex_input.json
 temp/babel-plugin-react-intl
+logs
 
 ### pyenv ###
 .python-version
@@ -19,3 +22,6 @@ temp/babel-plugin-react-intl
 
 # Local package dependencies
 module.config.js
+
+# Local environment overrides
+.env.private

.husky/_/.gitignore

@@ -0,0 +1 @@
+*

.husky/_/husky.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+if [ -z "$husky_skip_init" ]; then
+  debug () {
+    if [ "$HUSKY_DEBUG" = "1" ]; then
+      echo "husky (debug) - $1"
+    fi
+  }
+
+  readonly hook_name="$(basename "$0")"
+  debug "starting $hook_name..."
+
+  if [ "$HUSKY" = "0" ]; then
+    debug "HUSKY env variable is set to 0, skipping hook"
+    exit 0
+  fi
+
+  if [ -f ~/.huskyrc ]; then
+    debug "sourcing ~/.huskyrc"
+    . ~/.huskyrc
+  fi
+
+  export readonly husky_skip_init=1
+  sh -e "$0" "$@"
+  exitCode="$?"
+
+  if [ $exitCode != 0 ]; then
+    echo "husky - $hook_name hook exited with code $exitCode (error)"
+  fi
+
+  exit $exitCode
+fi

.husky/pre-commit

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

.nvmrc

@@ -0,0 +1 @@
+18

.tx/config

@@ -1,8 +1,9 @@
 [main]
 host = https://www.transifex.com
 
-[edx-platform.frontend-app-learning]
+[o:open-edx:p:edx-platform:r:frontend-app-learning]
 file_filter = src/i18n/messages/<lang>.json
 source_file = src/i18n/transifex_input.json
 source_lang = en
-type = KEYVALUEJSON
+type        = KEYVALUEJSON
+

Makefile

@@ -1,11 +1,10 @@
-transifex_resource = frontend-app-learning
-transifex_langs = "ar,fr,es_419,zh_CN"
+export TRANSIFEX_RESOURCE=frontend-app-learning
+transifex_langs = "ar,fr,es_419,zh_CN,pt,it,de,uk,ru,hi,fa_IR,fr_CA,it_IT,pt_PT,de_DE"
 
+intl_imports = ./node_modules/.bin/intl-imports.js
 transifex_utils = ./node_modules/.bin/transifex-utils.js
 i18n = ./src/i18n
 transifex_input = $(i18n)/transifex_input.json
-tx_url1 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transifex_resource)/translation/en/strings/
-tx_url2 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transifex_resource)/source/
 
 # This directory must match .babelrc .
 transifex_temp = ./temp/babel-plugin-react-intl
@@ -38,15 +37,30 @@ push_translations:
 	# Pushing strings to Transifex...
 	tx push -s
 	# Fetching hashes from Transifex...
-	./node_modules/reactifex/bash_scripts/get_hashed_strings.sh $(tx_url1)
+	./node_modules/@edx/reactifex/bash_scripts/get_hashed_strings_v3.sh
 	# Writing out comments to file...
-	$(transifex_utils) $(transifex_temp) --comments
+	$(transifex_utils) $(transifex_temp) --comments --v3-scripts-path
 	# Pushing comments to Transifex...
-	./node_modules/reactifex/bash_scripts/put_comments.sh $(tx_url2)
+	./node_modules/@edx/reactifex/bash_scripts/put_comments_v3.sh
 
+ifeq ($(OPENEDX_ATLAS_PULL),)
 # Pulls translations from Transifex.
 pull_translations:
-	tx pull -f --mode reviewed --language=$(transifex_langs)
+	tx pull -f --mode reviewed --languages=$(transifex_langs)
+else
+# Experimental: OEP-58 Pulls translations using atlas
+pull_translations:
+	rm -rf src/i18n/messages
+	mkdir src/i18n/messages
+	cd src/i18n/messages \
+      && atlas pull --filter=$(transifex_langs) \
+               translations/paragon/src/i18n/messages:paragon \
+               translations/frontend-component-header/src/i18n/messages:frontend-component-header \
+               translations/frontend-component-footer/src/i18n/messages:frontend-component-footer \
+               translations/frontend-app-learning/src/i18n/messages:frontend-app-learning
+
+	$(intl_imports) paragon frontend-component-header frontend-component-footer frontend-app-learning
+endif
 
 # This target is used by Travis.
 validate-no-uncommitted-package-lock-changes:
@@ -60,7 +74,6 @@ validate:
 	npm run lint -- --max-warnings 0
 	npm run test
 	npm run build
-	npm run is-es5
 
 .PHONY: validate.ci
 validate.ci:

README.rst

@@ -1,23 +1,21 @@
-|Coveralls| |npm_version| |npm_downloads| |license|
+|codecov| |license|
 
 frontend-app-learning
 =========================
 
-Please tag **@edx/teaching-and-learning** on any PRs or issues.  Thanks.
-
 Introduction
 ------------
 
-React app for edX learning.
+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).
 
-.. |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
+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/openedx/frontend-app-account/blob/master/LICENSE
 
 Development
 -----------
@@ -25,22 +23,10 @@ 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/openedx/devstack>`__ must be running and you must be logged into it.
 
--  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.
+- 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.
 
 Local module development
 ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -66,4 +52,70 @@ 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.
+See https://github.com/openedx/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:
+
+CREDIT_HELP_LINK_URL
+  A link to resources to help explain what course credit is and how to earn it.
+
+ENABLE_JUMPNAV
+  Enables the new Jump Navigation feature in the course breadcrumbs, defaulted to  the string 'true'.
+  Disable to have simple hyperlinks for breadcrumbs. Setting it to any other value but 'true' ('false','I love flags', 'etc' would disable the Jumpnav).
+  This feature flag is slated to be removed as jumpnav becomes default. Follow the progress of this ticket here:
+  https://openedx.atlassian.net/browse/TNL-8678
+
+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/0002-courseware-page-decisions.md

@@ -1,5 +1,7 @@
 # Courseware Page Decisions
 
+**See [0009-courseware-api-direction.md](0009-courseware-api-direction.md) for updates!**
+
 ## Courseware data loading
 
 Today we have strictly hierarchical courses - a course contains sections, which contain sequences, which contain units, which contain components.
@@ -37,6 +39,9 @@ Today, if the URL only specifies the course ID, we need to pick a sequence to sh
 
 Similarly, if the URL doesn't contain a unit ID, we use the `position` field of the sequence to determine which unit we want to display from that sequence.  If the position isn't specified in the sequence, we choose the first unit of the sequence.  After determining which unit to display, we update the URL to match.  After the URL is updated, the application will attempt to load that unit via an iFrame.
 
+_This URL scheme has been expanded upon in
+[ADR #8: Liberal courseware path handling](./0008-liberal-courseware-path-handling.md)._
+
 ## "Container" components vs. display components
 
 This application makes use of a few "container" components at the top level - CoursewareContainer and CourseHomeContainer.

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

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

docs/decisions/0009-courseware-api-direction.md

@@ -0,0 +1,62 @@
+# Direction of Courseware APIs
+
+In order to allow for greater flexibility and separation of concerns, we're going to stop using the Course Blocks API for navigational data, and pull that data from the Learning Sequences Outlines API instead. The intention is to give us four distinct layers of courseware that can eventually be composed in different ways:
+
+* Learning Context Metadata
+* Learning Context Navigation
+* Sequence Navigation
+* Unit Rendering
+
+Note that "Learning Context" is a generalization of "Course" that includes other things like Content Libraries, Learning Pathways, and potentially other logical groupings of content.
+
+This is a refinement of [0002-courseware-page-decisions.md](0002-courseware-page-decisions.md). The fundamental layers remain the same, but this document tries to better clarify the boundaries and path forward for these layers. We're not making these layers completely swappable/pluggable now, but we should separate the data access in a way that allows for that in the future.
+
+## Background
+
+We currently make four primary requests to the LMS when rendering courseware instructional content:
+
+1. Course Metadata: `/api/courseware/course/{courseId}` (REST API)
+2. Course Blocks API: `/api/courses/v2/blocks/?course_id={courseId}` (REST API)
+3. Sequence Metadata: `/api/courseware/sequence/{sequenceUsageKey}` (REST API)
+4. Unit: `/xblock/{unitBlockUsageKey}` (rendered in an iframe)
+
+There is a significant amount of overlap between the Course Blocks API and the others at the moment, since Course Blocks takes a static snapshot of the entire tree of course content at once. There are a few problems with the current arrangement:
+
+* It's slow and complex. The Course Blocks API can be difficult to maintain and reason about, and trickier to optimize.
+* Assuming that all course structures are the same makes it difficult to support other content types, like LabXchange Learning Pathways or adaptive content.
+* The overlap between Course Blocks and the other APIs means that there can be conflicts about the state.
+
+## Motivating Vision
+
+We have seen a desire to extend or enhance the courseware experience in various ways:
+
+Learning Context Navigation
+* Allowing for shorter, human-readable URLs in courseware.
+* Smaller courses that do not need the current navigational hierarchy.
+* LabXchange pathways.
+
+Sequence Navigation
+* Adaptive content, where the full list of units is not known up front.
+* More limited navigation, where content is pushed linearly, without the ability to jump ahead.
+* Different layouts for content browsing.
+
+Unit Rendering
+* Use of QTI content (currently serviced by cc2olx conversion).
+* Desire to experiment with a next-gen version of XBlock.
+* Use of entirely LTI units.
+
+The idea would be to insulate each layer from the layers above and below it. Sequence rendering shouldn't be affected by whether or not it's in a two level hierarchy (Course → Section → Sequence), or a flat one (Course → Sequence). Learning Context Navigation should be able to reference Sequences without caring if a Sequence is an adaptive one or not. Sequences should be able to have a common interface to call Unit iframes, whether those Units are rendering XBlocks or QTI content.
+
+Note that supporting these types of course structures would require downstream changes in other systems as well (e.g. analytics).
+
+## Next Step: Removing use of the Course Blocks API.
+
+The next step in this process is to remove the call to the Course Blocks API, and split its responsibilities across just the existing Learning Sequences Outline and Sequence Metadata APIs. This will involve at least a couple of steps.
+
+### Complete rollout of Learning Sequences Outline calls.
+
+We're currently in a transitional state between these APIs where the Learning Sequences Outline calls are only rolled out on a small handful of courses.
+
+### Shift Sequence and Unit metadata to only come from Sequence Metadata API.
+
+We currently pull this information from both Course Blocks and the Sequence Metadata API. We can consolidate on just the Sequence Metadata API. There is also server side optimization that can be done with the Sequence Metadata API calls as part of this work.

jest.config.js

@@ -7,5 +7,14 @@ module.exports = createConfig('jest', {
   coveragePathIgnorePatterns: [
     'src/setupTest.js',
     'src/i18n',
+    'src/.*\\.exp\\..*',
   ],
+  // see https://github.com/axios/axios/issues/5026
+  moduleNameMapper: {
+    "^axios$": "axios/dist/axios.js",
+    // See https://stackoverflow.com/questions/72382316/jest-encountered-an-unexpected-token-react-markdown
+    'react-markdown': '<rootDir>/node_modules/react-markdown/react-markdown.min.js',
+  },
+  testTimeout: 30000,
+  testEnvironment: 'jsdom'
 });

package.json

@@ -4,77 +4,79 @@
   "description": "Frontend learning application.",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/edx/frontend-app-learning.git"
+    "url": "git+https://github.com/openedx/frontend-app-learning.git"
   },
   "browserslist": [
-    "last 2 versions",
-    "ie 11"
+    "extends @edx/browserslist-config"
   ],
   "scripts": {
     "build": "fedx-scripts webpack",
     "i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
-    "is-es5": "es-check es5 ./dist/*.js",
     "lint": "fedx-scripts eslint --ext .js --ext .jsx .",
+    "lint:fix": "fedx-scripts eslint --fix --ext .js --ext .jsx .",
+    "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",
+  "homepage": "https://github.com/openedx/frontend-app-learning#readme",
   "publishConfig": {
     "access": "public"
   },
   "bugs": {
-    "url": "https://github.com/edx/frontend-app-learning/issues"
+    "url": "https://github.com/openedx/frontend-app-learning/issues"
   },
   "dependencies": {
-    "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
-    "@edx/frontend-component-footer": "10.1.2",
-    "@edx/frontend-enterprise": "4.2.3",
-    "@edx/frontend-platform": "1.8.1",
-    "@edx/paragon": "12.3.1",
-    "@fortawesome/fontawesome-svg-core": "1.2.32",
-    "@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.13",
-    "@reduxjs/toolkit": "1.3.6",
-    "classnames": "2.2.6",
-    "core-js": "3.6.5",
-    "prop-types": "15.7.2",
-    "react": "16.13.1",
-    "react-break": "1.3.2",
-    "react-dom": "16.13.1",
-    "react-helmet": "6.0.0",
-    "react-redux": "7.2.2",
-    "react-router": "5.2.0",
-    "react-router-dom": "5.2.0",
-    "react-share": "4.2.1",
-    "redux": "4.0.5",
-    "regenerator-runtime": "0.13.7",
-    "reselect": "4.0.0",
-    "truncate-html": "1.0.3"
+    "@edx/brand": "npm:@edx/brand-openedx@1.2.0",
+    "@edx/frontend-component-footer": "12.2.1",
+    "@edx/frontend-component-header": "4.6.0",
+    "@edx/frontend-lib-learning-assistant": "^1.14.0",
+    "@edx/frontend-lib-special-exams": "2.23.2",
+    "@edx/frontend-platform": "5.5.2",
+    "@edx/paragon": "20.46.0",
+    "@edx/react-unit-test-utils": "npm:@edx/react-unit-test-utils@1.7.0",
+    "@fortawesome/fontawesome-svg-core": "1.3.0",
+    "@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.4",
+    "@popperjs/core": "2.11.8",
+    "@reduxjs/toolkit": "1.8.1",
+    "classnames": "2.3.2",
+    "core-js": "3.22.2",
+    "history": "5.3.0",
+    "js-cookie": "3.0.5",
+    "lodash.camelcase": "4.3.0",
+    "prop-types": "15.8.1",
+    "query-string": "^7.1.3",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
+    "react-helmet": "6.1.0",
+    "react-redux": "7.2.9",
+    "react-router": "6.15.0",
+    "react-router-dom": "6.15.0",
+    "react-share": "4.4.1",
+    "redux": "4.1.2",
+    "regenerator-runtime": "0.13.11",
+    "reselect": "4.1.8",
+    "truncate-html": "1.0.4",
+    "util": "0.12.5"
   },
   "devDependencies": {
-    "@edx/frontend-build": "5.5.5",
-    "@testing-library/dom": "7.16.3",
-    "@testing-library/jest-dom": "5.10.1",
-    "@testing-library/react": "10.3.0",
-    "@testing-library/user-event": "12.0.17",
-    "axios-mock-adapter": "1.18.2",
-    "codecov": "3.7.2",
-    "es-check": "5.1.4",
-    "glob": "7.1.6",
-    "husky": "3.1.0",
-    "jest": "24.9.0",
-    "jest-chain": "1.1.5",
-    "reactifex": "1.1.1",
-    "rosie": "2.0.1"
+    "@edx/browserslist-config": "1.2.0",
+    "@edx/frontend-build": "^12.9.10",
+    "@edx/reactifex": "2.2.0",
+    "@pact-foundation/pact": "^11.0.2",
+    "@testing-library/jest-dom": "5.16.5",
+    "@testing-library/react": "12.1.5",
+    "@testing-library/user-event": "13.5.0",
+    "axios-mock-adapter": "1.20.0",
+    "copy-webpack-plugin": "^11.0.0",
+    "es-check": "6.2.1",
+    "husky": "7.0.4",
+    "jest": "29.5.0",
+    "rosie": "2.1.0"
   }
 }

public/index.html

@@ -5,6 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="shortcut icon" href="<%=htmlWebpackPlugin.options.FAVICON_URL%>" type="image/x-icon" />
+
     <% if (htmlWebpackPlugin.options.OPTIMIZELY_PROJECT_ID) { %>
       <script src="https://www.edx.org/optimizelyjs/<%= htmlWebpackPlugin.options.OPTIMIZELY_PROJECT_ID %>.js"></script>
     <% } %>

renovate.json

@@ -5,5 +5,12 @@
   "patch": {
     "automerge": true
   },
-  "rebaseStalePrs": true
+  "rebaseStalePrs": true,
+  "packageRules": [
+    {
+      "matchPackagePatterns": ["@edx"],
+      "matchUpdateTypes": ["minor", "patch"],
+      "automerge": true
+    }
+  ]
 }

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

@@ -1,17 +1,20 @@
-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, Hyperlink } from '@edx/paragon';
+import { Info } from '@edx/paragon/icons';
 
-import { Alert, ALERT_TYPES } from '../../generic/user-messages';
 import messages from './messages';
 
-function AccessExpirationAlert({ intl, payload }) {
+const AccessExpirationAlert = ({ intl, payload }) => {
   const {
     accessExpiration,
+    courseId,
+    org,
     userTimezone,
+    analyticsPageName,
   } = payload;
   const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
 
@@ -21,33 +24,20 @@ function AccessExpirationAlert({ intl, payload }) {
 
   const {
     expirationDate,
-    masqueradingExpiredCourse,
     upgradeDeadline,
     upgradeUrl,
   } = accessExpiration;
 
-  if (masqueradingExpiredCourse) {
-    return (
-      <Alert type={ALERT_TYPES.INFO}>
-        <FormattedMessage
-          id="learning.accessExpiration.expired"
-          defaultMessage="This learner does not have access to this course. Their access expired on {date}."
-          values={{
-            date: (
-              <FormattedDate
-                key="accessExpirationExpiredDate"
-                day="numeric"
-                month="short"
-                year="numeric"
-                value={expirationDate}
-                {...timezoneFormatArgs}
-              />
-            ),
-          }}
-        />
-      </Alert>
-    );
-  }
+  const logClick = () => {
+    sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
+      org_key: org,
+      courserun_key: courseId,
+      linkCategory: 'FBE_banner',
+      linkName: `${analyticsPageName}_audit_access_expires`,
+      linkType: 'link',
+      pageName: analyticsPageName,
+    });
+  };
 
   let deadlineMessage = null;
   if (upgradeDeadline && upgradeUrl) {
@@ -57,6 +47,7 @@ function AccessExpirationAlert({ intl, payload }) {
         <FormattedMessage
           id="learning.accessExpiration.deadline"
           defaultMessage="Upgrade by {date} to get unlimited access to the course as long as it exists on the site."
+          description="Warning shown to learner to upgrade while they are enrolled on the audit version and it's possible to upgrade"
           values={{
             date: (
               <FormattedDate
@@ -75,6 +66,7 @@ function AccessExpirationAlert({ intl, payload }) {
           className="font-weight-bold"
           style={{ textDecoration: 'underline' }}
           destination={upgradeUrl}
+          onClick={logClick}
         >
           {intl.formatMessage(messages.upgradeNow)}
         </Hyperlink>
@@ -83,11 +75,12 @@ function AccessExpirationAlert({ intl, payload }) {
   }
 
   return (
-    <Alert type={ALERT_TYPES.INFO}>
+    <Alert variant="info" icon={Info}>
       <span className="font-weight-bold">
         <FormattedMessage
           id="learning.accessExpiration.header"
           defaultMessage="Audit Access Expires {date}"
+          description="Headline for auditing deadline"
           values={{
             date: (
               <FormattedDate
@@ -106,6 +99,7 @@ function AccessExpirationAlert({ intl, payload }) {
       <FormattedMessage
         id="learning.accessExpiration.body"
         defaultMessage="You lose all access to this course, including your progress, on {date}."
+        description="Message body to tell learner the consequences of course expiration."
         values={{
           date: (
             <FormattedDate
@@ -122,7 +116,7 @@ function AccessExpirationAlert({ intl, payload }) {
       {deadlineMessage}
     </Alert>
   );
-}
+};
 
 AccessExpirationAlert.propTypes = {
   intl: intlShape.isRequired,
@@ -133,7 +127,10 @@ AccessExpirationAlert.propTypes = {
       upgradeDeadline: PropTypes.string,
       upgradeUrl: PropTypes.string,
     }).isRequired,
+    courseId: PropTypes.string.isRequired,
+    org: PropTypes.string.isRequired,
     userTimezone: PropTypes.string.isRequired,
+    analyticsPageName: PropTypes.string.isRequired,
   }).isRequired,
 };
 

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

@@ -0,0 +1,39 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormattedMessage, FormattedDate } from '@edx/frontend-platform/i18n';
+import { PageBanner } from '@edx/paragon';
+
+const AccessExpirationMasqueradeBanner = ({ payload }) => {
+  const {
+    expirationDate,
+    userTimezone,
+  } = payload;
+
+  const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
+
+  return (
+    <PageBanner variant="warning">
+      <FormattedMessage
+        id="instructorToolbar.pageBanner.courseHasExpired"
+        defaultMessage="This learner no longer has access to this course. Their access expired on {date}."
+        description="It's a warning that is shown to course author when being masqueraded as learner, while the course has expired for the real learner."
+        values={{
+          date: <FormattedDate
+            key="instructorToolbar.pageBanner.accessExpirationDate"
+            value={expirationDate}
+            {...timezoneFormatArgs}
+          />,
+        }}
+      />
+    </PageBanner>
+  );
+};
+
+AccessExpirationMasqueradeBanner.propTypes = {
+  payload: PropTypes.shape({
+    expirationDate: PropTypes.string.isRequired,
+    userTimezone: PropTypes.string.isRequired,
+  }).isRequired,
+};
+
+export default AccessExpirationMasqueradeBanner;

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

@@ -1,22 +1,51 @@
 import React, { useMemo } from 'react';
 import { useAlert } from '../../generic/user-messages';
+import { useModel } from '../../generic/model-store';
 
 const AccessExpirationAlert = React.lazy(() => import('./AccessExpirationAlert'));
+const AccessExpirationMasqueradeBanner = React.lazy(() => import('./AccessExpirationMasqueradeBanner'));
 
-function useAccessExpirationAlert(accessExpiration, userTimezone, topic) {
-  const isVisible = !!accessExpiration; // If it exists, show it.
-  const payload = {
+function useAccessExpirationAlert(accessExpiration, courseId, org, userTimezone, topic, analyticsPageName) {
+  const isVisible = accessExpiration && !accessExpiration.masqueradingExpiredCourse; // If it exists, show it.
+  const payload = useMemo(() => ({
     accessExpiration,
+    courseId,
+    org,
     userTimezone,
-  };
+    analyticsPageName,
+  }), [accessExpiration, analyticsPageName, courseId, org, userTimezone]);
 
   useAlert(isVisible, {
     code: 'clientAccessExpirationAlert',
-    payload: useMemo(() => payload, Object.values(payload).sort()),
+    payload,
     topic,
   });
 
   return { clientAccessExpirationAlert: AccessExpirationAlert };
 }
 
+export function useAccessExpirationMasqueradeBanner(courseId, tab) {
+  const {
+    userTimezone,
+  } = useModel('courseHomeMeta', courseId);
+  const {
+    accessExpiration,
+  } = useModel(tab, courseId);
+
+  const isVisible = accessExpiration && accessExpiration.masqueradingExpiredCourse;
+  const expirationDate = accessExpiration && accessExpiration.expirationDate;
+  const payload = useMemo(() => ({
+    expirationDate,
+    userTimezone,
+  }), [expirationDate, userTimezone]);
+
+  useAlert(isVisible, {
+    code: 'clientAccessExpirationMasqueradeBanner',
+    payload,
+    topic: 'instructor-toolbar-alerts',
+  });
+
+  return { clientAccessExpirationMasqueradeBanner: AccessExpirationMasqueradeBanner };
+}
+
 export default useAccessExpirationAlert;

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

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

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

@@ -4,6 +4,7 @@ const messages = defineMessages({
   upgradeNow: {
     id: 'learning.accessExpiration.upgradeNow',
     defaultMessage: 'Upgrade now',
+    description: 'The anchor text for the upgrading link',
   },
 });
 

src/alerts/active-enteprise-alert/ActiveEnterpriseAlert.jsx

@@ -0,0 +1,48 @@
+import React from 'react';
+import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import PropTypes from 'prop-types';
+import { Alert, Hyperlink } from '@edx/paragon';
+import { WarningFilled } from '@edx/paragon/icons';
+
+import { getConfig } from '@edx/frontend-platform';
+import genericMessages from './messages';
+
+const ActiveEnterpriseAlert = ({ intl, payload }) => {
+  const { text, courseId } = payload;
+  const changeActiveEnterprise = (
+    <Hyperlink
+      style={{ textDecoration: 'underline' }}
+      destination={
+        `${getConfig().LMS_BASE_URL}/enterprise/select/active/?success_url=${encodeURIComponent(
+          `${global.location.origin}/course/${courseId}/home`,
+        )}`
+    }
+    >
+      {intl.formatMessage(genericMessages.changeActiveEnterpriseLowercase)}
+    </Hyperlink>
+  );
+
+  return (
+    <Alert variant="warning" icon={WarningFilled}>
+      {text}
+      <FormattedMessage
+        id="learning.activeEnterprise.alert"
+        description="Prompts the user to log-in with the correct enterprise to access the course content."
+        defaultMessage=" {changeActiveEnterprise}."
+        values={{
+          changeActiveEnterprise,
+        }}
+      />
+    </Alert>
+  );
+};
+
+ActiveEnterpriseAlert.propTypes = {
+  intl: intlShape.isRequired,
+  payload: PropTypes.shape({
+    text: PropTypes.string,
+    courseId: PropTypes.string,
+  }).isRequired,
+};
+
+export default injectIntl(ActiveEnterpriseAlert);

src/alerts/active-enteprise-alert/ActiveEnterpriseAlert.test.jsx

@@ -0,0 +1,25 @@
+import React from 'react';
+import { getConfig } from '@edx/frontend-platform';
+import {
+  initializeTestStore, render, screen,
+} from '../../setupTest';
+import ActiveEnterpriseAlert from './ActiveEnterpriseAlert';
+
+describe('ActiveEnterpriseAlert', () => {
+  const mockData = {
+    payload: {
+      text: 'test message',
+      courseId: 'test-course-id',
+    },
+  };
+  beforeAll(async () => {
+    await initializeTestStore({ excludeFetchCourse: true, excludeFetchSequence: true });
+  });
+
+  it('Shows alert message and links', () => {
+    render(<ActiveEnterpriseAlert {...mockData} />);
+    expect(screen.getByRole('alert')).toBeInTheDocument();
+    expect(screen.getByText('test message', { exact: false })).toBeInTheDocument();
+    expect(screen.getByRole('link', { name: 'change enterprise now' })).toHaveAttribute('href', `${getConfig().LMS_BASE_URL}/enterprise/select/active/?success_url=http%3A%2F%2Flocalhost%2Fcourse%2Ftest-course-id%2Fhome`);
+  });
+});

src/alerts/active-enteprise-alert/hooks.js

@@ -0,0 +1,28 @@
+import React, { useMemo } from 'react';
+import { ALERT_TYPES, useAlert } from '../../generic/user-messages';
+import { useModel } from '../../generic/model-store';
+
+const ActiveEnterpriseAlert = React.lazy(() => import('./ActiveEnterpriseAlert'));
+
+export default function useActiveEnterpriseAlert(courseId) {
+  const { courseAccess } = useModel('courseHomeMeta', courseId);
+  /**
+   * This alert should render if
+   *    1. course access code is incorrect_active_enterprise
+   */
+  const isVisible = courseAccess && !courseAccess.hasAccess && courseAccess.errorCode === 'incorrect_active_enterprise';
+
+  const payload = useMemo(() => ({
+    text: courseAccess && courseAccess.userMessage,
+    courseId,
+  }), [courseAccess, courseId]);
+  useAlert(isVisible, {
+    code: 'clientActiveEnterpriseAlert',
+    topic: 'outline',
+    dismissible: false,
+    type: ALERT_TYPES.ERROR,
+    payload,
+  });
+
+  return { clientActiveEnterpriseAlert: ActiveEnterpriseAlert };
+}

src/alerts/active-enteprise-alert/index.js

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

src/alerts/active-enteprise-alert/messages.js

@@ -0,0 +1,11 @@
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+  changeActiveEnterpriseLowercase: {
+    id: 'learning.activeEnterprise.change.alert',
+    defaultMessage: 'change enterprise now',
+    description: 'Text in a link, prompting the user to change active enterprise.  Used in learning.activeEnterprise.change.alert"',
+  },
+});
+
+export default messages;

src/alerts/course-start-alert/CourseStartAlert.jsx

@@ -3,34 +3,44 @@ import PropTypes from 'prop-types';
 import {
   FormattedDate,
   FormattedMessage,
-  FormattedRelative,
+  FormattedRelativeTime,
   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';
+import { useModel } from '../../generic/model-store';
 
-const DAY_MS = 24 * 60 * 60 * 1000; // in ms
+const DAY_SEC = 24 * 60 * 60; // in seconds
+const DAY_MS = DAY_SEC * 1000; // in ms
+const YEAR_SEC = 365 * DAY_SEC; // in seconds
 
-function CourseStartAlert({ payload }) {
+const CourseStartAlert = ({ payload }) => {
   const {
-    startDate,
-    userTimezone,
+    courseId,
   } = payload;
 
+  const {
+    start: startDate,
+    userTimezone,
+  } = useModel('courseHomeMeta', courseId);
+
   const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
 
+  const delta = new Date(startDate) - new Date();
   const timeRemaining = (
-    <FormattedRelative
+    <FormattedRelativeTime
       key="timeRemaining"
-      value={startDate}
+      value={delta / 1000}
+      numeric="auto"
+      // 1 year interval to help auto format. It won't format without updateIntervalInSeconds.
+      updateIntervalInSeconds={YEAR_SEC}
       {...timezoneFormatArgs}
     />
   );
-
-  const delta = new Date(startDate) - new Date();
   if (delta < DAY_MS) {
     return (
-      <Alert type={ALERT_TYPES.INFO}>
+      <Alert variant="info" icon={Info}>
         <FormattedMessage
           id="learning.outline.alert.start.short"
           defaultMessage="Course starts {timeRemaining} at {courseStartTime}."
@@ -42,7 +52,6 @@ function CourseStartAlert({ payload }) {
                 day="numeric"
                 month="short"
                 year="numeric"
-                hour12={false}
                 timeZoneName="short"
                 value={startDate}
                 {...timezoneFormatArgs}
@@ -56,10 +65,10 @@ function CourseStartAlert({ payload }) {
   }
 
   return (
-    <Alert type={ALERT_TYPES.INFO}>
+    <Alert variant="info" icon={Info}>
       <strong>
         <FormattedMessage
-          id="learning.outline.alert.end.long"
+          id="learning.outline.alert.start.long"
           defaultMessage="Course starts {timeRemaining} on {courseStartDate}."
           description="Used when the time remaining is more than a day away."
           values={{
@@ -79,17 +88,17 @@ function CourseStartAlert({ payload }) {
       </strong>
       <br />
       <FormattedMessage
-        id="learning.outline.alert.end.calendar"
+        id="learning.outline.alert.start.calendar"
         defaultMessage="Don’t forget to add a calendar reminder!"
+        description="It's just a recommendation for learners to set a reminder for the course starting date and is shown when the course starting date is more than a day. "
       />
     </Alert>
   );
-}
+};
 
 CourseStartAlert.propTypes = {
   payload: PropTypes.shape({
-    startDate: PropTypes.string,
-    userTimezone: PropTypes.string,
+    courseId: PropTypes.string,
   }).isRequired,
 };
 

src/alerts/course-start-alert/CourseStartMasqueradeBanner.jsx

@@ -0,0 +1,44 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormattedMessage, FormattedDate } from '@edx/frontend-platform/i18n';
+import { PageBanner } from '@edx/paragon';
+
+import { useModel } from '../../generic/model-store';
+
+const CourseStartMasqueradeBanner = ({ payload }) => {
+  const {
+    courseId,
+  } = payload;
+
+  const {
+    start,
+    userTimezone,
+  } = useModel('courseHomeMeta', courseId);
+
+  const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
+
+  return (
+    <PageBanner variant="warning">
+      <FormattedMessage
+        id="instructorToolbar.pageBanner.courseHasNotStarted"
+        defaultMessage="This learner does not yet have access to this course. The course starts on {date}."
+        description="It's a warning that is shown to course author when being masqueraded as learner, while the course hasn't started for the real learner yet."
+        values={{
+          date: <FormattedDate
+            key="instructorToolbar.pageBanner.courseStartDate"
+            value={start}
+            {...timezoneFormatArgs}
+          />,
+        }}
+      />
+    </PageBanner>
+  );
+};
+
+CourseStartMasqueradeBanner.propTypes = {
+  payload: PropTypes.shape({
+    courseId: PropTypes.string.isRequired,
+  }).isRequired,
+};
+
+export default CourseStartMasqueradeBanner;

src/alerts/course-start-alert/hooks.js

@@ -0,0 +1,62 @@
+import React, { useMemo } from 'react';
+import { useAlert } from '../../generic/user-messages';
+import { useModel } from '../../generic/model-store';
+
+const CourseStartAlert = React.lazy(() => import('./CourseStartAlert'));
+const CourseStartMasqueradeBanner = React.lazy(() => import('./CourseStartMasqueradeBanner'));
+
+function IsStartDateInFuture(courseId) {
+  const {
+    start,
+  } = useModel('courseHomeMeta', courseId);
+
+  const today = new Date();
+  const startDate = new Date(start);
+  return startDate > today;
+}
+
+function useCourseStartAlert(courseId) {
+  const {
+    isEnrolled,
+  } = useModel('courseHomeMeta', courseId);
+
+  const isVisible = isEnrolled && IsStartDateInFuture(courseId);
+
+  const payload = useMemo(() => ({
+    courseId,
+  }), [courseId]);
+
+  useAlert(isVisible, {
+    code: 'clientCourseStartAlert',
+    payload,
+    topic: 'outline-course-alerts',
+  });
+
+  return {
+    clientCourseStartAlert: CourseStartAlert,
+  };
+}
+
+export function useCourseStartMasqueradeBanner(courseId, tab) {
+  const {
+    isMasquerading,
+  } = useModel('courseHomeMeta', courseId);
+
+  const isVisible = isMasquerading && tab === 'progress' && IsStartDateInFuture(courseId);
+
+  const payload = useMemo(() => ({
+    courseId,
+  }), [courseId]);
+
+  useAlert(isVisible, {
+    code: 'clientCourseStartMasqueradeBanner',
+    payload,
+    topic: 'instructor-toolbar-alerts',
+  });
+
+  return {
+    clientCourseStartMasqueradeBanner: CourseStartMasqueradeBanner,
+  };
+}
+
+export default useCourseStartAlert;

src/alerts/course-start-alert/index.js

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

src/alerts/enrollment-alert/EnrollmentAlert.jsx

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

src/alerts/enrollment-alert/clickHook.js

@@ -0,0 +1,35 @@
+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();
+    });
+  }, [addFlash, courseId, orgId, successText]);
+
+  return { enrollClickHandler, loading };
+}
+
+export default useEnrollClickHandler;

src/alerts/enrollment-alert/hooks.js

@@ -1,15 +1,12 @@
 /* eslint-disable import/prefer-default-export */
 import React, {
-  useContext, useState, useCallback, useMemo,
+  useContext, useMemo,
 } from 'react';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { AppContext } from '@edx/frontend-platform/react';
 
-import { UserMessagesContext, ALERT_TYPES, useAlert } from '../../generic/user-messages';
+import { 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) {
@@ -25,43 +22,18 @@ export function useEnrollmentAlert(courseId) {
    *    3. the course is private.
    */
   const isVisible = !enrolledUser && authenticatedUser !== null && privateOutline;
-  const payload = {
+  const payload = useMemo(() => ({
     canEnroll: outline && outline.enrollAlert ? outline.enrollAlert.canEnroll : false,
     courseId,
     extraText: outline && outline.enrollAlert ? outline.enrollAlert.extraText : '',
     isStaff: course && course.isStaff,
-  };
+  }), [course, courseId, outline]);
 
   useAlert(isVisible, {
     code: 'clientEnrollmentAlert',
-    payload: useMemo(() => payload, Object.values(payload).sort()),
+    payload,
     topic: 'outline',
   });
 
   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/AccountActivationAlert.jsx

@@ -0,0 +1,132 @@
+import React, { useState } from 'react';
+import Cookies from 'js-cookie';
+import { getConfig } from '@edx/frontend-platform';
+import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
+import {
+  AlertModal,
+  Button,
+  Spinner,
+  Icon,
+} from '@edx/paragon';
+import { Check, ArrowForward } from '@edx/paragon/icons';
+import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { sendActivationEmail } from '../../courseware/data';
+import messages from './messages';
+
+const AccountActivationAlert = ({
+  intl,
+}) => {
+  const [showModal, setShowModal] = useState(false);
+  const [showSpinner, setShowSpinner] = useState(false);
+  const [showCheck, setShowCheck] = useState(false);
+  const handleOnClick = () => {
+    setShowSpinner(true);
+    setShowCheck(false);
+    sendActivationEmail().then(() => {
+      setShowSpinner(false);
+      setShowCheck(true);
+    });
+  };
+
+  const showAccountActivationAlert = Cookies.get('show-account-activation-popup');
+  if (showAccountActivationAlert !== undefined) {
+    Cookies.remove('show-account-activation-popup', { path: '/', domain: process.env.SESSION_COOKIE_DOMAIN });
+    // extra check to make sure cookie was removed before updating the state. Updating the state without removal
+    // of cookie would make it infinite rendering
+    if (Cookies.get('show-account-activation-popup') === undefined) {
+      setShowModal(true);
+    }
+  }
+
+  const button = (
+    <Button
+      variant="primary"
+      className=""
+      onClick={() => setShowModal(false)}
+    >
+      <FormattedMessage
+        id="account-activation.alert.button"
+        defaultMessage="Continue to {siteName}"
+        description="account activation alert continue button"
+        values={{
+          siteName: getConfig().SITE_NAME,
+        }}
+      />
+      <Icon src={ArrowForward} className="ml-1 d-inline-block align-bottom" />
+    </Button>
+  );
+
+  const children = () => {
+    let bodyContent;
+    const message = (
+      <FormattedMessage
+        id="account-activation.alert.message"
+        defaultMessage="We sent an email to {boldEmail} with a link to activate your account. Can’t find it? Check your spam folder or
+        {sendEmailTag}."
+        description="Message for account activation alert which is shown after the registration"
+        values={{
+          boldEmail: <b>{getAuthenticatedUser() && getAuthenticatedUser().email}</b>,
+          sendEmailTag: (
+          // eslint-disable-next-line jsx-a11y/anchor-is-valid
+            <a href="#" role="button" onClick={handleOnClick}>
+              <FormattedMessage
+                id="account-activation.resend.link"
+                defaultMessage="resend the email"
+                description="Message for resend link in account activation alert which is shown after the registration"
+              />
+            </a>
+          ),
+        }}
+      />
+    );
+    bodyContent = (
+      <div>
+        {message}
+      </div>
+    );
+
+    if (!showCheck && showSpinner) {
+      bodyContent = (
+        <div>
+          {message}
+          <Spinner
+            animation="border"
+            variant="secondary"
+            style={{ height: '1.5rem', width: '1.5rem' }}
+          />
+        </div>
+      );
+    }
+
+    if (showCheck && !showSpinner) {
+      bodyContent = (
+        <div>
+          {message}
+          <Icon
+            src={Check}
+            style={{ height: '1.7rem', width: '1.25rem' }}
+            className="text-success-500 d-inline-block position-fixed"
+          />
+        </div>
+      );
+    }
+    return bodyContent;
+  };
+
+  return (
+    <AlertModal
+      isOpen={showModal}
+      title={intl.formatMessage(messages.accountActivationAlertTitle)}
+      footerNode={button}
+      onClose={() => ({})}
+    >
+      {children()}
+    </AlertModal>
+  );
+};
+
+AccountActivationAlert.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(AccountActivationAlert);

src/alerts/logistration-alert/LogistrationAlert.jsx

@@ -2,12 +2,12 @@ import React from 'react';
 import { getConfig } from '@edx/frontend-platform';
 import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
 import { getLoginRedirectUrl } from '@edx/frontend-platform/auth';
-import { Hyperlink } from '@edx/paragon';
+import { Alert, Hyperlink } from '@edx/paragon';
+import { WarningFilled } from '@edx/paragon/icons';
 
-import { Alert } from '../../generic/user-messages';
 import genericMessages from '../../generic/messages';
 
-function LogistrationAlert({ intl }) {
+const LogistrationAlert = ({ intl }) => {
   const signIn = (
     <Hyperlink
       style={{ textDecoration: 'underline' }}
@@ -29,7 +29,7 @@ function LogistrationAlert({ intl }) {
   );
 
   return (
-    <Alert type="error">
+    <Alert variant="warning" icon={WarningFilled}>
       <FormattedMessage
         id="learning.logistration.alert"
         description="Prompts the user to sign in or register to see course content."
@@ -41,7 +41,7 @@ function LogistrationAlert({ intl }) {
       />
     </Alert>
   );
-}
+};
 
 LogistrationAlert.propTypes = {
   intl: intlShape.isRequired,

src/alerts/logistration-alert/messages.js

@@ -0,0 +1,11 @@
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+  accountActivationAlertTitle: {
+    id: 'account-activation.alert.title',
+    defaultMessage: 'Activate your account so you can log back in',
+    description: 'Title for account activation alert which is shown after the registration',
+  },
+});
+
+export default messages;

src/alerts/offer-alert/OfferAlert.jsx

@@ -1,87 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-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 {
-    offer,
-    userTimezone,
-  } = payload;
-
-  if (!offer) {
-    return null;
-  }
-
-  const {
-    code,
-    expirationDate,
-    percentage,
-    upgradeUrl,
-  } = offer;
-  const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
-
-  return (
-    <Alert type={ALERT_TYPES.INFO}>
-      {/* the first-purchase-offer-banner class can be removed post REV-1512 experiment */}
-      <span className="font-weight-bold first-purchase-offer-banner">
-        <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}
-      >
-        {intl.formatMessage(messages.upgradeNow)}
-      </Hyperlink>
-    </Alert>
-  );
-}
-
-OfferAlert.propTypes = {
-  intl: intlShape.isRequired,
-  payload: PropTypes.shape({
-    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,
-    userTimezone: PropTypes.string.isRequired,
-  }).isRequired,
-};
-
-export default injectIntl(OfferAlert);

src/alerts/offer-alert/hooks.js

@@ -1,22 +0,0 @@
-import React, { useMemo } from 'react';
-import { useAlert } from '../../generic/user-messages';
-
-const OfferAlert = React.lazy(() => import('./OfferAlert'));
-
-export function useOfferAlert(offer, userTimezone, topic) {
-  const isVisible = !!offer; // if it exists, show it.
-  const payload = {
-    offer,
-    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

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

src/alerts/sequence-alerts/hooks.js

@@ -0,0 +1,57 @@
+import { useSelector } from 'react-redux';
+
+import { useModel } from '../../generic/model-store';
+import { ALERT_TYPES, useAlert } from '../../generic/user-messages';
+
+import messages from './messages';
+
+function useSequenceBannerTextAlert(sequenceId) {
+  const sequence = useModel('sequences', sequenceId);
+  const sequenceStatus = useSelector(state => state.courseware.sequenceStatus);
+
+  // Show Alert that comes along with the sequence
+  useAlert(sequenceStatus === 'loaded' && sequence.bannerText, {
+    code: null,
+    dismissible: false,
+    text: sequence.bannerText,
+    type: ALERT_TYPES.INFO,
+    topic: 'sequence',
+  });
+}
+
+function useSequenceEntranceExamAlert(courseId, sequenceId, intl) {
+  const course = useModel('coursewareMeta', courseId);
+  const sequence = useModel('sequences', sequenceId);
+  const sequenceStatus = useSelector(state => state.courseware.sequenceStatus);
+  const {
+    entranceExamCurrentScore,
+    entranceExamEnabled,
+    entranceExamId,
+    entranceExamMinimumScorePct,
+    entranceExamPassed,
+  } = course.entranceExamData || {};
+  const entranceExamAlertVisible = sequenceStatus === 'loaded' && entranceExamEnabled && entranceExamId === sequence.sectionId;
+  let entranceExamText;
+
+  if (entranceExamPassed) {
+    entranceExamText = intl.formatMessage(
+      messages.entranceExamTextPassed,
+      { entranceExamCurrentScore: entranceExamCurrentScore * 100 },
+    );
+  } else {
+    entranceExamText = intl.formatMessage(messages.entranceExamTextNotPassing, {
+      entranceExamCurrentScore: entranceExamCurrentScore * 100,
+      entranceExamMinimumScorePct: entranceExamMinimumScorePct * 100,
+    });
+  }
+
+  useAlert(entranceExamAlertVisible, {
+    code: null,
+    dismissible: false,
+    text: entranceExamText,
+    type: ALERT_TYPES.INFO,
+    topic: 'sequence',
+  });
+}
+
+export { useSequenceBannerTextAlert, useSequenceEntranceExamAlert };

src/alerts/sequence-alerts/messages.js

@@ -0,0 +1,14 @@
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+  entranceExamTextNotPassing: {
+    id: 'learn.sequence.entranceExamTextNotPassing',
+    defaultMessage: 'To access course materials, you must score {entranceExamMinimumScorePct}% or higher on this exam. Your current score is {entranceExamCurrentScore}%.',
+  },
+  entranceExamTextPassed: {
+    id: 'learn.sequence.entranceExamTextPassed',
+    defaultMessage: 'Your score is {entranceExamCurrentScore}%. You have passed the entrance exam.',
+  },
+});
+
+export default messages;

src/constants.js

@@ -0,0 +1,33 @@
+export const DECODE_ROUTES = {
+  ACCESS_DENIED: '/course/:courseId/access-denied',
+  HOME: '/course/:courseId/home',
+  LIVE: '/course/:courseId/live',
+  DATES: '/course/:courseId/dates',
+  DISCUSSION: '/course/:courseId/discussion/:path/*',
+  PROGRESS: [
+    '/course/:courseId/progress/:targetUserId/',
+    '/course/:courseId/progress',
+  ],
+  COURSE_END: '/course/:courseId/course-end',
+  COURSEWARE: [
+    '/course/:courseId/:sequenceId/:unitId',
+    '/course/:courseId/:sequenceId',
+    '/course/:courseId',
+  ],
+  REDIRECT_HOME: 'home/:courseId',
+  REDIRECT_SURVEY: 'survey/:courseId',
+};
+
+export const ROUTES = {
+  UNSUBSCRIBE: '/goal-unsubscribe/:token',
+  REDIRECT: '/redirect/*',
+  DASHBOARD: 'dashboard',
+  CONSENT: 'consent',
+};
+
+export const REDIRECT_MODES = {
+  DASHBOARD_REDIRECT: 'dashboard-redirect',
+  CONSENT_REDIRECT: 'consent-redirect',
+  HOME_REDIRECT: 'home-redirect',
+  SURVEY_REDIRECT: 'survey-redirect',
+};

src/course-header/AnonymousUserMenu.jsx

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

src/course-header/AuthenticatedUserDropdown.jsx

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

src/course-header/Header.jsx

@@ -1,97 +0,0 @@
-import React, { useContext } from 'react';
-import PropTypes from 'prop-types';
-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';
-
-import AnonymousUserMenu from './AnonymousUserMenu';
-import AuthenticatedUserDropdown from './AuthenticatedUserDropdown';
-import messages from './messages';
-
-function LinkedLogo({
-  href,
-  src,
-  alt,
-  ...attributes
-}) {
-  return (
-    <a href={href} {...attributes}>
-      <img className="d-block" src={src} alt={alt} />
-    </a>
-  );
-}
-
-LinkedLogo.propTypes = {
-  href: PropTypes.string.isRequired,
-  src: PropTypes.string.isRequired,
-  alt: PropTypes.string.isRequired,
-};
-
-function Header({
-  courseOrg, courseNumber, courseTitle, intl,
-}) {
-  const { authenticatedUser } = useContext(AppContext);
-
-  const { enterpriseLearnerPortalLink, enterpriseCustomerBrandingConfig } = useEnterpriseConfig(
-    authenticatedUser,
-    getConfig().ENTERPRISE_LEARNER_PORTAL_HOSTNAME,
-    getConfig().LMS_BASE_URL,
-  );
-
-  let headerLogo = (
-    <LinkedLogo
-      className="logo"
-      href={`${getConfig().LMS_BASE_URL}/dashboard`}
-      src={getConfig().LOGO_URL}
-      alt={getConfig().SITE_NAME}
-    />
-  );
-  if (enterpriseCustomerBrandingConfig && Object.keys(enterpriseCustomerBrandingConfig).length > 0) {
-    headerLogo = (
-      <LinkedLogo
-        className="logo"
-        href={enterpriseCustomerBrandingConfig.logoDestination}
-        src={enterpriseCustomerBrandingConfig.logo}
-        alt={enterpriseCustomerBrandingConfig.logoAltText}
-      />
-    );
-  }
-
-  return (
-    <header className="course-header">
-      <a className="sr-only sr-only-focusable" href="#main-content">{intl.formatMessage(messages.skipNavLink)}</a>
-      <div className="container-fluid py-2 d-flex align-items-center">
-        {headerLogo}
-        <div className="flex-grow-1 course-title-lockup" style={{ lineHeight: 1 }}>
-          <span className="d-block small m-0">{courseOrg} {courseNumber}</span>
-          <span className="d-block m-0 font-weight-bold course-title">{courseTitle}</span>
-        </div>
-        {authenticatedUser && (
-          <AuthenticatedUserDropdown
-            enterpriseLearnerPortalLink={enterpriseLearnerPortalLink}
-            username={authenticatedUser.username}
-          />
-        )}
-        {!authenticatedUser && (
-          <AnonymousUserMenu />
-        )}
-      </div>
-    </header>
-  );
-}
-
-Header.propTypes = {
-  courseOrg: PropTypes.string,
-  courseNumber: PropTypes.string,
-  courseTitle: PropTypes.string,
-  intl: intlShape.isRequired,
-};
-
-Header.defaultProps = {
-  courseOrg: null,
-  courseNumber: null,
-  courseTitle: null,
-};
-
-export default injectIntl(Header);

src/course-header/Header.test.jsx

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

src/course-header/messages.js

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

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

@@ -1,92 +0,0 @@
-import { Factory } from 'rosie'; // eslint-disable-line import/no-extraneous-dependencies
-import './block.factory';
-
-// Generates an Array of block IDs, either from a single block or an array of blocks.
-const getIds = (attr) => {
-  const blocks = Array.isArray(attr) ? attr : [attr];
-  return blocks.map(block => block.id);
-};
-
-// Generates an Object in { [block.id]: block } format, either from a single block or an array of blocks.
-const getBlocks = (attr) => {
-  const blocks = Array.isArray(attr) ? attr : [attr];
-  // eslint-disable-next-line no-return-assign,no-sequences
-  return blocks.reduce((acc, block) => (acc[block.id] = block, acc), {});
-};
-
-Factory.define('courseBlocks')
-  .option('courseId', 'course-v1:edX+DemoX+Demo_Course')
-  .option('units', ['courseId'], courseId => ([
-    Factory.build(
-      'block',
-      { type: 'vertical' },
-      { courseId },
-    ),
-  ]))
-  .option('sequence', ['courseId', 'units'], (courseId, child) => Factory.build(
-    'block',
-    { type: 'sequential', children: getIds(child) },
-    { courseId },
-  ))
-  .option('section', ['courseId', 'sequence'], (courseId, child) => Factory.build(
-    'block',
-    { type: 'chapter', children: getIds(child) },
-    { courseId },
-  ))
-  .option('course', ['courseId', 'section'], (courseId, child) => Factory.build(
-    'block',
-    { type: 'course', children: getIds(child) },
-    { courseId },
-  ))
-  .attr(
-    'blocks',
-    ['course', 'section', 'sequence', 'units'],
-    (course, section, sequence, units) => ({
-      [course.id]: course,
-      ...getBlocks(section),
-      ...getBlocks(sequence),
-      ...getBlocks(units),
-    }),
-  )
-  .attr('root', ['course'], course => course.id);
-
-/**
- * Builds a course with a single chapter, sequence, and unit.
- */
-export default function buildSimpleCourseBlocks(courseId, title, options = {}) {
-  const sequenceBlock = options.sequenceBlock || [Factory.build(
-    'block',
-    { type: 'sequential' },
-    { courseId },
-  )];
-  const sectionBlock = options.sectionBlock || Factory.build(
-    'block',
-    {
-      type: 'chapter',
-      display_name: 'Title of Section',
-      complete: options.complete || false,
-      resume_block: options.resumeBlock || false,
-      children: sequenceBlock.map(block => block.id),
-    },
-    { courseId },
-  );
-  const courseBlock = options.courseBlock || Factory.build(
-    'block',
-    { type: 'course', display_name: title, children: [sectionBlock.id] },
-    { courseId },
-  );
-  return {
-    courseBlocks: options.courseBlocks || Factory.build(
-      'courseBlocks',
-      { courseId },
-      {
-        sequence: sequenceBlock,
-        section: sectionBlock,
-        course: courseBlock,
-      },
-    ),
-    sequenceBlock,
-    sectionBlock,
-    courseBlock,
-  };
-}

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

@@ -1,90 +1,122 @@
 import { Factory } from 'rosie'; // eslint-disable-line import/no-extraneous-dependencies
+import courseMetadataBase from '../../../shared/data/__factories__/courseMetadataBase.factory';
 
 Factory.define('courseHomeMetadata')
-  .sequence(
-    'courseId', (courseId) => `course-v1:edX+DemoX+Demo_Course_${courseId}`,
-  )
+  .extend(courseMetadataBase)
   .option('host', 'http://localhost:18000')
   .attrs({
-    is_staff: false,
-    original_user_is_staff: false,
-    number: 'DemoX',
-    org: 'edX',
     title: 'Demonstration Course',
     is_self_paced: false,
     is_enrolled: false,
-  })
-  .attr(
-    'tabs', ['courseId', 'host'], (courseId, host) => {
-      const tabs = [
-        Factory.build(
-          'tab',
-          {
-            title: 'Course',
-            priority: 0,
-            slug: 'courseware',
-            type: 'courseware',
-          },
-          { courseId, path: 'course/' },
-        ),
-        Factory.build(
-          'tab',
-          {
-            title: 'Discussion',
-            priority: 1,
-            slug: 'discussion',
-            type: 'discussion',
-          },
-          { courseId, path: 'discussion/forum/' },
-        ),
-        Factory.build(
-          'tab',
-          {
-            title: 'Wiki',
-            priority: 2,
-            slug: 'wiki',
-            type: 'wiki',
-          },
-          { courseId, path: 'course_wiki' },
-        ),
-        Factory.build(
-          'tab',
-          {
-            title: 'Progress',
-            priority: 3,
-            slug: 'progress',
-            type: 'progress',
-          },
-          { courseId, path: 'progress' },
-        ),
-        Factory.build(
-          'tab',
-          {
-            title: 'Instructor',
-            priority: 4,
-            slug: 'instructor',
-            type: 'instructor',
-          },
-          { courseId, path: 'instructor' },
-        ),
-        Factory.build(
-          'tab',
-          {
-            title: 'Dates',
-            priority: 5,
-            slug: 'dates',
-            type: 'dates',
-          },
-          { courseId, path: 'dates' },
-        ),
-      ];
-
-      return tabs.map(
-        tab => ({
-          tab_id: tab.slug,
-          title: tab.title,
-          url: `${host}${tab.url}`,
-        }),
-      );
+    is_staff: false,
+    can_view_certificate: true,
+    celebrations: null,
+    course_access: {
+      additional_context_user_message: null,
+      developer_message: null,
+      error_code: null,
+      has_access: true,
+      user_fragment: null,
+      user_message: null,
     },
-  );
+    number: 'DemoX',
+    original_user_is_staff: false,
+    org: 'edX',
+    start: '2013-02-05T05:00:00Z',
+    user_timezone: 'UTC',
+    username: 'MockUser',
+    verified_mode: {
+      access_expiration_date: null,
+      currency: 'USD',
+      upgrade_url: 'http://localhost:18130/basket/add/?sku=8CF08E5',
+      sku: '8CF08E5',
+      price: 149,
+      currency_symbol: '$',
+    },
+  })
+  .attr('tabs', ['id', 'host'], (id, host) => [
+    Factory.build(
+      'tab',
+      {
+        title: 'Course',
+        priority: 0,
+        slug: 'courseware',
+        type: 'courseware',
+      },
+      {
+        courseId: id,
+        host,
+        path: 'course/',
+      },
+    ),
+    Factory.build(
+      'tab',
+      {
+        title: 'Discussion',
+        priority: 1,
+        slug: 'discussion',
+        type: 'discussion',
+      },
+      {
+        courseId: id,
+        host,
+        path: 'discussion/forum/',
+      },
+    ),
+    Factory.build(
+      'tab',
+      {
+        title: 'Wiki',
+        priority: 2,
+        slug: 'wiki',
+        type: 'wiki',
+      },
+      {
+        courseId: id,
+        host,
+        path: 'course_wiki',
+      },
+    ),
+    Factory.build(
+      'tab',
+      {
+        title: 'Progress',
+        priority: 3,
+        slug: 'progress',
+        type: 'progress',
+      },
+      {
+        courseId: id,
+        host,
+        path: 'progress',
+      },
+    ),
+    Factory.build(
+      'tab',
+      {
+        title: 'Instructor',
+        priority: 4,
+        slug: 'instructor',
+        type: 'instructor',
+      },
+      {
+        courseId: id,
+        host,
+        path: 'instructor',
+      },
+    ),
+    Factory.build(
+      'tab',
+      {
+        title: 'Dates',
+        priority: 5,
+        slug: 'dates',
+        type: 'dates',
+      },
+      {
+        courseId: id,
+        host,
+        path: 'dates',
+      },
+    ),
+  ]);

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

@@ -219,5 +219,4 @@ Factory.define('datesTabData')
     ],
     has_ended: false,
     learner_is_full_access: true,
-    user_timezone: 'America/New_York',
   });

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

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

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

@@ -1,25 +1,19 @@
 import { Factory } from 'rosie'; // eslint-disable-line import/no-extraneous-dependencies
 
-import buildSimpleCourseBlocks from './courseBlocks.factory';
+import { buildMinimalCourseBlocks } from '../../../shared/data/__factories__/courseBlocks.factory';
 
 Factory.define('outlineTabData')
   .option('courseId', 'course-v1:edX+DemoX+Demo_Course')
   .option('host', 'http://localhost:18000')
-  .option('dateBlocks', [])
-  .attr('course_tools', ['host', 'courseId'], (host, courseId) => ([{
-    analytics_id: 'edx.bookmarks',
-    title: 'Bookmarks',
-    url: `${host}/courses/${courseId}/bookmarks/`,
-  }]))
+  .option('date_blocks', [])
   .attr('course_blocks', ['courseId'], courseId => {
-    const { courseBlocks } = buildSimpleCourseBlocks(courseId);
+    const { courseBlocks } = buildMinimalCourseBlocks(courseId);
     return {
       blocks: courseBlocks.blocks,
     };
   })
-  .attr('dates_widget', ['dateBlocks'], (dateBlocks) => ({
+  .attr('dates_widget', ['date_blocks'], (dateBlocks) => ({
     course_date_blocks: dateBlocks,
-    user_timezone: 'UTC',
   }))
   .attr('resume_course', ['host', 'courseId'], (host, courseId) => ({
     has_visited_course: false,
@@ -34,12 +28,29 @@ Factory.define('outlineTabData')
     upgrade_url: `${host}/dashboard`,
   }))
   .attrs({
+    course_access_redirect: false,
+    has_scheduled_content: null,
     access_expiration: null,
-    can_show_upgrade_sock: true,
+    can_show_upgrade_sock: false,
+    cert_data: {
+      cert_status: null,
+      cert_web_view_url: null,
+      certificate_available_date: null,
+    },
     course_goals: {
       goal_options: [],
       selected_goal: null,
+      weekly_learning_goal_enabled: false,
+      days_per_week: null,
+      subscribed_to_reminders: null,
     },
+    course_tools: [
+      {
+        analytics_id: 'edx.bookmarks',
+        title: 'Bookmarks',
+        url: 'https://example.com/bookmarks',
+      },
+    ],
     dates_banner_info: {
       content_type_gating_enabled: false,
       missed_gated_content: false,

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

@@ -0,0 +1,83 @@
+import { Factory } from 'rosie'; // eslint-disable-line import/no-extraneous-dependencies
+
+// Sample data helpful when developing & testing, to see a variety of configurations.
+// This set of data may not be realistic, but it is intended to demonstrate many UI results.
+Factory.define('progressTabData')
+  .attrs({
+    access_expiration: null,
+    end: '3027-03-31T00:00:00Z',
+    certificate_data: {},
+    completion_summary: {
+      complete_count: 1,
+      incomplete_count: 1,
+      locked_count: 0,
+    },
+    course_grade: {
+      letter_grade: 'pass',
+      percent: 1,
+      is_passing: true,
+    },
+    credit_course_requirements: null,
+    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: true,
+            has_graded_assignment: true,
+            num_points_earned: 0,
+            num_points_possible: 3,
+            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',
+          },
+        ],
+      },
+      {
+        display_name: 'Second section',
+        subsections: [
+          {
+            assignment_type: 'Homework',
+            display_name: 'Second subsection',
+            has_graded_assignment: true,
+            num_points_earned: 1,
+            num_points_possible: 1,
+            percent_graded: 1.0,
+            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',
+          },
+        ],
+      },
+    ],
+    enrollment_mode: 'audit',
+    grading_policy: {
+      assignment_policies: [
+        {
+          num_droppable: 1,
+          num_total: 2,
+          short_label: 'HW',
+          type: 'Homework',
+          weight: 1,
+        },
+      ],
+      grade_range: {
+        pass: 0.75,
+      },
+    },
+    has_scheduled_content: false,
+    studio_url: 'http://studio.edx.org/settings/grading/course-v1:edX+Test+run',
+    user_has_passing_grade: false,
+    verification_data: {
+      link: null,
+      status: 'none',
+      status_date: null,
+    },
+    verified_mode: null,
+  });

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

@@ -0,0 +1,25 @@
+import { Factory } from 'rosie'; // eslint-disable-line import/no-extraneous-dependencies
+
+Factory.define('upgradeNotificationData')
+  .option('host', 'http://localhost:18000')
+  .option('dateBlocks', [])
+  .option('offer', null)
+  .option('userTimezone', 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',
+    currencySymbol: '$',
+    price: 149,
+    sku: 'ABCD1234',
+    upgradeUrl: `${host}/dashboard`,
+  }))
+  .attr('org', 'edX')
+  .attrs({
+    accessExpiration: {
+      expiration_date: '1950-07-13T02:04:49.040006Z',
+    },
+  })
+  .attr('timeOffsetMillis', 0);

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

@@ -3,8 +3,10 @@
 exports[`Data layer integration tests Test fetchDatesTab Should fetch, normalize, and save metadata 1`] = `
 Object {
   "courseHome": Object {
-    "courseId": "course-v1:edX+DemoX+Demo_Course_1",
+    "courseId": "course-v1:edX+DemoX+Demo_Course",
     "courseStatus": "loaded",
+    "proctoringPanelStatus": "loading",
+    "targetUserId": undefined,
     "toastBodyLink": null,
     "toastBodyText": null,
     "toastHeader": "",
@@ -13,56 +15,81 @@ Object {
     "courseId": null,
     "courseStatus": "loading",
     "sequenceId": null,
+    "sequenceMightBeUnit": false,
     "sequenceStatus": "loading",
   },
+  "learningAssistant": ObjectContaining {
+    "conversationId": Any<String>,
+  },
   "models": Object {
     "courseHomeMeta": Object {
-      "course-v1:edX+DemoX+Demo_Course_1": Object {
-        "courseId": "course-v1:edX+DemoX+Demo_Course_1",
-        "id": "course-v1:edX+DemoX+Demo_Course_1",
+      "course-v1:edX+DemoX+Demo_Course": Object {
+        "canViewCertificate": true,
+        "celebrations": null,
+        "courseAccess": Object {
+          "additionalContextUserMessage": null,
+          "developerMessage": null,
+          "errorCode": null,
+          "hasAccess": true,
+          "userFragment": null,
+          "userMessage": null,
+        },
+        "id": "course-v1:edX+DemoX+Demo_Course",
         "isEnrolled": false,
+        "isMasquerading": false,
         "isSelfPaced": false,
         "isStaff": false,
         "number": "DemoX",
         "org": "edX",
         "originalUserIsStaff": false,
+        "start": "2013-02-05T05:00:00Z",
         "tabs": Array [
           Object {
             "slug": "outline",
             "title": "Course",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/course/",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/course/",
           },
           Object {
             "slug": "discussion",
             "title": "Discussion",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/discussion/forum/",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/discussion/forum/",
           },
           Object {
             "slug": "wiki",
             "title": "Wiki",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/course_wiki",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/course_wiki",
           },
           Object {
             "slug": "progress",
             "title": "Progress",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/progress",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/progress",
           },
           Object {
             "slug": "instructor",
             "title": "Instructor",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/instructor",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/instructor",
           },
           Object {
             "slug": "dates",
             "title": "Dates",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/dates",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/dates",
           },
         ],
         "title": "Demonstration Course",
+        "userTimezone": "UTC",
+        "username": "MockUser",
+        "verifiedMode": Object {
+          "accessExpirationDate": null,
+          "currency": "USD",
+          "currencySymbol": "$",
+          "price": 149,
+          "sku": "8CF08E5",
+          "upgradeUrl": "http://localhost:18130/basket/add/?sku=8CF08E5",
+        },
       },
     },
     "dates": Object {
-      "course-v1:edX+DemoX+Demo_Course_1": Object {
+      "course-v1:edX+DemoX+Demo_Course": Object {
         "courseDateBlocks": Array [
           Object {
             "date": "2020-05-01T17:59:41Z",
@@ -276,20 +303,31 @@ Object {
           "verifiedUpgradeLink": "http://localhost:18130/basket/add/?sku=8CF08E5",
         },
         "hasEnded": false,
-        "id": "course-v1:edX+DemoX+Demo_Course_1",
+        "id": "course-v1:edX+DemoX+Demo_Course",
         "learnerIsFullAccess": true,
-        "userTimezone": "America/New_York",
       },
     },
   },
+  "recommendations": Object {
+    "recommendationsStatus": "loading",
+  },
+  "tours": Object {
+    "showCoursewareTour": false,
+    "showExistingUserCourseHomeTour": false,
+    "showNewUserCourseHomeModal": false,
+    "showNewUserCourseHomeTour": false,
+    "toursEnabled": false,
+  },
 }
 `;
 
 exports[`Data layer integration tests Test fetchOutlineTab Should fetch, normalize, and save metadata 1`] = `
 Object {
   "courseHome": Object {
-    "courseId": "course-v1:edX+DemoX+Demo_Course_1",
+    "courseId": "course-v1:edX+DemoX+Demo_Course",
     "courseStatus": "loaded",
+    "proctoringPanelStatus": "loading",
+    "targetUserId": undefined,
     "toastBodyLink": null,
     "toastBodyText": null,
     "toastHeader": "",
@@ -298,62 +336,93 @@ Object {
     "courseId": null,
     "courseStatus": "loading",
     "sequenceId": null,
+    "sequenceMightBeUnit": false,
     "sequenceStatus": "loading",
   },
+  "learningAssistant": ObjectContaining {
+    "conversationId": Any<String>,
+  },
   "models": Object {
     "courseHomeMeta": Object {
-      "course-v1:edX+DemoX+Demo_Course_1": Object {
-        "courseId": "course-v1:edX+DemoX+Demo_Course_1",
-        "id": "course-v1:edX+DemoX+Demo_Course_1",
+      "course-v1:edX+DemoX+Demo_Course": Object {
+        "canViewCertificate": true,
+        "celebrations": null,
+        "courseAccess": Object {
+          "additionalContextUserMessage": null,
+          "developerMessage": null,
+          "errorCode": null,
+          "hasAccess": true,
+          "userFragment": null,
+          "userMessage": null,
+        },
+        "id": "course-v1:edX+DemoX+Demo_Course",
         "isEnrolled": false,
+        "isMasquerading": false,
         "isSelfPaced": false,
         "isStaff": false,
         "number": "DemoX",
         "org": "edX",
         "originalUserIsStaff": false,
+        "start": "2013-02-05T05:00:00Z",
         "tabs": Array [
           Object {
             "slug": "outline",
             "title": "Course",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/course/",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/course/",
           },
           Object {
             "slug": "discussion",
             "title": "Discussion",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/discussion/forum/",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/discussion/forum/",
           },
           Object {
             "slug": "wiki",
             "title": "Wiki",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/course_wiki",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/course_wiki",
           },
           Object {
             "slug": "progress",
             "title": "Progress",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/progress",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/progress",
           },
           Object {
             "slug": "instructor",
             "title": "Instructor",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/instructor",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/instructor",
           },
           Object {
             "slug": "dates",
             "title": "Dates",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/dates",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/dates",
           },
         ],
         "title": "Demonstration Course",
+        "userTimezone": "UTC",
+        "username": "MockUser",
+        "verifiedMode": Object {
+          "accessExpirationDate": null,
+          "currency": "USD",
+          "currencySymbol": "$",
+          "price": 149,
+          "sku": "8CF08E5",
+          "upgradeUrl": "http://localhost:18130/basket/add/?sku=8CF08E5",
+        },
       },
     },
     "outline": Object {
-      "course-v1:edX+DemoX+Demo_Course_1": Object {
+      "course-v1:edX+DemoX+Demo_Course": Object {
         "accessExpiration": null,
-        "canShowUpgradeSock": true,
+        "canShowUpgradeSock": false,
+        "certData": Object {
+          "certStatus": null,
+          "certWebViewUrl": null,
+          "certificateAvailableDate": null,
+        },
         "courseBlocks": Object {
           "courses": Object {
             "block-v1:edX+DemoX+Demo_Course+type@course+block@bcdabcdabcdabcdabcdabcdabcdabcd3": Object {
-              "id": "course-v1:edX+DemoX+Demo_Course_1",
+              "hasScheduledContent": false,
+              "id": "course-v1:edX+DemoX+Demo_Course",
               "sectionIds": Array [
                 "block-v1:edX+DemoX+Demo_Course+type@chapter+block@bcdabcdabcdabcdabcdabcdabcdabcd2",
               ],
@@ -363,7 +432,7 @@ Object {
           "sections": Object {
             "block-v1:edX+DemoX+Demo_Course+type@chapter+block@bcdabcdabcdabcdabcdabcdabcdabcd2": Object {
               "complete": false,
-              "courseId": "course-v1:edX+DemoX+Demo_Course_1",
+              "courseId": "course-v1:edX+DemoX+Demo_Course",
               "id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@bcdabcdabcdabcdabcdabcdabcdabcd2",
               "resumeBlock": false,
               "sequenceIds": Array [
@@ -377,23 +446,28 @@ Object {
               "complete": false,
               "description": null,
               "due": null,
+              "effortActivities": 2,
+              "effortTime": 15,
               "icon": null,
               "id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@bcdabcdabcdabcdabcdabcdabcdabcd1",
               "sectionId": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@bcdabcdabcdabcdabcdabcdabcdabcd2",
               "showLink": true,
-              "title": "bcdabcdabcdabcdabcdabcdabcdabcd1",
+              "title": "Title of Sequence",
             },
           },
         },
         "courseGoals": Object {
+          "daysPerWeek": null,
           "goalOptions": Array [],
           "selectedGoal": null,
+          "subscribedToReminders": null,
+          "weeklyLearningGoalEnabled": false,
         },
         "courseTools": Array [
           Object {
             "analyticsId": "edx.bookmarks",
             "title": "Bookmarks",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/bookmarks/",
+            "url": "https://example.com/bookmarks",
           },
         ],
         "datesBannerInfo": Object {
@@ -403,20 +477,24 @@ Object {
         },
         "datesWidget": Object {
           "courseDateBlocks": Array [],
-          "userTimezone": "UTC",
         },
+        "enableProctoredExams": undefined,
         "enrollAlert": Object {
           "canEnroll": true,
           "extraText": "Contact the administrator.",
         },
+        "enrollmentMode": undefined,
         "handoutsHtml": "<ul><li>Handout 1</li></ul>",
         "hasEnded": undefined,
-        "id": "course-v1:edX+DemoX+Demo_Course_1",
+        "hasScheduledContent": null,
+        "id": "course-v1:edX+DemoX+Demo_Course",
         "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",
         },
+        "timeOffsetMillis": 0,
+        "userHasPassingGrade": undefined,
         "verifiedMode": Object {
           "accessExpirationDate": "2050-01-01T12:00:00",
           "currency": "USD",
@@ -429,5 +507,220 @@ Object {
       },
     },
   },
+  "recommendations": Object {
+    "recommendationsStatus": "loading",
+  },
+  "tours": Object {
+    "showCoursewareTour": false,
+    "showExistingUserCourseHomeTour": false,
+    "showNewUserCourseHomeModal": false,
+    "showNewUserCourseHomeTour": false,
+    "toursEnabled": false,
+  },
+}
+`;
+
+exports[`Data layer integration tests Test fetchProgressTab Should fetch, normalize, and save metadata 1`] = `
+Object {
+  "courseHome": Object {
+    "courseId": "course-v1:edX+DemoX+Demo_Course",
+    "courseStatus": "loaded",
+    "proctoringPanelStatus": "loading",
+    "targetUserId": undefined,
+    "toastBodyLink": null,
+    "toastBodyText": null,
+    "toastHeader": "",
+  },
+  "courseware": Object {
+    "courseId": null,
+    "courseStatus": "loading",
+    "sequenceId": null,
+    "sequenceMightBeUnit": false,
+    "sequenceStatus": "loading",
+  },
+  "learningAssistant": ObjectContaining {
+    "conversationId": Any<String>,
+  },
+  "models": Object {
+    "courseHomeMeta": Object {
+      "course-v1:edX+DemoX+Demo_Course": Object {
+        "canViewCertificate": true,
+        "celebrations": null,
+        "courseAccess": Object {
+          "additionalContextUserMessage": null,
+          "developerMessage": null,
+          "errorCode": null,
+          "hasAccess": true,
+          "userFragment": null,
+          "userMessage": null,
+        },
+        "id": "course-v1:edX+DemoX+Demo_Course",
+        "isEnrolled": false,
+        "isMasquerading": false,
+        "isSelfPaced": false,
+        "isStaff": false,
+        "number": "DemoX",
+        "org": "edX",
+        "originalUserIsStaff": false,
+        "start": "2013-02-05T05:00:00Z",
+        "tabs": Array [
+          Object {
+            "slug": "outline",
+            "title": "Course",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/course/",
+          },
+          Object {
+            "slug": "discussion",
+            "title": "Discussion",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/discussion/forum/",
+          },
+          Object {
+            "slug": "wiki",
+            "title": "Wiki",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/course_wiki",
+          },
+          Object {
+            "slug": "progress",
+            "title": "Progress",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/progress",
+          },
+          Object {
+            "slug": "instructor",
+            "title": "Instructor",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/instructor",
+          },
+          Object {
+            "slug": "dates",
+            "title": "Dates",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/dates",
+          },
+        ],
+        "title": "Demonstration Course",
+        "userTimezone": "UTC",
+        "username": "MockUser",
+        "verifiedMode": Object {
+          "accessExpirationDate": null,
+          "currency": "USD",
+          "currencySymbol": "$",
+          "price": 149,
+          "sku": "8CF08E5",
+          "upgradeUrl": "http://localhost:18130/basket/add/?sku=8CF08E5",
+        },
+      },
+    },
+    "progress": Object {
+      "course-v1:edX+DemoX+Demo_Course": Object {
+        "accessExpiration": null,
+        "certificateData": Object {},
+        "completionSummary": Object {
+          "completeCount": 1,
+          "incompleteCount": 1,
+          "lockedCount": 0,
+        },
+        "courseGrade": Object {
+          "isPassing": true,
+          "letterGrade": "pass",
+          "percent": 1,
+        },
+        "courseId": "course-v1:edX+DemoX+Demo_Course",
+        "creditCourseRequirements": null,
+        "end": "3027-03-31T00:00:00Z",
+        "enrollmentMode": "audit",
+        "gradesFeatureIsFullyLocked": false,
+        "gradesFeatureIsPartiallyLocked": false,
+        "gradingPolicy": Object {
+          "assignmentPolicies": Array [
+            Object {
+              "averageGrade": "1.00",
+              "numDroppable": 1,
+              "shortLabel": "HW",
+              "type": "Homework",
+              "weight": 1,
+              "weightedGrade": 1,
+            },
+          ],
+          "gradeRange": Object {
+            "pass": 0.75,
+          },
+        },
+        "hasScheduledContent": false,
+        "id": "course-v1:edX+DemoX+Demo_Course",
+        "sectionScores": Array [
+          Object {
+            "displayName": "First section",
+            "subsections": Array [
+              Object {
+                "assignmentType": "Homework",
+                "blockKey": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345",
+                "displayName": "First subsection",
+                "hasGradedAssignment": true,
+                "learnerHasAccess": true,
+                "numPointsEarned": 0,
+                "numPointsPossible": 3,
+                "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",
+              },
+            ],
+          },
+          Object {
+            "displayName": "Second section",
+            "subsections": Array [
+              Object {
+                "assignmentType": "Homework",
+                "displayName": "Second subsection",
+                "hasGradedAssignment": true,
+                "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",
+              },
+            ],
+          },
+        ],
+        "studioUrl": "http://studio.edx.org/settings/grading/course-v1:edX+Test+run",
+        "userHasPassingGrade": false,
+        "verificationData": Object {
+          "link": null,
+          "status": "none",
+          "statusDate": null,
+        },
+        "verifiedMode": null,
+      },
+    },
+  },
+  "recommendations": Object {
+    "recommendationsStatus": "loading",
+  },
+  "tours": Object {
+    "showCoursewareTour": false,
+    "showExistingUserCourseHomeTour": false,
+    "showNewUserCourseHomeModal": false,
+    "showNewUserCourseHomeTour": false,
+    "toursEnabled": false,
+  },
 }
 `;

src/course-home/data/api.js

@@ -1,18 +1,114 @@
 import { camelCaseObject, getConfig } from '@edx/frontend-platform';
 import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 import { logInfo } from '@edx/frontend-platform/logging';
+import { appendBrowserTimezoneToUrl } from '../../utils';
 
-function normalizeCourseHomeCourseMetadata(metadata) {
+const calculateAssignmentTypeGrades = (points, assignmentWeight, numDroppable) => {
+  let dropCount = numDroppable;
+  // Drop the lowest grades
+  while (dropCount && points.length >= dropCount) {
+    const lowestScore = Math.min(...points);
+    const lowestScoreIndex = points.indexOf(lowestScore);
+    points.splice(lowestScoreIndex, 1);
+    dropCount--;
+  }
+  let averageGrade = 0;
+  let weightedGrade = 0;
+  if (points.length) {
+    // Calculate the average grade for the assignment and round it. This rounding is not ideal and does not accurately
+    // reflect what a learner's grade would be, however, we must have parity with the current grading behavior that
+    // exists in edx-platform.
+    averageGrade = (points.reduce((a, b) => a + b, 0) / points.length).toFixed(2);
+    weightedGrade = averageGrade * assignmentWeight;
+  }
+  return { averageGrade, weightedGrade };
+};
+
+function normalizeAssignmentPolicies(assignmentPolicies, sectionScores) {
+  const gradeByAssignmentType = {};
+  assignmentPolicies.forEach(assignment => {
+    // Create an array with the number of total assignments and set the scores to 0
+    // as placeholders for assignments that have not yet been released
+    gradeByAssignmentType[assignment.type] = {
+      grades: Array(assignment.numTotal).fill(0),
+      numAssignmentsCreated: 0,
+      numTotalExpectedAssignments: assignment.numTotal,
+    };
+  });
+
+  sectionScores.forEach((chapter) => {
+    chapter.subsections.forEach((subsection) => {
+      if (!(subsection.hasGradedAssignment && subsection.showGrades && subsection.numPointsPossible)) {
+        return;
+      }
+      const {
+        assignmentType,
+        numPointsEarned,
+        numPointsPossible,
+      } = subsection;
+
+      // If a subsection's assignment type does not match an assignment policy in Studio,
+      // we won't be able to include it in this accumulation of grades by assignment type.
+      // This may happen if a course author has removed/renamed an assignment policy in Studio and
+      // neglected to update the subsection's of that assignment type
+      if (!gradeByAssignmentType[assignmentType]) {
+        return;
+      }
+
+      let {
+        numAssignmentsCreated,
+      } = gradeByAssignmentType[assignmentType];
+
+      numAssignmentsCreated++;
+      if (numAssignmentsCreated <= gradeByAssignmentType[assignmentType].numTotalExpectedAssignments) {
+        // Remove a placeholder grade so long as the number of recorded created assignments is less than the number
+        // of expected assignments
+        gradeByAssignmentType[assignmentType].grades.shift();
+      }
+      // Add the graded assignment to the list
+      gradeByAssignmentType[assignmentType].grades.push(numPointsEarned ? numPointsEarned / numPointsPossible : 0);
+      // Record the created assignment
+      gradeByAssignmentType[assignmentType].numAssignmentsCreated = numAssignmentsCreated;
+    });
+  });
+
+  return assignmentPolicies.map((assignment) => {
+    const { averageGrade, weightedGrade } = calculateAssignmentTypeGrades(
+      gradeByAssignmentType[assignment.type].grades,
+      assignment.weight,
+      assignment.numDroppable,
+    );
+
+    return {
+      averageGrade,
+      numDroppable: assignment.numDroppable,
+      shortLabel: assignment.shortLabel,
+      type: assignment.type,
+      weight: assignment.weight,
+      weightedGrade,
+    };
+  });
+}
+
+/**
+ * Tweak the metadata for consistency
+ * @param metadata the data to normalize
+ * @param rootSlug either 'courseware' or 'outline' depending on the context
+ * @returns {Object} The normalized metadata
+ */
+function normalizeCourseHomeCourseMetadata(metadata, rootSlug) {
   const data = camelCaseObject(metadata);
   return {
     ...data,
     tabs: data.tabs.map(tab => ({
-      // The API uses "courseware" as a slug for both courseware and the outline tab. We switch it to "outline" here for
+      // The API uses "courseware" as a slug for both courseware and the outline tab.
+      // If needed, we switch it to "outline" here for
       // use within the MFE to differentiate between course home and courseware.
-      slug: tab.tabId === 'courseware' ? 'outline' : tab.tabId,
+      slug: tab.tabId === 'courseware' ? rootSlug : tab.tabId,
       title: tab.title,
       url: tab.url,
     })),
+    isMasquerading: data.originalUserIsStaff && !data.isStaff,
   };
 }
 
@@ -29,6 +125,7 @@ export function normalizeOutlineBlocks(courseId, blocks) {
           id: courseId,
           title: block.display_name,
           sectionIds: block.children || [],
+          hasScheduledContent: block.has_scheduled_content,
         };
         break;
 
@@ -47,9 +144,13 @@ export function normalizeOutlineBlocks(courseId, blocks) {
           complete: block.complete,
           description: block.description,
           due: block.due,
+          effortActivities: block.effort_activities,
+          effortTime: block.effort_time,
           icon: block.icon,
           id: block.id,
-          showLink: !!block.lms_web_url, // we reconstruct the url ourselves as an MFE-internal <Link>
+          // The presence of a URL for the sequence indicates that we want this sequence to be a clickable
+          // link in the outline (even though we ignore the given url and use an internal <Link> to ourselves).
+          showLink: !!block.lms_web_url,
           title: block.display_name,
         };
         break;
@@ -85,10 +186,11 @@ export function normalizeOutlineBlocks(courseId, blocks) {
   return models;
 }
 
-export async function getCourseHomeCourseMetadata(courseId) {
-  const url = `${getConfig().LMS_BASE_URL}/api/course_home/v1/course_metadata/${courseId}`;
+export async function getCourseHomeCourseMetadata(courseId, rootSlug) {
+  let url = `${getConfig().LMS_BASE_URL}/api/course_home/course_metadata/${courseId}`;
+  url = appendBrowserTimezoneToUrl(url);
   const { data } = await getAuthenticatedHttpClient().get(url);
-  return normalizeCourseHomeCourseMetadata(data);
+  return normalizeCourseHomeCourseMetadata(data, rootSlug);
 }
 
 // For debugging purposes, you might like to see a fully loaded dates tab.
@@ -97,41 +199,97 @@ export async function getCourseHomeCourseMetadata(courseId) {
 // import './__factories__';
 export async function getDatesTabData(courseId) {
   // return camelCaseObject(Factory.build('datesTabData'));
-  const url = `${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`;
+  const url = `${getConfig().LMS_BASE_URL}/api/course_home/dates/${courseId}`;
   try {
     const { data } = await getAuthenticatedHttpClient().get(url);
     return camelCaseObject(data);
   } catch (error) {
-    const { httpErrorStatus } = error && error.customAttributes;
-    if (httpErrorStatus === 404) {
-      global.location.replace(`${getConfig().LMS_BASE_URL}/courses/${courseId}/dates`);
+    const httpErrorStatus = error?.response?.status;
+    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 {};
     }
-    if (httpErrorStatus === 401) {
-      global.location.replace(`${getConfig().LMS_BASE_URL}/courses/${courseId}/course`);
+    if (httpErrorStatus === 403) {
+      // The backend sends this if there is a course access error and the user should be redirected. The redirect
+      // info is included in the course metadata request and will be handled there as long as this call returns
+      // without an error
       return {};
     }
     throw error;
   }
 }
 
-export async function getProgressTabData(courseId) {
-  const url = `${getConfig().LMS_BASE_URL}/api/course_home/v1/progress/${courseId}`;
+export async function getProgressTabData(courseId, targetUserId) {
+  let url = `${getConfig().LMS_BASE_URL}/api/course_home/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}/`;
+  }
+
   try {
     const { data } = await getAuthenticatedHttpClient().get(url);
-    return camelCaseObject(data);
+    const camelCasedData = camelCaseObject(data);
+
+    camelCasedData.gradingPolicy.assignmentPolicies = normalizeAssignmentPolicies(
+      camelCasedData.gradingPolicy.assignmentPolicies,
+      camelCasedData.sectionScores,
+    );
+
+    // We replace gradingPolicy.gradeRange with the original data to preserve the intended casing for the grade.
+    // For example, if a grade range key is "A", we do not want it to be camel cased (i.e. "A" would become "a")
+    // 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;
+    const httpErrorStatus = error?.response?.status;
     if (httpErrorStatus === 404) {
       global.location.replace(`${getConfig().LMS_BASE_URL}/courses/${courseId}/progress`);
       return {};
     }
+    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 {};
+    }
+    if (httpErrorStatus === 403) {
+      // The backend sends this if there is a course access error and the user should be redirected. The redirect
+      // info is included in the course metadata request and will be handled there as long as this call returns
+      // without an error
+      return {};
+    }
     throw error;
   }
 }
 
-export async function getProctoringInfoData(courseId) {
-  const url = `${getConfig().LMS_BASE_URL}/api/edx_proctoring/v1/user_onboarding/status?course_id=${encodeURIComponent(courseId)}`;
+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)}`;
+  if (username) {
+    url += `&username=${encodeURIComponent(username)}`;
+  }
   try {
     const { data } = await getAuthenticatedHttpClient().get(url);
     return data;
@@ -144,51 +302,99 @@ export async function getProctoringInfoData(courseId) {
   }
 }
 
-export async function getOutlineTabData(courseId) {
-  const url = `${getConfig().LMS_BASE_URL}/api/course_home/v1/outline/${courseId}`;
-  let { tabData } = {};
+export async function getLiveTabIframe(courseId) {
+  const url = `${getConfig().LMS_BASE_URL}/api/course_live/iframe/${courseId}/`;
   try {
-    tabData = await getAuthenticatedHttpClient().get(url);
+    const { data } = await getAuthenticatedHttpClient().get(url);
+    return data;
   } catch (error) {
     const { httpErrorStatus } = error && error.customAttributes;
     if (httpErrorStatus === 404) {
-      global.location.replace(`${getConfig().LMS_BASE_URL}/courses/${courseId}/course/`);
+      return {};
+    }
+    throw error;
+  }
+}
+
+export function getTimeOffsetMillis(headerDate, requestTime, responseTime) {
+  // Time offset computation should move down into the HttpClient wrapper to maintain a global time correction reference
+  // Requires 'Access-Control-Expose-Headers: Date' on the server response per https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS#access-control-expose-headers
+
+  let timeOffsetMillis = 0;
+  if (headerDate !== undefined) {
+    const headerTime = Date.parse(headerDate);
+    const roundTripMillis = requestTime - responseTime;
+    const localTime = responseTime - (roundTripMillis / 2); // Roughly compensate for transit time
+    timeOffsetMillis = headerTime - localTime;
+  }
+
+  return timeOffsetMillis;
+}
+
+export async function getOutlineTabData(courseId) {
+  const url = `${getConfig().LMS_BASE_URL}/api/course_home/outline/${courseId}`;
+  const requestTime = Date.now();
+  let tabData;
+  try {
+    tabData = await getAuthenticatedHttpClient().get(url);
+  } catch (error) {
+    const httpErrorStatus = error?.response?.status;
+    if (httpErrorStatus === 403) {
+      // The backend sends this if there is a course access error and the user should be redirected. The redirect
+      // info is included in the course metadata request and will be handled there as long as this call returns
+      // without an error
       return {};
     }
     throw error;
   }
 
+  const responseTime = Date.now();
+
   const {
     data,
+    headers,
   } = tabData;
+
   const accessExpiration = camelCaseObject(data.access_expiration);
   const canShowUpgradeSock = data.can_show_upgrade_sock;
+  const certData = camelCaseObject(data.cert_data);
   const courseBlocks = data.course_blocks ? normalizeOutlineBlocks(courseId, data.course_blocks.blocks) : {};
   const courseGoals = camelCaseObject(data.course_goals);
   const courseTools = camelCaseObject(data.course_tools);
   const datesBannerInfo = camelCaseObject(data.dates_banner_info);
   const datesWidget = camelCaseObject(data.dates_widget);
+  const enableProctoredExams = data.enable_proctored_exams;
   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 welcomeMessageHtml = data.welcome_message_html || '';
 
   return {
     accessExpiration,
     canShowUpgradeSock,
+    certData,
     courseBlocks,
     courseGoals,
     courseTools,
     datesBannerInfo,
     datesWidget,
     enrollAlert,
+    enrollmentMode,
+    enableProctoredExams,
     handoutsHtml,
+    hasScheduledContent,
     hasEnded,
     offer,
     resumeCourse,
+    timeOffsetMillis, // This should move to a global time correction reference
+    userHasPassingGrade,
     verifiedMode,
     welcomeMessageHtml,
   };
@@ -202,13 +408,22 @@ export async function postCourseDeadlines(courseId, model) {
   });
 }
 
-export async function postCourseGoals(courseId, goalKey) {
-  const url = new URL(`${getConfig().LMS_BASE_URL}/api/course_home/v1/save_course_goal`);
+export async function deprecatedPostCourseGoals(courseId, goalKey) {
+  const url = new URL(`${getConfig().LMS_BASE_URL}/api/course_home/save_course_goal`);
   return getAuthenticatedHttpClient().post(url.href, { course_id: courseId, goal_key: goalKey });
 }
 
+export async function postWeeklyLearningGoal(courseId, daysPerWeek, subscribedToReminders) {
+  const url = new URL(`${getConfig().LMS_BASE_URL}/api/course_home/save_course_goal`);
+  return getAuthenticatedHttpClient().post(url.href, {
+    course_id: courseId,
+    days_per_week: daysPerWeek,
+    subscribed_to_reminders: subscribedToReminders,
+  });
+}
+
 export async function postDismissWelcomeMessage(courseId) {
-  const url = new URL(`${getConfig().LMS_BASE_URL}/api/course_home/v1/dismiss_welcome_message`);
+  const url = new URL(`${getConfig().LMS_BASE_URL}/api/course_home/dismiss_welcome_message`);
   await getAuthenticatedHttpClient().post(url.href, { course_id: courseId });
 }
 
@@ -224,3 +439,9 @@ export async function executePostFromPostEvent(postData, researchEventData) {
     research_event_data: researchEventData,
   });
 }
+
+export async function unsubscribeFromCourseGoal(token) {
+  const url = new URL(`${getConfig().LMS_BASE_URL}/api/course_home/unsubscribe_from_course_goal/${token}`);
+  return getAuthenticatedHttpClient().post(url.href)
+    .then(res => camelCaseObject(res));
+}

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

@@ -0,0 +1,16 @@
+import { getTimeOffsetMillis } from './api';
+
+describe('Calculate the time offset properly', () => {
+  it('Should return 0 if the headerDate is not set', async () => {
+    const offset = getTimeOffsetMillis(undefined, undefined, undefined);
+    expect(offset).toBe(0);
+  });
+
+  it('Should return the offset', async () => {
+    const headerDate = '2021-04-13T11:01:58.135Z';
+    const requestTime = new Date('2021-04-12T11:01:57.135Z');
+    const responseTime = new Date('2021-04-12T11:01:58.635Z');
+    const offset = getTimeOffsetMillis(headerDate, requestTime, responseTime);
+    expect(offset).toBe(86398750);
+  });
+});

src/course-home/data/index.js

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

src/course-home/data/pact-tests/lmsPact.test.jsx

@@ -0,0 +1,220 @@
+import path from 'path';
+import { mergeConfig, getConfig } from '@edx/frontend-platform';
+import { PactV3, MatchersV3 } from '@pact-foundation/pact';
+
+import {
+  getCourseHomeCourseMetadata,
+  getDatesTabData,
+} from '../api';
+
+import { initializeMockApp } from '../../../setupTest';
+import {
+  courseId, dateRegex, opaqueKeysRegex, dateTypeRegex,
+} from '../../../pacts/constants';
+
+const {
+  somethingLike: like, term, boolean, string, eachLike,
+} = MatchersV3;
+const provider = new PactV3({
+  consumer: 'frontend-app-learning',
+  provider: 'lms',
+  log: path.resolve(process.cwd(), 'src/course-home/data/pact-tests/logs', 'pact.log'),
+  dir: path.resolve(process.cwd(), 'src/pacts'),
+  pactfileWriteMode: 'merge',
+  logLevel: 'DEBUG',
+  cors: true,
+});
+
+describe('Course Home Service', () => {
+  beforeAll(async () => {
+    initializeMockApp();
+    mergeConfig({
+      LMS_BASE_URL: 'http://localhost:8081',
+    }, 'Custom app config for pact tests');
+  });
+
+  describe('When a request to fetch tab is made', () => {
+    it('returns tab data for a course_id', async () => {
+      setTimeout(() => {
+        provider.addInteraction({
+          state: `Tab data exists for course_id ${courseId}`,
+          uponReceiving: 'a request to fetch tab',
+          withRequest: {
+            method: 'GET',
+            path: `/api/course_home/course_metadata/${courseId}`,
+          },
+          willRespondWith: {
+            status: 200,
+            body: {
+              can_show_upgrade_sock: boolean(false),
+              verified_mode: like({
+                access_expiration_date: null,
+                currency: 'USD',
+                currency_symbol: '$',
+                price: 149,
+                sku: '8CF08E5',
+                upgrade_url: `${getConfig().ECOMMERCE_BASE_URL}/basket/add/?sku=8CF08E5`,
+              }),
+              celebrations: like({
+                first_section: false,
+                streak_length_to_celebrate: null,
+                streak_discount_enabled: false,
+              }),
+              course_access: {
+                has_access: boolean(true),
+                error_code: null,
+                developer_message: null,
+                user_message: null,
+                additional_context_user_message: null,
+                user_fragment: null,
+              },
+              course_id: term({
+                generate: 'course-v1:edX+DemoX+Demo_Course',
+                matcher: opaqueKeysRegex,
+              }),
+              is_enrolled: boolean(true),
+              is_self_paced: boolean(false),
+              is_staff: boolean(true),
+              number: string('DemoX'),
+              org: string('edX'),
+              original_user_is_staff: boolean(true),
+              start: term({
+                generate: '2013-02-05T05:00:00Z',
+                matcher: dateRegex,
+              }),
+              tabs: eachLike({
+                tab_id: 'courseware',
+                title: 'Course',
+                url: `${getConfig().BASE_URL}/course/course-v1:edX+DemoX+Demo_Course/home`,
+              }),
+              title: string('Demonstration Course'),
+              username: string('edx'),
+            },
+          },
+        });
+        const normalizedTabData = {
+          canShowUpgradeSock: false,
+          verifiedMode: {
+            accessExpirationDate: null,
+            currency: 'USD',
+            currencySymbol: '$',
+            price: 149,
+            sku: '8CF08E5',
+            upgradeUrl: `${getConfig().ECOMMERCE_BASE_URL}/basket/add/?sku=8CF08E5`,
+          },
+          celebrations: {
+            firstSection: false,
+            streakLengthToCelebrate: null,
+            streakDiscountEnabled: false,
+          },
+          courseAccess: {
+            hasAccess: true,
+            errorCode: null,
+            developerMessage: null,
+            userMessage: null,
+            additionalContextUserMessage: null,
+            userFragment: null,
+          },
+          courseId: 'course-v1:edX+DemoX+Demo_Course',
+          isEnrolled: true,
+          isMasquerading: false,
+          isSelfPaced: false,
+          isStaff: true,
+          number: 'DemoX',
+          org: 'edX',
+          originalUserIsStaff: true,
+          start: '2013-02-05T05:00:00Z',
+          tabs: [
+            {
+              slug: 'outline',
+              title: 'Course',
+              url: `${getConfig().BASE_URL}/course/course-v1:edX+DemoX+Demo_Course/home`,
+            },
+          ],
+          title: 'Demonstration Course',
+          username: 'edx',
+        };
+        const response = getCourseHomeCourseMetadata(courseId, 'outline');
+        expect(response).toBeTruthy();
+        expect(response).toEqual(normalizedTabData);
+      }, 100);
+    });
+  });
+
+  describe('When a request to fetch dates tab is made', () => {
+    it('returns course date blocks for a course_id', async () => {
+      setTimeout(() => {
+        provider.addInteraction({
+          state: `course date blocks exist for course_id ${courseId}`,
+          uponReceiving: 'a request to fetch dates tab',
+          withRequest: {
+            method: 'GET',
+            path: `/api/course_home/dates/${courseId}`,
+          },
+          willRespondWith: {
+            status: 200,
+            body: {
+              dates_banner_info: like({
+                missed_deadlines: false,
+                content_type_gating_enabled: false,
+                missed_gated_content: false,
+                verified_upgrade_link: `${getConfig().ECOMMERCE_BASE_URL}/basket/add/?sku=8CF08E5`,
+              }),
+              course_date_blocks: eachLike({
+                assignment_type: null,
+                complete: null,
+                date: term({
+                  generate: '2013-02-05T05:00:00Z',
+                  matcher: dateRegex,
+                }),
+                date_type: term({
+                  generate: 'verified-upgrade-deadline',
+                  matcher: dateTypeRegex,
+                }),
+                description: 'You are still eligible to upgrade to a Verified Certificate! Pursue it to highlight the knowledge and skills you gain in this course.',
+                learner_has_access: true,
+                link: `${getConfig().ECOMMERCE_BASE_URL}/basket/add/?sku=8CF08E5`,
+                link_text: 'Upgrade to Verified Certificate',
+                title: 'Verification Upgrade Deadline',
+                extra_info: null,
+                first_component_block_id: '',
+              }),
+              has_ended: boolean(false),
+              learner_is_full_access: boolean(true),
+              user_timezone: null,
+            },
+          },
+        });
+        const camelCaseResponse = {
+          datesBannerInfo: {
+            missedDeadlines: false,
+            contentTypeGatingEnabled: false,
+            missedGatedContent: false,
+            verifiedUpgradeLink: `${getConfig().ECOMMERCE_BASE_URL}/basket/add/?sku=8CF08E5`,
+          },
+          courseDateBlocks: [
+            {
+              assignmentType: null,
+              complete: null,
+              date: '2013-02-05T05:00:00Z',
+              dateType: 'verified-upgrade-deadline',
+              description: 'You are still eligible to upgrade to a Verified Certificate! Pursue it to highlight the knowledge and skills you gain in this course.',
+              learnerHasAccess: true,
+              link: `${getConfig().ECOMMERCE_BASE_URL}/basket/add/?sku=8CF08E5`,
+              linkText: 'Upgrade to Verified Certificate',
+              title: 'Verification Upgrade Deadline',
+              extraInfo: null,
+              firstComponentBlockId: '',
+            },
+          ],
+          hasEnded: false,
+          learnerIsFullAccess: true,
+          userTimezone: null,
+        };
+        const response = getDatesTabData(courseId);
+        expect(response).toBeTruthy();
+        expect(response).toEqual(camelCaseResponse);
+      }, 100);
+    });
+  });
+});

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

@@ -6,7 +6,7 @@ import { getConfig } from '@edx/frontend-platform';
 
 import * as thunks from './thunks';
 
-import executeThunk from '../../utils';
+import { appendBrowserTimezoneToUrl, executeThunk } from '../../utils';
 
 import { initializeMockApp } from '../../setupTest';
 import initializeStore from '../../store';
@@ -17,8 +17,21 @@ const axiosMock = new MockAdapter(getAuthenticatedHttpClient());
 
 describe('Data layer integration tests', () => {
   const courseHomeMetadata = Factory.build('courseHomeMetadata');
-  const { courseId } = courseHomeMetadata;
-  const courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/course_metadata/${courseId}`;
+  const { id: courseId } = courseHomeMetadata;
+  let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/course_metadata/${courseId}`;
+  courseMetadataUrl = appendBrowserTimezoneToUrl(courseMetadataUrl);
+
+  const courseHomeAccessDeniedMetadata = Factory.build(
+    'courseHomeMetadata',
+    {
+      id: courseId,
+      course_access: {
+        has_access: false,
+        error_code: 'bad codes',
+        additional_context_user_message: 'your Codes Are BAD',
+      },
+    },
+  );
 
   let store;
 
@@ -30,7 +43,7 @@ describe('Data layer integration tests', () => {
   });
 
   describe('Test fetchDatesTab', () => {
-    const datesBaseUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/dates`;
+    const datesBaseUrl = `${getConfig().LMS_BASE_URL}/api/course_home/dates`;
 
     it('Should fail to fetch if error occurs', async () => {
       axiosMock.onGet(courseMetadataUrl).networkError();
@@ -54,16 +67,40 @@ describe('Data layer integration tests', () => {
 
       const state = store.getState();
       expect(state.courseHome.courseStatus).toEqual('loaded');
-      expect(state).toMatchSnapshot();
+      expect(state).toMatchSnapshot({
+        // The Xpert chatbot (frontend-lib-learning-assistant) generates a unique UUID
+        // to keep track of conversations. This causes snapshots to fail, because this UUID
+        // is generated on each run of the snapshot. Instead, we use an asymmetric matcher here.
+        learningAssistant: expect.objectContaining({
+          conversationId: expect.any(String),
+        }),
+      });
     });
+
+    it.each([401, 403, 404])(
+      'should result in fetch denied for expected errors and failed for all others',
+      async (errorStatus) => {
+        axiosMock.onGet(courseMetadataUrl).reply(200, courseHomeAccessDeniedMetadata);
+        axiosMock.onGet(`${datesBaseUrl}/${courseId}`).reply(errorStatus, {});
+
+        await executeThunk(thunks.fetchDatesTab(courseId), store.dispatch);
+
+        let expectedState = 'failed';
+        if (errorStatus === 401 || errorStatus === 403) {
+          expectedState = 'denied';
+        }
+        expect(store.getState().courseHome.courseStatus).toEqual(expectedState);
+      },
+    );
   });
 
   describe('Test fetchOutlineTab', () => {
-    const outlineBaseUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/outline`;
+    const outlineBaseUrl = `${getConfig().LMS_BASE_URL}/api/course_home/outline`;
+    const outlineUrl = `${outlineBaseUrl}/${courseId}`;
 
     it('Should result in fetch failure if error occurs', async () => {
       axiosMock.onGet(courseMetadataUrl).networkError();
-      axiosMock.onGet(`${outlineBaseUrl}/${courseId}`).networkError();
+      axiosMock.onGet(outlineUrl).networkError();
 
       await executeThunk(thunks.fetchOutlineTab(courseId), store.dispatch);
 
@@ -74,8 +111,6 @@ describe('Data layer integration tests', () => {
     it('Should fetch, normalize, and save metadata', async () => {
       const outlineTabData = Factory.build('outlineTabData', { courseId });
 
-      const outlineUrl = `${outlineBaseUrl}/${courseId}`;
-
       axiosMock.onGet(courseMetadataUrl).reply(200, courseHomeMetadata);
       axiosMock.onGet(outlineUrl).reply(200, outlineTabData);
 
@@ -83,16 +118,102 @@ describe('Data layer integration tests', () => {
 
       const state = store.getState();
       expect(state.courseHome.courseStatus).toEqual('loaded');
-      expect(state).toMatchSnapshot();
+      expect(state).toMatchSnapshot({
+        // The Xpert chatbot (frontend-lib-learning-assistant) generates a unique UUID
+        // to keep track of conversations. This causes snapshots to fail, because this UUID
+        // is generated on each run of the snapshot. Instead, we use an asymmetric matcher here.
+        learningAssistant: expect.objectContaining({
+          conversationId: expect.any(String),
+        }),
+      });
     });
+
+    it.each([401, 403, 404])(
+      'should result in fetch denied for expected errors and failed for all others',
+      async (errorStatus) => {
+        axiosMock.onGet(courseMetadataUrl).reply(200, courseHomeAccessDeniedMetadata);
+        axiosMock.onGet(outlineUrl).reply(errorStatus, {});
+
+        await executeThunk(thunks.fetchOutlineTab(courseId), store.dispatch);
+
+        let expectedState = 'failed';
+        if (errorStatus === 403) {
+          expectedState = 'denied';
+        }
+        expect(store.getState().courseHome.courseStatus).toEqual(expectedState);
+      },
+    );
+  });
+
+  describe('Test fetchProgressTab', () => {
+    const progressBaseUrl = `${getConfig().LMS_BASE_URL}/api/course_home/progress`;
+
+    it('Should result in fetch failure if error occurs', async () => {
+      axiosMock.onGet(courseMetadataUrl).networkError();
+      axiosMock.onGet(`${progressBaseUrl}/${courseId}`).networkError();
+
+      await executeThunk(thunks.fetchProgressTab(courseId), store.dispatch);
+
+      expect(loggingService.logError).toHaveBeenCalled();
+      expect(store.getState().courseHome.courseStatus).toEqual('failed');
+    });
+
+    it('Should fetch, normalize, and save metadata', async () => {
+      const progressTabData = Factory.build('progressTabData', { courseId });
+
+      const progressUrl = `${progressBaseUrl}/${courseId}`;
+
+      axiosMock.onGet(courseMetadataUrl).reply(200, courseHomeMetadata);
+      axiosMock.onGet(progressUrl).reply(200, progressTabData);
+
+      await executeThunk(thunks.fetchProgressTab(courseId), store.dispatch);
+
+      const state = store.getState();
+      expect(state.courseHome.courseStatus).toEqual('loaded');
+      expect(state).toMatchSnapshot({
+        // The Xpert chatbot (frontend-lib-learning-assistant) generates a unique UUID
+        // to keep track of conversations. This causes snapshots to fail, because this UUID
+        // is generated on each run of the snapshot. Instead, we use an asymmetric matcher here.
+        learningAssistant: expect.objectContaining({
+          conversationId: expect.any(String),
+        }),
+      });
+    });
+
+    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);
+    });
+
+    it.each([401, 403, 404])(
+      'should result in fetch denied for expected errors and failed for all others',
+      async (errorStatus) => {
+        const progressUrl = `${progressBaseUrl}/${courseId}`;
+        axiosMock.onGet(courseMetadataUrl).reply(200, courseHomeAccessDeniedMetadata);
+        axiosMock.onGet(progressUrl).reply(errorStatus, {});
+
+        await executeThunk(thunks.fetchProgressTab(courseId), store.dispatch);
+
+        expect(store.getState().courseHome.courseStatus).toEqual('denied');
+      },
+    );
   });
 
   describe('Test saveCourseGoal', () => {
     it('Should save course goal', async () => {
-      const goalUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/save_course_goal`;
+      const goalUrl = `${getConfig().LMS_BASE_URL}/api/course_home/save_course_goal`;
       axiosMock.onPost(goalUrl).reply(200, {});
 
-      await thunks.saveCourseGoal(courseId, 'unsure');
+      await thunks.deprecatedSaveCourseGoal(courseId, 'unsure');
 
       expect(axiosMock.history.post[0].url).toEqual(goalUrl);
       expect(axiosMock.history.post[0].data).toEqual(`{"course_id":"${courseId}","goal_key":"unsure"}`);
@@ -120,7 +241,7 @@ describe('Data layer integration tests', () => {
 
   describe('Test dismissWelcomeMessage', () => {
     it('Should dismiss welcome message', async () => {
-      const dismissUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/dismiss_welcome_message`;
+      const dismissUrl = `${getConfig().LMS_BASE_URL}/api/course_home/dismiss_welcome_message`;
       axiosMock.onPost(dismissUrl).reply(201);
 
       await executeThunk(thunks.dismissWelcomeMessage(courseId), store.dispatch);

src/course-home/data/slice.js

@@ -4,29 +4,39 @@ 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',
   initialState: {
     courseStatus: 'loading',
     courseId: null,
+    proctoringPanelStatus: 'loading',
     toastBodyText: null,
     toastBodyLink: null,
     toastHeader: '',
   },
   reducers: {
+    fetchProctoringInfoResolved: (state) => {
+      state.proctoringPanelStatus = LOADED;
+    },
+    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,
@@ -41,9 +51,11 @@ const slice = createSlice({
 });
 
 export const {
+  fetchProctoringInfoResolved,
+  fetchTabDenied,
+  fetchTabFailure,
   fetchTabRequest,
   fetchTabSuccess,
-  fetchTabFailure,
   setCallToActionToast,
 } = slice.actions;
 

src/course-home/data/thunks.js

@@ -7,9 +7,11 @@ import {
   getOutlineTabData,
   getProgressTabData,
   postCourseDeadlines,
-  postCourseGoals,
+  deprecatedPostCourseGoals,
+  postWeeklyLearningGoal,
   postDismissWelcomeMessage,
   postRequestCert,
+  getLiveTabIframe,
 } from './api';
 
 import {
@@ -17,6 +19,7 @@ import {
 } from '../../generic/model-store';
 
 import {
+  fetchTabDenied,
   fetchTabFailure,
   fetchTabRequest,
   fetchTabSuccess,
@@ -27,46 +30,41 @@ const eventTypes = {
   POST_EVENT: 'post_event',
 };
 
-export function fetchTab(courseId, tab, getTabData) {
+export function fetchTab(courseId, tab, getTabData, targetUserId) {
   return async (dispatch) => {
     dispatch(fetchTabRequest({ courseId }));
-    Promise.allSettled([
-      getCourseHomeCourseMetadata(courseId),
-      getTabData(courseId),
-    ]).then(([courseHomeCourseMetadataResult, tabDataResult]) => {
-      const fetchedCourseHomeCourseMetadata = courseHomeCourseMetadataResult.status === 'fulfilled';
-      const fetchedTabData = tabDataResult.status === 'fulfilled';
-
-      if (fetchedCourseHomeCourseMetadata) {
-        dispatch(addModel({
-          modelType: 'courseHomeMeta',
-          model: {
-            id: courseId,
-            ...courseHomeCourseMetadataResult.value,
-          },
-        }));
-      } else {
-        logError(courseHomeCourseMetadataResult.reason);
-      }
-
-      if (fetchedTabData) {
+    try {
+      const courseHomeCourseMetadata = await getCourseHomeCourseMetadata(courseId, 'outline');
+      dispatch(addModel({
+        modelType: 'courseHomeMeta',
+        model: {
+          id: courseId,
+          ...courseHomeCourseMetadata,
+        },
+      }));
+      const tabDataResult = getTabData && await getTabData(courseId, targetUserId);
+      if (tabDataResult) {
         dispatch(addModel({
           modelType: tab,
           model: {
             id: courseId,
-            ...tabDataResult.value,
+            ...tabDataResult,
           },
         }));
-      } else {
-        logError(tabDataResult.reason);
       }
-
-      if (fetchedCourseHomeCourseMetadata && fetchedTabData) {
-        dispatch(fetchTabSuccess({ courseId }));
-      } else {
-        dispatch(fetchTabFailure({ courseId }));
+      // Disable the access-denied path for now - it caused a regression
+      if (!courseHomeCourseMetadata.courseAccess.hasAccess) {
+        dispatch(fetchTabDenied({ courseId }));
+      } else if (tabDataResult || !getTabData) {
+        dispatch(fetchTabSuccess({
+          courseId,
+          targetUserId,
+        }));
       }
-    });
+    } catch (e) {
+      dispatch(fetchTabFailure({ courseId }));
+      logError(e);
+    }
   };
 }
 
@@ -74,14 +72,22 @@ export function fetchDatesTab(courseId) {
   return fetchTab(courseId, 'dates', getDatesTabData);
 }
 
-export function fetchProgressTab(courseId) {
-  return fetchTab(courseId, 'progress', getProgressTabData);
+export function fetchProgressTab(courseId, targetUserId) {
+  return fetchTab(courseId, 'progress', getProgressTabData, parseInt(targetUserId, 10) || targetUserId);
 }
 
 export function fetchOutlineTab(courseId) {
   return fetchTab(courseId, 'outline', getOutlineTabData);
 }
 
+export function fetchLiveTab(courseId) {
+  return fetchTab(courseId, 'live', getLiveTabIframe);
+}
+
+export function fetchDiscussionTab(courseId) {
+  return fetchTab(courseId, 'discussion');
+}
+
 export function dismissWelcomeMessage(courseId) {
   return async () => postDismissWelcomeMessage(courseId);
 }
@@ -105,8 +111,12 @@ export function resetDeadlines(courseId, model, getTabData) {
   };
 }
 
-export async function saveCourseGoal(courseId, goalKey) {
-  return postCourseGoals(courseId, goalKey);
+export async function deprecatedSaveCourseGoal(courseId, goalKey) {
+  return deprecatedPostCourseGoals(courseId, goalKey);
+}
+
+export async function saveWeeklyLearningGoal(courseId, daysPerWeek, subscribedToReminders) {
+  return postWeeklyLearningGoal(courseId, daysPerWeek, subscribedToReminders);
 }
 
 export function processEvent(eventData, getTabData) {

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

@@ -1,46 +0,0 @@
-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

@@ -1,91 +0,0 @@
-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,
-  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: () => global.location.replace(verifiedUpgradeLink),
-    },
-    {
-      name: 'upgradeToResetBanner',
-      // verifiedUpgradeLink can be null if we've passed the upgrade deadline
-      shouldDisplay: upgradeToReset && verifiedUpgradeLink,
-      clickHandler: () => 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,
-  model: PropTypes.string.isRequired,
-  tabFetch: PropTypes.func.isRequired,
-};
-
-DatesBannerContainer.defaultProps = {
-  hasEnded: false,
-};
-
-export default DatesBannerContainer;

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

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

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

@@ -1,66 +0,0 @@
-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

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

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

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

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

@@ -1,41 +1,63 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 
 import messages from './messages';
-import Timeline from './Timeline';
-import DatesBannerContainer from '../dates-banner/DatesBannerContainer';
+import Timeline from './timeline/Timeline';
 
 import { fetchDatesTab } from '../data';
 import { useModel } from '../../generic/model-store';
 
-function DatesTab({ intl }) {
+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';
+
+const DatesTab = ({ intl }) => {
   const {
     courseId,
   } = useSelector(state => state.courseHome);
 
+  const {
+    isSelfPaced,
+    org,
+  } = useModel('courseHomeMeta', courseId);
+
   const {
     courseDateBlocks,
-    datesBannerInfo,
-    hasEnded,
   } = useModel('dates', courseId);
 
+  const hasDeadlines = courseDateBlocks && courseDateBlocks.some(x => x.dateType === 'assignment-due-date');
+
+  const logUpgradeLinkClick = () => {
+    sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
+      org_key: org,
+      courserun_key: courseId,
+      linkCategory: 'personalized_learner_schedules',
+      linkName: 'dates_upgrade',
+      linkType: 'button',
+      pageName: 'dates_tab',
+    });
+  };
+
   return (
     <>
       <div role="heading" aria-level="1" className="h2 my-3">
         {intl.formatMessage(messages.title)}
       </div>
-      <DatesBannerContainer
-        courseDateBlocks={courseDateBlocks}
-        datesBannerInfo={datesBannerInfo}
-        hasEnded={hasEnded}
-        model="dates"
-        tabFetch={fetchDatesTab}
-      />
+      {isSelfPaced && hasDeadlines && (
+        <>
+          <ShiftDatesAlert model="dates" fetch={fetchDatesTab} />
+          <SuggestedScheduleHeader />
+          <UpgradeToCompleteAlert logUpgradeLinkClick={logUpgradeLinkClick} />
+          <UpgradeToShiftDatesAlert logUpgradeLinkClick={logUpgradeLinkClick} model="dates" />
+        </>
+      )}
       <Timeline />
     </>
   );
-}
+};
 
 DatesTab.propTypes = {
   intl: intlShape.isRequired,

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

@@ -1,8 +1,9 @@
 import React from 'react';
-import { Route } from 'react-router';
+import { Routes, Route } from 'react-router-dom';
 import MockAdapter from 'axios-mock-adapter';
 import { Factory } from 'rosie';
 import { getConfig, history } from '@edx/frontend-platform';
+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 import { AppProvider } from '@edx/frontend-platform/react';
 import { waitForElementToBeRemoved } from '@testing-library/dom';
@@ -14,25 +15,50 @@ import { fetchDatesTab } from '../data';
 import { fireEvent, initializeMockApp, waitFor } from '../../setupTest';
 import initializeStore from '../../store';
 import { TabContainer } from '../../tab-page';
+import { appendBrowserTimezoneToUrl } from '../../utils';
 import { UserMessagesProvider } from '../../generic/user-messages';
 
 initializeMockApp();
+jest.mock('@edx/frontend-platform/analytics');
 
 describe('DatesTab', () => {
   let axiosMock;
+  let store;
+  let component;
 
-  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>
-  );
+  beforeEach(() => {
+    axiosMock = new MockAdapter(getAuthenticatedHttpClient());
+    store = initializeStore();
+    component = (
+      <AppProvider store={store}>
+        <UserMessagesProvider>
+          <Routes>
+            <Route
+              path="/course/:courseId/dates"
+              element={(
+                <TabContainer tab="dates" fetch={fetchDatesTab} slice="courseHome">
+                  <DatesTab />
+                </TabContainer>
+              )}
+            />
+          </Routes>
+        </UserMessagesProvider>
+      </AppProvider>
+    );
+  });
+
+  const datesTabData = Factory.build('datesTabData');
+  let courseMetadata = Factory.build('courseHomeMetadata', { user_timezone: 'America/New_York' });
+  const { id: courseId } = courseMetadata;
+
+  const datesUrl = `${getConfig().LMS_BASE_URL}/api/course_home/dates/${courseId}`;
+  let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/course_metadata/${courseId}`;
+  courseMetadataUrl = appendBrowserTimezoneToUrl(courseMetadataUrl);
+
+  function setMetadata(attributes, options) {
+    courseMetadata = Factory.build('courseHomeMetadata', attributes, options);
+    axiosMock.onGet(courseMetadataUrl).reply(200, courseMetadata);
+  }
 
   // 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
@@ -58,13 +84,8 @@ describe('DatesTab', () => {
 
   describe('when receiving a full set of dates data', () => {
     beforeEach(() => {
-      const datesTabData = Factory.build('datesTabData');
-      const courseMetadata = Factory.build('courseHomeMetadata');
-      const { courseId } = courseMetadata;
-
-      axiosMock = new MockAdapter(getAuthenticatedHttpClient());
-      axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/course_home/v1/course_metadata/${courseId}`).reply(200, courseMetadata);
-      axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`).reply(200, datesTabData);
+      axiosMock.onGet(courseMetadataUrl).reply(200, courseMetadata);
+      axiosMock.onGet(datesUrl).reply(200, datesTabData);
       history.push(`/course/${courseId}/dates`); // so tab can pull course id from url
 
       render(component);
@@ -124,35 +145,30 @@ describe('DatesTab', () => {
       userEvent.hover(tipIcon);
       const tooltip = screen.getByText(tipText); // now it's there
       userEvent.unhover(tipIcon);
-      waitForElementToBeRemoved(tooltip); // and it's gone again
+      await waitForElementToBeRemoved(tooltip); // and it's gone again
     });
   });
 
-  describe('Dates banner container ', () => {
-    const courseMetadata = Factory.build('courseHomeMetadata', { is_self_paced: true, is_enrolled: true });
-    const { courseId } = courseMetadata;
-    const datesTabData = Factory.build('datesTabData');
-
+  describe('Suggested schedule messaging', () => {
     beforeEach(() => {
-      axiosMock = new MockAdapter(getAuthenticatedHttpClient());
-      axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/course_home/v1/course_metadata/${courseId}`).reply(200, courseMetadata);
+      setMetadata({ is_self_paced: true, is_enrolled: true });
       history.push(`/course/${courseId}/dates`);
     });
 
-    it('renders datesTabInfoBanner', async () => {
+    it('renders SuggestedScheduleHeader', async () => {
       datesTabData.datesBannerInfo = {
         contentTypeGatingEnabled: false,
         missedDeadlines: false,
         missedGatedContent: false,
       };
 
-      axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`).reply(200, datesTabData);
+      axiosMock.onGet(datesUrl).reply(200, datesTabData);
       render(component);
 
-      await waitFor(() => expect(screen.getByText("We've built a suggested schedule to help you stay on track.")).toBeInTheDocument());
+      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());
     });
 
-    it('renders upgradeToCompleteGradedBanner', async () => {
+    it('renders UpgradeToCompleteAlert', async () => {
       datesTabData.datesBannerInfo = {
         contentTypeGatingEnabled: true,
         missedDeadlines: false,
@@ -160,15 +176,14 @@ describe('DatesTab', () => {
         verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
       };
 
-      axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`).reply(200, datesTabData);
+      axiosMock.onGet(datesUrl).reply(200, datesTabData);
       render(component);
 
-      await waitFor(() => expect(screen.getByText('You are auditing this course,')).toBeInTheDocument());
-      expect(screen.getByText('which means that you are unable to participate in graded assignments. To complete graded assignments as part of this course, you can upgrade today.')).toBeInTheDocument();
+      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());
       expect(screen.getByRole('button', { name: 'Upgrade now' })).toBeInTheDocument();
     });
 
-    it('renders upgradeToResetBanner', async () => {
+    it('renders UpgradeToShiftDatesAlert', async () => {
       datesTabData.datesBannerInfo = {
         contentTypeGatingEnabled: true,
         missedDeadlines: true,
@@ -176,15 +191,15 @@ describe('DatesTab', () => {
         verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
       };
 
-      axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`).reply(200, datesTabData);
+      axiosMock.onGet(datesUrl).reply(200, datesTabData);
       render(component);
 
-      await waitFor(() => expect(screen.getByText('You are auditing this course,')).toBeInTheDocument());
-      expect(screen.getByText('which means that you are unable to participate in graded assignments. It looks like you missed some important deadlines based on our suggested schedule. To complete graded assignments as part of this course and shift the past due assignments into the future, you can upgrade today.')).toBeInTheDocument();
+      await waitFor(() => expect(screen.getByText('It looks like you missed some important deadlines based on our suggested schedule.')).toBeInTheDocument());
+      expect(screen.getByText('To keep yourself on track, you can update this schedule and shift the past due assignments into the future. Don’t worry—you won’t lose any of the progress you’ve made when you shift your due dates.')).toBeInTheDocument();
       expect(screen.getByRole('button', { name: 'Upgrade to shift due dates' })).toBeInTheDocument();
     });
 
-    it('renders resetDatesBanner', async () => {
+    it('renders ShiftDatesAlert', async () => {
       datesTabData.datesBannerInfo = {
         contentTypeGatingEnabled: true,
         missedDeadlines: true,
@@ -192,7 +207,7 @@ describe('DatesTab', () => {
         verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
       };
 
-      axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`).reply(200, datesTabData);
+      axiosMock.onGet(datesUrl).reply(200, datesTabData);
       render(component);
 
       await waitFor(() => expect(screen.getByText('It looks like you missed some important deadlines based on our suggested schedule.')).toBeInTheDocument());
@@ -208,7 +223,7 @@ describe('DatesTab', () => {
         verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
       };
 
-      axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`).reply(200, datesTabData);
+      axiosMock.onGet(datesUrl).reply(200, datesTabData);
       render(component);
 
       // confirm "Shift due dates" button has rendered
@@ -235,5 +250,108 @@ describe('DatesTab', () => {
       // confirm "Shift due dates" button has not rendered
       expect(screen.queryByRole('button', { name: 'Shift due dates' })).not.toBeInTheDocument();
     });
+
+    it('sends analytics event onClick of upgrade button in UpgradeToCompleteAlert', async () => {
+      sendTrackEvent.mockClear();
+      datesTabData.datesBannerInfo = {
+        contentTypeGatingEnabled: true,
+        missedDeadlines: false,
+        missedGatedContent: false,
+        verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
+      };
+
+      axiosMock.onGet(datesUrl).reply(200, datesTabData);
+      render(component);
+
+      const upgradeButton = await waitFor(() => screen.getByRole('button', { name: 'Upgrade now' }));
+      fireEvent.click(upgradeButton);
+
+      expect(sendTrackEvent).toHaveBeenCalledTimes(1);
+      expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.ecommerce.upsell_links_clicked', {
+        org_key: 'edX',
+        courserun_key: courseId,
+        linkCategory: 'personalized_learner_schedules',
+        linkName: 'dates_upgrade',
+        linkType: 'button',
+        pageName: 'dates_tab',
+      });
+    });
+
+    it('sends analytics event onClick of upgrade button in UpgradeToShiftDatesAlert', async () => {
+      sendTrackEvent.mockClear();
+      datesTabData.datesBannerInfo = {
+        contentTypeGatingEnabled: true,
+        missedDeadlines: true,
+        missedGatedContent: true,
+        verifiedUpgradeLink: 'http://localhost:18130/basket/add/?sku=8CF08E5',
+      };
+
+      axiosMock.onGet(datesUrl).reply(200, datesTabData);
+      render(component);
+
+      const upgradeButton = await waitFor(() => screen.getByRole('button', { name: 'Upgrade to shift due dates' }));
+      fireEvent.click(upgradeButton);
+
+      expect(sendTrackEvent).toHaveBeenCalledTimes(1);
+      expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.ecommerce.upsell_links_clicked', {
+        org_key: 'edX',
+        courserun_key: courseId,
+        linkCategory: 'personalized_learner_schedules',
+        linkName: 'dates_upgrade',
+        linkType: 'button',
+        pageName: 'dates_tab',
+      });
+    });
+  });
+
+  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(`/course/${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/course/${courseMetadata.id}/home`);
+    });
+
+    it('redirects to the home page when unenrolled', async () => {
+      await renderDenied('enrollment_required');
+      expect(global.location.href).toEqual(`http://localhost/course/${courseMetadata.id}/home`);
+    });
   });
 });

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

@@ -4,30 +4,37 @@ const messages = defineMessages({
   completed: {
     id: 'learning.dates.badge.completed',
     defaultMessage: 'Completed',
+    description: 'shown as label for the assignments which learner has completed.',
   },
   dueNext: {
     id: 'learning.dates.badge.dueNext',
     defaultMessage: 'Due next',
+    description: 'Shown as label for the assignment which date is in the future',
   },
   pastDue: {
     id: 'learning.dates.badge.pastDue',
     defaultMessage: 'Past due',
+    description: 'Shown as label for the assignments which deadline has passed',
   },
   title: {
     id: 'learning.dates.title',
     defaultMessage: 'Important dates',
+    description: 'The title of dates tab (course timeline).',
   },
   today: {
     id: 'learning.dates.badge.today',
     defaultMessage: 'Today',
+    description: 'Label used when the scheduled date for the assignment matches the current day',
   },
   unreleased: {
     id: 'learning.dates.badge.unreleased',
     defaultMessage: 'Not yet released',
+    description: 'Shown as label for assignments which date is unknown yet',
   },
   verifiedOnly: {
     id: 'learning.dates.badge.verifiedOnly',
     defaultMessage: 'Verified only',
+    description: 'Shown as label for assignments which learner has no access to.',
   },
 });
 

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

@@ -2,26 +2,35 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { useSelector } from 'react-redux';
-import { FormattedDate, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import {
+  FormattedDate,
+  FormattedTime,
+  injectIntl,
+  intlShape,
+} from '@edx/frontend-platform/i18n';
 import { Tooltip, OverlayTrigger } from '@edx/paragon';
 import { faInfoCircle } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
-import { useModel } from '../../generic/model-store';
+import { useModel } from '../../../generic/model-store';
 
 import { getBadgeListAndColor } from './badgelist';
-import { isLearnerAssignment } from './utils';
+import { isLearnerAssignment } from '../utils';
 
-function Day({
-  date, first, intl, items, last,
-}) {
+const Day = ({
+  date,
+  first,
+  intl,
+  items,
+  last,
+}) => {
   const {
     courseId,
   } = useSelector(state => state.courseHome);
-
   const {
     userTimezone,
-  } = useModel('dates', courseId);
+  } = useModel('courseHomeMeta', courseId);
+
   const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
 
   const { color, badges } = getBadgeListAndColor(date, intl, null, items);
@@ -39,30 +48,41 @@ function Day({
 
       {/* Content */}
       <div className="d-inline-block ml-3 pl-2">
-        <div className="mb-1" data-testid="dates-header">
-          <p className="d-inline text-dark-500 font-weight-bold">
-            <FormattedDate
-              value={date}
-              day="numeric"
-              month="short"
-              weekday="short"
-              year="numeric"
-              {...timezoneFormatArgs}
-            />
-          </p>
+        <div className="row w-100 m-0 mb-1 align-items-center text-primary-700" data-testid="dates-header">
+          <FormattedDate
+            value={date}
+            day="numeric"
+            month="short"
+            weekday="short"
+            year="numeric"
+            {...timezoneFormatArgs}
+          />
           {badges}
         </div>
         {items.map((item) => {
           const { badges: itemBadges } = getBadgeListAndColor(date, intl, item, items);
+
+          const showDueDateTime = item.dateType === 'assignment-due-date';
           const showLink = item.link && isLearnerAssignment(item);
           const title = showLink ? (<u><a href={item.link} className="text-reset">{item.title}</a></u>) : item.title;
           const available = item.learnerHasAccess && (item.link || !isLearnerAssignment(item));
-          const textColor = available ? 'text-dark-500' : 'text-dark-200';
+          const textColor = available ? 'text-primary-700' : 'text-gray-500';
+
           return (
-            <div key={item.title + item.date} className={textColor} data-testid="dates-item">
+            <div key={item.title + item.date} className={classNames(textColor, 'small pb-1')} data-testid="dates-item">
               <div>
-                <span className="font-weight-bold small mt-1">
-                  {item.assignmentType && `${item.assignmentType}: `}{title}
+                <span className="small">
+                  <span className="font-weight-bold">{item.assignmentType && `${item.assignmentType}: `}{title}</span>
+                  {showDueDateTime && (
+                    <span>
+                      <span className="mx-1">due</span>
+                      <FormattedTime
+                        value={date}
+                        timeZoneName="short"
+                        {...timezoneFormatArgs}
+                      />
+                    </span>
+                  )}
                 </span>
                 {itemBadges}
                 {item.extraInfo && (
@@ -83,7 +103,7 @@ function Day({
       </div>
     </li>
   );
-}
+};
 
 Day.propTypes = {
   date: PropTypes.objectOf(Date).isRequired,

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

@@ -1,12 +1,12 @@
 import React from 'react';
 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';
 
-export default function Timeline() {
+const Timeline = () => {
   const {
     courseId,
   } = useSelector(state => state.courseHome);
@@ -61,10 +61,12 @@ export default function Timeline() {
   }
 
   return (
-    <ul className="list-unstyled m-0">
+    <ul className="list-unstyled m-0 mt-4 pt-2">
       {groupedDates.map((groupedDate) => (
         <Day key={groupedDate.date} {...groupedDate} />
       ))}
     </ul>
   );
-}
+};
+
+export default Timeline;

src/course-home/dates-tab/timeline/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 Badge from './Badge';
-import messages from './messages';
-import { daycmp, isLearnerAssignment } from './utils';
+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-gray-900',
+      className: 'text-black',
     },
     {
       message: messages.completed,
       shownForDay: assignments.length && assignments.every(isComplete),
       shownForItem: x => isLearnerAssignment(x) && isComplete(x),
-      bg: 'bg-dark-100',
-      className: 'text-gray-900',
+      bg: 'bg-light-500',
+      className: 'text-black',
     },
     {
       message: messages.pastDue,
@@ -72,7 +72,7 @@ function getBadgeListAndColor(date, intl, item, items) {
       shownForDay: items.length && items.every(x => !hasAccess(x)),
       shownForItem: x => !hasAccess(x),
       icon: faLock,
-      bg: 'bg-dark-500',
+      bg: 'bg-dark-700',
       className: 'text-white',
     },
   ];
@@ -96,7 +96,7 @@ function getBadgeListAndColor(date, intl, item, items) {
           color = b.bg;
         }
         return (
-          <Badge key={b.message.id} className={classNames(b.bg, b.className)}>
+          <Badge key={b.message.id} className={classNames('ml-2', b.bg, b.className)} data-testid="dates-badge">
             {b.icon && <FontAwesomeIcon icon={b.icon} className="mr-1" />}
             {intl.formatMessage(b.message)}
           </Badge>

src/course-home/discussion-tab/DiscussionTab.jsx

@@ -0,0 +1,35 @@
+import { getConfig } from '@edx/frontend-platform';
+import { injectIntl } from '@edx/frontend-platform/i18n';
+import React, { useState } from 'react';
+import { useSelector } from 'react-redux';
+import { useParams, generatePath, useNavigate } from 'react-router-dom';
+import { useIFrameHeight, useIFramePluginEvents } from '../../generic/hooks';
+
+const DiscussionTab = () => {
+  const { courseId } = useSelector(state => state.courseHome);
+  const { path } = useParams();
+  const [originalPath] = useState(path);
+  const navigate = useNavigate();
+
+  const [, iFrameHeight] = useIFrameHeight();
+  useIFramePluginEvents({
+    'discussions.navigate': (payload) => {
+      const basePath = generatePath('/course/:courseId/discussion', { courseId });
+      navigate(`${basePath}/${payload.path}`);
+    },
+  });
+  const discussionsUrl = `${getConfig().DISCUSSIONS_MFE_BASE_URL}/${courseId}/${originalPath}`;
+  return (
+    <iframe
+      src={discussionsUrl}
+      className="d-flex w-100 border-0"
+      height={iFrameHeight}
+      style={{ minHeight: '60rem' }}
+      title="discussion"
+    />
+  );
+};
+
+DiscussionTab.propTypes = {};
+
+export default injectIntl(DiscussionTab);

src/course-home/discussion-tab/DiscussionTab.test.jsx

@@ -0,0 +1,66 @@
+import { getConfig, history } from '@edx/frontend-platform';
+import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
+import { AppProvider } from '@edx/frontend-platform/react';
+import { render } from '@testing-library/react';
+import MockAdapter from 'axios-mock-adapter';
+import React from 'react';
+import { Route, Routes } from 'react-router-dom';
+import { Factory } from 'rosie';
+import { UserMessagesProvider } from '../../generic/user-messages';
+import {
+  initializeMockApp, messageEvent, screen, waitFor,
+} from '../../setupTest';
+import initializeStore from '../../store';
+import { TabContainer } from '../../tab-page';
+import { appendBrowserTimezoneToUrl } from '../../utils';
+import { fetchDiscussionTab } from '../data/thunks';
+import DiscussionTab from './DiscussionTab';
+
+initializeMockApp();
+jest.mock('@edx/frontend-platform/analytics');
+
+describe('DiscussionTab', () => {
+  let axiosMock;
+  let store;
+  let component;
+
+  beforeEach(() => {
+    axiosMock = new MockAdapter(getAuthenticatedHttpClient());
+    store = initializeStore();
+    component = (
+      <AppProvider store={store}>
+        <UserMessagesProvider>
+          <Routes>
+            <Route
+              path="/course/:courseId/discussion"
+              element={(
+                <TabContainer tab="discussion" fetch={fetchDiscussionTab} slice="courseHome">
+                  <DiscussionTab />
+                </TabContainer>
+              )}
+            />
+          </Routes>
+        </UserMessagesProvider>
+      </AppProvider>
+    );
+  });
+
+  const courseMetadata = Factory.build('courseHomeMetadata', { user_timezone: 'America/New_York' });
+  const { id: courseId } = courseMetadata;
+
+  let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/course_metadata/${courseId}`;
+  courseMetadataUrl = appendBrowserTimezoneToUrl(courseMetadataUrl);
+
+  beforeEach(() => {
+    axiosMock.onGet(courseMetadataUrl).reply(200, courseMetadata);
+    history.push(`/course/${courseId}/discussion`); // so tab can pull course id from url
+
+    render(component);
+  });
+
+  it('resizes when it gets a size hint from iframe', async () => {
+    window.postMessage({ ...messageEvent, payload: { height: 1234 } }, '*');
+    await waitFor(() => expect(screen.getByTitle('discussion'))
+      .toHaveAttribute('height', String(1234)));
+  });
+});

src/course-home/goal-unsubscribe/GoalUnsubscribe.jsx

@@ -0,0 +1,58 @@
+import { useEffect, useState } from 'react';
+import { useParams } from 'react-router-dom';
+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+
+import { LearningHeader as Header } from '@edx/frontend-component-header';
+import PageLoading from '../../generic/PageLoading';
+import { unsubscribeFromCourseGoal } from '../data/api';
+
+import messages from './messages';
+import ResultPage from './ResultPage';
+
+const GoalUnsubscribe = ({ intl }) => {
+  const { token } = useParams();
+  const [error, setError] = useState(false);
+  const [isLoading, setIsLoading] = useState(true);
+  const [data, setData] = useState({});
+
+  // We don't need to bother with redux for this simple page. We're not sharing state with other pages at all.
+  useEffect(() => {
+    unsubscribeFromCourseGoal(token)
+      .then(
+        (result) => {
+          setIsLoading(false);
+          setData(result.data);
+        },
+        () => {
+          setIsLoading(false);
+          setError(true);
+        },
+      );
+    // We unfortunately have no information about the user, course, org, or really anything
+    // as visiting this page is allowed to be done anonymously and without the context of the course.
+    // The token can be used to connect a user and course, it will just require some post-processing
+    sendTrackEvent('edx.ui.lms.goal.unsubscribe', { token });
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []); // deps=[] to only run once
+
+  return (
+    <>
+      <Header showUserDropdown={false} />
+      <main id="main-content" className="container my-5 text-center">
+        {isLoading && (
+          <PageLoading srMessage={`${intl.formatMessage(messages.loading)}`} />
+        )}
+        {!isLoading && (
+          <ResultPage error={error} courseTitle={data.courseTitle} />
+        )}
+      </main>
+    </>
+  );
+};
+
+GoalUnsubscribe.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(GoalUnsubscribe);

src/course-home/goal-unsubscribe/GoalUnsubscribe.test.jsx

@@ -0,0 +1,67 @@
+import React from 'react';
+import {
+  MemoryRouter, Route, Routes,
+} from 'react-router-dom';
+import MockAdapter from 'axios-mock-adapter';
+import { getConfig } from '@edx/frontend-platform';
+import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
+import { AppProvider } from '@edx/frontend-platform/react';
+import { render, screen } from '@testing-library/react';
+
+import GoalUnsubscribe from './GoalUnsubscribe';
+import { act, initializeMockApp } from '../../setupTest';
+import initializeStore from '../../store';
+import { UserMessagesProvider } from '../../generic/user-messages';
+
+initializeMockApp();
+jest.mock('@edx/frontend-platform/analytics');
+
+describe('GoalUnsubscribe', () => {
+  let axiosMock;
+  let store;
+  let component;
+  const unsubscribeUrl = `${getConfig().LMS_BASE_URL}/api/course_home/unsubscribe_from_course_goal/TOKEN`;
+
+  beforeEach(() => {
+    axiosMock = new MockAdapter(getAuthenticatedHttpClient());
+    store = initializeStore();
+    component = (
+      <AppProvider store={store} wrapWithRouter={false}>
+        <UserMessagesProvider>
+          <MemoryRouter initialEntries={['/goal-unsubscribe/TOKEN']}>
+            <Routes>
+              <Route path="/goal-unsubscribe/:token" element={<GoalUnsubscribe />} />
+            </Routes>
+          </MemoryRouter>
+        </UserMessagesProvider>
+      </AppProvider>
+    );
+  });
+
+  it('starts with a spinner', () => {
+    render(component);
+    expect(screen.getByRole('status')).toBeInTheDocument();
+  });
+
+  it('loads a real token', async () => {
+    const response = { course_title: 'My Sample Course' };
+    axiosMock.onPost(unsubscribeUrl).reply(200, response);
+    await act(async () => render(component));
+
+    expect(screen.getByText('You’ve unsubscribed from goal reminders')).toBeInTheDocument();
+    expect(screen.getByText(/your goal for My Sample Course/)).toBeInTheDocument();
+    expect(screen.getByRole('link', { name: 'Go to dashboard' }))
+      .toHaveAttribute('href', 'http://localhost:18000/dashboard');
+  });
+
+  it('loads a bad token with an error page', async () => {
+    axiosMock.onPost(unsubscribeUrl).reply(404, {});
+    await act(async () => render(component));
+
+    expect(screen.getByText('Something went wrong')).toBeInTheDocument();
+    expect(screen.getByRole('link', { name: 'Go to dashboard' }))
+      .toHaveAttribute('href', 'http://localhost:18000/dashboard');
+    expect(screen.getByRole('link', { name: 'contact support' }))
+      .toHaveAttribute('href', 'http://localhost:18000/contact');
+  });
+});

src/course-home/goal-unsubscribe/ResultPage.jsx

@@ -0,0 +1,60 @@
+import PropTypes from 'prop-types';
+import { getConfig } from '@edx/frontend-platform';
+import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { Button, Hyperlink } from '@edx/paragon';
+
+import messages from './messages';
+import { ReactComponent as UnsubscribeIcon } from './unsubscribe.svg';
+
+const ResultPage = ({ courseTitle, error, intl }) => {
+  const errorDescription = (
+    <FormattedMessage
+      id="learning.goals.unsubscribe.errorDescription"
+      defaultMessage="We were unable to unsubscribe you from goal reminder emails. Please try again later or {contactSupport} for help."
+      values={{
+        contactSupport: (
+          <Hyperlink
+            className="text-reset"
+            style={{ textDecoration: 'underline' }}
+            destination={`${getConfig().CONTACT_URL}`}
+          >
+            {intl.formatMessage(messages.contactSupport)}
+          </Hyperlink>
+        ),
+      }}
+    />
+  );
+
+  const header = error
+    ? intl.formatMessage(messages.errorHeader)
+    : intl.formatMessage(messages.header);
+  const description = error
+    ? errorDescription
+    : intl.formatMessage(messages.description, { courseTitle });
+
+  return (
+    <>
+      <UnsubscribeIcon className="text-primary" alt="" />
+      <div role="heading" aria-level="1" className="h2">{header}</div>
+      <div className="row justify-content-center">
+        <div className="col-xl-7 col-12 p-0">{description}</div>
+      </div>
+      <Button variant="brand" href={`${getConfig().LMS_BASE_URL}/dashboard`} className="mt-4">
+        {intl.formatMessage(messages.goToDashboard)}
+      </Button>
+    </>
+  );
+};
+
+ResultPage.defaultProps = {
+  courseTitle: null,
+  error: false,
+};
+
+ResultPage.propTypes = {
+  courseTitle: PropTypes.string,
+  error: PropTypes.bool,
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(ResultPage);

src/course-home/goal-unsubscribe/index.jsx

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

src/course-home/goal-unsubscribe/messages.js

@@ -0,0 +1,36 @@
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+  contactSupport: {
+    id: 'learning.goals.unsubscribe.contact',
+    defaultMessage: 'contact support',
+    description: 'Its shown as a suggestion or recommendation for learner when their unsubscribing request has failed',
+  },
+  description: {
+    id: 'learning.goals.unsubscribe.description',
+    defaultMessage: 'You will no longer receive email reminders about your goal for {courseTitle}.',
+    description: 'It describes the consequences to learner when they unsubscribe of goal reminder service',
+  },
+  errorHeader: {
+    id: 'learning.goals.unsubscribe.errorHeader',
+    defaultMessage: 'Something went wrong',
+    description: 'It indicate that the unsubscribing request has failed',
+  },
+  goToDashboard: {
+    id: 'learning.goals.unsubscribe.goToDashboard',
+    defaultMessage: 'Go to dashboard',
+    description: 'Anchor text for button that redirects to dashboard page',
+  },
+  header: {
+    id: 'learning.goals.unsubscribe.header',
+    defaultMessage: 'You’ve unsubscribed from goal reminders',
+    description: 'It indicate that the unsubscribing request was successful',
+  },
+  loading: {
+    id: 'learning.goals.unsubscribe.loading',
+    defaultMessage: 'Unsubscribing…',
+    description: 'Message shown when the unsubscribing request is processing',
+  },
+});
+
+export default messages;

src/course-home/goal-unsubscribe/unsubscribe.svg

@@ -0,0 +1,5 @@
+<svg width="167" height="153" viewBox="0 0 167 153" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M140.25 25.5H12.75V127.5H140.25V25.5ZM127.5 46L76.5 77.875L25.5 46V38.25L76.5 70.125L127.5 38.25V46Z" fill="currentColor"/>
+<circle cx="134" cy="39" r="33" transform="rotate(-90 134 39)" fill="white"/>
+<path d="M134 11C118.544 11 106 23.544 106 39C106 54.456 118.544 67 134 67C149.456 67 162 54.456 162 39C162 23.544 149.456 11 134 11ZM134 61.4C121.624 61.4 111.6 51.376 111.6 39C111.6 33.82 113.364 29.06 116.332 25.28L147.72 56.668C143.94 59.636 139.18 61.4 134 61.4ZM151.668 52.72L120.28 21.332C124.06 18.364 128.82 16.6 134 16.6C146.376 16.6 156.4 26.624 156.4 39C156.4 44.18 154.636 48.94 151.668 52.72Z" fill="#D23228"/>
+</svg>

src/course-home/live-tab/LiveTab.jsx

@@ -0,0 +1,22 @@
+import React, { useEffect } from 'react';
+import { useSelector } from 'react-redux';
+
+const LiveTab = () => {
+  const { courseId } = useSelector(state => state.courseHome);
+  const liveModel = useSelector(state => state.models.live);
+  useEffect(() => {
+    const iframe = document.getElementById('lti-tab-embed');
+    if (iframe) {
+      iframe.className += ' vh-100 w-100 border-0';
+    }
+  }, []);
+  return (
+    <div
+      id="live_tab"
+      // eslint-disable-next-line react/no-danger
+      dangerouslySetInnerHTML={{ __html: liveModel[courseId]?.iframe }}
+    />
+  );
+};
+
+export default LiveTab;

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

@@ -1,19 +1,41 @@
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faCalendarAlt } from '@fortawesome/free-regular-svg-icons';
+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { FormattedDate } from '@edx/frontend-platform/i18n';
 import React from 'react';
+import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
+import { useModel } from '../../generic/model-store';
 import { isLearnerAssignment } from '../dates-tab/utils';
 import './DateSummary.scss';
 
-export default function DateSummary({
+const DateSummary = ({
   dateBlock,
   userTimezone,
-}) {
+}) => {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);
+  const {
+    org,
+  } = useModel('courseHomeMeta', courseId);
+
   const linkedTitle = dateBlock.link && isLearnerAssignment(dateBlock);
   const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
+
+  const logVerifiedUpgradeClick = () => {
+    sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
+      org_key: org,
+      courserun_key: courseId,
+      linkCategory: '(none)',
+      linkName: 'course_home_dates',
+      linkType: 'link',
+      pageName: 'course_home',
+    });
+  };
+
   return (
-    <li className="container p-0 mb-3 small text-dark-500">
+    <li className="p-0 mb-3 small text-dark-500">
       <div className="row">
         <FontAwesomeIcon icon={faCalendarAlt} className="ml-3 mt-1 mr-1" fixedWidth />
         <div className="ml-1 font-weight-bold">
@@ -29,19 +51,31 @@ export default function DateSummary({
       </div>
       <div className="row ml-4 pr-2">
         <div className="date-summary-text">
-          {linkedTitle
-          && <div className="font-weight-bold mt-2"><a href={dateBlock.link}>{dateBlock.title}</a></div>}
-          {!linkedTitle
-          && <div className="font-weight-bold mt-2">{dateBlock.title}</div>}
+          {linkedTitle && (
+            <div className="font-weight-bold mt-2">
+              <a href={dateBlock.link}>{dateBlock.title}</a>
+            </div>
+          )}
+          {!linkedTitle && (
+            <div className="font-weight-bold mt-2">{dateBlock.title}</div>
+          )}
         </div>
-        {dateBlock.description
-          && <div className="date-summary-text mt-1">{dateBlock.description}</div>}
-        {!linkedTitle && dateBlock.link
-          && <a href={dateBlock.link} className="description-link">{dateBlock.linkText}</a>}
+        {dateBlock.description && (
+          <div className="date-summary-text mt-1">{dateBlock.description}</div>
+        )}
+        {!linkedTitle && dateBlock.link && (
+          <a
+            href={dateBlock.link}
+            onClick={dateBlock.dateType === 'verified-upgrade-deadline' ? logVerifiedUpgradeClick : () => {}}
+            className="description-link"
+          >
+            {dateBlock.linkText}
+          </a>
+        )}
       </div>
     </li>
   );
-}
+};
 
 DateSummary.propTypes = {
   dateBlock: PropTypes.shape({
@@ -59,3 +93,5 @@ DateSummary.propTypes = {
 DateSummary.defaultProps = {
   userTimezone: null,
 };
+
+export default DateSummary;

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

@@ -1,34 +1,52 @@
-import React, { useRef } from 'react';
+import React, { useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
 
 import { getConfig } from '@edx/frontend-platform';
 
-export default function LmsHtmlFragment({
+const LmsHtmlFragment = ({
   className,
   html,
   title,
   ...rest
-}) {
+}) => {
   const wholePage = `
     <html>
       <head>
         <base href="${getConfig().LMS_BASE_URL}" target="_parent">
-        <link rel="stylesheet" href="/static/css/bootstrap/lms-main.css">
-        <link rel="stylesheet" type="text/css" href="${getConfig().BASE_URL}/src/course-home/outline-tab/LmsHtmlFragment.css">
+        <link rel="stylesheet" href="/static/${getConfig().LEGACY_THEME_NAME ? `${getConfig().LEGACY_THEME_NAME}/` : ''}css/bootstrap/lms-main.css">
+        <link rel="stylesheet" type="text/css" href="${getConfig().BASE_URL}/static/LmsHtmlFragment.css">
       </head>
       <body class="${className}">${html}</body>
+      <script>
+        const resizer = new ResizeObserver(() => {
+          window.parent.postMessage({type: 'lmshtmlfragment.resize'}, '*');
+        });
+        resizer.observe(document.body);
+      </script>
     </html>
   `;
 
   const iframe = useRef(null);
-  function handleLoad() {
-    iframe.current.height = iframe.current.contentWindow.document.body.scrollHeight;
+  function resetIframeHeight() {
+    if (iframe?.current?.contentWindow?.document?.body) {
+      iframe.current.height = iframe.current.contentWindow.document.body.scrollHeight;
+    }
   }
 
+  useEffect(() => {
+    function receiveMessage(event) {
+      const { type } = event.data;
+      if (type === 'lmshtmlfragment.resize') {
+        resetIframeHeight();
+      }
+    }
+    global.addEventListener('message', receiveMessage);
+  }, []);
+
   return (
     <iframe
       className="w-100 border-0"
-      onLoad={handleLoad}
+      onLoad={resetIframeHeight}
       ref={iframe}
       referrerPolicy="origin"
       scrolling="no"
@@ -37,7 +55,7 @@ export default function LmsHtmlFragment({
       {...rest}
     />
   );
-}
+};
 
 LmsHtmlFragment.defaultProps = {
   className: '',
@@ -48,3 +66,5 @@ LmsHtmlFragment.propTypes = {
   html: PropTypes.string.isRequired,
   title: PropTypes.string.isRequired,
 };
+
+export default LmsHtmlFragment;

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

@@ -1,115 +1,137 @@
-import React, { useRef, useState } from 'react';
+import React, { useEffect, useState } from 'react';
+import { useLocation, useNavigate } from 'react-router-dom';
 import { useSelector } from 'react-redux';
-import { sendTrackingLogEvent } from '@edx/frontend-platform/analytics';
+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
+import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-
-import { Button, Toast } from '@edx/paragon';
+import { Button } from '@edx/paragon';
 import { AlertList } from '../../generic/user-messages';
 
 import CourseDates from './widgets/CourseDates';
-import CourseGoalCard from './widgets/CourseGoalCard';
 import CourseHandouts from './widgets/CourseHandouts';
-import CourseSock from '../../generic/course-sock';
+import StartOrResumeCourseCard from './widgets/StartOrResumeCourseCard';
+import WeeklyLearningGoalCard from './widgets/WeeklyLearningGoalCard';
 import CourseTools from './widgets/CourseTools';
-import DatesBannerContainer from '../dates-banner/DatesBannerContainer';
 import { fetchOutlineTab } from '../data';
-import genericMessages from '../../generic/messages';
 import messages from './messages';
 import Section from './Section';
-import UpdateGoalSelector from './widgets/UpdateGoalSelector';
-import UpgradeCard from './widgets/UpgradeCard';
-import useAccessExpirationAlert from '../../alerts/access-expiration-alert';
-import useCertificateAvailableAlert from './alerts/certificate-available-alert';
+import ShiftDatesAlert from '../suggested-schedule-messaging/ShiftDatesAlert';
+import UpgradeNotification from '../../generic/upgrade-notification/UpgradeNotification';
+import UpgradeToShiftDatesAlert from '../suggested-schedule-messaging/UpgradeToShiftDatesAlert';
+import useCertificateAvailableAlert from './alerts/certificate-status-alert';
 import useCourseEndAlert from './alerts/course-end-alert';
-import useCourseStartAlert from './alerts/course-start-alert';
-import useOfferAlert from '../../alerts/offer-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';
+import AccountActivationAlert from '../../alerts/logistration-alert/AccountActivationAlert';
 
-function OutlineTab({ intl }) {
+const OutlineTab = ({ intl }) => {
   const {
     courseId,
+    proctoringPanelStatus,
   } = useSelector(state => state.courseHome);
 
   const {
+    isSelfPaced,
     org,
     title,
+    userTimezone,
   } = useModel('courseHomeMeta', courseId);
 
   const {
     accessExpiration,
-    canShowUpgradeSock,
     courseBlocks: {
       courses,
       sections,
     },
     courseGoals: {
-      goalOptions,
       selectedGoal,
-    },
+      weeklyLearningGoalEnabled,
+    } = {},
     datesBannerInfo,
     datesWidget: {
       courseDateBlocks,
-      userTimezone,
-    },
-    hasEnded,
-    resumeCourse: {
-      hasVisitedCourse,
-      url: resumeCourseUrl,
     },
+    enableProctoredExams,
     offer,
+    timeOffsetMillis,
     verifiedMode,
   } = useModel('outline', courseId);
 
-  const [courseGoalToDisplay, setCourseGoalToDisplay] = useState(selectedGoal);
-  const [goalToastHeader, setGoalToastHeader] = useState('');
-  const [expandAll, setExpandAll] = useState(false);
+  const {
+    marketingUrl,
+  } = useModel('coursewareMeta', courseId);
 
-  const logResumeCourseClick = () => {
-    sendTrackingLogEvent('edx.course.home.resume_course.clicked', {
-      courserun_key: courseId,
-      event_type: hasVisitedCourse ? 'resume' : 'start',
-      org_key: org,
-      url: resumeCourseUrl,
-    });
+  const [expandAll, setExpandAll] = useState(false);
+  const navigate = useNavigate();
+
+  const eventProperties = {
+    org_key: org,
+    courserun_key: courseId,
   };
 
   // Below the course title alerts (appearing in the order listed here)
-  const offerAlert = useOfferAlert(offer, userTimezone, 'outline-course-alerts');
-  const accessExpirationAlert = useAccessExpirationAlert(accessExpiration, userTimezone, 'outline-course-alerts');
   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 courseSock = useRef(null);
+  const hasDeadlines = courseDateBlocks && courseDateBlocks.some(x => x.dateType === 'assignment-due-date');
+
+  const logUpgradeToShiftDatesLinkClick = () => {
+    sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
+      ...eventProperties,
+      linkCategory: 'personalized_learner_schedules',
+      linkName: 'course_home_upgrade_shift_dates',
+      linkType: 'button',
+      pageName: 'course_home',
+    });
+  };
+
+  const isEnterpriseUser = () => {
+    const authenticatedUser = getAuthenticatedUser();
+    const userRoleNames = authenticatedUser ? authenticatedUser.roles.map(role => role.split(':')[0]) : [];
+
+    return userRoleNames.includes('enterprise_learner');
+  };
+
+  /** show post enrolment survey to only B2C learners */
+  const learnerType = isEnterpriseUser() ? 'enterprise_learner' : 'b2c_learner';
+
+  const location = useLocation();
+
+  useEffect(() => {
+    const currentParams = new URLSearchParams(location.search);
+    const startCourse = currentParams.get('start_course');
+    if (startCourse === '1') {
+      sendTrackEvent('enrollment.email.clicked.startcourse', {});
+
+      // Deleting the course_start query param as it only needs to be set once
+      // whenever passed in query params.
+      currentParams.delete('start_course');
+      navigate({
+        pathname: location.pathname,
+        search: `?${currentParams.toString()}`,
+        replace: true,
+      });
+    }
+  }, [location.search]);
 
   return (
     <>
-      <Toast
-        closeLabel={intl.formatMessage(genericMessages.close)}
-        onClose={() => setGoalToastHeader('')}
-        show={!!(goalToastHeader)}
-      >
-        {goalToastHeader}
-      </Toast>
-      <div className="row w-100 m-0 mb-3 justify-content-between">
+      <div data-learner-type={learnerType} className="row w-100 mx-0 my-3 justify-content-between">
         <div className="col-12 col-sm-auto p-0">
           <div role="heading" aria-level="1" className="h2">{title}</div>
         </div>
-        {resumeCourseUrl && (
-          <div className="col-12 col-sm-auto p-0">
-            <Button block href={resumeCourseUrl} onClick={() => logResumeCourseClick()}>
-              {hasVisitedCourse ? intl.formatMessage(messages.resume) : intl.formatMessage(messages.start)}
-            </Button>
-          </div>
-        )}
       </div>
-      <div className="row">
+      <div className="row course-outline-tab">
+        <AccountActivationAlert />
         <div className="col-12">
           <AlertList
             topic="outline-private-alerts"
@@ -123,42 +145,30 @@ function OutlineTab({ intl }) {
             topic="outline-course-alerts"
             className="mb-3"
             customAlerts={{
-              ...accessExpirationAlert,
               ...certificateAvailableAlert,
               ...courseEndAlert,
               ...courseStartAlert,
-              ...offerAlert,
+              ...scheduledContentAlert,
             }}
           />
-          {courseDateBlocks && (
-            <DatesBannerContainer
-              courseDateBlocks={courseDateBlocks}
-              datesBannerInfo={datesBannerInfo}
-              hasEnded={hasEnded}
-              model="outline"
-              tabFetch={fetchOutlineTab}
-            />
-          )}
-          {!courseGoalToDisplay && goalOptions.length > 0 && (
-            <CourseGoalCard
-              courseId={courseId}
-              goalOptions={goalOptions}
-              title={title}
-              setGoalToDisplay={(newGoal) => { setCourseGoalToDisplay(newGoal); }}
-              setGoalToastHeader={(newHeader) => { setGoalToastHeader(newHeader); }}
-            />
+          {isSelfPaced && hasDeadlines && (
+            <>
+              <ShiftDatesAlert model="outline" fetch={fetchOutlineTab} />
+              <UpgradeToShiftDatesAlert model="outline" logUpgradeLinkClick={logUpgradeToShiftDatesLinkClick} />
+            </>
           )}
+          <StartOrResumeCourseCard />
           <WelcomeMessage courseId={courseId} />
           {rootCourseId && (
             <>
               <div className="row w-100 m-0 mb-3 justify-content-end">
-                <div className="col-12 col-sm-auto p-0">
+                <div className="col-12 col-md-auto p-0">
                   <Button variant="outline-primary" block onClick={() => { setExpandAll(!expandAll); }}>
                     {expandAll ? intl.formatMessage(messages.collapseAll) : intl.formatMessage(messages.expandAll)}
                   </Button>
                 </div>
               </div>
-              <ol className="list-unstyled">
+              <ol id="courseHome-outline" className="list-unstyled">
                 {courses[rootCourseId].sectionIds.map((sectionId) => (
                   <Section
                     key={sectionId}
@@ -174,47 +184,37 @@ function OutlineTab({ intl }) {
         </div>
         {rootCourseId && (
           <div className="col col-12 col-md-4">
-            <ProctoringInfoPanel
-              courseId={courseId}
-            />
-            {courseGoalToDisplay && goalOptions.length > 0 && (
-              <UpdateGoalSelector
-                courseId={courseId}
-                goalOptions={goalOptions}
-                selectedGoal={courseGoalToDisplay}
-                setGoalToDisplay={(newGoal) => { setCourseGoalToDisplay(newGoal); }}
-                setGoalToastHeader={(newHeader) => { setGoalToastHeader(newHeader); }}
+            <ProctoringInfoPanel />
+            { /** Defer showing the goal widget until the ProctoringInfoPanel has resolved or has been determined as
+             disabled to avoid components bouncing around too much as screen is rendered */ }
+            {(!enableProctoredExams || proctoringPanelStatus === 'loaded') && weeklyLearningGoalEnabled && (
+              <WeeklyLearningGoalCard
+                daysPerWeek={selectedGoal && 'daysPerWeek' in selectedGoal ? selectedGoal.daysPerWeek : null}
+                subscribedToReminders={selectedGoal && 'subscribedToReminders' in selectedGoal ? selectedGoal.subscribedToReminders : false}
               />
             )}
-            <CourseTools
-              courseId={courseId}
-            />
-            <UpgradeCard
-              courseId={courseId}
-              onLearnMore={canShowUpgradeSock ? () => { courseSock.current.showToUser(); } : null}
-            />
-            <CourseDates
-              courseId={courseId}
-            />
-            <CourseHandouts
+            <CourseTools />
+            <UpgradeNotification
+              offer={offer}
+              verifiedMode={verifiedMode}
+              accessExpiration={accessExpiration}
+              contentTypeGatingEnabled={datesBannerInfo.contentTypeGatingEnabled}
+              marketingUrl={marketingUrl}
+              upsellPageName="course_home"
+              userTimezone={userTimezone}
+              shouldDisplayBorder
+              timeOffsetMillis={timeOffsetMillis}
               courseId={courseId}
+              org={org}
             />
+            <CourseDates />
+            <CourseHandouts />
           </div>
         )}
       </div>
-      {canShowUpgradeSock && (
-        <CourseSock
-          courseId={courseId}
-          offer={offer}
-          orgKey={org}
-          pageLocation="Home Page"
-          ref={courseSock}
-          verifiedMode={verifiedMode}
-        />
-      )}
     </>
   );
-}
+};
 
 OutlineTab.propTypes = {
   intl: intlShape.isRequired,