fix: bugs related to variant release (#1307)

openedx · Sep 18, 2024 · 6c82806 · 6c82806
1 parent 9ce37c3
commit 6c82806
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 31 deletions.
diff --git a/...nents/learner-credit-management/assignment-modal/AssignmentAllocationHelpCollapsibles.jsx b/...nents/learner-credit-management/assignment-modal/AssignmentAllocationHelpCollapsibles.jsx
@@ -5,14 +5,11 @@ import { sendEnterpriseTrackEvent } from '@edx/frontend-enterprise-utils';
 import React from 'react';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 import dayjs from 'dayjs';
-import { ASSIGNMENT_ENROLLMENT_DEADLINE, DATETIME_FORMAT, getNormalizedEnrollByDate } from '../data';
+import { ASSIGNMENT_ENROLLMENT_DEADLINE, DATETIME_FORMAT } from '../data';
 import EVENT_NAMES from '../../../eventTracking';
 
 const AssignmentAllocationHelpCollapsibles = ({ enterpriseId, courseRun }) => {
-  const normalizedEnrollByDate = getNormalizedEnrollByDate(courseRun);
-  const enrollByDate = normalizedEnrollByDate
-    ? dayjs(normalizedEnrollByDate).format(DATETIME_FORMAT)
-    : null;
+  const enrollByDate = dayjs(courseRun.enrollBy).format(DATETIME_FORMAT);
   return (
     <Stack gap={1}>
       <Collapsible

diff --git a/src/components/learner-credit-management/assignment-modal/AssignmentModalContent.jsx b/src/components/learner-credit-management/assignment-modal/AssignmentModalContent.jsx
@@ -27,8 +27,7 @@ const AssignmentModalContent = ({
   const [emailAddressesInputValue, setEmailAddressesInputValue] = useState('');
   const [assignmentAllocationMetadata, setAssignmentAllocationMetadata] = useState({});
   const intl = useIntl();
-  // TODO: as part of fixed price, this would need to extract the contentPrice from courseRun, ENT-9394
-  const { contentPrice } = course.normalizedMetadata;
+  const { contentPrice } = courseRun;
   const handleEmailAddressInputChange = (e) => {
     const inputValue = e.target.value;
     setEmailAddressesInputValue(inputValue);
@@ -143,7 +142,7 @@ const AssignmentModalContent = ({
               />
             </h4>
             <AssignmentModalSummary
-              course={course}
+              courseRun={courseRun}
               learnerEmails={learnerEmails}
               assignmentAllocationMetadata={assignmentAllocationMetadata}
             />
@@ -207,6 +206,7 @@ AssignmentModalContent.propTypes = {
   courseRun: PropTypes.shape({
     enrollBy: PropTypes.string,
     start: PropTypes.string,
+    contentPrice: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   }).isRequired,
   onEmailAddressesChange: PropTypes.func.isRequired,
 };

diff --git a/src/components/learner-credit-management/assignment-modal/AssignmentModalSummary.jsx b/src/components/learner-credit-management/assignment-modal/AssignmentModalSummary.jsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { Card, Stack, Icon } from '@openedx/paragon';
+import { Card, Icon, Stack } from '@openedx/paragon';
 import { Error } from '@openedx/paragon/icons';
 
-import { useIntl, FormattedMessage } from '@edx/frontend-platform/i18n';
+import { FormattedMessage, useIntl } from '@edx/frontend-platform/i18n';
 import { formatPrice } from '../data';
 import AssignmentModalSummaryEmptyState from './AssignmentModalSummaryEmptyState';
 import AssignmentModalSummaryLearnerList from './AssignmentModalSummaryLearnerList';
@@ -13,13 +13,13 @@ import AssignmentModalSummaryErrorState from './AssignmentModalSummaryErrorState
 const AssignmentModalSummaryContents = ({
   hasLearnerEmails,
   learnerEmails,
-  course,
+  courseRun,
   hasInputValidationError,
 }) => {
   if (hasLearnerEmails) {
     return (
       <AssignmentModalSummaryLearnerList
-        course={course}
+        courseRun={courseRun}
         learnerEmails={learnerEmails}
       />
     );
@@ -31,7 +31,7 @@ const AssignmentModalSummaryContents = ({
 };
 
 const AssignmentModalSummary = ({
-  course,
+  courseRun,
   learnerEmails,
   assignmentAllocationMetadata,
 }) => {
@@ -66,7 +66,7 @@ const AssignmentModalSummary = ({
             <AssignmentModalSummaryContents
               learnerEmails={learnerEmails}
               hasLearnerEmails={hasLearnerEmails}
-              course={course}
+              courseRun={courseRun}
               hasInputValidationError={!isValidInput}
             />
           </Card.Section>
@@ -103,12 +103,16 @@ const AssignmentModalSummary = ({
 AssignmentModalSummaryContents.propTypes = {
   hasLearnerEmails: PropTypes.bool.isRequired,
   learnerEmails: PropTypes.arrayOf(PropTypes.string).isRequired,
-  course: PropTypes.shape().isRequired, // pass-thru prop to child component(s)
+  courseRun: PropTypes.shape({
+    contentPrice: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  }).isRequired, // pass-thru prop to child component(s)
   hasInputValidationError: PropTypes.bool.isRequired,
 };
 
 AssignmentModalSummary.propTypes = {
-  course: PropTypes.shape().isRequired, // pass-thru prop to child component(s)
+  courseRun: PropTypes.shape({
+    contentPrice: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  }).isRequired, // pass-thru prop to child component(s)
   learnerEmails: PropTypes.arrayOf(PropTypes.string).isRequired,
   assignmentAllocationMetadata: PropTypes.shape({
     isValidInput: PropTypes.bool,

diff --git a/...mponents/learner-credit-management/assignment-modal/AssignmentModalSummaryLearnerList.jsx b/...mponents/learner-credit-management/assignment-modal/AssignmentModalSummaryLearnerList.jsx
@@ -1,16 +1,15 @@
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import { v4 as uuidv4 } from 'uuid';
-import {
-  Button, Stack, Icon,
-} from '@openedx/paragon';
+import { Button, Icon, Stack } from '@openedx/paragon';
 import { Person } from '@openedx/paragon/icons';
 import { useIntl } from '@edx/frontend-platform/i18n';
 
-import { MAX_INITIAL_LEARNER_EMAILS_DISPLAYED_COUNT, hasLearnerEmailsSummaryListTruncation } from '../cards/data';
+import { hasLearnerEmailsSummaryListTruncation, MAX_INITIAL_LEARNER_EMAILS_DISPLAYED_COUNT } from '../cards/data';
+import { formatPrice } from '../data';
 
 const AssignmentModalSummaryLearnerList = ({
-  course,
+  courseRun,
   learnerEmails,
 }) => {
   const [isTruncated, setIsTruncated] = useState(hasLearnerEmailsSummaryListTruncation(learnerEmails));
@@ -53,7 +52,7 @@ const AssignmentModalSummaryLearnerList = ({
                 </Stack>
               </div>
               <span className="ml-auto">
-                {course.formattedPrice}
+                {formatPrice(courseRun.contentPrice)}
               </span>
             </div>
           </li>
@@ -74,8 +73,8 @@ const AssignmentModalSummaryLearnerList = ({
 };
 
 AssignmentModalSummaryLearnerList.propTypes = {
-  course: PropTypes.shape({
-    formattedPrice: PropTypes.string.isRequired,
+  courseRun: PropTypes.shape({
+    contentPrice: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   }).isRequired,
   learnerEmails: PropTypes.arrayOf(PropTypes.string).isRequired,
 };

diff --git a/src/components/learner-credit-management/data/utils.js b/src/components/learner-credit-management/data/utils.js
@@ -655,19 +655,19 @@ export const getAssignableCourseRuns = ({ courseRuns, subsidyExpirationDatetime,
     upgradeDeadline: dayjs.unix(courseRun.upgradeDeadline).toISOString(),
   }));
   const assignableCourseRunsFilter = ({
-    enrollBy, isActive, hasEnrollBy = false, isLateEnrollmentEligible = false,
+    enrollBy, isActive, hasEnrollBy, isLateEnrollmentEligible,
   }) => {
     let isEligibleForEnrollment = true;
     if (hasEnrollBy) {
       isEligibleForEnrollment = dayjs(enrollBy).isBefore(
         minimumEnrollByDateFromToday({ subsidyExpirationDatetime }),
       );
-    }
-    // Late redemption filter
-    if (isDateBeforeToday(enrollBy) && isLateRedemptionAllowed) {
-      const lateEnrollmentCutoff = dayjs().subtract(LATE_ENROLLMENTS_BUFFER_DAYS, 'days');
-      isEligibleForEnrollment = dayjs(enrollBy).isAfter(lateEnrollmentCutoff);
-      return isLateEnrollmentEligible && isEligibleForEnrollment;
+      // Late redemption filter
+      if (isDateBeforeToday(enrollBy) && isLateRedemptionAllowed) {
+        const lateEnrollmentCutoff = dayjs().subtract(LATE_ENROLLMENTS_BUFFER_DAYS, 'days');
+        isEligibleForEnrollment = dayjs(enrollBy).isAfter(lateEnrollmentCutoff);
+        return isLateEnrollmentEligible && isEligibleForEnrollment;
+      }
     }
     // General courseware filter
     return isActive && isEligibleForEnrollment;