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

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

@@ -70,19 +70,19 @@ describe('TeacherDashboardContractsLayout/SignOrganizationContractButton', () =>
     {
       label: "organization's contracts",
       organizationId: faker.string.uuid(),
-      courseProductRelationIds: undefined,
+      offerIds: undefined,
     },
     {
       label: "organization's training contracts",
       organizationId: faker.string.uuid(),
-      courseProductRelationIds: [faker.string.uuid()],
+      offerIds: [faker.string.uuid()],
     },
-  ])('should open $label frame on click', async ({ organizationId, courseProductRelationIds }) => {
+  ])('should open $label frame on click', async ({ organizationId, offerIds }) => {
     render(
       <Wrapper>
         <SignOrganizationContractButton
           organizationId={organizationId}
-          courseProductRelationIds={courseProductRelationIds}
+          offerIds={offerIds}
           contractToSignCount={12}
         />
       </Wrapper>,
@@ -92,8 +92,8 @@ describe('TeacherDashboardContractsLayout/SignOrganizationContractButton', () =>
     const user = userEvent.setup();
 
     let getInvitationLinkUrl = `https://joanie.test/api/v1.0/organizations/${organizationId}/contracts-signature-link/`;
-    if (courseProductRelationIds) {
-      getInvitationLinkUrl += `?course_product_relation_ids=${courseProductRelationIds[0]}`;
+    if (offerIds) {
+      getInvitationLinkUrl += `?offer_ids=${offerIds[0]}`;
     }
 
     fetchMock.get(getInvitationLinkUrl, {

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

@@ -3,7 +3,7 @@ import { defineMessages, FormattedMessage } from 'react-intl';
 import { Button } from '@openfun/cunningham-react';
 import { OrganizationContractFrame } from 'components/ContractFrame';
 
-import { CourseProductRelation, Organization } from 'types/Joanie';
+import { Offer, Organization } from 'types/Joanie';
 
 const messages = defineMessages({
   signAllPendingContracts: {
@@ -14,7 +14,7 @@ const messages = defineMessages({
 });
 
 interface Props {
-  courseProductRelationIds?: CourseProductRelation['id'][];
+  offerIds?: Offer['id'][];
   organizationId: Organization['id'];
   contractToSignCount: number;
 }
@@ -22,7 +22,7 @@ interface Props {
 const SignOrganizationContractButton = ({
   organizationId,
   contractToSignCount,
-  courseProductRelationIds = [],
+  offerIds = [],
 }: Props) => {
   const [contractFrameOpened, setContractFrameOpened] = useState(false);
   const hasContractToSign = contractToSignCount > 0;
@@ -48,7 +48,7 @@ const SignOrganizationContractButton = ({
         </Button>
       )}
       <OrganizationContractFrame
-        courseProductRelationIds={courseProductRelationIds}
+        offerIds={offerIds}
         organizationId={organizationId}
         isOpen={contractFrameOpened}
         onClose={() => setContractFrameOpened(false)}

frontend/js/pages/TeacherDashboardContractsLayout/hooks/useCheckContractArchiveExists/index.spec.tsx

@@ -5,7 +5,7 @@ import { IntlProvider } from 'react-intl';
 import { PropsWithChildren } from 'react';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
 import JoanieApiProvider from 'contexts/JoanieApiContext';
-import { CourseProductRelationFactory, OrganizationFactory } from 'utils/test/factories/joanie';
+import { OfferFactory, OrganizationFactory } from 'utils/test/factories/joanie';
 import {
   LocalStorageArchiveFilters,
   storeContractArchiveId,
@@ -41,24 +41,24 @@ describe.each([
   {
     testLabel: 'for all organization and all trainings',
     organization: undefined,
-    courseProductRelation: undefined,
+    offer: undefined,
   },
   {
     testLabel: 'for a training in an organization',
     organization: OrganizationFactory().one(),
-    courseProductRelation: CourseProductRelationFactory().one(),
+    offer: OfferFactory().one(),
   },
   {
     testLabel: 'for an organization',
     organization: OrganizationFactory().one(),
-    courseProductRelation: undefined,
+    offer: undefined,
   },
   {
     testLabel: 'for a training',
     organization: undefined,
-    courseProductRelation: CourseProductRelationFactory().one(),
+    offer: OfferFactory().one(),
   },
-])('useCheckContractArchiveExists $testLabel', ({ organization, courseProductRelation }) => {
+])('useCheckContractArchiveExists $testLabel', ({ organization, offer }) => {
   const Wrapper = ({ children }: PropsWithChildren) => {
     return (
       <IntlProvider locale="en">
@@ -71,7 +71,7 @@ describe.each([
   beforeEach(() => {
     localStorageArchiveFilters = {
       organizationId: organization ? organization.id : undefined,
-      courseProductRelationId: courseProductRelation ? courseProductRelation.id : undefined,
+      offerId: offer ? offer.id : undefined,
     };
 
     // Joanie providers calls

frontend/js/pages/TeacherDashboardContractsLayout/hooks/useCheckContractArchiveExists/index.tsx

@@ -2,17 +2,17 @@ import { useEffect, useRef, useState } from 'react';
 import useContractArchive from 'hooks/useContractArchive';
 import { CONTRACT_DOWNLOAD_SETTINGS } from 'settings';
 import { Nullable } from 'types/utils';
-import { CourseProductRelation, Organization } from 'types/Joanie';
+import { Offer, Organization } from 'types/Joanie';
 import { getStoredContractArchiveId } from '../useDownloadContractArchive/contractArchiveLocalStorage';
 
 export interface UseCheckContractArchiveExistsProps {
   organizationId?: Organization['id'];
-  courseProductRelationId?: CourseProductRelation['id'];
+  offerId?: Offer['id'];
   enable?: boolean;
 }
 
 const useCheckContractArchiveExist = (
-  { organizationId, courseProductRelationId, enable = true }: UseCheckContractArchiveExistsProps = {
+  { organizationId, offerId, enable = true }: UseCheckContractArchiveExistsProps = {
     enable: true,
   },
 ) => {
@@ -55,7 +55,7 @@ const useCheckContractArchiveExist = (
   useEffect(() => {
     const storedContractArchiveId = getStoredContractArchiveId({
       organizationId,
-      courseProductRelationId,
+      offerId,
     });
 
     if (enable && storedContractArchiveId) {
@@ -63,7 +63,7 @@ const useCheckContractArchiveExist = (
     } else {
       setIsContractArchiveExists(false);
     }
-  }, [enable, organizationId, courseProductRelationId]);
+  }, [enable, organizationId, offerId]);
 
   // Be sure to clear any timeout before unmouting the hook.
   useEffect(() => {

frontend/js/pages/TeacherDashboardContractsLayout/hooks/useDownloadContractArchive/contractArchiveLocalStorage.spec.ts

@@ -1,6 +1,6 @@
 import { faker } from '@faker-js/faker';
 import { CONTRACT_DOWNLOAD_SETTINGS } from 'settings';
-import { CourseProductRelationFactory, OrganizationFactory } from 'utils/test/factories/joanie';
+import { OfferFactory, OrganizationFactory } from 'utils/test/factories/joanie';
 import {
   LocalStorageArchiveFilters,
   generateLocalStorageKey,
@@ -14,56 +14,56 @@ describe.each([
   {
     testLabel: 'for all organization and all trainings',
     organization: undefined,
-    courseProductRelation: undefined,
+    offer: undefined,
     existingOrganization: undefined,
-    existingCourseProductRelation: undefined,
+    existingOffer: undefined,
   },
   {
     testLabel: 'for a training in an organization',
     organization: OrganizationFactory().one(),
-    courseProductRelation: CourseProductRelationFactory().one(),
+    offer: OfferFactory().one(),
     existingOrganization: undefined,
-    existingCourseProductRelation: undefined,
+    existingOffer: undefined,
   },
   {
     testLabel: 'for an organization',
     organization: OrganizationFactory().one(),
-    courseProductRelation: undefined,
+    offer: undefined,
     existingOrganization: undefined,
-    existingCourseProductRelation: undefined,
+    existingOffer: undefined,
   },
   {
     testLabel: 'for a training',
     organization: undefined,
-    courseProductRelation: CourseProductRelationFactory().one(),
+    offer: OfferFactory().one(),
     existingOrganization: undefined,
-    existingCourseProductRelation: undefined,
+    existingOffer: undefined,
   },
   {
     testLabel: 'for all organization and all trainings, with a other id already stored',
     organization: undefined,
-    courseProductRelation: undefined,
+    offer: undefined,
     existingOrganization: OrganizationFactory().one(),
-    existingCourseProductRelation: CourseProductRelationFactory().one(),
+    existingOffer: OfferFactory().one(),
   },
   {
     testLabel: 'for a training in an organization, with a other id already stored',
     organization: OrganizationFactory().one(),
-    courseProductRelation: CourseProductRelationFactory().one(),
+    offer: OfferFactory().one(),
   },
   {
     testLabel: 'for an organization, with a other id already stored',
     organization: OrganizationFactory().one(),
-    courseProductRelation: undefined,
+    offer: undefined,
     existingOrganization: OrganizationFactory().one(),
-    existingCourseProductRelation: CourseProductRelationFactory().one(),
+    existingOffer: OfferFactory().one(),
   },
   {
     testLabel: 'for a training, with a other id already stored',
     organization: undefined,
-    courseProductRelation: CourseProductRelationFactory().one(),
+    offer: OfferFactory().one(),
     existingOrganization: OrganizationFactory().one(),
-    existingCourseProductRelation: CourseProductRelationFactory().one(),
+    existingOffer: OfferFactory().one(),
   },
 
   {
@@ -72,16 +72,11 @@ describe.each([
   {
     testLabel: 'Testing with a other id already stored',
     existingOrganization: OrganizationFactory().one(),
-    existingCourseProductRelation: CourseProductRelationFactory().one(),
+    existingOffer: OfferFactory().one(),
   },
 ])(
   'contractArchiveLocalStorage $testLabel',
-  ({
-    organization,
-    courseProductRelation,
-    existingOrganization,
-    existingCourseProductRelation,
-  }) => {
+  ({ organization, offer, existingOrganization, existingOffer }) => {
     let localStorageArchiveFilters: LocalStorageArchiveFilters;
     let localStorageExistingArchiveFilters: LocalStorageArchiveFilters;
     let exsitingContractId: string;
@@ -89,17 +84,15 @@ describe.each([
     beforeEach(() => {
       localStorageArchiveFilters = {
         organizationId: organization ? organization.id : undefined,
-        courseProductRelationId: courseProductRelation ? courseProductRelation.id : undefined,
+        offerId: offer ? offer.id : undefined,
       };
       localStorageExistingArchiveFilters = {
         organizationId: existingOrganization ? existingOrganization.id : undefined,
-        courseProductRelationId: existingCourseProductRelation
-          ? existingCourseProductRelation.id
-          : undefined,
+        offerId: existingOffer ? existingOffer.id : undefined,
       };
       exsitingContractId = faker.string.uuid();
 
-      if (existingCourseProductRelation && existingOrganization) {
+      if (existingOffer && existingOrganization) {
         // everything should work fine with multiple archive stored
         storeContractArchiveId({
           ...localStorageExistingArchiveFilters,

frontend/js/pages/TeacherDashboardContractsLayout/hooks/useDownloadContractArchive/contractArchiveLocalStorage.ts

@@ -1,16 +1,13 @@
 import { CONTRACT_DOWNLOAD_SETTINGS } from 'settings';
-import { CourseProductRelation, Organization } from 'types/Joanie';
+import { Offer, Organization } from 'types/Joanie';
 
 export interface LocalStorageArchiveFilters {
   organizationId?: Organization['id'];
-  courseProductRelationId?: CourseProductRelation['id'];
+  offerId?: Offer['id'];
 }
 
-const generateLocalStorageKey = ({
-  organizationId,
-  courseProductRelationId,
-}: LocalStorageArchiveFilters = {}) => {
-  return `${CONTRACT_DOWNLOAD_SETTINGS.contractArchiveLocalStorageKey}::${organizationId ?? 'all'}::${courseProductRelationId ?? 'all'}`;
+const generateLocalStorageKey = ({ organizationId, offerId }: LocalStorageArchiveFilters = {}) => {
+  return `${CONTRACT_DOWNLOAD_SETTINGS.contractArchiveLocalStorageKey}::${organizationId ?? 'all'}::${offerId ?? 'all'}`;
 };
 
 const generateLocalStorageId = (contractArchiveId: string) => {
@@ -20,32 +17,27 @@ const generateLocalStorageId = (contractArchiveId: string) => {
 const storeContractArchiveId = ({
   contractArchiveId,
   organizationId,
-  courseProductRelationId,
+  offerId,
 }: {
   contractArchiveId: string;
   organizationId?: Organization['id'];
-  courseProductRelationId?: CourseProductRelation['id'];
+  offerId?: Offer['id'];
 }) => {
   localStorage.setItem(
-    generateLocalStorageKey({ organizationId, courseProductRelationId }),
+    generateLocalStorageKey({ organizationId, offerId }),
     generateLocalStorageId(contractArchiveId),
   );
 };
 
-const unstoreContractArchiveId = ({
-  organizationId,
-  courseProductRelationId,
-}: LocalStorageArchiveFilters = {}) => {
-  localStorage.removeItem(generateLocalStorageKey({ organizationId, courseProductRelationId }));
+const unstoreContractArchiveId = ({ organizationId, offerId }: LocalStorageArchiveFilters = {}) => {
+  localStorage.removeItem(generateLocalStorageKey({ organizationId, offerId }));
 };
 
 const getStoredContractArchiveId = ({
   organizationId,
-  courseProductRelationId,
+  offerId,
 }: LocalStorageArchiveFilters = {}) => {
-  const value = localStorage.getItem(
-    generateLocalStorageKey({ organizationId, courseProductRelationId }),
-  );
+  const value = localStorage.getItem(generateLocalStorageKey({ organizationId, offerId }));
   if (value === null) {
     return value;
   }
@@ -56,11 +48,9 @@ const getStoredContractArchiveId = ({
 
 const isStoredContractArchiveIdExpired = ({
   organizationId,
-  courseProductRelationId,
+  offerId,
 }: LocalStorageArchiveFilters = {}) => {
-  const value = localStorage.getItem(
-    generateLocalStorageKey({ organizationId, courseProductRelationId }),
-  );
+  const value = localStorage.getItem(generateLocalStorageKey({ organizationId, offerId }));
   if (value === null) {
     return false;
   }

frontend/js/pages/TeacherDashboardContractsLayout/hooks/useDownloadContractArchive/index.spec.tsx

@@ -5,7 +5,7 @@ import { PropsWithChildren } from 'react';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
 import JoanieApiProvider from 'contexts/JoanieApiContext';
 import { CONTRACT_DOWNLOAD_SETTINGS } from 'settings';
-import { CourseProductRelationFactory, OrganizationFactory } from 'utils/test/factories/joanie';
+import { OfferFactory, OrganizationFactory } from 'utils/test/factories/joanie';
 import {
   LocalStorageArchiveFilters,
   getStoredContractArchiveId,
@@ -50,30 +50,30 @@ describe.each([
   {
     testLabel: 'for all organization and all trainings',
     organization: undefined,
-    courseProductRelation: undefined,
+    offer: undefined,
   },
   {
     testLabel: 'for a training in an organization',
     organization: OrganizationFactory().one(),
-    courseProductRelation: CourseProductRelationFactory().one(),
+    offer: OfferFactory().one(),
   },
   {
     testLabel: 'for an organization',
     organization: OrganizationFactory().one(),
-    courseProductRelation: undefined,
+    offer: undefined,
   },
   {
     testLabel: 'for a training',
     organization: undefined,
-    courseProductRelation: CourseProductRelationFactory().one(),
+    offer: OfferFactory().one(),
   },
-])('useDownloadContractArchive $testLabel', ({ organization, courseProductRelation }) => {
+])('useDownloadContractArchive $testLabel', ({ organization, offer }) => {
   let localStorageArchiveFilters: LocalStorageArchiveFilters;
 
   beforeEach(() => {
     localStorageArchiveFilters = {
       organizationId: organization ? organization.id : undefined,
-      courseProductRelationId: courseProductRelation ? courseProductRelation.id : undefined,
+      offerId: offer ? offer.id : undefined,
     };
   });
 
@@ -97,22 +97,20 @@ describe.each([
     {
       testLabel: 'Testing with a other id already stored',
       existingOrganization: OrganizationFactory().one(),
-      existingCourseProductRelation: CourseProductRelationFactory().one(),
+      existingOffer: OfferFactory().one(),
     },
-  ])('$testLabel', ({ existingOrganization, existingCourseProductRelation }) => {
+  ])('$testLabel', ({ existingOrganization, existingOffer }) => {
     let localStorageExistingArchiveFilters: LocalStorageArchiveFilters;
     let exsitingContractId: string;
 
     beforeEach(() => {
       localStorageExistingArchiveFilters = {
         organizationId: existingOrganization ? existingOrganization.id : undefined,
-        courseProductRelationId: existingCourseProductRelation
-          ? existingCourseProductRelation.id
-          : undefined,
+        offerId: existingOffer ? existingOffer.id : undefined,
       };
       exsitingContractId = faker.string.uuid();
 
-      if (existingCourseProductRelation && existingOrganization) {
+      if (existingOffer && existingOrganization) {
         // everything should work fine with multiple archive stored
         storeContractArchiveId({
           ...localStorageExistingArchiveFilters,

frontend/js/pages/TeacherDashboardContractsLayout/hooks/useDownloadContractArchive/index.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useState } from 'react';
 import useContractArchive from 'hooks/useContractArchive';
-import { CourseProductRelation, Organization } from 'types/Joanie';
+import { Offer, Organization } from 'types/Joanie';
 import useCheckContractArchiveExists from '../useCheckContractArchiveExists';
 import useHasContractToDownload from '../useHasContractToDownload';
 import {
@@ -19,16 +19,16 @@ export enum ContractDownloadStatus {
 
 interface UseTeacherContractsBulkDownloadProps {
   organizationId?: Organization['id'];
-  courseProductRelationId?: CourseProductRelation['id'];
+  offerId?: Offer['id'];
 }
 
 const useDownloadContractArchive = ({
   organizationId,
-  courseProductRelationId,
+  offerId,
 }: UseTeacherContractsBulkDownloadProps) => {
   const localstorageArchiveFilters = {
     organizationId,
-    courseProductRelationId,
+    offerId,
   };
 
   // Contract's archive api interface
@@ -37,7 +37,7 @@ const useDownloadContractArchive = ({
   } = useContractArchive();
 
   // Simple hook that verifiy if current user have some fully signed contracts to download.
-  const hasContractToDownload = useHasContractToDownload(organizationId, courseProductRelationId);
+  const hasContractToDownload = useHasContractToDownload(organizationId, offerId);
 
   // Component state of the localstorage contract's archive id
   const [contractArchiveId, setContractArchiveId] = useState<string | null>(
@@ -116,7 +116,7 @@ const useDownloadContractArchive = ({
   const createContractArchive = async () => {
     let newContractArchiveId;
     if (contractArchiveId === null) {
-      newContractArchiveId = await createArchive(organizationId, courseProductRelationId);
+      newContractArchiveId = await createArchive(organizationId, offerId);
       setContractArchiveId(newContractArchiveId);
       storeContractArchiveId({
         ...localstorageArchiveFilters,

frontend/js/pages/TeacherDashboardContractsLayout/hooks/useHasContractToDownload/index.tsx

@@ -1,17 +1,14 @@
 import { useOrganizationContracts } from 'hooks/useContracts';
 import { PER_PAGE } from 'settings';
-import { ContractState, CourseProductRelation, Organization } from 'types/Joanie';
+import { ContractState, Offer, Organization } from 'types/Joanie';
 
-const useHasContractToDownload = (
-  organizationId?: Organization['id'],
-  courseProductRelationId?: CourseProductRelation['id'],
-) => {
+const useHasContractToDownload = (organizationId?: Organization['id'], offerId?: Offer['id']) => {
   const {
     items: contracts,
     states: { isFetched },
   } = useOrganizationContracts({
     organization_id: organizationId,
-    course_product_relation_id: courseProductRelationId,
+    offer_id: offerId,
     signature_state: ContractState.SIGNED,
     page: 1,
     page_size: PER_PAGE.teacherContractList,

frontend/js/pages/TeacherDashboardContractsLayout/hooks/useTeacherContractFilters/index.spec.tsx

@@ -7,7 +7,7 @@ import { MemoryRouter, Route, Routes } from 'react-router';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import JoanieSessionProvider from 'contexts/SessionContext/JoanieSessionProvider';
-import { CourseProductRelationFactory, OrganizationFactory } from 'utils/test/factories/joanie';
+import { OfferFactory, OrganizationFactory } from 'utils/test/factories/joanie';
 import { ContractState } from 'types/Joanie';
 import useTeacherContractFilters from '.';
 
@@ -67,13 +67,13 @@ describe('useTeacherContractFilters', () => {
       expect(result.current.initialFilters).toStrictEqual({
         contract_ids: [],
         organization_id: defaultOrganization.id,
-        course_product_relation_id: undefined,
+        offer_id: undefined,
         signature_state: ContractState.SIGNED,
       });
       expect(result.current.filters).toStrictEqual({
         contract_ids: [],
         organization_id: defaultOrganization.id,
-        course_product_relation_id: undefined,
+        offer_id: undefined,
         signature_state: ContractState.SIGNED,
       });
     });
@@ -83,7 +83,7 @@ describe('useTeacherContractFilters', () => {
     const defaultOrganization = OrganizationFactory({ id: 'default' }).one();
     const filteredOrganization = OrganizationFactory({ id: 'filtered' }).one();
     const routeOrganization = OrganizationFactory({ id: 'route' }).one();
-    const routeCourseProductRelation = CourseProductRelationFactory().one();
+    const routeOffer = OfferFactory().one();
     // fetching user's organizations to initialize default organizationId.
     fetchMock.get('https://joanie.test/api/v1.0/organizations/', [
       defaultOrganization,
@@ -92,8 +92,8 @@ describe('useTeacherContractFilters', () => {
     const { result } = renderHook(useTeacherContractFilters, {
       wrapper: ({ children }) => (
         <Wrapper
-          routePath="/:organizationId/:courseProductRelationId"
-          initialEntry={`/${routeOrganization.id}/${routeCourseProductRelation.id}?organization_id=${filteredOrganization.id}&signature_state=${ContractState?.UNSIGNED}&contract_ids=1&contract_ids=2`}
+          routePath="/:organizationId/:offerId"
+          initialEntry={`/${routeOrganization.id}/${routeOffer.id}?organization_id=${filteredOrganization.id}&signature_state=${ContractState?.UNSIGNED}&contract_ids=1&contract_ids=2`}
         >
           {children}
         </Wrapper>
@@ -104,13 +104,13 @@ describe('useTeacherContractFilters', () => {
       expect(result.current.initialFilters).toStrictEqual({
         contract_ids: ['1', '2'],
         organization_id: routeOrganization.id,
-        course_product_relation_id: routeCourseProductRelation.id,
+        offer_id: routeOffer.id,
         signature_state: ContractState.UNSIGNED,
       });
       expect(result.current.filters).toStrictEqual({
         contract_ids: ['1', '2'],
         organization_id: routeOrganization.id,
-        course_product_relation_id: routeCourseProductRelation.id,
+        offer_id: routeOffer.id,
         signature_state: ContractState.UNSIGNED,
       });
     });
@@ -119,7 +119,7 @@ describe('useTeacherContractFilters', () => {
   it("should use organizationId from query parameters when it's not in route params", async () => {
     const defaultOrganization = OrganizationFactory({ id: 'default' }).one();
     const filteredOrganization = OrganizationFactory({ id: 'filtered' }).one();
-    const routeCourseProductRelation = CourseProductRelationFactory({ id: 'route' }).one();
+    const routeOffer = OfferFactory({ id: 'route' }).one();
     // fetching user's organizations to initialize default organizationId.
     fetchMock.get('https://joanie.test/api/v1.0/organizations/', [
       defaultOrganization,
@@ -128,8 +128,8 @@ describe('useTeacherContractFilters', () => {
     const { result } = renderHook(useTeacherContractFilters, {
       wrapper: ({ children }) => (
         <Wrapper
-          routePath="/:courseProductRelationId"
-          initialEntry={`/${routeCourseProductRelation.id}/?organization_id=${filteredOrganization.id}&signature_state=${ContractState?.UNSIGNED}&contract_ids=1&contract_ids=2`}
+          routePath="/:offerId"
+          initialEntry={`/${routeOffer.id}/?organization_id=${filteredOrganization.id}&signature_state=${ContractState?.UNSIGNED}&contract_ids=1&contract_ids=2`}
         >
           {children}
         </Wrapper>
@@ -140,13 +140,13 @@ describe('useTeacherContractFilters', () => {
       expect(result.current.initialFilters).toStrictEqual({
         contract_ids: ['1', '2'],
         organization_id: filteredOrganization.id,
-        course_product_relation_id: routeCourseProductRelation.id,
+        offer_id: routeOffer.id,
         signature_state: ContractState.UNSIGNED,
       });
       expect(result.current.filters).toStrictEqual({
         contract_ids: ['1', '2'],
         organization_id: filteredOrganization.id,
-        course_product_relation_id: routeCourseProductRelation.id,
+        offer_id: routeOffer.id,
         signature_state: ContractState.UNSIGNED,
       });
     });
@@ -155,7 +155,7 @@ describe('useTeacherContractFilters', () => {
   it('setFilters should update filter state', async () => {
     const defaultOrganization = OrganizationFactory({ id: 'default' }).one();
     const routeOrganization = OrganizationFactory({ id: 'route' }).one();
-    const routeCourseProductRelation = CourseProductRelationFactory().one();
+    const routeOffer = OfferFactory().one();
     // fetching user's organizations to initialize default organizationId.
     fetchMock.get('https://joanie.test/api/v1.0/organizations/', [defaultOrganization]);
     const { result } = renderHook(useTeacherContractFilters, {
@@ -169,7 +169,7 @@ describe('useTeacherContractFilters', () => {
     const expectedInitialFilters = {
       contract_ids: [],
       organization_id: defaultOrganization.id,
-      course_product_relation_id: undefined,
+      offer_id: undefined,
       signature_state: ContractState.SIGNED,
     };
     await waitFor(() => {
@@ -179,7 +179,7 @@ describe('useTeacherContractFilters', () => {
     const newFilters = {
       contract_ids: ['1', '2'],
       organization_id: routeOrganization.id,
-      course_product_relation_id: routeCourseProductRelation.id,
+      offer_id: routeOffer.id,
       signature_state: ContractState.UNSIGNED,
     };
     act(() => {

frontend/js/pages/TeacherDashboardContractsLayout/hooks/useTeacherContractFilters/index.tsx

@@ -5,16 +5,16 @@ import { ContractResourceQuery, ContractState } from 'types/Joanie';
 
 export type TeacherDashboardContractsParams = {
   organizationId?: string;
-  courseProductRelationId?: string;
+  offerId?: string;
 };
 
 const useTeacherContractFilters = () => {
-  const { courseProductRelationId } = useParams<TeacherDashboardContractsParams>();
+  const { offerId } = useParams<TeacherDashboardContractsParams>();
   const [searchParams] = useSearchParams();
   const searchFilters: ContractResourceQuery = useMemo(() => {
     return {
       organization_id: searchParams.get('organization_id') || undefined,
-      course_product_relation_id: searchParams.get('course_product_relation_id') || undefined,
+      offer_id: searchParams.get('offer_id') || undefined,
       contract_ids: searchParams.getAll('contract_ids') || undefined,
       signature_state:
         (searchParams.get('signature_state') as ContractState) || ContractState.SIGNED,
@@ -28,7 +28,7 @@ const useTeacherContractFilters = () => {
     return {
       ...searchFilters,
       organization_id: defaultOrganizationId,
-      course_product_relation_id: courseProductRelationId,
+      offer_id: offerId,
     };
   }, [defaultOrganizationId]);
   const [filters, setFilters] = useState<ContractResourceQuery>(initialFilters);