Fix misspelled variable names

.env

@@ -2,23 +2,13 @@
 # If you add a new learning MFE-specific variable, please note it there!
 
 NODE_ENV='production'
-
 ACCESS_TOKEN_COOKIE_NAME=''
-AI_TRANSLATIONS_URL=''
 BASE_URL=''
-CONTACT_URL=''
 CREDENTIALS_BASE_URL=''
-CREDIT_HELP_LINK_URL=''
 CSRF_TOKEN_API_PATH=''
 DISCOVERY_API_BASE_URL=''
-DISCUSSIONS_MFE_BASE_URL=''
 ECOMMERCE_BASE_URL=''
-ENABLE_JUMPNAV='true'
-ENABLE_NEW_SIDEBAR=''
-ENABLE_NOTICES=''
 ENTERPRISE_LEARNER_PORTAL_HOSTNAME=''
-EXAMS_BASE_URL=''
-FAVICON_URL=''
 IGNORED_ERROR_REGEX=''
 INSIGHTS_BASE_URL=''
 LANGUAGE_PREFERENCE_COOKIE_NAME=''
@@ -28,15 +18,12 @@ LOGOUT_URL=''
 LOGO_URL=''
 LOGO_TRADEMARK_URL=''
 LOGO_WHITE_URL=''
-LEGACY_THEME_NAME=''
+FAVICON_URL=''
 MARKETING_SITE_BASE_URL=''
 ORDER_HISTORY_URL=''
-PROCTORED_EXAM_FAQ_URL=''
-PROCTORED_EXAM_RULES_URL=''
 REFRESH_ACCESS_TOKEN_ENDPOINT=''
 SEARCH_CATALOG_URL=''
 SEGMENT_KEY=''
-SESSION_COOKIE_DOMAIN=''
 SITE_NAME=''
 SOCIAL_UTM_MILESTONE_CAMPAIGN=''
 STUDIO_BASE_URL=''
@@ -48,4 +35,4 @@ TERMS_OF_SERVICE_URL=''
 TWITTER_HASHTAG=''
 TWITTER_URL=''
 USER_INFO_COOKIE_NAME=''
-OPTIMIZELY_FULL_STACK_SDK_KEY=''
+SESSION_COOKIE_DOMAIN=''

.env.development

@@ -2,23 +2,13 @@
 # If you add a new learning MFE-specific variable, please note it there!
 
 NODE_ENV='development'
-
 ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
-AI_TRANSLATIONS_URL='http://localhost:18760'
 BASE_URL='http://localhost:2000'
-CONTACT_URL='http://localhost:18000/contact'
 CREDENTIALS_BASE_URL='http://localhost:18150'
-CREDIT_HELP_LINK_URL='https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_credit_courses.html#keep-track-of-credit-requirements'
 CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
 DISCOVERY_API_BASE_URL='http://localhost:18381'
-DISCUSSIONS_MFE_BASE_URL='http://localhost:2002'
 ECOMMERCE_BASE_URL='http://localhost:18130'
-ENABLE_JUMPNAV='true'
-ENABLE_NEW_SIDEBAR=''
-ENABLE_NOTICES=''
 ENTERPRISE_LEARNER_PORTAL_HOSTNAME='localhost:8734'
-EXAMS_BASE_URL=''
-FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
 IGNORED_ERROR_REGEX=''
 LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
 LMS_BASE_URL='http://localhost:18000'
@@ -27,12 +17,10 @@ LOGOUT_URL='http://localhost:18000/logout'
 LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
 LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
 LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
-LEGACY_THEME_NAME=''
+FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
 MARKETING_SITE_BASE_URL='http://localhost:18000'
 ORDER_HISTORY_URL='http://localhost:1996/orders'
 PORT=2000
-PROCTORED_EXAM_FAQ_URL=''
-PROCTORED_EXAM_RULES_URL=''
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
 SEARCH_CATALOG_URL='http://localhost:18000/courses'
 SEGMENT_KEY=''
@@ -48,6 +36,3 @@ TWITTER_HASHTAG='myedxjourney'
 TWITTER_URL='https://twitter.com/edXOnline'
 USER_INFO_COOKIE_NAME='edx-user-info'
 SESSION_COOKIE_DOMAIN='localhost'
-CHAT_RESPONSE_URL='http://localhost:18000/api/learning_assistant/v1/course_id'
-PRIVACY_POLICY_URL='http://localhost:18000/privacy'
-OPTIMIZELY_FULL_STACK_SDK_KEY=''

.env.test

@@ -2,23 +2,13 @@
 # If you add a new learning MFE-specific variable, please note it there!
 
 NODE_ENV='test'
-
 ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
-AI_TRANSLATIONS_URL='http://localhost:18760'
 BASE_URL='http://localhost:2000'
-CONTACT_URL='http://localhost:18000/contact'
 CREDENTIALS_BASE_URL='http://localhost:18150'
-CREDIT_HELP_LINK_URL='https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_credit_courses.html#keep-track-of-credit-requirements'
 CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
 DISCOVERY_API_BASE_URL='http://localhost:18381'
-DISCUSSIONS_MFE_BASE_URL='http://localhost:2002'
 ECOMMERCE_BASE_URL='http://localhost:18130'
-ENABLE_JUMPNAV='true'
-ENABLE_NEW_SIDEBAR=''
-ENABLE_NOTICES=''
 ENTERPRISE_LEARNER_PORTAL_HOSTNAME='localhost:8734'
-EXAMS_BASE_URL='http://localhost:18740'
-FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
 IGNORED_ERROR_REGEX=''
 LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
 LMS_BASE_URL='http://localhost:18000'
@@ -27,12 +17,10 @@ LOGOUT_URL='http://localhost:18000/logout'
 LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
 LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
 LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
-LEGACY_THEME_NAME=''
+FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
 MARKETING_SITE_BASE_URL='http://localhost:18000'
 ORDER_HISTORY_URL='http://localhost:1996/orders'
 PORT=2000
-PROCTORED_EXAM_FAQ_URL=''
-PROCTORED_EXAM_RULES_URL=''
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
 SEARCH_CATALOG_URL='http://localhost:18000/courses'
 SEGMENT_KEY=''
@@ -47,4 +35,3 @@ TERMS_OF_SERVICE_URL='https://www.edx.org/edx-terms-service'
 TWITTER_HASHTAG='myedxjourney'
 TWITTER_URL='https://twitter.com/edXOnline'
 USER_INFO_COOKIE_NAME='edx-user-info'
-PRIVACY_POLICY_URL='http://localhost:18000/privacy'

.eslintrc.js

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

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

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

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

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

.github/workflows/commitlint.yml

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

.github/workflows/lockfileversion-check.yml

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

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

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

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

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

.github/workflows/validate.yml

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

.gitignore

@@ -1,12 +1,9 @@
 .DS_Store
 .eslintcache
 .idea
-*.swp
-*.swo
 node_modules
 npm-debug.log
 coverage
-env.config.*
 
 dist/
 src/i18n/transifex_input.json
@@ -23,10 +20,3 @@ logs
 
 # Local package dependencies
 module.config.js
-
-# Local environment overrides
-.env.private
-
-src/i18n/messages/
-
-env.config.jsx

.husky/_/.gitignore

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

.husky/_/husky.sh

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

.nvmrc

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

.tx/config

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

Makefile

@@ -1,17 +1,21 @@
-intl_imports = ./node_modules/.bin/intl-imports.js
+transifex_resource = frontend-app-learning
+transifex_langs = "ar,fr,es_419,zh_CN"
+
 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-formatjs
+transifex_temp = ./temp/babel-plugin-react-intl
 
 precommit:
 	npm run lint
 	npm audit
 
 requirements:
-	npm ci
+	npm install
 
 i18n.extract:
 	# Pulling display strings from .jsx files into .json files...
@@ -29,21 +33,20 @@ detect_changed_source_translations:
 	# Checking for changed translations...
 	git diff --exit-code $(i18n)
 
+# Pushes translations to Transifex.  You must run make extract_translations first.
+push_translations:
+	# Pushing strings to Transifex...
+	tx push -s
+	# Fetching hashes from Transifex...
+	./node_modules/reactifex/bash_scripts/get_hashed_strings.sh $(tx_url1)
+	# Writing out comments to file...
+	$(transifex_utils) $(transifex_temp) --comments
+	# Pushing comments to Transifex...
+	./node_modules/reactifex/bash_scripts/put_comments.sh $(tx_url2)
 
+# Pulls translations from Transifex.
 pull_translations:
-	rm -rf src/i18n/messages
-	mkdir src/i18n/messages
-	cd src/i18n/messages \
-	  && atlas pull $(ATLAS_OPTIONS) \
-	           translations/frontend-platform/src/i18n/messages:frontend-platform \
-	           translations/paragon/src/i18n/messages:paragon \
-	           translations/frontend-component-header/src/i18n/messages:frontend-component-header \
-	           translations/frontend-component-footer/src/i18n/messages:frontend-component-footer \
-	           translations/frontend-lib-special-exams/src/i18n/messages:frontend-lib-special-exams \
-	           translations/frontend-app-learning/src/i18n/messages:frontend-app-learning
-
-	$(intl_imports) frontend-platform paragon frontend-component-header frontend-component-footer frontend-lib-special-exams frontend-app-learning
-
+	tx pull -f --mode reviewed --language=$(transifex_langs)
 
 # This target is used by Travis.
 validate-no-uncommitted-package-lock-changes:
@@ -57,6 +60,7 @@ validate:
 	npm run lint -- --max-warnings 0
 	npm run test
 	npm run build
+	npm run is-es5
 
 .PHONY: validate.ci
 validate.ci:

README.rst

@@ -1,12 +1,10 @@
-#####################
-frontend-app-learning
-#####################
-
 |codecov| |license|
 
-********
-Purpose
-********
+frontend-app-learning
+=========================
+
+Introduction
+------------
 
 This is the Learning MFE (micro-frontend application), which renders all
 learner-facing course pages (like the course outline, the progress page,
@@ -17,58 +15,21 @@ Please tag **@edx/engage-squad** on any PRs or issues.  Thanks.
 .. |codecov| image:: https://codecov.io/gh/edx/frontend-app-learning/branch/master/graph/badge.svg?token=3z7XvuzTq3
    :target: https://codecov.io/gh/edx/frontend-app-learning
 .. |license| image:: https://img.shields.io/badge/license-AGPL-informational
-   :target: https://github.com/openedx/frontend-app-account/blob/master/LICENSE
+   :target: https://github.com/edx/frontend-app-account/blob/master/LICENSE
 
-***************
-Getting Started
-***************
+Development
+-----------
 
-Prerequisites
-=============
+Start Devstack
+^^^^^^^^^^^^^^
 
-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
-
-To use this application, `devstack <https://github.com/openedx/devstack>`__ must be running and you must be logged into it.
+To use this application, `devstack <https://github.com/edx/devstack>`__ must be running and you must be logged into it.
 
+- Run ``make dev.up.lms``
 - Visit http://localhost:2000/course/course-v1:edX+DemoX+Demo_Course to view the demo course.  You can replace ``course-v1:edX+DemoX+Demo_Course`` with a different course key.
 
-Cloning and Startup
-===================
-
-.. code-block::
-
-  1. Clone your new repo:
-
-    ``git clone https://github.com/openedx/frontend-app-learning.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-app-learning && npm ci``
-
-  4. Start the dev server:
-
-    ``npm start``
-
 Local module development
-=========================
+^^^^^^^^^^^^^^^^^^^^^^^^
 
 To develop locally on modules that are installed into this app, you'll need to create a ``module.config.js``
 file (which is git-ignored) that defines where to find your local modules, for instance::
@@ -84,24 +45,24 @@ file (which is git-ignored) that defines where to find your local modules, for i
        may want to use "src" if the module installs React as a peer/dev dependency.
      */
      localModules: [
-        { moduleName: '@openedx/paragon/scss', dir: '../paragon', dist: 'scss' },
-        { moduleName: '@openedx/paragon', dir: '../paragon', dist: 'dist' },
-        { moduleName: '@openedx/frontend-enterprise', dir: '../frontend-enterprise', dist: 'src' },
-        { moduleName: '@openedx/frontend-platform', dir: '../frontend-platform', dist: 'dist' },
+        { moduleName: '@edx/paragon/scss', dir: '../paragon', dist: 'scss' },
+        { moduleName: '@edx/paragon', dir: '../paragon', dist: 'dist' },
+        { moduleName: '@edx/frontend-enterprise', dir: '../frontend-enterprise', dist: 'src' },
+        { moduleName: '@edx/frontend-platform', dir: '../frontend-platform', dist: 'dist' },
      ],
    };
 
-See https://github.com/openedx/frontend-build#local-module-configuration-for-webpack for more details.
+See https://github.com/edx/frontend-build#local-module-configuration-for-webpack for more details.
 
 Deployment
-==========
+----------
 
 The Learning MFE is similar to all the other Open edX MFEs. Read the Open
 edX Developer Guide's section on
 `MFE applications <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html>`_.
 
 Environment Variables
-======================
+^^^^^^^^^^^^^^^^^^^^^
 
 This MFE is configured via environment variables supplied at build time.
 All micro-frontends have a shared set of required environment variables,
@@ -110,15 +71,6 @@ as documented in the Open edX Developer Guide under
 
 The learning micro-frontend also supports the following additional variables:
 
-CREDIT_HELP_LINK_URL
-  A link to resources to help explain what course credit is and how to earn it.
-
-ENABLE_JUMPNAV
-  Enables the new Jump Navigation feature in the course breadcrumbs, defaulted to  the string 'true'.
-  Disable to have simple hyperlinks for breadcrumbs. Setting it to any other value but 'true' ('false','I love flags', 'etc' would disable the Jumpnav).
-  This feature flag is slated to be removed as jumpnav becomes default. Follow the progress of this ticket here:
-  https://openedx.atlassian.net/browse/TNL-8678
-
 SOCIAL_UTM_MILESTONE_CAMPAIGN
   This value is passed as the ``utm_campaign`` parameter for social-share
   links when celebrating learning milestones in the course. Optional.
@@ -157,60 +109,3 @@ TWITTER_URL
   unless this is set. Optional.
 
   Example: https://twitter.com/edXOnline
-
-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-app-learning/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
-
-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.
-
-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/
-
-License
-=======
-
-The code in this repository is licensed under the AGPLv3 unless otherwise
-noted.
-
-Please see `LICENSE <LICENSE>`_ for details.
-
-Reporting Security Issues
-=========================
-
-Please do not report security issues in public. Please email security@openedx.org.

catalog-info.yaml

@@ -1,18 +0,0 @@
-# This file records information about this repo. Its use is described in OEP-55:
-# https://open-edx-proposals.readthedocs.io/en/latest/processes/oep-0055-proc-project-maintainers.html
-
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: 'frontend-app-learning'
-  description: "This is the Learning MFE, which renders all learner-facing course pages."
-  links:
-    - url: "https://github.com/openedx/frontend-app-learning"
-      title: "Learning MFE"
-      icon: "Web"
-  annotations:
-    openedx.org/arch-interest-groups: ""
-spec:
-  owner: group:2u-aurora
-  type: 'website'
-  lifecycle: 'production'

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

@@ -1,7 +1,5 @@
 # Courseware Page Decisions
 
-**See [0009-courseware-api-direction.md](0009-courseware-api-direction.md) for updates!**
-
 ## Courseware data loading
 
 Today we have strictly hierarchical courses - a course contains sections, which contain sequences, which contain units, which contain components.

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

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

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

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

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

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

example.env.config.jsx

@@ -1,24 +0,0 @@
-import UnitTranslationPlugin from '@plugins/UnitTranslationPlugin';
-import { PLUGIN_OPERATIONS, DIRECT_PLUGIN } from '@openedx/frontend-plugin-framework';
-
-// Load environment variables from .env file
-const config = {
-  ...process.env,
-  pluginSlots: {
-    unit_title_plugin: {
-      plugins: [
-        {
-          op: PLUGIN_OPERATIONS.Insert,
-          widget: {
-            id: 'unit_title_plugin',
-            type: DIRECT_PLUGIN,
-            priority: 1,
-            RenderWidget: UnitTranslationPlugin,
-          },
-        },
-      ],
-    },
-  },
-};
-
-export default config;

global-setup.js

@@ -1,4 +0,0 @@
-// Force all tests to run in UTC to prevent tests from being sensitive to host timezone.
-module.exports = async () => {
-  process.env.TZ = 'UTC';
-};

jest.config.js

@@ -1,6 +1,6 @@
-const { createConfig } = require('@openedx/frontend-build');
+const { createConfig } = require('@edx/frontend-build');
 
-const config = createConfig('jest', {
+module.exports = createConfig('jest', {
   setupFilesAfterEnv: [
     '<rootDir>/src/setupTest.js',
   ],
@@ -9,36 +9,4 @@ const config = createConfig('jest', {
     'src/i18n',
     'src/.*\\.exp\\..*',
   ],
-  // see https://github.com/axios/axios/issues/5026
-  moduleNameMapper: {
-    "^axios$": "axios/dist/axios.js",
-    // See https://stackoverflow.com/questions/72382316/jest-encountered-an-unexpected-token-react-markdown
-    'react-markdown': '<rootDir>/node_modules/react-markdown/react-markdown.min.js',
-    '@src/(.*)': '<rootDir>/src/$1',
-    '@plugins/(.*)': '<rootDir>/plugins/$1',
-  },
-  testTimeout: 30000,
-  globalSetup: "./global-setup.js",
-  verbose: true,
-  testEnvironment: 'jsdom',
 });
-
-// delete config.testURL;
-
-config.reporters = [...(config.reporters || []), ["jest-console-group-reporter", {
-  // change this setting if need to see less details for each test
-  // reportType: "summary" | "details", 
-  // enable: true | false,
-  afterEachTest: {
-    enable: true,
-    filePaths: false,
-    reportType: "details",
-  },
-  afterAllTests: {
-    reportType: "summary",
-    enable: true,
-    filePaths: true,
-  },
-}]];
-
-module.exports = config;

package.json

@@ -4,14 +4,16 @@
   "description": "Frontend learning application.",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/openedx/frontend-app-learning.git"
+    "url": "git+https://github.com/edx/frontend-app-learning.git"
   },
   "browserslist": [
-    "extends @edx/browserslist-config"
+    "last 2 versions",
+    "ie 11"
   ],
   "scripts": {
     "build": "fedx-scripts webpack",
-    "i18n_extract": "fedx-scripts formatjs extract",
+    "i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
+    "is-es5": "es-check es5 ./dist/*.js",
     "lint": "fedx-scripts eslint --ext .js --ext .jsx .",
     "lint:fix": "fedx-scripts eslint --fix --ext .js --ext .jsx .",
     "prepare": "husky install",
@@ -21,76 +23,60 @@
   },
   "author": "edX",
   "license": "AGPL-3.0",
-  "homepage": "https://github.com/openedx/frontend-app-learning#readme",
+  "homepage": "https://github.com/edx/frontend-app-learning#readme",
   "publishConfig": {
     "access": "public"
   },
   "bugs": {
-    "url": "https://github.com/openedx/frontend-app-learning/issues"
+    "url": "https://github.com/edx/frontend-app-learning/issues"
   },
   "dependencies": {
-    "@datadog/browser-logs": "^5.14.0",
-    "@datadog/browser-rum": "^5.14.0",
-    "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
-    "@edx/frontend-component-footer": "^13.0.4",
-    "@edx/frontend-component-header": "^5.0.2",
-    "@edx/frontend-lib-learning-assistant": "^2.0.0",
-    "@edx/frontend-lib-special-exams": "^3.0.0",
-    "@edx/frontend-platform": "^7.1.2",
-    "@edx/openedx-atlas": "^0.6.0",
-    "@edx/react-unit-test-utils": "^2.0.0",
-    "@fortawesome/fontawesome-svg-core": "1.3.0",
+    "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
+    "@edx/frontend-component-footer": "10.1.6",
+    "@edx/frontend-enterprise-utils": "0.1.7",
+    "@edx/frontend-lib-special-exams": "1.12.0",
+    "@edx/frontend-platform": "1.12.3",
+    "@edx/paragon": "16.7.0",
+    "@fortawesome/fontawesome-svg-core": "1.2.36",
     "@fortawesome/free-brands-svg-icons": "5.15.4",
     "@fortawesome/free-regular-svg-icons": "5.15.4",
     "@fortawesome/free-solid-svg-icons": "5.15.4",
-    "@fortawesome/react-fontawesome": "^0.1.4",
-    "@openedx/frontend-plugin-framework": "^1.0.2",
-    "@openedx/paragon": "^22.1.1",
-    "@popperjs/core": "2.11.8",
-    "@reduxjs/toolkit": "1.8.1",
-    "classnames": "2.3.2",
-    "core-js": "3.22.2",
-    "history": "5.3.0",
-    "joi": "^17.11.0",
-    "js-cookie": "3.0.5",
+    "@fortawesome/react-fontawesome": "0.1.15",
+    "@pact-foundation/pact": "9.16.0",
+    "@reduxjs/toolkit": "1.6.1",
+    "classnames": "2.3.1",
+    "core-js": "3.16.1",
+    "js-cookie": "2.2.1",
     "lodash.camelcase": "4.3.0",
-    "prop-types": "15.8.1",
-    "query-string": "^7.1.3",
+    "prop-types": "15.7.2",
     "react": "17.0.2",
+    "react-break": "1.3.2",
     "react-dom": "17.0.2",
     "react-helmet": "6.1.0",
-    "react-redux": "7.2.9",
-    "react-router": "6.15.0",
-    "react-router-dom": "6.15.0",
-    "react-share": "4.4.1",
-    "redux": "4.1.2",
-    "regenerator-runtime": "0.13.11",
-    "reselect": "4.1.8",
+    "react-redux": "7.2.4",
+    "react-router": "5.2.0",
+    "react-router-dom": "5.2.0",
+    "react-share": "4.4.0",
+    "redux": "4.1.1",
+    "regenerator-runtime": "0.13.9",
+    "reselect": "4.0.0",
     "truncate-html": "1.0.4",
-    "util": "0.12.5"
+    "util": "0.12.4"
   },
   "devDependencies": {
-    "@edx/browserslist-config": "1.2.0",
-    "@edx/reactifex": "2.2.0",
-    "@openedx/frontend-build": "13.0.30",
-    "@pact-foundation/pact": "^11.0.2",
-    "@testing-library/jest-dom": "5.16.5",
-    "@testing-library/react": "12.1.5",
-    "@testing-library/react-hooks": "^8.0.1",
-    "@testing-library/user-event": "13.5.0",
-    "axios-mock-adapter": "1.20.0",
-    "copy-webpack-plugin": "^11.0.0",
-    "es-check": "6.2.1",
-    "eslint-import-resolver-webpack": "^0.13.8",
-    "husky": "7.0.4",
-    "jest": "^26.6.3",
-    "jest-console-group-reporter": "^1.0.1",
-    "jest-when": "^3.6.0",
-    "postcss-loader": "^8.1.1",
-    "rosie": "2.1.1",
-    "sass": "^1.72.0",
-    "sass-loader": "^14.1.1",
-    "source-map-loader": "^5.0.0",
-    "style-loader": "^3.3.4"
+    "@edx/frontend-build": "8.0.0",
+    "@testing-library/dom": "7.16.3",
+    "@testing-library/jest-dom": "5.14.1",
+    "@testing-library/react": "10.3.0",
+    "@testing-library/user-event": "12.8.3",
+    "axios-mock-adapter": "1.19.0",
+    "codecov": "3.8.3",
+    "es-check": "5.2.4",
+    "glob": "7.1.7",
+    "husky": "7.0.1",
+    "jest": "27.0.6",
+    "jest-chain": "1.1.5",
+    "reactifex": "1.1.1",
+    "rosie": "2.1.0"
   }
 }

plugins/README.md

@@ -1,17 +0,0 @@
-## How to develop plugin
-
-You can define plugin in `env.config.jsx` see `example.env.config.jsx` as example.
-
-## Current caveat
-
-- The way for how I deal with override method is still wonky
-  - The redux still require middleware to ignore the plugin's action from serializing
-  - I am not sure how it behave with useCallback, useMemo, ...etc
-  - There are still open question on how to write it properly
-
-## Current work that should consider core part and extendable for the future plugin framework
-
-- `usePluingsCallback` is the callback supose to be some level of equality to be using `React.useCallback`. It would try to execute the function, then any plugin that try `registerOverrideMethod`. The order of the it being run isn't the determined. There are a couple things I want to add:
-  - I might consider testing it with `zustand` library to make sure it is portable and not rely on `redux`. I tried to do this with provider, but it seems to run into infinite loop of trigger changed.
-
-- `registerOverrideMethod` is working like a way to register callback that behave like a middleware. It ran the default one, then pass the result of the default one to the plugin. Any plugin that register the override can update the value. Alternatively, we can override the function completely instead applying each affect. Or we can support both. But it requires a bit more thought out architecture.

plugins/UnitTranslationPlugin/__snapshots__/index.test.jsx.snap

@@ -1,15 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<UnitTranslationPlugin /> render TranslationSelection when translation is enabled and language is available 1`] = `
-<TranslationSelection
-  availableLanguages={
-    Array [
-      "en",
-    ]
-  }
-  courseId="courseId"
-  id="id"
-  language="en"
-  unitId="unitId"
-/>
-`;

plugins/UnitTranslationPlugin/data/api.js

@@ -1,90 +0,0 @@
-import { getConfig, camelCaseObject } from '@edx/frontend-platform';
-import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
-import { logError } from '@edx/frontend-platform/logging';
-import { stringify } from 'query-string';
-
-export const fetchTranslationConfig = async (courseId) => {
-  const url = `${
-    getConfig().LMS_BASE_URL
-  }/api/translatable_xblocks/config/?course_id=${encodeURIComponent(courseId)}`;
-  try {
-    const { data } = await getAuthenticatedHttpClient().get(url);
-    return {
-      enabled: data.feature_enabled,
-      availableLanguages: data.available_translation_languages || [
-        {
-          code: 'en',
-          label: 'English',
-        },
-        {
-          code: 'es',
-          label: 'Spanish',
-        },
-      ],
-    };
-  } catch (error) {
-    logError(`Translation plugin fail to fetch from ${url}`, error);
-    return {
-      enabled: false,
-      availableLanguages: [],
-    };
-  }
-};
-
-export async function getTranslationFeedback({
-  courseId,
-  translationLanguage,
-  unitId,
-  userId,
-}) {
-  const params = stringify({
-    translation_language: translationLanguage,
-    course_id: encodeURIComponent(courseId),
-    unit_id: encodeURIComponent(unitId),
-    user_id: userId,
-  });
-  const fetchFeedbackUrl = `${
-    getConfig().AI_TRANSLATIONS_URL
-  }/api/v1/whole-course-translation-feedback?${params}`;
-  try {
-    const { data } = await getAuthenticatedHttpClient().get(fetchFeedbackUrl);
-    return camelCaseObject(data);
-  } catch (error) {
-    logError(
-      `Translation plugin fail to fetch from ${fetchFeedbackUrl}`,
-      error,
-    );
-    return {};
-  }
-}
-
-export async function createTranslationFeedback({
-  courseId,
-  feedbackValue,
-  translationLanguage,
-  unitId,
-  userId,
-}) {
-  const createFeedbackUrl = `${
-    getConfig().AI_TRANSLATIONS_URL
-  }/api/v1/whole-course-translation-feedback/`;
-  try {
-    const { data } = await getAuthenticatedHttpClient().post(
-      createFeedbackUrl,
-      {
-        course_id: courseId,
-        feedback_value: feedbackValue,
-        translation_language: translationLanguage,
-        unit_id: unitId,
-        user_id: userId,
-      },
-    );
-    return camelCaseObject(data);
-  } catch (error) {
-    logError(
-      `Translation plugin fail to create feedback from ${createFeedbackUrl}`,
-      error,
-    );
-    return {};
-  }
-}

plugins/UnitTranslationPlugin/data/api.test.js

@@ -1,125 +0,0 @@
-import { camelCaseObject } from '@edx/frontend-platform';
-import { logError } from '@edx/frontend-platform/logging';
-import { stringify } from 'query-string';
-
-import {
-  fetchTranslationConfig,
-  getTranslationFeedback,
-  createTranslationFeedback,
-} from './api';
-
-const mockGetMethod = jest.fn();
-const mockPostMethod = jest.fn();
-jest.mock('@edx/frontend-platform/auth', () => ({
-  getAuthenticatedHttpClient: () => ({
-    get: mockGetMethod,
-    post: mockPostMethod,
-  }),
-}));
-jest.mock('@edx/frontend-platform/logging', () => ({
-  logError: jest.fn(),
-}));
-
-describe('UnitTranslation api', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-  describe('fetchTranslationConfig', () => {
-    const courseId = 'course-v1:edX+DemoX+Demo_Course';
-    const expectedResponse = {
-      feature_enabled: true,
-      available_translation_languages: [
-        {
-          code: 'en',
-          label: 'English',
-        },
-        {
-          code: 'es',
-          label: 'Spanish',
-        },
-      ],
-    };
-    it('should fetch translation config', async () => {
-      const expectedUrl = `http://localhost:18000/api/translatable_xblocks/config/?course_id=${encodeURIComponent(
-        courseId,
-      )}`;
-      mockGetMethod.mockResolvedValueOnce({ data: expectedResponse });
-      const result = await fetchTranslationConfig(courseId);
-      expect(result).toEqual({
-        enabled: true,
-        availableLanguages: expectedResponse.available_translation_languages,
-      });
-      expect(mockGetMethod).toHaveBeenCalledWith(expectedUrl);
-    });
-
-    it('should return disabled and unavailable languages on error', async () => {
-      mockGetMethod.mockRejectedValueOnce(new Error('error'));
-      const result = await fetchTranslationConfig(courseId);
-      expect(result).toEqual({
-        enabled: false,
-        availableLanguages: [],
-      });
-      expect(logError).toHaveBeenCalled();
-    });
-  });
-
-  describe('getTranslationFeedback', () => {
-    const props = {
-      courseId: 'course-v1:edX+DemoX+Demo_Course',
-      translationLanguage: 'es',
-      unitId: 'unit-v1:edX+DemoX+Demo_Course+type@video+block@video',
-      userId: 'test_user',
-    };
-    const expectedResponse = {
-      feedback: 'good',
-    };
-    it('should fetch translation feedback', async () => {
-      const params = stringify({
-        translation_language: props.translationLanguage,
-        course_id: encodeURIComponent(props.courseId),
-        unit_id: encodeURIComponent(props.unitId),
-        user_id: props.userId,
-      });
-      const expectedUrl = `http://localhost:18760/api/v1/whole-course-translation-feedback?${params}`;
-      mockGetMethod.mockResolvedValueOnce({ data: expectedResponse });
-      const result = await getTranslationFeedback(props);
-      expect(result).toEqual(camelCaseObject(expectedResponse));
-      expect(mockGetMethod).toHaveBeenCalledWith(expectedUrl);
-    });
-
-    it('should return empty object on error', async () => {
-      mockGetMethod.mockRejectedValueOnce(new Error('error'));
-      const result = await getTranslationFeedback(props);
-      expect(result).toEqual({});
-      expect(logError).toHaveBeenCalled();
-    });
-  });
-
-  describe('createTranslationFeedback', () => {
-    const props = {
-      courseId: 'course-v1:edX+DemoX+Demo_Course',
-      feedbackValue: 'good',
-      translationLanguage: 'es',
-      unitId: 'unit-v1:edX+DemoX+Demo_Course+type@video+block@video',
-      userId: 'test_user',
-    };
-    it('should create translation feedback', async () => {
-      const expectedUrl = 'http://localhost:18760/api/v1/whole-course-translation-feedback/';
-      mockPostMethod.mockResolvedValueOnce({});
-      await createTranslationFeedback(props);
-      expect(mockPostMethod).toHaveBeenCalledWith(expectedUrl, {
-        course_id: props.courseId,
-        feedback_value: props.feedbackValue,
-        translation_language: props.translationLanguage,
-        unit_id: props.unitId,
-        user_id: props.userId,
-      });
-    });
-
-    it('should log error on failure', async () => {
-      mockPostMethod.mockRejectedValueOnce(new Error('error'));
-      await createTranslationFeedback(props);
-      expect(logError).toHaveBeenCalled();
-    });
-  });
-});

plugins/UnitTranslationPlugin/feedback-widget/__snapshots__/index.test.jsx.snap

@@ -1,204 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<FeedbackWidget /> render feedback widget 1`] = `
-<div
-  className="d-none"
->
-  <div
-    className="sequence w-100"
-  >
-    <div
-      className="ml-4 mr-2"
-    >
-      <ActionRow>
-        Rate this page translation
-        <Spacer />
-        <div>
-          <IconButton
-            alt="positive-feedback"
-            className="m-1"
-            iconAs="Icon"
-            id="positive-feedback-button"
-            onClick={[MockFunction onThumbsUpClick]}
-            src="ThumbUpOutline"
-            variant="secondary"
-          />
-          <IconButton
-            alt="negative-feedback"
-            className="mr-2"
-            iconAs="Icon"
-            id="negative-feedback-button"
-            onClick={[MockFunction onThumbsDownClick]}
-            src="ThumbDownOffAlt"
-            variant="secondary"
-          />
-        </div>
-        <div
-          className="mb-1 text-light action-row-divider"
-        >
-          |
-        </div>
-        <div>
-          <IconButton
-            alt="close-feedback"
-            className="ml-1 mr-2 float-right"
-            iconAs="Icon"
-            id="close-feedback-button"
-            onClick={[MockFunction closeFeedbackWidget]}
-            src="Close"
-            variant="secondary"
-          />
-        </div>
-      </ActionRow>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<FeedbackWidget /> render gratitude text 1`] = `
-<div
-  className="d-none"
->
-  <div
-    className="sequence w-100"
-  >
-    <div
-      className="ml-4 mr-4"
-    >
-      <ActionRow
-        className="m-2 justify-content-center"
-      >
-        Thank you! Your feedback matters.
-      </ActionRow>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<FeedbackWidget /> renders hidden by default 1`] = `
-<div
-  className="d-none"
->
-  <div
-    className="sequence w-100"
-  >
-    <div
-      className="ml-4 mr-2"
-    >
-      <ActionRow>
-        Rate this page translation
-        <Spacer />
-        <div>
-          <IconButton
-            alt="positive-feedback"
-            className="m-1"
-            iconAs="Icon"
-            id="positive-feedback-button"
-            onClick={[MockFunction onThumbsUpClick]}
-            src="ThumbUpOutline"
-            variant="secondary"
-          />
-          <IconButton
-            alt="negative-feedback"
-            className="mr-2"
-            iconAs="Icon"
-            id="negative-feedback-button"
-            onClick={[MockFunction onThumbsDownClick]}
-            src="ThumbDownOffAlt"
-            variant="secondary"
-          />
-        </div>
-        <div
-          className="mb-1 text-light action-row-divider"
-        >
-          |
-        </div>
-        <div>
-          <IconButton
-            alt="close-feedback"
-            className="ml-1 mr-2 float-right"
-            iconAs="Icon"
-            id="close-feedback-button"
-            onClick={[MockFunction closeFeedbackWidget]}
-            src="Close"
-            variant="secondary"
-          />
-        </div>
-      </ActionRow>
-    </div>
-    <div
-      className="ml-4 mr-4"
-    >
-      <ActionRow
-        className="m-2 justify-content-center"
-      >
-        Thank you! Your feedback matters.
-      </ActionRow>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<FeedbackWidget /> renders show when elemReady is true 1`] = `
-<div
-  className="sequence-container d-inline-flex flex-row w-100"
->
-  <div
-    className="sequence w-100"
-  >
-    <div
-      className="ml-4 mr-2"
-    >
-      <ActionRow>
-        Rate this page translation
-        <Spacer />
-        <div>
-          <IconButton
-            alt="positive-feedback"
-            className="m-1"
-            iconAs="Icon"
-            id="positive-feedback-button"
-            onClick={[MockFunction onThumbsUpClick]}
-            src="ThumbUpOutline"
-            variant="secondary"
-          />
-          <IconButton
-            alt="negative-feedback"
-            className="mr-2"
-            iconAs="Icon"
-            id="negative-feedback-button"
-            onClick={[MockFunction onThumbsDownClick]}
-            src="ThumbDownOffAlt"
-            variant="secondary"
-          />
-        </div>
-        <div
-          className="mb-1 text-light action-row-divider"
-        >
-          |
-        </div>
-        <div>
-          <IconButton
-            alt="close-feedback"
-            className="ml-1 mr-2 float-right"
-            iconAs="Icon"
-            id="close-feedback-button"
-            onClick={[MockFunction closeFeedbackWidget]}
-            src="Close"
-            variant="secondary"
-          />
-        </div>
-      </ActionRow>
-    </div>
-    <div
-      className="ml-4 mr-4"
-    >
-      <ActionRow
-        className="m-2 justify-content-center"
-      >
-        Thank you! Your feedback matters.
-      </ActionRow>
-    </div>
-  </div>
-</div>
-`;

plugins/UnitTranslationPlugin/feedback-widget/index.jsx

@@ -1,116 +0,0 @@
-import React, {
-  useEffect, useRef, useState,
-} from 'react';
-import PropTypes from 'prop-types';
-
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { ActionRow, IconButton, Icon } from '@openedx/paragon';
-import { Close, ThumbUpOutline, ThumbDownOffAlt } from '@openedx/paragon/icons';
-
-import './index.scss';
-import messages from './messages';
-import useFeedbackWidget from './useFeedbackWidget';
-
-const FeedbackWidget = ({
-  courseId,
-  translationLanguage,
-  unitId,
-  userId,
-}) => {
-  const { formatMessage } = useIntl();
-  const ref = useRef(null);
-  const [elemReady, setElemReady] = useState(false);
-  const {
-    closeFeedbackWidget,
-    showFeedbackWidget,
-    showGratitudeText,
-    onThumbsUpClick,
-    onThumbsDownClick,
-  } = useFeedbackWidget({
-    courseId,
-    translationLanguage,
-    unitId,
-    userId,
-  });
-
-  useEffect(() => {
-    if (ref.current) {
-      const domNode = document.getElementById('whole-course-translation-feedback-widget');
-      domNode.appendChild(ref.current);
-      setElemReady(true);
-    }
-  }, [ref.current]);
-
-  return (
-    <div ref={ref} className={(elemReady) ? 'sequence-container d-inline-flex flex-row w-100' : 'd-none'}>
-      {(showFeedbackWidget || showGratitudeText) ? (
-        <div className="sequence w-100">
-          {
-            showFeedbackWidget && (
-              <div className="ml-4 mr-2">
-                <ActionRow>
-                  {formatMessage(messages.rateTranslationText)}
-                  <ActionRow.Spacer />
-                  <div>
-                    <IconButton
-                      src={ThumbUpOutline}
-                      iconAs={Icon}
-                      alt="positive-feedback"
-                      onClick={onThumbsUpClick}
-                      variant="secondary"
-                      className="m-1"
-                      id="positive-feedback-button"
-                    />
-                    <IconButton
-                      src={ThumbDownOffAlt}
-                      iconAs={Icon}
-                      alt="negative-feedback"
-                      onClick={onThumbsDownClick}
-                      variant="secondary"
-                      className="mr-2"
-                      id="negative-feedback-button"
-                    />
-                  </div>
-                  <div className="mb-1 text-light action-row-divider">
-                    |
-                  </div>
-                  <div>
-                    <IconButton
-                      src={Close}
-                      iconAs={Icon}
-                      alt="close-feedback"
-                      onClick={closeFeedbackWidget}
-                      variant="secondary"
-                      className="ml-1 mr-2 float-right"
-                      id="close-feedback-button"
-                    />
-                  </div>
-                </ActionRow>
-              </div>
-            )
-          }
-          {
-            showGratitudeText && (
-              <div className="ml-4 mr-4">
-                <ActionRow className="m-2 justify-content-center">
-                  {formatMessage(messages.gratitudeText)}
-                </ActionRow>
-              </div>
-            )
-          }
-        </div>
-      ) : null}
-    </div>
-  );
-};
-
-FeedbackWidget.propTypes = {
-  courseId: PropTypes.string.isRequired,
-  translationLanguage: PropTypes.string.isRequired,
-  userId: PropTypes.string.isRequired,
-  unitId: PropTypes.string.isRequired,
-};
-
-FeedbackWidget.defaultProps = {};
-
-export default FeedbackWidget;

plugins/UnitTranslationPlugin/feedback-widget/index.scss

@@ -1,4 +0,0 @@
-.action-row-divider {
-    font-size: 31px;
-    font-weight: 100;
-}

plugins/UnitTranslationPlugin/feedback-widget/index.test.jsx

@@ -1,107 +0,0 @@
-import { useState } from 'react';
-import { shallow } from '@edx/react-unit-test-utils';
-
-import FeedbackWidget from './index';
-import useFeedbackWidget from './useFeedbackWidget';
-
-jest.mock('react', () => ({
-  ...jest.requireActual('react'),
-  useState: jest.fn((value) => [value, jest.fn()]),
-}));
-jest.mock('@openedx/paragon', () => jest.requireActual('@edx/react-unit-test-utils').mockComponents({
-  ActionRow: {
-    Spacer: 'Spacer',
-  },
-  IconButton: 'IconButton',
-  Icon: 'Icon',
-}));
-jest.mock('@openedx/paragon/icons', () => ({
-  Close: 'Close',
-  ThumbUpOutline: 'ThumbUpOutline',
-  ThumbDownOffAlt: 'ThumbDownOffAlt',
-}));
-jest.mock('./useFeedbackWidget');
-jest.mock('@edx/frontend-platform/i18n', () => {
-  const i18n = jest.requireActual('@edx/frontend-platform/i18n');
-  const { formatMessage } = jest.requireActual('@edx/react-unit-test-utils');
-  return {
-    ...i18n,
-    useIntl: jest.fn(() => ({
-      formatMessage,
-    })),
-  };
-});
-
-describe('<FeedbackWidget />', () => {
-  const props = {
-    courseId: 'course-v1:edX+DemoX+Demo_Course',
-    translationLanguage: 'es',
-    unitId:
-      'block-v1:edX+DemoX+Demo_Course+type@vertical+block@37b72b3915204b70acb00c55b604b563',
-    userId: '123',
-  };
-
-  const mockUseFeedbackWidget = ({ showFeedbackWidget, showGratitudeText }) => {
-    useFeedbackWidget.mockReturnValueOnce({
-      closeFeedbackWidget: jest.fn().mockName('closeFeedbackWidget'),
-      sendFeedback: jest.fn().mockName('sendFeedback'),
-      onThumbsUpClick: jest.fn().mockName('onThumbsUpClick'),
-      onThumbsDownClick: jest.fn().mockName('onThumbsDownClick'),
-      showFeedbackWidget,
-      showGratitudeText,
-    });
-  };
-
-  it('renders hidden by default', () => {
-    mockUseFeedbackWidget({
-      showFeedbackWidget: true,
-      showGratitudeText: true,
-    });
-    const wrapper = shallow(<FeedbackWidget {...props} />);
-    expect(wrapper.snapshot).toMatchSnapshot();
-    expect(wrapper.instance.findByType('div')[0].props.className).toContain(
-      'd-none',
-    );
-  });
-
-  it('renders show when elemReady is true', () => {
-    mockUseFeedbackWidget({
-      showFeedbackWidget: true,
-      showGratitudeText: true,
-    });
-    useState.mockReturnValueOnce([true, jest.fn()]);
-    const wrapper = shallow(<FeedbackWidget {...props} />);
-    expect(wrapper.snapshot).toMatchSnapshot();
-    expect(wrapper.instance.findByType('div')[0].props.className).not.toContain(
-      'd-none',
-    );
-  });
-
-  it('render empty when showFeedbackWidget and showGratitudeText are false', () => {
-    mockUseFeedbackWidget({
-      showFeedbackWidget: false,
-      showGratitudeText: false,
-    });
-    useState.mockReturnValueOnce([true, jest.fn()]);
-    const wrapper = shallow(<FeedbackWidget {...props} />);
-    expect(wrapper.instance.findByType('div')[0].children.length).toBe(0);
-  });
-
-  it('render feedback widget', () => {
-    mockUseFeedbackWidget({
-      showFeedbackWidget: true,
-      showGratitudeText: false,
-    });
-    const wrapper = shallow(<FeedbackWidget {...props} />);
-    expect(wrapper.snapshot).toMatchSnapshot();
-  });
-
-  it('render gratitude text', () => {
-    mockUseFeedbackWidget({
-      showFeedbackWidget: false,
-      showGratitudeText: true,
-    });
-    const wrapper = shallow(<FeedbackWidget {...props} />);
-    expect(wrapper.snapshot).toMatchSnapshot();
-  });
-});

plugins/UnitTranslationPlugin/feedback-widget/messages.js

@@ -1,16 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  rateTranslationText: {
-    id: 'feedbackWidget.rateTranslationText',
-    defaultMessage: 'Rate this page translation',
-    description: 'Title for the feedback widget action row.',
-  },
-  gratitudeText: {
-    id: 'feedbackWidget.gratitudeText',
-    defaultMessage: 'Thank you! Your feedback matters.',
-    description: 'Title for secondary action row.',
-  },
-});
-
-export default messages;

plugins/UnitTranslationPlugin/feedback-widget/useFeedbackWidget.js

@@ -1,82 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-
-import { createTranslationFeedback, getTranslationFeedback } from '../data/api';
-
-const useFeedbackWidget = ({
-  courseId,
-  translationLanguage,
-  unitId,
-  userId,
-}) => {
-  const [showFeedbackWidget, setShowFeedbackWidget] = useState(false);
-  const [showGratitudeText, setShowGratitudeText] = useState(false);
-
-  const closeFeedbackWidget = useCallback(() => {
-    setShowFeedbackWidget(false);
-  }, [setShowFeedbackWidget]);
-
-  const openFeedbackWidget = useCallback(() => {
-    setShowFeedbackWidget(true);
-  }, [setShowFeedbackWidget]);
-
-  useEffect(async () => {
-    const translationFeedback = await getTranslationFeedback({
-      courseId,
-      translationLanguage,
-      unitId,
-      userId,
-    });
-    setShowFeedbackWidget(!translationFeedback);
-  }, [
-    courseId,
-    translationLanguage,
-    unitId,
-    userId,
-  ]);
-
-  const openGratitudeText = useCallback(() => {
-    setShowGratitudeText(true);
-    setTimeout(() => {
-      setShowGratitudeText(false);
-    }, 3000);
-  }, [setShowGratitudeText]);
-
-  const sendFeedback = useCallback(async (feedbackValue) => {
-    await createTranslationFeedback({
-      courseId,
-      feedbackValue,
-      translationLanguage,
-      unitId,
-      userId,
-    });
-    closeFeedbackWidget();
-    openGratitudeText();
-  }, [
-    courseId,
-    translationLanguage,
-    unitId,
-    userId,
-    closeFeedbackWidget,
-    openGratitudeText,
-  ]);
-
-  const onThumbsUpClick = useCallback(() => {
-    sendFeedback(true);
-  }, [sendFeedback]);
-  const onThumbsDownClick = useCallback(() => {
-    sendFeedback(false);
-  }, [sendFeedback]);
-
-  return {
-    closeFeedbackWidget,
-    openFeedbackWidget,
-    openGratitudeText,
-    sendFeedback,
-    showFeedbackWidget,
-    showGratitudeText,
-    onThumbsUpClick,
-    onThumbsDownClick,
-  };
-};
-
-export default useFeedbackWidget;

plugins/UnitTranslationPlugin/feedback-widget/useFeedbackWidget.test.js

@@ -1,163 +0,0 @@
-import { renderHook, act } from '@testing-library/react-hooks';
-
-import useFeedbackWidget from './useFeedbackWidget';
-import { createTranslationFeedback, getTranslationFeedback } from '../data/api';
-
-jest.mock('../data/api', () => ({
-  createTranslationFeedback: jest.fn(),
-  getTranslationFeedback: jest.fn(),
-}));
-
-const initialProps = {
-  courseId: 'course-v1:edX+DemoX+Demo_Course',
-  translationLanguage: 'es',
-  unitId: 'block-v1:edX+DemoX+Demo_Course+type@vertical+block@vertical_0270f6de40fc',
-  userId: 3,
-};
-
-const newProps = {
-  courseId: 'course-v1:edX+DemoX+Demo_Course',
-  translationLanguage: 'fr',
-  unitId: 'block-v1:edX+DemoX+Demo_Course+type@vertical+block@vertical_0270f6de40fc',
-  userId: 3,
-};
-
-describe('useFeedbackWidget', () => {
-  beforeEach(async () => {
-    getTranslationFeedback.mockReturnValue('');
-  });
-
-  afterEach(() => {
-    jest.restoreAllMocks();
-  });
-
-  test('closeFeedbackWidget behavior', () => {
-    const { result, waitFor } = renderHook(() => useFeedbackWidget(initialProps));
-    waitFor(() => expect(result.current.showFeedbackWidget.toBe(true)));
-    act(() => {
-      result.current.closeFeedbackWidget();
-    });
-    expect(result.current.showFeedbackWidget).toBe(false);
-  });
-
-  test('openFeedbackWidget behavior', () => {
-    const { result } = renderHook(() => useFeedbackWidget(initialProps));
-    act(() => {
-      result.current.closeFeedbackWidget();
-    });
-    expect(result.current.showFeedbackWidget).toBe(false);
-    act(() => {
-      result.current.openFeedbackWidget();
-    });
-    expect(result.current.showFeedbackWidget).toBe(true);
-  });
-
-  test('openGratitudeText behavior', async () => {
-    const { result, waitFor } = renderHook(() => useFeedbackWidget(initialProps));
-
-    expect(result.current.showGratitudeText).toBe(false);
-    act(() => {
-      result.current.openGratitudeText();
-    });
-    expect(result.current.showGratitudeText).toBe(true);
-    // Wait for 3 seconds to hide the gratitude text
-    waitFor(() => {
-      expect(result.current.showGratitudeText).toBe(false);
-    }, { timeout: 3000 });
-  });
-
-  test('sendFeedback behavior', () => {
-    const { result, waitFor } = renderHook(() => useFeedbackWidget(initialProps));
-    const feedbackValue = true;
-
-    waitFor(() => expect(result.current.showFeedbackWidget.toBe(true)));
-
-    expect(result.current.showGratitudeText).toBe(false);
-    act(() => {
-      result.current.sendFeedback(feedbackValue);
-    });
-
-    waitFor(() => {
-      expect(result.current.showFeedbackWidget).toBe(false);
-      expect(result.current.showGratitudeText).toBe(true);
-    });
-
-    expect(createTranslationFeedback).toHaveBeenCalledWith({
-      courseId: initialProps.courseId,
-      feedbackValue,
-      translationLanguage: initialProps.translationLanguage,
-      unitId: initialProps.unitId,
-      userId: initialProps.userId,
-    });
-
-    // Wait for 3 seconds to hide the gratitude text
-    waitFor(() => {
-      expect(result.current.showGratitudeText).toBe(false);
-    }, { timeout: 3000 });
-  });
-
-  test('onThumbsUpClick behavior', () => {
-    const { result } = renderHook(() => useFeedbackWidget(initialProps));
-
-    act(() => {
-      result.current.onThumbsUpClick();
-    });
-
-    expect(createTranslationFeedback).toHaveBeenCalledWith({
-      courseId: initialProps.courseId,
-      feedbackValue: true,
-      translationLanguage: initialProps.translationLanguage,
-      unitId: initialProps.unitId,
-      userId: initialProps.userId,
-    });
-  });
-
-  test('onThumbsDownClick behavior', () => {
-    const { result } = renderHook(() => useFeedbackWidget(initialProps));
-
-    act(() => {
-      result.current.onThumbsDownClick();
-    });
-
-    expect(createTranslationFeedback).toHaveBeenCalledWith({
-      courseId: initialProps.courseId,
-      feedbackValue: false,
-      translationLanguage: initialProps.translationLanguage,
-      unitId: initialProps.unitId,
-      userId: initialProps.userId,
-    });
-  });
-
-  test('fetch feedback on initialization', () => {
-    const { waitFor } = renderHook(() => useFeedbackWidget(initialProps));
-    waitFor(() => {
-      expect(getTranslationFeedback).toHaveBeenCalledWith({
-        courseId: initialProps.courseId,
-        translationLanguage: initialProps.translationLanguage,
-        unitId: initialProps.unitId,
-        userId: initialProps.userId,
-      });
-    });
-  });
-
-  test('fetch feedback on props update', () => {
-    const { rerender, waitFor } = renderHook(() => useFeedbackWidget(initialProps));
-    waitFor(() => {
-      expect(getTranslationFeedback).toHaveBeenCalledWith({
-        courseId: initialProps.courseId,
-        translationLanguage: initialProps.translationLanguage,
-        unitId: initialProps.unitId,
-        userId: initialProps.userId,
-      });
-    });
-    rerender(newProps);
-    waitFor(() => {
-      expect(getTranslationFeedback).toHaveBeenCalledWith({
-        courseId: newProps.courseId,
-        translationLanguage: newProps.translationLanguage,
-        unitId: newProps.unitId,
-        userId: newProps.userId,
-      });
-    });
-  });
-});

plugins/UnitTranslationPlugin/index.jsx

@@ -1,43 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import PropTypes from 'prop-types';
-
-import { useModel } from '@src/generic/model-store';
-
-import TranslationSelection from './translation-selection';
-import { fetchTranslationConfig } from './data/api';
-
-const UnitTranslationPlugin = ({ id, courseId, unitId }) => {
-  const { language } = useModel('coursewareMeta', courseId);
-  const [translationConfig, setTranslationConfig] = useState({
-    enabled: false,
-    availableLanguages: [],
-  });
-
-  useEffect(() => {
-    fetchTranslationConfig(courseId).then(setTranslationConfig);
-  }, []);
-
-  const { enabled, availableLanguages } = translationConfig;
-
-  if (!enabled || !language || !availableLanguages.length) {
-    return null;
-  }
-
-  return (
-    <TranslationSelection
-      id={id}
-      courseId={courseId}
-      language={language}
-      availableLanguages={availableLanguages}
-      unitId={unitId}
-    />
-  );
-};
-
-UnitTranslationPlugin.propTypes = {
-  id: PropTypes.string.isRequired,
-  courseId: PropTypes.string.isRequired,
-  unitId: PropTypes.string.isRequired,
-};
-
-export default UnitTranslationPlugin;

plugins/UnitTranslationPlugin/index.test.jsx

@@ -1,62 +0,0 @@
-import { shallow } from '@edx/react-unit-test-utils';
-import { useState } from 'react';
-import { useModel } from '@src/generic/model-store';
-
-import UnitTranslationPlugin from './index';
-
-jest.mock('@src/generic/model-store');
-jest.mock('./data/api', () => ({
-  fetchTranslationConfig: jest.fn(),
-}));
-jest.mock('./translation-selection', () => 'TranslationSelection');
-jest.mock('react', () => ({
-  ...jest.requireActual('react'),
-  useState: jest.fn(),
-}));
-
-describe('<UnitTranslationPlugin />', () => {
-  const props = {
-    id: 'id',
-    courseId: 'courseId',
-    unitId: 'unitId',
-  };
-  const mockInitialState = ({ enabled = true, availableLanguages = ['en'] }) => {
-    useState.mockReturnValue([{ enabled, availableLanguages }, jest.fn()]);
-  };
-  it('render empty when translation is not enabled', () => {
-    useModel.mockReturnValue({ language: 'en' });
-    mockInitialState({ enabled: false });
-
-    const wrapper = shallow(<UnitTranslationPlugin {...props} />);
-
-    expect(wrapper.isEmptyRender()).toBe(true);
-  });
-  it('render empty when available languages is empty', () => {
-    useModel.mockReturnValue({ language: 'fr' });
-    mockInitialState({
-      availableLanguages: [],
-    });
-
-    const wrapper = shallow(<UnitTranslationPlugin {...props} />);
-
-    expect(wrapper.isEmptyRender()).toBe(true);
-  });
-
-  it('render empty when course language has not been set', () => {
-    useModel.mockReturnValue({ language: undefined });
-    mockInitialState({});
-
-    const wrapper = shallow(<UnitTranslationPlugin {...props} />);
-
-    expect(wrapper.isEmptyRender()).toBe(true);
-  });
-
-  it('render TranslationSelection when translation is enabled and language is available', () => {
-    useModel.mockReturnValue({ language: 'en' });
-    mockInitialState({});
-
-    const wrapper = shallow(<UnitTranslationPlugin {...props} />);
-
-    expect(wrapper.snapshot).toMatchSnapshot();
-  });
-});

plugins/UnitTranslationPlugin/translation-selection/TranslationModal.jsx

@@ -1,82 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { useIntl } from '@edx/frontend-platform/i18n';
-import {
-  StandardModal,
-  ActionRow,
-  Button,
-  Icon,
-  ListBox,
-  ListBoxOption,
-} from '@openedx/paragon';
-import { Check } from '@openedx/paragon/icons';
-
-import useTranslationModal from './useTranslationModal';
-import messages from './messages';
-
-import './TranslationModal.scss';
-
-const TranslationModal = ({
-  isOpen,
-  close,
-  selectedLanguage,
-  setSelectedLanguage,
-  availableLanguages,
-}) => {
-  const { formatMessage } = useIntl();
-  const { selectedIndex, setSelectedIndex, onSubmit } = useTranslationModal({
-    selectedLanguage,
-    setSelectedLanguage,
-    close,
-    availableLanguages,
-  });
-
-  return (
-    <StandardModal
-      title={formatMessage(messages.languageSelectionModalTitle)}
-      isOpen={isOpen}
-      onClose={close}
-      footerNode={(
-        <ActionRow>
-          <ActionRow.Spacer />
-          <Button variant="tertiary" onClick={close}>
-            {formatMessage(messages.cancelButtonText)}
-          </Button>
-          <Button onClick={onSubmit}>
-            {formatMessage(messages.submitButtonText)}
-          </Button>
-        </ActionRow>
-      )}
-    >
-      <ListBox className="listbox-container">
-        {availableLanguages.map(({ code, label }, index) => (
-          <ListBoxOption
-            className="d-flex justify-content-between"
-            key={code}
-            selectedOptionIndex={selectedIndex}
-            onSelect={() => setSelectedIndex(index)}
-          >
-            {label}
-            {selectedIndex === index && <Icon src={Check} />}
-          </ListBoxOption>
-        ))}
-      </ListBox>
-    </StandardModal>
-  );
-};
-
-TranslationModal.propTypes = {
-  isOpen: PropTypes.bool.isRequired,
-  close: PropTypes.func.isRequired,
-  selectedLanguage: PropTypes.string.isRequired,
-  setSelectedLanguage: PropTypes.func.isRequired,
-  availableLanguages: PropTypes.arrayOf(
-    PropTypes.shape({
-      code: PropTypes.string.isRequired,
-      label: PropTypes.string.isRequired,
-    }),
-  ).isRequired,
-};
-
-export default TranslationModal;

plugins/UnitTranslationPlugin/translation-selection/TranslationModal.scss

@@ -1,7 +0,0 @@
-.listbox-container {
-  max-height: 400px;
-
-  :last-child {
-    margin-bottom: 5px;
-  }
-}

plugins/UnitTranslationPlugin/translation-selection/TranslationModal.test.jsx

@@ -1,59 +0,0 @@
-import { shallow } from '@edx/react-unit-test-utils';
-
-import TranslationModal from './TranslationModal';
-
-jest.mock('./useTranslationModal', () => ({
-  __esModule: true,
-  default: () => ({
-    selectedIndex: 0,
-    setSelectedIndex: jest.fn(),
-    onSubmit: jest.fn().mockName('onSubmit'),
-  }),
-}));
-jest.mock('@openedx/paragon', () => jest.requireActual('@edx/react-unit-test-utils').mockComponents({
-  StandardModal: 'StandardModal',
-  ActionRow: {
-    Spacer: 'Spacer',
-  },
-  Button: 'Button',
-  Icon: 'Icon',
-  ListBox: 'ListBox',
-  ListBoxOption: 'ListBoxOption',
-}));
-jest.mock('@openedx/paragon/icons', () => ({
-  Check: jest.fn().mockName('icons.Check'),
-}));
-jest.mock('@edx/frontend-platform/i18n', () => {
-  const i18n = jest.requireActual('@edx/frontend-platform/i18n');
-  const { formatMessage } = jest.requireActual('@edx/react-unit-test-utils');
-  return {
-    ...i18n,
-    useIntl: jest.fn(() => ({
-      formatMessage,
-    })),
-  };
-});
-
-describe('TranslationModal', () => {
-  const props = {
-    isOpen: true,
-    close: jest.fn().mockName('close'),
-    selectedLanguage: 'en',
-    setSelectedLanguage: jest.fn().mockName('setSelectedLanguage'),
-    availableLanguages: [
-      {
-        code: 'en',
-        label: 'English',
-      },
-      {
-        code: 'es',
-        label: 'Spanish',
-      },
-    ],
-  };
-  it('renders correctly', () => {
-    const wrapper = shallow(<TranslationModal {...props} />);
-    expect(wrapper.snapshot).toMatchSnapshot();
-    expect(wrapper.instance.findByType('ListBoxOption')).toHaveLength(2);
-  });
-});

plugins/UnitTranslationPlugin/translation-selection/__snapshots__/TranslationModal.test.jsx.snap

@@ -1,49 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`TranslationModal renders correctly 1`] = `
-<StandardModal
-  footerNode={
-    <ActionRow>
-      <Spacer />
-      <Button
-        onClick={[MockFunction close]}
-        variant="tertiary"
-      >
-        Cancel
-      </Button>
-      <Button
-        onClick={[MockFunction onSubmit]}
-      >
-        Submit
-      </Button>
-    </ActionRow>
-  }
-  isOpen={true}
-  onClose={[MockFunction close]}
-  title="Translate this course"
->
-  <ListBox
-    className="listbox-container"
-  >
-    <ListBoxOption
-      className="d-flex justify-content-between"
-      key="en"
-      onSelect={[Function]}
-      selectedOptionIndex={0}
-    >
-      English
-      <Icon
-        src={[MockFunction icons.Check]}
-      />
-    </ListBoxOption>
-    <ListBoxOption
-      className="d-flex justify-content-between"
-      key="es"
-      onSelect={[Function]}
-      selectedOptionIndex={0}
-    >
-      Spanish
-    </ListBoxOption>
-  </ListBox>
-</StandardModal>
-`;

plugins/UnitTranslationPlugin/translation-selection/__snapshots__/index.test.jsx.snap

@@ -1,50 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<TranslationSelection /> renders 1`] = `
-<Fragment>
-  <ProductTour
-    tours={
-      Array [
-        Object {
-          "abitrarily": "defined",
-        },
-      ]
-    }
-  />
-  <IconButton
-    alt="change-language"
-    className="mr-2 mb-2 float-right"
-    iconAs="Icon"
-    id="translation-selection-button"
-    onClick={[MockFunction open]}
-    src="Language"
-    variant="primary"
-  />
-  <TranslationModal
-    availableLanguages={
-      Array [
-        Object {
-          "code": "en",
-          "label": "English",
-        },
-        Object {
-          "code": "es",
-          "label": "Spanish",
-        },
-      ]
-    }
-    close={[MockFunction close]}
-    courseId="course-v1:edX+DemoX+Demo_Course"
-    id="plugin-test-id"
-    isOpen={false}
-    selectedLanguage="en"
-    setSelectedLanguage={[MockFunction setSelectedLanguage]}
-  />
-  <FeedbackWidget
-    courseId="course-v1:edX+DemoX+Demo_Course"
-    translationLanguage="en"
-    unitId="unit-test-id"
-    userId="123"
-  />
-</Fragment>
-`;

plugins/UnitTranslationPlugin/translation-selection/index.jsx

@@ -1,100 +0,0 @@
-import React, { useContext, useEffect } from 'react';
-import PropTypes from 'prop-types';
-
-import { AppContext } from '@edx/frontend-platform/react';
-import { IconButton, Icon, ProductTour } from '@openedx/paragon';
-import { Language } from '@openedx/paragon/icons';
-import { useDispatch } from 'react-redux';
-import { stringifyUrl } from 'query-string';
-
-import { registerOverrideMethod } from '@src/generic/plugin-store';
-
-import TranslationModal from './TranslationModal';
-import useTranslationTour from './useTranslationTour';
-import useSelectLanguage from './useSelectLanguage';
-import FeedbackWidget from '../feedback-widget';
-
-const TranslationSelection = ({
-  id, courseId, language, availableLanguages, unitId,
-}) => {
-  const {
-    authenticatedUser: { userId },
-  } = useContext(AppContext);
-  const dispatch = useDispatch();
-  const {
-    translationTour, isOpen, open, close,
-  } = useTranslationTour();
-
-  const { selectedLanguage, setSelectedLanguage } = useSelectLanguage({
-    courseId,
-    language,
-  });
-
-  useEffect(() => {
-    dispatch(
-      registerOverrideMethod({
-        pluginName: id,
-        methodName: 'getIFrameUrl',
-        method: (iframeUrl) => {
-          const finalUrl = stringifyUrl({
-            url: iframeUrl,
-            query: {
-              ...(language
-                && selectedLanguage
-                && language !== selectedLanguage && {
-                src_lang: language,
-                dest_lang: selectedLanguage,
-              }),
-            },
-          });
-          return finalUrl;
-        },
-      }),
-    );
-  }, [language, selectedLanguage]);
-
-  return (
-    <>
-      <ProductTour tours={[translationTour]} />
-      <IconButton
-        src={Language}
-        iconAs={Icon}
-        alt="change-language"
-        onClick={open}
-        variant="primary"
-        className="mr-2 mb-2 float-right"
-        id="translation-selection-button"
-      />
-      <TranslationModal
-        isOpen={isOpen}
-        close={close}
-        courseId={courseId}
-        selectedLanguage={selectedLanguage}
-        setSelectedLanguage={setSelectedLanguage}
-        availableLanguages={availableLanguages}
-        id={id}
-      />
-      <FeedbackWidget
-        courseId={courseId}
-        translationLanguage={selectedLanguage}
-        unitId={unitId}
-        userId={userId}
-      />
-    </>
-  );
-};
-
-TranslationSelection.propTypes = {
-  id: PropTypes.string.isRequired,
-  courseId: PropTypes.string.isRequired,
-  unitId: PropTypes.string.isRequired,
-  language: PropTypes.string.isRequired,
-  availableLanguages: PropTypes.arrayOf(PropTypes.shape({
-    code: PropTypes.string.isRequired,
-    label: PropTypes.string.isRequired,
-  })).isRequired,
-};
-
-TranslationSelection.defaultProps = {};
-
-export default TranslationSelection;

plugins/UnitTranslationPlugin/translation-selection/index.test.jsx

@@ -1,63 +0,0 @@
-import { shallow } from '@edx/react-unit-test-utils';
-
-import TranslationSelection from './index';
-
-jest.mock('react', () => ({
-  ...jest.requireActual('react'),
-  useContext: jest.fn().mockName('useContext').mockReturnValue({
-    authenticatedUser: {
-      userId: '123',
-    },
-  }),
-}));
-jest.mock('@openedx/paragon', () => ({
-  IconButton: 'IconButton',
-  Icon: 'Icon',
-  ProductTour: 'ProductTour',
-}));
-jest.mock('@openedx/paragon/icons', () => ({
-  Language: 'Language',
-}));
-jest.mock('./useTranslationTour', () => () => ({
-  translationTour: {
-    abitrarily: 'defined',
-  },
-  isOpen: false,
-  open: jest.fn().mockName('open'),
-  close: jest.fn().mockName('close'),
-}));
-jest.mock('react-redux', () => ({
-  useDispatch: jest.fn().mockName('useDispatch'),
-}));
-jest.mock('@src/generic/plugin-store', () => ({
-  registerOverrideMethod: jest.fn().mockName('registerOverrideMethod'),
-}));
-jest.mock('./TranslationModal', () => 'TranslationModal');
-jest.mock('./useSelectLanguage', () => () => ({
-  selectedLanguage: 'en',
-  setSelectedLanguage: jest.fn().mockName('setSelectedLanguage'),
-}));
-jest.mock('../feedback-widget', () => 'FeedbackWidget');
-
-describe('<TranslationSelection />', () => {
-  const props = {
-    id: 'plugin-test-id',
-    courseId: 'course-v1:edX+DemoX+Demo_Course',
-    language: 'en',
-    availableLanguages: [
-      {
-        code: 'en',
-        label: 'English',
-      },
-      {
-        code: 'es',
-        label: 'Spanish',
-      },
-    ],
-    unitId: 'unit-test-id',
-  };
-  it('renders', () => {
-    const wrapper = shallow(<TranslationSelection {...props} />);
-    expect(wrapper.snapshot).toMatchSnapshot();
-  });
-});

plugins/UnitTranslationPlugin/translation-selection/messages.js

@@ -1,41 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  translationTourModalTitle: {
-    id: 'translationSelection.translationTourModalTitle',
-    defaultMessage: 'This is a standard modal dialog',
-    description: 'Title for the translation modal.',
-  },
-  translationTourModalBody: {
-    id: 'translationSelection.translationTourModalBody',
-    defaultMessage: 'Now you can easily translate course content.',
-    description: 'Body for the translation modal.',
-  },
-  tryItButtonText: {
-    id: 'translationSelection.tryItButtonText',
-    defaultMessage: 'Try it',
-    description: 'Button text for the translation modal.',
-  },
-  dismissButtonText: {
-    id: 'translationSelection.dismissButtonText',
-    defaultMessage: 'Dismiss',
-    description: 'Button text for the translation modal.',
-  },
-  languageSelectionModalTitle: {
-    id: 'translationSelection.languageSelectionModalTitle',
-    defaultMessage: 'Translate this course',
-    description: 'Title for the translation modal.',
-  },
-  cancelButtonText: {
-    id: 'translationSelection.cancelButtonText',
-    defaultMessage: 'Cancel',
-    description: 'Button text for the translation modal.',
-  },
-  submitButtonText: {
-    id: 'translationSelection.submitButtonText',
-    defaultMessage: 'Submit',
-    description: 'Button text for the translation modal.',
-  },
-});
-
-export default messages;

plugins/UnitTranslationPlugin/translation-selection/useSelectLanguage.js

@@ -1,35 +0,0 @@
-import { useCallback } from 'react';
-import { StrictDict, useKeyedState } from '@edx/react-unit-test-utils';
-import {
-  getLocalStorage,
-  setLocalStorage,
-} from '@src/data/localStorage';
-
-export const selectedLanguageKey = 'selectedLanguages';
-
-export const stateKeys = StrictDict({
-  selectedLanguage: 'selectedLanguage',
-});
-
-const useSelectLanguage = ({ courseId, language }) => {
-  const selectedLanguageItem = getLocalStorage(selectedLanguageKey) || {};
-  const [selectedLanguage, updateSelectedLanguage] = useKeyedState(
-    stateKeys.selectedLanguage,
-    selectedLanguageItem[courseId] || language,
-  );
-
-  const setSelectedLanguage = useCallback((newSelectedLanguage) => {
-    setLocalStorage(selectedLanguageKey, {
-      ...selectedLanguageItem,
-      [courseId]: newSelectedLanguage,
-    });
-    updateSelectedLanguage(newSelectedLanguage);
-  });
-
-  return {
-    selectedLanguage,
-    setSelectedLanguage,
-  };
-};
-
-export default useSelectLanguage;

plugins/UnitTranslationPlugin/translation-selection/useSelectLanguage.test.js

@@ -1,63 +0,0 @@
-import { mockUseKeyedState } from '@edx/react-unit-test-utils';
-import {
-  getLocalStorage,
-  setLocalStorage,
-} from '@src/data/localStorage';
-
-import useSelectLanguage, {
-  stateKeys,
-  selectedLanguageKey,
-} from './useSelectLanguage';
-
-const state = mockUseKeyedState(stateKeys);
-
-jest.mock('react', () => ({
-  ...jest.requireActual('react'),
-  useCallback: jest.fn((cb, prereqs) => (...args) => [
-    cb(...args),
-    { cb, prereqs },
-  ]),
-}));
-jest.mock('@src/data/localStorage', () => ({
-  getLocalStorage: jest.fn(),
-  setLocalStorage: jest.fn(),
-}));
-
-describe('useSelectLanguage', () => {
-  const props = {
-    courseId: 'test-course-id',
-    language: 'en',
-  };
-  const languages = [
-    { code: 'en', label: 'English' },
-    { code: 'es', label: 'Spanish' },
-  ];
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    state.mock();
-  });
-  afterEach(() => {
-    state.resetVals();
-  });
-
-  languages.forEach(({ code, label }) => {
-    it(`initializes selectedLanguage to the selected language (${label})`, () => {
-      getLocalStorage.mockReturnValueOnce({ [props.courseId]: code });
-      const { selectedLanguage } = useSelectLanguage(props);
-
-      state.expectInitializedWith(stateKeys.selectedLanguage, code);
-      expect(selectedLanguage).toBe(code);
-    });
-  });
-
-  test('setSelectedLanguage behavior', () => {
-    const { setSelectedLanguage } = useSelectLanguage(props);
-
-    setSelectedLanguage('es');
-    state.expectSetStateCalledWith(stateKeys.selectedLanguage, 'es');
-    expect(setLocalStorage).toHaveBeenCalledWith(selectedLanguageKey, {
-      [props.courseId]: 'es',
-    });
-  });
-});

plugins/UnitTranslationPlugin/translation-selection/useTranslationModal.js

@@ -1,29 +0,0 @@
-import { useCallback } from 'react';
-import { StrictDict, useKeyedState } from '@edx/react-unit-test-utils';
-
-export const stateKeys = StrictDict({
-  selectedIndex: 'selectedIndex',
-});
-
-const useTranslationModal = ({
-  selectedLanguage, setSelectedLanguage, close, availableLanguages,
-}) => {
-  const [selectedIndex, setSelectedIndex] = useKeyedState(
-    stateKeys.selectedIndex,
-    availableLanguages.findIndex((lang) => lang.code === selectedLanguage),
-  );
-
-  const onSubmit = useCallback(() => {
-    const newSelectedLanguage = availableLanguages[selectedIndex].code;
-    setSelectedLanguage(newSelectedLanguage);
-    close();
-  }, [selectedIndex]);
-
-  return {
-    selectedIndex,
-    setSelectedIndex,
-    onSubmit,
-  };
-};
-
-export default useTranslationModal;

plugins/UnitTranslationPlugin/translation-selection/useTranslationModal.test.js

@@ -1,49 +0,0 @@
-import { mockUseKeyedState } from '@edx/react-unit-test-utils';
-
-import useTranslationModal, { stateKeys } from './useTranslationModal';
-
-const state = mockUseKeyedState(stateKeys);
-
-jest.mock('react', () => ({
-  ...jest.requireActual('react'),
-  useCallback: jest.fn((cb, prereqs) => (...args) => ([
-    cb(...args), { cb, prereqs },
-  ])),
-}));
-
-describe('useTranslationModal', () => {
-  const props = {
-    selectedLanguage: 'en',
-    setSelectedLanguage: jest.fn(),
-    close: jest.fn(),
-    availableLanguages: [
-      { code: 'en', label: 'English' },
-      { code: 'es', label: 'Spanish' },
-    ],
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    state.mock();
-  });
-  afterEach(() => {
-    state.resetVals();
-  });
-
-  it('initializes selectedIndex to the index of the selected language', () => {
-    const { selectedIndex } = useTranslationModal(props);
-
-    state.expectInitializedWith(stateKeys.selectedIndex, 0);
-    expect(selectedIndex).toBe(0);
-  });
-
-  it('onSubmit updates the selected language and closes the modal', () => {
-    const { onSubmit } = useTranslationModal({
-      ...props,
-      selectedLanguage: 'es',
-    });
-    onSubmit();
-    expect(props.setSelectedLanguage).toHaveBeenCalledWith('es');
-    expect(props.close).toHaveBeenCalled();
-  });
-});

plugins/UnitTranslationPlugin/translation-selection/useTranslationTour.js

@@ -1,62 +0,0 @@
-import { useCallback } from 'react';
-
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { useToggle } from '@openedx/paragon';
-import { StrictDict, useKeyedState } from '@edx/react-unit-test-utils';
-
-import messages from './messages';
-
-const hasSeenTranslationTourKey = 'hasSeenTranslationTour';
-
-export const stateKeys = StrictDict({
-  showTranslationTour: 'showTranslationTour',
-});
-
-const useTranslationTour = () => {
-  const { formatMessage } = useIntl();
-
-  const [isTourEnabled, setIsTourEnabled] = useKeyedState(
-    stateKeys.showTranslationTour,
-    global.localStorage.getItem(hasSeenTranslationTourKey) !== 'true',
-  );
-  const [isOpen, open, close] = useToggle(false);
-
-  const endTour = useCallback(() => {
-    global.localStorage.setItem(hasSeenTranslationTourKey, 'true');
-    setIsTourEnabled(false);
-  }, [isTourEnabled, setIsTourEnabled]);
-
-  const tryIt = useCallback(() => {
-    endTour();
-    open();
-  }, [endTour, open]);
-
-  const translationTour = isTourEnabled
-    ? {
-      tourId: 'translation',
-      enabled: isTourEnabled,
-      onDismiss: endTour,
-      onEnd: tryIt,
-      checkpoints: [
-        {
-          title: formatMessage(messages.translationTourModalTitle),
-          body: formatMessage(messages.translationTourModalBody),
-          placement: 'bottom',
-          target: '#translation-selection-button',
-          showDismissButton: true,
-          endButtonText: formatMessage(messages.tryItButtonText),
-          dismissButtonText: formatMessage(messages.dismissButtonText),
-        },
-      ],
-    }
-    : {};
-
-  return {
-    translationTour,
-    isOpen,
-    open,
-    close,
-  };
-};
-
-export default useTranslationTour;

plugins/UnitTranslationPlugin/translation-selection/useTranslationTour.test.js

@@ -1,95 +0,0 @@
-import { mockUseKeyedState } from '@edx/react-unit-test-utils';
-import { useToggle } from '@openedx/paragon';
-
-import useTranslationTour, { stateKeys } from './useTranslationTour';
-
-jest.mock('react', () => ({
-  ...jest.requireActual('react'),
-  useCallback: jest.fn((cb, prereqs) => () => {
-    cb();
-    return { useCallback: { cb, prereqs } };
-  }),
-}));
-jest.mock('@openedx/paragon', () => ({
-  useToggle: jest.fn(),
-}));
-jest.mock('@edx/frontend-platform/i18n', () => {
-  const i18n = jest.requireActual('@edx/frontend-platform/i18n');
-  const { formatMessage } = jest.requireActual('@edx/react-unit-test-utils');
-  // this provide consistent for the test on different platform/timezone
-  const formatDate = jest.fn(date => new Date(date).toISOString()).mockName('useIntl.formatDate');
-  return {
-    ...i18n,
-    useIntl: jest.fn(() => ({
-      formatMessage,
-      formatDate,
-    })),
-    defineMessages: m => m,
-    FormattedMessage: () => 'FormattedMessage',
-  };
-});
-jest.mock('@src/data/localStorage', () => ({
-  getLocalStorage: jest.fn(),
-  setLocalStorage: jest.fn(),
-}));
-
-const state = mockUseKeyedState(stateKeys);
-
-describe('useTranslationSelection', () => {
-  const mockLocalStroage = {
-    getItem: jest.fn(),
-    setItem: jest.fn(),
-  };
-
-  const toggleOpen = jest.fn();
-  const toggleClose = jest.fn();
-
-  useToggle.mockReturnValue([false, toggleOpen, toggleClose]);
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    state.mock();
-    window.localStorage = mockLocalStroage;
-  });
-  afterEach(() => {
-    state.resetVals();
-    delete window.localStorage;
-  });
-
-  it('do not have translation tour if user already seen it', () => {
-    mockLocalStroage.getItem.mockReturnValueOnce('not seen');
-    const { translationTour } = useTranslationTour();
-
-    expect(translationTour.enabled).toBe(true);
-  });
-
-  it('show translation tour if user has not seen it', () => {
-    mockLocalStroage.getItem.mockReturnValueOnce('true');
-    const { translationTour } = useTranslationTour();
-
-    expect(translationTour).toMatchObject({});
-  });
-  test('open and close as pass from useToggle', () => {
-    const { isOpen, open, close } = useTranslationTour();
-    expect(isOpen).toBe(false);
-    expect(toggleOpen).toBe(open);
-    expect(toggleClose).toBe(close);
-  });
-  test('end tour on dismiss button click', () => {
-    mockLocalStroage.getItem.mockReturnValueOnce('not seen');
-    const { translationTour } = useTranslationTour();
-    translationTour.onDismiss();
-    expect(mockLocalStroage.setItem).toHaveBeenCalledWith(
-      'hasSeenTranslationTour',
-      'true',
-    );
-    state.expectSetStateCalledWith(stateKeys.showTranslationTour, false);
-  });
-  test('end tour and open modal on try it button click', () => {
-    mockLocalStroage.getItem.mockReturnValueOnce('not seen');
-    const { translationTour } = useTranslationTour();
-    translationTour.onEnd();
-    state.expectSetStateCalledWith(stateKeys.showTranslationTour, false);
-    expect(toggleOpen).toHaveBeenCalled();
-  });
-});

public/index.html

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

renovate.json

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

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

@@ -1,14 +1,26 @@
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import {
   FormattedMessage, FormattedDate, injectIntl, intlShape,
 } from '@edx/frontend-platform/i18n';
-import { Alert, Hyperlink } from '@openedx/paragon';
-import { Info } from '@openedx/paragon/icons';
+import { Alert, Hyperlink } from '@edx/paragon';
+import { Info } from '@edx/paragon/icons';
 
 import messages from './messages';
+import AccessExpirationAlertMMP2P from './AccessExpirationAlertMMP2P';
+import AccessExpirationAlertMasquerade from './AccessExpirationAlertMasquerade';
+
+function AccessExpirationAlert({ intl, payload }) {
+  /** [MM-P2P] Experiment */
+  const [showMMP2P, setShowMMP2P] = useState(!!window.experiment__home_alert_bShowMMP2P);
+  if (window.experiment__home_alert_showMMP2P === undefined) {
+    window.experiment__home_alert_showMMP2P = (val) => {
+      window.experiment__home_alert_bShowMMP2P = !!val;
+      setShowMMP2P(!!val);
+    };
+  }
 
-const AccessExpirationAlert = ({ intl, payload }) => {
   const {
     accessExpiration,
     courseId,
@@ -24,10 +36,24 @@ const AccessExpirationAlert = ({ intl, payload }) => {
 
   const {
     expirationDate,
+    masqueradingExpiredCourse,
     upgradeDeadline,
     upgradeUrl,
   } = accessExpiration;
 
+  if (masqueradingExpiredCourse) {
+    return (
+      <AccessExpirationAlertMasquerade payload={payload} />
+    );
+  }
+
+  /** [MM-P2P] Experiment */
+  if (showMMP2P) {
+    return (
+      <AccessExpirationAlertMMP2P payload={payload} />
+    );
+  }
+
   const logClick = () => {
     sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
       org_key: org,
@@ -47,7 +73,6 @@ const AccessExpirationAlert = ({ intl, payload }) => {
         <FormattedMessage
           id="learning.accessExpiration.deadline"
           defaultMessage="Upgrade by {date} to get unlimited access to the course as long as it exists on the site."
-          description="Warning shown to learner to upgrade while they are enrolled on the audit version and it's possible to upgrade"
           values={{
             date: (
               <FormattedDate
@@ -80,7 +105,6 @@ const AccessExpirationAlert = ({ intl, payload }) => {
         <FormattedMessage
           id="learning.accessExpiration.header"
           defaultMessage="Audit Access Expires {date}"
-          description="Headline for auditing deadline"
           values={{
             date: (
               <FormattedDate
@@ -99,7 +123,6 @@ const AccessExpirationAlert = ({ intl, payload }) => {
       <FormattedMessage
         id="learning.accessExpiration.body"
         defaultMessage="You lose all access to this course, including your progress, on {date}."
-        description="Message body to tell learner the consequences of course expiration."
         values={{
           date: (
             <FormattedDate
@@ -116,7 +139,7 @@ const AccessExpirationAlert = ({ intl, payload }) => {
       {deadlineMessage}
     </Alert>
   );
-};
+}
 
 AccessExpirationAlert.propTypes = {
   intl: intlShape.isRequired,

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

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

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

@@ -0,0 +1,60 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormattedMessage, FormattedDate } from '@edx/frontend-platform/i18n';
+import { Alert } from '@edx/paragon';
+import { Info } from '@edx/paragon/icons';
+
+function AccessExpirationAlertMasquerade({ payload }) {
+  const {
+    accessExpiration,
+    userTimezone,
+  } = payload;
+
+  if (!accessExpiration) {
+    return null;
+  }
+
+  const {
+    expirationDate,
+    masqueradingExpiredCourse,
+  } = accessExpiration;
+
+  if (!masqueradingExpiredCourse) {
+    return null;
+  }
+
+  const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
+
+  return (
+    <Alert variant="info" icon={Info}>
+      <FormattedMessage
+        id="learning.accessExpiration.expired"
+        defaultMessage="This learner does not have access to this course. Their access expired on {date}."
+        values={{
+          date: (
+            <FormattedDate
+              key="accessExpirationExpiredDate"
+              day="numeric"
+              month="short"
+              year="numeric"
+              value={expirationDate}
+              {...timezoneFormatArgs}
+            />
+          ),
+        }}
+      />
+    </Alert>
+  );
+}
+
+AccessExpirationAlertMasquerade.propTypes = {
+  payload: PropTypes.shape({
+    accessExpiration: PropTypes.shape({
+      expirationDate: PropTypes.string.isRequired,
+      masqueradingExpiredCourse: PropTypes.bool.isRequired,
+    }).isRequired,
+    userTimezone: PropTypes.string.isRequired,
+  }).isRequired,
+};
+
+export default AccessExpirationAlertMasquerade;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/alerts/enrollment-alert/EnrollmentAlert.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import PropTypes from 'prop-types';
-import { Alert, Button } from '@openedx/paragon';
-import { Info, WarningFilled } from '@openedx/paragon/icons';
+import { Alert, Button } from '@edx/paragon';
+import { Info, WarningFilled } from '@edx/paragon/icons';
 
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faSpinner } from '@fortawesome/free-solid-svg-icons';
@@ -11,7 +11,7 @@ import { useModel } from '../../generic/model-store';
 import messages from './messages';
 import useEnrollClickHandler from './clickHook';
 
-const EnrollmentAlert = ({ intl, payload }) => {
+function EnrollmentAlert({ intl, payload }) {
   const {
     canEnroll,
     courseId,
@@ -55,7 +55,7 @@ const EnrollmentAlert = ({ intl, payload }) => {
       </div>
     </Alert>
   );
-};
+}
 
 EnrollmentAlert.propTypes = {
   intl: intlShape.isRequired,

src/alerts/enrollment-alert/clickHook.js

@@ -27,7 +27,7 @@ function useEnrollClickHandler(courseId, orgId, successText) {
       });
       global.location.reload();
     });
-  }, [addFlash, courseId, orgId, successText]);
+  }, [courseId]);
 
   return { enrollClickHandler, loading };
 }

src/alerts/enrollment-alert/hooks.js

@@ -22,16 +22,16 @@ export function useEnrollmentAlert(courseId) {
    *    3. the course is private.
    */
   const isVisible = !enrolledUser && authenticatedUser !== null && privateOutline;
-  const payload = useMemo(() => ({
+  const payload = {
     canEnroll: outline && outline.enrollAlert ? outline.enrollAlert.canEnroll : false,
     courseId,
     extraText: outline && outline.enrollAlert ? outline.enrollAlert.extraText : '',
     isStaff: course && course.isStaff,
-  }), [course, courseId, outline]);
+  };
 
   useAlert(isVisible, {
     code: 'clientEnrollmentAlert',
-    payload,
+    payload: useMemo(() => payload, Object.values(payload).sort()),
     topic: 'outline',
   });
 

src/alerts/logistration-alert/AccountActivationAlert.jsx

@@ -7,15 +7,12 @@ import {
   Button,
   Spinner,
   Icon,
-} from '@openedx/paragon';
-import { Check, ArrowForward } from '@openedx/paragon/icons';
-import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+} from '@edx/paragon';
+import { Check, ArrowForward } from '@edx/paragon/icons';
+import { FormattedMessage, injectIntl } from '@edx/frontend-platform/i18n';
 import { sendActivationEmail } from '../../courseware/data';
-import messages from './messages';
 
-const AccountActivationAlert = ({
-  intl,
-}) => {
+function AccountActivationAlert() {
   const [showModal, setShowModal] = useState(false);
   const [showSpinner, setShowSpinner] = useState(false);
   const [showCheck, setShowCheck] = useState(false);
@@ -32,12 +29,22 @@ const AccountActivationAlert = ({
   if (showAccountActivationAlert !== undefined) {
     Cookies.remove('show-account-activation-popup', { path: '/', domain: process.env.SESSION_COOKIE_DOMAIN });
     // extra check to make sure cookie was removed before updating the state. Updating the state without removal
-    // of cookie would make it infinite rendering
+    // of cookie would make it infinit rendering
     if (Cookies.get('show-account-activation-popup') === undefined) {
       setShowModal(true);
     }
   }
 
+  const title = (
+    <h3>
+      <FormattedMessage
+        id="account-activation.alert.title"
+        defaultMessage="Activate your account so you can log back in"
+        description="Title for account activation alert which is shown after the registration"
+      />
+    </h3>
+  );
+
   const button = (
     <Button
       variant="primary"
@@ -57,7 +64,7 @@ const AccountActivationAlert = ({
   );
 
   const children = () => {
-    let bodyContent;
+    let bodyContent = null;
     const message = (
       <FormattedMessage
         id="account-activation.alert.message"
@@ -116,17 +123,13 @@ const AccountActivationAlert = ({
   return (
     <AlertModal
       isOpen={showModal}
-      title={intl.formatMessage(messages.accountActivationAlertTitle)}
+      title={title}
       footerNode={button}
       onClose={() => ({})}
     >
       {children()}
     </AlertModal>
   );
-};
-
-AccountActivationAlert.propTypes = {
-  intl: intlShape.isRequired,
-};
+}
 
 export default injectIntl(AccountActivationAlert);

src/alerts/logistration-alert/LogistrationAlert.jsx

@@ -2,12 +2,12 @@ import React from 'react';
 import { getConfig } from '@edx/frontend-platform';
 import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
 import { getLoginRedirectUrl } from '@edx/frontend-platform/auth';
-import { Alert, Hyperlink } from '@openedx/paragon';
-import { WarningFilled } from '@openedx/paragon/icons';
+import { Alert, Hyperlink } from '@edx/paragon';
+import { WarningFilled } from '@edx/paragon/icons';
 
 import genericMessages from '../../generic/messages';
 
-const LogistrationAlert = ({ intl }) => {
+function LogistrationAlert({ intl }) {
   const signIn = (
     <Hyperlink
       style={{ textDecoration: 'underline' }}
@@ -41,7 +41,7 @@ const LogistrationAlert = ({ intl }) => {
       />
     </Alert>
   );
-};
+}
 
 LogistrationAlert.propTypes = {
   intl: intlShape.isRequired,

src/alerts/logistration-alert/messages.js

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

src/alerts/sequence-alerts/hooks.js

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

src/alerts/sequence-alerts/messages.js

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

src/constants.js

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

src/course-header/AnonymousUserMenu.jsx

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

src/course-header/AuthenticatedUserDropdown.jsx

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

src/course-header/CourseTabsNavigation.jsx

@@ -5,16 +5,12 @@ import classNames from 'classnames';
 
 import messages from './messages';
 import Tabs from '../generic/tabs/Tabs';
-import { CoursewareSearch, CoursewareSearchToggle } from '../course-home/courseware-search';
-import { useCoursewareSearchState } from '../course-home/courseware-search/hooks';
 
-const CourseTabsNavigation = ({
+function CourseTabsNavigation({
   activeTabSlug, className, tabs, intl,
-}) => {
-  const { show } = useCoursewareSearchState();
-
+}) {
   return (
-    <div id="courseTabsNavigation" className={classNames('course-tabs-navigation', className)}>
+    <div className={classNames('course-tabs-navigation', className)}>
       <div className="container-xl">
         <Tabs
           className="nav-underline-tabs"
@@ -31,13 +27,9 @@ const CourseTabsNavigation = ({
           ))}
         </Tabs>
       </div>
-      <div className="course-tabs-navigation__search-toggle">
-        <CoursewareSearchToggle />
-      </div>
-      {show && <CoursewareSearch />}
     </div>
   );
-};
+}
 
 CourseTabsNavigation.propTypes = {
   activeTabSlug: PropTypes.string,

src/course-header/CourseTabsNavigation.test.jsx

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

src/course-header/Header.jsx

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

src/course-header/Header.test.jsx

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

src/course-header/index.js

@@ -1,2 +1,2 @@
-/* eslint-disable import/prefer-default-export */
+export { default as Header } from './Header';
 export { default as CourseTabsNavigation } from './CourseTabsNavigation';

src/course-header/messages.js

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

src/course-home/courseware-search/CoursewareResultsFilter.jsx

@@ -1,80 +0,0 @@
-import React, { useMemo } from 'react';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Tabs, Tab } from '@openedx/paragon';
-
-import { useParams } from 'react-router';
-import CoursewareSearchResults from './CoursewareSearchResults';
-import messages from './messages';
-import { useCoursewareSearchParams } from './hooks';
-import { useModel } from '../../generic/model-store';
-
-const filterAll = 'all';
-const filterTypes = ['text', 'video', 'sequence'];
-const filterOther = 'other';
-const validFilters = [filterAll, ...filterTypes, filterOther];
-
-export const CoursewareSearchResultsFilter = ({ intl }) => {
-  const { courseId } = useParams();
-  const lastSearch = useModel('contentSearchResults', courseId);
-  const { filter: filterKeyword, setFilter } = useCoursewareSearchParams();
-
-  if (!lastSearch) { return null; }
-
-  const { results: data = [] } = lastSearch;
-
-  // If there's no data, we show an empty result.
-  if (!data.length) { return <CoursewareSearchResults />; }
-
-  const results = useMemo(() => {
-    // This reducer distributes the data into different groups to make it easy to
-    // use on the filters.
-    // All results are added to the "all" key and then to its proper group key as well.
-    const grouped = data.reduce((acc, { type, ...rest }) => {
-      const resultType = filterTypes.includes(type) ? type : filterOther;
-      acc[filterAll].push({ type: resultType, ...rest });
-      acc[resultType] = [...(acc[resultType] || []), { type: resultType, ...rest }];
-      return acc;
-    }, { [filterAll]: [] });
-
-    // This is just to format the output object with the expected tab order.
-    const output = {};
-    validFilters.forEach(key => { if (grouped[key]) { output[key] = grouped[key]; } });
-
-    return output;
-  }, [lastSearch]);
-
-  const tabKeys = Object.keys(results);
-  // Filter has no use if it has only 2 tabs (The "all" tab and another one with the same items).
-  if (tabKeys.length < 3) { return <CoursewareSearchResults results={results[filterAll]} />; }
-
-  const filters = useMemo(() => tabKeys.map((key) => ({
-    key,
-    label: intl.formatMessage(messages[`filter:${key}`]),
-    count: results[key].length,
-  })), [results]);
-
-  const activeKey = validFilters.includes(filterKeyword) ? filterKeyword : filterAll;
-
-  return (
-    <Tabs
-      id="courseware-search-results-tabs"
-      className="courseware-search-results-tabs"
-      data-testid="courseware-search-results-tabs"
-      variant="tabs"
-      activeKey={activeKey}
-      onSelect={setFilter}
-    >
-      {filters.filter(({ count }) => (count > 0)).map(({ key, label }) => (
-        <Tab key={key} eventKey={key} title={label} data-testid={`courseware-search-results-tabs-${key}`}>
-          <CoursewareSearchResults results={results[key]} />
-        </Tab>
-      ))}
-    </Tabs>
-  );
-};
-
-CoursewareSearchResultsFilter.propTypes = {
-  intl: intlShape.isRequired,
-};
-
-export default injectIntl(CoursewareSearchResultsFilter);

src/course-home/courseware-search/CoursewareResultsFilter.test.jsx

@@ -1,132 +0,0 @@
-import React from 'react';
-import { AppProvider } from '@edx/frontend-platform/react';
-import { Route, Routes } from 'react-router-dom';
-import { history } from '@edx/frontend-platform';
-import {
-  initializeMockApp,
-  render,
-  screen,
-  waitFor,
-} from '../../setupTest';
-import { CoursewareSearchResultsFilter } from './CoursewareResultsFilter';
-import { useCoursewareSearchParams } from './hooks';
-import initializeStore from '../../store';
-import { useModel } from '../../generic/model-store';
-import searchResultsFactory from './test-data/search-results-factory';
-
-jest.mock('./hooks');
-jest.mock('../../generic/model-store', () => ({
-  useModel: jest.fn(),
-}));
-
-global.ResizeObserver = jest.fn().mockImplementation(() => ({
-  observe: jest.fn(),
-  unobserve: jest.fn(),
-  disconnect: jest.fn(),
-}));
-
-const decodedCourseId = 'course-v1:edX+DemoX+Demo_Course';
-const decodedSequenceId = 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@edx_introduction';
-const decodedUnitId = 'block-v1:edX+DemoX+Demo_Course+type@vertical+block@vertical_0270f6de40fc';
-const pathname = `/course/${decodedCourseId}/${decodedSequenceId}/${decodedUnitId}`;
-
-const intl = {
-  formatMessage: (message) => message?.defaultMessage || '',
-};
-
-const coursewareSearch = {
-  query: '',
-  filter: '',
-  setQuery: jest.fn(),
-  setFilter: jest.fn(),
-  clearSearchParams: jest.fn(),
-};
-
-function renderComponent(props = {}) {
-  const store = initializeStore();
-  history.push(pathname);
-  const { container } = render(
-    <AppProvider store={store}>
-      <Routes>
-        <Route path="/course/:courseId/:sequenceId/:unitId" element={<CoursewareSearchResultsFilter intl={intl} {...props} />} />
-      </Routes>
-    </AppProvider>,
-  );
-  return container;
-}
-
-describe('CoursewareSearchResultsFilter', () => {
-  beforeAll(initializeMockApp);
-
-  beforeEach(() => {
-    useCoursewareSearchParams.mockReturnValue(coursewareSearch);
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  describe('when returning full results', () => {
-    beforeEach(() => {
-      useModel.mockReturnValue(searchResultsFactory());
-      renderComponent();
-    });
-
-    it('should render without errors', async () => {
-      await waitFor(() => {
-        expect(useCoursewareSearchParams).toBeCalled();
-      });
-
-      expect(screen.queryByTestId('courseware-search-results-tabs')).toBeInTheDocument();
-      expect(screen.queryByTestId('courseware-search-results-tabs-all')).toBeInTheDocument();
-      expect(screen.queryByTestId('courseware-search-results-tabs-text')).toBeInTheDocument();
-      expect(screen.queryByTestId('courseware-search-results-tabs-video')).toBeInTheDocument();
-      expect(screen.queryByTestId('courseware-search-results-tabs-sequence')).toBeInTheDocument();
-      expect(screen.queryByTestId('courseware-search-results-tabs-other')).toBeInTheDocument();
-    });
-  });
-
-  describe('when returning only one result type', () => {
-    beforeEach(async () => {
-      // Get results for only videos
-      const data = searchResultsFactory();
-      const onlyVideos = data.results.filter(({ type }) => type === 'video');
-      const filteredResults = {
-        ...data,
-        results: onlyVideos,
-      };
-
-      useModel.mockReturnValue(filteredResults);
-      await renderComponent();
-    });
-
-    it('should not render', async () => {
-      await waitFor(() => {
-        expect(useCoursewareSearchParams).toBeCalled();
-      });
-
-      expect(screen.queryByTestId('courseware-search-results-tabs')).not.toBeInTheDocument();
-    });
-  });
-
-  describe('when there are not results', () => {
-    beforeEach(async () => {
-      useModel.mockReturnValue(searchResultsFactory('blah', {
-        results: [],
-        filters: [],
-        total: 0,
-        maxScore: null,
-        ms: 5,
-      }));
-      await renderComponent();
-    });
-
-    it('should not render', async () => {
-      await waitFor(() => {
-        expect(useCoursewareSearchParams).toBeCalled();
-      });
-
-      expect(screen.queryByTestId('courseware-search-results-tabs')).not.toBeInTheDocument();
-    });
-  });
-});

src/course-home/courseware-search/CoursewareSearch.jsx

@@ -1,148 +0,0 @@
-import React, { useEffect } from 'react';
-import { useParams } from 'react-router';
-import { useDispatch } from 'react-redux';
-import { sendTrackingLogEvent } from '@edx/frontend-platform/analytics';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import {
-  Alert, Button, Icon, Spinner,
-} from '@openedx/paragon';
-import {
-  Close,
-} from '@openedx/paragon/icons';
-import { setShowSearch } from '../data/slice';
-import { useCoursewareSearchParams, useElementBoundingBox, useLockScroll } from './hooks';
-import messages from './messages';
-
-import CoursewareSearchForm from './CoursewareSearchForm';
-import CoursewareSearchResultsFilterContainer from './CoursewareResultsFilter';
-import { updateModel, useModel } from '../../generic/model-store';
-import { searchCourseContent } from '../data/thunks';
-
-const CoursewareSearch = ({ intl, ...sectionProps }) => {
-  const { courseId } = useParams();
-  const { query: searchKeyword, setQuery, clearSearchParams } = useCoursewareSearchParams();
-  const dispatch = useDispatch();
-  const { org } = useModel('courseHomeMeta', courseId);
-  const {
-    loading,
-    searchKeyword: lastSearchKeyword,
-    errors,
-    total,
-  } = useModel('contentSearchResults', courseId);
-
-  useLockScroll();
-
-  const info = useElementBoundingBox('courseTabsNavigation');
-  const top = info ? `${Math.floor(info.top)}px` : 0;
-
-  const clearSearch = () => {
-    clearSearchParams();
-    dispatch(updateModel({
-      modelType: 'contentSearchResults',
-      model: {
-        id: courseId,
-        searchKeyword: '',
-        results: [],
-        errors: undefined,
-        loading: false,
-      },
-    }));
-  };
-
-  const handleSubmit = (value) => {
-    if (!value) {
-      clearSearch();
-      return;
-    }
-
-    sendTrackingLogEvent('edx.course.home.courseware_search.submit', {
-      org_key: org,
-      courserun_key: courseId,
-      event_type: 'searchKeyword',
-      keyword: value,
-    });
-
-    dispatch(searchCourseContent(courseId, value));
-    setQuery(value);
-  };
-
-  useEffect(() => {
-    handleSubmit(searchKeyword);
-  }, []);
-
-  const handleOnChange = (value) => {
-    if (value === searchKeyword) { return; }
-    if (!value) { clearSearch(); }
-  };
-
-  const handleSearchCloseClick = () => {
-    clearSearch();
-    dispatch(setShowSearch(false));
-  };
-
-  let status = 'idle';
-  if (loading) {
-    status = 'loading';
-  } else if (errors) {
-    status = 'error';
-  } else if (lastSearchKeyword) {
-    status = 'results';
-  }
-
-  return (
-    <section className="courseware-search" style={{ '--modal-top-position': top }} data-testid="courseware-search-section" {...sectionProps}>
-      <div className="courseware-search__close">
-        <Button
-          variant="tertiary"
-          className="p-1"
-          aria-label={intl.formatMessage(messages.searchCloseAction)}
-          onClick={handleSearchCloseClick}
-          data-testid="courseware-search-close-button"
-        ><Icon src={Close} />
-        </Button>
-      </div>
-      <div className="courseware-search__outer-content">
-        <div className="courseware-search__content">
-          <h1 className="h2">{intl.formatMessage(messages.searchModuleTitle)}</h1>
-          <CoursewareSearchForm
-            searchTerm={searchKeyword}
-            onSubmit={handleSubmit}
-            onChange={handleOnChange}
-            placeholder={intl.formatMessage(messages.searchBarPlaceholderText)}
-          />
-          {status === 'loading' ? (
-            <div className="courseware-search__spinner" data-testid="courseware-search-spinner">
-              <Spinner animation="border" variant="light" screenReaderText={intl.formatMessage(messages.loading)} />
-            </div>
-          ) : null}
-          {status === 'error' && (
-            <Alert className="mt-4" variant="danger" data-testid="courseware-search-error">
-              {intl.formatMessage(messages.searchResultsError)}
-            </Alert>
-          )}
-          {status === 'results' ? (
-            <>
-              {total > 0 ? (
-                <div
-                  className="courseware-search__results-summary"
-                  aria-live="polite"
-                  aria-relevant="all"
-                  aria-atomic="true"
-                  data-testid="courseware-search-summary"
-                >{intl.formatMessage(messages.searchResultsLabel, { total, keyword: lastSearchKeyword })}
-                </div>
-              ) : null}
-              <CoursewareSearchResultsFilterContainer />
-            </>
-          ) : null}
-        </div>
-      </div>
-    </section>
-  );
-};
-
-CoursewareSearch.propTypes = {
-  intl: intlShape.isRequired,
-};
-
-export default injectIntl(CoursewareSearch);

src/course-home/courseware-search/CoursewareSearch.test.jsx

@@ -1,285 +0,0 @@
-import React from 'react';
-import { history } from '@edx/frontend-platform';
-import { AppProvider } from '@edx/frontend-platform/react';
-import { Route, Routes } from 'react-router-dom';
-import { sendTrackingLogEvent } from '@edx/frontend-platform/analytics';
-import {
-  initializeMockApp,
-  render,
-  screen,
-  waitFor,
-  fireEvent,
-} from '../../setupTest';
-import { CoursewareSearch } from './index';
-import { useElementBoundingBox, useLockScroll, useCoursewareSearchParams } from './hooks';
-import initializeStore from '../../store';
-import { searchCourseContent } from '../data/thunks';
-import { setShowSearch } from '../data/slice';
-import { updateModel, useModel } from '../../generic/model-store';
-
-jest.mock('./hooks');
-jest.mock('../../generic/model-store', () => ({
-  updateModel: jest.fn(),
-  useModel: jest.fn(),
-}));
-
-jest.mock('@edx/frontend-platform/analytics', () => ({
-  sendTrackingLogEvent: jest.fn(),
-}));
-
-jest.mock('../data/thunks', () => ({
-  searchCourseContent: jest.fn(),
-}));
-
-jest.mock('../data/slice', () => ({
-  setShowSearch: jest.fn(),
-}));
-
-const mockDispatch = jest.fn();
-jest.mock('react-redux', () => ({
-  ...jest.requireActual('react-redux'),
-  useDispatch: () => mockDispatch,
-}));
-
-const decodedCourseId = 'course-v1:edX+DemoX+Demo_Course';
-const decodedSequenceId = 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@edx_introduction';
-const decodedUnitId = 'block-v1:edX+DemoX+Demo_Course+type@vertical+block@vertical_0270f6de40fc';
-const pathname = `/course/${decodedCourseId}/${decodedSequenceId}/${decodedUnitId}`;
-
-const tabsTopPosition = 128;
-
-const defaultProps = {
-  org: 'edX',
-  loading: false,
-  searchKeyword: '',
-  errors: undefined,
-  total: 0,
-};
-
-const coursewareSearch = {
-  query: '',
-  filter: '',
-  setQuery: jest.fn(),
-  setFilter: jest.fn(),
-  clearSearchParams: jest.fn(),
-};
-
-const intl = {
-  formatMessage: (message) => message?.defaultMessage || '',
-};
-
-function renderComponent(props = {}) {
-  const store = initializeStore();
-  history.push(pathname);
-  const { container } = render(
-    <AppProvider store={store}>
-      <Routes>
-        <Route path="/course/:courseId/:sequenceId/:unitId" element={<CoursewareSearch intl={intl} {...props} />} />
-      </Routes>
-    </AppProvider>,
-  );
-  return container;
-}
-
-const mockModels = ((props = defaultProps) => {
-  useModel.mockReturnValue({
-    ...defaultProps,
-    ...props,
-  });
-
-  updateModel.mockReturnValue({
-    type: 'MOCK_ACTION',
-    payload: {
-      modelType: 'contentSearchResults',
-      model: defaultProps,
-    },
-  });
-});
-
-const mockSearchParams = ((props = coursewareSearch) => {
-  useCoursewareSearchParams.mockReturnValue(props);
-});
-
-describe('CoursewareSearch', () => {
-  beforeAll(initializeMockApp);
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  describe('when rendering normally', () => {
-    beforeAll(() => {
-      useElementBoundingBox.mockImplementation(() => ({ top: tabsTopPosition }));
-    });
-
-    it('should use useElementBoundingBox() and useLockScroll() hooks', () => {
-      mockModels();
-      mockSearchParams();
-      renderComponent();
-
-      expect(useElementBoundingBox).toBeCalledTimes(1);
-      expect(useLockScroll).toBeCalledTimes(1);
-    });
-
-    it('should have a "--modal-top-position" CSS variable matching the CourseTabsNavigation top position', () => {
-      mockModels();
-      mockSearchParams();
-      renderComponent();
-
-      const section = screen.getByTestId('courseware-search-section');
-      expect(section.style.getPropertyValue('--modal-top-position')).toBe(`${tabsTopPosition}px`);
-    });
-  });
-
-  describe('when clicking on the "Close" button', () => {
-    it('should dispatch setShowSearch(false)', async () => {
-      mockModels();
-      renderComponent();
-
-      await waitFor(() => {
-        const close = screen.queryByTestId('courseware-search-close-button');
-        fireEvent.click(close);
-      });
-
-      expect(setShowSearch).toBeCalledWith(false);
-    });
-  });
-
-  describe('when CourseTabsNavigation is not present', () => {
-    it('should use "--modal-top-position: 0" if  nce element is not present', () => {
-      useElementBoundingBox.mockImplementation(() => undefined);
-
-      mockModels();
-      mockSearchParams();
-      renderComponent();
-
-      const section = screen.getByTestId('courseware-search-section');
-      expect(section.style.getPropertyValue('--modal-top-position')).toBe('0');
-    });
-  });
-
-  describe('when passing extra props', () => {
-    it('should pass on extra props to section element', () => {
-      mockModels();
-      mockSearchParams();
-      renderComponent({ foo: 'bar' });
-
-      const section = screen.getByTestId('courseware-search-section');
-      expect(section).toHaveAttribute('foo', 'bar');
-    });
-  });
-
-  describe('when submitting an empty search', () => {
-    it('should clear the search by dispatch updateModel', async () => {
-      mockModels();
-      renderComponent();
-
-      await waitFor(() => {
-        const submit = screen.queryByTestId('courseware-search-form-submit');
-        fireEvent.click(submit);
-      });
-
-      expect(updateModel).toHaveBeenCalledWith({
-        modelType: 'contentSearchResults',
-        model: {
-          id: decodedCourseId,
-          searchKeyword: '',
-          results: [],
-          errors: undefined,
-          loading: false,
-        },
-      });
-    });
-  });
-
-  describe('when submitting a search', () => {
-    it('should show a loading state', () => {
-      mockModels({
-        loading: true,
-      });
-      renderComponent();
-
-      expect(screen.queryByTestId('courseware-search-spinner')).toBeInTheDocument();
-    });
-
-    it('should call searchCourseContent', async () => {
-      mockModels();
-      renderComponent();
-
-      const searchKeyword = 'course';
-
-      await waitFor(() => {
-        const input = screen.queryByTestId('courseware-search-form').querySelector('input');
-        fireEvent.change(input, { target: { value: searchKeyword } });
-      });
-
-      await waitFor(() => {
-        const submit = screen.queryByTestId('courseware-search-form-submit');
-        fireEvent.click(submit);
-      });
-
-      expect(sendTrackingLogEvent).toHaveBeenCalledWith('edx.course.home.courseware_search.submit', {
-        org_key: defaultProps.org,
-        courserun_key: decodedCourseId,
-        event_type: 'searchKeyword',
-        keyword: searchKeyword,
-      });
-      expect(searchCourseContent).toHaveBeenCalledWith(decodedCourseId, searchKeyword);
-    });
-
-    it('should show an error state if any', () => {
-      mockModels({
-        errors: ['foo'],
-      });
-      renderComponent();
-
-      expect(screen.queryByTestId('courseware-search-error')).toBeInTheDocument();
-    });
-
-    it('should not show a summary if there are no results', () => {
-      mockModels({
-        searchKeyword: 'test',
-        total: 0,
-      });
-      renderComponent();
-
-      expect(screen.queryByTestId('courseware-search-summary')).not.toBeInTheDocument();
-    });
-
-    it('should show a summary for the results', () => {
-      mockModels({
-        searchKeyword: 'fubar',
-        total: 1,
-      });
-      renderComponent();
-
-      expect(screen.queryByTestId('courseware-search-summary').textContent).toBe('Results for "fubar":');
-    });
-  });
-
-  describe('when clearing the search input', () => {
-    it('should clear the search by dispatch updateModel', async () => {
-      mockModels({
-        searchKeyword: 'fubar',
-        total: 2,
-      });
-      renderComponent();
-
-      await waitFor(() => {
-        const input = screen.queryByTestId('courseware-search-form').querySelector('input');
-        fireEvent.change(input, { target: { value: '' } });
-      });
-
-      expect(updateModel).toHaveBeenCalledWith({
-        modelType: 'contentSearchResults',
-        model: {
-          id: decodedCourseId,
-          searchKeyword: '',
-          results: [],
-          errors: undefined,
-          loading: false,
-        },
-      });
-    });
-  });
-});

src/course-home/courseware-search/CoursewareSearchEmpty.jsx

@@ -1,15 +0,0 @@
-import React from 'react';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import messages from './messages';
-
-const CoursewareSearchEmpty = ({ intl }) => (
-  <div className="courseware-search-results">
-    <p className="courseware-search-results__empty" data-testid="no-results">{intl.formatMessage(messages.searchResultsNone)}</p>
-  </div>
-);
-
-CoursewareSearchEmpty.propTypes = {
-  intl: intlShape.isRequired,
-};
-
-export default injectIntl(CoursewareSearchEmpty);

src/course-home/courseware-search/CoursewareSearchEmpty.test.jsx

@@ -1,24 +0,0 @@
-import React from 'react';
-import {
-  initializeMockApp,
-  render,
-  screen,
-} from '../../setupTest';
-import CoursewareSearchEmpty from './CoursewareSearchEmpty';
-
-function renderComponent() {
-  const { container } = render(<CoursewareSearchEmpty />);
-  return container;
-}
-
-describe('CoursewareSearchEmpty', () => {
-  beforeAll(async () => {
-    initializeMockApp();
-  });
-
-  it('should match the snapshot', () => {
-    renderComponent();
-
-    expect(screen.getByTestId('no-results')).toMatchSnapshot();
-  });
-});

src/course-home/courseware-search/CoursewareSearchForm.jsx

@@ -1,54 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { SearchField } from '@openedx/paragon';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import messages from './messages';
-
-const CoursewareSearchForm = ({
-  intl,
-  searchTerm,
-  onSubmit,
-  onChange,
-  placeholder,
-}) => (
-  <SearchField.Advanced
-    value={searchTerm}
-    onSubmit={onSubmit}
-    onChange={onChange}
-    submitButtonLocation="external"
-    className="courseware-search-form"
-    screenReaderText={{
-      label: intl.formatMessage(messages.searchSubmitLabel),
-      clearButton: intl.formatMessage(messages.searchClearAction),
-      submitButton: null, // Remove the sr-only label in the button.
-    }}
-  >
-    <div className="pgn__searchfield_wrapper" data-testid="courseware-search-form">
-      <SearchField.Label />
-      <SearchField.Input placeholder={placeholder} autoFocus />
-      <SearchField.ClearButton />
-    </div>
-    <SearchField.SubmitButton
-      buttonText={intl.formatMessage(messages.searchSubmitLabel)}
-      submitButtonLocation="external"
-      data-testid="courseware-search-form-submit"
-    />
-  </SearchField.Advanced>
-);
-
-CoursewareSearchForm.propTypes = {
-  intl: intlShape.isRequired,
-  searchTerm: PropTypes.string,
-  onSubmit: PropTypes.func,
-  onChange: PropTypes.func,
-  placeholder: PropTypes.string,
-};
-
-CoursewareSearchForm.defaultProps = {
-  searchTerm: undefined,
-  onSubmit: undefined,
-  onChange: undefined,
-  placeholder: undefined,
-};
-
-export default injectIntl(CoursewareSearchForm);

src/course-home/courseware-search/CoursewareSearchForm.test.jsx

@@ -1,60 +0,0 @@
-import React from 'react';
-import {
-  act,
-  initializeMockApp,
-  render,
-  screen,
-  waitFor,
-  fireEvent,
-} from '../../setupTest';
-import CoursewareSearchForm from './CoursewareSearchForm';
-
-function renderComponent(placeholder, onSubmit, onChange) {
-  const { container } = render(<CoursewareSearchForm
-    placeholder={placeholder}
-    onSubmit={onSubmit}
-    onChange={onChange}
-  />);
-  return container;
-}
-
-describe('CoursewareSearchToggle', () => {
-  const placeholderText = 'Search for courseware';
-  let onSubmitHandlerMock;
-  let onChangeHandlerMock;
-
-  beforeAll(async () => {
-    onChangeHandlerMock = jest.fn();
-    onSubmitHandlerMock = jest.fn();
-    initializeMockApp();
-  });
-
-  it('should render', async () => {
-    await act(async () => renderComponent(placeholderText, onSubmitHandlerMock, onChangeHandlerMock));
-    await waitFor(() => {
-      expect(screen.queryByTestId('courseware-search-form')).toBeInTheDocument();
-    });
-  });
-
-  it('should call onChange handler when input changes', async () => {
-    await act(async () => renderComponent(placeholderText, onSubmitHandlerMock, onChangeHandlerMock));
-    await waitFor(() => {
-      const element = screen.queryByPlaceholderText(placeholderText);
-      fireEvent.change(element, { target: { value: 'test' } });
-      expect(onChangeHandlerMock).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  it('should call onSubmit handler when submit is clicked', async () => {
-    await act(async () => renderComponent(placeholderText, onSubmitHandlerMock, onChangeHandlerMock));
-    await waitFor(async () => {
-      const element = await screen.findByTestId('courseware-search-form-submit');
-      fireEvent.click(element);
-      expect(onSubmitHandlerMock).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-});

src/course-home/courseware-search/CoursewareSearchResults.jsx

@@ -1,86 +0,0 @@
-import React from 'react';
-import {
-  Folder, TextFields, VideoCamera, Article,
-} from '@openedx/paragon/icons';
-import { getConfig } from '@edx/frontend-platform';
-import { Icon } from '@openedx/paragon';
-import PropTypes from 'prop-types';
-import CoursewareSearchEmpty from './CoursewareSearchEmpty';
-
-const iconTypeMapping = {
-  text: TextFields,
-  video: VideoCamera,
-  sequence: Folder,
-  other: Article,
-};
-
-const defaultIcon = Article;
-
-const CoursewareSearchResults = ({ results = [] }) => {
-  if (!results?.length) {
-    return <CoursewareSearchEmpty />;
-  }
-
-  const baseUrl = `${getConfig().LMS_BASE_URL}`;
-
-  return (
-    <div className="courseware-search-results" data-testid="search-results">
-      {results.map(({
-        id,
-        title,
-        type,
-        location,
-        url,
-        contentHits,
-      }) => {
-        const key = type.toLowerCase();
-        const icon = iconTypeMapping[key] || defaultIcon;
-        const isExternal = !url.startsWith('/');
-        const linkProps = isExternal ? {
-          href: url,
-          target: '_blank',
-          rel: 'nofollow',
-        } : { href: `${baseUrl}${url}` };
-
-        return (
-          <a key={id} className="courseware-search-results__item" {...linkProps}>
-            <div className="courseware-search-results__icon"><Icon src={icon} /></div>
-            <div className="courseware-search-results__info">
-              <div className="courseware-search-results__title">
-                <span>{title}</span>
-                {contentHits ? (<em>{contentHits}</em>) : null }
-              </div>
-              {location?.length ? (
-                <ul className="courseware-search-results__breadcrumbs">
-                  {
-                  // This ignore is necessary because the breadcrumb texts might have duplicates.
-                  // The breadcrumbs are not expected to change.
-                  // eslint-disable-next-line react/no-array-index-key
-                  location.map((breadcrumb, i) => (<li key={`${i}:${breadcrumb}`}><div>{breadcrumb}</div></li>))
-                  }
-                </ul>
-              ) : null}
-            </div>
-          </a>
-        );
-      })}
-    </div>
-  );
-};
-
-CoursewareSearchResults.propTypes = {
-  results: PropTypes.arrayOf(PropTypes.shape({
-    id: PropTypes.string,
-    title: PropTypes.string,
-    type: PropTypes.string,
-    location: PropTypes.arrayOf(PropTypes.string),
-    url: PropTypes.string,
-    contentHits: PropTypes.number,
-  })),
-};
-
-CoursewareSearchResults.defaultProps = {
-  results: [],
-};
-
-export default CoursewareSearchResults;

src/course-home/courseware-search/CoursewareSearchResults.test.jsx

@@ -1,41 +0,0 @@
-import React from 'react';
-import {
-  initializeMockApp,
-  render,
-  screen,
-} from '../../setupTest';
-import CoursewareSearchResults from './CoursewareSearchResults';
-import messages from './messages';
-import searchResultsFactory from './test-data/search-results-factory';
-
-jest.mock('react-redux');
-
-function renderComponent({ results }) {
-  const { container } = render(<CoursewareSearchResults results={results} />);
-  return container;
-}
-
-describe('CoursewareSearchResults', () => {
-  beforeAll(async () => {
-    initializeMockApp();
-  });
-
-  describe('when an empty array is provided', () => {
-    beforeEach(() => { renderComponent({ results: [] }); });
-
-    it('should render a "no results found" message.', () => {
-      expect(screen.getByTestId('no-results').textContent).toBe(messages.searchResultsNone.defaultMessage);
-    });
-  });
-
-  describe('when list of results is provided', () => {
-    beforeEach(() => {
-      const { results } = searchResultsFactory('course');
-      renderComponent({ results });
-    });
-
-    it('should match the snapshot', () => {
-      expect(screen.getByTestId('search-results')).toMatchSnapshot();
-    });
-  });
-});

src/course-home/courseware-search/CoursewareSearchToggle.jsx

@@ -1,47 +0,0 @@
-import React, { useEffect } from 'react';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Button, Icon } from '@openedx/paragon';
-import { Search } from '@openedx/paragon/icons';
-import { useDispatch } from 'react-redux';
-import messages from './messages';
-import { useCoursewareSearchFeatureFlag, useCoursewareSearchParams } from './hooks';
-import { setShowSearch } from '../data/slice';
-
-const CoursewareSearchToggle = ({
-  intl,
-}) => {
-  const dispatch = useDispatch();
-  const enabled = useCoursewareSearchFeatureFlag();
-  const { query } = useCoursewareSearchParams();
-
-  const handleSearchOpenClick = () => {
-    dispatch(setShowSearch(true));
-  };
-
-  useEffect(() => {
-    if (enabled && !!query) { handleSearchOpenClick(); }
-  }, [enabled]);
-
-  if (!enabled) { return null; }
-
-  return (
-    <div className="courseware-searc-toggle">
-      <Button
-        variant="tertiary"
-        size="sm"
-        className="p-1 mt-2 mr-2 rounded-lg"
-        aria-label={intl.formatMessage(messages.searchOpenAction)}
-        onClick={handleSearchOpenClick}
-        data-testid="courseware-search-open-button"
-      >
-        <Icon src={Search} />
-      </Button>
-    </div>
-  );
-};
-
-CoursewareSearchToggle.propTypes = {
-  intl: intlShape.isRequired,
-};
-
-export default injectIntl(CoursewareSearchToggle);