fix(deps): update dependency axios-mock-adapter to v1.22.0

* feat: babel-plugin-react-intl to babel-plugin-formatjs migration

* fix: upgraded frontend-build to fix security issue

* fix: upgraded frontend-build to fix security issue

* fix: upgraded frontend build again

* refactor: upgraded to latest frontend-build and resolved vulnerabilities

.env.development

@@ -1,4 +1,6 @@
 ACCESS_TOKEN_COOKIE_NAME=edx-jwt-cookie-header-payload
+ACCOUNT_PROFILE_URL=http://localhost:1995
+ACCOUNT_SETTINGS_URL=http://localhost:1997
 BASE_URL=localhost:8080
 CREDENTIALS_BASE_URL=http://localhost:18150
 CSRF_TOKEN_API_PATH=/csrf/api/v1/token

.eslintrc.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
 const { createConfig } = require('@edx/frontend-build');
 
-module.exports = createConfig('eslint');
+module.exports = createConfig('eslint');

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

@@ -16,4 +16,4 @@ jobs:
     secrets:
       GITHUB_APP_ID: ${{ secrets.GRAPHQL_AUTH_APP_ID }}
       GITHUB_APP_PRIVATE_KEY: ${{ secrets.GRAPHQL_AUTH_APP_PEM }}
-      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}
+      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}

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

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

.github/workflows/ci.yml

@@ -9,18 +9,17 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node: [16]
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
+    - name: Setup Nodejs Env
+      run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
     - name: Setup Nodejs
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
-        node-version: ${{ matrix.node }}
+        node-version: ${{ env.NODE_VER }}
     - name: Install dependencies
       run: npm ci
     - name: Validate package-lock.json changes
@@ -29,7 +28,9 @@ jobs:
       run: npm run lint
     - name: Test
       run: npm run test
+    - name: Build
+      run: npm run build
     - name: i18n_extract
       run: npm run i18n_extract
     - name: Coverage
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v3

.github/workflows/commitlint.yml

@@ -7,4 +7,4 @@ on:
 
 jobs:
   commitlint:
-    uses: edx/.github/.github/workflows/commitlint.yml@master
+    uses: openedx/.github/.github/workflows/commitlint.yml@master

.github/workflows/lockfileversion-check.yml

@@ -10,5 +10,4 @@ on:
 
 jobs:
   version-check:
-    uses: openedx/.github/.github/workflows/lockfileversion-check.yml@master
-    
+    uses: openedx/.github/.github/workflows/lockfile-check.yml@master

.github/workflows/release.yml

@@ -9,13 +9,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      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@v2
+      uses: actions/setup-node@v3
       with:
-        node-version: 16
+        node-version: ${{ env.NODE_VER }}
     - name: Install dependencies
       run: npm ci
     - name: Validate package-lock.json changes
@@ -27,11 +29,11 @@ jobs:
     - name: i18n_extract
       run: npm run i18n_extract
     - name: Coverage
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v3
     - name: Build
       run: npm run build
     - name: Release
-      uses: cycjimmy/semantic-release-action@v2
+      uses: cycjimmy/semantic-release-action@v3
       with:
         semantic_version: 16
       env:

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

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

.gitignore

@@ -7,3 +7,5 @@ temp
 src/i18n/transifex_input.json
 module.config.js
 .idea/
+
+.vscode

.nvmrc

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

Makefile

@@ -1,14 +1,12 @@
-transifex_resource = frontend-component-header
-transifex_langs = "ar,fr,fr_CA,es_419,zh_CN"
+export TRANSIFEX_RESOURCE = frontend-component-header
+transifex_langs = "ar,fr,es_419,zh_CN,pt,it,de,uk,ru,hi,fr_CA"
 
 transifex_utils = ./node_modules/.bin/transifex-utils.js
 i18n = ./src/i18n
 transifex_input = $(i18n)/transifex_input.json
-tx_url1 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transifex_resource)/translation/en/strings/
-tx_url2 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transifex_resource)/source/
 
 # This directory must match .babelrc .
-transifex_temp = ./temp/babel-plugin-react-intl
+transifex_temp = ./temp/babel-plugin-formatjs
 
 build:
 	rm -rf ./dist
@@ -19,7 +17,7 @@ build:
 	@rm -rf dist/__mocks__
 
 requirements:
-	npm install
+	npm ci
 
 i18n.extract:
 	# Pulling display strings from .jsx files into .json files...
@@ -42,15 +40,15 @@ push_translations:
 	# Pushing strings to Transifex...
 	tx push -s
 	# Fetching hashes from Transifex...
-	./node_modules/reactifex/bash_scripts/get_hashed_strings.sh $(tx_url1)
+	./node_modules/@edx/reactifex/bash_scripts/get_hashed_strings_v3.sh
 	# Writing out comments to file...
-	$(transifex_utils) $(transifex_temp) --comments
+	$(transifex_utils) $(transifex_temp) --comments --v3-scripts-path
 	# Pushing comments to Transifex...
-	./node_modules/reactifex/bash_scripts/put_comments.sh $(tx_url2)
+	./node_modules/@edx/reactifex/bash_scripts/put_comments_v3.sh
 
 # Pulls translations from Transifex.
 pull_translations:
-	tx pull -f --mode reviewed --languages=$(transifex_langs)
+	tx pull -t -f --mode reviewed --languages=$(transifex_langs)
 
 # This target is used by Travis.
 validate-no-uncommitted-package-lock-changes:

README.rst

@@ -2,22 +2,42 @@
 frontend-component-header
 #########################
 
-|Build Status| |Codecov| |npm_version| |npm_downloads| |license| |semantic-release|
+|license| |Build Status| |Codecov| |npm_version| |npm_downloads| |semantic-release|
 
 ********
-Overview
+Purpose
 ********
 
 A generic header for Open edX micro-frontend applications.
 
 ************
-Requirements
+Getting Started
 ************
 
-This component uses ``@edx/frontend-platform`` services such as i18n, analytics, configuration, and the ``AppContext`` React component, and expects that it has been loaded into a micro-frontend that has been properly initialized via ``@edx/frontend-platform``'s ``initialize`` function. `Please visit the frontend template application to see an example. <https://github.com/edx/frontend-template-application/blob/master/src/index.jsx>`_
+Prerequisites
+=============
+
+The `devstack`_ is currently recommended as a development environment for your
+new MFE.  If you start it with ``make dev.up.lms`` that should give you
+everything you need as a companion to this frontend.
+
+Note that it is also possible to use `Tutor`_ to develop an MFE.  You can refer
+to the `relevant tutor-mfe documentation`_ to get started using it.
+
+.. _Devstack: https://github.com/openedx/devstack
+
+.. _Tutor: https://github.com/overhangio/tutor
+
+.. _relevant tutor-mfe documentation: https://github.com/overhangio/tutor-mfe#mfe-development
+
+Requirements
+============
+
+This component uses ``@edx/frontend-platform`` services such as i18n, analytics, configuration, and the ``AppContext`` React component, and expects that it has been loaded into a micro-frontend that has been properly initialized via ``@edx/frontend-platform``'s ``initialize`` function. `Please visit the frontend template application to see an example. <https://github.com/openedx/frontend-template-application/blob/master/src/index.jsx>`_
+
 
 Environment Variables
-=====================
+====================
 
 * ``LMS_BASE_URL`` - The URL of the LMS of your Open edX instance.
 * ``LOGOUT_URL`` - The URL of the API endpoint which performs a user logout.
@@ -26,13 +46,14 @@ Environment Variables
   Defaults to "localhost" in development.
 * ``LOGO_URL`` - The URL of the site's logo.  This logo is displayed in the header.
 * ``ORDER_HISTORY_URL`` - The URL of the order history page.
+* ``ACCOUNT_PROFILE_URL`` - The URL of the account profile page.
+* ``ACCOUNT_SETTINGS_URL`` - The URL of the account settings page.
 * ``AUTHN_MINIMAL_HEADER`` - A boolean flag which hides the main menu, user menu, and logged-out
   menu items when truthy.  This is intended to be used in micro-frontends like
   frontend-app-authentication in which these menus are considered distractions from the user's task.
 
-************
 Installation
-************
+============
 
 To install this header into your Open edX micro-frontend, run the following command in your MFE:
 
@@ -40,9 +61,33 @@ To install this header into your Open edX micro-frontend, run the following comm
 
 This will make the component available to be imported into your application.
 
-*****
+Cloning and Startup
+===================
+
+.. code-block::
+
+
+  1. Clone your new repo:
+
+    ``git clone https://github.com/openedx/frontend-component-header.git``
+
+  2. Use node v18.x.
+
+    The current version of the micro-frontend build scripts support node 18.
+    Using other major versions of node *may* work, but this is unsupported.  For
+    convenience, this repository includes an .nvmrc file to help in setting the
+    correct node version via `nvm <https://github.com/nvm-sh/nvm>`_.
+
+  3. Install npm dependencies:
+
+    ``cd frontend-component-header && npm ci``
+
+  4. Start the dev server:
+
+    ``npm start``
+
 Usage
-*****
+=====
 
 This library has the following exports:
 
@@ -53,17 +98,15 @@ This library has the following exports:
 Examples
 ========
 
-* `An example of component and messages usage. <https://github.com/edx/frontend-template-application/blob/3355bb3a96232390e9056f35b06ffa8f105ed7ca/src/index.jsx#L21>`_
-* `An example of SCSS file usage. <https://github.com/edx/frontend-template-application/blob/3cd5485bf387b8c479baf6b02bf59e3061dc3465/src/index.scss#L8>`_
+* `An example of component and messages usage. <https://github.com/openedx/frontend-template-application/blob/3355bb3a96232390e9056f35b06ffa8f105ed7ca/src/index.jsx#L21>`_
+* `An example of SCSS file usage. <https://github.com/openedx/frontend-template-application/blob/3cd5485bf387b8c479baf6b02bf59e3061dc3465/src/index.scss#L8>`_
 
-
-***********
 Development
-***********
+===========
 
 Install dependencies::
 
-  npm i
+  npm ci
 
 Start the development server::
 
@@ -73,6 +116,63 @@ Build a production distribution::
 
   npm run build
 
+License
+=======
+
+The code in this repository is licensed under the AGPLv3 unless otherwise
+noted.
+
+Please see `LICENSE <LICENSE>`_ for details.
+
+Contributing
+============
+
+Contributions are very welcome.  Please read `How To Contribute`_ for details.
+
+.. _How To Contribute: https://openedx.org/r/how-to-contribute
+
+This project is currently accepting all types of contributions, bug fixes,
+security fixes, maintenance work, or new features.  However, please make sure
+to have a discussion about your new feature idea with the maintainers prior to
+beginning development to maximize the chances of your change being accepted.
+You can start a conversation by creating a new issue on this repo summarizing
+your idea.
+
+Getting Help
+===========
+
+If you're having trouble, we have discussion forums at
+https://discuss.openedx.org where you can connect with others in the community.
+
+Our real-time conversations are on Slack. You can request a `Slack
+invitation`_, then join our `community Slack workspace`_.  Because this is a
+frontend repository, the best place to discuss it would be in the `#wg-frontend
+channel`_.
+
+For anything non-trivial, the best path is to open an issue in this repository
+with as many details about the issue you are facing as you can provide.
+
+https://github.com/openedx/frontend-component-header/issues
+
+For more information about these options, see the `Getting Help`_ page.
+
+.. _Slack invitation: https://openedx.org/slack
+.. _community Slack workspace: https://openedx.slack.com/
+.. _#wg-frontend channel: https://openedx.slack.com/archives/C04BM6YC7A6
+.. _Getting Help: https://openedx.org/community/connect
+
+The Open edX Code of Conduct
+============================
+
+All community members are expected to follow the `Open edX Code of Conduct`_.
+
+.. _Open edX Code of Conduct: https://openedx.org/code-of-conduct/
+
+Reporting Security Issues
+=========================
+
+Please do not report security issues in public. Please email security@openedx.org.
+
 .. |Build Status| image:: https://api.travis-ci.com/edx/frontend-component-header.svg?branch=master
    :target: https://travis-ci.com/edx/frontend-component-header
 .. |Codecov| image:: https://img.shields.io/codecov/c/github/edx/frontend-component-header
@@ -84,4 +184,4 @@ Build a production distribution::
 .. |license| image:: https://img.shields.io/npm/l/@edx/frontend-component-header.svg
    :target: @edx/frontend-component-header
 .. |semantic-release| image:: https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg
-   :target: https://github.com/semantic-release/semantic-release
+   :target: https://github.com/semantic-release/semantic-release

package.json

@@ -8,7 +8,7 @@
   },
   "scripts": {
     "build": "make build",
-    "i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
+    "i18n_extract": "fedx-scripts formatjs extract",
     "lint": "fedx-scripts eslint --ext .js --ext .jsx .",
     "snapshot": "fedx-scripts jest --updateSnapshot",
     "start": "fedx-scripts webpack-dev-server --progress",
@@ -24,53 +24,53 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/edx/frontend-component-header.git"
+    "url": "git+https://github.com/openedx/frontend-component-header.git"
   },
   "author": "edX",
   "license": "AGPL-3.0",
   "bugs": {
-    "url": "https://github.com/edx/frontend-component-header/issues"
+    "url": "https://github.com/openedx/frontend-component-header/issues"
   },
-  "homepage": "https://github.com/edx/frontend-component-header#readme",
+  "homepage": "https://github.com/openedx/frontend-component-header#readme",
   "devDependencies": {
-    "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
-    "@edx/frontend-build": "11.0.2",
-    "@edx/frontend-platform": "2.5.0",
-    "@edx/paragon": "19.25.3",
-    "codecov": "3.8.3",
+    "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
+    "@edx/browserslist-config": "^1.1.1",
+    "@edx/frontend-build": "13.0.3",
+    "@edx/frontend-platform": "6.0.2",
+    "@edx/reactifex": "^2.1.1",
+    "@testing-library/dom": "9.3.3",
+    "@testing-library/jest-dom": "5.17.0",
+    "@testing-library/react": "10.4.9",
+    "@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
     "enzyme": "3.11.0",
-    "enzyme-adapter-react-16": "1.15.6",
-    "husky": "7.0.4",
+    "husky": "8.0.3",
+    "jest": "29.7.0",
+    "jest-chain": "1.1.6",
     "prop-types": "15.8.1",
-    "react": "16.14.0",
-    "react-dom": "16.14.0",
-    "react-redux": "7.2.8",
-    "react-router-dom": "5.3.3",
-    "react-test-renderer": "16.14.0",
-    "reactifex": "1.1.1",
-    "redux": "4.2.0",
-    "redux-saga": "1.1.3",
-    "@testing-library/dom": "8.16.0",
-    "@testing-library/jest-dom": "5.16.4",
-    "jest": "28.1.3",
-    "jest-chain": "1.1.5",
-    "@testing-library/react": "10.4.9"
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
+    "react-redux": "7.2.9",
+    "react-router-dom": "6.17.0",
+    "react-test-renderer": "17.0.2",
+    "redux": "4.2.1",
+    "redux-saga": "1.2.3"
   },
   "dependencies": {
+    "@edx/paragon": "21.5.6",
+    "@fortawesome/fontawesome-svg-core": "6.4.2",
+    "@fortawesome/free-brands-svg-icons": "6.4.2",
+    "@fortawesome/free-regular-svg-icons": "6.4.2",
+    "@fortawesome/free-solid-svg-icons": "6.4.2",
+    "@fortawesome/react-fontawesome": "^0.2.0",
+    "axios-mock-adapter": "1.22.0",
     "babel-polyfill": "6.26.0",
     "react-responsive": "8.2.0",
-    "react-transition-group": "4.4.2",
-    "@fortawesome/fontawesome-svg-core": "1.2.36",
-    "@fortawesome/free-brands-svg-icons": "5.15.4",
-    "@fortawesome/free-regular-svg-icons": "5.15.4",
-    "@fortawesome/free-solid-svg-icons": "5.15.4",
-    "@fortawesome/react-fontawesome": "^0.2.0"
+    "react-transition-group": "4.4.5"
   },
   "peerDependencies": {
-    "@edx/frontend-platform": "^2.0.0",
-    "@edx/paragon": ">= 7.0.0 < 21.0.0",
+    "@edx/frontend-platform": "^4.0.0 || ^5.0.0 || ^6.0.0",
     "prop-types": "^15.5.10",
-    "react": "^16.9.0",
-    "react-dom": "^16.9.0"
+    "react": "^16.9.0 || ^17.0.0",
+    "react-dom": "^16.9.0 || ^17.0.0"
   }
 }

renovate.json

@@ -22,6 +22,11 @@
         "pin"
       ],
       "automerge": true
+    },
+    {
+      "matchPackagePatterns": ["@edx", "@openedx"],
+      "matchUpdateTypes": ["minor", "patch"],
+      "automerge": true
     }
   ],
   "timezone": "America/New_York"

src/Avatar.jsx

@@ -3,12 +3,12 @@ import PropTypes from 'prop-types';
 
 import { AvatarIcon } from './Icons';
 
-function Avatar({
+const Avatar = ({
   size,
   src,
   alt,
   className,
-}) {
+}) => {
   const avatar = src ? (
     <img className="d-block w-100 h-100" src={src} alt={alt} />
   ) : (
@@ -23,7 +23,7 @@ function Avatar({
       {avatar}
     </span>
   );
-}
+};
 
 Avatar.propTypes = {
   src: PropTypes.string,

src/Header.jsx

@@ -30,7 +30,7 @@ subscribe(APP_CONFIG_INITIALIZED, () => {
   }, 'Header additional config');
 });
 
-function Header({ intl }) {
+const Header = ({ intl }) => {
   const { authenticatedUser, config } = useContext(AppContext);
 
   const mainMenu = [
@@ -55,12 +55,12 @@ function Header({ intl }) {
     },
     {
       type: 'item',
-      href: `${config.LMS_BASE_URL}/u/${authenticatedUser.username}`,
+      href: `${config.ACCOUNT_PROFILE_URL}/u/${authenticatedUser.username}`,
       content: intl.formatMessage(messages['header.user.menu.profile']),
     },
     {
       type: 'item',
-      href: `${config.LMS_BASE_URL}/account/settings`,
+      href: config.ACCOUNT_SETTINGS_URL,
       content: intl.formatMessage(messages['header.user.menu.account.settings']),
     },
     {
@@ -110,7 +110,7 @@ function Header({ intl }) {
       </Responsive>
     </>
   );
-}
+};
 
 Header.propTypes = {
   intl: intlShape.isRequired,

src/Header.test.jsx

@@ -1,3 +1,4 @@
+/* eslint-disable react/prop-types */
 import React from 'react';
 import { IntlProvider } from '@edx/frontend-platform/i18n';
 import TestRenderer from 'react-test-renderer';
@@ -6,28 +7,31 @@ import { Context as ResponsiveContext } from 'react-responsive';
 
 import Header from './index';
 
+const HeaderComponent = ({ width, contextValue }) => (
+  <ResponsiveContext.Provider value={width}>
+    <IntlProvider locale="en" messages={{}}>
+      <AppContext.Provider
+        value={contextValue}
+      >
+        <Header />
+      </AppContext.Provider>
+    </IntlProvider>
+  </ResponsiveContext.Provider>
+);
+
 describe('<Header />', () => {
   it('renders correctly for anonymous desktop', () => {
-    const component = (
-      <ResponsiveContext.Provider value={{ width: 1280 }}>
-        <IntlProvider locale="en" messages={{}}>
-          <AppContext.Provider
-            value={{
-              authenticatedUser: null,
-              config: {
-                LMS_BASE_URL: process.env.LMS_BASE_URL,
-                SITE_NAME: process.env.SITE_NAME,
-                LOGIN_URL: process.env.LOGIN_URL,
-                LOGOUT_URL: process.env.LOGOUT_URL,
-                LOGO_URL: process.env.LOGO_URL,
-              },
-            }}
-          >
-            <Header />
-          </AppContext.Provider>
-        </IntlProvider>
-      </ResponsiveContext.Provider>
-    );
+    const contextValue = {
+      authenticatedUser: null,
+      config: {
+        LMS_BASE_URL: process.env.LMS_BASE_URL,
+        SITE_NAME: process.env.SITE_NAME,
+        LOGIN_URL: process.env.LOGIN_URL,
+        LOGOUT_URL: process.env.LOGOUT_URL,
+        LOGO_URL: process.env.LOGO_URL,
+      },
+    };
+    const component = <HeaderComponent width={{ width: 1280 }} contextValue={contextValue} />;
 
     const wrapper = TestRenderer.create(component);
 
@@ -35,31 +39,22 @@ describe('<Header />', () => {
   });
 
   it('renders correctly for authenticated desktop', () => {
-    const component = (
-      <ResponsiveContext.Provider value={{ width: 1280 }}>
-        <IntlProvider locale="en" messages={{}}>
-          <AppContext.Provider
-            value={{
-              authenticatedUser: {
-                userId: 'abc123',
-                username: 'edX',
-                roles: [],
-                administrator: false,
-              },
-              config: {
-                LMS_BASE_URL: process.env.LMS_BASE_URL,
-                SITE_NAME: process.env.SITE_NAME,
-                LOGIN_URL: process.env.LOGIN_URL,
-                LOGOUT_URL: process.env.LOGOUT_URL,
-                LOGO_URL: process.env.LOGO_URL,
-              },
-            }}
-          >
-            <Header />
-          </AppContext.Provider>
-        </IntlProvider>
-      </ResponsiveContext.Provider>
-    );
+    const contextValue = {
+      authenticatedUser: {
+        userId: 'abc123',
+        username: 'edX',
+        roles: [],
+        administrator: false,
+      },
+      config: {
+        LMS_BASE_URL: process.env.LMS_BASE_URL,
+        SITE_NAME: process.env.SITE_NAME,
+        LOGIN_URL: process.env.LOGIN_URL,
+        LOGOUT_URL: process.env.LOGOUT_URL,
+        LOGO_URL: process.env.LOGO_URL,
+      },
+    };
+    const component = <HeaderComponent width={{ width: 1280 }} contextValue={contextValue} />;
 
     const wrapper = TestRenderer.create(component);
 
@@ -67,26 +62,17 @@ describe('<Header />', () => {
   });
 
   it('renders correctly for anonymous mobile', () => {
-    const component = (
-      <ResponsiveContext.Provider value={{ width: 500 }}>
-        <IntlProvider locale="en" messages={{}}>
-          <AppContext.Provider
-            value={{
-              authenticatedUser: null,
-              config: {
-                LMS_BASE_URL: process.env.LMS_BASE_URL,
-                SITE_NAME: process.env.SITE_NAME,
-                LOGIN_URL: process.env.LOGIN_URL,
-                LOGOUT_URL: process.env.LOGOUT_URL,
-                LOGO_URL: process.env.LOGO_URL,
-              },
-            }}
-          >
-            <Header />
-          </AppContext.Provider>
-        </IntlProvider>
-      </ResponsiveContext.Provider>
-    );
+    const contextValue = {
+      authenticatedUser: null,
+      config: {
+        LMS_BASE_URL: process.env.LMS_BASE_URL,
+        SITE_NAME: process.env.SITE_NAME,
+        LOGIN_URL: process.env.LOGIN_URL,
+        LOGOUT_URL: process.env.LOGOUT_URL,
+        LOGO_URL: process.env.LOGO_URL,
+      },
+    };
+    const component = <HeaderComponent width={{ width: 500 }} contextValue={contextValue} />;
 
     const wrapper = TestRenderer.create(component);
 
@@ -94,31 +80,22 @@ describe('<Header />', () => {
   });
 
   it('renders correctly for authenticated mobile', () => {
-    const component = (
-      <ResponsiveContext.Provider value={{ width: 500 }}>
-        <IntlProvider locale="en" messages={{}}>
-          <AppContext.Provider
-            value={{
-              authenticatedUser: {
-                userId: 'abc123',
-                username: 'edX',
-                roles: [],
-                administrator: false,
-              },
-              config: {
-                LMS_BASE_URL: process.env.LMS_BASE_URL,
-                SITE_NAME: process.env.SITE_NAME,
-                LOGIN_URL: process.env.LOGIN_URL,
-                LOGOUT_URL: process.env.LOGOUT_URL,
-                LOGO_URL: process.env.LOGO_URL,
-              },
-            }}
-          >
-            <Header />
-          </AppContext.Provider>
-        </IntlProvider>
-      </ResponsiveContext.Provider>
-    );
+    const contextValue = {
+      authenticatedUser: {
+        userId: 'abc123',
+        username: 'edX',
+        roles: [],
+        administrator: false,
+      },
+      config: {
+        LMS_BASE_URL: process.env.LMS_BASE_URL,
+        SITE_NAME: process.env.SITE_NAME,
+        LOGIN_URL: process.env.LOGIN_URL,
+        LOGOUT_URL: process.env.LOGOUT_URL,
+        LOGO_URL: process.env.LOGO_URL,
+      },
+    };
+    const component = <HeaderComponent width={{ width: 500 }} contextValue={contextValue} />;
 
     const wrapper = TestRenderer.create(component);
 

src/Icons.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-export const MenuIcon = props => (
+export const MenuIcon = (props) => (
   <svg
     width="24px"
     height="24px"
@@ -14,7 +14,7 @@ export const MenuIcon = props => (
   </svg>
 );
 
-export const AvatarIcon = props => (
+export const AvatarIcon = (props) => (
   <svg
     width="24px"
     height="24px"
@@ -29,7 +29,7 @@ export const AvatarIcon = props => (
   </svg>
 );
 
-export const CaretIcon = props => (
+export const CaretIcon = (props) => (
   <svg
     width="16px"
     height="16px"

src/Logo.jsx

@@ -1,29 +1,25 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-function Logo({ src, alt, ...attributes }) {
-  return (
-    <img src={src} alt={alt} {...attributes} />
-  );
-}
+const Logo = ({ src, alt, ...attributes }) => (
+  <img src={src} alt={alt} {...attributes} />
+);
 
 Logo.propTypes = {
   src: PropTypes.string.isRequired,
   alt: PropTypes.string.isRequired,
 };
 
-function LinkedLogo({
+const LinkedLogo = ({
   href,
   src,
   alt,
   ...attributes
-}) {
-  return (
-    <a href={href} {...attributes}>
-      <img className="d-block" src={src} alt={alt} />
-    </a>
-  );
-}
+}) => (
+  <a href={href} {...attributes}>
+    <img className="d-block" src={src} alt={alt} />
+  </a>
+);
 
 LinkedLogo.propTypes = {
   href: PropTypes.string.isRequired,

src/Menu/Menu.jsx

@@ -2,12 +2,10 @@ import React from 'react';
 import { CSSTransition } from 'react-transition-group';
 import PropTypes from 'prop-types';
 
-function MenuTrigger({ tag, className, ...attributes }) {
-  return React.createElement(tag, {
-    className: `menu-trigger ${className}`,
-    ...attributes,
-  });
-}
+const MenuTrigger = ({ tag, className, ...attributes }) => React.createElement(tag, {
+  className: `menu-trigger ${className}`,
+  ...attributes,
+});
 MenuTrigger.propTypes = {
   tag: PropTypes.string,
   className: PropTypes.string,
@@ -16,14 +14,13 @@ MenuTrigger.defaultProps = {
   tag: 'div',
   className: null,
 };
-const MenuTriggerType = <MenuTrigger />.type;
+const MenuTriggerComp = <MenuTrigger />;
+const MenuTriggerType = MenuTriggerComp.type;
 
-function MenuContent({ tag, className, ...attributes }) {
-  return React.createElement(tag, {
-    className: ['menu-content', className].join(' '),
-    ...attributes,
-  });
-}
+const MenuContent = ({ tag, className, ...attributes }) => React.createElement(tag, {
+  className: ['menu-content', className].join(' '),
+  ...attributes,
+});
 MenuContent.propTypes = {
   tag: PropTypes.string,
   className: PropTypes.string,

src/StudioHeader.jsx

@@ -1,99 +0,0 @@
-import React, { useContext } from 'react';
-import PropTypes from 'prop-types';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { AppContext } from '@edx/frontend-platform/react';
-import {
-  APP_CONFIG_INITIALIZED,
-  ensureConfig,
-  mergeConfig,
-  subscribe,
-} from '@edx/frontend-platform';
-
-import DesktopHeader from './DesktopHeader';
-
-import messages from './Header.messages';
-
-ensureConfig([
-  'STUDIO_BASE_URL',
-  'LOGOUT_URL',
-  'LOGIN_URL',
-  'SITE_NAME',
-  'LOGO_URL',
-  'ORDER_HISTORY_URL',
-], 'StudioHeader component');
-
-subscribe(APP_CONFIG_INITIALIZED, () => {
-  mergeConfig({
-    AUTHN_MINIMAL_HEADER: !!process.env.AUTHN_MINIMAL_HEADER,
-  }, 'StudioHeader additional config');
-});
-
-function StudioHeader({ intl, mainMenu, appMenu }) {
-  const { authenticatedUser, config } = useContext(AppContext);
-
-  const userMenu = authenticatedUser === null ? [] : [
-    {
-      type: 'item',
-      href: `${config.STUDIO_BASE_URL}`,
-      content: intl.formatMessage(messages['header.user.menu.studio.home']),
-    },
-    {
-      type: 'item',
-      href: `${config.STUDIO_BASE_URL}/maintenance`,
-      content: intl.formatMessage(messages['header.user.menu.studio.maintenance']),
-    },
-    {
-      type: 'item',
-      href: config.LOGOUT_URL,
-      content: intl.formatMessage(messages['header.user.menu.logout']),
-    },
-  ];
-
-  const props = {
-    logo: config.LOGO_URL,
-    logoAltText: config.SITE_NAME,
-    logoDestination: config.STUDIO_BASE_URL,
-    loggedIn: authenticatedUser !== null,
-    username: authenticatedUser !== null ? authenticatedUser.username : null,
-    avatar: authenticatedUser !== null ? authenticatedUser.avatar : null,
-    mainMenu,
-    userMenu,
-    appMenu,
-    loggedOutItems: [],
-  };
-
-  return <DesktopHeader {...props} />;
-}
-
-StudioHeader.propTypes = {
-  intl: intlShape.isRequired,
-  appMenu: PropTypes.shape(
-    {
-      content: PropTypes.string,
-      href: PropTypes.string,
-      menuItems: PropTypes.arrayOf(
-        PropTypes.shape({
-          type: PropTypes.string,
-          href: PropTypes.string,
-          content: PropTypes.string,
-        }),
-      ),
-    },
-  ),
-  mainMenu: PropTypes.arrayOf(
-    PropTypes.shape(
-      {
-        type: PropTypes.string,
-        href: PropTypes.string,
-        content: PropTypes.string,
-      },
-    ),
-  ),
-};
-
-StudioHeader.defaultProps = {
-  appMenu: null,
-  mainMenu: [],
-};
-
-export default injectIntl(StudioHeader);

src/StudioHeader.test.jsx

@@ -1,135 +0,0 @@
-import React from 'react';
-import { IntlProvider } from '@edx/frontend-platform/i18n';
-import TestRenderer from 'react-test-renderer';
-import { AppContext } from '@edx/frontend-platform/react';
-
-import { StudioHeader } from './index';
-
-describe('<StudioHeader />', () => {
-  it('renders correctly', () => {
-    const component = (
-      <IntlProvider locale="en" messages={{}}>
-        <AppContext.Provider
-          value={{
-            authenticatedUser: {
-              userId: 'abc123',
-              username: 'edX',
-              roles: [],
-              administrator: false,
-            },
-            config: {
-              STUDIO_BASE_URL: process.env.STUDIO_BASE_URL,
-              SITE_NAME: process.env.SITE_NAME,
-              LOGIN_URL: process.env.LOGIN_URL,
-              LOGOUT_URL: process.env.LOGOUT_URL,
-              LOGO_URL: process.env.LOGO_URL,
-            },
-          }}
-        >
-          <StudioHeader />
-        </AppContext.Provider>
-      </IntlProvider>
-    );
-
-    const wrapper = TestRenderer.create(component);
-
-    expect(wrapper.toJSON()).toMatchSnapshot();
-  });
-
-  it('renders correctly with the optional app menu', () => {
-    const appMenu = {
-      content: 'App Menu',
-      menuItems: [
-        {
-          type: 'dropdown',
-          href: 'https://menu-href-url.org',
-          content: 'Content 1',
-        },
-        {
-          type: 'dropdown',
-          href: 'https://menu-href-url.org',
-          content: 'Content 2',
-        },
-        {
-          type: 'dropdown',
-          href: 'https://menu-href-url.org',
-          content: 'Content 3',
-        },
-      ],
-    };
-    const component = (
-      <IntlProvider locale="en" messages={{}}>
-        <AppContext.Provider
-          value={{
-            authenticatedUser: {
-              userId: 'abc123',
-              username: 'edX',
-              roles: [],
-              administrator: false,
-            },
-            config: {
-              STUDIO_BASE_URL: process.env.STUDIO_BASE_URL,
-              SITE_NAME: process.env.SITE_NAME,
-              LOGIN_URL: process.env.LOGIN_URL,
-              LOGOUT_URL: process.env.LOGOUT_URL,
-              LOGO_URL: process.env.LOGO_URL,
-            },
-          }}
-        >
-          <StudioHeader appMenu={appMenu} />
-        </AppContext.Provider>
-      </IntlProvider>
-    );
-
-    const wrapper = TestRenderer.create(component);
-
-    expect(wrapper.toJSON()).toMatchSnapshot();
-  });
-
-  it('renders correctly with the optional main menu', () => {
-    const mainMenu = [
-      {
-        type: 'dropdown',
-        href: 'https://menu-href-url.org',
-        content: 'Content 1',
-      },
-      {
-        type: 'dropdown',
-        href: 'https://menu-href-url.org',
-        content: 'Content 2',
-      },
-      {
-        type: 'dropdown',
-        href: 'https://menu-href-url.org',
-        content: 'Content 3',
-      },
-    ];
-    const component = (
-      <IntlProvider locale="en" messages={{}}>
-        <AppContext.Provider
-          value={{
-            authenticatedUser: {
-              userId: 'abc123',
-              username: 'edX',
-              roles: [],
-              administrator: false,
-            },
-            config: {
-              STUDIO_BASE_URL: process.env.STUDIO_BASE_URL,
-              SITE_NAME: process.env.SITE_NAME,
-              LOGIN_URL: process.env.LOGIN_URL,
-              LOGOUT_URL: process.env.LOGOUT_URL,
-              LOGO_URL: process.env.LOGO_URL,
-            },
-          }}
-        >
-          <StudioHeader mainMenu={mainMenu} />
-        </AppContext.Provider>
-      </IntlProvider>
-    );
-
-    const wrapper = TestRenderer.create(component);
-
-    expect(wrapper.toJSON()).toMatchSnapshot();
-  });
-});

src/__snapshots__/StudioHeader.test.jsx.snap

@@ -1,425 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<StudioHeader /> renders correctly 1`] = `
-<header
-  className="site-header-desktop"
->
-  <a
-    className="nav-skip sr-only sr-only-focusable"
-    href="#main"
-  >
-    Skip to main content
-  </a>
-  <div
-    className="container-fluid null"
-  >
-    <div
-      className="nav-container position-relative d-flex align-items-center"
-    >
-      <img
-        alt="edX"
-        className="logo"
-        src="https://edx-cdn.org/v3/default/logo.svg"
-      />
-      <nav
-        aria-label="Main"
-        className="nav main-nav"
-      />
-      <nav
-        aria-label="Secondary"
-        className="nav secondary-menu-container align-items-center ml-auto"
-      >
-        <div
-          className="menu null"
-          onKeyDown={[Function]}
-          onMouseEnter={[Function]}
-          onMouseLeave={[Function]}
-        >
-          <button
-            aria-expanded={false}
-            aria-haspopup="menu"
-            aria-label="Account menu for edX"
-            className="menu-trigger btn btn-outline-primary d-inline-flex align-items-center pl-2 pr-3"
-            onClick={[Function]}
-          >
-            <span
-              className="avatar overflow-hidden d-inline-flex rounded-circle mr-2"
-              style={
-                Object {
-                  "height": "1.5em",
-                  "width": "1.5em",
-                }
-              }
-            >
-              <svg
-                aria-hidden={true}
-                focusable="false"
-                height="24px"
-                role="img"
-                style={
-                  Object {
-                    "height": "1.5em",
-                    "width": "1.5em",
-                  }
-                }
-                version="1.1"
-                viewBox="0 0 24 24"
-                width="24px"
-              >
-                <path
-                  d="M4.10255106,18.1351061 C4.7170266,16.0581859 8.01891846,14.4720277 12,14.4720277 C15.9810815,14.4720277 19.2829734,16.0581859 19.8974489,18.1351061 C21.215206,16.4412566 22,14.3122775 22,12 C22,6.4771525 17.5228475,2 12,2 C6.4771525,2 2,6.4771525 2,12 C2,14.3122775 2.78479405,16.4412566 4.10255106,18.1351061 Z M12,24 C5.372583,24 0,18.627417 0,12 C0,5.372583 5.372583,0 12,0 C18.627417,0 24,5.372583 24,12 C24,18.627417 18.627417,24 12,24 Z M12,13 C9.790861,13 8,11.209139 8,9 C8,6.790861 9.790861,5 12,5 C14.209139,5 16,6.790861 16,9 C16,11.209139 14.209139,13 12,13 Z"
-                  fill="currentColor"
-                />
-              </svg>
-            </span>
-            edX
-             
-            <svg
-              aria-hidden={true}
-              focusable="false"
-              height="16px"
-              role="img"
-              version="1.1"
-              viewBox="0 0 16 16"
-              width="16px"
-            >
-              <path
-                d="M7,4 L7,8 L11,8 L11,10 L5,10 L5,4 L7,4 Z"
-                fill="currentColor"
-                transform="translate(8.000000, 7.000000) rotate(-45.000000) translate(-8.000000, -7.000000) "
-              />
-            </svg>
-          </button>
-        </div>
-      </nav>
-    </div>
-  </div>
-</header>
-`;
-
-exports[`<StudioHeader /> renders correctly with the optional app menu 1`] = `
-<header
-  className="site-header-desktop"
->
-  <a
-    className="nav-skip sr-only sr-only-focusable"
-    href="#main"
-  >
-    Skip to main content
-  </a>
-  <div
-    className="container-fluid null"
-  >
-    <div
-      className="nav-container position-relative d-flex align-items-center"
-    >
-      <img
-        alt="edX"
-        className="logo"
-        src="https://edx-cdn.org/v3/default/logo.svg"
-      />
-      <nav
-        aria-label="Main"
-        className="nav main-nav"
-      />
-      <nav
-        aria-label="App"
-        className="nav app-nav"
-      >
-        <div
-          className="menu null"
-          onKeyDown={[Function]}
-          onMouseEnter={[Function]}
-          onMouseLeave={[Function]}
-        >
-          <a
-            aria-expanded={false}
-            aria-haspopup="menu"
-            className="menu-trigger nav-link d-inline-flex align-items-center"
-            onClick={[Function]}
-          >
-            App Menu
-             
-            <svg
-              aria-hidden={true}
-              focusable="false"
-              height="16px"
-              role="img"
-              version="1.1"
-              viewBox="0 0 16 16"
-              width="16px"
-            >
-              <path
-                d="M7,4 L7,8 L11,8 L11,10 L5,10 L5,4 L7,4 Z"
-                fill="currentColor"
-                transform="translate(8.000000, 7.000000) rotate(-45.000000) translate(-8.000000, -7.000000) "
-              />
-            </svg>
-          </a>
-        </div>
-      </nav>
-      <nav
-        aria-label="Secondary"
-        className="nav secondary-menu-container align-items-center ml-auto"
-      >
-        <div
-          className="menu null"
-          onKeyDown={[Function]}
-          onMouseEnter={[Function]}
-          onMouseLeave={[Function]}
-        >
-          <button
-            aria-expanded={false}
-            aria-haspopup="menu"
-            aria-label="Account menu for edX"
-            className="menu-trigger btn btn-outline-primary d-inline-flex align-items-center pl-2 pr-3"
-            onClick={[Function]}
-          >
-            <span
-              className="avatar overflow-hidden d-inline-flex rounded-circle mr-2"
-              style={
-                Object {
-                  "height": "1.5em",
-                  "width": "1.5em",
-                }
-              }
-            >
-              <svg
-                aria-hidden={true}
-                focusable="false"
-                height="24px"
-                role="img"
-                style={
-                  Object {
-                    "height": "1.5em",
-                    "width": "1.5em",
-                  }
-                }
-                version="1.1"
-                viewBox="0 0 24 24"
-                width="24px"
-              >
-                <path
-                  d="M4.10255106,18.1351061 C4.7170266,16.0581859 8.01891846,14.4720277 12,14.4720277 C15.9810815,14.4720277 19.2829734,16.0581859 19.8974489,18.1351061 C21.215206,16.4412566 22,14.3122775 22,12 C22,6.4771525 17.5228475,2 12,2 C6.4771525,2 2,6.4771525 2,12 C2,14.3122775 2.78479405,16.4412566 4.10255106,18.1351061 Z M12,24 C5.372583,24 0,18.627417 0,12 C0,5.372583 5.372583,0 12,0 C18.627417,0 24,5.372583 24,12 C24,18.627417 18.627417,24 12,24 Z M12,13 C9.790861,13 8,11.209139 8,9 C8,6.790861 9.790861,5 12,5 C14.209139,5 16,6.790861 16,9 C16,11.209139 14.209139,13 12,13 Z"
-                  fill="currentColor"
-                />
-              </svg>
-            </span>
-            edX
-             
-            <svg
-              aria-hidden={true}
-              focusable="false"
-              height="16px"
-              role="img"
-              version="1.1"
-              viewBox="0 0 16 16"
-              width="16px"
-            >
-              <path
-                d="M7,4 L7,8 L11,8 L11,10 L5,10 L5,4 L7,4 Z"
-                fill="currentColor"
-                transform="translate(8.000000, 7.000000) rotate(-45.000000) translate(-8.000000, -7.000000) "
-              />
-            </svg>
-          </button>
-        </div>
-      </nav>
-    </div>
-  </div>
-</header>
-`;
-
-exports[`<StudioHeader /> renders correctly with the optional main menu 1`] = `
-<header
-  className="site-header-desktop"
->
-  <a
-    className="nav-skip sr-only sr-only-focusable"
-    href="#main"
-  >
-    Skip to main content
-  </a>
-  <div
-    className="container-fluid null"
-  >
-    <div
-      className="nav-container position-relative d-flex align-items-center"
-    >
-      <img
-        alt="edX"
-        className="logo"
-        src="https://edx-cdn.org/v3/default/logo.svg"
-      />
-      <nav
-        aria-label="Main"
-        className="nav main-nav"
-      >
-        <div
-          className="menu nav-item"
-          onKeyDown={[Function]}
-          onMouseEnter={[Function]}
-          onMouseLeave={[Function]}
-        >
-          <a
-            aria-expanded={false}
-            aria-haspopup="menu"
-            className="menu-trigger nav-link d-inline-flex align-items-center"
-            href="https://menu-href-url.org"
-            onClick={[Function]}
-          >
-            Content 1
-             
-            <svg
-              aria-hidden={true}
-              focusable="false"
-              height="16px"
-              role="img"
-              version="1.1"
-              viewBox="0 0 16 16"
-              width="16px"
-            >
-              <path
-                d="M7,4 L7,8 L11,8 L11,10 L5,10 L5,4 L7,4 Z"
-                fill="currentColor"
-                transform="translate(8.000000, 7.000000) rotate(-45.000000) translate(-8.000000, -7.000000) "
-              />
-            </svg>
-          </a>
-        </div>
-        <div
-          className="menu nav-item"
-          onKeyDown={[Function]}
-          onMouseEnter={[Function]}
-          onMouseLeave={[Function]}
-        >
-          <a
-            aria-expanded={false}
-            aria-haspopup="menu"
-            className="menu-trigger nav-link d-inline-flex align-items-center"
-            href="https://menu-href-url.org"
-            onClick={[Function]}
-          >
-            Content 2
-             
-            <svg
-              aria-hidden={true}
-              focusable="false"
-              height="16px"
-              role="img"
-              version="1.1"
-              viewBox="0 0 16 16"
-              width="16px"
-            >
-              <path
-                d="M7,4 L7,8 L11,8 L11,10 L5,10 L5,4 L7,4 Z"
-                fill="currentColor"
-                transform="translate(8.000000, 7.000000) rotate(-45.000000) translate(-8.000000, -7.000000) "
-              />
-            </svg>
-          </a>
-        </div>
-        <div
-          className="menu nav-item"
-          onKeyDown={[Function]}
-          onMouseEnter={[Function]}
-          onMouseLeave={[Function]}
-        >
-          <a
-            aria-expanded={false}
-            aria-haspopup="menu"
-            className="menu-trigger nav-link d-inline-flex align-items-center"
-            href="https://menu-href-url.org"
-            onClick={[Function]}
-          >
-            Content 3
-             
-            <svg
-              aria-hidden={true}
-              focusable="false"
-              height="16px"
-              role="img"
-              version="1.1"
-              viewBox="0 0 16 16"
-              width="16px"
-            >
-              <path
-                d="M7,4 L7,8 L11,8 L11,10 L5,10 L5,4 L7,4 Z"
-                fill="currentColor"
-                transform="translate(8.000000, 7.000000) rotate(-45.000000) translate(-8.000000, -7.000000) "
-              />
-            </svg>
-          </a>
-        </div>
-      </nav>
-      <nav
-        aria-label="Secondary"
-        className="nav secondary-menu-container align-items-center ml-auto"
-      >
-        <div
-          className="menu null"
-          onKeyDown={[Function]}
-          onMouseEnter={[Function]}
-          onMouseLeave={[Function]}
-        >
-          <button
-            aria-expanded={false}
-            aria-haspopup="menu"
-            aria-label="Account menu for edX"
-            className="menu-trigger btn btn-outline-primary d-inline-flex align-items-center pl-2 pr-3"
-            onClick={[Function]}
-          >
-            <span
-              className="avatar overflow-hidden d-inline-flex rounded-circle mr-2"
-              style={
-                Object {
-                  "height": "1.5em",
-                  "width": "1.5em",
-                }
-              }
-            >
-              <svg
-                aria-hidden={true}
-                focusable="false"
-                height="24px"
-                role="img"
-                style={
-                  Object {
-                    "height": "1.5em",
-                    "width": "1.5em",
-                  }
-                }
-                version="1.1"
-                viewBox="0 0 24 24"
-                width="24px"
-              >
-                <path
-                  d="M4.10255106,18.1351061 C4.7170266,16.0581859 8.01891846,14.4720277 12,14.4720277 C15.9810815,14.4720277 19.2829734,16.0581859 19.8974489,18.1351061 C21.215206,16.4412566 22,14.3122775 22,12 C22,6.4771525 17.5228475,2 12,2 C6.4771525,2 2,6.4771525 2,12 C2,14.3122775 2.78479405,16.4412566 4.10255106,18.1351061 Z M12,24 C5.372583,24 0,18.627417 0,12 C0,5.372583 5.372583,0 12,0 C18.627417,0 24,5.372583 24,12 C24,18.627417 18.627417,24 12,24 Z M12,13 C9.790861,13 8,11.209139 8,9 C8,6.790861 9.790861,5 12,5 C14.209139,5 16,6.790861 16,9 C16,11.209139 14.209139,13 12,13 Z"
-                  fill="currentColor"
-                />
-              </svg>
-            </span>
-            edX
-             
-            <svg
-              aria-hidden={true}
-              focusable="false"
-              height="16px"
-              role="img"
-              version="1.1"
-              viewBox="0 0 16 16"
-              width="16px"
-            >
-              <path
-                d="M7,4 L7,8 L11,8 L11,10 L5,10 L5,4 L7,4 Z"
-                fill="currentColor"
-                transform="translate(8.000000, 7.000000) rotate(-45.000000) translate(-8.000000, -7.000000) "
-              />
-            </svg>
-          </button>
-        </div>
-      </nav>
-    </div>
-  </div>
-</header>
-`;

src/i18n/index.js

@@ -1,34 +1,28 @@
 import arMessages from './messages/ar.json';
-
-import caMessages from './messages/ca.json';
-import heMessages from './messages/he.json';
-import idMessages from './messages/id.json';
-import plMessages from './messages/pl.json';
-import ruMessages from './messages/ru.json';
-import thMessages from './messages/th.json';
-import ukMessages from './messages/uk.json';
-
-// no need to import en messages-- they are in the defaultMessage field
-import es419Messages from './messages/es_419.json';
 import frMessages from './messages/fr.json';
-import kokrMessages from './messages/ko_KR.json';
-import ptbrMessages from './messages/pt_BR.json';
+import es419Messages from './messages/es_419.json';
 import zhcnMessages from './messages/zh_CN.json';
+import ptMessages from './messages/pt.json';
+import itMessages from './messages/it.json';
+import ukMessages from './messages/uk.json';
+import deMessages from './messages/de.json';
+import ruMessages from './messages/ru.json';
+import hiMessages from './messages/hi.json';
+import frCAMessages from './messages/fr_CA.json';
+// no need to import en messages-- they are in the defaultMessage field
 
 const messages = {
   ar: arMessages,
-  ca: caMessages,
-  he: heMessages,
-  id: idMessages,
-  pl: plMessages,
-  ru: ruMessages,
-  th: thMessages,
-  uk: ukMessages,
   'es-419': es419Messages,
   fr: frMessages,
   'zh-cn': zhcnMessages,
-  'ko-kr': kokrMessages,
-  'pt-br': ptbrMessages,
+  pt: ptMessages,
+  it: itMessages,
+  de: deMessages,
+  hi: hiMessages,
+  'fr-ca': frCAMessages,
+  ru: ruMessages,
+  uk: ukMessages,
 };
 
 export default messages;

src/i18n/messages/ar.json

@@ -1,33 +1,56 @@
 {
   "general.register.sentenceCase": "التسجيل",
   "general.signIn.sentenceCase": "تسجيل الدخول",
-  "header.links.courses": "مساقات",
-  "header.links.programs": "برامج",
-  "header.links.content.search": "استكشف الجديد",
-  "header.links.schools": "المدارس والشركاء",
+  "header.links.courses": "المساقات",
+  "header.links.programs": "البرامج",
+  "header.links.content.search": "اكتشف الجديد",
+  "header.links.schools": "المدارس و الشركاء",
   "header.user.menu.dashboard": "لوحة المعلومات",
   "header.user.menu.profile": "الملف الشخصي",
-  "header.user.menu.account.settings": "حساب",
-  "header.user.menu.order.history": "سجل الطلبات",
+  "header.user.menu.account.settings": "الحساب",
+  "header.user.menu.order.history": "سجل الطلبيات",
   "header.user.menu.logout": "تسجيل الخروج",
   "header.user.menu.login": "تسجيل الدخول",
-  "header.user.menu.register": "تسجيل ",
-  "header.user.menu.studio.home": "Studio Home",
-  "header.user.menu.studio.maintenance": "Maintenance",
-  "header.label.account.nav": "حساب",
+  "header.user.menu.register": "التسجيل",
+  "header.user.menu.studio.home": "صفحة الاستوديو الرئيسية",
+  "header.user.menu.studio.maintenance": "الصيانة",
+  "header.label.account.nav": "الحساب",
   "header.label.account.menu": "قائمة الحساب",
-  "header.label.account.menu.for": "قائمة الحساب للمستخدم {username}",
-  "header.label.main.nav": "الرئيسية",
+  "header.label.account.menu.for": "قائمة حساب المستخدم {username}",
+  "header.label.main.nav": "القا|مة الرئيسية",
   "header.label.main.menu": "القائمة الرئيسية",
   "header.label.main.header": "الرئيسية",
-  "header.label.secondary.nav": "فرعي",
+  "header.label.secondary.nav": "القائمة الثانوية",
   "header.label.skip.nav": "التخطي إلى المحتوى الرئيسي",
-  "header.label.app.nav": "App",
+  "header.label.app.nav": "تطبيق",
   "header.menu.dashboard.label": "لوحة المعلومات",
-  "header.help.label": "مساعدة",
+  "header.help.label": "المساعدة",
   "header.menu.profile.label": "الملف الشخصي",
-  "header.menu.account.label": "حساب",
-  "header.menu.orderHistory.label": "سجل الطلبات",
+  "header.menu.account.label": "الحساب",
+  "header.menu.orderHistory.label": "سجل الطلبيات",
   "header.navigation.skipNavLink": "التخطي إلى المحتوى الرئيسي",
-  "header.menu.signOut.label": "تسجيل الخروج"
+  "header.menu.signOut.label": "تسجيل الخروج",
+  "header.links.content": "Content",
+  "header.links.settings": "Settings",
+  "header.links.content.tools": "Tools",
+  "header.links.outline": "Outline",
+  "header.links.updates": "Updates",
+  "header.links.pages": "Pages & Resources",
+  "header.links.filesAndUploads": "Files & Uploads",
+  "header.links.textbooks": "Textbooks",
+  "header.links.videoUploads": "Video Uploads",
+  "header.links.scheduleAndDetails": "Schedule & Details",
+  "header.links.grading": "Grading",
+  "header.links.courseTeam": "Course Team",
+  "header.links.groupConfigurations": "Group Configurations",
+  "header.links.proctoredExamSettings": "Proctored Exam Settings",
+  "header.links.advancedSettings": "Advanced Settings",
+  "header.links.certificates": "Certificates",
+  "header.links.publisher": "Publisher",
+  "header.links.import": "Import",
+  "header.links.export": "Export",
+  "header.links.checklists": "Checklists",
+  "header.user.menu.studio": "Studio Home",
+  "header.user.menu.maintenance": "Maintenance",
+  "header.label.courseOutline": "Back to course outline in Studio"
 }

src/i18n/messages/ca.json

@@ -1 +0,0 @@
-{}

src/i18n/messages/de.json

@@ -0,0 +1,56 @@
+{
+  "general.register.sentenceCase": "Register",
+  "general.signIn.sentenceCase": "Sign in",
+  "header.links.courses": "Courses",
+  "header.links.programs": "Programs",
+  "header.links.content.search": "Discover New",
+  "header.links.schools": "Schools & Partners",
+  "header.user.menu.dashboard": "Dashboard",
+  "header.user.menu.profile": "Profile",
+  "header.user.menu.account.settings": "Account",
+  "header.user.menu.order.history": "Order History",
+  "header.user.menu.logout": "Logout",
+  "header.user.menu.login": "Login",
+  "header.user.menu.register": "Sign Up",
+  "header.user.menu.studio.home": "Studio Home",
+  "header.user.menu.studio.maintenance": "Maintenance",
+  "header.label.account.nav": "Account",
+  "header.label.account.menu": "Account Menu",
+  "header.label.account.menu.for": "Account menu for {username}",
+  "header.label.main.nav": "Main",
+  "header.label.main.menu": "Main Menu",
+  "header.label.main.header": "Main",
+  "header.label.secondary.nav": "Secondary",
+  "header.label.skip.nav": "Skip to main content",
+  "header.label.app.nav": "App",
+  "header.menu.dashboard.label": "Dashboard",
+  "header.help.label": "Help",
+  "header.menu.profile.label": "Profile",
+  "header.menu.account.label": "Account",
+  "header.menu.orderHistory.label": "Order History",
+  "header.navigation.skipNavLink": "Skip to main content.",
+  "header.menu.signOut.label": "Sign Out",
+  "header.links.content": "Content",
+  "header.links.settings": "Settings",
+  "header.links.content.tools": "Tools",
+  "header.links.outline": "Outline",
+  "header.links.updates": "Updates",
+  "header.links.pages": "Pages & Resources",
+  "header.links.filesAndUploads": "Files & Uploads",
+  "header.links.textbooks": "Textbooks",
+  "header.links.videoUploads": "Video Uploads",
+  "header.links.scheduleAndDetails": "Schedule & Details",
+  "header.links.grading": "Grading",
+  "header.links.courseTeam": "Course Team",
+  "header.links.groupConfigurations": "Group Configurations",
+  "header.links.proctoredExamSettings": "Proctored Exam Settings",
+  "header.links.advancedSettings": "Advanced Settings",
+  "header.links.certificates": "Certificates",
+  "header.links.publisher": "Publisher",
+  "header.links.import": "Import",
+  "header.links.export": "Export",
+  "header.links.checklists": "Checklists",
+  "header.user.menu.studio": "Studio Home",
+  "header.user.menu.maintenance": "Maintenance",
+  "header.label.courseOutline": "Back to course outline in Studio"
+}

src/i18n/messages/es_419.json

@@ -12,8 +12,8 @@
   "header.user.menu.logout": "Cerrar sesión",
   "header.user.menu.login": "Login",
   "header.user.menu.register": "Registrarse",
-  "header.user.menu.studio.home": "Studio Home",
-  "header.user.menu.studio.maintenance": "Maintenance",
+  "header.user.menu.studio.home": "Inicio Studio",
+  "header.user.menu.studio.maintenance": "Mantenimiento",
   "header.label.account.nav": "Cuenta",
   "header.label.account.menu": "Menú de la cuenta",
   "header.label.account.menu.for": "Menú de la cuenta para {username}",
@@ -22,12 +22,35 @@
   "header.label.main.header": "Principal",
   "header.label.secondary.nav": "Secondary",
   "header.label.skip.nav": "Ir al contenido principal",
-  "header.label.app.nav": "App",
+  "header.label.app.nav": "Aplicación",
   "header.menu.dashboard.label": "Panel de Control",
   "header.help.label": "Ayuda",
   "header.menu.profile.label": "Perfil",
   "header.menu.account.label": "Cuenta",
   "header.menu.orderHistory.label": "Historial de órdenes",
   "header.navigation.skipNavLink": "Dirígete al contenido principal.",
-  "header.menu.signOut.label": "Cerrar sesión"
+  "header.menu.signOut.label": "Cerrar sesión",
+  "header.links.content": "Contenido",
+  "header.links.settings": "Configuración",
+  "header.links.content.tools": "Herramientas",
+  "header.links.outline": "Estructura",
+  "header.links.updates": "Actualizaciones",
+  "header.links.pages": "Páginas & Recursos",
+  "header.links.filesAndUploads": "Administración de archivos",
+  "header.links.textbooks": "Libros de texto",
+  "header.links.videoUploads": "Carga de videos",
+  "header.links.scheduleAndDetails": "Calendario y detalles",
+  "header.links.grading": "Calificaciones",
+  "header.links.courseTeam": "Equipo del curso",
+  "header.links.groupConfigurations": "Configuraciones de Grupo",
+  "header.links.proctoredExamSettings": "Configuración de Exámenes Supervisados",
+  "header.links.advancedSettings": "Configuración avanzada",
+  "header.links.certificates": "Certificados",
+  "header.links.publisher": "Publisher",
+  "header.links.import": "Importar",
+  "header.links.export": "Exportar",
+  "header.links.checklists": "Listas de chequeo",
+  "header.user.menu.studio": "Inicio Studio",
+  "header.user.menu.maintenance": "Mantenimiento",
+  "header.label.courseOutline": "Volver al esquema del curso en Studio"
 }

src/i18n/messages/fr.json

@@ -29,5 +29,28 @@
   "header.menu.account.label": "Compte",
   "header.menu.orderHistory.label": "Historique des commandes",
   "header.navigation.skipNavLink": "Passer au contenu principal",
-  "header.menu.signOut.label": "Se déconnecter"
+  "header.menu.signOut.label": "Se déconnecter",
+  "header.links.content": "Content",
+  "header.links.settings": "Settings",
+  "header.links.content.tools": "Tools",
+  "header.links.outline": "Outline",
+  "header.links.updates": "Updates",
+  "header.links.pages": "Pages & Resources",
+  "header.links.filesAndUploads": "Files & Uploads",
+  "header.links.textbooks": "Textbooks",
+  "header.links.videoUploads": "Video Uploads",
+  "header.links.scheduleAndDetails": "Schedule & Details",
+  "header.links.grading": "Grading",
+  "header.links.courseTeam": "Course Team",
+  "header.links.groupConfigurations": "Group Configurations",
+  "header.links.proctoredExamSettings": "Proctored Exam Settings",
+  "header.links.advancedSettings": "Advanced Settings",
+  "header.links.certificates": "Certificates",
+  "header.links.publisher": "Publisher",
+  "header.links.import": "Import",
+  "header.links.export": "Export",
+  "header.links.checklists": "Checklists",
+  "header.user.menu.studio": "Studio Home",
+  "header.user.menu.maintenance": "Maintenance",
+  "header.label.courseOutline": "Back to course outline in Studio"
 }

src/i18n/messages/fr_CA.json

@@ -29,5 +29,28 @@
   "header.menu.account.label": "Compte",
   "header.menu.orderHistory.label": "Historique des commandes",
   "header.navigation.skipNavLink": "Passer au contenu principal.",
-  "header.menu.signOut.label": "Se déconnecter"
+  "header.menu.signOut.label": "Se déconnecter",
+  "header.links.content": "Contenu",
+  "header.links.settings": "Paramètres",
+  "header.links.content.tools": "Outils",
+  "header.links.outline": "Plan de cours",
+  "header.links.updates": "Annonces",
+  "header.links.pages": "Pages et ressources",
+  "header.links.filesAndUploads": "Fichiers et téléversements",
+  "header.links.textbooks": "Manuels",
+  "header.links.videoUploads": "Téléversements des vidéos",
+  "header.links.scheduleAndDetails": "Dates et détails",
+  "header.links.grading": "Évaluation",
+  "header.links.courseTeam": "Équipe de cours",
+  "header.links.groupConfigurations": "Configuration des groupes",
+  "header.links.proctoredExamSettings": "Paramètres d'examen surveillé",
+  "header.links.advancedSettings": "Paramètres avancés",
+  "header.links.certificates": "Attestations",
+  "header.links.publisher": "Éditeur",
+  "header.links.import": "Importer",
+  "header.links.export": "Exporter",
+  "header.links.checklists": "Listes de contrôle",
+  "header.user.menu.studio": "Accueil Studio",
+  "header.user.menu.maintenance": "Entretien",
+  "header.label.courseOutline": "Retour au plan de cours dans Studio"
 }

src/i18n/messages/he.json

@@ -1 +0,0 @@
-{}

src/i18n/messages/hi.json

@@ -0,0 +1,56 @@
+{
+  "general.register.sentenceCase": "Register",
+  "general.signIn.sentenceCase": "Sign in",
+  "header.links.courses": "Courses",
+  "header.links.programs": "Programs",
+  "header.links.content.search": "Discover New",
+  "header.links.schools": "Schools & Partners",
+  "header.user.menu.dashboard": "Dashboard",
+  "header.user.menu.profile": "Profile",
+  "header.user.menu.account.settings": "Account",
+  "header.user.menu.order.history": "Order History",
+  "header.user.menu.logout": "Logout",
+  "header.user.menu.login": "Login",
+  "header.user.menu.register": "Sign Up",
+  "header.user.menu.studio.home": "Studio Home",
+  "header.user.menu.studio.maintenance": "Maintenance",
+  "header.label.account.nav": "Account",
+  "header.label.account.menu": "Account Menu",
+  "header.label.account.menu.for": "Account menu for {username}",
+  "header.label.main.nav": "Main",
+  "header.label.main.menu": "Main Menu",
+  "header.label.main.header": "Main",
+  "header.label.secondary.nav": "Secondary",
+  "header.label.skip.nav": "Skip to main content",
+  "header.label.app.nav": "App",
+  "header.menu.dashboard.label": "Dashboard",
+  "header.help.label": "Help",
+  "header.menu.profile.label": "Profile",
+  "header.menu.account.label": "Account",
+  "header.menu.orderHistory.label": "Order History",
+  "header.navigation.skipNavLink": "Skip to main content.",
+  "header.menu.signOut.label": "Sign Out",
+  "header.links.content": "Content",
+  "header.links.settings": "Settings",
+  "header.links.content.tools": "Tools",
+  "header.links.outline": "Outline",
+  "header.links.updates": "Updates",
+  "header.links.pages": "Pages & Resources",
+  "header.links.filesAndUploads": "Files & Uploads",
+  "header.links.textbooks": "Textbooks",
+  "header.links.videoUploads": "Video Uploads",
+  "header.links.scheduleAndDetails": "Schedule & Details",
+  "header.links.grading": "Grading",
+  "header.links.courseTeam": "Course Team",
+  "header.links.groupConfigurations": "Group Configurations",
+  "header.links.proctoredExamSettings": "Proctored Exam Settings",
+  "header.links.advancedSettings": "Advanced Settings",
+  "header.links.certificates": "Certificates",
+  "header.links.publisher": "Publisher",
+  "header.links.import": "Import",
+  "header.links.export": "Export",
+  "header.links.checklists": "Checklists",
+  "header.user.menu.studio": "Studio Home",
+  "header.user.menu.maintenance": "Maintenance",
+  "header.label.courseOutline": "Back to course outline in Studio"
+}

src/i18n/messages/id.json

@@ -1 +0,0 @@
-{}

src/i18n/messages/it.json

@@ -0,0 +1,56 @@
+{
+  "general.register.sentenceCase": "Register",
+  "general.signIn.sentenceCase": "Sign in",
+  "header.links.courses": "Courses",
+  "header.links.programs": "Programs",
+  "header.links.content.search": "Discover New",
+  "header.links.schools": "Schools & Partners",
+  "header.user.menu.dashboard": "Dashboard",
+  "header.user.menu.profile": "Profile",
+  "header.user.menu.account.settings": "Account",
+  "header.user.menu.order.history": "Order History",
+  "header.user.menu.logout": "Logout",
+  "header.user.menu.login": "Login",
+  "header.user.menu.register": "Sign Up",
+  "header.user.menu.studio.home": "Studio Home",
+  "header.user.menu.studio.maintenance": "Maintenance",
+  "header.label.account.nav": "Account",
+  "header.label.account.menu": "Account Menu",
+  "header.label.account.menu.for": "Account menu for {username}",
+  "header.label.main.nav": "Main",
+  "header.label.main.menu": "Main Menu",
+  "header.label.main.header": "Main",
+  "header.label.secondary.nav": "Secondary",
+  "header.label.skip.nav": "Skip to main content",
+  "header.label.app.nav": "App",
+  "header.menu.dashboard.label": "Dashboard",
+  "header.help.label": "Help",
+  "header.menu.profile.label": "Profile",
+  "header.menu.account.label": "Account",
+  "header.menu.orderHistory.label": "Order History",
+  "header.navigation.skipNavLink": "Skip to main content.",
+  "header.menu.signOut.label": "Sign Out",
+  "header.links.content": "Content",
+  "header.links.settings": "Settings",
+  "header.links.content.tools": "Tools",
+  "header.links.outline": "Outline",
+  "header.links.updates": "Updates",
+  "header.links.pages": "Pages & Resources",
+  "header.links.filesAndUploads": "Files & Uploads",
+  "header.links.textbooks": "Textbooks",
+  "header.links.videoUploads": "Video Uploads",
+  "header.links.scheduleAndDetails": "Schedule & Details",
+  "header.links.grading": "Grading",
+  "header.links.courseTeam": "Course Team",
+  "header.links.groupConfigurations": "Group Configurations",
+  "header.links.proctoredExamSettings": "Proctored Exam Settings",
+  "header.links.advancedSettings": "Advanced Settings",
+  "header.links.certificates": "Certificates",
+  "header.links.publisher": "Publisher",
+  "header.links.import": "Import",
+  "header.links.export": "Export",
+  "header.links.checklists": "Checklists",
+  "header.user.menu.studio": "Studio Home",
+  "header.user.menu.maintenance": "Maintenance",
+  "header.label.courseOutline": "Back to course outline in Studio"
+}

src/i18n/messages/ko_KR.json

@@ -1,2 +0,0 @@
-{
-}

src/i18n/messages/pl.json

@@ -1 +0,0 @@
-{}

src/i18n/messages/pt.json

@@ -0,0 +1,56 @@
+{
+  "general.register.sentenceCase": "Register",
+  "general.signIn.sentenceCase": "Sign in",
+  "header.links.courses": "Courses",
+  "header.links.programs": "Programs",
+  "header.links.content.search": "Discover New",
+  "header.links.schools": "Schools & Partners",
+  "header.user.menu.dashboard": "Dashboard",
+  "header.user.menu.profile": "Profile",
+  "header.user.menu.account.settings": "Account",
+  "header.user.menu.order.history": "Order History",
+  "header.user.menu.logout": "Logout",
+  "header.user.menu.login": "Login",
+  "header.user.menu.register": "Sign Up",
+  "header.user.menu.studio.home": "Studio Home",
+  "header.user.menu.studio.maintenance": "Maintenance",
+  "header.label.account.nav": "Account",
+  "header.label.account.menu": "Account Menu",
+  "header.label.account.menu.for": "Account menu for {username}",
+  "header.label.main.nav": "Main",
+  "header.label.main.menu": "Main Menu",
+  "header.label.main.header": "Main",
+  "header.label.secondary.nav": "Secondary",
+  "header.label.skip.nav": "Skip to main content",
+  "header.label.app.nav": "App",
+  "header.menu.dashboard.label": "Dashboard",
+  "header.help.label": "Help",
+  "header.menu.profile.label": "Profile",
+  "header.menu.account.label": "Account",
+  "header.menu.orderHistory.label": "Order History",
+  "header.navigation.skipNavLink": "Skip to main content.",
+  "header.menu.signOut.label": "Sign Out",
+  "header.links.content": "Content",
+  "header.links.settings": "Settings",
+  "header.links.content.tools": "Tools",
+  "header.links.outline": "Outline",
+  "header.links.updates": "Updates",
+  "header.links.pages": "Pages & Resources",
+  "header.links.filesAndUploads": "Files & Uploads",
+  "header.links.textbooks": "Textbooks",
+  "header.links.videoUploads": "Video Uploads",
+  "header.links.scheduleAndDetails": "Schedule & Details",
+  "header.links.grading": "Grading",
+  "header.links.courseTeam": "Course Team",
+  "header.links.groupConfigurations": "Group Configurations",
+  "header.links.proctoredExamSettings": "Proctored Exam Settings",
+  "header.links.advancedSettings": "Advanced Settings",
+  "header.links.certificates": "Certificates",
+  "header.links.publisher": "Publisher",
+  "header.links.import": "Import",
+  "header.links.export": "Export",
+  "header.links.checklists": "Checklists",
+  "header.user.menu.studio": "Studio Home",
+  "header.user.menu.maintenance": "Maintenance",
+  "header.label.courseOutline": "Back to course outline in Studio"
+}

src/i18n/messages/pt_BR.json

@@ -1,2 +0,0 @@
-{
-}

src/i18n/messages/ru.json

@@ -1 +1,56 @@
-{}
+{
+  "general.register.sentenceCase": "Register",
+  "general.signIn.sentenceCase": "Sign in",
+  "header.links.courses": "Courses",
+  "header.links.programs": "Programs",
+  "header.links.content.search": "Discover New",
+  "header.links.schools": "Schools & Partners",
+  "header.user.menu.dashboard": "Dashboard",
+  "header.user.menu.profile": "Profile",
+  "header.user.menu.account.settings": "Account",
+  "header.user.menu.order.history": "Order History",
+  "header.user.menu.logout": "Logout",
+  "header.user.menu.login": "Login",
+  "header.user.menu.register": "Sign Up",
+  "header.user.menu.studio.home": "Studio Home",
+  "header.user.menu.studio.maintenance": "Maintenance",
+  "header.label.account.nav": "Account",
+  "header.label.account.menu": "Account Menu",
+  "header.label.account.menu.for": "Account menu for {username}",
+  "header.label.main.nav": "Main",
+  "header.label.main.menu": "Main Menu",
+  "header.label.main.header": "Main",
+  "header.label.secondary.nav": "Secondary",
+  "header.label.skip.nav": "Skip to main content",
+  "header.label.app.nav": "App",
+  "header.menu.dashboard.label": "Dashboard",
+  "header.help.label": "Help",
+  "header.menu.profile.label": "Profile",
+  "header.menu.account.label": "Account",
+  "header.menu.orderHistory.label": "Order History",
+  "header.navigation.skipNavLink": "Skip to main content.",
+  "header.menu.signOut.label": "Sign Out",
+  "header.links.content": "Content",
+  "header.links.settings": "Settings",
+  "header.links.content.tools": "Tools",
+  "header.links.outline": "Outline",
+  "header.links.updates": "Updates",
+  "header.links.pages": "Pages & Resources",
+  "header.links.filesAndUploads": "Files & Uploads",
+  "header.links.textbooks": "Textbooks",
+  "header.links.videoUploads": "Video Uploads",
+  "header.links.scheduleAndDetails": "Schedule & Details",
+  "header.links.grading": "Grading",
+  "header.links.courseTeam": "Course Team",
+  "header.links.groupConfigurations": "Group Configurations",
+  "header.links.proctoredExamSettings": "Proctored Exam Settings",
+  "header.links.advancedSettings": "Advanced Settings",
+  "header.links.certificates": "Certificates",
+  "header.links.publisher": "Publisher",
+  "header.links.import": "Import",
+  "header.links.export": "Export",
+  "header.links.checklists": "Checklists",
+  "header.user.menu.studio": "Studio Home",
+  "header.user.menu.maintenance": "Maintenance",
+  "header.label.courseOutline": "Back to course outline in Studio"
+}

src/i18n/messages/th.json

@@ -1 +0,0 @@
-{}

src/i18n/messages/uk.json

@@ -1 +1,56 @@
-{}
+{
+  "general.register.sentenceCase": "Register",
+  "general.signIn.sentenceCase": "Увійти",
+  "header.links.courses": "Курси",
+  "header.links.programs": "Програми",
+  "header.links.content.search": "Discover New",
+  "header.links.schools": "Schools & Partners",
+  "header.user.menu.dashboard": "Dashboard",
+  "header.user.menu.profile": "Profile",
+  "header.user.menu.account.settings": "Account",
+  "header.user.menu.order.history": "Order History",
+  "header.user.menu.logout": "Logout",
+  "header.user.menu.login": "Login",
+  "header.user.menu.register": "Sign Up",
+  "header.user.menu.studio.home": "Studio Home",
+  "header.user.menu.studio.maintenance": "Maintenance",
+  "header.label.account.nav": "Account",
+  "header.label.account.menu": "Меню облікового запису",
+  "header.label.account.menu.for": "Меню облікового запису для {username}",
+  "header.label.main.nav": "Main",
+  "header.label.main.menu": "Main Menu",
+  "header.label.main.header": "Main",
+  "header.label.secondary.nav": "Secondary",
+  "header.label.skip.nav": "Перейти до головного змісту",
+  "header.label.app.nav": "App",
+  "header.menu.dashboard.label": "Dashboard",
+  "header.help.label": "Help",
+  "header.menu.profile.label": "Profile",
+  "header.menu.account.label": "Account",
+  "header.menu.orderHistory.label": "Order History",
+  "header.navigation.skipNavLink": "Перейти до головного змісту.",
+  "header.menu.signOut.label": "Sign Out",
+  "header.links.content": "Content",
+  "header.links.settings": "Settings",
+  "header.links.content.tools": "Tools",
+  "header.links.outline": "Outline",
+  "header.links.updates": "Updates",
+  "header.links.pages": "Pages & Resources",
+  "header.links.filesAndUploads": "Files & Uploads",
+  "header.links.textbooks": "Textbooks",
+  "header.links.videoUploads": "Video Uploads",
+  "header.links.scheduleAndDetails": "Schedule & Details",
+  "header.links.grading": "Grading",
+  "header.links.courseTeam": "Course Team",
+  "header.links.groupConfigurations": "Group Configurations",
+  "header.links.proctoredExamSettings": "Proctored Exam Settings",
+  "header.links.advancedSettings": "Advanced Settings",
+  "header.links.certificates": "Certificates",
+  "header.links.publisher": "Publisher",
+  "header.links.import": "Import",
+  "header.links.export": "Export",
+  "header.links.checklists": "Checklists",
+  "header.user.menu.studio": "Studio Home",
+  "header.user.menu.maintenance": "Maintenance",
+  "header.label.courseOutline": "Back to course outline in Studio"
+}

src/i18n/messages/zh_CN.json

@@ -29,5 +29,28 @@
   "header.menu.account.label": "Account",
   "header.menu.orderHistory.label": "Order History",
   "header.navigation.skipNavLink": "Skip to main content.",
-  "header.menu.signOut.label": "Sign Out"
+  "header.menu.signOut.label": "Sign Out",
+  "header.links.content": "Content",
+  "header.links.settings": "Settings",
+  "header.links.content.tools": "Tools",
+  "header.links.outline": "Outline",
+  "header.links.updates": "Updates",
+  "header.links.pages": "Pages & Resources",
+  "header.links.filesAndUploads": "Files & Uploads",
+  "header.links.textbooks": "Textbooks",
+  "header.links.videoUploads": "Video Uploads",
+  "header.links.scheduleAndDetails": "Schedule & Details",
+  "header.links.grading": "Grading",
+  "header.links.courseTeam": "Course Team",
+  "header.links.groupConfigurations": "Group Configurations",
+  "header.links.proctoredExamSettings": "Proctored Exam Settings",
+  "header.links.advancedSettings": "Advanced Settings",
+  "header.links.certificates": "Certificates",
+  "header.links.publisher": "Publisher",
+  "header.links.import": "Import",
+  "header.links.export": "Export",
+  "header.links.checklists": "Checklists",
+  "header.user.menu.studio": "Studio Home",
+  "header.user.menu.maintenance": "Maintenance",
+  "header.label.courseOutline": "Back to course outline in Studio"
 }

src/index.jsx

@@ -1,7 +1,7 @@
 import Header from './Header';
 import LearningHeader from './learning-header/LearningHeader';
 import messages from './i18n/index';
-import StudioHeader from './StudioHeader';
+import StudioHeader from './studio-header';
 
 export { LearningHeader, messages, StudioHeader };
 

src/index.scss

@@ -3,6 +3,7 @@ $blue: #007db8;
 $white: #fff;
 
 @import './Menu/menu.scss';
+@import './studio-header/header.scss';
 
 .dropdown-item a {
   text-decoration: none;
@@ -27,7 +28,7 @@ $white: #fff;
 
 .learning-header {
   min-width: 0;
-  
+
   .course-title-lockup {
     min-width: 0;
 

src/learning-header/AnonymousUserMenu.jsx

@@ -7,25 +7,23 @@ import { Button } from '@edx/paragon';
 
 import genericMessages from '../generic/messages';
 
-function AnonymousUserMenu({ intl }) {
-  return (
-    <div>
-      <Button
-        className="mr-3"
-        variant="outline-primary"
-        href={`${getConfig().LMS_BASE_URL}/register?next=${encodeURIComponent(global.location.href)}`}
-      >
-        {intl.formatMessage(genericMessages.registerSentenceCase)}
-      </Button>
-      <Button
-        variant="primary"
-        href={`${getLoginRedirectUrl(global.location.href)}`}
-      >
-        {intl.formatMessage(genericMessages.signInSentenceCase)}
-      </Button>
-    </div>
-  );
-}
+const AnonymousUserMenu = ({ intl }) => (
+  <div>
+    <Button
+      className="mr-3"
+      variant="outline-primary"
+      href={`${getConfig().LMS_BASE_URL}/register?next=${encodeURIComponent(global.location.href)}`}
+    >
+      {intl.formatMessage(genericMessages.registerSentenceCase)}
+    </Button>
+    <Button
+      variant="primary"
+      href={`${getLoginRedirectUrl(global.location.href)}`}
+    >
+      {intl.formatMessage(genericMessages.signInSentenceCase)}
+    </Button>
+  </div>
+);
 
 AnonymousUserMenu.propTypes = {
   intl: intlShape.isRequired,

src/learning-header/AuthenticatedUserDropdown.jsx

@@ -3,14 +3,13 @@ import PropTypes from 'prop-types';
 
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faUserCircle } from '@fortawesome/free-solid-svg-icons';
-
 import { getConfig } from '@edx/frontend-platform';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Dropdown } from '@edx/paragon';
 
 import messages from './messages';
 
-function AuthenticatedUserDropdown({ intl, username }) {
+const AuthenticatedUserDropdown = ({ intl, username }) => {
   const dashboardMenuItem = (
     <Dropdown.Item href={`${getConfig().LMS_BASE_URL}/dashboard`}>
       {intl.formatMessage(messages.dashboard)}
@@ -19,8 +18,8 @@ function AuthenticatedUserDropdown({ intl, username }) {
 
   return (
     <>
-      <a className="text-gray-700 mr-3" href={`${getConfig().SUPPORT_URL}`}>{intl.formatMessage(messages.help)}</a>
-      <Dropdown className="user-dropdown">
+      <a className="text-gray-700" href={`${getConfig().SUPPORT_URL}`}>{intl.formatMessage(messages.help)}</a>
+      <Dropdown className="user-dropdown ml-3">
         <Dropdown.Toggle variant="outline-primary">
           <FontAwesomeIcon icon={faUserCircle} className="d-md-none" size="lg" />
           <span data-hj-suppress className="d-none d-md-inline">
@@ -29,10 +28,10 @@ function AuthenticatedUserDropdown({ intl, username }) {
         </Dropdown.Toggle>
         <Dropdown.Menu className="dropdown-menu-right">
           {dashboardMenuItem}
-          <Dropdown.Item href={`${getConfig().LMS_BASE_URL}/u/${username}`}>
+          <Dropdown.Item href={`${getConfig().ACCOUNT_PROFILE_URL}/u/${username}`}>
             {intl.formatMessage(messages.profile)}
           </Dropdown.Item>
-          <Dropdown.Item href={`${getConfig().LMS_BASE_URL}/account/settings`}>
+          <Dropdown.Item href={getConfig().ACCOUNT_SETTINGS_URL}>
             {intl.formatMessage(messages.account)}
           </Dropdown.Item>
           { getConfig().ORDER_HISTORY_URL && (
@@ -47,7 +46,7 @@ function AuthenticatedUserDropdown({ intl, username }) {
       </Dropdown>
     </>
   );
-}
+};
 
 AuthenticatedUserDropdown.propTypes = {
   intl: intlShape.isRequired,

src/learning-header/LearningHeader.jsx

@@ -8,18 +8,16 @@ import AnonymousUserMenu from './AnonymousUserMenu';
 import AuthenticatedUserDropdown from './AuthenticatedUserDropdown';
 import messages from './messages';
 
-function LinkedLogo({
+const LinkedLogo = ({
   href,
   src,
   alt,
   ...attributes
-}) {
-  return (
-    <a href={href} {...attributes}>
-      <img className="d-block" src={src} alt={alt} />
-    </a>
-  );
-}
+}) => (
+  <a href={href} {...attributes}>
+    <img className="d-block" src={src} alt={alt} />
+  </a>
+);
 
 LinkedLogo.propTypes = {
   href: PropTypes.string.isRequired,
@@ -27,9 +25,9 @@ LinkedLogo.propTypes = {
   alt: PropTypes.string.isRequired,
 };
 
-function LearningHeader({
+const LearningHeader = ({
   courseOrg, courseNumber, courseTitle, intl, showUserDropdown,
-}) {
+}) => {
   const { authenticatedUser } = useContext(AppContext);
 
   const headerLogo = (
@@ -51,17 +49,17 @@ function LearningHeader({
           <span className="d-block m-0 font-weight-bold course-title">{courseTitle}</span>
         </div>
         {showUserDropdown && authenticatedUser && (
-          <AuthenticatedUserDropdown
-            username={authenticatedUser.username}
-          />
+        <AuthenticatedUserDropdown
+          username={authenticatedUser.username}
+        />
         )}
         {showUserDropdown && !authenticatedUser && (
-          <AnonymousUserMenu />
+        <AnonymousUserMenu />
         )}
       </div>
     </header>
   );
-}
+};
 
 LearningHeader.propTypes = {
   courseOrg: PropTypes.string,

src/learning-header/LearningHeader.test.jsx

@@ -12,7 +12,7 @@ describe('Header', () => {
 
   it('displays user button', () => {
     render(<Header />);
-    expect(screen.getByRole('button')).toHaveTextContent(authenticatedUser.username);
+    expect(screen.getByText(authenticatedUser.username)).toBeInTheDocument();
   });
 
   it('displays course data', () => {

src/setupTest.js

@@ -3,7 +3,7 @@
 import Enzyme from 'enzyme';
 import React from 'react';
 import PropTypes from 'prop-types';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 import '@testing-library/jest-dom';
 import '@testing-library/jest-dom/extend-expect';
 import 'babel-polyfill';
@@ -22,6 +22,8 @@ Enzyme.configure({ adapter: new Adapter() });
 // These configuration values are usually set in webpack's EnvironmentPlugin however
 // Jest does not use webpack so we need to set these so for testing
 process.env.ACCESS_TOKEN_COOKIE_NAME = 'edx-jwt-cookie-header-payload';
+process.env.ACCOUNT_PROFILE_URL = 'http://localhost:1995';
+process.env.ACCOUNT_SETTINGS_URL = 'http://localhost:1997';
 process.env.BASE_URL = 'localhost:1995';
 process.env.CREDENTIALS_BASE_URL = 'http://localhost:18150';
 process.env.CSRF_TOKEN_API_PATH = '/csrf/api/v1/token';
@@ -102,16 +104,14 @@ function render(
     ...renderOptions
   } = {},
 ) {
-  function Wrapper({ children }) {
-    return (
+  const Wrapper = ({ children }) => (
     // eslint-disable-next-line react/jsx-filename-extension
-      <IntlProvider locale="en">
-        <AppProvider store={store}>
-          {children}
-        </AppProvider>
-      </IntlProvider>
-    );
-  }
+    <IntlProvider locale="en">
+      <AppProvider store={store}>
+        {children}
+      </AppProvider>
+    </IntlProvider>
+  );
 
   Wrapper.propTypes = {
     children: PropTypes.node.isRequired,

src/studio-header/BrandNav.jsx

@@ -0,0 +1,24 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const BrandNav = ({
+  studioBaseUrl,
+  logo,
+  logoAltText,
+}) => (
+  <a href={studioBaseUrl}>
+    <img
+      src={logo}
+      alt={logoAltText}
+      className="d-block logo"
+    />
+  </a>
+);
+
+BrandNav.propTypes = {
+  studioBaseUrl: PropTypes.string.isRequired,
+  logo: PropTypes.string.isRequired,
+  logoAltText: PropTypes.string.isRequired,
+};
+
+export default BrandNav;

src/studio-header/CourseLockUp.jsx

@@ -0,0 +1,54 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import {
+  OverlayTrigger,
+  Tooltip,
+} from '@edx/paragon';
+import messages from './messages';
+
+const CourseLockUp = ({
+  outlineLink,
+  org,
+  number,
+  title,
+  // injected
+  intl,
+}) => (
+  <OverlayTrigger
+    placement="bottom"
+    overlay={(
+      <Tooltip id="course-lock-up">
+        {title}
+      </Tooltip>
+    )}
+  >
+    <a
+      className="course-title-lockup w-25 mr-2"
+      href={outlineLink}
+      aria-label={intl.formatMessage(messages['header.label.courseOutline'])}
+      data-testid="course-lock-up-block"
+    >
+      <span className="d-block small m-0 text-gray-800" data-testid="course-org-number">{org} {number}</span>
+      <span className="d-block m-0 font-weight-bold text-gray-800" data-testid="course-title">{title}</span>
+    </a>
+  </OverlayTrigger>
+);
+
+CourseLockUp.propTypes = {
+  number: PropTypes.string,
+  org: PropTypes.string,
+  title: PropTypes.string,
+  outlineLink: PropTypes.string,
+  // injected
+  intl: intlShape.isRequired,
+};
+
+CourseLockUp.defaultProps = {
+  number: null,
+  org: null,
+  title: null,
+  outlineLink: null,
+};
+
+export default injectIntl(CourseLockUp);

src/studio-header/HeaderBody.jsx

@@ -0,0 +1,155 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  ActionRow,
+  Button,
+  Container,
+  Nav,
+  Row,
+} from '@edx/paragon';
+import { Close, MenuIcon } from '@edx/paragon/icons';
+
+import CourseLockUp from './CourseLockUp';
+import UserMenu from './UserMenu';
+import BrandNav from './BrandNav';
+import NavDropdownMenu from './NavDropdownMenu';
+
+const HeaderBody = ({
+  logo,
+  logoAltText,
+  number,
+  org,
+  title,
+  username,
+  isAdmin,
+  studioBaseUrl,
+  logoutUrl,
+  authenticatedUserAvatar,
+  isMobile,
+  setModalPopupTarget,
+  toggleModalPopup,
+  isModalPopupOpen,
+  isHiddenMainMenu,
+  mainMenuDropdowns,
+  outlineLink,
+}) => {
+  const renderBrandNav = (
+    <BrandNav
+      {...{
+        studioBaseUrl,
+        logo,
+        logoAltText,
+      }}
+    />
+  );
+
+  return (
+    <Container size="xl" className="px-4">
+      <ActionRow as="header">
+        {isHiddenMainMenu ? (
+          <Row className="flex-nowrap ml-4">
+            {renderBrandNav}
+          </Row>
+        ) : (
+          <>
+            {isMobile ? (
+              <Button
+                ref={setModalPopupTarget}
+                className="d-inline-flex align-items-center"
+                variant="tertiary"
+                onClick={toggleModalPopup}
+                iconBefore={isModalPopupOpen ? Close : MenuIcon}
+                data-testid="mobile-menu-button"
+              >
+                Menu
+              </Button>
+            ) : (
+              <Row className="flex-nowrap m-0">
+                {renderBrandNav}
+                <CourseLockUp
+                  {...{
+                    outlineLink,
+                    number,
+                    org,
+                    title,
+                  }}
+                />
+              </Row>
+            )}
+            {isMobile ? (
+              <>
+                <ActionRow.Spacer />
+                {renderBrandNav}
+              </>
+            ) : (
+              <Nav data-testid="desktop-menu" className="ml-4">
+                {mainMenuDropdowns.map(dropdown => {
+                  const { id, buttonTitle, items } = dropdown;
+                  return (
+                    <NavDropdownMenu {...{ id, buttonTitle, items }} />
+                  );
+                })}
+              </Nav>
+            )}
+          </>
+        )}
+        <ActionRow.Spacer />
+        <Nav>
+          <UserMenu
+            {...{
+              username,
+              studioBaseUrl,
+              logoutUrl,
+              authenticatedUserAvatar,
+              isAdmin,
+            }}
+          />
+        </Nav>
+      </ActionRow>
+    </Container>
+  );
+};
+
+HeaderBody.propTypes = {
+  studioBaseUrl: PropTypes.string.isRequired,
+  logoutUrl: PropTypes.string.isRequired,
+  setModalPopupTarget: PropTypes.func.isRequired,
+  toggleModalPopup: PropTypes.func.isRequired,
+  isModalPopupOpen: PropTypes.bool.isRequired,
+  number: PropTypes.string,
+  org: PropTypes.string,
+  title: PropTypes.string,
+  logo: PropTypes.string,
+  logoAltText: PropTypes.string,
+  authenticatedUserAvatar: PropTypes.string,
+  username: PropTypes.string,
+  isAdmin: PropTypes.bool,
+  isMobile: PropTypes.bool,
+  isHiddenMainMenu: PropTypes.bool,
+  mainMenuDropdowns: PropTypes.arrayOf(PropTypes.shape({
+    id: PropTypes.string,
+    buttonTitle: PropTypes.string,
+    items: PropTypes.arrayOf(PropTypes.shape({
+      href: PropTypes.string,
+      title: PropTypes.string,
+    })),
+  })),
+  outlineLink: PropTypes.string,
+};
+
+HeaderBody.defaultProps = {
+  logo: null,
+  logoAltText: null,
+  number: '',
+  org: '',
+  title: '',
+  authenticatedUserAvatar: null,
+  username: null,
+  isAdmin: false,
+  isMobile: false,
+  isHiddenMainMenu: false,
+  mainMenuDropdowns: [],
+  outlineLink: null,
+};
+
+export default HeaderBody;

src/studio-header/MobileHeader.jsx

@@ -0,0 +1,76 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { useToggle, ModalPopup } from '@edx/paragon';
+import HeaderBody from './HeaderBody';
+import MobileMenu from './MobileMenu';
+
+const MobileHeader = ({
+  mainMenuDropdowns,
+  ...props
+}) => {
+  const [isOpen, , close, toggle] = useToggle(false);
+  const [target, setTarget] = useState(null);
+
+  return (
+    <>
+      <HeaderBody
+        {...props}
+        isMobile
+        setModalPopupTarget={setTarget}
+        toggleModalPopup={toggle}
+        isModalPopupOpen={isOpen}
+      />
+      <ModalPopup
+        hasArrow
+        placement="bottom"
+        positionRef={target}
+        isOpen={isOpen}
+        onClose={close}
+        onEscapeKey={close}
+        className="mobile-menu-container"
+      >
+        <MobileMenu {...{ mainMenuDropdowns }} />
+      </ModalPopup>
+    </>
+  );
+};
+
+MobileHeader.propTypes = {
+  studioBaseUrl: PropTypes.string.isRequired,
+  logoutUrl: PropTypes.string.isRequired,
+  setModalPopupTarget: PropTypes.func.isRequired,
+  toggleModalPopup: PropTypes.func.isRequired,
+  isModalPopupOpen: PropTypes.bool.isRequired,
+  number: PropTypes.string,
+  org: PropTypes.string,
+  title: PropTypes.string,
+  logo: PropTypes.string,
+  logoAltText: PropTypes.string,
+  authenticatedUserAvatar: PropTypes.string,
+  username: PropTypes.string,
+  isAdmin: PropTypes.bool,
+  mainMenuDropdowns: PropTypes.arrayOf(PropTypes.shape({
+    id: PropTypes.string,
+    buttonTitle: PropTypes.string,
+    items: PropTypes.arrayOf(PropTypes.shape({
+      href: PropTypes.string,
+      title: PropTypes.string,
+    })),
+  })),
+  outlineLink: PropTypes.string,
+};
+
+MobileHeader.defaultProps = {
+  logo: null,
+  logoAltText: null,
+  number: null,
+  org: null,
+  title: null,
+  authenticatedUserAvatar: null,
+  username: null,
+  isAdmin: false,
+  mainMenuDropdowns: [],
+  outlineLink: null,
+};
+
+export default MobileHeader;

src/studio-header/MobileMenu.jsx

@@ -0,0 +1,51 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Collapsible } from '@edx/paragon';
+
+const MobileMenu = ({
+  mainMenuDropdowns,
+}) => (
+  <div
+    className="ml-4 p-2 bg-light-100 border border-gray-200 small rounded"
+    data-testid="mobile-menu"
+  >
+    <div>
+      {mainMenuDropdowns.map(dropdown => {
+        const { id, buttonTitle, items } = dropdown;
+        return (
+          <Collapsible
+            className="border-light-100"
+            title={buttonTitle}
+            key={id}
+          >
+            <ul className="p-0" style={{ listStyleType: 'none' }}>
+              {items.map(item => (
+                <li className="mobile-menu-item">
+                  <a href={item.href}>
+                    {item.title}
+                  </a>
+                </li>
+              ))}
+            </ul>
+          </Collapsible>
+        );
+      })}
+    </div>
+  </div>
+);
+
+MobileMenu.propTypes = {
+  mainMenuDropdowns: PropTypes.arrayOf(PropTypes.shape({
+    id: PropTypes.string,
+    buttonTitle: PropTypes.string,
+    items: PropTypes.arrayOf(PropTypes.shape({
+      href: PropTypes.string,
+      title: PropTypes.string,
+    })),
+  })),
+};
+MobileMenu.defaultProps = {
+  mainMenuDropdowns: [],
+};
+
+export default MobileMenu;

src/studio-header/NavDropdownMenu.jsx

@@ -0,0 +1,38 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  Dropdown,
+  DropdownButton,
+} from '@edx/paragon';
+
+const NavDropdownMenu = ({
+  id,
+  buttonTitle,
+  items,
+}) => (
+  <DropdownButton
+    id={id}
+    title={buttonTitle}
+    variant="tertiary"
+  >
+    {items.map(item => (
+      <Dropdown.Item
+        href={item.href}
+        className="small"
+      >
+        {item.title}
+      </Dropdown.Item>
+    ))}
+  </DropdownButton>
+);
+
+NavDropdownMenu.propTypes = {
+  id: PropTypes.string.isRequired,
+  buttonTitle: PropTypes.string.isRequired,
+  items: PropTypes.arrayOf(PropTypes.shape({
+    href: PropTypes.string,
+    title: PropTypes.string,
+  })).isRequired,
+};
+
+export default NavDropdownMenu;

src/studio-header/StudioHeader.jsx

@@ -0,0 +1,74 @@
+import React, { useContext } from 'react';
+import PropTypes from 'prop-types';
+import Responsive from 'react-responsive';
+import { AppContext } from '@edx/frontend-platform/react';
+import { ensureConfig } from '@edx/frontend-platform';
+
+import MobileHeader from './MobileHeader';
+import HeaderBody from './HeaderBody';
+
+ensureConfig([
+  'STUDIO_BASE_URL',
+  'SITE_NAME',
+  'LOGOUT_URL',
+  'LOGIN_URL',
+  'LOGO_URL',
+], 'Studio Header component');
+
+const StudioHeader = ({
+  number, org, title, isHiddenMainMenu, mainMenuDropdowns, outlineLink,
+}) => {
+  const { authenticatedUser, config } = useContext(AppContext);
+  const props = {
+    logo: config.LOGO_URL,
+    logoAltText: `Studio ${config.SITE_NAME}`,
+    number,
+    org,
+    title,
+    username: authenticatedUser?.username,
+    isAdmin: authenticatedUser?.administrator,
+    authenticatedUserAvatar: authenticatedUser?.avatar,
+    studioBaseUrl: config.STUDIO_BASE_URL,
+    logoutUrl: config.LOGOUT_URL,
+    isHiddenMainMenu,
+    mainMenuDropdowns,
+    outlineLink,
+  };
+
+  return (
+    <>
+      <Responsive maxWidth={768}>
+        <MobileHeader {...props} />
+      </Responsive>
+      <Responsive minWidth={769}>
+        <HeaderBody {...props} />
+      </Responsive>
+    </>
+  );
+};
+
+StudioHeader.propTypes = {
+  number: PropTypes.string,
+  org: PropTypes.string,
+  title: PropTypes.string.isRequired,
+  isHiddenMainMenu: PropTypes.bool,
+  mainMenuDropdowns: PropTypes.arrayOf(PropTypes.shape({
+    id: PropTypes.string,
+    buttonTitle: PropTypes.string,
+    items: PropTypes.arrayOf(PropTypes.shape({
+      href: PropTypes.string,
+      title: PropTypes.string,
+    })),
+  })),
+  outlineLink: PropTypes.string,
+};
+
+StudioHeader.defaultProps = {
+  number: '',
+  org: '',
+  isHiddenMainMenu: false,
+  mainMenuDropdowns: [],
+  outlineLink: null,
+};
+
+export default StudioHeader;

src/studio-header/StudioHeader.test.jsx

@@ -0,0 +1,197 @@
+/* eslint-disable react/prop-types */
+import React, { useMemo } from 'react';
+import {
+  render,
+  fireEvent,
+  waitFor,
+} from '@testing-library/react';
+
+import { AppContext } from '@edx/frontend-platform/react';
+import { IntlProvider } from '@edx/frontend-platform/i18n';
+import { Context as ResponsiveContext } from 'react-responsive';
+
+import StudioHeader from './StudioHeader';
+import messages from './messages';
+
+const authenticatedUser = {
+  userId: 3,
+  username: 'abc123',
+  administrator: true,
+  roles: [],
+  avatar: '/imges/test.png',
+};
+let currentUser;
+let screenWidth = 1280;
+
+const RootWrapper = ({
+  ...props
+}) => {
+  const appContextValue = useMemo(() => ({
+    authenticatedUser: currentUser,
+    config: {
+      LOGOUT_URL: process.env.LOGOUT_URL,
+      LOGO_URL: process.env.LOGO_URL,
+      SITE_NAME: process.env.SITE_NAME,
+      STUDIO_BASE_URL: process.env.STUDIO_BASE_URL,
+      LOGIN_URL: process.env.LOGIN_URL,
+    },
+  }), []);
+  const responsiveContextValue = useMemo(() => ({ width: screenWidth }), []);
+
+  return (
+    // eslint-disable-next-line react/jsx-no-constructed-context-values, react/prop-types
+    <IntlProvider locale="en">
+      <AppContext.Provider value={appContextValue}>
+        <ResponsiveContext.Provider value={responsiveContextValue}>
+          <StudioHeader
+            {...props}
+          />
+        </ResponsiveContext.Provider>
+      </AppContext.Provider>
+    </IntlProvider>
+  );
+};
+
+const props = {
+  number: '123',
+  org: 'Ed',
+  title: 'test',
+  mainMenuDropdowns: [
+    {
+      id: 'testId',
+      buttonTitle: 'test',
+      items: [
+        {
+          title: 'link',
+          href: '#',
+        },
+      ],
+    },
+  ],
+  outlineLink: 'tEsTLInK',
+};
+
+describe('Header', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    currentUser = authenticatedUser;
+  });
+  describe('desktop', () => {
+    it('course lock up should be visible', () => {
+      const { getByTestId } = render(<RootWrapper {...props} />);
+      const courseLockUpBlock = getByTestId('course-lock-up-block');
+
+      expect(courseLockUpBlock).toBeVisible();
+    });
+
+    it('mobile menu should not be visible', () => {
+      const { queryByTestId } = render(<RootWrapper {...props} />);
+      const mobileMenuButton = queryByTestId('mobile-menu-button');
+
+      expect(mobileMenuButton).toBeNull();
+    });
+
+    it('desktop menu should be visible', () => {
+      const { getByTestId } = render(<RootWrapper {...props} />);
+      const desktopMenu = getByTestId('desktop-menu');
+
+      expect(desktopMenu).toBeVisible();
+    });
+
+    it('should render one dropdown', async () => {
+      const { getAllByRole, getByText } = render(<RootWrapper {...props} />);
+      const dropdownMenu = getAllByRole('button')[0];
+
+      expect(dropdownMenu).toBeVisible();
+
+      await waitFor(() => fireEvent.click(dropdownMenu));
+      const dropdownOption = getByText('link');
+
+      expect(dropdownOption).toBeVisible();
+    });
+
+    it('maintenance should not be in user menu', async () => {
+      currentUser = { ...authenticatedUser, administrator: false };
+      const { getAllByRole, queryByText } = render(<RootWrapper {...props} />);
+      const userMenu = getAllByRole('button')[1];
+      await waitFor(() => fireEvent.click(userMenu));
+      const maintenanceButton = queryByText(messages['header.user.menu.maintenance'].defaultMessage);
+
+      expect(maintenanceButton).toBeNull();
+    });
+
+    it('user menu should use avatar icon', async () => {
+      currentUser = { ...authenticatedUser, avatar: null };
+      const { getByTestId } = render(<RootWrapper {...props} />);
+      const avatarIcon = getByTestId('avatar-icon');
+
+      expect(avatarIcon).toBeVisible();
+    });
+
+    it('should hide nav items if prop isHiddenMainMenu true', async () => {
+      const initialProps = { ...props, isHiddenMainMenu: true };
+      const { queryByTestId } = render(<RootWrapper {...initialProps} />);
+      const desktopMenu = queryByTestId('desktop-menu');
+      const mobileMenuButton = queryByTestId('mobile-menu-button');
+
+      expect(mobileMenuButton).toBeNull();
+
+      expect(desktopMenu).toBeNull();
+    });
+  });
+
+  describe('mobile', () => {
+    beforeEach(() => { screenWidth = 500; });
+    it('course lock up should not be visible', async () => {
+      const { queryByTestId } = render(<RootWrapper {...props} />);
+      const courseLockUpBlock = queryByTestId('course-lock-up-block');
+
+      expect(courseLockUpBlock).toBeNull();
+    });
+
+    it('mobile menu should be visible', async () => {
+      const { getByTestId } = render(<RootWrapper {...props} />);
+      const mobileMenuButton = getByTestId('mobile-menu-button');
+
+      expect(mobileMenuButton).toBeVisible();
+      await waitFor(() => fireEvent.click(mobileMenuButton));
+      const mobileMenu = getByTestId('mobile-menu');
+
+      expect(mobileMenu).toBeVisible();
+    });
+
+    it('desktop menu should not be visible', () => {
+      const { queryByTestId } = render(<RootWrapper {...props} />);
+      const desktopMenu = queryByTestId('desktop-menu');
+
+      expect(desktopMenu).toBeNull();
+    });
+
+    it('maintenance should be in user menu', async () => {
+      const { getAllByRole, getByText } = render(<RootWrapper {...props} />);
+      const userMenu = getAllByRole('button')[1];
+      await waitFor(() => fireEvent.click(userMenu));
+      const maintenanceButton = getByText(messages['header.user.menu.maintenance'].defaultMessage);
+
+      expect(maintenanceButton).toBeVisible();
+    });
+
+    it('user menu should use avatar image', async () => {
+      const { getByTestId } = render(<RootWrapper {...props} />);
+      const avatarImage = getByTestId('avatar-image');
+
+      expect(avatarImage).toBeVisible();
+    });
+
+    it('should hide nav items if prop isHiddenMainMenu true', async () => {
+      const initialProps = { ...props, isHiddenMainMenu: true };
+      const { queryByTestId } = render(<RootWrapper {...initialProps} />);
+      const desktopMenu = queryByTestId('desktop-menu');
+      const mobileMenuButton = queryByTestId('mobile-menu-button');
+
+      expect(mobileMenuButton).toBeNull();
+
+      expect(desktopMenu).toBeNull();
+    });
+  });
+});

src/studio-header/UserMenu.jsx

@@ -0,0 +1,69 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import {
+  Avatar,
+} from '@edx/paragon';
+import NavDropdownMenu from './NavDropdownMenu';
+import getUserMenuItems from './utils';
+
+const UserMenu = ({
+  username,
+  studioBaseUrl,
+  logoutUrl,
+  authenticatedUserAvatar,
+  isMobile,
+  isAdmin,
+  // injected
+  intl,
+}) => {
+  const avatar = authenticatedUserAvatar ? (
+    <img
+      className="d-block w-100 h-100"
+      src={authenticatedUserAvatar}
+      alt={username}
+      data-testid="avatar-image"
+    />
+  ) : (
+    <Avatar
+      size="sm"
+      className="mr-2"
+      alt={username}
+      data-testid="avatar-icon"
+    />
+  );
+  const title = isMobile ? avatar : <>{avatar}{username}</>;
+
+  return (
+    <NavDropdownMenu
+      buttonTitle={title}
+      id="user-dropdown-menu"
+      items={getUserMenuItems({
+        studioBaseUrl,
+        logoutUrl,
+        intl,
+        isAdmin,
+      })}
+    />
+  );
+};
+
+UserMenu.propTypes = {
+  username: PropTypes.string,
+  studioBaseUrl: PropTypes.string.isRequired,
+  logoutUrl: PropTypes.string.isRequired,
+  authenticatedUserAvatar: PropTypes.string,
+  isMobile: PropTypes.bool,
+  isAdmin: PropTypes.bool,
+  // injected
+  intl: intlShape.isRequired,
+};
+
+UserMenu.defaultProps = {
+  isMobile: false,
+  isAdmin: false,
+  authenticatedUserAvatar: null,
+  username: null,
+};
+
+export default injectIntl(UserMenu);

src/studio-header/header.scss

@@ -0,0 +1,64 @@
+// This SCSS was partly copied from edx/frontend-app-support-tools/src/support-header/index.scss.
+$spacer: 1rem;
+$white: #FFFFFF;
+
+.btn-tertiary:hover {
+  color: white;
+  background-color: #00262B;
+}
+
+.course-title-lockup {
+  @media only screen and (max-width: 768px) {
+    padding-left: .5rem;
+    max-width: 70%;
+  }
+
+  @media only screen and (min-width: 769px) {
+    padding: .5rem;
+    padding-right: $spacer;
+    border-right: 1px solid #E5E5E5;
+    min-width: 70%;
+  }
+
+  overflow: hidden;
+
+  span {
+    color: #333333;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    line-height: 1.375rem;
+  }
+}
+
+.site-header-mobile,
+.site-header-desktop {
+  position: relative;
+  z-index: 1000;
+}
+
+.site-header-mobile {img {
+    height: 1.5rem;
+  }
+}
+
+.site-header-desktop {
+  height: 3.75rem;
+  box-shadow: 0 1px 0 0 rgb(0 0 0 / .1);
+  background: $white;
+
+  .logo {
+    display: block;
+    box-sizing: content-box;
+    position: relative;
+    top: -.05em;
+    height: 1.75rem;
+    padding: $spacer 0;
+    margin-right: $spacer;
+
+    img {
+      display: block;
+      height: 100%;
+    }
+  }
+}

src/studio-header/index.js

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

src/studio-header/messages.js

@@ -0,0 +1,156 @@
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+  'header.links.content': {
+    id: 'header.links.content',
+    defaultMessage: 'Content',
+    description: 'Label for Content menu trigger',
+  },
+  'header.links.settings': {
+    id: 'header.links.settings',
+    defaultMessage: 'Settings',
+    description: 'Label for Settings menu trigger',
+  },
+  'header.links.tools': {
+    id: 'header.links.content.tools',
+    defaultMessage: 'Tools',
+    description: 'Label for Tools menu trigger',
+  },
+  'header.links.outline': {
+    id: 'header.links.outline',
+    defaultMessage: 'Outline',
+    description: 'Link to Studio Outline page',
+  },
+  'header.links.updates': {
+    id: 'header.links.updates',
+    defaultMessage: 'Updates',
+    description: 'Link to Studio Updates page',
+  },
+  'header.links.pages': {
+    id: 'header.links.pages',
+    defaultMessage: 'Pages & Resources',
+    description: 'Link to Studio Pages page',
+  },
+  'header.links.filesAndUploads': {
+    id: 'header.links.filesAndUploads',
+    defaultMessage: 'Files & Uploads',
+    description: 'Link to Studio Files & Uploads page',
+  },
+  'header.links.textbooks': {
+    id: 'header.links.textbooks',
+    defaultMessage: 'Textbooks',
+    description: 'Link to Studio Textbooks page',
+  },
+  'header.links.videoUploads': {
+    id: 'header.links.videoUploads',
+    defaultMessage: 'Video Uploads',
+    description: 'Link to Studio Video Uploads page',
+  },
+  'header.links.scheduleAndDetails': {
+    id: 'header.links.scheduleAndDetails',
+    defaultMessage: 'Schedule & Details',
+    description: 'Link to Studio Schedule & Details page',
+  },
+  'header.links.grading': {
+    id: 'header.links.grading',
+    defaultMessage: 'Grading',
+    description: 'Link to Studio Grading page',
+  },
+  'header.links.courseTeam': {
+    id: 'header.links.courseTeam',
+    defaultMessage: 'Course Team',
+    description: 'Link to Studio Course Team page',
+  },
+  'header.links.groupConfigurations': {
+    id: 'header.links.groupConfigurations',
+    defaultMessage: 'Group Configurations',
+    description: 'Link to Studio Group Configurations page',
+  },
+  'header.links.proctoredExamSettings': {
+    id: 'header.links.proctoredExamSettings',
+    defaultMessage: 'Proctored Exam Settings',
+    description: 'Link to Studio Proctored Exam Settings page',
+  },
+  'header.links.advancedSettings': {
+    id: 'header.links.advancedSettings',
+    defaultMessage: 'Advanced Settings',
+    description: 'Link to Studio Advanced Settings page',
+  },
+  'header.links.certificates': {
+    id: 'header.links.certificates',
+    defaultMessage: 'Certificates',
+    description: 'Link to Studio Certificates page',
+  },
+  'header.links.publisher': {
+    id: 'header.links.publisher',
+    defaultMessage: 'Publisher',
+    description: 'Link to Publisher',
+  },
+  'header.links.import': {
+    id: 'header.links.import',
+    defaultMessage: 'Import',
+    description: 'Link to Studio Import page',
+  },
+  'header.links.export': {
+    id: 'header.links.export',
+    defaultMessage: 'Export',
+    description: 'Link to Studio Export page',
+  },
+  'header.links.checklists': {
+    id: 'header.links.checklists',
+    defaultMessage: 'Checklists',
+    description: 'Link to Studio Checklists page',
+  },
+  'header.user.menu.studio': {
+    id: 'header.user.menu.studio',
+    defaultMessage: 'Studio Home',
+    description: 'Link to Studio Home',
+  },
+  'header.user.menu.maintenance': {
+    id: 'header.user.menu.maintenance',
+    defaultMessage: 'Maintenance',
+    description: 'Link to the Studio maintenance page',
+  },
+  'header.user.menu.logout': {
+    id: 'header.user.menu.logout',
+    defaultMessage: 'Logout',
+    description: 'Logout link',
+  },
+  'header.label.account.menu': {
+    id: 'header.label.account.menu',
+    defaultMessage: 'Account Menu',
+    description: 'The aria label for the account menu trigger',
+  },
+  'header.label.account.menu.for': {
+    id: 'header.label.account.menu.for',
+    defaultMessage: 'Account menu for {username}',
+    description: 'The aria label for the account menu trigger when the username is displayed in it',
+  },
+  'header.label.main.nav': {
+    id: 'header.label.main.nav',
+    defaultMessage: 'Main',
+    description: 'The aria label for the main menu nav',
+  },
+  'header.label.main.menu': {
+    id: 'header.label.main.menu',
+    defaultMessage: 'Main Menu',
+    description: 'The aria label for the main menu trigger',
+  },
+  'header.label.main.header': {
+    id: 'header.label.main.header',
+    defaultMessage: 'Main',
+    description: 'The aria label for the main header',
+  },
+  'header.label.secondary.nav': {
+    id: 'header.label.secondary.nav',
+    defaultMessage: 'Secondary',
+    description: 'The aria label for the seconary nav',
+  },
+  'header.label.courseOutline': {
+    id: 'header.label.courseOutline',
+    defaultMessage: 'Back to course outline in Studio',
+    description: 'The aria label for the link back to the Studio Course Outline',
+  },
+});
+
+export default messages;

src/studio-header/utils.js

@@ -0,0 +1,36 @@
+import messages from './messages';
+
+const getUserMenuItems = ({
+  studioBaseUrl,
+  logoutUrl,
+  intl,
+  isAdmin,
+}) => {
+  let items = [
+    {
+      href: `${studioBaseUrl}}`,
+      title: intl.formatMessage(messages['header.user.menu.studio']),
+    }, {
+      href: `${logoutUrl}`,
+      title: intl.formatMessage(messages['header.user.menu.logout']),
+    },
+  ];
+  if (isAdmin) {
+    items = [
+      {
+        href: `${studioBaseUrl}}`,
+        title: intl.formatMessage(messages['header.user.menu.studio']),
+      }, {
+        href: `${studioBaseUrl}/maintenance`,
+        title: intl.formatMessage(messages['header.user.menu.maintenance']),
+      }, {
+        href: `${logoutUrl}`,
+        title: intl.formatMessage(messages['header.user.menu.logout']),
+      },
+    ];
+  }
+
+  return items;
+};
+
+export default getUserMenuItems;

src/test-utils.js

@@ -0,0 +1,6 @@
+const executeThunk = async (thunk, dispatch, getState) => {
+  await thunk(dispatch, getState);
+  await new Promise(setImmediate);
+};
+
+export default executeThunk;