Merge branch 'master' of https://github.com/openedx/frontend-app-lear…

…ner-portal-enterprise into bilalqamar95/jest-v29-upgrade

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+    # Adding new check for github-actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+        interval: "weekly"

.github/workflows/ci.yml

@@ -9,17 +9,14 @@ concurrency:
 jobs:
   tests:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node: [18, 20]
 
     steps:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Setup Nodejs
       uses: actions/setup-node@v4
       with:
-        node-version: ${{ matrix.node }}
+        node-version-file: '.nvmrc'
     - name: Install dependencies
       run: npm ci
     - name: Lint

package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "@edx/brand": "npm:@openedx/[email protected]",
     "@edx/frontend-component-footer": "14.0.1",
-    "@edx/frontend-enterprise-catalog-search": "10.6.0",
+    "@edx/frontend-enterprise-catalog-search": "10.7.1",
     "@edx/frontend-enterprise-hotjar": "7.1.0",
     "@edx/frontend-enterprise-logistration": "9.1.0",
     "@edx/frontend-enterprise-utils": "9.1.0",

src/components/app/data/constants.js

@@ -52,7 +52,7 @@ export const ENTERPRISE_OFFER_SUBSIDY_TYPE = 'enterpriseOffer';
 export const LEARNER_CREDIT_SUBSIDY_TYPE = 'learnerCredit';
 
 export const ENROLL_BY_DATE_WARNING_THRESHOLD_DAYS = 10;
-export const MAX_HIGHLIGHT_SETS = 12;
+export const MAX_HIGHLIGHT_SETS = 16;
 
 // Note: `cancelled` is correct and matches backend state
 // despite how the key is spelled
@@ -64,3 +64,6 @@ export const ASSIGNMENT_TYPES = {
   ERRORED: 'errored',
   EXPIRING: 'expiring',
 };
+
+// When the start date is before this number of days before today, display the alternate start date (fixed to today).
+export const START_DATE_DEFAULT_TO_TODAY_THRESHOLD_DAYS = 14;

src/components/app/data/hooks/useCourseMetadata.js

@@ -3,7 +3,7 @@ import { useParams, useSearchParams } from 'react-router-dom';
 
 import { queryCourseMetadata } from '../queries';
 import {
-  determineAllocatedCourseRunAssignmentsForCourse,
+  determineAllocatedAssignmentsForCourse,
   getAvailableCourseRuns,
   transformCourseMetadataByAllocatedCourseRunAssignments,
 } from '../utils';
@@ -23,10 +23,7 @@ export default function useCourseMetadata(queryOptions = {}) {
     allocatedCourseRunAssignmentKeys,
     hasAssignedCourseRuns,
     hasMultipleAssignedCourseRuns,
-  } = determineAllocatedCourseRunAssignmentsForCourse({
-    courseKey,
-    redeemableLearnerCreditPolicies,
-  });
+  } = determineAllocatedAssignmentsForCourse({ courseKey, redeemableLearnerCreditPolicies });
   // `requestUrl.searchParams` uses `URLSearchParams`, which decodes `+` as a space, so we
   // need to replace it with `+` again to be a valid course run key.
   let courseRunKey = searchParams.get('course_run_key')?.replaceAll(' ', '+');

src/components/app/data/hooks/useEnterpriseCourseEnrollments.js

@@ -73,7 +73,7 @@ export default function useEnterpriseCourseEnrollments(queryOptions = {}) {
     },
     enabled: isEnabled,
   });
-
+  // TODO: Talk about how we don't have access to weeksToComplete on the dashboard page.
   const allEnrollmentsByStatus = useMemo(() => transformAllEnrollmentsByStatus({
     enterpriseCourseEnrollments,
     requests,

src/components/app/data/hooks/useEnterpriseFeatures.test.jsx

@@ -18,9 +18,6 @@ const mockEnterpriseLearnerData = {
   activeEnterpriseCustomer: null,
   activeEnterpriseCustomerUserRoleAssignments: [],
   allLinkedEnterpriseCustomerUsers: [],
-  enterpriseFeatures: {
-    featurePrequerySearchSuggestions: true,
-  },
   staffEnterpriseCustomer: null,
 };
 const mockEnterpriseFeatures = mockEnterpriseLearnerData.enterpriseFeatures;

src/components/app/data/utils.js

@@ -317,7 +317,6 @@ export const canUnenrollCourseEnrollment = (courseEnrollment) => {
  */
 export const transformCourseEnrollment = (rawCourseEnrollment) => {
   const courseEnrollment = { ...rawCourseEnrollment };
-
   // Return the fields expected by the component(s)
   courseEnrollment.title = courseEnrollment.displayName;
   courseEnrollment.microMastersTitle = courseEnrollment.micromastersTitle;
@@ -409,7 +408,6 @@ export const transformLearnerContentAssignment = (learnerContentAssignment, ente
     courseKey = parentContentKey;
     courseRunId = contentKey;
   }
-
   return {
     linkToCourse: `/${enterpriseSlug}/course/${courseKey}`,
     courseRunId,
@@ -510,7 +508,6 @@ export function getAvailableCourseRuns({ course, lateEnrollmentBufferDays }) {
   if (!course?.courseRuns) {
     return [];
   }
-
   // These are the standard rules used for determining whether a run is "available".
   const standardAvailableCourseRunsFilter = (courseRun) => (
     courseRun.isMarketable && !isArchived(courseRun) && courseRun.isEnrollable
@@ -806,27 +803,45 @@ export function isEnrollmentUpgradeable(enrollment) {
  *   }
  * }
  */
-export function determineAllocatedCourseRunAssignmentsForCourse({
+export function determineAllocatedAssignmentsForCourse({
   redeemableLearnerCreditPolicies,
   courseKey,
 }) {
   const { learnerContentAssignments } = redeemableLearnerCreditPolicies;
   // note: checking the non-happy path first, with early return so happy path code isn't nested in conditional.
   if (!learnerContentAssignments.hasAllocatedAssignments) {
     return {
+      isCourseAssigned: false,
+      allocatedAssignmentsForCourse: [],
       allocatedCourseRunAssignmentKeys: [],
       allocatedCourseRunAssignments: [],
       hasAssignedCourseRuns: false,
       hasMultipleAssignedCourseRuns: false,
     };
   }
-  const allocatedCourseRunAssignments = learnerContentAssignments.allocatedAssignments.filter((assignment) => (
-    assignment.isAssignedCourseRun && assignment.parentContentKey === courseKey
-  ));
+
+  const allocatedAssignmentsForCourse = [];
+  const allocatedCourseRunAssignments = [];
+
+  learnerContentAssignments.allocatedAssignments.forEach((assignment) => {
+    const isCourseRunAssignment = assignment.isAssignedCourseRun && assignment.parentContentKey === courseKey;
+    const isCourseAssignment = !assignment.isAssignedCourseRun && assignment.contentKey === courseKey;
+    if (isCourseRunAssignment || isCourseAssignment) {
+      allocatedAssignmentsForCourse.push(assignment);
+    }
+    if (isCourseRunAssignment) {
+      allocatedCourseRunAssignments.push(assignment);
+    }
+  });
+
+  const isCourseAssigned = allocatedAssignmentsForCourse.length > 0;
   const allocatedCourseRunAssignmentKeys = allocatedCourseRunAssignments.map(assignment => assignment.contentKey);
   const hasAssignedCourseRuns = allocatedCourseRunAssignmentKeys.length > 0;
   const hasMultipleAssignedCourseRuns = allocatedCourseRunAssignmentKeys.length > 1;
+
   return {
+    isCourseAssigned,
+    allocatedAssignmentsForCourse,
     allocatedCourseRunAssignmentKeys,
     allocatedCourseRunAssignments,
     hasAssignedCourseRuns,
@@ -861,7 +876,7 @@ export function transformCourseMetadataByAllocatedCourseRunAssignments({
       courseRuns: courseMetadata.courseRuns.filter(
         courseRun => allocatedCourseRunAssignmentKeys.includes(courseRun.key),
       ),
-      availableCourseRuns: courseMetadata.courseRuns.filter(
+      availableCourseRuns: courseMetadata.availableCourseRuns.filter(
         courseRun => allocatedCourseRunAssignmentKeys.includes(courseRun.key),
       ),
     };

src/components/course/CourseSidebarPrice.jsx

@@ -20,7 +20,7 @@ const CourseSidebarPrice = () => {
   const intl = useIntl();
   const { data: enterpriseCustomer } = useEnterpriseCustomer();
   const { coursePrice, currency } = useCoursePrice();
-  const isCourseAssigned = useIsCourseAssigned();
+  const { isCourseAssigned } = useIsCourseAssigned();
   const canRequestSubsidy = useCanUserRequestSubsidyForCourse();
   const { userSubsidyApplicableToCourse } = useUserSubsidyApplicableToCourse();