Merge branch 'master' into sajjad/VAN-1618

package.json

@@ -29,9 +29,9 @@
     "@edx/brand": "npm:@edx/brand-edx.org@^2.0.3",
     "@edx/browserslist-config": "^1.1.0",
     "@edx/frontend-component-footer": "^12.0.0",
-    "@edx/frontend-enterprise-hotjar": "^1.2.0",
+    "@edx/frontend-enterprise-hotjar": "^1.4.0",
     "@edx/frontend-platform": "^4.2.0",
-    "@edx/paragon": "^20.32.0",
+    "@edx/paragon": "^20.44.0",
     "@edx/react-unit-test-utils": "^1.7.0",
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
     "@fortawesome/free-brands-svg-icons": "^5.15.4",
@@ -59,8 +59,8 @@
     "moment": "^2.29.4",
     "prop-types": "15.7.2",
     "query-string": "7.0.1",
-    "react": "^16.14.0",
-    "react-dom": "^16.14.0",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
     "react-helmet": "^6.1.0",
     "react-intl": "^5.20.9",
     "react-pdf": "^5.5.0",
@@ -84,15 +84,15 @@
     "@edx/reactifex": "^2.1.1",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.1.0",
+    "@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
     "axios-mock-adapter": "^1.20.0",
     "copy-webpack-plugin": "^11.0.0",
-    "enzyme-adapter-react-16": "^1.15.6",
     "fetch-mock": "^9.11.0",
     "husky": "^7.0.0",
     "identity-obj-proxy": "^3.0.0",
     "jest-expect-message": "^1.0.2",
     "react-dev-utils": "^11.0.4",
-    "react-test-renderer": "^16.14.0",
+    "react-test-renderer": "^17.0.2",
     "redux-mock-store": "^1.5.4",
     "semantic-release": "^20.1.3"
   }

src/i18n/messages/ar.json

@@ -44,6 +44,13 @@
   "ProductRecommendations.bootcampDescription": "Intensive, hands-on, project based training",
   "ProductRecommendations.courseHeading": "Courses",
   "ProductRecommendations.courseDescription": "Find new interests and advance your career",
+  "RecommendationsPanel.recommendationsFeatureText": "Personalized recommendations feature is not yet available. We are working hard on bringing it to your learner home in the near future.",
+  "RecommendationsPanel.recommendationsAlertText": "Would you like to be alerted when it becomes available?",
+  "RecommendationsPanel.recommendationsModalHeading": "Thank you for your interest!",
+  "RecommendationsPanel.modalSkipButton": "Skip for now",
+  "RecommendationsPanel.modalCountMeButton": "Count me in!",
+  "learnerVariantDashboard.recommendedForYou": "Recommended For You",
+  "RecommendationsPanel.seeAllRecommendationsButton": "See All Recommendations",
   "RecommendationsPanel.recommendationsHeading": "توصيات خاصة لك",
   "RecommendationsPanel.popularCoursesHeading": "المساقات الشائعة",
   "RecommendationsPanel.exploreCoursesButton": "استكشف المساقات"

src/i18n/messages/es_419.json

@@ -44,6 +44,13 @@
   "ProductRecommendations.bootcampDescription": "Capacitación intensiva, práctica y basada en proyectos",
   "ProductRecommendations.courseHeading": "Cursos",
   "ProductRecommendations.courseDescription": "Encontrar nuevos intereses y avanzar en la carrera",
+  "RecommendationsPanel.recommendationsFeatureText": "La función de recomendaciones personalizadas aún no está disponible. Estamos trabajando arduamente para llevarlo a casa de su alumno en un futuro próximo.",
+  "RecommendationsPanel.recommendationsAlertText": "¿Le gustaría recibir una alerta cuando esté disponible?",
+  "RecommendationsPanel.recommendationsModalHeading": "¡Gracias por su interés!",
+  "RecommendationsPanel.modalSkipButton": "Saltar por ahora ",
+  "RecommendationsPanel.modalCountMeButton": "¡Cuente conmigo!",
+  "learnerVariantDashboard.recommendedForYou": "Recomendado para usted",
+  "RecommendationsPanel.seeAllRecommendationsButton": "Ver todas las recomendaciones",
   "RecommendationsPanel.recommendationsHeading": "Recomendaciones para ti",
   "RecommendationsPanel.popularCoursesHeading": "Cursos populares",
   "RecommendationsPanel.exploreCoursesButton": "Explorar cursos"

src/i18n/messages/fr.json

@@ -44,6 +44,13 @@
   "ProductRecommendations.bootcampDescription": "Intensive, hands-on, project based training",
   "ProductRecommendations.courseHeading": "Courses",
   "ProductRecommendations.courseDescription": "Find new interests and advance your career",
+  "RecommendationsPanel.recommendationsFeatureText": "Personalized recommendations feature is not yet available. We are working hard on bringing it to your learner home in the near future.",
+  "RecommendationsPanel.recommendationsAlertText": "Would you like to be alerted when it becomes available?",
+  "RecommendationsPanel.recommendationsModalHeading": "Thank you for your interest!",
+  "RecommendationsPanel.modalSkipButton": "Skip for now",
+  "RecommendationsPanel.modalCountMeButton": "Count me in!",
+  "learnerVariantDashboard.recommendedForYou": "Recommended For You",
+  "RecommendationsPanel.seeAllRecommendationsButton": "See All Recommendations",
   "RecommendationsPanel.recommendationsHeading": "Des recommandations pour vous",
   "RecommendationsPanel.popularCoursesHeading": "Cours populaires",
   "RecommendationsPanel.exploreCoursesButton": "Explorer les cours"

src/i18n/messages/fr_CA.json

@@ -1,6 +1,6 @@
 {
   "dashboard.mycourses": "Mes cours",
-  "Dashboard.NoCoursesView.lookingForChallengePrompt": "A la recherche d'un nouveau défi ?",
+  "Dashboard.NoCoursesView.lookingForChallengePrompt": "A la recherche d'un nouveau défi?",
   "Dashboard.NoCoursesView.exploreCoursesPrompt": "Explorez nos cours pour les ajouter à votre tableau de bord.",
   "Dashboard.NoCoursesView.exploreCoursesButton": "Explorer les cours",
   "Dashboard.NoCoursesView.bannerAlt": "Aucune bannière de cours",
@@ -9,7 +9,7 @@
   "leanerDashboard.enterpriseDialogDismissButton": "Rejeter",
   "leanerDashboard.enterpriseDialogConfirmButton": "Aller au tableau de bord",
   "leanerDashboard.confirmEmailBanner": "Confirmer maintenant",
-  "leanerDashboard.confirmEmailTextReminderBanner": "N'oubliez pas de confirmer votre courriel afin de pouvoir continuer à apprendre sur edX ! {confirmNowButton}.",
+  "leanerDashboard.confirmEmailTextReminderBanner": "N'oubliez pas de confirmer votre courriel afin de pouvoir continuer à apprendre sur EDUlib! {confirmNowButton}.",
   "leanerDashboard.verifiedConfirmEmailButton": "J'ai confirmé mon courriel",
   "leanerDashboard.confirmEmailModalHeader": "Confirmer votre courriel",
   "leanerDashboard.confirmEmailModalBody": "Nous vous avons envoyé un courriel pour vérifier votre compte. Veuillez vérifier votre boîte de réception et cliquer sur le gros bouton rouge pour confirmer et continuer à apprendre.",
@@ -24,7 +24,7 @@
   "learnerVariantDashboard.course": "Cours",
   "learnerVariantDashboard.program": "Programmes",
   "learnerVariantDashboard.discoverNew": "Découvrir les nouveautés",
-  "learnerVariantDashboard.logoAltText": "Tableau de bord edX, Inc.",
+  "learnerVariantDashboard.logoAltText": "Tableau de bord EDUlib, Inc.",
   "learnerVariantDashboard.collapseMenuOpenAltText": "Menu",
   "learnerVariantDashboard.collapseMenuClosedAltText": "Fermer",
   "leanerDashboard.menu.career.label": "Carrière",
@@ -35,7 +35,7 @@
   "MasqueradeBar.StudentNameInput": "Nom d'utilisateur ou courriel",
   "MasqueradeBar.NoStudentFound": "Aucun étudiant avec ce nom d'utilisateur ou cette adresse courriel n'a pu être trouvé",
   "MasqueradeBar.UnknownError": "Une erreur inconnue est survenue",
-  "WidgetSidebar.lookingForChallengePrompt": "A la recherche d'un nouveau défi ?",
+  "WidgetSidebar.lookingForChallengePrompt": "A la recherche d'un nouveau défi?",
   "WidgetSidebar.findCoursesButton": "Trouver un cours {arrow}",
   "ProductRecommendations.recommendationsHeading": "Vous pourriez aussi aimer",
   "ProductRecommendations.executiveEducationHeading": "Formation des cadres",
@@ -44,6 +44,13 @@
   "ProductRecommendations.bootcampDescription": "Formation intensive, pratique et basée sur des projets",
   "ProductRecommendations.courseHeading": "Cours",
   "ProductRecommendations.courseDescription": "Trouvez de nouveaux intérêts et faites progresser votre carrière",
+  "RecommendationsPanel.recommendationsFeatureText": "La fonctionnalité de recommandations personnalisées n'est pas encore disponible. Nous travaillons fort pour le proposer à votre apprenant dans un avenir rapproché.",
+  "RecommendationsPanel.recommendationsAlertText": "Souhaitez-vous être alerté dès qu'il sera disponible?",
+  "RecommendationsPanel.recommendationsModalHeading": "Merci pour votre intérêt!",
+  "RecommendationsPanel.modalSkipButton": "Ignorer pour l'instant",
+  "RecommendationsPanel.modalCountMeButton": "Comptez sur moi!",
+  "learnerVariantDashboard.recommendedForYou": "Recommandé pour vous",
+  "RecommendationsPanel.seeAllRecommendationsButton": "Voir toutes les recommandations",
   "RecommendationsPanel.recommendationsHeading": "Des recommandations pour vous",
   "RecommendationsPanel.popularCoursesHeading": "Cours populaires",
   "RecommendationsPanel.exploreCoursesButton": "Explorer les cours"

src/i18n/messages/pt_BR.json

@@ -44,6 +44,13 @@
   "ProductRecommendations.bootcampDescription": "Intensive, hands-on, project based training",
   "ProductRecommendations.courseHeading": "Courses",
   "ProductRecommendations.courseDescription": "Find new interests and advance your career",
+  "RecommendationsPanel.recommendationsFeatureText": "Personalized recommendations feature is not yet available. We are working hard on bringing it to your learner home in the near future.",
+  "RecommendationsPanel.recommendationsAlertText": "Would you like to be alerted when it becomes available?",
+  "RecommendationsPanel.recommendationsModalHeading": "Thank you for your interest!",
+  "RecommendationsPanel.modalSkipButton": "Skip for now",
+  "RecommendationsPanel.modalCountMeButton": "Count me in!",
+  "learnerVariantDashboard.recommendedForYou": "Recommended For You",
+  "RecommendationsPanel.seeAllRecommendationsButton": "See All Recommendations",
   "RecommendationsPanel.recommendationsHeading": "Recommendations for you",
   "RecommendationsPanel.popularCoursesHeading": "Popular courses",
   "RecommendationsPanel.exploreCoursesButton": "Explorar cursos"

src/i18n/messages/zh_CN.json

@@ -44,6 +44,13 @@
   "ProductRecommendations.bootcampDescription": "Intensive, hands-on, project based training",
   "ProductRecommendations.courseHeading": "Courses",
   "ProductRecommendations.courseDescription": "Find new interests and advance your career",
+  "RecommendationsPanel.recommendationsFeatureText": "Personalized recommendations feature is not yet available. We are working hard on bringing it to your learner home in the near future.",
+  "RecommendationsPanel.recommendationsAlertText": "Would you like to be alerted when it becomes available?",
+  "RecommendationsPanel.recommendationsModalHeading": "Thank you for your interest!",
+  "RecommendationsPanel.modalSkipButton": "Skip for now",
+  "RecommendationsPanel.modalCountMeButton": "Count me in!",
+  "learnerVariantDashboard.recommendedForYou": "Recommended For You",
+  "RecommendationsPanel.seeAllRecommendationsButton": "See All Recommendations",
   "RecommendationsPanel.recommendationsHeading": "Recommendations for you",
   "RecommendationsPanel.popularCoursesHeading": "Popular courses",
   "RecommendationsPanel.exploreCoursesButton": "Explore courses"

src/setupTest.jsx

@@ -3,7 +3,7 @@ import '@testing-library/jest-dom';
 import '@testing-library/jest-dom/extend-expect';
 
 import Enzyme from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 
 Enzyme.configure({ adapter: new Adapter() });
 

src/widgets/ProductRecommendations/api.js

@@ -1,9 +1,9 @@
 import { get, stringifyUrl } from 'data/services/lms/utils';
 import urls from 'data/services/lms/urls';
 
-export const crossProductAndAmplitudeRecommendationsUrl = (courseId) => `${urls.getApiUrl()}/learner_recommendations/product_recommendations/${courseId}/`;
-export const amplitudeRecommendationsUrl = () => `${urls.getApiUrl()}/learner_recommendations/product_recommendations/`;
-export const recommendationsContextUrl = () => `${urls.getApiUrl()}/learner_recommendations/recommendations_context/`;
+export const crossProductAndAmplitudeRecommendationsUrl = (courseId) => `${urls.getApiUrl()}/edx_recommendations/learner_dashboard/cross_product/${courseId}/`;
+export const amplitudeRecommendationsUrl = () => `${urls.getApiUrl()}/edx_recommendations/learner_dashboard/amplitude/v2/`;
+export const recommendationsContextUrl = () => `${urls.getApiUrl()}/edx_recommendations/learner_dashboard/recommendations_context/`;
 
 const fetchRecommendationsContext = () => get(stringifyUrl(recommendationsContextUrl()));
 

src/widgets/RecommendationsPanel/api.js

@@ -2,7 +2,7 @@ import { StrictDict } from 'utils';
 import { get, stringifyUrl } from 'data/services/lms/utils';
 import urls from 'data/services/lms/urls';
 
-export const getFetchUrl = () => (`${urls.getApiUrl()}/api/edx_recommendations/learner_dashboard/amplitude/`);
+export const getFetchUrl = () => (`${urls.getApiUrl()}/edx_recommendations/learner_dashboard/amplitude/`);
 export const apiKeys = StrictDict({ user: 'user' });
 
 const fetchRecommendedCourses = () => get(stringifyUrl(getFetchUrl()));