Merge branch 'master' into open-release/quince.master

Makefile

@@ -10,7 +10,7 @@ i18n = ./src/i18n
 transifex_input = $(i18n)/transifex_input.json
 
 # This directory must match .babelrc .
-transifex_temp = ./temp/babel-plugin-react-intl
+transifex_temp = ./temp/babel-plugin-formatjs
 
 NPM_TESTS=build i18n_extract lint test
 

README.md

@@ -21,6 +21,45 @@ Some guidelines for writing widgets:
 * You can load data from the redux store, but should not add or modify fields in that structure.
 * Network events should be managed in component hooks, though can use our `data/constants/requests:requestStates` for ease of tracking the request states.
 
+ ## License
+
+The code in this repository is licensed under the AGPLv3 unless otherwise
+noted.
+
+Please see `LICENSE <LICENSE>`_ for details.
+
+## 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-learner-dashboard/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
+
 ## Resources
 
 * [Learner Home project info at the Open edX Wiki](https://openedx.atlassian.net/wiki/spaces/OEPM/pages/3575906333/Learner+Home)
+
+## The Open edX Code of Conduct
+
+All community members are expected to follow the `Open edX Code of Conduct`_.
+
+.. _Open edX Code of Conduct: https://openedx.org/code-of-conduct/
+
+## Reporting Security Issues
+
+Please do not report security issues in public. Please email [email protected].

package.json

@@ -8,7 +8,7 @@
   },
   "scripts": {
     "build": "fedx-scripts webpack",
-    "i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
+    "i18n_extract": "fedx-scripts formatjs extract",
     "lint": "fedx-scripts eslint --ext .jsx,.js src/",
     "lint-fix": "fedx-scripts eslint --fix --ext .jsx,.js src/",
     "semantic-release": "semantic-release",
@@ -26,7 +26,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@edx/brand": "npm:@edx/brand-edx.org@^2.0.3",
+    "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
     "@edx/browserslist-config": "^1.1.0",
     "@edx/frontend-component-footer": "^12.2.1",
     "@edx/frontend-enterprise-hotjar": "^2.0.0",
@@ -80,7 +80,7 @@
     "whatwg-fetch": "^3.6.2"
   },
   "devDependencies": {
-    "@edx/frontend-build": "12.8.27",
+    "@edx/frontend-build": "13.0.1",
     "@edx/reactifex": "^2.1.1",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.1.0",

src/config/index.js

@@ -16,6 +16,7 @@ const configuration = {
   SUPPORT_URL: process.env.SUPPORT_URL || null,
   ENABLE_NOTICES: process.env.ENABLE_NOTICES || null,
   CAREER_LINK_URL: process.env.CAREER_LINK_URL || null,
+  LOGO_URL: process.env.LOGO_URL,
 };
 
 const features = {};

src/containers/CourseFilterControls/CourseFilterControls.jsx

@@ -68,7 +68,7 @@ export const CourseFilterControls = ({
               onClose={close}
             >
               <div className="p-1 mr-3">
-                <b>Refine</b>
+                <b>{formatMessage(messages.refine)}</b>
               </div>
               <hr />
               <div className="filter-form-row">

src/containers/CourseFilterControls/messages.js

@@ -1,6 +1,6 @@
-import { StrictDict } from 'utils';
+import { defineMessages } from '@edx/frontend-platform/i18n';
 
-export const messages = StrictDict({
+const messages = defineMessages({
   inProgress: {
     id: 'learner-dash.courseListFilters.inProgress',
     description: 'in-progress filter checkbox label for course list filters',
@@ -52,4 +52,5 @@ export const messages = StrictDict({
     defaultMessage: 'Refine',
   },
 });
+
 export default messages;

src/containers/LearnerDashboardHeader/BrandLogo.jsx

@@ -3,6 +3,7 @@ import React from 'react';
 import { useIntl } from '@edx/frontend-platform/i18n';
 
 import { reduxHooks } from 'hooks';
+import { configuration } from '../../config';
 
 import messages from './messages';
 
@@ -14,7 +15,7 @@ export const BrandLogo = () => {
     <a href={dashboard?.url || '/'} className="mx-auto">
       <img
         className="logo py-3"
-        src="https://edx-cdn.org/v3/prod/logo.svg"
+        src={configuration.LOGO_URL}
         alt={formatMessage(messages.logoAltText)}
       />
     </a>

src/containers/LearnerDashboardHeader/ExpandedHeader/AuthenticatedUserDropdown.jsx

@@ -29,9 +29,9 @@ export const AuthenticatedUserDropdown = () => {
           </span>
         </Dropdown.Toggle>
         <Dropdown.Menu className="dropdown-menu-right">
-          <Dropdown.Header>SWITCH DASHBOARD</Dropdown.Header>
+          <Dropdown.Header>{formatMessage(messages.dashboardSwitch)}</Dropdown.Header>
           <Dropdown.Item as="a" href="/edx-dashboard" className="active">
-            Personal
+            {formatMessage(messages.dashboardPersonal)}
           </Dropdown.Item>
           {!!dashboard && (
             <Dropdown.Item as="a" href={dashboard.url} key={dashboard.label}>

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

@@ -8,7 +8,7 @@ exports[`BrandLogo dashboard defined 1`] = `
   <img
     alt="edX, Inc. Dashboard"
     className="logo py-3"
-    src="https://edx-cdn.org/v3/prod/logo.svg"
+    src="https://edx-cdn.org/v3/default/logo.svg"
   />
 </a>
 `;
@@ -21,7 +21,7 @@ exports[`BrandLogo dashboard undefined 1`] = `
   <img
     alt="edX, Inc. Dashboard"
     className="logo py-3"
-    src="https://edx-cdn.org/v3/prod/logo.svg"
+    src="https://edx-cdn.org/v3/default/logo.svg"
   />
 </a>
 `;

src/containers/LearnerDashboardHeader/messages.js

@@ -6,6 +6,16 @@ const messages = defineMessages({
     defaultMessage: 'Dashboard',
     description: 'The text for the user menu Dashboard navigation link.',
   },
+  dashboardPersonal: {
+    id: 'learnerVariantDashboard.menu.dashboardPersonal.label',
+    defaultMessage: 'Personal',
+    description: 'Link to personal dashboard in user menu',
+  },
+  dashboardSwitch: {
+    id: 'learnerVariantDashboard.menu.dashboardSwitch.label',
+    defaultMessage: 'SWITCH DASHBOARD',
+    description: 'Switch Dashboard header in the user menu',
+  },
   help: {
     id: 'learnerVariantDashboard.help.label',
     defaultMessage: 'Help',

src/widgets/RecommendationsPaintedDoorBtn/PaintedDoorExperimentContext.jsx

@@ -68,7 +68,13 @@ export const useIsEnterpriseUser = () => {
   return enterpriseUser;
 };
 
-export const PaintedDoorExperimentContext = React.createContext();
+export const PaintedDoorExperimentContext = React.createContext({
+  experimentVariation: null,
+  isPaintedDoorNavbarBtnVariation: null,
+  isPaintedDoorWidgetBtnVariation: null,
+  isPaintedDoorControlVariation: null,
+  experimentLoading: null,
+});
 
 export const PaintedDoorExperimentProvider = ({ children }) => {
   const [experimentData, setExperimentData] = module.state.experimentData({