feat: upgraded to node v18, added .nvmrc and updated workflows (#712 )

* feat: upgraded to node v18, added .nvmrc and updated workflows * build: updated frontend-build, frontend-platform, component-footer & component-header packages * refactor: updated snapshots * refactor: updated snapshots
chore: update frontend-platform version to v4.2.0
2023-06-09 08:51:17 +02:00 · 2023-05-02 17:14:27 -03:00
27 changed files with 2892 additions and 2111 deletions
--- a/.env
+++ b/.env
@@ -25,7 +25,6 @@ FAVICON_URL=''
 COLLECT_YEAR_OF_BIRTH=true
 APP_ID=''
 MFE_CONFIG_API_URL=''
-SEARCH_CATALOG_URL=''
 ENABLE_SKILLS_BUILDER=''
 ENABLE_SKILLS_BUILDER_PROFILE=''
 ALGOLIA_APP_ID=''
--- a/.env.development
+++ b/.env.development
@@ -26,7 +26,6 @@ FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
 COLLECT_YEAR_OF_BIRTH=true
 APP_ID=''
 MFE_CONFIG_API_URL=''
-SEARCH_CATALOG_URL='http://localhost:18000/courses'
 ENABLE_SKILLS_BUILDER='true'
 ENABLE_SKILLS_BUILDER_PROFILE=''
 ALGOLIA_APP_ID=''
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,4 @@ temp/babel-plugin-react-intl
 *~
 /temp
 /.vscode
-
-# Open edX
-module.config.js
-.env.development-stage
+/module.config.js
--- a/15
+++ b/15
@@ -2,7 +2,6 @@ export TRANSIFEX_RESOURCE = frontend-app-profile
 transifex_resource = frontend-app-profile
 transifex_langs = "ar,fr,es_419,zh_CN,pt,it,de,uk,ru,hi,fr_CA"

-intl_imports = ./node_modules/.bin/intl-imports.js
 transifex_utils = ./node_modules/.bin/transifex-utils.js
 i18n = ./src/i18n
 transifex_input = $(i18n)/transifex_input.json
@@ -50,23 +49,9 @@ push_translations:
 	# Pushing comments to Transifex...
 	./node_modules/@edx/reactifex/bash_scripts/put_comments_v3.sh

-ifeq ($(OPENEDX_ATLAS_PULL),)
 # Pulls translations from Transifex.
 pull_translations:
 	tx pull -t -f --mode reviewed --languages=$(transifex_langs)
-else
-# Experimental: OEP-58 Pulls translations using atlas
-pull_translations:
-	rm -rf src/i18n/messages
-	mkdir src/i18n/messages
-	cd src/i18n/messages \
-      && atlas pull --filter=$(transifex_langs) \
-               translations/frontend-component-header/src/i18n/messages:frontend-component-header \
-               translations/frontend-component-footer/src/i18n/messages:frontend-component-footer \
-               translations/frontend-app-profile/src/i18n/messages:frontend-app-profile
-
-	$(intl_imports) frontend-component-header frontend-component-footer frontend-app-profile
-endif

 # This target is used by Travis.
 validate-no-uncommitted-package-lock-changes:
--- a/env.config.js
+++ b/env.config.js
@@ -1,25 +0,0 @@
-const config = {
-  // Override default .env.development values
-  ACCESS_TOKEN_COOKIE_NAME: 'stage-edx-jwt-cookie-header-payload',
-  CREDENTIALS_BASE_URL: 'https://credentials.stage.edx.org',
-  LMS_BASE_URL: 'https://courses.stage.edx.org',
-  LOGIN_URL: 'https://courses.stage.edx.org/login',
-  LOGOUT_URL: 'https://courses.stage.edx.org/logout',
-  MARKETING_SITE_BASE_URL: 'https://stage.edx.org',
-  ORDER_HISTORY_URL: 'https://orders.stage.edx.org/orders',
-  ENTERPRISE_LEARNER_PORTAL_HOSTNAME: 'enterprise.stage.edx.org',
-  REFRESH_ACCESS_TOKEN_ENDPOINT: 'https://courses.stage.edx.org/login_refresh',
-  // Paragon theme URLs
-  PARAGON_THEME_URLS: {
-    core: 'https://cdn.jsdelivr.net/npm/@edx/paragon@$paragonVersion/dist/core.min.css',
-    variants: {
-      light: {
-        url: 'https://cdn.jsdelivr.net/npm/@edx/paragon@$paragonVersion/dist/light.min.css',
-        default: true,
-        dark: false,
-      },
-    },
-  },
-};
-
-export default config;
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -30,16 +30,16 @@
    "@edx/brand": "npm:@edx/brand-openedx@1.2.0",
    "@edx/frontend-component-footer": "12.0.0",
    "@edx/frontend-component-header": "4.0.0",
-    "@edx/frontend-platform": "4.5.0",
-    "@edx/paragon": "^20.32.0",
+    "@edx/frontend-platform": "4.2.0",
+    "@edx/paragon": "^20.20.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.2.0",
-    "algoliasearch": "4.17.1",
+    "algoliasearch": "4.6.0",
    "classnames": "2.3.2",
-    "core-js": "3.30.2",
+    "core-js": "3.27.2",
    "history": "4.10.1",
    "lodash.camelcase": "4.3.0",
    "lodash.get": "4.4.2",
@@ -59,15 +59,15 @@
    "redux-saga": "1.2.3",
    "redux-thunk": "2.4.2",
    "regenerator-runtime": "0.13.11",
-    "reselect": "4.1.8",
+    "reselect": "4.1.7",
    "universal-cookie": "4.0.4"
  },
  "devDependencies": {
-    "@commitlint/cli": "17.6.3",
-    "@commitlint/config-angular": "17.6.3",
+    "@commitlint/cli": "17.5.1",
+    "@commitlint/config-angular": "17.4.4",
    "@edx/browserslist-config": "^1.1.1",
-    "@edx/frontend-build": "12.8.38",
-    "@edx/reactifex": "2.2.0",
+    "@edx/frontend-build": "12.8.6",
+    "@edx/reactifex": "2.1.1",
    "@testing-library/react": "11.2.7",
    "codecov": "3.8.3",
    "enzyme": "3.11.0",
--- a/src/i18n/index.jsx
+++ b/src/i18n/index.jsx
@@ -1,6 +1,3 @@
-import { messages as headerMessages } from '@edx/frontend-component-header';
-import { messages as footerMessages } from '@edx/frontend-component-footer';
-
 import arMessages from './messages/ar.json';
 import frMessages from './messages/fr.json';
 import es419Messages from './messages/es_419.json';
@@ -14,7 +11,7 @@ import hiMessages from './messages/hi.json';
 import frCAMessages from './messages/fr_CA.json';
 // no need to import en messages-- they are in the defaultMessage field

-const appMessages = {
+const messages = {
  ar: arMessages,
  'es-419': es419Messages,
  fr: frMessages,
@@ -28,8 +25,4 @@ const appMessages = {
  uk: ukMessages,
 };

-export default [
-  headerMessages,
-  footerMessages,
-  appMessages,
-];
+export default messages;
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -34,11 +34,11 @@
  "profile.formcontrols.button.saved": "تم الحفظ",
  "profile.visibility.who.just.me": "أنا فقط",
  "profile.visibility.who.everyone": "جميع من على {siteName}",
-  "profile.learningGoal.learningGoal": "هدف التعلم",
-  "profile.learningGoal.options.start_career": "أريد أن أبدأ مسيرتي المهنية",
-  "profile.learningGoal.options.advance_career": "أريد أن ارتقي في مسيرتي المهنية",
-  "profile.learningGoal.options.learn_something_new": "أريد أن أتعلم شيئًا جديدًا",
-  "profile.learningGoal.options.something_else": "شيء آخر",
+  "profile.learningGoal.learningGoal": "Learning Goal",
+  "profile.learningGoal.options.start_career": "I want to start my career",
+  "profile.learningGoal.options.advance_career": "I want to advance my career",
+  "profile.learningGoal.options.learn_something_new": "I want to learn something new",
+  "profile.learningGoal.options.something_else": "Something else",
  "profile.name.full.name": "الاسم الكامل",
  "profile.name.details": "هذا هو الاسم الذي يظهر في حسابك وفي شهاداتك",
  "profile.name.empty": "إضافة الاسم",
@@ -54,31 +54,31 @@
  "profile.viewMyRecords": "عرض سجلّاتي",
  "profile.loading": "يتم تحميل الملف الشخصي...",
  "profile.username.description": "معلومات ملفك الشخصي تظهر لك فقط. وحده اسم المستخدم الخاص بك يظهر للآخرين على {siteName}.",
-  "skills.builder.header.title": "باني المهارات",
-  "skills.builder.header.subheading": "دع (المنصة التعليمية أو edX) ان تكون دليلك",
-  "go.back.button": "العودة إلى الخلف",
-  "next.step.button": "الخطوة التالية",
-  "exit.button": "خروج",
-  "select.preferences": "حدد التفضيلاتك",
-  "review.results": "مراجعة النتائج",
-  "skills.builder.description": "ابحث عن الدورات والبرامج المناسبة التي تساعدك في الوصول إلى أهدافك.",
-  "learning.goal.prompt": "أولاً، أخبرنا بما تريد تحقيقه",
-  "select.learning.goal": "اختر هدفًا",
-  "learning.goal.start_career": "أريد أن أبدأ مسيرتي المهنية",
-  "learning.goal.advance_career": "أريد أن ارتقي في مهنتي",
-  "learning.goal.change_career": "اريد تغيير المهنتي",
-  "learning.goal.something.new": "أريد أن أتعلم شيئًا جديدًا",
-  "learning.goal.something.else": "شيء آخر",
-  "job.title.prompt": "بعد ذلك، ابحث وحدد المسمى الوظيفي الحالي الخاص بك",
-  "job.title.input.placeholder.text": "أبحث واختار مسمى وظيفي",
-  "student.checkbox.prompt": "أنا طالب",
-  "currently.looking.checkbox.prompt": "أنا حاليا أبحث عن عمل",
-  "career.interest.prompt": "ما هي المهن التي تثير اهتمامك؟",
-  "career.interest.input.placeholder.text": "حدد ما يصل إلى ثلاث عناوين وظيفية جديدة",
-  "career.interest.remove.button.alt.text": "إزالة الاهتمام الوظيفي:",
-  "matches.found.success.alert": "وجدنا المهارات والدورات التي تناسب تفضيلاتك!",
-  "matches.not.found.danger.alert": "لم نتمكن من استرداد التوصيات في هذا الوقت. الرجاء معاودة المحاولة في وقت لاحق.",
-  "related.skills.heading": "مهارات ذات الصلة",
-  "related.skills.selectable.box.label.text": "مهارات ذات الصلة:",
+  "skills.builder.header.title": "Skills Builder",
+  "skills.builder.header.subheading": "Let edX be your guide",
+  "go.back.button": "Go Back",
+  "next.step.button": "Next Step",
+  "exit.button": "Exit",
+  "select.preferences": "Select preferences",
+  "review.results": "Review results",
+  "skills.builder.description": "Find the right courses and programs that help you reach your goals.",
+  "learning.goal.prompt": "First, tell us what you want to achieve",
+  "select.learning.goal": "Select a goal",
+  "learning.goal.start_career": "I want to start my career",
+  "learning.goal.advance_career": "I want to advance my career",
+  "learning.goal.change_career": "I want to change careers",
+  "learning.goal.something.new": "I want to learn something new",
+  "learning.goal.something.else": "Something else",
+  "job.title.prompt": "Next, search and select your current job title",
+  "job.title.input.placeholder.text": "Search and select a job title",
+  "student.checkbox.prompt": "I'm a student",
+  "currently.looking.checkbox.prompt": "I'm currently looking for work",
+  "career.interest.prompt": "What careers are you interested in?",
+  "career.interest.input.placeholder.text": "Select up to 3 new job titles",
+  "career.interest.remove.button.alt.text": "Remove career interest: ",
+  "matches.found.success.alert": "We found skills and courses that match your preferences!",
+  "matches.not.found.danger.alert": "We were not able to retrieve recommendations at this time. Please try again later.",
+  "related.skills.heading": "Related Skills",
+  "related.skills.selectable.box.label.text": "Related skills:",
  "product.recommendations.header.text": "{productType} recommendations for {jobName}"
 }
--- a/src/i18n/messages/uk.json
+++ b/src/i18n/messages/uk.json
@@ -8,7 +8,7 @@
  "profile.certificate.organization.label": "From",
  "profile.certificate.completion.date.label": "Completed on {date}",
  "profile.no.certificates": "You don't have any certificates yet.",
-  "profile.certificates.my.certificates": "Мої сертифікати",
+  "profile.certificates.my.certificates": "My Certificates",
  "profile.certificates.view.certificate": "View Certificate",
  "profile.certificates.types.verified": "Verified Certificate",
  "profile.certificates.types.professional": "Professional Certificate",
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -16,10 +16,10 @@ import {
 import React from 'react';
 import ReactDOM from 'react-dom';

-import Header from '@edx/frontend-component-header';
-import Footer from '@edx/frontend-component-footer';
+import Header, { messages as headerMessages } from '@edx/frontend-component-header';
+import Footer, { messages as footerMessages } from '@edx/frontend-component-footer';

-import messages from './i18n';
+import appMessages from './i18n';
 import configureStore from './data/configureStore';

 import './index.scss';
@@ -46,7 +46,11 @@ subscribe(APP_INIT_ERROR, (error) => {
 });

 initialize({
-  messages,
+  messages: [
+    appMessages,
+    headerMessages,
+    footerMessages,
+  ],
  hydrateAuthenticatedUser: true,
  handlers: {
    config: () => {
@@ -58,7 +62,6 @@ initialize({
        ALGOLIA_JOBS_INDEX_NAME: process.env.ALGOLIA_JOBS_INDEX_NAME || null,
        ALGOLIA_PRODUCT_INDEX_NAME: process.env.ALGOLIA_PRODUCT_INDEX_NAME || null,
        ALGOLIA_SEARCH_API_KEY: process.env.ALGOLIA_SEARCH_API_KEY || null,
-        MARKETING_SITE_SEARCH_URL: process.env.SEARCH_CATALOG_URL || null,
      }, 'App loadConfig override handler');
    },
  },
--- a/src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx
+++ b/src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx
@@ -1,10 +1,9 @@
 import React, { useState, useContext } from 'react';
 import {
-  Button, Container, Stepper, ModalDialog, Form, Hyperlink,
+  Button, Container, Stepper, ModalDialog,
 } from '@edx/paragon';
-import { getConfig } from '@edx/frontend-platform';
 import { useIntl } from '@edx/frontend-platform/i18n';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
+import { useHistory } from 'react-router';
 import {
  STEP1, STEP2,
 } from '../data/constants';
@@ -20,34 +19,13 @@ import headerImage from '../images/headerImage.png';
 const SkillsBuilderModal = () => {
  const { formatMessage } = useIntl();
  const { state } = useContext(SkillsBuilderContext);
-  const { currentGoal, currentJobTitle, careerInterests } = state;
+  const { careerInterests } = state;
  const [currentStep, setCurrentStep] = useState(STEP1);

-  const sendActionButtonEvent = (eventSuffix) => {
-    sendTrackEvent(
-      `edx.skills_builder.${eventSuffix}`,
-      {
-        app_name: 'skills_builder',
-        category: 'skills_builder',
-        learner_data: {
-          current_goal: currentGoal,
-          current_job_title: currentJobTitle,
-          career_interests: careerInterests,
-        },
-      },
-    );
-  };
+  const history = useHistory();

-  const nextStepHandle = () => {
-    setCurrentStep(STEP2);
-    sendActionButtonEvent('next_step');
-  };
-  const exitButtonHandle = () => {
-    sendActionButtonEvent('exit');
-  };
-  const closeButtonHandle = () => {
-    sendActionButtonEvent('close');
-    window.location.href = getConfig().MARKETING_SITE_SEARCH_URL;
+  const onCloseHandle = () => {
+    history.goBack();
  };

  return (
@@ -57,7 +35,7 @@ const SkillsBuilderModal = () => {
        size="fullscreen"
        className="skills-builder-modal bg-light-200"
        isOpen
-        onClose={closeButtonHandle}
+        onClose={onCloseHandle}
      >
        <ModalDialog.Hero>
          <ModalDialog.Hero.Background className="bg-primary-500">
@@ -72,37 +50,40 @@ const SkillsBuilderModal = () => {

        <ModalDialog.Body>
          <Container size="md" className="p-4.5">
-            <Form>
-              <Stepper.Step eventKey={STEP1} title={formatMessage(messages.selectPreferences)}>
-                <SelectPreferences />
-              </Stepper.Step>
+            <Stepper.Step eventKey={STEP1} title={formatMessage(messages.selectPreferences)}>
+              <SelectPreferences />
+            </Stepper.Step>

-              <Stepper.Step eventKey={STEP2} title={formatMessage(messages.reviewResults)}>
-                <ViewResults />
-              </Stepper.Step>
-            </Form>
+            <Stepper.Step eventKey={STEP2} title={formatMessage(messages.reviewResults)}>
+              <ViewResults />
+            </Stepper.Step>
          </Container>
        </ModalDialog.Body>

        <ModalDialog.Footer>
          <Stepper.ActionRow eventKey={STEP1}>
+            <Button variant="outline-primary" onClick={onCloseHandle}>
+              {formatMessage(messages.goBackButton)}
+            </Button>
+            <Stepper.ActionRow.Spacer />
            <Button
-              onClick={nextStepHandle}
+              onClick={() => setCurrentStep(STEP2)}
              disabled={careerInterests.length === 0}
            >
              {formatMessage(messages.nextStepButton)}
            </Button>
          </Stepper.ActionRow>
          <Stepper.ActionRow eventKey={STEP2}>
-            <Button variant="outline-primary" onClick={() => setCurrentStep(STEP1)}>
+            <Button
+              variant="outline-primary"
+              onClick={() => setCurrentStep(STEP1)}
+            >
              {formatMessage(messages.goBackButton)}
            </Button>
            <Stepper.ActionRow.Spacer />
-            <Hyperlink destination={getConfig().MARKETING_SITE_SEARCH_URL}>
-              <Button onClick={exitButtonHandle}>
-                {formatMessage(messages.exitButton)}
-              </Button>
-            </Hyperlink>
+            <Button onClick={onCloseHandle}>
+              {formatMessage(messages.exitButton)}
+            </Button>
          </Stepper.ActionRow>
        </ModalDialog.Footer>
      </ModalDialog>
--- a/src/skills-builder/skills-builder-modal/select-preferences/CareerInterestCard.jsx
+++ b/src/skills-builder/skills-builder-modal/select-preferences/CareerInterestCard.jsx
@@ -4,7 +4,6 @@ import {
  IconButton, Icon,
 } from '@edx/paragon';
 import { useIntl } from '@edx/frontend-platform/i18n';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { Close } from '@edx/paragon/icons';
 import { SkillsBuilderContext } from '../../skills-builder-context';
 import { removeCareerInterest } from '../../data/actions';
@@ -14,21 +13,6 @@ const CareerInterestCard = ({ interest }) => {
  const { formatMessage } = useIntl();
  const { dispatch } = useContext(SkillsBuilderContext);

-  const handleRemoveCareerInterest = () => {
-    dispatch(removeCareerInterest(interest));
-
-    sendTrackEvent(
-      'edx.skills_builder.career_interest.removed',
-      {
-        app_name: 'skills_builder',
-        category: 'skills_builder',
-        learner_data: {
-          career_interest: interest,
-        },
-      },
-    );
-  };
-
  return (
    <div className="d-flex justify-content-between align-items-center pb-2 pr-2 pl-4 rounded shadow-sm">
      <p className="pt-4">
@@ -38,7 +22,7 @@ const CareerInterestCard = ({ interest }) => {
        iconAs={Icon}
        src={Close}
        alt={`${formatMessage(messages.removeCareerInterestButtonAltText)} ${interest}`}
-        onClick={handleRemoveCareerInterest}
+        onClick={() => dispatch(removeCareerInterest(interest))}
      />
    </div>
  );
--- a/src/skills-builder/skills-builder-modal/select-preferences/CareerInterestSelect.jsx
+++ b/src/skills-builder/skills-builder-modal/select-preferences/CareerInterestSelect.jsx
@@ -1,11 +1,10 @@
 import React, { useContext } from 'react';
 import { getConfig } from '@edx/frontend-platform';
 import { useIntl } from '@edx/frontend-platform/i18n';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import {
  Stack, Row, Col, Form,
 } from '@edx/paragon';
-import { Configure, InstantSearch } from 'react-instantsearch-hooks-web';
+import { InstantSearch } from 'react-instantsearch-hooks-web';
 import JobTitleInstantSearch from './JobTitleInstantSearch';
 import CareerInterestCard from './CareerInterestCard';
 import { addCareerInterest } from '../../data/actions';
@@ -21,17 +20,6 @@ const CareerInterestSelect = () => {
  const handleCareerInterestSelect = (value) => {
    if (!careerInterests.includes(value) && careerInterests.length < 3) {
      dispatch(addCareerInterest(value));
-
-      sendTrackEvent(
-        'edx.skills_builder.career_interest.added',
-        {
-          app_name: 'skills_builder',
-          category: 'skills_builder',
-          learner_data: {
-            career_interest: value,
-          },
-        },
-      );
    }
  };

@@ -42,11 +30,9 @@ const CareerInterestSelect = () => {
          {formatMessage(messages.careerInterestPrompt)}
        </h4>
        <InstantSearch searchClient={searchClient} indexName={getConfig().ALGOLIA_JOBS_INDEX_NAME}>
-          <Configure filters="b2c_opt_in:true" />
          <JobTitleInstantSearch
            onSelected={handleCareerInterestSelect}
            placeholder={formatMessage(messages.careerInterestInputPlaceholderText)}
-            data-testid="career-interest-select"
          />
        </InstantSearch>
      </Form.Label>
--- a/src/skills-builder/skills-builder-modal/select-preferences/GoalSelect.jsx
+++ b/src/skills-builder/skills-builder-modal/select-preferences/GoalSelect.jsx
@@ -3,7 +3,6 @@ import {
  Form,
 } from '@edx/paragon';
 import { useIntl } from '@edx/frontend-platform/i18n';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { setGoal } from '../../data/actions';
 import { SkillsBuilderContext } from '../../skills-builder-context';
 import messages from './messages';
@@ -13,22 +12,6 @@ const GoalDropdown = () => {
  const { state, dispatch } = useContext(SkillsBuilderContext);
  const { currentGoal } = state;

-  const handleGoalSelect = (e) => {
-    const { value } = e.target;
-    dispatch(setGoal(value));
-
-    sendTrackEvent(
-      'edx.skills_builder.goal.select',
-      {
-        app_name: 'skills_builder',
-        category: 'skills_builder',
-        learner_data: {
-          current_goal: value,
-        },
-      },
-    );
-  };
-
  return (
    <Form.Group>
      <Form.Label>
@@ -39,10 +22,10 @@ const GoalDropdown = () => {
      <Form.Control
        as="select"
        value={currentGoal}
-        onChange={handleGoalSelect}
+        onChange={(e) => dispatch(setGoal(e.target.value))}
        data-testid="goal-select-dropdown"
      >
-        <option value="" disabled={currentGoal}>{formatMessage(messages.selectLearningGoal)}</option>
+        <option value="">{formatMessage(messages.selectLearningGoal)}</option>
        <option>{formatMessage(messages.learningGoalStartCareer)}</option>
        <option>{formatMessage(messages.learningGoalAdvanceCareer)}</option>
        <option>{formatMessage(messages.learningGoalChangeCareer)}</option>
--- a/src/skills-builder/skills-builder-modal/select-preferences/JobTitleSelect.jsx
+++ b/src/skills-builder/skills-builder-modal/select-preferences/JobTitleSelect.jsx
@@ -4,7 +4,6 @@ import {
  Form, Stack,
 } from '@edx/paragon';
 import { useIntl } from '@edx/frontend-platform/i18n';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { InstantSearch } from 'react-instantsearch-hooks-web';
 import { setCurrentJobTitle } from '../../data/actions';
 import { SkillsBuilderContext } from '../../skills-builder-context';
@@ -13,37 +12,16 @@ import messages from './messages';

 const JobTitleSelect = () => {
  const { formatMessage } = useIntl();
-  const { state, dispatch, algolia } = useContext(SkillsBuilderContext);
+  const { dispatch, algolia } = useContext(SkillsBuilderContext);
  const { searchClient } = algolia;
-  const { currentJobTitle } = state;

  const handleCurrentJobTitleSelect = (value) => {
    dispatch(setCurrentJobTitle(value));
-    sendTrackEvent(
-      'edx.skills_builder.current_job.select',
-      {
-        app_name: 'skills_builder',
-        category: 'skills_builder',
-        learner_data: {
-          current_job_title: value,
-        },
-      },
-    );
  };

-  const handleCheckboxChange = (e) => {
-    const { value } = e.target;
-    // only setCurrentJobTitle if the user hasn't selected a current job as we don't want to override their selection
-    if (!currentJobTitle) { dispatch(setCurrentJobTitle(value)); }
-
-    sendTrackEvent(
-      `edx.skills_builder.current_job.${value}`,
-      {
-        app_name: 'skills_builder',
-        category: 'skills_builder',
-      },
-    );
-  };
+  // Below implementation sets the job title to "Student" or "Looking for work" — this overwrites any previous selection
+  // This will need to be revisited when we decide what to do with this data
+  const handleCheckboxChange = (e) => dispatch(setCurrentJobTitle(e.target.value));

  return (
    <Stack>
@@ -55,7 +33,6 @@ const JobTitleSelect = () => {
          <JobTitleInstantSearch
            onSelected={handleCurrentJobTitleSelect}
            placeholder={formatMessage(messages.jobTitleInputPlaceholderText)}
-            data-testid="job-title-select"
          />
        </InstantSearch>
      </Form.Label>
@@ -64,10 +41,10 @@ const JobTitleSelect = () => {
          name="other-occupations"
          onChange={handleCheckboxChange}
        >
-          <Form.Checkbox value="student">
+          <Form.Checkbox value="Student">
            {formatMessage(messages.studentCheckboxPrompt)}
          </Form.Checkbox>
-          <Form.Checkbox value="looking_for_work">
+          <Form.Checkbox value="Looking for work">
            {formatMessage(messages.currentlyLookingCheckboxPrompt)}
          </Form.Checkbox>
        </Form.CheckboxSet>
--- a/src/skills-builder/skills-builder-modal/select-preferences/SelectPreferences.jsx
+++ b/src/skills-builder/skills-builder-modal/select-preferences/SelectPreferences.jsx
@@ -27,7 +27,7 @@ const SelectPreferences = () => {
          <JobTitleSelect />
        )}

-        {currentGoal && currentJobTitle && (
+        {currentJobTitle && (
          <CareerInterestSelect />
        )}
      </Stack>
--- a/src/skills-builder/skills-builder-modal/select-preferences/test/SelectPreferences.test.jsx
+++ b/src/skills-builder/skills-builder-modal/select-preferences/test/SelectPreferences.test.jsx
@@ -2,13 +2,8 @@ import {
  screen, render, cleanup, fireEvent,
 } from '@testing-library/react';
 import { mergeConfig } from '@edx/frontend-platform';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { SkillsBuilderWrapperWithContext, dispatchMock, contextValue } from '../../../test/setupSkillsBuilder';

-jest.mock('@edx/frontend-platform/analytics', () => ({
-  sendTrackEvent: jest.fn(),
-}));
-
 describe('select-preferences', () => {
  beforeAll(() => {
    mergeConfig({
@@ -34,13 +29,8 @@ describe('select-preferences', () => {
        payload: 'I want to advance my career',
        type: 'SET_GOAL',
      };
-      const expectedStudent = {
-        payload: 'student',
-        type: 'SET_CURRENT_JOB_TITLE',
-      };
-
      const expectedJobTitle = {
-        payload: 'Prospector',
+        payload: 'Student',
        type: 'SET_CURRENT_JOB_TITLE',
      };

@@ -50,41 +40,9 @@ describe('select-preferences', () => {
      const checkbox = screen.getByRole('checkbox', { name: 'I\'m a student' });
      fireEvent.click(checkbox);

-      const jobTitleInput = screen.getByTestId('job-title-select');
-      fireEvent.change(jobTitleInput, { target: { value: 'Prospector' } });
-      fireEvent.click(screen.getByRole('button', { name: 'Prospector' }));
-
      expect(screen.getByText('Next, search and select your current job title')).toBeTruthy();
      expect(dispatchMock).toHaveBeenCalledWith(expectedGoal);
-      expect(dispatchMock).toHaveBeenCalledWith(expectedStudent);
      expect(dispatchMock).toHaveBeenCalledWith(expectedJobTitle);
-      expect(sendTrackEvent).toHaveBeenCalledWith(
-        'edx.skills_builder.goal.select',
-        {
-          app_name: 'skills_builder',
-          category: 'skills_builder',
-          learner_data: {
-            current_goal: 'I want to advance my career',
-          },
-        },
-      );
-      expect(sendTrackEvent).toHaveBeenCalledWith(
-        'edx.skills_builder.current_job.student',
-        {
-          app_name: 'skills_builder',
-          category: 'skills_builder',
-        },
-      );
-      expect(sendTrackEvent).toHaveBeenCalledWith(
-        'edx.skills_builder.current_job.select',
-        {
-          app_name: 'skills_builder',
-          category: 'skills_builder',
-          learner_data: {
-            current_job_title: 'Prospector',
-          },
-        },
-      );
    });

    it('should render the third prompt if a current job title is selected', () => {
@@ -112,33 +70,14 @@ describe('select-preferences', () => {
              ...contextValue.state,
              currentGoal: 'I want to start my career',
              currentJobTitle: 'Goblin Lackey',
-              careerInterests: ['Prospector'],
+              careerInterests: ['Prospector', 'Mirror Breaker', 'Bombardment'],
            },
          },
        ),
      );
      expect(screen.getByText('Prospector')).toBeTruthy();
-
-      const careerInterestInput = screen.getByTestId('career-interest-select');
-      fireEvent.change(careerInterestInput, { target: { value: 'Mirror Breaker' } });
-      fireEvent.click(screen.getByRole('button', { name: 'Mirror Breaker' }));
-
-      expect(sendTrackEvent).toHaveBeenCalledWith(
-        'edx.skills_builder.career_interest.added',
-        {
-          app_name: 'skills_builder',
-          category: 'skills_builder',
-          learner_data: {
-            career_interest: 'Mirror Breaker',
-          },
-        },
-      );
-      expect(dispatchMock).toHaveBeenCalledWith(
-        {
-          payload: 'Mirror Breaker',
-          type: 'ADD_CAREER_INTEREST',
-        },
-      );
+      expect(screen.getByText('Mirror Breaker')).toBeTruthy();
+      expect(screen.getByText('Bombardment')).toBeTruthy();
    });
  });

@@ -165,16 +104,6 @@ describe('select-preferences', () => {

      fireEvent.click(screen.getByLabelText('Remove career interest: Prospector'));
      expect(dispatchMock).toHaveBeenCalledWith(expected);
-      expect(sendTrackEvent).toHaveBeenCalledWith(
-        'edx.skills_builder.career_interest.removed',
-        {
-          app_name: 'skills_builder',
-          category: 'skills_builder',
-          learner_data: {
-            career_interest: 'Prospector',
-          },
-        },
-      );
    });
  });
 });
--- a/src/skills-builder/skills-builder-modal/view-results/CarouselStack.jsx
+++ b/src/skills-builder/skills-builder-modal/view-results/CarouselStack.jsx
@@ -1,18 +1,13 @@
 import React from 'react';
 import { CardCarousel } from '@edx/paragon';
 import { useIntl } from '@edx/frontend-platform/i18n';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import RecommendationCard from './RecommendationCard';
 import messages from './messages';

 const CarouselStack = ({ selectedRecommendations }) => {
  const { formatMessage } = useIntl();
-  const { id: jobId, name: jobName, recommendations } = selectedRecommendations;
+  const { name: jobName, recommendations } = selectedRecommendations;
  const productTypeNames = Object.keys(recommendations);
-  const courseKeys = recommendations.course?.map(rec => ({
-    title: rec.title,
-    courserun_key: rec.active_run_key,
-  }));

  const normalizeProductTypeName = (productType) => {
    // If the productType is more than one word (i.e. boot_camp)
@@ -40,24 +35,6 @@ const CarouselStack = ({ selectedRecommendations }) => {
    </h3>
  );

-  const handleCourseCardClick = (courseKey, productType) => {
-    sendTrackEvent(
-      'edx.skills_builder.recommendation.click',
-      {
-        app_name: 'skills_builder',
-        category: 'skills_builder',
-        page: 'skills_builder',
-        courserun_key: courseKey,
-        product_type: productType,
-        selected_recommendations: {
-          job_id: jobId,
-          job_name: jobName,
-          courserun_keys: courseKeys,
-        },
-      },
-    );
-  };
-
  return (
    productTypeNames.map(productType => (
      <CardCarousel
@@ -66,12 +43,7 @@ const CarouselStack = ({ selectedRecommendations }) => {
        title={renderCarouselTitle(productType)}
      >
        {recommendations[productType].map(rec => (
-          <RecommendationCard
-            key={rec.uuid}
-            handleCourseCardClick={handleCourseCardClick}
-            rec={rec}
-            productType={productType}
-          />
+          <RecommendationCard rec={rec} key={rec.uuid} />
        ))}
      </CardCarousel>
    )));
--- a/src/skills-builder/skills-builder-modal/view-results/RecommendationCard.jsx
+++ b/src/skills-builder/skills-builder-modal/view-results/RecommendationCard.jsx
@@ -1,13 +1,13 @@
 import React from 'react';
 import { Card, Chip, Hyperlink } from '@edx/paragon';
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import cardImageCapFallbackSrc from '../../images/card-imagecap-fallback.png';

-const RecommendationCard = ({ rec, productType, handleCourseCardClick }) => {
+const RecommendationCard = ({ rec }) => {
  const {
    card_image_url: cardImageUrl,
    marketing_url: marketingUrl,
-    active_run_key: courseKey,
    owners,
    partner,
    title,
@@ -17,15 +17,12 @@ const RecommendationCard = ({ rec, productType, handleCourseCardClick }) => {

  return (
    <Hyperlink destination={marketingUrl} target="_blank" showLaunchIcon={false}>
-      <Card
-        className="carousel-card"
-        onClick={() => handleCourseCardClick(courseKey, productType)}
-      >
+      <Card className={classNames('carousel-card')}>
        <Card.ImageCap
          src={cardImageUrl}
          logoSrc={logoImageUrl}
-          fallbackSrc={cardImageCapFallbackSrc}
-          fallbackLogoSrc={cardImageCapFallbackSrc}
+          fallackSrc={cardImageCapFallbackSrc}
+          fallBackLogo={cardImageCapFallbackSrc}
        />
        <Card.Header title={title} />
        <Card.Section>
@@ -51,10 +48,7 @@ RecommendationCard.propTypes = {
      key: PropTypes.string,
      logoImageUrl: PropTypes.string,
    })),
-    active_run_key: PropTypes.string.isRequired,
  }).isRequired,
-  productType: PropTypes.string.isRequired,
-  handleCourseCardClick: PropTypes.func.isRequired,
 };

 export default RecommendationCard;
--- a/src/skills-builder/skills-builder-modal/view-results/ViewResults.jsx
+++ b/src/skills-builder/skills-builder-modal/view-results/ViewResults.jsx
@@ -1,10 +1,7 @@
-import React, {
-  useContext, useEffect, useState,
-} from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import {
  Stack, Row, Alert, Spinner,
 } from '@edx/paragon';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { useIntl } from '@edx/frontend-platform/i18n';
 import { CheckCircle, ErrorOutline } from '@edx/paragon/icons';
 import { SkillsBuilderContext } from '../../skills-builder-context';
@@ -58,24 +55,9 @@ const ViewResults = () => {
      }));

      setJobSkillsList(jobInfo);
-      setSelectedJobTitle(results[0].name);
+      setSelectedJobTitle(jobInfo[0].name);
      setProductRecommendations(results);
      setIsLoading(false);
-      sendTrackEvent('edx.skills_builder.recommendation.shown', {
-        app_name: 'skills_builder',
-        category: 'skills_builder',
-        page: 'skills_builder',
-        selected_recommendations: {
-          job_id: results[0].id,
-          job_name: results[0].name,
-          /* We extract the title and course key into an array of objects */
-          courserun_keys: results[0].recommendations.course?.map(rec => ({
-            title: rec.title,
-            courserun_key: rec.active_run_key,
-          })),
-        },
-        is_default: true,
-      });
    };
    getRecommendations()
      .catch(() => {
@@ -88,35 +70,6 @@ const ViewResults = () => {
    setSelectedRecommendations(productRecommendations.find(rec => rec.name === selectedJobTitle));
  }, [productRecommendations, selectedJobTitle]);

-  const handleJobTitleChange = (e) => {
-    const { value } = e.target;
-    setSelectedJobTitle(value);
-    const currentSelection = productRecommendations.find(rec => rec.name === value);
-    const { id: jobId, name: jobName, recommendations } = currentSelection;
-    const courseKeys = recommendations.course?.map(rec => ({
-      title: rec.title,
-      courserun_key: rec.active_run_key,
-    }));
-    /*
-      The is_default value will be set to false for any selections made by the user.
-      This code is intentionally duplicated from the event that fires in the useEffect for fetching recommendations.
-      This proved less clunky than refactoring to make things DRY as we have to ensure the first call fires only once.
-      The previous implementation wrapped the event in an additional useEffect that was looping unnecessarily.
-      We have plans to refactor all of the event code as part of APER-2392, where we will revisit this approach.
-    */
-    sendTrackEvent('edx.skills_builder.recommendation.shown', {
-      app_name: 'skills_builder',
-      category: 'skills_builder',
-      page: 'skills_builder',
-      selected_recommendations: {
-        job_id: jobId,
-        job_name: jobName,
-        courserun_keys: courseKeys,
-      },
-      is_default: false,
-    });
-  };
-
  if (fetchError) {
    return (
      <Alert
@@ -153,7 +106,7 @@ const ViewResults = () => {
        <RelatedSkillsSelectableBoxSet
          jobSkillsList={jobSkillsList}
          selectedJobTitle={selectedJobTitle}
-          onChange={handleJobTitleChange}
+          onChange={(e) => setSelectedJobTitle(e.target.value)}
        />

        <CarouselStack selectedRecommendations={selectedRecommendations} />
--- a/src/skills-builder/skills-builder-modal/view-results/test/ViewResults.test.jsx
+++ b/src/skills-builder/skills-builder-modal/view-results/test/ViewResults.test.jsx
@@ -2,14 +2,9 @@ import {
  screen, render, cleanup, fireEvent, act,
 } from '@testing-library/react';
 import { mergeConfig } from '@edx/frontend-platform';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { SkillsBuilderWrapperWithContext, contextValue } from '../../../test/setupSkillsBuilder';
 import { getProductRecommendations } from '../../../utils/search';

-jest.mock('@edx/frontend-platform/analytics', () => ({
-  sendTrackEvent: jest.fn(),
-}));
-
 const renderSkillsBuilderWrapper = (
  value = {
    ...contextValue,
@@ -42,117 +37,22 @@ describe('view-results', () => {
      });
    });

-    afterEach(() => {
-      jest.clearAllMocks();
-    });
-
-    it('should render a <JobSillsSelectableBox> for each career interest the learner has submitted', () => {
+    it('should render a <JobSillsSelectableBox> for each career interest the learner has submitted', async () => {
      expect(screen.getByText('Prospector')).toBeTruthy();
      expect(screen.getByText('Mirror Breaker')).toBeTruthy();

      const chipComponents = document.querySelectorAll('.pgn__chip');
      expect(chipComponents[0].textContent).toEqual('finding shiny things');
      expect(chipComponents[1].textContent).toEqual('mining');
-      expect(sendTrackEvent).toHaveBeenCalledWith(
-        'edx.skills_builder.recommendation.shown',
-        {
-          app_name: 'skills_builder',
-          category: 'skills_builder',
-          page: 'skills_builder',
-          selected_recommendations: {
-            job_id: 0,
-            job_name: 'Prospector',
-            courserun_keys: [
-              {
-                title: 'Mining with the Mons',
-                courserun_key: 'MONS101',
-              },
-              {
-                title: 'The Art of Warren Upkeep',
-                courserun_key: 'WAR101',
-              },
-            ],
-          },
-          is_default: true,
-        },
-      );
-      // called once when "Next Step" button is clicked and then again for above event
-      expect(sendTrackEvent).toHaveBeenCalledTimes(2);
    });

-    it('renders a carousel of <Card> components', () => {
+    it('renders a carousel of <Card> components', async () => {
      expect(screen.getByText('Course recommendations for Prospector')).toBeTruthy();
    });

    it('changes the recommendations based on the selected job title', () => {
      fireEvent.click(screen.getByRole('radio', { name: 'Mirror Breaker' }));
      expect(screen.getByText('Course recommendations for Mirror Breaker')).toBeTruthy();
-      expect(sendTrackEvent).toHaveBeenCalledWith(
-        'edx.skills_builder.recommendation.shown',
-        {
-          app_name: 'skills_builder',
-          category: 'skills_builder',
-          page: 'skills_builder',
-          selected_recommendations: {
-            job_id: 1,
-            job_name: 'Mirror Breaker',
-            courserun_keys: [
-              {
-                title: 'Mining with the Mons',
-                courserun_key: 'MONS101',
-              },
-              {
-                title: 'The Art of Warren Upkeep',
-                courserun_key: 'WAR101',
-              },
-            ],
-          },
-          is_default: false,
-        },
-      );
-    });
-
-    it('sends an event when the "Next Step" button is clicked', () => {
-      expect(sendTrackEvent).toHaveBeenCalledWith(
-        'edx.skills_builder.next_step',
-        {
-          app_name: 'skills_builder',
-          category: 'skills_builder',
-          learner_data: {
-            current_goal: 'I want to start my career',
-            current_job_title: 'Goblin Lackey',
-            career_interests: ['Prospector', 'Mirror Breaker', 'Bombardment'],
-          },
-        },
-      );
-    });
-
-    it('fires an event when a product recommendation is clicked', () => {
-      fireEvent.click(screen.getByText('Mining with the Mons'));
-      expect(sendTrackEvent).toHaveBeenCalledWith(
-        'edx.skills_builder.recommendation.click',
-        {
-          app_name: 'skills_builder',
-          category: 'skills_builder',
-          page: 'skills_builder',
-          courserun_key: 'MONS101',
-          product_type: 'course',
-          selected_recommendations: {
-            job_id: 0,
-            job_name: 'Prospector',
-            courserun_keys: [
-              {
-                title: 'Mining with the Mons',
-                courserun_key: 'MONS101',
-              },
-              {
-                title: 'The Art of Warren Upkeep',
-                courserun_key: 'WAR101',
-              },
-            ],
-          },
-        },
-      );
    });
  });

--- a/src/skills-builder/test/mocks/jobSkills.mockData.js
+++ b/src/skills-builder/test/mocks/jobSkills.mockData.js
@@ -2,11 +2,11 @@ export const mockData = {
  hits: [
    {
      id: 0,
-      name: 'Prospector'
+      name: 'Text File Engineer'
    },
    {
      id: 1,
-      name: 'Mirror Breaker'
+      name: 'Screen Viewer'
    },
  ],
  searchJobs: [
@@ -44,7 +44,6 @@ export const mockData = {
      partner: ['edx'],
      card_image_url: 'https://thisIsAUrl.ForAnImage.01.jpeg',
      marketing_url: 'https://thisIsAUrl.ForTheRecommendedContent.01.com',
-      active_run_key: 'MONS101',
      owners: [
        {
          logoImageUrl: 'https://thisIsAUrl.ForALogoImage.01.jpeg',
@@ -57,7 +56,6 @@ export const mockData = {
      partner: ['edx'],
      card_image_url: 'https://thisIsAUrl.ForAnImage.02.jpeg',
      marketing_url: 'https://thisIsAUrl.ForTheRecommendedContent.02.com',
-      active_run_key: 'WAR101',
      owners: [
        {
          logoImageUrl: 'https://thisIsAUrl.ForALogoImage.02.jpeg',
--- a/src/skills-builder/test/setupSkillsBuilder.jsx
+++ b/src/skills-builder/test/setupSkillsBuilder.jsx
@@ -11,7 +11,6 @@ jest.mock('@edx/frontend-platform/logging');
 jest.mock('react-instantsearch-hooks-web', () => ({
  // eslint-disable-next-line react/prop-types
  InstantSearch: ({ children }) => (<div>{children}</div>),
-  Configure: jest.fn(() => (null)),
  useSearchBox: jest.fn(() => ({ refine: jest.fn() })),
  useHits: jest.fn(() => ({ hits: mockData.hits })),
 }));
--- a/src/skills-builder/utils/search.jsx
+++ b/src/skills-builder/utils/search.jsx
@@ -96,7 +96,7 @@ export const getProductRecommendations = async (productIndex, productType, skill
  const formattedSkillNames = formatFacetFilterData('skills.skill', skills);
  try {
    const { hits } = await productIndex.search('', {
-      filters: `product: "${productType}" AND language: "English"`,
+      filters: `product: "${productType}"`,
      facetFilters: [
        formattedSkillNames,
      ],
--- a/src/skills-builder/utils/tests/search.test.jsx
+++ b/src/skills-builder/utils/tests/search.test.jsx
@@ -55,7 +55,7 @@ describe('Algolias utility function', () => {

  it('getProductRecommendations() queries Algolia with the expected search parameters', async () => {
    const expectedSearchParameters = {
-      filters: 'product: "Course" AND language: "English"',
+      filters: 'product: "Course"',
      facetFilters: [
        ['skills.skill:Sword Lobbing'],
      ],
--- a/webpack.dev.config.js
+++ b/webpack.dev.config.js
@@ -1,8 +0,0 @@
-const { createConfig } = require('@edx/frontend-build');
-
-module.exports = createConfig('webpack-dev', {
-  devServer: {
-    allowedHosts: 'all',
-    https: true,
-  },
-});
Author	SHA1	Message	Date
Bilal Qamar	2af0383847	feat: upgraded to node v18, added .nvmrc and updated workflows (#712 ) * feat: upgraded to node v18, added .nvmrc and updated workflows * build: updated frontend-build, frontend-platform, component-footer & component-header packages * refactor: updated snapshots * refactor: updated snapshots	2023-06-09 08:51:17 +02:00
Sagirov Eugeniy	57e3bd0125	chore: update frontend-platform version to v4.2.0	2023-05-02 17:14:27 -03:00