@@ -99,7 +99,7 @@ const CourseHeader = () => {
{catalog.containsContentItems ? (
<>
- {features.ENABLE_COURSE_REVIEW &&
}
+ {enableReviewSection &&
}
{defaultProgram && (
This course is part of a {formatProgramType(defaultProgram.type)}.
diff --git a/src/components/course/CourseRunCard.jsx b/src/components/course/CourseRunCard.jsx
index d9d198b50..082bb0461 100644
--- a/src/components/course/CourseRunCard.jsx
+++ b/src/components/course/CourseRunCard.jsx
@@ -8,7 +8,6 @@ import {
import { AppContext } from '@edx/frontend-platform/react';
import { useLocation } from 'react-router-dom';
-import { getConfig } from '@edx/frontend-platform/config';
import EnrollAction from './enrollment/EnrollAction';
import { enrollButtonTypes } from './enrollment/constants';
import {
@@ -26,7 +25,6 @@ import {
numberWithPrecision,
} from './data/utils';
import { formatStringAsNumber } from '../../utils/common';
-import { isExperimentVariant } from '../../utils/optimizely';
import { useSubsidyDataForCourse } from './enrollment/hooks';
import { useCourseEnrollmentUrl, useUserHasSubsidyRequestForCourse, useCoursePriceForUserSubsidy } from './data/hooks';
@@ -72,8 +70,6 @@ const CourseRunCard = ({
isEnrollable,
} = courseRun;
- const config = getConfig();
-
const location = useLocation();
const { enterpriseConfig } = useContext(AppContext);
@@ -226,10 +222,6 @@ const CourseRunCard = ({
&& enrollmentType === enrollButtonTypes.TO_DATASHARING_CONSENT
&& userSubsidyApplicableToCourse?.subsidyType === LICENSE_SUBSIDY_TYPE
);
- // Only users buckted in `Variation 1` can see the change.
- const isExperimentVariation1 = isExperimentVariant(config.EXPERIMENT_2_ID, config.EXPERIMENT_2_VARIANT_1_ID);
- // For our experiment, we should trigger our Optimizely event only when this condition is true
- const triggerLicenseSubsidyEvent = shouldShowLicenseSubsidyPriceText;
return (
@@ -245,7 +237,7 @@ const CourseRunCard = ({
>
{heading}
{subHeading}
- {isExperimentVariation1 && shouldShowLicenseSubsidyPriceText && (
+ {shouldShowLicenseSubsidyPriceText && (
)}
@@ -279,7 +270,7 @@ CourseRunCard.propTypes = {
start: PropTypes.string.isRequired,
key: PropTypes.string.isRequired,
seats: PropTypes.arrayOf(PropTypes.shape()).isRequired,
- firstEnrollablePaidSeatPrice: PropTypes.number.isRequired,
+ firstEnrollablePaidSeatPrice: PropTypes.number,
}).isRequired,
userEnrollments: PropTypes.arrayOf(PropTypes.shape({
isEnrollmentActive: PropTypes.bool.isRequired,
@@ -301,7 +292,7 @@ LicenseSubsidyPriceText.propTypes = {
start: PropTypes.string.isRequired,
key: PropTypes.string.isRequired,
seats: PropTypes.arrayOf(PropTypes.shape()).isRequired,
- firstEnrollablePaidSeatPrice: PropTypes.number.isRequired,
+ firstEnrollablePaidSeatPrice: PropTypes.number,
}).isRequired,
userSubsidyApplicableToCourse: PropTypes.shape({
discountType: PropTypes.string.isRequired,
diff --git a/src/components/course/CourseSidebarPrice.jsx b/src/components/course/CourseSidebarPrice.jsx
index 38141b574..d204e736e 100644
--- a/src/components/course/CourseSidebarPrice.jsx
+++ b/src/components/course/CourseSidebarPrice.jsx
@@ -22,11 +22,11 @@ export const INSUFFICIENT_ENTERPRISE_OFFER_BALANCE = 'Your organization doesn\'t
const CourseSidebarPrice = () => {
const { enterpriseConfig } = useContext(AppContext);
const { state: courseData } = useContext(CourseContext);
- const { activeCourseRun, userSubsidyApplicableToCourse } = courseData;
+ const { course, activeCourseRun, userSubsidyApplicableToCourse } = courseData;
const { subsidyRequestConfiguration } = useContext(SubsidyRequestsContext);
const [coursePrice, currency] = useCoursePriceForUserSubsidy({
- activeCourseRun, userSubsidyApplicableToCourse,
+ courseEntitlements: course?.entitlements, activeCourseRun, userSubsidyApplicableToCourse,
});
const {
diff --git a/src/components/course/data/hooks.jsx b/src/components/course/data/hooks.tsx
similarity index 67%
rename from src/components/course/data/hooks.jsx
rename to src/components/course/data/hooks.tsx
index 99f782656..0b447bd3c 100644
--- a/src/components/course/data/hooks.jsx
+++ b/src/components/course/data/hooks.tsx
@@ -15,13 +15,17 @@ import { CourseContext } from '../CourseContextProvider';
import { isDefinedAndNotNull } from '../../../utils/common';
import { features } from '../../../config';
-import CourseService from './service';
+import CourseService, { AllCourseData } from './service';
+import {
+ Course, CourseOwner, CourseRecommendation, EnterpriseSubsidy, SubscriptionLicense,
+} from './types';
import {
isCourseInstructorPaced,
isCourseSelfPaced,
findCouponCodeForCourse,
getSubsidyToApplyForCourse,
findEnterpriseOfferForCourse,
+ courseUsesEntitlementPricing,
} from './utils';
import {
COURSE_PACING_MAP,
@@ -33,6 +37,9 @@ import {
ENROLLMENT_COURSE_RUN_KEY_QUERY_PARAM,
} from './constants';
import { pushEvent, EVENTS } from '../../../utils/optimizely';
+import { getEntitlementPrice } from '../enrollment/utils';
+
+import { ReactAppContext } from '../../../../external';
// How long to delay an event, so that we allow enough time for any async analytics event call to resolve
const CLICK_DELAY_MS = 300; // 300ms replicates Segment's ``trackLink`` function
@@ -48,8 +55,10 @@ export function useAllCourseData({
activeCatalogs,
}) {
const [isLoading, setIsLoading] = useState(false);
- const [courseData, setCourseData] = useState();
- const [courseRecommendations, setCourseRecommendations] = useState();
+ const [courseData, setCourseData] = useState();
+ const [courseRecommendations, setCourseRecommendations] = useState<
+ CourseRecommendation[] | undefined
+ >();
const [fetchError, setFetchError] = useState();
useEffect(() => {
@@ -73,33 +82,49 @@ export function useAllCourseData({
containsContentItems,
catalogList: catalogsWithCourse,
},
+ courseDetails,
} = data;
- let userSubsidyApplicableToCourse = null;
+ let userSubsidyApplicableToCourse: EnterpriseSubsidy | null = null;
if (containsContentItems) {
- let licenseForCourse = null;
+ let licenseForCourse: SubscriptionLicense | null = null;
if (subscriptionLicense) {
// get subscription license with extra information (i.e. discount type, discount value, subsidy checksum)
try {
const fetchLicenseSubsidyResponse = await courseService.fetchUserLicenseSubsidy();
- licenseForCourse = camelCaseObject(fetchLicenseSubsidyResponse.data);
- } catch (error) {
+ licenseForCourse = camelCaseObject(
+ fetchLicenseSubsidyResponse.data,
+ );
+ } catch (error: any) {
logError(error);
setFetchError(error);
}
}
- const { firstEnrollablePaidSeatPrice } = courseService.activeCourseRun || {};
+ let coursePrice: number | undefined = 0;
+
+ if (courseUsesEntitlementPricing(courseDetails)) {
+ coursePrice = getEntitlementPrice(courseDetails?.entitlements);
+ }
+
+ if (courseService?.activeCourseRun?.firstEnrollablePaidSeatPrice) {
+ coursePrice = courseService.activeCourseRun.firstEnrollablePaidSeatPrice;
+ }
userSubsidyApplicableToCourse = getSubsidyToApplyForCourse({
applicableSubscriptionLicense: licenseForCourse,
- applicableCouponCode: findCouponCodeForCourse(couponCodes, catalogsWithCourse),
+ applicableCouponCode: findCouponCodeForCourse(
+ couponCodes,
+ catalogsWithCourse,
+ ),
applicableEnterpriseOffer: findEnterpriseOfferForCourse({
- enterpriseOffers: canEnrollWithEnterpriseOffers ? enterpriseOffers : [],
+ enterpriseOffers: canEnrollWithEnterpriseOffers
+ ? enterpriseOffers
+ : [],
catalogList: catalogsWithCourse,
- coursePrice: firstEnrollablePaidSeatPrice,
+ coursePrice,
}),
});
}
@@ -108,13 +133,15 @@ export function useAllCourseData({
...data,
userSubsidyApplicableToCourse,
});
- } catch (error) {
+ } catch (error: any) {
logError(error);
setFetchError(error);
}
try {
- const data = await courseService.fetchAllCourseRecommendations(activeCatalogs);
+ const data = await courseService.fetchAllCourseRecommendations(
+ activeCatalogs,
+ );
setCourseRecommendations(data);
} catch (error) {
logError(error);
@@ -164,9 +191,9 @@ export function useCourseSubjects(course) {
}
// TODO: Refactor away from useEffect useState
-export function useCoursePartners(course) {
- const [partners, setPartners] = useState([]);
- const [label, setLabel] = useState('');
+export function useCoursePartners(course: Course): [CourseOwner[], string] {
+ const [partners, setPartners] = useState([]);
+ const [label, setLabel] = useState('');
useEffect(() => {
if (course?.owners) {
@@ -202,7 +229,7 @@ export function useCourseRunWeeksToComplete(courseRun) {
// TODO: Refactor away from useEffect useState
export function useCourseTranscriptLanguages(courseRun) {
const [languages, setLanguages] = useState([]);
- const [label, setLabel] = useState(undefined);
+ const [label, setLabel] = useState(undefined);
useEffect(() => {
if (courseRun && courseRun.transcriptLanguages) {
@@ -220,36 +247,30 @@ export function useCourseTranscriptLanguages(courseRun) {
// TODO: Refactor away from useEffect useState
export function useCoursePacingType(courseRun) {
- const [pacingType, setPacingType] = useState();
+ const [pacingType, setPacingType] = useState();
- useEffect(
- () => {
- if (isCourseSelfPaced(courseRun.pacingType)) {
- setPacingType(COURSE_PACING_MAP.SELF_PACED);
- }
+ useEffect(() => {
+ if (isCourseSelfPaced(courseRun.pacingType)) {
+ setPacingType(COURSE_PACING_MAP.SELF_PACED);
+ }
- if (isCourseInstructorPaced(courseRun.pacingType)) {
- setPacingType(COURSE_PACING_MAP.INSTRUCTOR_PACED);
- }
- },
- [courseRun],
- );
+ if (isCourseInstructorPaced(courseRun.pacingType)) {
+ setPacingType(COURSE_PACING_MAP.INSTRUCTOR_PACED);
+ }
+ }, [courseRun]);
// TODO: Refactor away from useEffect useState
- const pacingTypeContent = useMemo(
- () => {
- if (pacingType === COURSE_PACING_MAP.INSTRUCTOR_PACED) {
- return 'Instructor-led on a course schedule';
- }
+ const pacingTypeContent = useMemo(() => {
+ if (pacingType === COURSE_PACING_MAP.INSTRUCTOR_PACED) {
+ return 'Instructor-led on a course schedule';
+ }
- if (pacingType === COURSE_PACING_MAP.SELF_PACED) {
- return 'Self-paced on your time';
- }
+ if (pacingType === COURSE_PACING_MAP.SELF_PACED) {
+ return 'Self-paced on your time';
+ }
- return undefined;
- },
- [pacingType],
- );
+ return undefined;
+ }, [pacingType]);
return [pacingType, pacingTypeContent];
}
@@ -259,17 +280,17 @@ export function useCoursePacingType(courseRun) {
* @param {object} args Arguments.
* @param {Object} args.activeCourseRun course run info
* @param {Object} args.userSubsidyApplicableToCourse Usersubsidy
+ * @param {Object} args.courseEntitlements Course Entitlements
*
* @returns {Object} { activeCourseRun, userSubsidyApplicableToCourse }
*/
export const useCoursePriceForUserSubsidy = ({
- activeCourseRun, userSubsidyApplicableToCourse,
+ activeCourseRun, userSubsidyApplicableToCourse, courseEntitlements,
}) => {
const currency = CURRENCY_USD;
-
const coursePrice = useMemo(
() => {
- const listPrice = activeCourseRun.firstEnrollablePaidSeatPrice;
+ const listPrice = activeCourseRun?.firstEnrollablePaidSeatPrice || getEntitlementPrice(courseEntitlements);
if (!listPrice) {
return null;
@@ -283,13 +304,19 @@ export const useCoursePriceForUserSubsidy = ({
const { discountType, discountValue } = userSubsidyApplicableToCourse;
let discountedPrice;
- if (discountType
- && discountType.toLowerCase() === SUBSIDY_DISCOUNT_TYPE_MAP.PERCENTAGE.toLowerCase()) {
- discountedPrice = listPrice - (listPrice * (discountValue / 100));
+ if (
+ discountType
+ && discountType.toLowerCase()
+ === SUBSIDY_DISCOUNT_TYPE_MAP.PERCENTAGE.toLowerCase()
+ ) {
+ discountedPrice = listPrice - listPrice * (discountValue / 100);
}
- if (discountType
- && discountType.toLowerCase() === SUBSIDY_DISCOUNT_TYPE_MAP.ABSOLUTE.toLowerCase()) {
+ if (
+ discountType
+ && discountType.toLowerCase()
+ === SUBSIDY_DISCOUNT_TYPE_MAP.ABSOLUTE.toLowerCase()
+ ) {
discountedPrice = Math.max(listPrice - discountValue, 0);
}
@@ -308,7 +335,7 @@ export const useCoursePriceForUserSubsidy = ({
// Case 2: No subsidy available for course
return onlyListPrice;
},
- [activeCourseRun, userSubsidyApplicableToCourse],
+ [activeCourseRun, userSubsidyApplicableToCourse, courseEntitlements],
);
return [coursePrice, currency];
@@ -349,7 +376,7 @@ export const useCourseEnrollmentUrl = ({
const config = getConfig();
const baseQueryParams = useMemo(() => {
const params = new URLSearchParams(location.search);
- params.set(ENROLLMENT_FAILED_QUERY_PARAM, true);
+ params.set(ENROLLMENT_FAILED_QUERY_PARAM, 'true');
params.set(ENROLLMENT_COURSE_RUN_KEY_QUERY_PARAM, courseRunKey);
return params;
}, [location.search, courseRunKey]);
@@ -358,94 +385,99 @@ export const useCourseEnrollmentUrl = ({
() => ({
next: `${config.LMS_BASE_URL}/courses/${courseRunKey}/course`,
// Redirect back to the same page with a failure query param
- failure_url: `${global.location.origin}${location.pathname}?${baseQueryParams.toString()}`,
+ failure_url: `${global.location.origin}${
+ location.pathname
+ }?${baseQueryParams.toString()}`,
}),
[config.LMS_BASE_URL, courseRunKey, baseQueryParams, location.pathname],
);
// TODO: use the new helper functions (createEnrollWithLicenseUrl, createEnrollWithCouponCodeUrl) to generate url
- const enrollmentUrl = useMemo(
- () => {
- if (userSubsidyApplicableToCourse?.subsidyType === LICENSE_SUBSIDY_TYPE) {
- const queryParams = new URLSearchParams({
- ...baseEnrollmentOptions,
- license_uuid: userSubsidyApplicableToCourse.subsidyId,
- course_id: courseRunKey,
- enterprise_customer_uuid: enterpriseConfig.uuid,
- // We don't want any sidebar text we show the data consent page from this workflow since
- // the text on the sidebar is used when a learner is coming from their employer's system.
- left_sidebar_text_override: '',
- source: 'enterprise-learner-portal',
- });
- return `${config.LMS_BASE_URL}/enterprise/grant_data_sharing_permissions/?${queryParams.toString()}`;
- }
-
- if (!sku) {
- // No product SKU is present, so the course cannot be enrolled in.
- return null;
- }
-
+ const enrollmentUrl = useMemo(() => {
+ if (userSubsidyApplicableToCourse?.subsidyType === LICENSE_SUBSIDY_TYPE) {
const queryParams = new URLSearchParams({
...baseEnrollmentOptions,
- sku,
- consent_url_param_string: `failure_url=${encodeURIComponent(global.location.href)}?${baseQueryParams.toString()}&left_sidebar_text_override=`,
+ license_uuid: userSubsidyApplicableToCourse.subsidyId,
+ course_id: courseRunKey,
+ enterprise_customer_uuid: enterpriseConfig.uuid,
+ // We don't want any sidebar text we show the data consent page from this workflow since
+ // the text on the sidebar is used when a learner is coming from their employer's system.
+ left_sidebar_text_override: '',
+ source: 'enterprise-learner-portal',
});
+ return `${
+ config.LMS_BASE_URL
+ }/enterprise/grant_data_sharing_permissions/?${queryParams.toString()}`;
+ }
- if (features.ENROLL_WITH_CODES && userSubsidyApplicableToCourse?.subsidyType === COUPON_CODE_SUBSIDY_TYPE) {
- queryParams.set('code', userSubsidyApplicableToCourse.code);
- return `${config.ECOMMERCE_BASE_URL}/coupons/redeem/?${queryParams.toString()}`;
- }
+ if (!sku) {
+ // No product SKU is present, so the course cannot be enrolled in.
+ return null;
+ }
- // This enrollment url will automatically apply enterprise offers
- return `${config.ECOMMERCE_BASE_URL}/basket/add/?${queryParams.toString()}`;
- },
- [
- userSubsidyApplicableToCourse,
+ const queryParams = new URLSearchParams({
+ ...baseEnrollmentOptions,
sku,
- baseEnrollmentOptions,
- baseQueryParams,
- config.ECOMMERCE_BASE_URL,
- config.LMS_BASE_URL,
- courseRunKey,
- enterpriseConfig.uuid,
- ],
- );
+ consent_url_param_string: `failure_url=${encodeURIComponent(
+ global.location.href,
+ )}?${baseQueryParams.toString()}&left_sidebar_text_override=`,
+ });
+
+ if (
+ features.ENROLL_WITH_CODES
+ && userSubsidyApplicableToCourse?.subsidyType === COUPON_CODE_SUBSIDY_TYPE
+ ) {
+ queryParams.set('code', userSubsidyApplicableToCourse.code);
+ return `${
+ config.ECOMMERCE_BASE_URL
+ }/coupons/redeem/?${queryParams.toString()}`;
+ }
+
+ // This enrollment url will automatically apply enterprise offers
+ return `${config.ECOMMERCE_BASE_URL}/basket/add/?${queryParams.toString()}`;
+ }, [
+ userSubsidyApplicableToCourse,
+ sku,
+ baseEnrollmentOptions,
+ baseQueryParams,
+ config.ECOMMERCE_BASE_URL,
+ config.LMS_BASE_URL,
+ courseRunKey,
+ enterpriseConfig.uuid,
+ ]);
return enrollmentUrl;
};
+export type AlgoliaSearchParams = {
+ objectId?: string | null, queryId?: string | null
+};
/**
* A hook that parses the URL query parameters to extract an objectId and queryId and then
* immediately remove them from the URL via a history replace to keep the URLs clean.
*
* @returns An object containing the Algolia objectId and queryId that led to a page view of the Course page.
*/
-export const useExtractAndRemoveSearchParamsFromURL = () => {
+export const useExtractAndRemoveSearchParamsFromURL: () => AlgoliaSearchParams | {} = () => {
const { search } = useLocation();
const history = useHistory();
- const [algoliaSearchParams, setAlgoliaSearchParams] = useState({});
+ const [algoliaSearchParams, setAlgoliaSearchParams] = useState({});
- const queryParams = useMemo(
- () => new URLSearchParams(search),
- [search],
- );
+ const queryParams = useMemo(() => new URLSearchParams(search), [search]);
- useEffect(
- () => {
- if (queryParams.get('queryId') && queryParams.get('objectId')) {
- setAlgoliaSearchParams({
- queryId: queryParams.get('queryId'),
- objectId: queryParams.get('objectId'),
- });
- queryParams.delete('queryId');
- queryParams.delete('objectId');
- history.replace({
- search: queryParams.toString(),
- });
- }
- },
- [history, queryParams],
- );
+ useEffect(() => {
+ if (queryParams.get('queryId') && queryParams.get('objectId')) {
+ setAlgoliaSearchParams({
+ queryId: queryParams.get('queryId'),
+ objectId: queryParams.get('objectId'),
+ });
+ queryParams.delete('queryId');
+ queryParams.delete('objectId');
+ history.replace({
+ search: queryParams.toString(),
+ });
+ }
+ }, [history, queryParams]);
return algoliaSearchParams;
};
@@ -469,7 +501,7 @@ export const useTrackSearchConversionClickHandler = ({ href, eventName }) => {
algoliaSearchParams,
},
} = useContext(CourseContext);
- const { enterpriseConfig } = useContext(AppContext);
+ const { enterpriseConfig } = useContext(AppContext);
const handleClick = useCallback(
(e) => {
const { queryId, objectId } = algoliaSearchParams;
@@ -484,16 +516,12 @@ export const useTrackSearchConversionClickHandler = ({ href, eventName }) => {
global.location.href = href;
}, CLICK_DELAY_MS);
}
- sendEnterpriseTrackEvent(
- enterpriseConfig.uuid,
- eventName,
- {
- products: [{ objectID: objectId }],
- index: getConfig().ALGOLIA_INDEX_NAME,
- queryID: queryId,
- courseKey,
- },
- );
+ sendEnterpriseTrackEvent(enterpriseConfig.uuid, eventName, {
+ products: [{ objectID: objectId }],
+ index: getConfig().ALGOLIA_INDEX_NAME,
+ queryID: queryId,
+ courseKey,
+ });
},
[algoliaSearchParams, href, enterpriseConfig, eventName, courseKey],
);
@@ -506,7 +534,10 @@ export const useTrackSearchConversionClickHandler = ({ href, eventName }) => {
*
* @returns Click handler function for clicks on enrollment buttons when a learner possesses a license subsidy.
*/
-export const useOptimizelyLicenseSubsidyEnrollmentClickHandler = ({ href, courseRunKey }) => {
+export const useOptimizelyLicenseSubsidyEnrollmentClickHandler = ({
+ href,
+ courseRunKey,
+}) => {
const handleClick = useCallback(
(e) => {
// If tracking is on a link with an external href destination, we must intentionally delay the default click
@@ -517,7 +548,9 @@ export const useOptimizelyLicenseSubsidyEnrollmentClickHandler = ({ href, course
global.location.href = href;
}, CLICK_DELAY_MS);
}
- pushEvent(EVENTS.LICENSE_SUBSIDY_ENROLLMENT_CLICK, { courseKey: courseRunKey });
+ pushEvent(EVENTS.LICENSE_SUBSIDY_ENROLLMENT_CLICK, {
+ courseKey: courseRunKey,
+ });
},
[courseRunKey, href],
);
@@ -530,7 +563,11 @@ export const useOptimizelyLicenseSubsidyEnrollmentClickHandler = ({ href, course
*
* @returns Click handler function for clicks on enrollment buttons.
*/
-export const useOptimizelyEnrollmentClickHandler = ({ href, courseRunKey, courseEnrollmentsByStatus }) => {
+export const useOptimizelyEnrollmentClickHandler = ({
+ href,
+ courseRunKey,
+ courseEnrollmentsByStatus,
+}) => {
const enrollmentCountIsZero = Object.values(courseEnrollmentsByStatus).flat().length === 0;
const handleClick = useCallback(
@@ -567,11 +604,10 @@ export const useOptimizelyEnrollmentClickHandler = ({ href, courseRunKey, course
* @param {string} [courseKey] - optional filter for specific course
* @returns {boolean}
*/
-export function useUserHasSubsidyRequestForCourse(courseKey) {
- const {
- subsidyRequestConfiguration,
- requestsBySubsidyType,
- } = useContext(SubsidyRequestsContext);
+export function useUserHasSubsidyRequestForCourse(courseKey?: string) {
+ const { subsidyRequestConfiguration, requestsBySubsidyType } = useContext(
+ SubsidyRequestsContext,
+ );
return useMemo(() => {
if (!subsidyRequestConfiguration?.subsidyRequestsEnabled) {
@@ -582,17 +618,13 @@ export function useUserHasSubsidyRequestForCourse(courseKey) {
return requestsBySubsidyType[SUBSIDY_TYPE.LICENSE].length > 0;
}
case SUBSIDY_TYPE.COUPON: {
- const foundCouponRequest = requestsBySubsidyType[SUBSIDY_TYPE.COUPON].find(
- request => (!courseKey || request.courseId === courseKey),
- );
+ const foundCouponRequest = requestsBySubsidyType[
+ SUBSIDY_TYPE.COUPON
+ ].find((request) => !courseKey || request.courseId === courseKey);
return !!foundCouponRequest;
}
default:
return false;
}
- }, [
- courseKey,
- subsidyRequestConfiguration,
- requestsBySubsidyType,
- ]);
+ }, [courseKey, subsidyRequestConfiguration, requestsBySubsidyType]);
}
diff --git a/src/components/course/data/service.js b/src/components/course/data/service.ts
similarity index 63%
rename from src/components/course/data/service.js
rename to src/components/course/data/service.ts
index 282c7a908..939abb24d 100644
--- a/src/components/course/data/service.js
+++ b/src/components/course/data/service.ts
@@ -3,9 +3,42 @@ import { camelCaseObject } from '@edx/frontend-platform/utils';
import { getConfig } from '@edx/frontend-platform/config';
import { getActiveCourseRun, getAvailableCourseRuns } from './utils';
+import { FrontendPlatformConfig, HttpClient } from '../../../../external';
+import {
+ CourseData,
+ CourseRun,
+ CourseServiceOptions,
+ CourseRecommendation,
+ CourseEnrollment,
+ UserEntitlement,
+ CatalogData,
+ EnterpriseSubsidy,
+} from './types';
-export default class CourseService {
- constructor(options = {}) {
+export type AllCourseData = {
+ courseDetails: CourseData;
+ userEnrollments: CourseEnrollment[];
+ userEntitlements: UserEntitlement[];
+ catalog: CatalogData;
+ userSubsidyApplicableToCourse?: EnterpriseSubsidy | null;
+};
+
+export default class CourseService implements CourseServiceOptions {
+ activeCourseRun?: CourseRun;
+
+ courseKey?: string;
+
+ courseRunKey?: string;
+
+ enterpriseUuid?: string;
+
+ config: FrontendPlatformConfig;
+
+ authenticatedHttpClient: HttpClient;
+
+ cachedAuthenticatedHttpClient: HttpClient;
+
+ constructor(options: CourseServiceOptions = {}) {
const {
activeCourseRun,
courseKey,
@@ -25,13 +58,13 @@ export default class CourseService {
this.activeCourseRun = activeCourseRun;
}
- async fetchAllCourseData() {
+ async fetchAllCourseData(): Promise {
const courseDataRaw = await Promise.all([
this.fetchCourseDetails(),
this.fetchUserEnrollments(),
this.fetchUserEntitlements(),
this.fetchEnterpriseCustomerContainsContent(),
- ]).then((responses) => responses.map(res => res.data));
+ ]).then((responses) => responses.map((res) => res.data));
const courseData = camelCaseObject(courseDataRaw);
const courseDetails = courseData[0];
@@ -46,7 +79,9 @@ export default class CourseService {
if (availableCourseRunKeys.includes(this.courseRunKey)) {
courseDetails.canonicalCourseRunKey = this.courseRunKey;
courseDetails.courseRunKeys = [this.courseRunKey];
- courseDetails.courseRuns = availableCourseRuns.filter(obj => obj.key === this.courseRunKey);
+ courseDetails.courseRuns = availableCourseRuns.filter(
+ (obj) => obj.key === this.courseRunKey,
+ );
courseDetails.advertisedCourseRunUuid = courseDetails.courseRuns[0].uuid;
}
}
@@ -59,39 +94,56 @@ export default class CourseService {
};
}
- async fetchAllCourseRecommendations(activeCatalogs = []) {
- const resp = await this.fetchCourseRecommendations()
- .then(async (response) => {
+ async fetchAllCourseRecommendations(
+ activeCatalogs = [],
+ ): Promise {
+ const resp = await this.fetchCourseRecommendations().then(
+ async (response) => {
const {
all_recommendations: allRecommendations,
same_partner_recommendations: samePartnerRecommendations,
} = response.data;
// handle no recommendations case
- if (allRecommendations.length < 1 && samePartnerRecommendations.length < 1) {
+ if (
+ allRecommendations.length < 1
+ && samePartnerRecommendations.length < 1
+ ) {
return response.data;
}
- const allRecommendationsKeys = allRecommendations?.map((rec) => rec.key);
- const samePartnerRecommendationsKeys = samePartnerRecommendations?.map((rec) => rec.key);
+ const allRecommendationsKeys = allRecommendations?.map(
+ (rec) => rec.key,
+ );
+ const samePartnerRecommendationsKeys = samePartnerRecommendations?.map(
+ (rec) => rec.key,
+ );
const options = {
- content_keys: allRecommendationsKeys.concat(samePartnerRecommendationsKeys),
+ content_keys: allRecommendationsKeys.concat(
+ samePartnerRecommendationsKeys,
+ ),
catalog_uuids: activeCatalogs,
};
- const filteredRecommendations = await this.fetchFilteredRecommendations(options);
- const { filtered_content_keys: filteredContentKeys } = filteredRecommendations.data;
+ const filteredRecommendations = await this.fetchFilteredRecommendations(
+ options,
+ );
+ const {
+ filtered_content_keys: filteredContentKeys,
+ } = filteredRecommendations.data;
const recommendations = {
all_recommendations: allRecommendations.filter(
- (rec) => !samePartnerRecommendationsKeys.includes(rec.key) && filteredContentKeys.includes(rec.key),
+ (rec) => !samePartnerRecommendationsKeys.includes(rec.key)
+ && filteredContentKeys.includes(rec.key),
),
same_partner_recommendations: samePartnerRecommendations.filter(
(rec) => filteredContentKeys.includes(rec.key),
),
};
return recommendations;
- });
+ },
+ );
return resp;
}
@@ -100,7 +152,7 @@ export default class CourseService {
return this.cachedAuthenticatedHttpClient.post(url, options);
}
- fetchCourseDetails() {
+ fetchCourseDetails(): CourseData {
const url = `${this.config.DISCOVERY_API_BASE_URL}/api/v1/courses/${this.courseKey}/`;
return this.cachedAuthenticatedHttpClient.get(url);
}
@@ -118,10 +170,12 @@ export default class CourseService {
fetchUserEnrollments() {
const queryParams = new URLSearchParams({
enterprise_id: this.enterpriseUuid,
- is_active: true,
- });
+ is_active: 'true',
+ } as Record);
const config = getConfig();
- const url = `${config.LMS_BASE_URL}/enterprise_learner_portal/api/v1/enterprise_course_enrollments/?${queryParams.toString()}`;
+ const url = `${
+ config.LMS_BASE_URL
+ }/enterprise_learner_portal/api/v1/enterprise_course_enrollments/?${queryParams.toString()}`;
return getAuthenticatedHttpClient().get(url);
}
@@ -134,21 +188,27 @@ export default class CourseService {
// This API call will *only* obtain the enterprise's catalogs whose
// catalog queries return/contain the specified courseKey.
const queryParams = new URLSearchParams({
- course_run_ids: courseRunIds,
- get_catalogs_containing_specified_content_ids: true,
- });
-
- const url = `${this.config.ENTERPRISE_CATALOG_API_BASE_URL}/api/v1/enterprise-customer/${this.enterpriseUuid}/contains_content_items/?${queryParams.toString()}`;
+ course_run_ids: courseRunIds.toString(),
+ get_catalogs_containing_specified_content_ids: 'true',
+ } as Record);
+
+ const url = `${
+ this.config.ENTERPRISE_CATALOG_API_BASE_URL
+ }/api/v1/enterprise-customer/${
+ this.enterpriseUuid
+ }/contains_content_items/?${queryParams.toString()}`;
return this.cachedAuthenticatedHttpClient.get(url);
}
- fetchUserLicenseSubsidy(courseKey = this.activeCourseRun.key) {
+ fetchUserLicenseSubsidy(courseKey = this?.activeCourseRun?.key) {
const queryParams = new URLSearchParams({
enterprise_customer_uuid: this.enterpriseUuid,
course_key: courseKey,
- });
- const url = `${this.config.LICENSE_MANAGER_URL}/api/v1/license-subsidy/?${queryParams.toString()}`;
- return this.cachedAuthenticatedHttpClient.get(url).catch(error => {
+ } as Record);
+ const url = `${
+ this.config.LICENSE_MANAGER_URL
+ }/api/v1/license-subsidy/?${queryParams.toString()}`;
+ return this.cachedAuthenticatedHttpClient.get(url).catch((error) => {
const httpErrorStatus = error.customAttributes?.httpErrorStatus;
if (httpErrorStatus === 404) {
// 404 means the user's license is not applicable for the course, return undefined instead of throwing an error
diff --git a/src/components/course/data/tests/hooks.test.jsx b/src/components/course/data/tests/hooks.test.tsx
similarity index 82%
rename from src/components/course/data/tests/hooks.test.jsx
rename to src/components/course/data/tests/hooks.test.tsx
index f55ca4999..549c9f3cc 100644
--- a/src/components/course/data/tests/hooks.test.jsx
+++ b/src/components/course/data/tests/hooks.test.tsx
@@ -1,32 +1,35 @@
+import React from 'react';
import { renderHook } from '@testing-library/react-hooks';
import { render, screen } from '@testing-library/react';
import moment from 'moment';
import { camelCaseObject } from '@edx/frontend-platform';
-import {
- MemoryRouter,
-} from 'react-router-dom';
+import { MemoryRouter } from 'react-router-dom';
import { logError } from '@edx/frontend-platform/logging';
import {
useCourseEnrollmentUrl,
useUserHasSubsidyRequestForCourse,
useAllCourseData,
useOptimizelyEnrollmentClickHandler,
- useOptimizelyLicenseSubsidyEnrollmentClickHandler,
useCoursePartners,
useCourseRunWeeksToComplete,
useCourseTranscriptLanguages,
useCoursePacingType,
useCoursePriceForUserSubsidy,
useExtractAndRemoveSearchParamsFromURL,
+ AlgoliaSearchParams,
} from '../hooks';
import { SubsidyRequestsContext } from '../../../enterprise-subsidy-requests/SubsidyRequestsContextProvider';
-import { SUBSIDY_TYPE, SUBSIDY_REQUEST_STATE } from '../../../enterprise-subsidy-requests/constants';
+import {
+ SUBSIDY_TYPE,
+ SUBSIDY_REQUEST_STATE,
+} from '../../../enterprise-subsidy-requests/constants';
import {
LICENSE_SUBSIDY_TYPE,
COUPON_CODE_SUBSIDY_TYPE,
ENTERPRISE_OFFER_SUBSIDY_TYPE,
} from '../constants';
import * as optimizelyUtils from '../../../../utils/optimizely';
+import { CouponCode, CourseRun } from '../types';
jest.mock('@edx/frontend-platform/logging', () => ({
logError: jest.fn(),
@@ -51,12 +54,17 @@ const mockLicenseForCourse = {
start_date: moment().subtract(1, 'w').toISOString(),
expiration_date: moment().add(8, 'w').toISOString(),
};
-
-const mockCouponCodesForCourse = [{
- catalog: 'catalog-1',
- couponStartDate: moment().subtract(1, 'w').toISOString(),
- couponEndDate: moment().add(8, 'w').toISOString(),
-}];
+const mockCouponCodesForCourse: CouponCode[] = [
+ {
+ catalog: 'catalog-1',
+ couponStartDate: moment().subtract(1, 'w').toISOString(),
+ couponEndDate: moment().add(8, 'w').toISOString(),
+ uuid: '',
+ code: '',
+ usageType: '',
+ benefitValue: 0,
+ },
+];
const mockBaseEnterpriseOffer = {
usageType: 'Percentage',
@@ -139,7 +147,9 @@ describe('useAllCourseData', () => {
expect(mockCourseService.fetchAllCourseData).toHaveBeenCalled();
expect(mockCourseService.fetchAllCourseRecommendations).toHaveBeenCalled();
- expect(result.current.courseRecommendations).toEqual(camelCaseObject(mockCourseRecommendataions));
+ expect(result.current.courseRecommendations).toEqual(
+ camelCaseObject(mockCourseRecommendataions),
+ );
});
it('returns null if no courseKey or enterpriseConfig is provided', async () => {
@@ -175,7 +185,9 @@ describe('useAllCourseData', () => {
it('handles non 404 errors fetching All course data', async () => {
const mockError = new Error('error');
- mockCourseService.fetchAllCourseData.mockRejectedValueOnce(mockError);
+ mockCourseService.fetchAllCourseData.mockRejectedValueOnce(
+ mockError as never,
+ );
const { result, waitForNextUpdate } = renderHook(() => useAllCourseData({
...basicProps,
}));
@@ -187,7 +199,9 @@ describe('useAllCourseData', () => {
it('handles non 404 errors fetching All course recommendations', async () => {
const mockError = new Error('error');
- mockCourseService.fetchAllCourseRecommendations.mockRejectedValueOnce(mockError);
+ mockCourseService.fetchAllCourseRecommendations.mockRejectedValueOnce(
+ mockError as never,
+ );
const { result, waitForNextUpdate } = renderHook(() => useAllCourseData({
...basicProps,
activeCatalogs: null,
@@ -200,14 +214,18 @@ describe('useAllCourseData', () => {
});
expect(mockCourseService.fetchAllCourseData).toHaveBeenCalled();
- expect(mockCourseService.fetchAllCourseRecommendations).toHaveBeenCalledWith(null);
+ expect(
+ mockCourseService.fetchAllCourseRecommendations,
+ ).toHaveBeenCalledWith(null);
expect(logError).toHaveBeenCalledWith(mockError);
expect(result.current.courseRecommendations).toEqual([]);
});
it('handles non 404 errors fetching user license subsidy', async () => {
const mockError = new Error('error');
- mockCourseService.fetchUserLicenseSubsidy.mockRejectedValueOnce(mockError);
+ mockCourseService.fetchUserLicenseSubsidy.mockRejectedValueOnce(
+ mockError as never,
+ );
const subscriptionLicense = {
uuid: 'license-uuid',
};
@@ -235,6 +253,7 @@ describe('useAllCourseData', () => {
discountValue: mockCouponCodesForCourse[0].benefitValue,
startDate: mockCouponCodesForCourse[0].couponStartDate,
endDate: mockCouponCodesForCourse[0].couponEndDate,
+ code: mockCouponCodesForCourse[0].code,
subsidyType: COUPON_CODE_SUBSIDY_TYPE,
},
});
@@ -273,8 +292,10 @@ describe('useAllCourseData', () => {
userSubsidyApplicableToCourse: {
discountType: mockBaseEnterpriseOffer.usageType.toLowerCase(),
discountValue: mockBaseEnterpriseOffer.discountValue,
- startDate: mockEnterpriseOffersForCourse.globalBookingsLimit.startDatetime,
- endDate: mockEnterpriseOffersForCourse.globalBookingsLimit.endDatetime,
+ startDate:
+ mockEnterpriseOffersForCourse.globalBookingsLimit.startDatetime,
+ endDate:
+ mockEnterpriseOffersForCourse.globalBookingsLimit.endDatetime,
subsidyType: ENTERPRISE_OFFER_SUBSIDY_TYPE,
},
});
@@ -297,7 +318,8 @@ describe('useAllCourseData', () => {
userSubsidyApplicableToCourse: {
discountType: mockBaseEnterpriseOffer.usageType.toLowerCase(),
discountValue: mockBaseEnterpriseOffer.discountValue,
- startDate: mockEnterpriseOffersForCourse.noBookingsLimit.startDatetime,
+ startDate:
+ mockEnterpriseOffersForCourse.noBookingsLimit.startDatetime,
endDate: mockEnterpriseOffersForCourse.noBookingsLimit.endDatetime,
subsidyType: ENTERPRISE_OFFER_SUBSIDY_TYPE,
},
@@ -321,7 +343,8 @@ describe('useAllCourseData', () => {
userSubsidyApplicableToCourse: {
discountType: mockBaseEnterpriseOffer.usageType.toLowerCase(),
discountValue: mockBaseEnterpriseOffer.discountValue,
- startDate: mockEnterpriseOffersForCourse.userBookingsLimit.startDatetime,
+ startDate:
+ mockEnterpriseOffersForCourse.userBookingsLimit.startDatetime,
endDate: mockEnterpriseOffersForCourse.userBookingsLimit.endDatetime,
subsidyType: ENTERPRISE_OFFER_SUBSIDY_TYPE,
},
@@ -337,7 +360,12 @@ describe('useCourseEnrollmentUrl', () => {
couponStartDate: moment().subtract(1, 'w').toISOString(),
couponEndDate: moment().add(8, 'w').toISOString(),
};
+ const enrollmentImputBase = {
+ catalogList: [],
+ userSubsidyApplicableToCourse: {},
+ };
const noLicenseEnrollmentInputs = {
+ ...enrollmentImputBase,
enterpriseConfig: {
uuid: 'foo',
},
@@ -345,10 +373,10 @@ describe('useCourseEnrollmentUrl', () => {
couponCodes: [mockCouponCode],
sku: 'xkcd',
location: { search: 'foo' },
-
};
// just skip the coupon codes here to ensure we process absence correctly
const noCouponCodesEnrollmentInputs = {
+ ...enrollmentImputBase,
enterpriseConfig: {
uuid: 'foo',
},
@@ -363,23 +391,31 @@ describe('useCourseEnrollmentUrl', () => {
subsidyType: LICENSE_SUBSIDY_TYPE,
subsidyId: 'license-uuid',
},
+ key: undefined,
};
describe('subscription license', () => {
test('returns an lms url to DSC for enrollment with a license', () => {
const { result } = renderHook(() => useCourseEnrollmentUrl(withLicenseEnrollmentInputs));
expect(result.current).toContain(process.env.LMS_BASE_URL);
- expect(result.current).toContain(withLicenseEnrollmentInputs.enterpriseConfig.uuid);
+ expect(result.current).toContain(
+ withLicenseEnrollmentInputs.enterpriseConfig.uuid,
+ );
expect(result.current).toContain(withLicenseEnrollmentInputs.key);
- expect(result.current).toContain(withLicenseEnrollmentInputs.userSubsidyApplicableToCourse.subsidyId);
+ expect(result.current).toContain(
+ withLicenseEnrollmentInputs.userSubsidyApplicableToCourse.subsidyId,
+ );
});
test('does not use the license uuid for enrollment if there is no valid license subsidy (even with a license uuid)', () => {
const noSubsidyEnrollmentInputs = { ...withLicenseEnrollmentInputs };
+ // @ts-ignore
delete noSubsidyEnrollmentInputs.userSubsidyApplicableToCourse;
const { result } = renderHook(() => useCourseEnrollmentUrl(noSubsidyEnrollmentInputs));
- expect(result.current).not.toContain(withLicenseEnrollmentInputs.userSubsidyApplicableToCourse.subsidyId);
+ expect(result.current).not.toContain(
+ withLicenseEnrollmentInputs.userSubsidyApplicableToCourse.subsidyId,
+ );
});
});
@@ -394,15 +430,15 @@ describe('useCourseEnrollmentUrl', () => {
}));
expect(result.current).toContain(process.env.ECOMMERCE_BASE_URL);
expect(result.current).toContain(noLicenseEnrollmentInputs.sku);
- expect(result.current).toContain(noLicenseEnrollmentInputs.couponCodes[0].code);
+ expect(result.current).toContain(
+ noLicenseEnrollmentInputs.couponCodes[0].code,
+ );
expect(result.current).toContain(withLicenseEnrollmentInputs.key);
});
test('with no coupon codes returns ecommerce url to add product to basket', () => {
const { result } = renderHook(() => useCourseEnrollmentUrl({
...noLicenseEnrollmentInputs,
- couponCodes: [],
-
}));
expect(result.current).toContain(process.env.ECOMMERCE_BASE_URL);
expect(result.current).toContain(noLicenseEnrollmentInputs.sku);
@@ -432,7 +468,7 @@ describe('useCourseEnrollmentUrl', () => {
const { result } = renderHook(() => useCourseEnrollmentUrl({
...noCouponCodesEnrollmentInputs,
}));
- expect(result.current.includes('failure_url'));
+ expect(result?.current?.includes('failure_url'));
});
});
});
@@ -445,9 +481,13 @@ describe('useUserHasSubsidyRequestForCourse', () => {
subsidyRequestConfiguration: null,
};
const wrapper = ({ children }) => (
- {children}
+
+ {children}
+
);
- const { result } = renderHook(() => useUserHasSubsidyRequestForCourse(), { wrapper });
+ const { result } = renderHook(() => useUserHasSubsidyRequestForCourse(), {
+ wrapper,
+ });
expect(result.current).toBe(false);
});
@@ -460,9 +500,13 @@ describe('useUserHasSubsidyRequestForCourse', () => {
},
};
const wrapper = ({ children }) => (
- {children}
+
+ {children}
+
);
- const { result } = renderHook(() => useUserHasSubsidyRequestForCourse(), { wrapper });
+ const { result } = renderHook(() => useUserHasSubsidyRequestForCourse(), {
+ wrapper,
+ });
expect(result.current).toBe(false);
});
@@ -478,9 +522,13 @@ describe('useUserHasSubsidyRequestForCourse', () => {
},
};
const wrapper = ({ children }) => (
- {children}
+
+ {children}
+
);
- const { result } = renderHook(() => useUserHasSubsidyRequestForCourse(), { wrapper });
+ const { result } = renderHook(() => useUserHasSubsidyRequestForCourse(), {
+ wrapper,
+ });
expect(result.current).toBe(true);
});
@@ -493,13 +541,20 @@ describe('useUserHasSubsidyRequestForCourse', () => {
},
requestsBySubsidyType: {
[SUBSIDY_TYPE.LICENSE]: [],
- [SUBSIDY_TYPE.COUPON]: [{ state: SUBSIDY_REQUEST_STATE.REQUESTED, courseId }],
+ [SUBSIDY_TYPE.COUPON]: [
+ { state: SUBSIDY_REQUEST_STATE.REQUESTED, courseId },
+ ],
},
};
const wrapper = ({ children }) => (
- {children}
+
+ {children}
+
+ );
+ const { result } = renderHook(
+ () => useUserHasSubsidyRequestForCourse(courseId),
+ { wrapper },
);
- const { result } = renderHook(() => useUserHasSubsidyRequestForCourse(courseId), { wrapper });
expect(result.current).toBe(true);
});
@@ -511,33 +566,24 @@ describe('useUserHasSubsidyRequestForCourse', () => {
},
requestsBySubsidyType: {
[SUBSIDY_TYPE.LICENSE]: [],
- [SUBSIDY_TYPE.COUPON]: [{ state: SUBSIDY_REQUEST_STATE.REQUESTED, courseId: 'lorem' }],
+ [SUBSIDY_TYPE.COUPON]: [
+ { state: SUBSIDY_REQUEST_STATE.REQUESTED, courseId: 'lorem' },
+ ],
},
};
const wrapper = ({ children }) => (
- {children}
+
+ {children}
+
+ );
+ const { result } = renderHook(
+ () => useUserHasSubsidyRequestForCourse('ipsum'),
+ { wrapper },
);
- const { result } = renderHook(() => useUserHasSubsidyRequestForCourse('ipsum'), { wrapper });
expect(result.current).toBe(false);
});
});
-describe('useOptimizelyLicenseSubsidyEnrollmentClickHandler', () => {
- const basicProps = {
- courseRunKey: 'courseRunKey',
- href: 'http://example.com',
- };
-
- afterEach(() => jest.clearAllMocks());
-
- it('sends correct optimizely event', () => {
- const pushEventSpy = jest.spyOn(optimizelyUtils, 'pushEvent').mockImplementation(() => true);
- const { result } = renderHook(() => useOptimizelyLicenseSubsidyEnrollmentClickHandler(basicProps));
- result.current({ preventDefault: jest.fn() });
- expect(pushEventSpy).toHaveBeenCalledWith('enterprise_learner_portal_license_subsidy_enrollment_click', { courseKey: 'courseRunKey' });
- });
-});
-
describe('useOptimizelyEnrollmentClickHandler', () => {
const basicProps = {
courseRunKey: 'courseRunKey',
@@ -548,12 +594,22 @@ describe('useOptimizelyEnrollmentClickHandler', () => {
afterEach(() => jest.clearAllMocks());
it('sends correct optimizely event', () => {
- const pushEventSpy = jest.spyOn(optimizelyUtils, 'pushEvent').mockImplementation(() => true);
+ const pushEventSpy = jest
+ .spyOn(optimizelyUtils, 'pushEvent')
+ .mockImplementation(() => true);
const { result } = renderHook(() => useOptimizelyEnrollmentClickHandler(basicProps));
result.current({ preventDefault: jest.fn() });
expect(pushEventSpy).toHaveBeenCalledTimes(2);
- expect(pushEventSpy).toHaveBeenNthCalledWith(1, 'enterprise_learner_portal_enrollment_click', { courseKey: 'courseRunKey' });
- expect(pushEventSpy).toHaveBeenNthCalledWith(2, 'enterprise_learner_portal_first_enrollment_click', { courseKey: 'courseRunKey' });
+ expect(pushEventSpy).toHaveBeenNthCalledWith(
+ 1,
+ 'enterprise_learner_portal_enrollment_click',
+ { courseKey: 'courseRunKey' },
+ );
+ expect(pushEventSpy).toHaveBeenNthCalledWith(
+ 2,
+ 'enterprise_learner_portal_first_enrollment_click',
+ { courseKey: 'courseRunKey' },
+ );
});
});
@@ -566,7 +622,7 @@ describe('useCoursePartners', () => {
{label}
{partners.map((partner) => (
- - {partner}
+ - {partner}
))}