richie 3.1.3.dev12__py2.py3-none-any.whl → 3.1.3.dev17__py2.py3-none-any.whl

frontend/js/hooks/useCourseProductUnion/index.spec.tsx

@@ -2,13 +2,13 @@ import { renderHook, waitFor } from '@testing-library/react';
 import { QueryClient } from '@tanstack/react-query';
 import fetchMock from 'fetch-mock';
 import { PropsWithChildren } from 'react';
-import { CourseListItem, Offer } from 'types/Joanie';
+import { CourseListItem, Offering } from 'types/Joanie';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import { SessionProvider } from 'contexts/SessionContext';
 import { getRoutes } from 'api/joanie';
 import { mockPaginatedResponse } from 'utils/test/mockPaginatedResponse';
-import { CourseListItemFactory, OfferFactory } from 'utils/test/factories/joanie';
+import { CourseListItemFactory, OfferingFactory } from 'utils/test/factories/joanie';
 import { BaseJoanieAppWrapper } from 'utils/test/wrappers/BaseJoanieAppWrapper';
 import { useCourseProductUnion } from '.';
 
@@ -41,12 +41,12 @@ const renderUseCourseProductUnion = ({ organizationId }: { organizationId?: stri
 
 describe('useCourseProductUnion', () => {
   let courseList: CourseListItem[];
-  let offerList: Offer[];
+  let offeringList: Offering[];
   let nbApiCalls: number;
 
   beforeEach(() => {
     courseList = CourseListItemFactory().many(6);
-    offerList = OfferFactory().many(6);
+    offeringList = OfferingFactory().many(6);
 
     fetchMock.get('https://joanie.endpoint/api/v1.0/orders/', [], { overwriteRoutes: true });
     fetchMock.get('https://joanie.endpoint/api/v1.0/credit-cards/', [], { overwriteRoutes: true });
@@ -59,38 +59,38 @@ describe('useCourseProductUnion', () => {
     fetchMock.restore();
   });
 
-  it('should call courses and offer endpoints', async () => {
+  it('should call courses and offering endpoints', async () => {
     const ROUTES = getRoutes();
     const coursesUrl = ROUTES.courses.get.replace(':id/', '');
-    const offersUrl = ROUTES.offers.get.replace(':id/', '');
+    const offeringsUrl = ROUTES.offerings.get.replace(':id/', '');
     fetchMock.get(
       `${coursesUrl}?has_listed_course_runs=true&page=1&page_size=${PER_PAGE}`,
       mockPaginatedResponse(courseList.slice(0, PER_PAGE), 0, false),
     );
     fetchMock.get(
-      `${offersUrl}?page=1&page_size=${PER_PAGE}`,
-      mockPaginatedResponse(offerList.slice(0, PER_PAGE), 0, false),
+      `${offeringsUrl}?page=1&page_size=${PER_PAGE}`,
+      mockPaginatedResponse(offeringList.slice(0, PER_PAGE), 0, false),
     );
     const { result } = renderUseCourseProductUnion();
     await waitFor(() => expect(result.current.isLoading).toBe(false));
     expect(result.current.data.length).toBe(PER_PAGE);
     nbApiCalls += 1; // courses page 1
-    nbApiCalls += 1; // offers page 1
+    nbApiCalls += 1; // offerings page 1
     const calledUrls = fetchMock.calls().map((call) => call[0]);
     expect(calledUrls).toHaveLength(nbApiCalls);
     expect(calledUrls).toContain(
       `${coursesUrl}?has_listed_course_runs=true&page=1&page_size=${PER_PAGE}`,
     );
-    expect(calledUrls).toContain(`${offersUrl}?page=1&page_size=${PER_PAGE}`);
+    expect(calledUrls).toContain(`${offeringsUrl}?page=1&page_size=${PER_PAGE}`);
   }, 25000);
 
-  it('should call organization courses and organization offer endpoints', async () => {
+  it('should call organization courses and organization offering endpoints', async () => {
     const organizationId = 'DUMMY_ORGANIZATION_ID';
     const ROUTES = getRoutes();
     const organizationCoursesUrl = ROUTES.organizations.courses.get
       .replace(':organization_id', organizationId)
       .replace(':id/', '');
-    const organizationOffersUrl = ROUTES.organizations.offers.get
+    const organizationOfferingsUrl = ROUTES.organizations.offerings.get
       .replace(':organization_id', organizationId)
       .replace(':id/', '');
     fetchMock.get(
@@ -98,19 +98,19 @@ describe('useCourseProductUnion', () => {
       mockPaginatedResponse(courseList.slice(0, PER_PAGE), 0, false),
     );
     fetchMock.get(
-      `${organizationOffersUrl}?page=1&page_size=${PER_PAGE}`,
-      mockPaginatedResponse(offerList.slice(0, PER_PAGE), 0, false),
+      `${organizationOfferingsUrl}?page=1&page_size=${PER_PAGE}`,
+      mockPaginatedResponse(offeringList.slice(0, PER_PAGE), 0, false),
     );
     const { result } = renderUseCourseProductUnion({ organizationId: 'DUMMY_ORGANIZATION_ID' });
     await waitFor(() => expect(result.current.isLoading).toBe(false));
     expect(result.current.data.length).toBe(PER_PAGE);
     nbApiCalls += 1; // courses page 1
-    nbApiCalls += 1; // offers page 1
+    nbApiCalls += 1; // offerings page 1
     const calledUrls = fetchMock.calls().map((call) => call[0]);
     expect(calledUrls).toHaveLength(nbApiCalls);
     expect(calledUrls).toContain(
       `${organizationCoursesUrl}?has_listed_course_runs=true&page=1&page_size=${PER_PAGE}`,
     );
-    expect(calledUrls).toContain(`${organizationOffersUrl}?page=1&page_size=${PER_PAGE}`);
+    expect(calledUrls).toContain(`${organizationOfferingsUrl}?page=1&page_size=${PER_PAGE}`);
   });
 });

frontend/js/hooks/useCourseProductUnion/index.ts

@@ -3,11 +3,11 @@ import { useJoanieApi } from 'contexts/JoanieApiContext';
 import {
   CourseListItem,
   Product,
-  Offer,
+  Offering,
   CourseQueryFilters,
-  OfferQueryFilters,
+  OfferingQueryFilters,
   ProductType,
-  OfferLight,
+  OfferingLight,
 } from 'types/Joanie';
 import useUnionResource, { ResourceUnionPaginationProps } from 'hooks/useUnionResource';
 
@@ -41,9 +41,9 @@ export const useCourseProductUnion = ({
   const api = useJoanieApi();
   return useUnionResource<
     CourseListItem,
-    Offer | OfferLight,
+    Offering | OfferingLight,
     CourseQueryFilters,
-    OfferQueryFilters
+    OfferingQueryFilters
   >({
     queryAConfig: {
       queryKey: ['user', 'courses'],
@@ -51,8 +51,8 @@ export const useCourseProductUnion = ({
       filters: { query, organization_id: organizationId, has_listed_course_runs: true },
     },
     queryBConfig: {
-      queryKey: ['user', 'offers'],
-      fn: api.offers.get,
+      queryKey: ['user', 'offerings'],
+      fn: api.offerings.get,
       filters: { query, organization_id: organizationId, product_type: productType },
     },
     perPage,

frontend/js/hooks/useCourseProducts.ts

@@ -1,5 +1,5 @@
 import { defineMessages } from 'react-intl';
-import { API, CourseProductQueryFilters, Offer, Product } from 'types/Joanie';
+import { API, CourseProductQueryFilters, Offering, Product } from 'types/Joanie';
 import { QueryOptions, useResourcesCustom, UseResourcesProps } from 'hooks/useResources';
 import { useJoanieApi } from 'contexts/JoanieApiContext';
 
@@ -19,7 +19,7 @@ export const messages = defineMessages({
 /**
  * Joanie Api hook to retrieve a product through its id and a course code.
  */
-const props: UseResourcesProps<Offer, CourseProductQueryFilters, API['courses']['products']> = {
+const props: UseResourcesProps<Offering, CourseProductQueryFilters, API['courses']['products']> = {
   queryKey: ['courses-products'],
   apiInterface: () => useJoanieApi().courses.products,
   messages,
@@ -27,11 +27,11 @@ const props: UseResourcesProps<Offer, CourseProductQueryFilters, API['courses'][
 
 export const useCourseProduct = (
   filters: Omit<CourseProductQueryFilters, 'id'> & { product_id: Product['id'] },
-  queryOptions?: QueryOptions<Offer>,
+  queryOptions?: QueryOptions<Offering>,
 ) => {
   const { product_id: productId, ...queryfilters } = filters;
   const enabled = !!productId && !!queryfilters.course_id;
-  const resources = useResourcesCustom<Offer, CourseProductQueryFilters>({
+  const resources = useResourcesCustom<Offering, CourseProductQueryFilters>({
     ...props,
     filters: { id: productId, ...queryfilters },
     queryOptions: { ...queryOptions, enabled },

frontend/js/hooks/useDefaultOrganizationId/index.tsx

@@ -1,6 +1,6 @@
 import { useParams, useSearchParams } from 'react-router';
 import { useOrganizations } from 'hooks/useOrganizations';
-import { Offer, Organization } from 'types/Joanie';
+import { Offering, Organization } from 'types/Joanie';
 
 /**
  * return organization id with this priority:
@@ -9,14 +9,14 @@ import { Offer, Organization } from 'types/Joanie';
  * * first organization of user's organizations
  */
 const useDefaultOrganizationId = () => {
-  const { organizationId: routeOrganizationId, offerId: routeOfferId } = useParams<{
+  const { organizationId: routeOrganizationId, offeringId: routeOfferingId } = useParams<{
     organizationId?: Organization['id'];
-    offerId: Offer['id'];
+    offeringId: Offering['id'];
   }>();
   const [searchParams] = useSearchParams();
   const queryOrganizationId = searchParams.get('organization_id') || undefined;
   const { items: organizations } = useOrganizations(
-    { offer_id: routeOfferId },
+    { offering_id: routeOfferingId },
     {
       enabled: !routeOrganizationId && !queryOrganizationId,
     },

frontend/js/hooks/useOffering/index.ts

@@ -0,0 +1,32 @@
+import { defineMessages } from 'react-intl';
+import { useJoanieApi } from 'contexts/JoanieApiContext';
+import { API, Offering, OfferingQueryFilters } from 'types/Joanie';
+import { useResource, useResources, UseResourcesProps } from 'hooks/useResources';
+
+const messages = defineMessages({
+  errorGet: {
+    id: 'hooks.useOfferings.errorGet',
+    description: 'Error message shown to the user when offering fetch request fails.',
+    defaultMessage: 'An error occurred while fetching trainings. Please retry later.',
+  },
+  errorNotFound: {
+    id: 'hooks.useOfferings.errorNotFound',
+    description: 'Error message shown to the user when no offering matches.',
+    defaultMessage: 'Cannot find the training.',
+  },
+});
+
+/**
+ * Joanie Api hook to retrieve/create/update/delete course
+ * owned by the authenticated user.
+ */
+const props: UseResourcesProps<Offering, OfferingQueryFilters, API['offerings']> = {
+  queryKey: ['offerings'],
+  apiInterface: () => useJoanieApi().offerings,
+  session: true,
+  messages,
+};
+
+export const useOfferings = useResources<Offering, OfferingQueryFilters, API['offerings']>(props);
+
+export const useOffering = useResource<Offering, OfferingQueryFilters>(props);

frontend/js/hooks/useTeacherCoursesSearch/index.tsx

@@ -1,16 +1,16 @@
 import { useEffect, useState } from 'react';
 import { useParams, useSearchParams } from 'react-router';
 import { useCourseProductUnion } from 'hooks/useCourseProductUnion';
-import { CourseListItem, OfferLight, ProductType } from 'types/Joanie';
+import { CourseListItem, OfferingLight, ProductType } from 'types/Joanie';
 import { Maybe, Nullable } from 'types/utils';
 
 const useTeacherCoursesSearch = () => {
   const { organizationId } = useParams<{ organizationId: string }>();
   const [searchParams, setSearchParams] = useSearchParams();
   const [count, setCount] = useState<Maybe<number>>(0);
-  const [courseAndProductList, setCourseAndProductList] = useState<(CourseListItem | OfferLight)[]>(
-    [],
-  );
+  const [courseAndProductList, setCourseAndProductList] = useState<
+    (CourseListItem | OfferingLight)[]
+  >([]);
   const [isNewSearchLoading, setIsNewSearchLoading] = useState(false);
   const query = searchParams.get('query') || undefined;
   const {

frontend/js/hooks/useTeacherPendingContractsCount/index.ts

@@ -1,19 +1,19 @@
 import { useOrganizationContracts } from 'hooks/useContracts';
 import { PER_PAGE } from 'settings';
-import { ContractState, Offer, Organization } from 'types/Joanie';
+import { ContractState, Offering, Organization } from 'types/Joanie';
 
 interface UseTeacherPendingContractsCountProps {
   organizationId?: Organization['id'];
-  offerId?: Offer['id'];
+  offeringId?: Offering['id'];
 }
 
 const useTeacherPendingContractsCount = ({
   organizationId,
-  offerId,
+  offeringId,
 }: UseTeacherPendingContractsCountProps) => {
   const { items: contracts, meta } = useOrganizationContracts({
     organization_id: organizationId,
-    offer_id: offerId,
+    offering_id: offeringId,
     signature_state: ContractState.LEARNER_SIGNED,
     page: 1,
     page_size: PER_PAGE.teacherContractList,

frontend/js/pages/DashboardCourses/index.spec.tsx

@@ -5,12 +5,12 @@ import userEvent from '@testing-library/user-event';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
 import { DashboardTest } from 'widgets/Dashboard/components/DashboardTest';
 import {
-  OfferFactory,
+  OfferingFactory,
   EnrollmentFactory,
   CredentialOrderFactory,
 } from 'utils/test/factories/joanie';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
-import { CourseLight, Offer, Enrollment, CredentialOrder } from 'types/Joanie';
+import { CourseLight, Offering, Enrollment, CredentialOrder } from 'types/Joanie';
 import { expectNoSpinner, expectSpinner } from 'utils/test/expectSpinner';
 import { expectBannerError, expectBannerInfo, expectNoBannerInfo } from 'utils/test/expectBanner';
 import { Deferred } from 'utils/test/deferred';
@@ -54,15 +54,15 @@ describe('<DashboardCourses/>', () => {
   const perPage = PER_PAGE.useOrdersEnrollments;
 
   const mockOrders = (orders: CredentialOrder[], client?: QueryClient) => {
-    const offers: Record<string, Offer> = {};
+    const offerings: Record<string, Offering> = {};
     orders.forEach((order) => {
       const productId = order.product_id;
       const courseCode = (order.course as CourseLight).code;
-      const offer = OfferFactory().one();
+      const offering = OfferingFactory().one();
 
       fetchMock.get(
         `https://joanie.endpoint/api/v1.0/courses/${courseCode}/products/${productId}/`,
-        offer,
+        offering,
       );
 
       // Allowing this option boosts the test performances. Without it, the tests case with 200+
@@ -70,28 +70,28 @@ describe('<DashboardCourses/>', () => {
       if (client) {
         client.setQueryData(
           ['courses-products', JSON.stringify({ id: courseCode, productId })],
-          offer,
+          offering,
         );
       }
-      offers[order.id] = offer;
+      offerings[order.id] = offering;
     });
     orders.sort((a, b) => {
       const aDate = new Date(a.created_on);
       const bDate = new Date(b.created_on);
       return bDate.getTime() - aDate.getTime();
     });
-    return { orders, offers };
+    return { orders, offerings };
   };
 
   const expectList = (
     entities: (CredentialOrder | Enrollment)[],
-    offers: Record<string, Offer>,
+    offerings: Record<string, Offering>,
   ) => {
     const itemElements = document.querySelectorAll<HTMLElement>('.dashboard__courses__list__item');
     expect(itemElements.length).toBe(entities.length);
     entities.forEach((entity, i) => {
       const title = isOrder(entity)
-        ? offers[entity.id].product.title
+        ? offerings[entity.id].product.title
         : entity.course_run.course?.title;
       getByRole(itemElements[i], 'heading', {
         name: title,
@@ -146,7 +146,10 @@ describe('<DashboardCourses/>', () => {
 
   it('should render the list of entities', async () => {
     const client = createTestQueryClient({ user: true });
-    const { orders, offers } = mockOrders(CredentialOrderFactory().many(perPage * 2 + 1), client);
+    const { orders, offerings } = mockOrders(
+      CredentialOrderFactory().many(perPage * 2 + 1),
+      client,
+    );
     fetchMock.get(
       'https://joanie.endpoint/api/v1.0/orders/' +
         '?product_type=credential' +
@@ -252,18 +255,18 @@ describe('<DashboardCourses/>', () => {
     await expectNoBannerInfo('You have no enrollments nor orders yet');
     let loadMoreButton = await screen.findByRole('button', { name: 'Load more' });
     expect(loadMoreButton).toBeEnabled();
-    await waitFor(() => expectList(entities.slice(0, perPage), offers), { interval: 200 });
+    await waitFor(() => expectList(entities.slice(0, perPage), offerings), { interval: 200 });
 
     // Click on load more button to load slice 2.
     await act(async () => userEvent.click(loadMoreButton));
-    await waitFor(() => expectList(entities.slice(0, perPage * 2), offers));
+    await waitFor(() => expectList(entities.slice(0, perPage * 2), offerings));
     loadMoreButton = await screen.findByRole('button', { name: 'Load more' });
     expect(loadMoreButton).toBeEnabled();
 
     // Activate intersection observe to load slice 3.
     const { onIntersect } = (globalThis as any).__intersection_observer_props__;
     await waitFor(async () => onIntersect());
-    await waitFor(() => expectList(entities.slice(0, perPage * 3), offers), { timeout: 30000 });
+    await waitFor(() => expectList(entities.slice(0, perPage * 3), offerings), { timeout: 30000 });
     loadMoreButton = await screen.findByRole('button', { name: 'Load more' });
     expect(loadMoreButton).toBeEnabled();
   }, 15000);

frontend/js/pages/TeacherDashboardContractsLayout/TeacherDashboardContracts/index.spec.tsx

@@ -3,7 +3,7 @@ import { screen } from '@testing-library/react';
 import { getAllByRole } from '@testing-library/dom';
 import userEvent from '@testing-library/user-event';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
-import { ContractFactory, OfferFactory, OrganizationFactory } from 'utils/test/factories/joanie';
+import { ContractFactory, OfferingFactory, OrganizationFactory } from 'utils/test/factories/joanie';
 import { expectNoSpinner } from 'utils/test/expectSpinner';
 import { expectBannerError } from 'utils/test/expectBanner';
 import { HttpStatusCode } from 'utils/errors/HttpError';
@@ -33,8 +33,8 @@ jest.mock('components/ContractFrame', () => ({
 describe('pages/TeacherDashboardContracts', () => {
   setupJoanieSession();
 
-  it('should render a list of contracts for a offer', async () => {
-    const offer = OfferFactory().one();
+  it('should render a list of contracts for an offering', async () => {
+    const offering = OfferingFactory().one();
     const contracts = ContractFactory({
       student_signed_on: Date.toString(),
       organization_signed_on: Date.toString(),
@@ -44,29 +44,32 @@ describe('pages/TeacherDashboardContracts', () => {
 
     // OrganizationContractFilter request all organizations forwho the user have access
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/?offer_id=${offer.id}`,
+      `https://joanie.endpoint/api/v1.0/organizations/?offering_id=${offering.id}`,
       organizations,
     );
     // TeacherDashboardContracts request a paginated list of contracts to display
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/${defaultOrganization.id}/contracts/?offer_id=${offer.id}&signature_state=signed&page=1&page_size=25`,
+      `https://joanie.endpoint/api/v1.0/organizations/${defaultOrganization.id}/` +
+        `contracts/?offering_id=${offering.id}&signature_state=signed&page=1&page_size=25`,
       { results: contracts, count: 0, previous: null, next: null },
     );
     // useTeacherContractsToSign request all contract to sign, without pagination
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/${defaultOrganization.id}/contracts/?signature_state=half_signed&offer_id=${offer.id}`,
+      `https://joanie.endpoint/api/v1.0/organizations/${defaultOrganization.id}/` +
+        `contracts/?signature_state=half_signed&offering_id=${offering.id}`,
       { results: [], count: 0, previous: null, next: null },
     );
 
     render(<TeacherDashboardContracts />, {
       routerOptions: {
-        path: '/courses/:courseId/products/:offerId/contracts',
-        initialEntries: [`/courses/${offer.course.id}/products/${offer.id}/contracts`],
+        path: '/courses/:courseId/products/:offeringId/contracts',
+        initialEntries: [`/courses/${offering.course.id}/products/${offering.id}/contracts`],
       },
     });
 
     await expectNoSpinner();
 
+    // screen.logTestingPlaygroundURL();
     // Organization filter should have been rendered
     const organizationFilter: HTMLInputElement = await screen.findByRole('combobox', {
       name: 'Organization',

frontend/js/pages/TeacherDashboardContractsLayout/TeacherDashboardContracts/index.tsx

@@ -42,7 +42,7 @@ const TeacherDashboardContracts = () => {
     defaultPage: page ? parseInt(page, 10) : 1,
     pageSize: PER_PAGE.teacherContractList,
   });
-  const { organizationId: routeOrganizationId, offerId: routeofferId } =
+  const { organizationId: routeOrganizationId, offeringId: routeOfferingId } =
     useParams<TeacherDashboardContractsParams>();
   // organization list is used to show/hide organization filter.
   // when organizationId is in route's params this filter is always hidden.
@@ -50,7 +50,7 @@ const TeacherDashboardContracts = () => {
   const {
     items: organizationList,
     states: { isFetched: isOrganizationListFetched },
-  } = useOrganizations({ offer_id: routeofferId }, { enabled: !routeOrganizationId });
+  } = useOrganizations({ offering_id: routeOfferingId }, { enabled: !routeOrganizationId });
   const hasMultipleOrganizations = isOrganizationListFetched && organizationList.length > 1;
   const { initialFilters, filters, setFilters } = useTeacherContractFilters();
   const {
@@ -91,7 +91,10 @@ const TeacherDashboardContracts = () => {
   return (
     <div className="teacher-contract-page">
       <div className="dashboard__page__actions">
-        <ContractActionsBar organizationId={filters.organization_id!} offerId={filters.offer_id} />
+        <ContractActionsBar
+          organizationId={filters.organization_id!}
+          offeringId={filters.offering_id}
+        />
         <ContractFiltersBar
           defaultValues={initialFilters}
           onFiltersChange={handleFiltersChange}

frontend/js/pages/TeacherDashboardContractsLayout/components/BulkDownloadContractButton/index.spec.tsx

@@ -9,7 +9,7 @@ import JoanieApiProvider from 'contexts/JoanieApiContext';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import { ContractDownloadStatus } from 'pages/TeacherDashboardContractsLayout/hooks/useDownloadContractArchive';
 
-import { OfferFactory, OrganizationFactory } from 'utils/test/factories/joanie';
+import { OfferingFactory, OrganizationFactory } from 'utils/test/factories/joanie';
 import { unstoreContractArchiveId } from 'pages/TeacherDashboardContractsLayout/hooks/useDownloadContractArchive/contractArchiveLocalStorage';
 import BulkDownloadContractButton from '.';
 
@@ -44,26 +44,26 @@ describe.each([
   {
     testLabel: 'for all organization and all trainings',
     organization: undefined,
-    offer: undefined,
+    offering: undefined,
   },
   {
     testLabel: 'for a training in an organization',
     organization: OrganizationFactory().one(),
-    offer: OfferFactory().one(),
+    offering: OfferingFactory().one(),
   },
   {
     testLabel: 'for an organization',
     organization: OrganizationFactory().one(),
-    offer: undefined,
+    offering: undefined,
   },
   {
     testLabel: 'for a training',
     organization: undefined,
-    offer: OfferFactory().one(),
+    offering: OfferingFactory().one(),
   },
 ])(
   'TeacherDashboardContractsLayout/BulkDownloadContractButton $testLabel',
-  ({ organization, offer }) => {
+  ({ organization, offering }) => {
     const Wrapper = ({ children }: PropsWithChildren) => {
       return (
         <IntlProvider locale="en">
@@ -86,7 +86,7 @@ describe.each([
       jest.resetAllMocks();
       unstoreContractArchiveId({
         organizationId: organization ? organization.id : undefined,
-        offerId: offer ? offer.id : undefined,
+        offeringId: offering ? offering.id : undefined,
       });
     });
 
@@ -97,7 +97,7 @@ describe.each([
         <Wrapper>
           <BulkDownloadContractButton
             organizationId={organization?.id ?? undefined}
-            offerId={offer?.id ?? undefined}
+            offeringId={offering?.id ?? undefined}
           />
         </Wrapper>,
       );
@@ -118,7 +118,7 @@ describe.each([
         <Wrapper>
           <BulkDownloadContractButton
             organizationId={organization?.id ?? undefined}
-            offerId={offer?.id ?? undefined}
+            offeringId={offering?.id ?? undefined}
           />
         </Wrapper>,
       );
@@ -139,7 +139,7 @@ describe.each([
         <Wrapper>
           <BulkDownloadContractButton
             organizationId={organization?.id ?? undefined}
-            offerId={offer?.id ?? undefined}
+            offeringId={offering?.id ?? undefined}
           />
         </Wrapper>,
       );
@@ -160,7 +160,7 @@ describe.each([
         <Wrapper>
           <BulkDownloadContractButton
             organizationId={organization?.id ?? undefined}
-            offerId={offer?.id ?? undefined}
+            offeringId={offering?.id ?? undefined}
           />
         </Wrapper>,
       );

frontend/js/pages/TeacherDashboardContractsLayout/components/BulkDownloadContractButton/index.timer.spec.tsx

@@ -14,7 +14,7 @@ import {
   unstoreContractArchiveId,
 } from 'pages/TeacherDashboardContractsLayout/hooks/useDownloadContractArchive/contractArchiveLocalStorage';
 import { CONTRACT_DOWNLOAD_SETTINGS } from 'settings';
-import { OfferFactory, OrganizationFactory } from 'utils/test/factories/joanie';
+import { OfferingFactory, OrganizationFactory } from 'utils/test/factories/joanie';
 import BulkDownloadContractButton from '.';
 
 jest.mock('utils/context', () => ({
@@ -45,26 +45,26 @@ describe.each([
   {
     testLabel: 'for all organization and all trainings',
     organization: undefined,
-    offer: undefined,
+    offering: undefined,
   },
   {
     testLabel: 'for a training in an organization',
     organization: OrganizationFactory().one(),
-    offer: OfferFactory().one(),
+    offering: OfferingFactory().one(),
   },
   {
     testLabel: 'for an organization',
     organization: OrganizationFactory().one(),
-    offer: undefined,
+    offering: undefined,
   },
   {
     testLabel: 'for a training',
     organization: undefined,
-    offer: OfferFactory().one(),
+    offering: OfferingFactory().one(),
   },
 ])(
   'TeacherDashboardContractsLayout/BulkDownloadContractButton with fake timer, $testLabel',
-  ({ organization, offer }) => {
+  ({ organization, offering }) => {
     let localStorageArchiveFilters: LocalStorageArchiveFilters;
 
     const Wrapper = ({ children }: PropsWithChildren) => {
@@ -81,7 +81,7 @@ describe.each([
     beforeEach(() => {
       localStorageArchiveFilters = {
         organizationId: organization ? organization.id : undefined,
-        offerId: offer ? offer.id : undefined,
+        offeringId: offering ? offering.id : undefined,
       };
       mockHasContractToDownload = true;
 
@@ -102,7 +102,7 @@ describe.each([
       jest.clearAllMocks();
       unstoreContractArchiveId({
         organizationId: organization ? organization.id : undefined,
-        offerId: offer ? offer.id : undefined,
+        offeringId: offering ? offering.id : undefined,
       });
     });
 
@@ -114,7 +114,7 @@ describe.each([
         <Wrapper>
           <BulkDownloadContractButton
             organizationId={organization?.id ?? undefined}
-            offerId={offer?.id ?? undefined}
+            offeringId={offering?.id ?? undefined}
           />
         </Wrapper>,
       );
@@ -151,7 +151,7 @@ describe.each([
 
       render(
         <Wrapper>
-          <BulkDownloadContractButton organizationId={organization?.id} offerId={offer?.id} />
+          <BulkDownloadContractButton organizationId={organization?.id} offeringId={offering?.id} />
         </Wrapper>,
       );
 

frontend/js/pages/TeacherDashboardContractsLayout/components/BulkDownloadContractButton/index.tsx

@@ -4,7 +4,7 @@ import { useEffect } from 'react';
 import useDownloadContractArchive, {
   ContractDownloadStatus,
 } from 'pages/TeacherDashboardContractsLayout/hooks/useDownloadContractArchive';
-import { Offer, Organization } from 'types/Joanie';
+import { Offering, Organization } from 'types/Joanie';
 
 const messages = defineMessages({
   bulkDownloadButtonDownloadLabel: {
@@ -26,16 +26,16 @@ const messages = defineMessages({
 
 interface BulkDownloadContractButtonProps {
   organizationId?: Organization['id'];
-  offerId?: Offer['id'];
+  offeringId?: Offering['id'];
 }
 
 const BulkDownloadContractButton = ({
   organizationId,
-  offerId,
+  offeringId,
 }: BulkDownloadContractButtonProps) => {
   const { downloadContractArchive, createContractArchive, status } = useDownloadContractArchive({
     organizationId,
-    offerId,
+    offeringId,
   });
 
   useEffect(() => {