feat: remove upgrade button

This removes the upgrade button as default content in CourseCardActionSlot.

This is, for the moment, a Sumac-specific change.  The button is still
present in master, pending proper removal (including the component
definitions from the rest of the repository) prior to the U release by
the maintainers.  See:

https://github.com/openedx/frontend-app-learner-dashboard/issues/438

.env

@@ -32,6 +32,7 @@ ENTERPRISE_MARKETING_UTM_SOURCE=''
 ENTERPRISE_MARKETING_UTM_CAMPAIGN=''
 ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM=''
 LEARNING_BASE_URL=''
+ZENDESK_KEY=''
 HOTJAR_APP_ID=''
 HOTJAR_VERSION='6'
 HOTJAR_DEBUG=''
@@ -41,4 +42,3 @@ ENABLE_NOTICES=''
 CAREER_LINK_URL=''
 ENABLE_EDX_PERSONAL_DASHBOARD=false
 ENABLE_PROGRAMS=false
-NON_BROWSABLE_COURSES=false

.env.development

@@ -38,6 +38,7 @@ ENTERPRISE_MARKETING_UTM_CAMPAIGN='example.com Referral'
 ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM='Footer'
 LEARNING_BASE_URL='http://localhost:2000'
 SESSION_COOKIE_DOMAIN='localhost'
+ZENDESK_KEY=''
 HOTJAR_APP_ID=''
 HOTJAR_VERSION='6'
 HOTJAR_DEBUG=''
@@ -47,4 +48,3 @@ ENABLE_NOTICES=''
 CAREER_LINK_URL=''
 ENABLE_EDX_PERSONAL_DASHBOARD=false
 ENABLE_PROGRAMS=false
-NON_BROWSABLE_COURSES=false

.env.test

@@ -37,6 +37,7 @@ ENTERPRISE_MARKETING_UTM_SOURCE='example.com'
 ENTERPRISE_MARKETING_UTM_CAMPAIGN='example.com Referral'
 ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM='Footer'
 LEARNING_BASE_URL='http://localhost:2000'
+ZENDESK_KEY='test-zendesk-key'
 HOTJAR_APP_ID='hot-jar-app-id'
 HOTJAR_VERSION='6'
 HOTJAR_DEBUG=''
@@ -46,4 +47,3 @@ ENABLE_NOTICES=''
 CAREER_LINK_URL=''
 ENABLE_EDX_PERSONAL_DASHBOARD=true
 ENABLE_PROGRAMS=false
-NON_BROWSABLE_COURSES=false

.github/workflows/ci.yml

@@ -11,6 +11,9 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: [18, 20]
 
     steps:
     - name: Checkout
@@ -19,7 +22,7 @@ jobs:
     - name: Setup Nodejs
       uses: actions/setup-node@v4
       with:
-        node-version-file: '.nvmrc'
+        node-version: ${{ matrix.node }}
 
     - name: Install dependencies
       run: npm ci
@@ -37,7 +40,24 @@ jobs:
       run: npm run build
 
     - name: Run Coverage
-      uses: codecov/codecov-action@v5
+      uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         fail_ci_if_error: true
+
+    - name: Send failure notification
+      if: ${{ failure() }}
+      uses: dawidd6/action-send-mail@v3
+      with:
+        server_address: email-smtp.us-east-1.amazonaws.com
+        server_port: 465
+        username: ${{ secrets.EDX_SMTP_USERNAME }}
+        password: ${{ secrets.EDX_SMTP_PASSWORD }}
+        subject: CI workflow failed in ${{github.repository}}
+        to: masters-grades@edx.org,aperture@2u-internal.opsgenie.net
+        from: github-actions <github-actions@edx.org>
+        nodemailerlog: true
+        nodemailerdebug: true
+        body: CI workflow in ${{github.repository}} failed!
+          For details see "github.com/${{ github.repository }}/actions/runs/${{ github.run_id
+          }}"

.github/workflows/npm-publish.yml

@@ -0,0 +1,35 @@
+name: Release CI
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Nodejs Env
+        run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VER }}
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Create Build
+        run: npm run build
+
+      - name: Release Package
+        env:
+          GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.SEMANTIC_RELEASE_NPM_TOKEN }}
+        run: npm semantic-release

.husky/pre-push

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

.releaserc

@@ -0,0 +1,27 @@
+{
+  "branch": "master",
+  "tagFormat": "v${version}",
+  "verifyConditions": [
+    "@semantic-release/npm",
+    {
+      "path": "@semantic-release/github",
+      "assets": {
+        "path": "dist/*"
+      }
+    }
+  ],
+  "analyzeCommits": "@semantic-release/commit-analyzer",
+  "generateNotes": "@semantic-release/release-notes-generator",
+  "prepare": "@semantic-release/npm",
+  "publish": [
+    "@semantic-release/npm",
+    {
+      "path": "@semantic-release/github",
+      "assets": {
+        "path": "dist/*"
+      }
+    }
+  ],
+  "success": [],
+  "fail": []
+}

catalog-info.yaml

@@ -17,7 +17,6 @@ metadata:
     openedx.org/arch-interest-groups: ""
     # This can be multiple comma-separated projects.
     openedx.org/add-to-projects: "openedx:23"
-    openedx.org/release: "master"
 spec:
   type: 'service'
   lifecycle: 'production'

example.env.config.js

@@ -59,6 +59,7 @@ module.exports = {
   ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM: 'Footer',
   LEARNING_BASE_URL: 'http://localhost:2000',
   SESSION_COOKIE_DOMAIN: 'localhost',
+  ZENDESK_KEY: '',
   HOTJAR_APP_ID: '',
   HOTJAR_VERSION: 6,
   HOTJAR_DEBUG: '',

openedx.yaml

@@ -0,0 +1,9 @@
+# This file describes this Open edX repo, as described in OEP-2:
+# http://open-edx-proposals.readthedocs.io/en/latest/oeps/oep-0002.html#specification
+
+tags:
+  - frontend-app
+  - masters
+oeps:
+  oep-2: true    # Repository metadata
+openedx-release: {ref: master}

package.json

@@ -16,11 +16,11 @@
     "lint-fix": "fedx-scripts eslint --fix --ext .jsx,.js src/",
     "semantic-release": "semantic-release",
     "start": "fedx-scripts webpack-dev-server --progress",
-    "dev": "PUBLIC_PATH=/learner-dashboard/ MFE_CONFIG_API_URL='http://localhost:8000/api/mfe_config/v1' fedx-scripts webpack-dev-server --progress --host apps.local.openedx.io",
     "test": "TZ=GMT fedx-scripts jest --coverage --passWithNoTests",
     "quality": "npm run lint-fix && npm run test",
     "watch-tests": "jest --watch",
-    "snapshot": "fedx-scripts jest --updateSnapshot"
+    "snapshot": "fedx-scripts jest --updateSnapshot",
+    "prepare": "husky install"
   },
   "author": "edX",
   "license": "AGPL-3.0",
@@ -30,57 +30,70 @@
   },
   "dependencies": {
     "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
-    "@edx/frontend-component-footer": "^14.6.0",
-    "@edx/frontend-component-header": "^6.2.0",
-    "@edx/frontend-enterprise-hotjar": "7.2.0",
-    "@edx/frontend-platform": "^8.3.1",
-    "@edx/openedx-atlas": "^0.7.0",
-    "@edx/react-unit-test-utils": "^4.0.0",
+    "@edx/frontend-component-header": "^5.6.0",
+    "@edx/frontend-enterprise-hotjar": "3.0.0",
+    "@edx/frontend-platform": "8.1.2",
+    "@edx/openedx-atlas": "^0.6.0",
+    "@edx/react-unit-test-utils": "3.0.0",
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
     "@fortawesome/free-brands-svg-icons": "^5.15.4",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
     "@fortawesome/react-fontawesome": "^0.2.0",
-    "@openedx/frontend-plugin-framework": "^1.7.0",
-    "@openedx/paragon": "^22.16.0",
+    "@openedx/frontend-plugin-framework": "^1.2.0",
+    "@openedx/frontend-slot-footer": "^1.0.2",
+    "@openedx/paragon": "^22.2.2",
+    "@redux-beacon/segment": "^1.1.0",
     "@redux-devtools/extension": "3.3.0",
-    "@reduxjs/toolkit": "^2.0.0",
+    "@reduxjs/toolkit": "^1.6.1",
+    "@testing-library/user-event": "^13.5.0",
     "classnames": "^2.3.1",
-    "core-js": "3.42.0",
-    "filesize": "^10.0.0",
+    "core-js": "3.38.1",
+    "dompurify": "^2.3.1",
+    "email-prop-type": "^3.0.1",
+    "file-saver": "^2.0.5",
+    "filesize": "^8.0.6",
     "font-awesome": "4.7.0",
     "history": "5.3.0",
+    "html-react-parser": "^1.3.0",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "29.7.0",
+    "jest-when": "^3.6.0",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "prop-types": "15.8.1",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "query-string": "7.1.3",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
     "react-helmet": "^6.1.0",
-    "react-intl": "6.8.9",
+    "react-intl": "6.8.0",
+    "react-pdf": "^7.0.0",
     "react-redux": "^7.2.4",
-    "react-router-dom": "6.29.0",
+    "react-router-dom": "6.27.0",
     "react-share": "^4.4.0",
+    "react-zendesk": "^0.1.13",
     "redux": "4.2.1",
+    "redux-beacon": "^2.1.0",
     "redux-logger": "3.0.6",
     "redux-thunk": "2.4.2",
     "regenerator-runtime": "^0.14.0",
     "reselect": "^4.0.0",
     "universal-cookie": "^4.0.4",
-    "util": "^0.12.4"
+    "util": "^0.12.4",
+    "whatwg-fetch": "^3.6.2"
   },
   "devDependencies": {
     "@edx/browserslist-config": "^1.3.0",
     "@edx/reactifex": "^2.1.1",
-    "@openedx/frontend-build": "^14.3.3",
-    "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "^16.2.0",
+    "@openedx/frontend-build": "14.1.5",
+    "@testing-library/jest-dom": "^5.14.1",
+    "@testing-library/react": "^12.1.0",
     "copy-webpack-plugin": "^12.0.0",
+    "husky": "^9.0.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
     "jest-expect-message": "^1.1.3",
-    "jest-when": "^3.6.0",
     "react-dev-utils": "^12.0.0",
-    "react-test-renderer": "^18.3.1",
-    "redux-mock-store": "^1.5.4"
+    "react-test-renderer": "^17.0.2",
+    "redux-mock-store": "^1.5.4",
+    "semantic-release": "^20.1.3"
   }
 }

src/App.jsx

@@ -6,7 +6,7 @@ import { logError } from '@edx/frontend-platform/logging';
 import { initializeHotjar } from '@edx/frontend-enterprise-hotjar';
 
 import { ErrorPage, AppContext } from '@edx/frontend-platform/react';
-import { FooterSlot } from '@edx/frontend-component-footer';
+import FooterSlot from '@openedx/frontend-slot-footer';
 import { Alert } from '@openedx/paragon';
 
 import { RequestKeys } from 'data/constants/requests';
@@ -80,7 +80,7 @@ export const App = () => {
       <div>
         <AppWrapper>
           <LearnerDashboardHeader />
-          <main id="main">
+          <main>
             {hasNetworkFailure
               ? (
                 <Alert variant="danger">

src/App.test.jsx

@@ -13,10 +13,11 @@ import AppWrapper from 'containers/WidgetContainers/AppWrapper';
 import { App } from './App';
 import messages from './messages';
 
-jest.mock('@edx/frontend-component-footer', () => ({ FooterSlot: 'FooterSlot' }));
+jest.mock('@edx/frontend-component-footer', () => ({ FooterSlot: 'Footer' }));
 
 jest.mock('containers/Dashboard', () => 'Dashboard');
 jest.mock('containers/LearnerDashboardHeader', () => 'LearnerDashboardHeader');
+jest.mock('components/ZendeskFab', () => 'ZendeskFab');
 jest.mock('containers/WidgetContainers/AppWrapper', () => 'AppWrapper');
 jest.mock('data/redux', () => ({
   selectors: 'redux.selectors',
@@ -74,9 +75,11 @@ describe('App router component', () => {
       it('loads dashboard', () => {
         const main = el.instance.findByType('main')[0];
         expect(main.children.length).toEqual(1);
-        const dashboard = main.children[0].el;
+        const dashboard = main.children[0];
         expect(dashboard.type).toEqual('Dashboard');
-        expect(dashboard).toEqual(shallow(<Dashboard />));
+        expect(
+          dashboard.matches(shallow(<Dashboard />)),
+        ).toEqual(true);
       });
     });
     describe('no network failure with optimizely url', () => {
@@ -89,9 +92,11 @@ describe('App router component', () => {
       it('loads dashboard', () => {
         const main = el.instance.findByType('main')[0];
         expect(main.children.length).toEqual(1);
-        const dashboard = main.children[0].el;
+        const dashboard = main.children[0];
         expect(dashboard.type).toEqual('Dashboard');
-        expect(dashboard).toEqual(shallow(<Dashboard />));
+        expect(
+          dashboard.matches(shallow(<Dashboard />)),
+        ).toEqual(true);
       });
     });
     describe('no network failure with optimizely project id', () => {
@@ -104,9 +109,11 @@ describe('App router component', () => {
       it('loads dashboard', () => {
         const main = el.instance.findByType('main')[0];
         expect(main.children.length).toEqual(1);
-        const dashboard = main.children[0].el;
+        const dashboard = main.children[0];
         expect(dashboard.type).toEqual('Dashboard');
-        expect(dashboard).toEqual(shallow(<Dashboard />));
+        expect(
+          dashboard.matches(shallow(<Dashboard />)),
+        ).toEqual(true);
       });
     });
     describe('initialize failure', () => {

src/__snapshots__/App.test.jsx.snap

@@ -17,9 +17,7 @@ exports[`App router component component initialize failure snapshot 1`] = `
   <div>
     <AppWrapper>
       <LearnerDashboardHeader />
-      <main
-        id="main"
-      >
+      <main>
         <Alert
           variant="danger"
         >
@@ -51,9 +49,7 @@ exports[`App router component component no network failure snapshot 1`] = `
   <div>
     <AppWrapper>
       <LearnerDashboardHeader />
-      <main
-        id="main"
-      >
+      <main>
         <Dashboard />
       </main>
     </AppWrapper>
@@ -79,9 +75,7 @@ exports[`App router component component no network failure with optimizely proje
   <div>
     <AppWrapper>
       <LearnerDashboardHeader />
-      <main
-        id="main"
-      >
+      <main>
         <Dashboard />
       </main>
     </AppWrapper>
@@ -107,9 +101,7 @@ exports[`App router component component no network failure with optimizely url s
   <div>
     <AppWrapper>
       <LearnerDashboardHeader />
-      <main
-        id="main"
-      >
+      <main>
         <Dashboard />
       </main>
     </AppWrapper>
@@ -135,9 +127,7 @@ exports[`App router component component refresh failure snapshot 1`] = `
   <div>
     <AppWrapper>
       <LearnerDashboardHeader />
-      <main
-        id="main"
-      >
+      <main>
         <Alert
           variant="danger"
         >

src/__snapshots__/index.test.jsx.snap

@@ -1,43 +1,40 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`app registry subscribe: APP_INIT_ERROR.  snapshot: displays an ErrorPage to root element 1`] = `
-<UNDEFINED>
-  <ErrorPage
-    message="test-error-message"
-  />
-</UNDEFINED>
+<ErrorPage
+  message="test-error-message"
+/>
 `;
 
 exports[`app registry subscribe: APP_READY.  links App to root element 1`] = `
-<UNDEFINED>
-  <AppProvider
-    store={
-      {
-        "redux": "store",
-      }
+<AppProvider
+  store={
+    {
+      "redux": "store",
     }
-  >
-    <NoticesWrapper>
-      <Routes>
-        <Route
-          element={
-            <PageWrap>
-              <App />
-            </PageWrap>
-          }
-          path="/"
-        />
-        <Route
-          element={
-            <Navigate
-              replace={true}
-              to="/"
-            />
-          }
-          path="*"
-        />
-      </Routes>
-    </NoticesWrapper>
-  </AppProvider>
-</UNDEFINED>
+  }
+  wrapWithRouter={true}
+>
+  <NoticesWrapper>
+    <Routes>
+      <Route
+        element={
+          <PageWrap>
+            <App />
+          </PageWrap>
+        }
+        path="/"
+      />
+      <Route
+        element={
+          <Navigate
+            replace={true}
+            to="/"
+          />
+        }
+        path="*"
+      />
+    </Routes>
+  </NoticesWrapper>
+</AppProvider>
 `;

src/components/NoticesWrapper/api.js

@@ -3,15 +3,16 @@ import { getAuthenticatedHttpClient, getAuthenticatedUser } from '@edx/frontend-
 import { logError, logInfo } from '@edx/frontend-platform/logging';
 
 export const noticesUrl = `${getConfig().LMS_BASE_URL}/notices/api/v1/unacknowledged`;
+export const error404Message = 'This probably happened because the notices plugin is not installed on platform.';
 
-export const getNotices = ({ onLoad, notFoundMessage }) => {
+export const getNotices = ({ onLoad }) => {
   const authenticatedUser = getAuthenticatedUser();
 
   const handleError = async (e) => {
     // Error probably means that notices is not installed, which is fine.
     const { customAttributes: { httpErrorStatus } } = e;
     if (httpErrorStatus === 404) {
-      logInfo(`${e}. ${notFoundMessage}`);
+      logInfo(`${e}. ${error404Message}`);
     } else {
       logError(e);
     }

src/components/NoticesWrapper/hooks.js

@@ -1,11 +1,9 @@
 import React from 'react';
 import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from 'react-intl';
 
 import { StrictDict } from 'utils';
 import { getNotices } from './api';
 import * as module from './hooks';
-import messages from './messages';
 
 /**
  * This component uses the platform-plugin-notices plugin to function.
@@ -19,8 +17,6 @@ export const state = StrictDict({
 
 export const useNoticesWrapperData = () => {
   const [isRedirected, setIsRedirected] = module.state.isRedirected();
-  const { formatMessage } = useIntl();
-
   React.useEffect(() => {
     if (getConfig().ENABLE_NOTICES) {
       getNotices({
@@ -30,10 +26,9 @@ export const useNoticesWrapperData = () => {
             window.location.replace(`${data.data.results[0]}?next=${window.location.href}`);
           }
         },
-        notFoundMessage: formatMessage(messages.error404Message),
       });
     }
-  }, [setIsRedirected, formatMessage]);
+  }, [setIsRedirected]);
   return { isRedirected };
 };
 

src/components/NoticesWrapper/hooks.test.js

@@ -8,12 +8,6 @@ import * as hooks from './hooks';
 
 jest.mock('@edx/frontend-platform', () => ({ getConfig: jest.fn() }));
 jest.mock('./api', () => ({ getNotices: jest.fn() }));
-const mockFormatMessage = jest.fn(message => message.defaultMessage || 'translated-string');
-jest.mock('react-intl', () => ({
-  useIntl: () => ({
-    formatMessage: mockFormatMessage,
-  }),
-}));
 
 getConfig.mockReturnValue({ ENABLE_NOTICES: true });
 const state = new MockUseState(hooks);
@@ -40,7 +34,7 @@ describe('NoticesWrapper hooks', () => {
           getConfig.mockReturnValueOnce({ ENABLE_NOTICES: false });
           hooks.useNoticesWrapperData();
           const [cb, prereqs] = React.useEffect.mock.calls[0];
-          expect(prereqs).toEqual([state.setState.isRedirected, mockFormatMessage]);
+          expect(prereqs).toEqual([state.setState.isRedirected]);
           cb();
           expect(getNotices).not.toHaveBeenCalled();
         });
@@ -49,7 +43,7 @@ describe('NoticesWrapper hooks', () => {
             hooks.useNoticesWrapperData();
             expect(React.useEffect).toHaveBeenCalled();
             const [cb, prereqs] = React.useEffect.mock.calls[0];
-            expect(prereqs).toEqual([state.setState.isRedirected, mockFormatMessage]);
+            expect(prereqs).toEqual([state.setState.isRedirected]);
             cb();
             expect(getNotices).toHaveBeenCalled();
             const { onLoad } = getNotices.mock.calls[0][0];
@@ -65,7 +59,7 @@ describe('NoticesWrapper hooks', () => {
             window.location = { replace: jest.fn(), href: 'test-old-href' };
             hooks.useNoticesWrapperData();
             const [cb, prereqs] = React.useEffect.mock.calls[0];
-            expect(prereqs).toEqual([state.setState.isRedirected, mockFormatMessage]);
+            expect(prereqs).toEqual([state.setState.isRedirected]);
             cb();
             expect(getNotices).toHaveBeenCalled();
             const { onLoad } = getNotices.mock.calls[0][0];

src/components/NoticesWrapper/messages.js

@@ -1,11 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  error404Message: {
-    id: 'learner-dash.notices.error404Message',
-    defaultMessage: 'This probably happened because the notices plugin is not installed on platform.',
-    description: 'Error message when notices API returns 404',
-  },
-});
-
-export default messages;

src/components/ZendeskFab/__snapshots__/index.test.jsx.snap

@@ -0,0 +1,65 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ZendeskFab snapshot 1`] = `
+<Zendesk
+  cookies={true}
+  defer={true}
+  webWidget={
+    {
+      "answerBot": {
+        "avatar": {
+          "name": {
+            "*": "edX Support",
+          },
+          "url": "https://edx-cdn.org/v3/prod/favicon.ico",
+        },
+        "contactOnlyAfterQuery": true,
+        "suppress": false,
+        "title": {
+          "*": "edX Support",
+        },
+      },
+      "chat": {
+        "departments": {
+          "enabled": [
+            "account settings",
+            "billing and payments",
+            "certificates",
+            "deadlines",
+            "errors and technical issues",
+            "other",
+            "proctoring",
+          ],
+        },
+        "suppress": false,
+      },
+      "contactForm": {
+        "attachments": true,
+        "selectTicketForm": {
+          "*": "Please choose your request type:",
+        },
+        "ticketForms": [
+          {
+            "fields": [
+              {
+                "id": "description",
+                "prefill": {
+                  "*": "",
+                },
+              },
+            ],
+            "id": 360003368814,
+            "subject": false,
+          },
+        ],
+      },
+      "contactOptions": {
+        "enabled": false,
+      },
+      "helpCenter": {
+        "originalArticleButton": true,
+      },
+    }
+  }
+/>
+`;

src/components/ZendeskFab/index.jsx

@@ -0,0 +1,56 @@
+import React from 'react';
+
+import { getConfig } from '@edx/frontend-platform';
+import { useIntl } from '@edx/frontend-platform/i18n';
+
+import Zendesk from 'react-zendesk';
+import messages from './messages';
+
+const ZendeskFab = () => {
+  const { formatMessage } = useIntl();
+  const setting = {
+    cookies: true,
+    webWidget: {
+      contactOptions: {
+        enabled: false,
+      },
+      chat: {
+        suppress: false,
+        departments: {
+          enabled: ['account settings', 'billing and payments', 'certificates', 'deadlines', 'errors and technical issues', 'other', 'proctoring'],
+        },
+      },
+      contactForm: {
+        ticketForms: [
+          {
+            id: 360003368814,
+            subject: false,
+            fields: [{ id: 'description', prefill: { '*': '' } }],
+          },
+        ],
+        selectTicketForm: {
+          '*': formatMessage(messages.selectTicketForm),
+        },
+        attachments: true,
+      },
+      helpCenter: {
+        originalArticleButton: true,
+      },
+      answerBot: {
+        suppress: false,
+        contactOnlyAfterQuery: true,
+        title: { '*': formatMessage(messages.supportTitle) },
+        avatar: {
+          url: 'https://edx-cdn.org/v3/prod/favicon.ico',
+          name: { '*': formatMessage(messages.supportTitle) },
+        },
+      },
+    },
+  };
+
+  return (
+    <Zendesk defer zendeskKey={getConfig().ZENDESK_KEY} {...setting} />
+  );
+};
+
+export default ZendeskFab;

src/components/ZendeskFab/index.test.jsx

@@ -0,0 +1,12 @@
+import { shallow } from '@edx/react-unit-test-utils';
+
+import ZendeskFab from '.';
+
+jest.mock('react-zendesk', () => 'Zendesk');
+
+describe('ZendeskFab', () => {
+  test('snapshot', () => {
+    const wrapper = shallow(<ZendeskFab />);
+    expect(wrapper.snapshot).toMatchSnapshot();
+  });
+});

src/components/ZendeskFab/messages.js

@@ -0,0 +1,16 @@
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+  supportTitle: {
+    id: 'zendesk.supportTitle',
+    description: 'Title for the support button',
+    defaultMessage: 'edX Support',
+  },
+  selectTicketForm: {
+    id: 'zendesk.selectTicketForm',
+    description: 'Select ticket form',
+    defaultMessage: 'Please choose your request type:',
+  },
+});
+
+export default messages;

src/config/index.js

@@ -12,6 +12,7 @@ const configuration = {
   // ACCESS_TOKEN_COOKIE_NAME: process.env.ACCESS_TOKEN_COOKIE_NAME,
   LEARNING_BASE_URL: process.env.LEARNING_BASE_URL,
   SESSION_COOKIE_DOMAIN: process.env.SESSION_COOKIE_DOMAIN || '',
+  ZENDESK_KEY: process.env.ZENDESK_KEY,
   SUPPORT_URL: process.env.SUPPORT_URL || null,
   ENABLE_NOTICES: process.env.ENABLE_NOTICES || null,
   CAREER_LINK_URL: process.env.CAREER_LINK_URL || null,
@@ -19,7 +20,6 @@ const configuration = {
   ENABLE_EDX_PERSONAL_DASHBOARD: process.env.ENABLE_EDX_PERSONAL_DASHBOARD === 'true',
   SEARCH_CATALOG_URL: process.env.SEARCH_CATALOG_URL || null,
   ENABLE_PROGRAMS: process.env.ENABLE_PROGRAMS === 'true',
-  NON_BROWSABLE_COURSES: process.env.NON_BROWSABLE_COURSES === 'true',
 };
 
 const features = {};

src/containers/CourseCard/components/CourseCardActions/BeginCourseButton.test.jsx

@@ -27,7 +27,7 @@ reduxHooks.useCardCourseRunData.mockReturnValue({ homeUrl });
 const execEdPath = (cardId) => `exec-ed-tracking-path=${cardId}`;
 reduxHooks.useCardExecEdTrackingParam.mockImplementation(execEdPath);
 reduxHooks.useTrackCourseEvent.mockImplementation(
-  (eventName, cardId, url) => ({ trackCourseEvent: { eventName, cardId, url } }),
+  (eventName, cardId, upgradeUrl) => ({ trackCourseEvent: { eventName, cardId, upgradeUrl } }),
 );
 
 describe('BeginCourseButton', () => {

src/containers/CourseCard/components/CourseCardActions/ResumeButton.test.jsx

@@ -26,7 +26,7 @@ reduxHooks.useCardCourseRunData.mockReturnValue({ resumeUrl });
 const execEdPath = (cardId) => `exec-ed-tracking-path=${cardId}`;
 reduxHooks.useCardExecEdTrackingParam.mockImplementation(execEdPath);
 reduxHooks.useTrackCourseEvent.mockImplementation(
-  (eventName, cardId, url) => ({ trackCourseEvent: { eventName, cardId, url } }),
+  (eventName, cardId, upgradeUrl) => ({ trackCourseEvent: { eventName, cardId, upgradeUrl } }),
 );
 
 let wrapper;

src/containers/CourseCard/components/CourseCardActions/UpgradeButton.jsx

@@ -0,0 +1,45 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { Locked } from '@openedx/paragon/icons';
+import { useIntl } from '@edx/frontend-platform/i18n';
+
+import track from 'tracking';
+import { reduxHooks } from 'hooks';
+import useActionDisabledState from '../hooks';
+
+import ActionButton from './ActionButton';
+import messages from './messages';
+
+export const UpgradeButton = ({ cardId }) => {
+  const { formatMessage } = useIntl();
+
+  const { upgradeUrl } = reduxHooks.useCardCourseRunData(cardId);
+  const { disableUpgradeCourse } = useActionDisabledState(cardId);
+
+  const trackUpgradeClick = reduxHooks.useTrackCourseEvent(
+    track.course.upgradeClicked,
+    cardId,
+    upgradeUrl,
+  );
+
+  const enabledProps = {
+    as: 'a',
+    href: upgradeUrl,
+    onClick: trackUpgradeClick,
+  };
+  return (
+    <ActionButton
+      iconBefore={Locked}
+      variant="outline-primary"
+      disabled={disableUpgradeCourse}
+      {...!disableUpgradeCourse && enabledProps}
+    >
+      {formatMessage(messages.upgrade)}
+    </ActionButton>
+  );
+};
+UpgradeButton.propTypes = {
+  cardId: PropTypes.string.isRequired,
+};
+export default UpgradeButton;

src/containers/CourseCard/components/CourseCardActions/UpgradeButton.test.jsx

@@ -0,0 +1,49 @@
+import { shallow } from '@edx/react-unit-test-utils';
+
+import track from 'tracking';
+import { reduxHooks } from 'hooks';
+import useActionDisabledState from '../hooks';
+import UpgradeButton from './UpgradeButton';
+
+jest.mock('tracking', () => ({
+  course: {
+    upgradeClicked: jest.fn().mockName('segment.trackUpgradeClicked'),
+  },
+}));
+
+jest.mock('hooks', () => ({
+  reduxHooks: {
+    useCardCourseRunData: jest.fn(),
+    useTrackCourseEvent: jest.fn(
+      (eventName, cardId, upgradeUrl) => ({ trackCourseEvent: { eventName, cardId, upgradeUrl } }),
+    ),
+  },
+}));
+jest.mock('../hooks', () => jest.fn(() => ({ disableUpgradeCourse: false })));
+jest.mock('./ActionButton', () => 'ActionButton');
+
+describe('UpgradeButton', () => {
+  const props = {
+    cardId: 'cardId',
+  };
+  const upgradeUrl = 'upgradeUrl';
+  reduxHooks.useCardCourseRunData.mockReturnValue({ upgradeUrl });
+  describe('snapshot', () => {
+    test('can upgrade', () => {
+      const wrapper = shallow(<UpgradeButton {...props} />);
+      expect(wrapper.snapshot).toMatchSnapshot();
+      expect(wrapper.instance.props.disabled).toEqual(false);
+      expect(wrapper.instance.props.onClick).toEqual(reduxHooks.useTrackCourseEvent(
+        track.course.upgradeClicked,
+        props.cardId,
+        upgradeUrl,
+      ));
+    });
+    test('cannot upgrade', () => {
+      useActionDisabledState.mockReturnValueOnce({ disableUpgradeCourse: true });
+      const wrapper = shallow(<UpgradeButton {...props} />);
+      expect(wrapper.snapshot).toMatchSnapshot();
+      expect(wrapper.instance.props.disabled).toEqual(true);
+    });
+  });
+});

src/containers/CourseCard/components/CourseCardActions/ViewCourseButton.test.jsx

@@ -15,7 +15,7 @@ jest.mock('hooks', () => ({
   reduxHooks: {
     useCardCourseRunData: jest.fn(() => ({ homeUrl: 'homeUrl' })),
     useTrackCourseEvent: jest.fn(
-      (eventName, cardId, url) => ({ trackCourseEvent: { eventName, cardId, url } }),
+      (eventName, cardId, upgradeUrl) => ({ trackCourseEvent: { eventName, cardId, upgradeUrl } }),
     ),
   },
 }));

src/containers/CourseCard/components/CourseCardActions/__snapshots__/BeginCourseButton.test.jsx.snap

@@ -10,7 +10,7 @@ exports[`BeginCourseButton snapshot disabled snapshot 1`] = `
       "trackCourseEvent": {
         "cardId": "cardId",
         "eventName": [MockFunction segment.enterCourseClicked],
-        "url": "home-urlexec-ed-tracking-path=cardId",
+        "upgradeUrl": "home-urlexec-ed-tracking-path=cardId",
       },
     }
   }
@@ -29,7 +29,7 @@ exports[`BeginCourseButton snapshot enabled snapshot 1`] = `
       "trackCourseEvent": {
         "cardId": "cardId",
         "eventName": [MockFunction segment.enterCourseClicked],
-        "url": "home-urlexec-ed-tracking-path=cardId",
+        "upgradeUrl": "home-urlexec-ed-tracking-path=cardId",
       },
     }
   }

src/containers/CourseCard/components/CourseCardActions/__snapshots__/ResumeButton.test.jsx.snap

@@ -10,7 +10,7 @@ exports[`ResumeButton snapshot disabled snapshot 1`] = `
       "trackCourseEvent": {
         "cardId": "cardId",
         "eventName": [MockFunction segment.enterCourseClicked],
-        "url": "resume-urlexec-ed-tracking-path=cardId",
+        "upgradeUrl": "resume-urlexec-ed-tracking-path=cardId",
       },
     }
   }
@@ -29,7 +29,7 @@ exports[`ResumeButton snapshot enabled snapshot 1`] = `
       "trackCourseEvent": {
         "cardId": "cardId",
         "eventName": [MockFunction segment.enterCourseClicked],
-        "url": "resume-urlexec-ed-tracking-path=cardId",
+        "upgradeUrl": "resume-urlexec-ed-tracking-path=cardId",
       },
     }
   }

src/containers/CourseCard/components/CourseCardActions/__snapshots__/UpgradeButton.test.jsx.snap

@@ -0,0 +1,32 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`UpgradeButton snapshot can upgrade 1`] = `
+<ActionButton
+  as="a"
+  disabled={false}
+  href="upgradeUrl"
+  iconBefore={[MockFunction icons.Locked]}
+  onClick={
+    {
+      "trackCourseEvent": {
+        "cardId": "cardId",
+        "eventName": [MockFunction segment.trackUpgradeClicked],
+        "upgradeUrl": "upgradeUrl",
+      },
+    }
+  }
+  variant="outline-primary"
+>
+  Upgrade
+</ActionButton>
+`;
+
+exports[`UpgradeButton snapshot cannot upgrade 1`] = `
+<ActionButton
+  disabled={true}
+  iconBefore={[MockFunction icons.Locked]}
+  variant="outline-primary"
+>
+  Upgrade
+</ActionButton>
+`;

src/containers/CourseCard/components/CourseCardActions/__snapshots__/ViewCourseButton.test.jsx.snap

@@ -10,7 +10,7 @@ exports[`ViewCourseButton learner can view course 1`] = `
       "trackCourseEvent": {
         "cardId": "cardId",
         "eventName": [MockFunction segment.enterCourseClicked],
-        "url": "homeUrl",
+        "upgradeUrl": "homeUrl",
       },
     }
   }
@@ -29,7 +29,7 @@ exports[`ViewCourseButton learner cannot view course 1`] = `
       "trackCourseEvent": {
         "cardId": "cardId",
         "eventName": [MockFunction segment.enterCourseClicked],
-        "url": "homeUrl",
+        "upgradeUrl": "homeUrl",
       },
     }
   }

src/containers/CourseCard/components/CourseCardActions/index.test.jsx

@@ -3,6 +3,7 @@ import { shallow } from '@edx/react-unit-test-utils';
 import { reduxHooks } from 'hooks';
 
 import CourseCardActionSlot from 'plugin-slots/CourseCardActionSlot';
+import UpgradeButton from './UpgradeButton';
 import SelectSessionButton from './SelectSessionButton';
 import BeginCourseButton from './BeginCourseButton';
 import ResumeButton from './ResumeButton';
@@ -20,6 +21,7 @@ jest.mock('hooks', () => ({
 }));
 
 jest.mock('plugin-slots/CourseCardActionSlot', () => 'CustomActionButton');
+jest.mock('./UpgradeButton', () => 'UpgradeButton');
 jest.mock('./SelectSessionButton', () => 'SelectSessionButton');
 jest.mock('./ViewCourseButton', () => 'ViewCourseButton');
 jest.mock('./BeginCourseButton', () => 'BeginCourseButton');
@@ -57,7 +59,19 @@ describe('CourseCardActions', () => {
     });
   });
   describe('output', () => {
+    describe('Exec Ed course', () => {
+      it('does not render upgrade button', () => {
+        mockHooks({ isExecEd2UCourse: true });
+        render();
+        expect(el.instance.findByType(UpgradeButton).length).toEqual(0);
+      });
+    });
     describe('entitlement course', () => {
+      it('does not render upgrade button', () => {
+        mockHooks({ isEntitlement: true });
+        render();
+        expect(el.instance.findByType(UpgradeButton).length).toEqual(0);
+      });
       it('renders ViewCourseButton if fulfilled', () => {
         mockHooks({ isEntitlement: true, isFulfilled: true });
         render();
@@ -69,15 +83,22 @@ describe('CourseCardActions', () => {
         expect(el.instance.findByType(SelectSessionButton)[0].props.cardId).toEqual(cardId);
       });
     });
+    describe('verified course', () => {
+      it('does not render upgrade button', () => {
+        mockHooks({ isVerified: true });
+        render();
+        expect(el.instance.findByType(UpgradeButton).length).toEqual(0);
+      });
+    });
     describe('not entitlement, verified, or exec ed', () => {
-      it('renders CourseCardActionSlot and ViewCourseButton for archived courses', () => {
+      it('renders UpgradeButton and ViewCourseButton for archived courses', () => {
         mockHooks({ isArchived: true });
         render();
         expect(el.instance.findByType(CourseCardActionSlot)[0].props.cardId).toEqual(cardId);
         expect(el.instance.findByType(ViewCourseButton)[0].props.cardId).toEqual(cardId);
       });
       describe('unstarted courses', () => {
-        it('renders CourseCardActionSlot and BeginCourseButton', () => {
+        it('renders UpgradeButton and BeginCourseButton', () => {
           mockHooks();
           render();
           expect(el.instance.findByType(CourseCardActionSlot)[0].props.cardId).toEqual(cardId);
@@ -85,7 +106,7 @@ describe('CourseCardActions', () => {
         });
       });
       describe('active courses (started, and not archived)', () => {
-        it('renders CourseCardActionSlot and ResumeButton', () => {
+        it('renders UpgradeButton and ResumeButton', () => {
           mockHooks({ hasStarted: true });
           render();
           expect(el.instance.findByType(CourseCardActionSlot)[0].props.cardId).toEqual(cardId);

src/containers/CourseCard/components/CourseCardActions/messages.js

@@ -1,6 +1,11 @@
 import { defineMessages } from '@edx/frontend-platform/i18n';
 
 const messages = defineMessages({
+  upgrade: {
+    id: 'learner-dash.courseCard.actions.upgrade',
+    description: 'Course card upgrade button text',
+    defaultMessage: 'Upgrade',
+  },
   beginCourse: {
     id: 'learner-dash.courseCard.actions.beginCourse',
     description: 'Course card begin-course button text',

src/containers/CourseCard/components/CourseCardBanners/CourseBanner.jsx

@@ -12,6 +12,7 @@ export const CourseBanner = ({ cardId }) => {
   const {
     isVerified,
     isAuditAccessExpired,
+    canUpgrade,
     coursewareAccess = {},
   } = reduxHooks.useCardEnrollmentData(cardId);
   const courseRun = reduxHooks.useCardCourseRunData(cardId);
@@ -25,7 +26,13 @@ export const CourseBanner = ({ cardId }) => {
   return (
     <>
       {isAuditAccessExpired
-        && (
+        && (canUpgrade ? (
+          <Banner>
+            {formatMessage(messages.auditAccessExpired)}
+            {'  '}
+            {formatMessage(messages.upgradeToAccess)}
+          </Banner>
+        ) : (
           <Banner>
             {formatMessage(messages.auditAccessExpired)}
             {'  '}
@@ -33,7 +40,17 @@ export const CourseBanner = ({ cardId }) => {
               {formatMessage(messages.findAnotherCourse)}
             </Hyperlink>
           </Banner>
-        )}
+        ))}
+
+      {courseRun.isActive && !canUpgrade && (
+        <Banner>
+          {formatMessage(messages.upgradeDeadlinePassed)}
+          {'  '}
+          <Hyperlink isInline destination={courseRun.marketingUrl || ''}>
+            {formatMessage(messages.exploreCourseDetails)}
+          </Hyperlink>
+        </Banner>
+      )}
 
       {(!isStaff && isTooEarly && courseRun.startDate) && (
         <Banner>
@@ -42,7 +59,6 @@ export const CourseBanner = ({ cardId }) => {
           })}
         </Banner>
       )}
-
       {(!isStaff && hasUnmetPrerequisites) && (
         <Banner>{formatMessage(messages.prerequisitesNotMet)}</Banner>
       )}

src/containers/CourseCard/components/CourseCardBanners/CourseBanner.test.jsx

@@ -25,6 +25,7 @@ let el;
 
 const enrollmentData = {
   isVerified: false,
+  canUpgrade: false,
   isAuditAccessExpired: false,
   coursewareAccess: {
     hasUnmetPrerequisites: false,
@@ -64,18 +65,51 @@ describe('CourseBanner', () => {
     render({ enrollment: { isVerified: true } });
     expect(el.isEmptyRender()).toEqual(true);
   });
-  describe('audit access expired', () => {
+  describe('audit access expired, can upgrade', () => {
+    beforeEach(() => {
+      render({ enrollment: { isAuditAccessExpired: true, canUpgrade: true } });
+    });
+    test('snapshot: (auditAccessExpired, upgradeToAccess)', () => {
+      expect(el.snapshot).toMatchSnapshot();
+    });
+    test('messages: (auditAccessExpired, upgradeToAccess)', () => {
+      expect(el.instance.children[0].children[0].el).toContain(messages.auditAccessExpired.defaultMessage);
+      expect(el.instance.children[0].children[2].el).toContain(messages.upgradeToAccess.defaultMessage);
+    });
+  });
+  describe('audit access expired, cannot upgrade', () => {
     beforeEach(() => {
       render({ enrollment: { isAuditAccessExpired: true } });
     });
     test('snapshot: (auditAccessExpired, findAnotherCourse hyperlink)', () => {
       expect(el.snapshot).toMatchSnapshot();
     });
-    test('messages: auditAccessExpired', () => {
+    test('messages: (auditAccessExpired, upgradeToAccess)', () => {
       expect(el.instance.children[0].children[0].el).toContain(messages.auditAccessExpired.defaultMessage);
       expect(el.instance.findByType(Hyperlink)[0].children[0].el).toEqual(messages.findAnotherCourse.defaultMessage);
     });
   });
+  describe('course run active and cannot upgrade', () => {
+    beforeEach(() => {
+      render({ courseRun: { isActive: true } });
+    });
+    test('snapshot: (upgradseDeadlinePassed, exploreCourseDetails hyperlink)', () => {
+      expect(el.snapshot).toMatchSnapshot();
+    });
+    test('messages: (upgradseDeadlinePassed, exploreCourseDetails hyperlink)', () => {
+      expect(el.instance.children[0].children[0].el).toContain(messages.upgradeDeadlinePassed.defaultMessage);
+      const link = el.instance.findByType(Hyperlink);
+      expect(link[0].children[0].el).toEqual(messages.exploreCourseDetails.defaultMessage);
+      expect(link[0].props.destination).toEqual(courseRunData.marketingUrl);
+    });
+  });
+  test('no display if audit access not expired and (course is not active or can upgrade)', () => {
+    render();
+    // isEmptyRender() isn't true because the minimal is <Fragment />
+    expect(el.instance.children).toEqual([]);
+    render({ enrollment: { canUpgrade: true }, courseRun: { isActive: true } });
+    expect(el.instance.children).toEqual([]);
+  });
   describe('unmet prerequisites', () => {
     beforeEach(() => {
       render({ enrollment: { coursewareAccess: { hasUnmetPrerequisites: true } } });

src/containers/CourseCard/components/CourseCardBanners/__snapshots__/CourseBanner.test.jsx.snap

@@ -1,6 +1,16 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`CourseBanner audit access expired snapshot: (auditAccessExpired, findAnotherCourse hyperlink) 1`] = `
+exports[`CourseBanner audit access expired, can upgrade snapshot: (auditAccessExpired, upgradeToAccess) 1`] = `
+<Fragment>
+  <Banner>
+    Your audit access to this course has expired.
+      
+    Upgrade now to access your course again.
+  </Banner>
+</Fragment>
+`;
+
+exports[`CourseBanner audit access expired, cannot upgrade snapshot: (auditAccessExpired, findAnotherCourse hyperlink) 1`] = `
 <Fragment>
   <Banner>
     Your audit access to this course has expired.
@@ -15,6 +25,21 @@ exports[`CourseBanner audit access expired snapshot: (auditAccessExpired, findAn
 </Fragment>
 `;
 
+exports[`CourseBanner course run active and cannot upgrade snapshot: (upgradseDeadlinePassed, exploreCourseDetails hyperlink) 1`] = `
+<Fragment>
+  <Banner>
+    Your upgrade deadline for this course has passed.  To upgrade, enroll in a session that is farther in the future.
+      
+    <Hyperlink
+      destination="marketing-url"
+      isInline={true}
+    >
+      Explore course details.
+    </Hyperlink>
+  </Banner>
+</Fragment>
+`;
+
 exports[`CourseBanner snapshot: stacking banners 1`] = `<Fragment />`;
 
 exports[`CourseBanner staff snapshot: isStaff 1`] = `<Fragment />`;

src/containers/CourseCard/components/CourseCardBanners/__snapshots__/index.test.jsx.snap

@@ -8,7 +8,7 @@ exports[`CourseCardBanners render with isEnrolled false 1`] = `
   <RelatedProgramsBanner
     cardId="test-card-id"
   />
-  <CourseBannerSlot
+  <CourseBanner
     cardId="test-card-id"
   />
   <EntitlementBanner
@@ -25,7 +25,7 @@ exports[`CourseCardBanners renders default CourseCardBanners 1`] = `
   <RelatedProgramsBanner
     cardId="test-card-id"
   />
-  <CourseBannerSlot
+  <CourseBanner
     cardId="test-card-id"
   />
   <EntitlementBanner

src/containers/CourseCard/components/CourseCardBanners/index.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 
 import { reduxHooks } from 'hooks';
 
-import CourseBannerSlot from 'plugin-slots/CourseBannerSlot';
+import CourseBanner from './CourseBanner';
 import CertificateBanner from './CertificateBanner';
 import CreditBanner from './CreditBanner';
 import EntitlementBanner from './EntitlementBanner';
@@ -14,7 +14,7 @@ export const CourseCardBanners = ({ cardId }) => {
   return (
     <div className="course-card-banners" data-testid="CourseCardBanners">
       <RelatedProgramsBanner cardId={cardId} />
-      <CourseBannerSlot cardId={cardId} />
+      <CourseBanner cardId={cardId} />
       <EntitlementBanner cardId={cardId} />
       {isEnrolled && <CertificateBanner cardId={cardId} />}
       {isEnrolled && <CreditBanner cardId={cardId} />}

src/containers/CourseCard/components/CourseCardBanners/messages.js

@@ -6,11 +6,26 @@ const messages = defineMessages({
     description: 'Audit access expiration banner message',
     defaultMessage: 'Your audit access to this course has expired.',
   },
+  upgradeToAccess: {
+    id: 'learner-dash.courseCard.banners.upgradeToAccess',
+    description: 'Upgrade prompt for audit-expired learners that can still upgrade',
+    defaultMessage: 'Upgrade now to access your course again.',
+  },
   findAnotherCourse: {
     id: 'learner-dash.courseCard.banners.findAnotherCourse',
     description: 'Action prompt taking learners to course exploration',
     defaultMessage: 'Find another course',
   },
+  upgradeDeadlinePassed: {
+    id: 'learner-dash.courseCard.banners.upgradeDeadlinePassed',
+    description: 'Audit upgrade deadline passed banner message',
+    defaultMessage: 'Your upgrade deadline for this course has passed.  To upgrade, enroll in a session that is farther in the future.',
+  },
+  exploreCourseDetails: {
+    id: 'learner-dash.courseCard.banners.exploreCourseDetails',
+    description: 'Action prompt taking learners to course details page',
+    defaultMessage: 'Explore course details.',
+  },
   certRestricted: {
     id: 'learner-dash.courseCard.banners.certificateRestricted',
     description: 'Restricted certificate warning message',

src/containers/CourseCard/components/CourseCardDetails/hooks.js

@@ -10,8 +10,8 @@ export const useAccessMessage = ({ cardId }) => {
   const courseRun = reduxHooks.useCardCourseRunData(cardId);
   const formatDate = utilHooks.useFormatDate();
   if (!courseRun.isStarted) {
-    if (!courseRun.startDate && !courseRun.advertisedStart) { return null; }
-    const startDate = courseRun.advertisedStart ? courseRun.advertisedStart : formatDate(courseRun.startDate);
+    if (!courseRun.startDate) { return null; }
+    const startDate = formatDate(courseRun.startDate);
     return formatMessage(messages.courseStarts, { startDate });
   }
   if (enrollment.isEnrolled) {

src/containers/CourseCard/components/CourseCardImage.jsx

@@ -20,13 +20,11 @@ export const CourseCardImage = ({ cardId, orientation }) => {
   const { isVerified } = reduxHooks.useCardEnrollmentData(cardId);
   const { disableCourseTitle } = useActionDisabledState(cardId);
   const handleImageClicked = reduxHooks.useTrackCourseEvent(courseImageClicked, cardId, homeUrl);
-  const wrapperClassName = `pgn__card-wrapper-image-cap d-inline-block overflow-visible ${orientation}`;
+  const wrapperClassName = `pgn__card-wrapper-image-cap overflow-visible ${orientation}`;
   const image = (
     <>
       <img
-        // w-100 is necessary for images on Safari, otherwise stretches full height of the image
-        // https://stackoverflow.com/a/44250830
-        className="pgn__card-image-cap w-100 show"
+        className="pgn__card-image-cap show"
         src={bannerImgSrc}
         alt={formatMessage(messages.bannerAlt)}
       />

src/containers/CourseCard/components/CourseCardImage.test.jsx

@@ -18,8 +18,8 @@ jest.mock('hooks', () => ({
     useCardCourseData: jest.fn(() => ({ bannerImgSrc: 'banner-img-src' })),
     useCardCourseRunData: jest.fn(() => ({ homeUrl })),
     useCardEnrollmentData: jest.fn(() => ({ isVerified: true })),
-    useTrackCourseEvent: jest.fn((eventName, cardId, url) => ({
-      trackCourseEvent: { eventName, cardId, url },
+    useTrackCourseEvent: jest.fn((eventName, cardId, upgradeUrl) => ({
+      trackCourseEvent: { eventName, cardId, upgradeUrl },
     })),
   },
 }));

src/containers/CourseCard/components/CourseCardTitle.test.jsx

@@ -17,8 +17,8 @@ jest.mock('hooks', () => ({
   reduxHooks: {
     useCardCourseData: jest.fn(() => ({ courseName: 'course-name' })),
     useCardCourseRunData: jest.fn(() => ({ homeUrl })),
-    useTrackCourseEvent: jest.fn((eventName, cardId, url) => ({
-      trackCourseEvent: { eventName, cardId, url },
+    useTrackCourseEvent: jest.fn((eventName, cardId, upgradeUrl) => ({
+      trackCourseEvent: { eventName, cardId, upgradeUrl },
     })),
   },
 }));

src/containers/CourseCard/components/__snapshots__/CourseCardImage.test.jsx.snap

@@ -2,14 +2,14 @@
 
 exports[`CourseCardImage snapshot renders clickable link course Image 1`] = `
 <a
-  className="pgn__card-wrapper-image-cap d-inline-block overflow-visible orientation"
+  className="pgn__card-wrapper-image-cap overflow-visible orientation"
   href="home-url"
   onClick={
     {
       "trackCourseEvent": {
         "cardId": "cardId",
         "eventName": [MockFunction segment.courseImageClicked],
-        "url": "home-url",
+        "upgradeUrl": "home-url",
       },
     }
   }
@@ -18,7 +18,7 @@ exports[`CourseCardImage snapshot renders clickable link course Image 1`] = `
   <Fragment>
     <img
       alt="Course thumbnail"
-      className="pgn__card-image-cap w-100 show"
+      className="pgn__card-image-cap show"
       src="banner-img-src"
     />
     <span
@@ -43,12 +43,12 @@ exports[`CourseCardImage snapshot renders clickable link course Image 1`] = `
 
 exports[`CourseCardImage snapshot renders disabled link 1`] = `
 <div
-  className="pgn__card-wrapper-image-cap d-inline-block overflow-visible orientation"
+  className="pgn__card-wrapper-image-cap overflow-visible orientation"
 >
   <Fragment>
     <img
       alt="Course thumbnail"
-      className="pgn__card-image-cap w-100 show"
+      className="pgn__card-image-cap show"
       src="banner-img-src"
     />
     <span

src/containers/CourseCard/components/__snapshots__/CourseCardTitle.test.jsx.snap

@@ -11,7 +11,7 @@ exports[`CourseCardTitle snapshot renders clickable link course title 1`] = `
         "trackCourseEvent": {
           "cardId": "cardId",
           "eventName": [MockFunction segment.courseTitleClicked],
-          "url": "home-url",
+          "upgradeUrl": "home-url",
         },
       }
     }

src/containers/CourseCard/components/hooks.js

@@ -3,18 +3,19 @@ import { reduxHooks } from 'hooks';
 export const useActionDisabledState = (cardId) => {
   const { isMasquerading } = reduxHooks.useMasqueradeData();
   const {
-    hasAccess, isAudit, isAuditAccessExpired,
+    canUpgrade, hasAccess, isAudit, isAuditAccessExpired,
   } = reduxHooks.useCardEnrollmentData(cardId);
   const {
     isEntitlement, isFulfilled, canChange, hasSessions,
   } = reduxHooks.useCardEntitlementData(cardId);
 
-  const { resumeUrl, homeUrl } = reduxHooks.useCardCourseRunData(cardId);
+  const { resumeUrl, homeUrl, upgradeUrl } = reduxHooks.useCardCourseRunData(cardId);
 
   const disableBeginCourse = !homeUrl || (isMasquerading || !hasAccess || (isAudit && isAuditAccessExpired));
   const disableResumeCourse = !resumeUrl || (isMasquerading || !hasAccess || (isAudit && isAuditAccessExpired));
   const disableViewCourse = !hasAccess || (isAudit && isAuditAccessExpired);
   const disableSelectSession = !isEntitlement || isMasquerading || !hasAccess || (!canChange || !hasSessions);
+  const disableUpgradeCourse = !upgradeUrl || (isMasquerading && !canUpgrade);
 
   const disableCourseTitle = (isEntitlement && !isFulfilled) || disableViewCourse;
 
@@ -22,6 +23,7 @@ export const useActionDisabledState = (cardId) => {
     disableBeginCourse,
     disableResumeCourse,
     disableViewCourse,
+    disableUpgradeCourse,
     disableSelectSession,
     disableCourseTitle,
   };

src/containers/CourseCard/components/hooks.test.js

@@ -16,6 +16,7 @@ const cardId = 'my-test-course-number';
 describe('useActionDisabledState', () => {
   const defaultData = {
     isMasquerading: false,
+    canUpgrade: false,
     isEntitlement: false,
     isFulfilled: false,
     canChange: false,
@@ -25,10 +26,12 @@ describe('useActionDisabledState', () => {
     isAuditAccessExpired: false,
     resumeUrl: 'resume.url',
     homeUrl: 'home.url',
+    upgradeUrl: 'upgrade.url',
   };
   const mockHooksData = (args) => {
     const {
       isMasquerading,
+      canUpgrade,
       isEntitlement,
       isFulfilled,
       canChange,
@@ -38,9 +41,11 @@ describe('useActionDisabledState', () => {
       isAuditAccessExpired,
       resumeUrl,
       homeUrl,
+      upgradeUrl,
     } = { ...defaultData, ...args };
     reduxHooks.useMasqueradeData.mockReturnValueOnce({ isMasquerading });
     reduxHooks.useCardEnrollmentData.mockReturnValueOnce({
+      canUpgrade,
       hasAccess,
       isAudit,
       isAuditAccessExpired,
@@ -54,6 +59,7 @@ describe('useActionDisabledState', () => {
     reduxHooks.useCardCourseRunData.mockReturnValueOnce({
       resumeUrl,
       homeUrl,
+      upgradeUrl,
     });
   };
 
@@ -115,6 +121,21 @@ describe('useActionDisabledState', () => {
       testDisabled({ hasAccess: true }, false);
     });
   });
+  describe('disableUpgradeCourse', () => {
+    const testDisabled = (data, expected) => {
+      mockHooksData(data);
+      expect(runHook().disableUpgradeCourse).toBe(expected);
+    };
+    it('disable when upgradeUrl is invalid', () => {
+      testDisabled({ upgradeUrl: null }, true);
+    });
+    it('disable when isMasquerading is true and canUpgrade is false', () => {
+      testDisabled({ isMasquerading: true, canUpgrade: false }, true);
+    });
+    it('enable when all conditions are met', () => {
+      testDisabled({ canUpgrade: true }, false);
+    });
+  });
   describe('disableSelectSession', () => {
     const testDisabled = (data, expected) => {
       mockHooksData(data);

src/containers/CoursesPanel/NoCoursesView/__snapshots__/index.test.jsx.snap

@@ -9,11 +9,9 @@ exports[`NoCoursesView snapshot 1`] = `
     alt="No Courses view banner"
     src="icon/mock/path"
   />
-  <h3
-    className="h1"
-  >
+  <h1>
     Looking for a new challenge?
-  </h3>
+  </h1>
   <p>
     Explore our courses to add them to your dashboard.
   </p>

src/containers/CoursesPanel/NoCoursesView/index.jsx

@@ -19,9 +19,9 @@ export const NoCoursesView = () => {
       className="d-flex align-items-center justify-content-center mb-4.5"
     >
       <Image src={emptyCourseSVG} alt={formatMessage(messages.bannerAlt)} />
-      <h3 className="h1">
+      <h1>
         {formatMessage(messages.lookingForChallengePrompt)}
-      </h3>
+      </h1>
       <p>
         {formatMessage(messages.exploreCoursesPrompt)}
       </p>

src/containers/CoursesPanel/hooks.js

@@ -1,5 +1,7 @@
 import React from 'react';
 
+import queryString from 'query-string';
+
 import { ListPageSize, SortKeys } from 'data/constants/app';
 import { reduxHooks } from 'hooks';
 import { StrictDict } from 'utils';
@@ -25,13 +27,12 @@ export const useCourseListData = () => {
 
   const [sortBy, setSortBy] = module.state.sortBy(SortKeys.enrolled);
 
-  const querySearch = new URLSearchParams(window.location.search);
-  const disablePagination = querySearch.get('disable_pagination');
+  const querySearch = queryString.parse(window.location.search, { parseNumbers: true });
 
   const { numPages, visibleList } = reduxHooks.useCurrentCourseList({
     sortBy,
     filters,
-    pageSize: Number(disablePagination) === 1 ? 0 : ListPageSize,
+    pageSize: querySearch?.disable_pagination === 1 ? 0 : ListPageSize,
   });
 
   const handleRemoveFilter = (filter) => () => removeFilter(filter);

src/containers/CoursesPanel/hooks.test.js

@@ -1,3 +1,5 @@
+import queryString from 'query-string';
+
 import { MockUseState } from 'testUtils';
 import { reduxHooks } from 'hooks';
 import { ListPageSize, SortKeys } from 'data/constants/app';
@@ -13,10 +15,8 @@ jest.mock('hooks', () => ({
   },
 }));
 
-const mockGet = jest.fn(() => ({}));
-
-global.URLSearchParams = jest.fn().mockImplementation(() => ({
-  get: mockGet,
+jest.mock('query-string', () => ({
+  parse: jest.fn(() => ({})),
 }));
 
 const state = new MockUseState(hooks);
@@ -67,7 +67,7 @@ describe('CourseList hooks', () => {
       it('loads current course list with page size 0 if/when there is query param disable_pagination=1', () => {
         state.mock();
         state.mockVal(state.keys.sortBy, testSortBy);
-        mockGet.mockReturnValueOnce('1');
+        queryString.parse.mockReturnValueOnce({ disable_pagination: 1 });
         out = hooks.useCourseListData();
         expect(reduxHooks.useCurrentCourseList).toHaveBeenCalledWith({
           sortBy: testSortBy,

src/containers/Dashboard/DashboardLayout.jsx

@@ -40,7 +40,8 @@ export const DashboardLayout = ({ children }) => {
         <Col {...courseListColumnProps} className="course-list-column">
           {children}
         </Col>
-        <Col {...columnConfig.sidebar} className={['sidebar-column', !isCollapsed && 'not-collapsed']}>
+        <Col {...columnConfig.sidebar} className="sidebar-column">
+          {!isCollapsed && (<h2 className="course-list-title">&nbsp;</h2>)}
           <WidgetSidebarSlot />
         </Col>
       </Row>

src/containers/Dashboard/DashboardLayout.test.jsx

@@ -84,9 +84,10 @@ describe('DashboardLayout', () => {
 
   describe('not collapsed', () => {
     const testWidgetSpacing = () => {
-      it('shows not-collapsed class on widget sidebar', () => {
+      it('shows a blank (nbsp) h2 spacer component above widget sidebar', () => {
         const columns = el.instance.findByType(Col);
-        expect(columns[1].props.className).toContain('not-collapsed');
+        // nonbreaking space equivalent
+        expect(columns[1].findByType('h2')[0].children[0].el).toEqual('\xA0');
       });
     };
     describe('sidebar showing', () => {

src/containers/Dashboard/__snapshots__/DashboardLayout.test.jsx.snap

@@ -24,12 +24,7 @@ exports[`DashboardLayout collapsed sidebar not showing snapshot 1`] = `
       test-children
     </Col>
     <Col
-      className={
-        [
-          "sidebar-column",
-          false,
-        ]
-      }
+      className="sidebar-column"
       lg={
         {
           "offset": 0,
@@ -73,12 +68,7 @@ exports[`DashboardLayout collapsed sidebar showing snapshot 1`] = `
       test-children
     </Col>
     <Col
-      className={
-        [
-          "sidebar-column",
-          false,
-        ]
-      }
+      className="sidebar-column"
       lg={
         {
           "offset": 0,
@@ -122,12 +112,7 @@ exports[`DashboardLayout not collapsed sidebar not showing snapshot 1`] = `
       test-children
     </Col>
     <Col
-      className={
-        [
-          "sidebar-column",
-          "not-collapsed",
-        ]
-      }
+      className="sidebar-column"
       lg={
         {
           "offset": 0,
@@ -141,6 +126,11 @@ exports[`DashboardLayout not collapsed sidebar not showing snapshot 1`] = `
         }
       }
     >
+      <h2
+        className="course-list-title"
+      >
+         
+      </h2>
       <WidgetSidebarSlot />
     </Col>
   </Row>
@@ -171,12 +161,7 @@ exports[`DashboardLayout not collapsed sidebar showing snapshot 1`] = `
       test-children
     </Col>
     <Col
-      className={
-        [
-          "sidebar-column",
-          "not-collapsed",
-        ]
-      }
+      className="sidebar-column"
       lg={
         {
           "offset": 0,
@@ -190,6 +175,11 @@ exports[`DashboardLayout not collapsed sidebar showing snapshot 1`] = `
         }
       }
     >
+      <h2
+        className="course-list-title"
+      >
+         
+      </h2>
       <WidgetSidebarSlot />
     </Col>
   </Row>

src/containers/Dashboard/__snapshots__/index.test.jsx.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Dashboard snapshots courses loaded, show select session modal snapshot 1`] = `
+exports[`Dashboard snapshots courses loaded, show select session modal, no available dashboards snapshot 1`] = `
 <div
   className="d-flex flex-column p-2 pt-0"
   id="dashboard-container"
@@ -11,7 +11,6 @@ exports[`Dashboard snapshots courses loaded, show select session modal snapshot
     test-page-title
   </h1>
   <Fragment>
-    <DashboardModalSlot />
     <SelectSessionModal />
   </Fragment>
   <div
@@ -44,7 +43,7 @@ exports[`Dashboard snapshots courses still loading snapshot 1`] = `
 </div>
 `;
 
-exports[`Dashboard snapshots there are no courses snapshot 1`] = `
+exports[`Dashboard snapshots there are no courses, there ARE available dashboards snapshot 1`] = `
 <div
   className="d-flex flex-column p-2 pt-0"
   id="dashboard-container"
@@ -55,7 +54,7 @@ exports[`Dashboard snapshots there are no courses snapshot 1`] = `
     test-page-title
   </h1>
   <Fragment>
-    <DashboardModalSlot />
+    <EnterpriseDashboardModal />
   </Fragment>
   <div
     data-testid="dashboard-content"

src/containers/Dashboard/index.jsx

@@ -2,9 +2,9 @@ import React from 'react';
 
 import { reduxHooks } from 'hooks';
 import { RequestKeys } from 'data/constants/requests';
+import EnterpriseDashboardModal from 'containers/EnterpriseDashboardModal';
 import SelectSessionModal from 'containers/SelectSessionModal';
 import CoursesPanel from 'containers/CoursesPanel';
-import DashboardModalSlot from 'plugin-slots/DashboardModalSlot';
 
 import LoadingView from './LoadingView';
 import DashboardLayout from './DashboardLayout';
@@ -15,6 +15,7 @@ export const Dashboard = () => {
   hooks.useInitializeDashboard();
   const { pageTitle } = hooks.useDashboardMessages();
   const hasCourses = reduxHooks.useHasCourses();
+  const hasAvailableDashboards = reduxHooks.useHasAvailableDashboards();
   const initIsPending = reduxHooks.useRequestIsPending(RequestKeys.initialize);
   const showSelectSessionModal = reduxHooks.useShowSelectSessionModal();
 
@@ -23,7 +24,7 @@ export const Dashboard = () => {
       <h1 className="sr-only">{pageTitle}</h1>
       {!initIsPending && (
         <>
-          <DashboardModalSlot />
+          {hasAvailableDashboards && <EnterpriseDashboardModal />}
           {(hasCourses && showSelectSessionModal) && <SelectSessionModal />}
         </>
       )}

src/containers/Dashboard/index.scss

@@ -6,14 +6,6 @@
 
 .sidebar-column {
   padding: 0 map-get($spacers, 3) 0 map-get($spacers, 1);
-
-  &.not-collapsed {
-    padding-top: map-get($spacers, 2);
-
-    & >:first-child {
-      margin-top: map-get($spacers, 5\.5);
-    }
-  }
 }
 
 @include media-breakpoint-down(lg) {

src/containers/Dashboard/index.test.jsx

@@ -2,6 +2,7 @@ import { shallow } from '@edx/react-unit-test-utils';
 
 import { reduxHooks } from 'hooks';
 
+import EnterpriseDashboardModal from 'containers/EnterpriseDashboardModal';
 import SelectSessionModal from 'containers/SelectSessionModal';
 import CoursesPanel from 'containers/CoursesPanel';
 
@@ -13,12 +14,13 @@ import Dashboard from '.';
 jest.mock('hooks', () => ({
   reduxHooks: {
     useHasCourses: jest.fn(),
+    useHasAvailableDashboards: jest.fn(),
     useShowSelectSessionModal: jest.fn(),
     useRequestIsPending: jest.fn(),
   },
 }));
 
-jest.mock('plugin-slots/DashboardModalSlot', () => 'DashboardModalSlot');
+jest.mock('containers/EnterpriseDashboardModal', () => 'EnterpriseDashboardModal');
 jest.mock('containers/CoursesPanel', () => 'CoursesPanel');
 jest.mock('./LoadingView', () => 'LoadingView');
 jest.mock('./DashboardLayout', () => 'DashboardLayout');
@@ -36,10 +38,12 @@ describe('Dashboard', () => {
   });
   const createWrapper = ({
     hasCourses,
+    hasAvailableDashboards,
     initIsPending,
     showSelectSessionModal,
   }) => {
     reduxHooks.useHasCourses.mockReturnValueOnce(hasCourses);
+    reduxHooks.useHasAvailableDashboards.mockReturnValueOnce(hasAvailableDashboards);
     reduxHooks.useRequestIsPending.mockReturnValueOnce(initIsPending);
     reduxHooks.useShowSelectSessionModal.mockReturnValueOnce(showSelectSessionModal);
     return shallow(<Dashboard />);
@@ -67,6 +71,7 @@ describe('Dashboard', () => {
     const testView = ({
       props,
       content: [contentName, contentEl],
+      showEnterpriseModal,
       showSelectSessionModal,
     }) => {
       beforeEach(() => { wrapper = createWrapper(props); });
@@ -75,6 +80,10 @@ describe('Dashboard', () => {
       it(`renders ${contentName}`, () => {
         testContent(contentEl);
       });
+      it(`${renderString(showEnterpriseModal)} dashbaord modal`, () => {
+        expect(wrapper.instance.findByType(EnterpriseDashboardModal).length)
+          .toEqual(showEnterpriseModal ? 1 : 0);
+      });
       it(`${renderString(showSelectSessionModal)} select session modal`, () => {
         expect(wrapper.instance.findByType(SelectSessionModal).length).toEqual(showSelectSessionModal ? 1 : 0);
       });
@@ -83,38 +92,44 @@ describe('Dashboard', () => {
       testView({
         props: {
           hasCourses: false,
+          hasAvailableDashboards: false,
           initIsPending: true,
           showSelectSessionModal: false,
         },
         content: ['LoadingView', <LoadingView />],
+        showEnterpriseModal: false,
         showSelectSessionModal: false,
       });
     });
 
-    describe('courses loaded, show select session modal', () => {
+    describe('courses loaded, show select session modal, no available dashboards', () => {
       testView({
         props: {
           hasCourses: true,
+          hasAvailableDashboards: false,
           initIsPending: false,
           showSelectSessionModal: true,
         },
         content: ['LoadedView', (
           <DashboardLayout><CoursesPanel /></DashboardLayout>
         )],
+        showEnterpriseModal: false,
         showSelectSessionModal: true,
       });
     });
 
-    describe('there are no courses', () => {
+    describe('there are no courses, there ARE available dashboards', () => {
       testView({
         props: {
           hasCourses: false,
+          hasAvailableDashboards: true,
           initIsPending: false,
           showSelectSessionModal: false,
         },
         content: ['Dashboard layout with no courses sidebar and content', (
           <DashboardLayout><CoursesPanel /></DashboardLayout>
         )],
+        showEnterpriseModal: true,
         showSelectSessionModal: false,
       });
     });

src/containers/EnterpriseDashboardModal/__snapshots__/index.test.jsx.snap

@@ -0,0 +1,42 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EnterpriseDashboard empty snapshot 1`] = `null`;
+
+exports[`EnterpriseDashboard snapshot 1`] = `
+<ModalDialog
+  hasCloseButton={false}
+  onClose={[MockFunction useEnterpriseDashboardHook.handleEscape]}
+  title=""
+>
+  <div
+    className="bg-white p-3 rounded shadow"
+    style={
+      {
+        "textAlign": "start",
+      }
+    }
+  >
+    <h4>
+      You have access to the edX, Inc. dashboard
+    </h4>
+    <p>
+      To access the courses available to you through edX, Inc., visit the edX, Inc. dashboard now.
+    </p>
+    <ActionRow>
+      <Button
+        onClick={[MockFunction useEnterpriseDashboardHook.handleClose]}
+        variant="tertiary"
+      >
+        Dismiss
+      </Button>
+      <Button
+        href="/edx-dashboard"
+        onClick={[MockFunction useEnterpriseDashboardHook.handleCTAClick]}
+        type="a"
+      >
+        Go to dashboard
+      </Button>
+    </ActionRow>
+  </div>
+</ModalDialog>
+`;

src/containers/EnterpriseDashboardModal/hooks.js

@@ -0,0 +1,48 @@
+import React from 'react';
+
+import { StrictDict } from 'utils';
+import track from 'tracking';
+import { reduxHooks } from 'hooks';
+
+import * as module from './hooks';
+
+export const state = StrictDict({
+  showModal: (val) => React.useState(val), // eslint-disable-line
+});
+
+const { modalOpened, modalClosed, modalCTAClicked } = track.enterpriseDashboard;
+
+export const useEnterpriseDashboardHook = () => {
+  const [showModal, setShowModal] = module.state.showModal(true);
+  const dashboard = reduxHooks.useEnterpriseDashboardData();
+
+  const trackOpened = modalOpened(dashboard.enterpriseUUID);
+  const trackClose = modalClosed(dashboard.enterpriseUUID, 'Cancel button');
+  const trackEscape = modalClosed(dashboard.enterpriseUUID, 'Escape');
+
+  const handleCTAClick = modalCTAClicked(dashboard.enterpriseUUID, dashboard.url);
+  const handleClose = () => {
+    trackClose();
+    setShowModal(false);
+  };
+  const handleEscape = () => {
+    trackEscape();
+    setShowModal(false);
+  };
+
+  React.useEffect(() => {
+    if (dashboard && dashboard.label) {
+      trackOpened();
+    }
+  }, []); // eslint-disable-line
+
+  return {
+    showModal,
+    handleCTAClick,
+    handleClose,
+    handleEscape,
+    dashboard,
+  };
+};
+
+export default useEnterpriseDashboardHook;

src/containers/EnterpriseDashboardModal/hooks.test.js

@@ -0,0 +1,75 @@
+import { MockUseState } from 'testUtils';
+import { reduxHooks } from 'hooks';
+import track from 'tracking';
+
+import * as hooks from './hooks';
+
+jest.mock('hooks', () => ({
+  reduxHooks: {
+    useEnterpriseDashboardData: jest.fn(),
+  },
+}));
+jest.mock('tracking', () => {
+  const modalOpenedEvent = jest.fn();
+  const modalClosedEvent = jest.fn();
+  const modalCTAClickedEvent = jest.fn();
+  return {
+    __esModule: true,
+    default: {
+      enterpriseDashboard: {
+        modalOpenedEvent,
+        modalClosedEvent,
+        modalCTAClickedEvent,
+        modalOpened: jest.fn(() => modalOpenedEvent),
+        modalClosed: jest.fn(() => modalClosedEvent),
+        modalCTAClicked: jest.fn(() => modalCTAClickedEvent),
+      },
+    },
+  };
+});
+
+const state = new MockUseState(hooks);
+
+const enterpriseDashboardData = { label: 'edX, Inc.', url: '/edx-dashboard' };
+
+describe('EnterpriseDashboard hooks', () => {
+  reduxHooks.useEnterpriseDashboardData.mockReturnValue({ ...enterpriseDashboardData });
+
+  describe('state values', () => {
+    state.testGetter(state.keys.showModal);
+  });
+
+  describe('behavior', () => {
+    let out;
+
+    beforeEach(() => {
+      state.mock();
+      out = hooks.useEnterpriseDashboardHook();
+    });
+    afterEach(state.restore);
+
+    test('useEnterpriseDashboardHook to return dashboard data from redux hooks', () => {
+      expect(out.dashboard).toMatchObject(enterpriseDashboardData);
+    });
+
+    test('modal initializes to shown when rendered and closes on click', () => {
+      state.expectInitializedWith(state.keys.showModal, true);
+      out.handleClose();
+      expect(state.values.showModal).toEqual(false);
+    });
+
+    test('modal initializes to shown when rendered and closes on escape', () => {
+      state.expectInitializedWith(state.keys.showModal, true);
+      out.handleEscape();
+      expect(state.values.showModal).toEqual(false);
+    });
+
+    test('CTA click tracks modalCTAClicked', () => {
+      out.handleCTAClick();
+      expect(track.enterpriseDashboard.modalCTAClicked).toHaveBeenCalledWith(
+        enterpriseDashboardData.enterpriseUUID,
+        enterpriseDashboardData.url,
+      );
+    });
+  });
+});

src/containers/EnterpriseDashboardModal/index.jsx

@@ -0,0 +1,60 @@
+import React from 'react';
+// import PropTypes from 'prop-types';
+
+import { useIntl } from '@edx/frontend-platform/i18n';
+import {
+  ModalDialog, ActionRow, Button,
+} from '@openedx/paragon';
+
+import messages from './messages';
+import useEnterpriseDashboardHook from './hooks';
+
+export const EnterpriseDashboardModal = () => {
+  const { formatMessage } = useIntl();
+  const {
+    showModal,
+    handleClose,
+    handleCTAClick,
+    handleEscape,
+    dashboard,
+  } = useEnterpriseDashboardHook();
+  if (!dashboard || !dashboard.label) {
+    return null;
+  }
+  return (
+    <ModalDialog
+      isOpen={showModal}
+      onClose={handleEscape}
+      hasCloseButton={false}
+      title=""
+    >
+      <div
+        className="bg-white p-3 rounded shadow"
+        style={{ textAlign: 'start' }}
+      >
+        <h4>
+          {formatMessage(messages.enterpriseDialogHeader, {
+            label: dashboard.label,
+          })}
+        </h4>
+        <p>
+          {formatMessage(messages.enterpriseDialogBody, {
+            label: dashboard.label,
+          })}
+        </p>
+        <ActionRow>
+          <Button variant="tertiary" onClick={handleClose}>
+            {formatMessage(messages.enterpriseDialogDismissButton)}
+          </Button>
+          <Button type="a" href={dashboard.url} onClick={handleCTAClick}>
+            {formatMessage(messages.enterpriseDialogConfirmButton)}
+          </Button>
+        </ActionRow>
+      </div>
+    </ModalDialog>
+  );
+};
+
+EnterpriseDashboardModal.propTypes = {};
+
+export default EnterpriseDashboardModal;

src/containers/EnterpriseDashboardModal/index.test.jsx

@@ -0,0 +1,29 @@
+import { shallow } from '@edx/react-unit-test-utils';
+import EnterpriseDashboard from '.';
+
+import useEnterpriseDashboardHook from './hooks';
+
+jest.mock('./hooks', () => ({
+  __esModule: true,
+  default: jest.fn(),
+}));
+
+describe('EnterpriseDashboard', () => {
+  test('snapshot', () => {
+    const hookData = {
+      dashboard: { label: 'edX, Inc.', url: '/edx-dashboard' },
+      showDialog: false,
+      handleClose: jest.fn().mockName('useEnterpriseDashboardHook.handleClose'),
+      handleCTAClick: jest.fn().mockName('useEnterpriseDashboardHook.handleCTAClick'),
+      handleEscape: jest.fn().mockName('useEnterpriseDashboardHook.handleEscape'),
+    };
+    useEnterpriseDashboardHook.mockReturnValueOnce({ ...hookData });
+    const el = shallow(<EnterpriseDashboard />);
+    expect(el.snapshot).toMatchSnapshot();
+  });
+  test('empty snapshot', () => {
+    useEnterpriseDashboardHook.mockReturnValueOnce({});
+    const el = shallow(<EnterpriseDashboard />);
+    expect(el.snapshot).toMatchSnapshot();
+  });
+});

src/containers/EnterpriseDashboardModal/messages.js

@@ -0,0 +1,26 @@
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+  enterpriseDialogHeader: {
+    id: 'leanerDashboard.enterpriseDialogHeader',
+    defaultMessage: 'You have access to the {label} dashboard',
+    description: 'title for enterpise dashboard dialog',
+  },
+  enterpriseDialogBody: {
+    id: 'leanerDashboard.enterpriseDialogBody',
+    defaultMessage: 'To access the courses available to you through {label}, visit the {label} dashboard now.',
+    description: 'Body text for enterpise dashboard dialog',
+  },
+  enterpriseDialogDismissButton: {
+    id: 'leanerDashboard.enterpriseDialogDismissButton',
+    defaultMessage: 'Dismiss',
+    description: 'Dismiss button to cancel visiting dashboard',
+  },
+  enterpriseDialogConfirmButton: {
+    id: 'leanerDashboard.enterpriseDialogConfirmButton',
+    defaultMessage: 'Go to dashboard',
+    description: 'Confirm button to go to the dashboard url',
+  },
+});
+
+export default messages;

src/containers/LearnerDashboardHeader/BrandLogo.jsx

@@ -0,0 +1,27 @@
+import React from 'react';
+
+import { useIntl } from '@edx/frontend-platform/i18n';
+
+import { reduxHooks } from 'hooks';
+
+import { getConfig } from '@edx/frontend-platform';
+import messages from './messages';
+
+export const BrandLogo = () => {
+  const { formatMessage } = useIntl();
+  const dashboard = reduxHooks.useEnterpriseDashboardData();
+
+  return (
+    <a href={dashboard?.url || '/'} className="mx-auto">
+      <img
+        className="logo py-3"
+        src={getConfig().LOGO_URL}
+        alt={formatMessage(messages.logoAltText)}
+      />
+    </a>
+  );
+};
+
+BrandLogo.propTypes = {};
+
+export default BrandLogo;

src/containers/LearnerDashboardHeader/BrandLogo.test.jsx

@@ -0,0 +1,28 @@
+import { shallow } from '@edx/react-unit-test-utils';
+
+import { reduxHooks } from 'hooks';
+import BrandLogo from './BrandLogo';
+
+jest.mock('hooks', () => ({
+  reduxHooks: {
+    useEnterpriseDashboardData: jest.fn(),
+  },
+}));
+
+describe('BrandLogo', () => {
+  test('dashboard defined', () => {
+    reduxHooks.useEnterpriseDashboardData.mockReturnValueOnce({
+      url: 'url',
+    });
+    const wrapper = shallow(<BrandLogo />);
+    expect(wrapper.snapshot).toMatchSnapshot();
+    expect(wrapper.instance.findByType('a')[0].props.href).toEqual('url');
+  });
+
+  test('dashboard undefined', () => {
+    reduxHooks.useEnterpriseDashboardData.mockReturnValueOnce(null);
+    const wrapper = shallow(<BrandLogo />);
+    expect(wrapper.snapshot).toMatchSnapshot();
+    expect(wrapper.instance.findByType('a')[0].props.href).toEqual('/');
+  });
+});

src/containers/LearnerDashboardHeader/ConfirmEmailBanner/__snapshots__/index.test.jsx.snap

@@ -55,11 +55,11 @@ exports[`ConfirmEmailBanner snapshot Show on unverified 1`] = `
     onClose={[MockFunction closeConfirmModal]}
     title=""
   >
-    <h2
-      className="text-center p-3 h1"
+    <h1
+      className="text-center p-3"
     >
       Confirm your email
-    </h2>
+    </h1>
     <p
       className="text-center"
     >

src/containers/LearnerDashboardHeader/ConfirmEmailBanner/index.jsx

@@ -64,7 +64,7 @@ export const ConfirmEmailBanner = () => {
           </Button>
         )}
       >
-        <h2 className="text-center p-3 h1">{formatMessage(messages.confirmEmailModalHeader)}</h2>
+        <h1 className="text-center p-3">{formatMessage(messages.confirmEmailModalHeader)}</h1>
         <p className="text-center">{formatMessage(messages.confirmEmailModalBody)}</p>
       </MarketingModal>
     </>

src/containers/LearnerDashboardHeader/LearnerDashboardMenu.jsx

@@ -0,0 +1,76 @@
+import { getConfig } from '@edx/frontend-platform';
+
+import urls from 'data/services/lms/urls';
+
+import messages from './messages';
+
+const getLearnerHeaderMenu = (
+  formatMessage,
+  courseSearchUrl,
+  authenticatedUser,
+  exploreCoursesClick,
+) => ({
+  mainMenu: [
+    {
+      type: 'item',
+      href: '/',
+      content: formatMessage(messages.course),
+      isActive: true,
+    },
+    ...(getConfig().ENABLE_PROGRAMS ? [{
+      type: 'item',
+      href: `${urls.programsUrl()}`,
+      content: formatMessage(messages.program),
+    }] : []),
+    {
+      type: 'item',
+      href: `${urls.baseAppUrl(courseSearchUrl)}`,
+      content: formatMessage(messages.discoverNew),
+      onClick: (e) => {
+        exploreCoursesClick(e);
+      },
+    },
+  ],
+  secondaryMenu: [
+    ...(getConfig().SUPPORT_URL ? [{
+      type: 'item',
+      href: `${getConfig().SUPPORT_URL}`,
+      content: formatMessage(messages.help),
+    }] : []),
+  ],
+  userMenu: [
+    {
+      heading: '',
+      items: [
+        {
+          type: 'item',
+          href: `${getConfig().ACCOUNT_PROFILE_URL}/u/${authenticatedUser?.username}`,
+          content: formatMessage(messages.profile),
+        },
+        {
+          type: 'item',
+          href: `${getConfig().ACCOUNT_SETTINGS_URL}`,
+          content: formatMessage(messages.account),
+        },
+        ...(getConfig().ORDER_HISTORY_URL ? [{
+          type: 'item',
+          href: getConfig().ORDER_HISTORY_URL,
+          content: formatMessage(messages.orderHistory),
+        }] : []),
+      ],
+    },
+    {
+      heading: '',
+      items: [
+        {
+          type: 'item',
+          href: `${getConfig().LOGOUT_URL}`,
+          content: formatMessage(messages.signOut),
+        },
+      ],
+    },
+  ],
+}
+);
+
+export default getLearnerHeaderMenu;

src/containers/LearnerDashboardHeader/__snapshots__/BrandLogo.test.jsx.snap

@@ -0,0 +1,27 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`BrandLogo dashboard defined 1`] = `
+<a
+  className="mx-auto"
+  href="url"
+>
+  <img
+    alt="edX, Inc. Dashboard"
+    className="logo py-3"
+    src="https://edx-cdn.org/v3/default/logo.svg"
+  />
+</a>
+`;
+
+exports[`BrandLogo dashboard undefined 1`] = `
+<a
+  className="mx-auto"
+  href="/"
+>
+  <img
+    alt="edX, Inc. Dashboard"
+    className="logo py-3"
+    src="https://edx-cdn.org/v3/default/logo.svg"
+  />
+</a>
+`;

src/containers/LearnerDashboardHeader/__snapshots__/index.test.jsx.snap

@@ -3,7 +3,59 @@
 exports[`LearnerDashboardHeader render 1`] = `
 <Fragment>
   <ConfirmEmailBanner />
-  <Header />
+  <Header
+    mainMenuItems={
+      [
+        {
+          "content": "Courses",
+          "href": "/",
+          "isActive": true,
+          "type": "item",
+        },
+        {
+          "content": "Discover New",
+          "href": "http://localhost:18000/course-search-url",
+          "onClick": [Function],
+          "type": "item",
+        },
+      ]
+    }
+    secondaryMenuItems={[]}
+    userMenuItems={
+      [
+        {
+          "heading": "",
+          "items": [
+            {
+              "content": "Profile",
+              "href": "http://account-profile-url.test/u/undefined",
+              "type": "item",
+            },
+            {
+              "content": "Account",
+              "href": "http://account-settings-url.test",
+              "type": "item",
+            },
+            {
+              "content": "Order History",
+              "href": "test-url",
+              "type": "item",
+            },
+          ],
+        },
+        {
+          "heading": "",
+          "items": [
+            {
+              "content": "Sign Out",
+              "href": "http://localhost:18000/logout",
+              "type": "item",
+            },
+          ],
+        },
+      ]
+    }
+  />
   <MasqueradeBar />
 </Fragment>
 `;

src/containers/LearnerDashboardHeader/hooks.js

@@ -0,0 +1,53 @@
+import React from 'react';
+import { useWindowSize, breakpoints } from '@openedx/paragon';
+import { useIntl } from '@edx/frontend-platform/i18n';
+import track from 'tracking';
+import { StrictDict } from 'utils';
+import { linkNames } from 'tracking/constants';
+
+import getLearnerHeaderMenu from './LearnerDashboardMenu';
+
+import * as module from './hooks';
+
+export const state = StrictDict({
+  isOpen: (val) => React.useState(val), // eslint-disable-line
+});
+
+export const useIsCollapsed = () => {
+  const { width } = useWindowSize();
+  const isCollapsed = React.useMemo(() => (width <= breakpoints.large.minWidth), [width]);
+  return isCollapsed;
+};
+
+export const findCoursesNavClicked = (href) => track.findCourses.findCoursesClicked(href, {
+  linkName: linkNames.learnerHomeNavExplore,
+});
+
+export const findCoursesNavDropdownClicked = (href) => track.findCourses.findCoursesClicked(href, {
+  linkName: linkNames.learnerHomeNavDropdownExplore,
+});
+
+export const useLearnerDashboardHeaderMenu = ({
+  courseSearchUrl, authenticatedUser, exploreCoursesClick,
+}) => {
+  const { formatMessage } = useIntl();
+  return getLearnerHeaderMenu(formatMessage, courseSearchUrl, authenticatedUser, exploreCoursesClick);
+};
+
+export const useLearnerDashboardHeaderData = () => {
+  const [isOpen, setIsOpen] = module.state.isOpen(false);
+  const toggleIsOpen = () => setIsOpen(!isOpen);
+
+  return {
+    isOpen,
+    toggleIsOpen,
+  };
+};
+
+export default {
+  useIsCollapsed,
+  findCoursesNavClicked,
+  findCoursesNavDropdownClicked,
+  useLearnerDashboardHeaderData,
+  useLearnerDashboardHeaderMenu,
+};

src/containers/LearnerDashboardHeader/hooks.test.js

@@ -0,0 +1,81 @@
+import { useWindowSize, breakpoints } from '@openedx/paragon';
+import track from 'tracking';
+import { linkNames } from 'tracking/constants';
+
+import { MockUseState } from 'testUtils';
+
+import * as hooks from './hooks';
+
+const state = new MockUseState(hooks);
+
+const {
+  useIsCollapsed,
+  findCoursesNavClicked,
+  findCoursesNavDropdownClicked,
+  useLearnerDashboardHeaderData,
+  useLearnerDashboardHeaderMenu,
+} = hooks;
+
+jest.mock('tracking', () => ({
+  findCourses: {
+    findCoursesClicked: jest.fn(),
+  },
+}));
+
+const url = 'http://example.com';
+
+describe('LearnerDashboardHeader hooks', () => {
+  describe('state values', () => {
+    state.testGetter(state.keys.isOpen);
+  });
+
+  describe('useIsCollapsed', () => {
+    test('large screen is not collapsed', () => {
+      useWindowSize.mockReturnValueOnce({ width: breakpoints.large.minWidth + 1 });
+      expect(useIsCollapsed()).toEqual(false);
+    });
+    test('small screen is collapsed', () => {
+      useWindowSize.mockReturnValueOnce({ width: breakpoints.large.minWidth - 1 });
+      expect(useIsCollapsed()).toEqual(true);
+    });
+  });
+
+  describe('findCoursesNavClicked', () => {
+    test('calls tracking with nav link name', () => {
+      findCoursesNavClicked(url);
+      expect(track.findCourses.findCoursesClicked).toHaveBeenCalledWith(url, {
+        linkName: linkNames.learnerHomeNavExplore,
+      });
+    });
+  });
+
+  describe('getLearnerDashboardHeaderMenu', () => {
+    test('calls header menu data hook', () => {
+      const courseSearchUrl = '/courses';
+      const authenticatedUser = {
+        username: 'test',
+      };
+      const learnerHomeHeaderMenu = useLearnerDashboardHeaderMenu({ courseSearchUrl, authenticatedUser });
+      expect(learnerHomeHeaderMenu.mainMenu.length).toBe(2);
+    });
+  });
+
+  describe('findCoursesNavDropdownClicked', () => {
+    test('calls tracking with dropdown link name', () => {
+      findCoursesNavDropdownClicked(url);
+      expect(track.findCourses.findCoursesClicked).toHaveBeenCalledWith(url, {
+        linkName: linkNames.learnerHomeNavDropdownExplore,
+      });
+    });
+  });
+
+  describe('useLearnerDashboardHeaderData', () => {
+    test('default state', () => {
+      state.mock();
+      const out = useLearnerDashboardHeaderData();
+      state.expectInitializedWith(state.keys.isOpen, false);
+      out.toggleIsOpen();
+      expect(state.values.isOpen).toEqual(true);
+    });
+  });
+});

src/containers/LearnerDashboardHeader/index.jsx

@@ -1,16 +1,43 @@
 import React from 'react';
 
-import Header from '@edx/frontend-component-header';
 import MasqueradeBar from 'containers/MasqueradeBar';
+import { AppContext } from '@edx/frontend-platform/react';
+import Header from '@edx/frontend-component-header';
+import { reduxHooks } from 'hooks';
+import urls from 'data/services/lms/urls';
+
 import ConfirmEmailBanner from './ConfirmEmailBanner';
 
-export const LearnerDashboardHeader = () => (
-  <>
-    <ConfirmEmailBanner />
-    <Header />
-    <MasqueradeBar />
-  </>
-);
+import { useLearnerDashboardHeaderMenu, findCoursesNavClicked } from './hooks';
+
+import './index.scss';
+
+export const LearnerDashboardHeader = () => {
+  const { authenticatedUser } = React.useContext(AppContext);
+  const { courseSearchUrl } = reduxHooks.usePlatformSettingsData();
+
+  const exploreCoursesClick = () => {
+    findCoursesNavClicked(urls.baseAppUrl(courseSearchUrl));
+  };
+
+  const learnerHomeHeaderMenu = useLearnerDashboardHeaderMenu({
+    courseSearchUrl,
+    authenticatedUser,
+    exploreCoursesClick,
+  });
+
+  return (
+    <>
+      <ConfirmEmailBanner />
+      <Header
+        mainMenuItems={learnerHomeHeaderMenu.mainMenu}
+        secondaryMenuItems={learnerHomeHeaderMenu.secondaryMenu}
+        userMenuItems={learnerHomeHeaderMenu.userMenu}
+      />
+      <MasqueradeBar />
+    </>
+  );
+};
 
 LearnerDashboardHeader.propTypes = {};
 

src/containers/LearnerDashboardHeader/index.scss

@@ -0,0 +1,38 @@
+.dropdown-menu-collapse {
+  width: 100vw;
+  position: absolute;
+  left: 0;
+}
+
+.learner-variant-header {
+  a {
+    // needed to make the link not resize the header
+    border-bottom: 2px solid transparent;
+  }
+  .course-link {
+    border-bottom: 2px solid !important;
+  }
+
+  .course-link:hover {
+    border-bottom: inherit !important;
+  }
+}
+
+.nav-small-menu {
+  > * {
+    justify-content: flex-start !important;
+
+    border-radius: 0 !important;
+    border-top: 1px solid #ddd !important;
+
+    &::after {
+      content: '\00BB';
+      padding-left: 10px;
+    }
+  }
+}
+
+.logo {
+  // copy from legacy dashboard
+  height: 40px;
+}

src/containers/LearnerDashboardHeader/index.test.jsx

@@ -1,18 +1,47 @@
+import { mergeConfig } from '@edx/frontend-platform';
 import { shallow } from '@edx/react-unit-test-utils';
 import Header from '@edx/frontend-component-header';
 
+import urls from 'data/services/lms/urls';
 import LearnerDashboardHeader from '.';
+import { findCoursesNavClicked } from './hooks';
 
+jest.mock('hooks', () => ({
+  reduxHooks: {
+    usePlatformSettingsData: jest.fn(() => ({
+      courseSearchUrl: '/course-search-url',
+    })),
+  },
+}));
+jest.mock('./hooks', () => ({
+  ...jest.requireActual('./hooks'),
+  findCoursesNavClicked: jest.fn(),
+}));
 jest.mock('containers/MasqueradeBar', () => 'MasqueradeBar');
 jest.mock('./ConfirmEmailBanner', () => 'ConfirmEmailBanner');
 jest.mock('@edx/frontend-component-header', () => 'Header');
 
 describe('LearnerDashboardHeader', () => {
   test('render', () => {
+    mergeConfig({ ORDER_HISTORY_URL: 'test-url' });
     const wrapper = shallow(<LearnerDashboardHeader />);
     expect(wrapper.snapshot).toMatchSnapshot();
     expect(wrapper.instance.findByType('ConfirmEmailBanner')).toHaveLength(1);
     expect(wrapper.instance.findByType('MasqueradeBar')).toHaveLength(1);
     expect(wrapper.instance.findByType(Header)).toHaveLength(1);
+    wrapper.instance.findByType(Header)[0].props.mainMenuItems[1].onClick();
+    expect(findCoursesNavClicked).toHaveBeenCalledWith(urls.baseAppUrl('/course-search-url'));
+    expect(wrapper.instance.findByType(Header)[0].props.secondaryMenuItems.length).toBe(0);
+  });
+
+  test('should display Help link if SUPPORT_URL is set', () => {
+    mergeConfig({ SUPPORT_URL: 'http://localhost:18000/support' });
+    const wrapper = shallow(<LearnerDashboardHeader />);
+    expect(wrapper.instance.findByType(Header)[0].props.secondaryMenuItems.length).toBe(1);
+  });
+  test('should display Programs link if it is enabled by configuration', () => {
+    mergeConfig({ ENABLE_PROGRAMS: true });
+    const wrapper = shallow(<LearnerDashboardHeader />);
+    expect(wrapper.instance.findByType(Header)[0].props.mainMenuItems.length).toBe(3);
   });
 });

src/containers/LearnerDashboardHeader/messages.js

@@ -0,0 +1,91 @@
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+  dashboard: {
+    id: 'learnerVariantDashboard.menu.dashboard.label',
+    defaultMessage: 'Dashboard',
+    description: 'The text for the user menu Dashboard navigation link.',
+  },
+  dashboardPersonal: {
+    id: 'learnerVariantDashboard.menu.dashboardPersonal.label',
+    defaultMessage: 'Personal',
+    description: 'Link to personal dashboard in user menu',
+  },
+  dashboardSwitch: {
+    id: 'learnerVariantDashboard.menu.dashboardSwitch.label',
+    defaultMessage: 'SWITCH DASHBOARD',
+    description: 'Switch Dashboard header in the user menu',
+  },
+  help: {
+    id: 'learnerVariantDashboard.help.label',
+    defaultMessage: 'Help',
+    description: 'The text for the link to the Help Center',
+  },
+  profile: {
+    id: 'learnerVariantDashboard.menu.profile.label',
+    defaultMessage: 'Profile',
+    description: 'The text for the user menu Profile navigation link.',
+  },
+  viewPrograms: {
+    id: 'learnerVariantDashboard.menu.viewPrograms.label',
+    defaultMessage: 'View Programs',
+    description: 'The text for the user menu View Programs navigation link.',
+  },
+  account: {
+    id: 'learnerVariantDashboard.menu.account.label',
+    defaultMessage: 'Account',
+    description: 'The text for the user menu Account navigation link.',
+  },
+  orderHistory: {
+    id: 'learnerVariantDashboard.menu.orderHistory.label',
+    defaultMessage: 'Order History',
+    description: 'The text for the user menu Order History navigation link.',
+  },
+  signOut: {
+    id: 'learnerVariantDashboard.menu.signOut.label',
+    defaultMessage: 'Sign Out',
+    description: 'The label for the user menu Sign Out action.',
+  },
+  course: {
+    id: 'learnerVariantDashboard.course',
+    defaultMessage: 'Courses',
+    description: 'Header link for switching to dashboard page.',
+  },
+  program: {
+    id: 'learnerVariantDashboard.program',
+    defaultMessage: 'Programs',
+    description: 'Header link for switching to program page.',
+  },
+  discoverNew: {
+    id: 'learnerVariantDashboard.discoverNew',
+    defaultMessage: 'Discover New',
+    description: 'Header link for switching to discover page.',
+  },
+  logoAltText: {
+    id: 'learnerVariantDashboard.logoAltText',
+    defaultMessage: 'edX, Inc. Dashboard',
+    description: 'Alt text for the edX logo.',
+  },
+  collapseMenuOpenAltText: {
+    id: 'learnerVariantDashboard.collapseMenuOpenAltText',
+    defaultMessage: 'Menu',
+    description: 'Alt text for the collapse menu icon when the menu is open.',
+  },
+  collapseMenuClosedAltText: {
+    id: 'learnerVariantDashboard.collapseMenuClosedAltText',
+    defaultMessage: 'Close',
+    description: 'Alt text for the collapse menu icon when the menu is closed.',
+  },
+  career: {
+    id: 'leanerDashboard.menu.career.label',
+    defaultMessage: 'Career',
+    description: 'The text for the user menu Career navigation link.',
+  },
+  newAlert: {
+    id: 'header.menu.new.label',
+    defaultMessage: 'New',
+    description: 'The text announcing that an item in the user menu is New',
+  },
+});
+
+export default messages;

src/containers/UnenrollConfirmModal/constants.js

@@ -1,6 +1,5 @@
 /* eslint-disable quotes */
 import { StrictDict } from 'utils';
-import { defineMessages } from '@edx/frontend-platform/i18n';
 
 export const reasonKeys = StrictDict({
   prereqs: 'prereqs',
@@ -27,7 +26,7 @@ export const order = [
   reasonKeys.easy,
 ];
 
-const messages = defineMessages({
+const messages = StrictDict({
   [reasonKeys.prereqs]: {
     id: 'learner-dash.unenrollConfirm.reasons.prereqs',
     description: 'Unenroll reason option - missing prerequisites',

src/data/redux/app/selectors/appSelectors.js

@@ -10,7 +10,10 @@ export const numCourses = createSelector(
   (courseData) => Object.keys(courseData).length,
 );
 export const hasCourses = createSelector([module.numCourses], (num) => num > 0);
-
+export const hasAvailableDashboards = createSelector(
+  [simpleSelectors.enterpriseDashboard],
+  (data) => data !== null && data.isLearnerPortalEnabled === true,
+);
 export const showSelectSessionModal = createSelector(
   [simpleSelectors.selectSessionModal],
   (data) => data.cardId != null,
@@ -19,5 +22,6 @@ export const showSelectSessionModal = createSelector(
 export default StrictDict({
   numCourses,
   hasCourses,
+  hasAvailableDashboards,
   showSelectSessionModal,
 });

src/data/redux/app/selectors/appSelectors.test.js

@@ -17,6 +17,15 @@ describe('basic app selectors', () => {
       expect(cb(0)).toEqual(false);
     });
   });
+  describe('hasAvailableDashboards', () => {
+    it('returns true iff the enterpriseDashboard field is populated and learner portal is enabled', () => {
+      const { preSelectors, cb } = appSelectors.hasAvailableDashboards;
+      expect(preSelectors).toEqual([simpleSelectors.enterpriseDashboard]);
+      expect(cb({ isLearnerPortalEnabled: true })).toEqual(true);
+      expect(cb({ isLearnerPortalEnabled: false })).toEqual(false);
+      expect(cb(null)).toEqual(false);
+    });
+  });
   describe('showSelectSessionModal', () => {
     it('returns true if the selectSessionModal cardId is not null', () => {
       const { preSelectors, cb } = appSelectors.showSelectSessionModal;

src/data/redux/app/selectors/courseCard.js

@@ -43,7 +43,6 @@ export const courseCard = StrictDict({
     (courseRun) => (courseRun === null ? {} : {
       endDate: module.loadDateVal(courseRun.endDate),
       startDate: module.loadDateVal(courseRun.startDate),
-      advertisedStart: courseRun.advertisedStart,
 
       courseId: courseRun.courseId,
       isArchived: courseRun.isArchived,
@@ -53,6 +52,7 @@ export const courseCard = StrictDict({
 
       homeUrl: courseRun.homeUrl,
       marketingUrl: courseRun.marketingUrl,
+      upgradeUrl: courseRun.upgradeUrl,
 
       progressUrl: baseAppUrl(courseRun.progressUrl),
       resumeUrl: baseAppUrl(courseRun.resumeUrl), // resume will route this to learning mfe.

src/data/redux/app/selectors/courseCard.test.js

@@ -147,7 +147,6 @@ describe('courseCard selectors module', () => {
         loadSelector(courseCard.courseRun, {
           endDate: '3000-10-20',
           startDate: '2000-10-20',
-          advertisedStart: 'Mid June',
 
           courseId: 'test-course-id',
           isArchived: 'test-is-archived',
@@ -157,6 +156,7 @@ describe('courseCard selectors module', () => {
 
           homeUrl: 'test-home-url',
           marketingUrl: 'test-marketing-url',
+          upgradeUrl: 'test-upgrade-url',
 
           progressUrl: 'test-progress-url',
           resumeUrl: 'test-resume-url',
@@ -173,9 +173,6 @@ describe('courseCard selectors module', () => {
         expect(selected.endDate).toEqual(new Date(testData.endDate));
         expect(selected.startDate).toEqual(new Date(testData.startDate));
       });
-      it('passes advertised start date', () => {
-        expect(selected.advertisedStart).toEqual(testData.advertisedStart);
-      });
       it('passes [courseId, isArchived, isStarted]', () => {
         expect(selected.courseId).toEqual(testData.courseId);
         expect(selected.isArchived).toEqual(testData.isArchived);
@@ -184,9 +181,10 @@ describe('courseCard selectors module', () => {
       it('passes minPassingGrade floored from float to a percentage value', () => {
         expect(selected.minPassingGrade).toEqual(93);
       });
-      it('passes [homeUrl, marketingUrl]', () => {
+      it('passes [homeUrl, marketingUrl, upgradeUrl]', () => {
         expect(selected.homeUrl).toEqual(testData.homeUrl);
         expect(selected.marketingUrl).toEqual(testData.marketingUrl);
+        expect(selected.upgradeUrl).toEqual(testData.upgradeUrl);
       });
       it('passes [progressUrl, unenrollUrl, resumeUrl], converted to baseAppUrl', () => {
         expect(selected.progressUrl).toEqual(baseAppUrl(testData.progressUrl));

src/data/redux/app/selectors/simpleSelectors.test.js

@@ -36,6 +36,12 @@ describe('app simple selectors', () => {
       expect(preSelectors).toEqual([appSelector]);
       expect(cb(testState.app)).toEqual(testString);
     });
+    test('enterpriseDashboard returns empty object if data returns null', () => {
+      testState = { app: { enterpriseDashboard: null } };
+      const { preSelectors, cb } = simpleSelectors.enterpriseDashboard;
+      expect(preSelectors).toEqual([appSelector]);
+      expect(cb(testState.app)).toEqual({});
+    });
     describe('cardSimpleSelectors', () => {
       keys = keyStore(cardSimpleSelectors);
       test.each([

src/data/redux/hooks/app.js

@@ -18,6 +18,7 @@ export const useSocialShareSettings = () => useSelector(selectors.socialShareSet
 
 /** global-level meta-selectors **/
 export const useHasCourses = () => useSelector(selectors.hasCourses);
+export const useHasAvailableDashboards = () => useSelector(selectors.hasAvailableDashboards);
 export const useCurrentCourseList = (opts) => useSelector(
   state => selectors.currentList(state, opts),
 );

src/data/redux/requests/reducer.test.js

@@ -47,16 +47,5 @@ describe('requests reducer', () => {
         });
       });
     });
-    describe('clearRequest', () => {
-      it('cleanup status and error', () => {
-        expect(reducer(
-          testingState,
-          actions.clearRequest({ requestKey: testKey, error: testValue }),
-        )).toEqual({
-          ...testingState,
-          [testKey]: {},
-        });
-      });
-    });
   });
 });

src/data/services/lms/api.js

@@ -50,6 +50,12 @@ export const logEvent = ({ eventName, data, courseId }) => post(urls.event(), {
   event: JSON.stringify(data),
 });
 
+export const logUpgrade = ({ courseId }) => module.logEvent({
+  eventName: eventNames.upgradeButtonClickedEnrollment,
+  courseId,
+  data: { location: 'learner-dashboard' },
+});
+
 export const logShare = ({ courseId, site }) => module.logEvent({
   eventName: eventNames.shareClicked,
   courseId,
@@ -72,6 +78,7 @@ export default {
   updateEntitlementEnrollment,
   deleteEntitlementEnrollment,
   logEvent,
+  logUpgrade,
   logShare,
   createCreditRequest,
 };

src/data/services/lms/api.test.js

@@ -130,6 +130,13 @@ describe('lms api methods', () => {
       beforeEach(() => {
         jest.spyOn(api, moduleKeys.logEvent).mockImplementation(logEvent);
       });
+      test('logUpgrade sends enrollment upgrade click event with learner dashboard location', () => {
+        expect(api.logUpgrade({ courseId })).toEqual(logEvent({
+          eventName: eventNames.upgradeButtonClickedEnrollment,
+          courseId,
+          data: { location: 'learner-dashboard' },
+        }));
+      });
       test('logShare sends share clicke vent with course id, side and location', () => {
         const site = 'test-site';
         expect(api.logShare({ courseId, site })).toEqual(logEvent({

src/data/services/lms/fakeData/courses.js

@@ -779,6 +779,9 @@ export const compileCourseRunData = ({ courseName, ...data }, index) => {
     courseProvider: getOption(providerOptions, index),
     programs: getOption(programsOptions, index),
   };
+  if (out.enrollment.canUpgrade) {
+    out.courseRun.upgradeUrl = 'test-upgrade-url';
+  }
   return out;
 };
 

src/data/services/lms/utils.js

@@ -1,34 +1,6 @@
+import queryString from 'query-string';
 import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 
-/**
- * stringify(query, existingQuery)
- * simple wrapper to convert an object to a query string
- * @param {object} query - object to convert
- * @param {string} existingQuery - existing query string
- * @returns {string} - query string
- */
-
-export const stringify = (query, existingQuery = '') => {
-  const searchParams = new URLSearchParams(existingQuery);
-
-  Object.entries(query).forEach(([key, value]) => {
-    if (value === undefined || value === null || value === '') {
-      searchParams.delete(key);
-    } else if (Array.isArray(value)) {
-      searchParams.delete(key);
-      value.forEach((val) => {
-        if (val !== undefined && val !== null && val !== '') {
-          searchParams.append(key, val);
-        }
-      });
-    } else {
-      searchParams.set(key, value);
-    }
-  });
-
-  return searchParams.toString();
-};
-
 /**
  * get(url)
  * simple wrapper providing an authenticated Http client get action
@@ -38,23 +10,21 @@ export const get = (...args) => getAuthenticatedHttpClient().get(...args);
 /**
  * post(url, data)
  * simple wrapper providing an authenticated Http client post action
- * stringify is used to convert the object to query string with = and &
+ * queryString.stringify is used to convert the object to query string with = and &
  * @param {string} url - target url
  * @param {object|string} body - post payload
  */
-export const post = (url, body = {}) => getAuthenticatedHttpClient().post(url, stringify(body));
+export const post = (url, body) => getAuthenticatedHttpClient().post(url, queryString.stringify(body));
 
 export const client = getAuthenticatedHttpClient;
 
 /**
  * stringifyUrl(url, query)
- * simple wrapper to convert a url and query object to a full url
+ * simple wrapper around queryString.stringifyUrl that sets skip behavior
  * @param {string} url - base url string
  * @param {object} query - query parameters
- * @returns {string} - full url
  */
-export const stringifyUrl = (url, query) => {
-  const [baseUrl, existingQuery = ''] = url.split('?');
-  const queryString = stringify(query, existingQuery);
-  return queryString ? `${baseUrl}?${queryString}` : baseUrl;
-};
+export const stringifyUrl = (url, query) => queryString.stringifyUrl(
+  { url, query },
+  { skipNull: true, skipEmptyString: true },
+);

src/data/services/lms/utils.test.js

@@ -1,6 +1,11 @@
+import queryString from 'query-string';
 import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 import * as utils from './utils';
 
+jest.mock('query-string', () => ({
+  stringifyUrl: jest.fn((url, options) => ({ url, options })),
+  stringify: jest.fn((data) => data),
+}));
 jest.mock('@edx/frontend-platform/auth', () => ({
   getAuthenticatedHttpClient: jest.fn(),
 }));
@@ -15,25 +20,28 @@ describe('lms service utils', () => {
     });
   });
   describe('post', () => {
-    it('forwards arguments to authenticatedHttpClient().post, removes undefined attributes and appends array values', () => {
+    it('forwards arguments to authenticatedHttpClient().post', () => {
       const post = jest.fn((...args) => ({ post: args }));
       getAuthenticatedHttpClient.mockReturnValue({ post });
       const url = 'some url';
       const body = {
         some: 'body',
-        for: undefined,
+        for: 'the',
         test: 'yay',
-        array: ['one', 'two', undefined],
       };
       const expectedUrl = utils.post(url, body);
-      expect(expectedUrl).toEqual(post(url, 'some=body&test=yay&array=one&array=two'));
+      expect(queryString.stringify).toHaveBeenCalledWith(body);
+      expect(expectedUrl).toEqual(post(url, body));
     });
   });
   describe('stringifyUrl', () => {
-    it('forwards url and query to stringifyUrl skipping null and ""', () => {
+    it('forwards url and query to stringifyUrl with options to skip null and ""', () => {
       const url = 'here.com';
       const query = { some: 'set', of: 'queryParams' };
-      expect(utils.stringifyUrl(url, query)).toEqual('here.com?some=set&of=queryParams');
+      const options = { skipNull: true, skipEmptyString: true };
+      expect(utils.stringifyUrl(url, query)).toEqual(
+        queryString.stringifyUrl({ url, query }, options),
+      );
     });
   });
 });

src/index.jsx

@@ -2,8 +2,8 @@
 import 'core-js/stable';
 import 'regenerator-runtime/runtime';
 
-import React, { StrictMode } from 'react';
-import { createRoot } from 'react-dom/client';
+import React from 'react';
+import ReactDOM from 'react-dom';
 import {
   Route, Navigate, Routes,
 } from 'react-router-dom';
@@ -30,29 +30,23 @@ import App from './App';
 import NoticesWrapper from './components/NoticesWrapper';
 
 subscribe(APP_READY, () => {
-  const root = createRoot(document.getElementById('root'));
-
-  root.render(
-    <StrictMode>
-      <AppProvider store={store}>
-        <NoticesWrapper>
-          <Routes>
-            <Route path="/" element={<PageWrap><App /></PageWrap>} />
-            <Route path="*" element={<Navigate to="/" replace />} />
-          </Routes>
-        </NoticesWrapper>
-      </AppProvider>
-    </StrictMode>,
+  ReactDOM.render(
+    <AppProvider store={store}>
+      <NoticesWrapper>
+        <Routes>
+          <Route path="/" element={<PageWrap><App /></PageWrap>} />
+          <Route path="*" element={<Navigate to="/" replace />} />
+        </Routes>
+      </NoticesWrapper>
+    </AppProvider>,
+    document.getElementById('root'),
   );
 });
 
 subscribe(APP_INIT_ERROR, (error) => {
-  const root = createRoot(document.getElementById('root'));
-
-  root.render(
-    <StrictMode>
-      <ErrorPage message={error.message} />
-    </StrictMode>,
+  ReactDOM.render(
+    <ErrorPage message={error.message} />,
+    document.getElementById('root'),
   );
 });
 

src/index.test.jsx

@@ -1,3 +1,5 @@
+import { render } from 'react-dom';
+
 import {
   APP_INIT_ERROR,
   APP_READY,
@@ -9,20 +11,9 @@ import {
 import { configuration } from './config';
 import * as app from '.';
 
-// These need to be var not let so they get hoisted
-// and can be used by jest.mock (which is also hoisted)
-var mockRender; // eslint-disable-line no-var
-var mockCreateRoot; // eslint-disable-line no-var
-jest.mock('react-dom/client', () => {
-  mockRender = jest.fn();
-  mockCreateRoot = jest.fn(() => ({
-    render: mockRender,
-  }));
-
-  return ({
-    createRoot: mockCreateRoot,
-  });
-});
+jest.mock('react-dom', () => ({
+  render: jest.fn(),
+}));
 
 jest.mock('@edx/frontend-platform', () => ({
   mergeConfig: jest.fn(),
@@ -41,9 +32,7 @@ describe('app registry', () => {
   let getElement;
 
   beforeEach(() => {
-    mockCreateRoot.mockClear();
-    mockRender.mockClear();
-
+    render.mockClear();
     getElement = window.document.getElementById;
     window.document.getElementById = jest.fn(id => ({ id }));
   });
@@ -55,16 +44,18 @@ describe('app registry', () => {
     const callArgs = subscribe.mock.calls[0];
     expect(callArgs[0]).toEqual(APP_READY);
     callArgs[1]();
-    const [rendered] = mockRender.mock.calls[0];
+    const [rendered, target] = render.mock.calls[0];
     expect(rendered).toMatchSnapshot();
+    expect(target).toEqual(document.getElementById('root'));
   });
   test('subscribe: APP_INIT_ERROR.  snapshot: displays an ErrorPage to root element', () => {
     const callArgs = subscribe.mock.calls[1];
     expect(callArgs[0]).toEqual(APP_INIT_ERROR);
     const error = { message: 'test-error-message' };
     callArgs[1](error);
-    const [rendered] = mockRender.mock.calls[0];
+    const [rendered, target] = render.mock.calls[0];
     expect(rendered).toMatchSnapshot();
+    expect(target).toEqual(document.getElementById('root'));
   });
   test('initialize is called with requireAuthenticatedUser', () => {
     expect(initialize).toHaveBeenCalledTimes(1);

src/plugin-slots/CourseBannerSlot/README.md

@@ -1,48 +0,0 @@
-# Course Card Action Slot
-
-### Slot ID: `org.openedx.frontend.learner_dashboard.course_card_banner.v1`
-### Props:
-* `cardId`
-
-## Description
-
-This slot is used for replacing or adding content for the `CourseBanner` component. This banner is rendered as a child of the `CourseCard`.
-
-The default CourseBanner looks like this when audit access has expired for the course:
-![Screenshot of the default CourseBanner when audit access has expired](./images/course_banner_slot_default.png)
-
-## Example
-
-The following `env.config.jsx` will render a custom implemenation of a CourseBanner under every `CourseCard`.
-
-![Screenshot of custom banner added under CourseCard](./images/course_banner_slot_default.png)
-
-```js
-import { DIRECT_PLUGIN, PLUGIN_OPERATIONS } from '@openedx/frontend-plugin-framework';
-import { Alert } from '@openedx/paragon';
-
-const config = {
-  pluginSlots: {
-    'org.openedx.frontend.learner_dashboard.course_card_banner.v1': {
-      keepDefault: false,
-      plugins: [
-        {
-          op: PLUGIN_OPERATIONS.Insert,
-          widget: {
-            id: 'org.openedx.frontend.learner_dashboard.course_card_banner.v1',
-            type: DIRECT_PLUGIN,
-            priority: 60,
-            RenderWidget: ({ cardId }) => (
-              <Alert variant="info" className="mb-0">
-                Course banner for course with {cardId}
-              </Alert>
-            ),
-          },
-        },
-      ],
-    },
-  },
-}
-
-export default config;
-```

src/plugin-slots/CourseBannerSlot/index.jsx

@@ -1,23 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { PluginSlot } from '@openedx/frontend-plugin-framework';
-import CourseBanner from 'containers/CourseCard/components/CourseCardBanners/CourseBanner';
-
-const CourseBannerSlot = ({ cardId }) => (
-  <PluginSlot
-    id="org.openedx.frontend.learner_dashboard.course_card_banner.v1"
-    pluginProps={{
-      cardId,
-    }}
-  >
-    <CourseBanner
-      cardId={cardId}
-    />
-  </PluginSlot>
-);
-
-CourseBannerSlot.propTypes = {
-  cardId: PropTypes.string.isRequired,
-};
-
-export default CourseBannerSlot;

src/plugin-slots/CourseCardActionSlot/README.md

@@ -1,10 +1,6 @@
 # Course Card Action Slot
 
-### Slot ID: `org.openedx.frontend.learner_dashboard.course_card_action.v1`
-
-### Slot ID Aliases
-* `course_card_action_slot`
-
+### Slot ID: `course_card_action_slot`
 ### Props:
 * `cardId`
 
@@ -24,7 +20,7 @@ import ActionButton from 'containers/CourseCard/components/CourseCardActions/Act
 
 const config = {
   pluginSlots: {
-    'org.openedx.frontend.learner_dashboard.course_card_action.v1': {
+    course_card_action_slot: {
       keepDefault: false,
       plugins: [
         {