richie-education 3.2.0 → 3.2.1-dev3

package/js/components/SaleTunnel/SaleTunnelInformation/index.tsx

@@ -104,7 +104,7 @@ const Total = () => {
   const { product, offering, enrollment } = useSaleTunnelContext();
   const totalPrice =
     enrollment?.offerings?.[0]?.rules?.discounted_price ??
-    offering?.rules.discounted_price ??
+    offering?.rules?.discounted_price ??
     product.price;
   return (
     <div className="sale-tunnel__total">

package/js/components/SaleTunnel/index.spec.tsx

@@ -496,7 +496,7 @@ describe.each([
       expect($totalAmount).toHaveTextContent(
         'Total' +
           formatPrice(
-            enrollmentDiscounted.offerings[0].rules.discounted_price!,
+            enrollmentDiscounted.offerings[0].rules?.discounted_price!,
             product.price_currency,
           ).replace(/(\u202F|\u00a0)/g, ' '),
       );
@@ -569,7 +569,7 @@ describe.each([
     const $totalAmount = screen.getByTestId('sale-tunnel__total__amount');
     expect($totalAmount).toHaveTextContent(
       'Total' +
-        formatPrice(offering!.rules.discounted_price!, product.price_currency).replace(
+        formatPrice(offering!.rules!.discounted_price!, product.price_currency).replace(
           /(\u202F|\u00a0)/g,
           ' ',
         ),

package/js/types/Joanie.ts

@@ -200,7 +200,7 @@ export interface OfferingRule {
 
 export interface Offering extends OfferingLight {
   is_withdrawable: boolean;
-  rules: OfferingRule;
+  rules?: OfferingRule;
 }
 export function isOffering(
   entity: CourseListItem | OfferingLight | RichieCourse,

package/js/widgets/SyllabusCourseRunsList/components/CourseProductItem/CourseProductItemFooter/index.tsx

@@ -33,7 +33,7 @@ const CourseProductItemFooter = ({
   offering,
   canPurchase,
 }: CourseProductItemFooterProps) => {
-  if (!offering.rules.has_seats_left)
+  if (!offering?.rules?.has_seats_left)
     return (
       <p className="product-widget__footer__message">
         <FormattedMessage {...messages.noSeatsAvailable} />
@@ -50,7 +50,7 @@ const CourseProductItemFooter = ({
         disabled={!canPurchase}
         buttonProps={{ fullWidth: true }}
       />
-      {offering.rules.has_seat_limit && (
+      {offering?.rules?.has_seat_limit && (
         <p className="product-widget__footer__message">
           <FormattedMessage
             {...messages.nbSeatsAvailable}

package/js/widgets/SyllabusCourseRunsList/components/CourseProductItem/index.spec.tsx

@@ -194,7 +194,7 @@ describe('CourseProductItem', () => {
     const discountedPriceLabel = screen.getByText('Discounted price:');
     expect(discountedPriceLabel.classList.contains('offscreen')).toBe(true);
     const discountedPrice = screen.getByText(
-      priceFormatter(product.price_currency, offering.rules.discounted_price!).replace(
+      priceFormatter(product.price_currency, offering.rules!.discounted_price!).replace(
         /(\u202F|\u00a0)/g,
         ' ',
       ),
@@ -257,7 +257,7 @@ describe('CourseProductItem', () => {
     const discountedPriceLabel = screen.getByText('Discounted price:');
     expect(discountedPriceLabel.classList.contains('offscreen')).toBe(true);
     const discountedPrice = screen.getByText(
-      priceFormatter(product.price_currency, offering.rules.discounted_price!).replace(
+      priceFormatter(product.price_currency, offering.rules!.discounted_price!).replace(
         /(\u202F|\u00a0)/g,
         ' ',
       ),
@@ -838,4 +838,39 @@ describe('CourseProductItem', () => {
     expect(screen.queryByRole('button', { name: product.call_to_action })).not.toBeInTheDocument();
     screen.getByText('Sorry, no seats available for now');
   });
+
+  it('renders product information without rules in offering', async () => {
+    const offering = OfferingFactory({
+      product: CredentialProductFactory({
+        price: 840,
+        price_currency: 'EUR',
+      }).one(),
+      rules: undefined,
+    }).one();
+    const { product } = offering;
+    fetchMock.get(
+      `https://joanie.endpoint/api/v1.0/courses/00000/products/${product.id}/`,
+      offering,
+    );
+
+    render(
+      <CourseProductItem
+        course={PacedCourseFactory({ code: '00000' }).one()}
+        productId={product.id}
+      />,
+      { queryOptions: { client: createTestQueryClient({ user: null }) } },
+    );
+
+    // Wait for product information to be fetched
+    await screen.findByRole('heading', { level: 3, name: product.title });
+
+    // Expect to render the component without rules information
+    expect(
+      screen.getByText(
+        priceFormatter(product.price_currency, product.price).replace(/(\u202F|\u00a0)/g, ' '),
+      ),
+    ).toBeInTheDocument();
+    expect(document.querySelector('.product-widget__price-discounted')).not.toBeInTheDocument();
+    expect(screen.getByText('Sorry, no seats available for now')).toBeInTheDocument();
+  });
 });

package/js/widgets/SyllabusCourseRunsList/components/CourseProductItem/index.tsx

@@ -103,7 +103,7 @@ const Header = ({ product, order, offering, hasPurchased, canPurchase, compact }
       return null;
     }
 
-    if (offering.rules.discounted_price != null) {
+    if (offering?.rules?.discounted_price != null) {
       return (
         <>
           <span id="original-price" className="offscreen">
@@ -133,7 +133,7 @@ const Header = ({ product, order, offering, hasPurchased, canPurchase, compact }
     return (
       <FormattedNumber currency={product.price_currency} value={product.price} style="currency" />
     );
-  }, [canPurchase, offering.rules.discounted_price, product.price]);
+  }, [canPurchase, offering?.rules?.discounted_price, product.price]);
 
   return (
     <header className="product-widget__header">
@@ -144,10 +144,10 @@ const Header = ({ product, order, offering, hasPurchased, canPurchase, compact }
         {hasPurchased && <FormattedMessage {...messages.purchased} />}
         {displayPrice}
       </strong>
-      {offering?.rules.description && (
+      {offering?.rules?.description && (
         <p className="product-widget__header-description">{offering.rules.description}</p>
       )}
-      {offering?.rules.discounted_price && (
+      {offering?.rules?.discounted_price && (
         <p className="product-widget__header-discount">
           {offering.rules.discount_rate ? (
             <span className="product-widget__header-discount-rate">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "richie-education",
-  "version": "3.2.0",
+  "version": "3.2.1-dev3",
   "description": "A CMS to build learning portals for Open Education",
   "main": "sandbox/manage.py",
   "scripts": {