richie-education 3.1.3-dev12 → 3.1.3-dev17

package/js/widgets/Dashboard/components/DashboardSidebar/components/ContractNavLink/index.tsx

@@ -1,7 +1,7 @@
 import { createSearchParams } from 'react-router';
 import { useMemo } from 'react';
 import { MenuLink } from 'widgets/Dashboard/components/DashboardSidebar';
-import { ContractState, Offer, Organization } from 'types/Joanie';
+import { ContractState, Offering, Organization } from 'types/Joanie';
 import useTeacherPendingContractsCount from 'hooks/useTeacherPendingContractsCount';
 import { ContractActions } from 'utils/AbilitiesHelper/types';
 import useContractAbilities from 'hooks/useContractAbilities';
@@ -11,14 +11,14 @@ import MenuNavLink from '../MenuNavLink';
 interface ContractNavLinkProps {
   link: MenuLink;
   organizationId?: Organization['id'];
-  offerId?: Offer['id'];
+  offeringId?: Offering['id'];
 }
 
-const ContractNavLink = ({ link, organizationId, offerId }: ContractNavLinkProps) => {
+const ContractNavLink = ({ link, organizationId, offeringId }: ContractNavLinkProps) => {
   const defaultOrganizationId = useDefaultOrganizationId();
   const { contracts: pendingContracts, pendingContractCount } = useTeacherPendingContractsCount({
     organizationId: organizationId || defaultOrganizationId,
-    offerId,
+    offeringId,
   });
   const contractAbilities = useContractAbilities(pendingContracts);
   const canSignContracts = contractAbilities.can(ContractActions.SIGN);

package/js/widgets/Dashboard/components/TeacherDashboardCourseSidebar/index.spec.tsx

@@ -4,7 +4,7 @@ import { createIntl } from 'react-intl';
 import { generatePath } from 'react-router';
 import { CourseListItem } from 'types/Joanie';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
-import { CourseFactory, OfferFactory, OrganizationFactory } from 'utils/test/factories/joanie';
+import { CourseFactory, OfferingFactory, OrganizationFactory } from 'utils/test/factories/joanie';
 import { expectNoSpinner } from 'utils/test/expectSpinner';
 import { render } from 'utils/test/render';
 import { setupJoanieSession } from 'utils/test/wrappers/JoanieAppWrapper';
@@ -61,14 +61,14 @@ describe('<TeacherDashboardCourseSidebar/>', () => {
       label: 'course',
       course: CourseFactory().one(),
       organization: undefined,
-      offer: undefined,
+      offering: undefined,
       expectedRoutes: [TeacherDashboardPaths.COURSE_GENERAL_INFORMATION],
     },
     {
       label: 'training',
       course: CourseFactory().one(),
       organization: undefined,
-      offer: OfferFactory().one(),
+      offering: OfferingFactory().one(),
       expectedRoutes: [
         TeacherDashboardPaths.COURSE_PRODUCT,
         TeacherDashboardPaths.COURSE_PRODUCT_CONTRACTS,
@@ -79,14 +79,14 @@ describe('<TeacherDashboardCourseSidebar/>', () => {
       label: "organization's course",
       course: CourseFactory().one(),
       organization: OrganizationFactory().one(),
-      offer: undefined,
+      offering: undefined,
       expectedRoutes: [TeacherDashboardPaths.ORGANIZATION_COURSE_GENERAL_INFORMATION],
     },
     {
       label: "organization's training",
       course: CourseFactory().one(),
       organization: OrganizationFactory().one(),
-      offer: OfferFactory().one(),
+      offering: OfferingFactory().one(),
       expectedRoutes: [
         TeacherDashboardPaths.ORGANIZATION_PRODUCT,
         TeacherDashboardPaths.ORGANIZATION_PRODUCT_CONTRACTS,
@@ -95,20 +95,20 @@ describe('<TeacherDashboardCourseSidebar/>', () => {
     },
   ])(
     'should display menu items for "$label" route',
-    async ({ course, organization, offer, expectedRoutes }) => {
+    async ({ course, organization, offering, expectedRoutes }) => {
       // mock api for organization's training
-      if (organization && offer) {
+      if (organization && offering) {
         // fetching training's contracts
         nbApiRequest += 1;
         fetchMock.get(
-          `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/contracts/?offer_id=${offer.id}&signature_state=half_signed&page=1&page_size=25`,
+          `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/contracts/?offering_id=${offering.id}&signature_state=half_signed&page=1&page_size=25`,
           [],
         );
         // fetching organization's training
         nbApiRequest += 1;
         fetchMock.get(
-          `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/offers/${offer.id}/`,
-          offer,
+          `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/offerings/${offering.id}/`,
+          offering,
         );
       } else if (organization) {
         // fetching organization's course
@@ -117,12 +117,15 @@ describe('<TeacherDashboardCourseSidebar/>', () => {
           `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/courses/${course.id}/`,
           course,
         );
-      } else if (offer) {
+      } else if (offering) {
         // fetching training
         nbApiRequest += 1;
-        fetchMock.get(`https://joanie.endpoint/api/v1.0/offers/${offer.id}/`, offer);
+        fetchMock.get(`https://joanie.endpoint/api/v1.0/offerings/${offering.id}/`, offering);
         nbApiRequest += 1;
-        fetchMock.get(`https://joanie.endpoint/api/v1.0/organizations/?offer_id=${offer.id}`, []);
+        fetchMock.get(
+          `https://joanie.endpoint/api/v1.0/organizations/?offering_id=${offering.id}`,
+          [],
+        );
       } else {
         // mock api for course
         nbApiRequest += 1;
@@ -132,9 +135,9 @@ describe('<TeacherDashboardCourseSidebar/>', () => {
       let routePath = '/:courseId';
       let initialEntry = `/${course.id}`;
 
-      if (offer) {
-        routePath += '/:offerId';
-        initialEntry += `/${offer.id}`;
+      if (offering) {
+        routePath += '/:offeringId';
+        initialEntry += `/${offering.id}`;
       }
       if (organization) {
         routePath = '/:organizationId' + routePath;
@@ -158,7 +161,7 @@ describe('<TeacherDashboardCourseSidebar/>', () => {
           generatePath(expectedRoute, {
             organizationId: organization ? organization.id : null,
             courseId: course.id,
-            offerId: offer ? offer.id : null,
+            offeringId: offering ? offering.id : null,
           }),
         );
       });

package/js/widgets/Dashboard/components/TeacherDashboardCourseSidebar/index.tsx

@@ -2,7 +2,7 @@ import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 import { generatePath, useParams } from 'react-router';
 import { useMemo } from 'react';
 import { capitalize } from 'lodash-es';
-import { useOffer } from 'hooks/useOffer';
+import { useOffering } from 'hooks/useOffering';
 import { DashboardSidebar, MenuLink } from 'widgets/Dashboard/components/DashboardSidebar';
 import { getDashboardRouteLabel } from 'widgets/Dashboard/utils/dashboardRoutes';
 import { useCourse } from 'hooks/useCourses';
@@ -41,11 +41,11 @@ export const TeacherDashboardCourseSidebar = () => {
   const {
     organizationId: routeOrganizationId,
     courseId: routeCourseId,
-    offerId: routeofferId = '',
+    offeringId: routeOfferingId = '',
   } = useParams<{
     organizationId?: string;
     courseId: string;
-    offerId: string;
+    offeringId: string;
   }>();
 
   const {
@@ -54,29 +54,35 @@ export const TeacherDashboardCourseSidebar = () => {
   } = useCourse(
     routeCourseId,
     { organization_id: routeOrganizationId },
-    { enabled: !routeofferId },
+    { enabled: !routeOfferingId },
   );
 
   const {
-    item: offer,
-    states: { fetching: offerFetching },
-  } = useOffer(
-    routeofferId,
+    item: offering,
+    states: { fetching: offeringFetching },
+  } = useOffering(
+    routeOfferingId,
     {
       organization_id: routeOrganizationId,
     },
-    { enabled: !!routeofferId },
+    { enabled: !!routeOfferingId },
   );
 
-  const fetching = useMemo(() => courseFetching || offerFetching, [courseFetching, offerFetching]);
-  const product = useMemo(() => (offer ? offer.product : undefined), [offer]);
-  const course = useMemo(() => (offer ? offer.course : singleCourse), [offer, singleCourse]);
+  const fetching = useMemo(
+    () => courseFetching || offeringFetching,
+    [courseFetching, offeringFetching],
+  );
+  const product = useMemo(() => (offering ? offering.product : undefined), [offering]);
+  const course = useMemo(
+    () => (offering ? offering.course : singleCourse),
+    [offering, singleCourse],
+  );
 
   const getMenuLinkFromPath = (basePath: TeacherDashboardPaths) => {
     const path = generatePath(basePath, {
       organizationId: routeOrganizationId ?? '',
       courseId: routeCourseId ?? '',
-      offerId: routeofferId ?? '',
+      offeringId: routeOfferingId ?? '',
     });
     const menuLink: MenuLink = {
       to: path,
@@ -93,7 +99,7 @@ export const TeacherDashboardCourseSidebar = () => {
         <ContractNavLink
           link={menuLink}
           organizationId={routeOrganizationId}
-          offerId={routeofferId}
+          offeringId={routeOfferingId}
         />
       );
     }
@@ -103,10 +109,10 @@ export const TeacherDashboardCourseSidebar = () => {
   const menuLinkList = useMemo(
     () =>
       getMenuRoutes({
-        offerId: routeofferId,
+        offeringId: routeOfferingId,
         organizationId: routeOrganizationId,
       }).map(getMenuLinkFromPath),
-    [routeOrganizationId, routeofferId],
+    [routeOrganizationId, routeOfferingId],
   );
 
   return (

package/js/widgets/Dashboard/components/TeacherDashboardCourseSidebar/utils.ts

@@ -1,13 +1,13 @@
 import { TeacherDashboardPaths } from 'widgets/Dashboard/utils/teacherDashboardPaths';
 
 interface GetMenuRoutesArgs {
-  offerId?: string;
+  offeringId?: string;
   organizationId?: string;
 }
 
-export const getMenuRoutes = ({ offerId, organizationId }: GetMenuRoutesArgs) => {
+export const getMenuRoutes = ({ offeringId, organizationId }: GetMenuRoutesArgs) => {
   if (organizationId) {
-    if (offerId) {
+    if (offeringId) {
       return [
         TeacherDashboardPaths.ORGANIZATION_PRODUCT,
         TeacherDashboardPaths.ORGANIZATION_PRODUCT_CONTRACTS,
@@ -17,7 +17,7 @@ export const getMenuRoutes = ({ offerId, organizationId }: GetMenuRoutesArgs) =>
     return [TeacherDashboardPaths.ORGANIZATION_COURSE_GENERAL_INFORMATION];
   }
 
-  if (offerId) {
+  if (offeringId) {
     return [
       TeacherDashboardPaths.COURSE_PRODUCT,
       TeacherDashboardPaths.COURSE_PRODUCT_CONTRACTS,

package/js/widgets/Dashboard/components/TeacherDashboardOrganizationSidebar/index.tsx

@@ -24,9 +24,9 @@ const messages = defineMessages({
 export const TeacherDashboardOrganizationSidebar = () => {
   const intl = useIntl();
   const getRouteLabel = getDashboardRouteLabel(intl);
-  const { organizationId, offerId } = useParams<{
+  const { organizationId, offeringId } = useParams<{
     organizationId: string;
-    offerId?: string;
+    offeringId?: string;
   }>();
   const {
     item: organization,
@@ -43,7 +43,7 @@ export const TeacherDashboardOrganizationSidebar = () => {
 
     if (basePath === TeacherDashboardPaths.ORGANIZATION_CONTRACTS) {
       menuLink.component = (
-        <ContractNavLink link={menuLink} organizationId={organizationId} offerId={offerId} />
+        <ContractNavLink link={menuLink} organizationId={organizationId} offeringId={offeringId} />
       );
     }
 

package/js/widgets/Dashboard/utils/teacherDashboardPaths.tsx

@@ -9,14 +9,14 @@ export enum TeacherDashboardPaths {
   ORGANIZATION = `${ROOT}/organizations/:organizationId`,
   ORGANIZATION_CONTRACTS = `${ORGANIZATION}/contracts`,
   ORGANIZATION_COURSES = `${ORGANIZATION}/courses`,
-  ORGANIZATION_PRODUCT = `${ORGANIZATION_COURSES}/:courseId/products/:offerId`,
+  ORGANIZATION_PRODUCT = `${ORGANIZATION_COURSES}/:courseId/products/:offeringId`,
   ORGANIZATION_COURSE_CONTRACTS = `${ORGANIZATION_COURSES}/:courseId/contracts`,
-  ORGANIZATION_PRODUCT_CONTRACTS = `${ORGANIZATION_COURSES}/:courseId/products/:offerId/contracts`,
-  ORGANIZATION_COURSE_PRODUCT_LEARNER_LIST = `${ORGANIZATION_COURSES}/:courseId/products/:offerId/learners`,
+  ORGANIZATION_PRODUCT_CONTRACTS = `${ORGANIZATION_COURSES}/:courseId/products/:offeringId/contracts`,
+  ORGANIZATION_COURSE_PRODUCT_LEARNER_LIST = `${ORGANIZATION_COURSES}/:courseId/products/:offeringId/learners`,
   ORGANIZATION_COURSE_GENERAL_INFORMATION = `${ORGANIZATION_COURSES}/:courseId/information`,
   COURSE = `${TEACHER_COURSES}/:courseId`,
   COURSE_GENERAL_INFORMATION = `${COURSE}/information`,
-  COURSE_PRODUCT = `${COURSE}/products/:offerId`,
+  COURSE_PRODUCT = `${COURSE}/products/:offeringId`,
   COURSE_PRODUCT_LEARNER_LIST = `${COURSE_PRODUCT}/learners`,
   COURSE_PRODUCT_CONTRACTS = `${COURSE_PRODUCT}/contracts`,
 }

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

@@ -1,6 +1,6 @@
 import { FormattedMessage, defineMessages } from 'react-intl';
 import PurchaseButton from 'components/PurchaseButton';
-import { Offer, CredentialProduct } from 'types/Joanie';
+import { Offering, CredentialProduct } from 'types/Joanie';
 import { PacedCourse } from 'types';
 
 const messages = defineMessages({
@@ -24,16 +24,16 @@ other {# remaining seats}
 
 interface CourseProductItemFooterProps {
   course: PacedCourse;
-  offer: Offer;
+  offering: Offering;
   canPurchase: boolean;
 }
 
-const CourseProductItemFooter = ({ course, offer, canPurchase }: CourseProductItemFooterProps) => {
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  const { seats, nb_seats_available } = offer;
-  const hasSeatsLimit = seats && nb_seats_available !== undefined;
-  const hasNoSeatsAvailable = hasSeatsLimit && nb_seats_available === 0;
-  if (hasNoSeatsAvailable)
+const CourseProductItemFooter = ({
+  course,
+  offering,
+  canPurchase,
+}: CourseProductItemFooterProps) => {
+  if (!offering.rules.has_seats_left)
     return (
       <p className="product-widget__footer__message">
         <FormattedMessage {...messages.noSeatsAvailable} />
@@ -43,18 +43,18 @@ const CourseProductItemFooter = ({ course, offer, canPurchase }: CourseProductIt
     <div className="product-widget__footer__order-group">
       <PurchaseButton
         course={course}
-        product={offer.product as CredentialProduct}
-        offer={offer}
-        organizations={offer.organizations}
-        isWithdrawable={offer.is_withdrawable}
+        product={offering.product as CredentialProduct}
+        offering={offering}
+        organizations={offering.organizations}
+        isWithdrawable={offering.is_withdrawable}
         disabled={!canPurchase}
         buttonProps={{ fullWidth: true }}
       />
-      {hasSeatsLimit && (
+      {offering.rules.has_seat_limit && (
         <p className="product-widget__footer__message">
           <FormattedMessage
             {...messages.nbSeatsAvailable}
-            values={{ nb: offer.nb_seats_available }}
+            values={{ nb: offering.rules.nb_available_seats }}
           />
         </p>
       )}