richie-education 2.25.0-b2.dev168 → 2.25.0-b2.dev170

package/js/components/CourseGlimpse/utils.ts

@@ -1,12 +1,12 @@
 import { IntlShape } from 'react-intl';
+import { generatePath } from 'react-router-dom';
 import { Course as RichieCourse, isRichieCourse } from 'types/Course';
-import { getDashboardRoutePath } from 'widgets/Dashboard/utils/dashboardRoutes';
-import { TeacherDashboardPaths } from 'widgets/Dashboard/utils/teacherRouteMessages';
 import {
   CourseListItem as JoanieCourse,
   CourseProductRelation,
   isCourseProductRelation,
 } from 'types/Joanie';
+import { TeacherDashboardPaths } from 'widgets/Dashboard/utils/teacherDashboardPaths';
 import { CourseGlimpseCourse } from '.';
 
 const getCourseGlimpsePropsFromCourseProductRelation = (
@@ -14,17 +14,16 @@ const getCourseGlimpsePropsFromCourseProductRelation = (
   intl: IntlShape,
   organizationId?: string,
 ): CourseGlimpseCourse => {
-  const getRoutePath = getDashboardRoutePath(intl);
   const courseRouteParams = {
     courseId: courseProductRelation.course.id,
     courseProductRelationId: courseProductRelation.id,
   };
   const courseRoute = organizationId
-    ? getRoutePath(TeacherDashboardPaths.ORGANIZATION_PRODUCT, {
+    ? generatePath(TeacherDashboardPaths.ORGANIZATION_PRODUCT, {
         ...courseRouteParams,
         organizationId,
       })
-    : getRoutePath(TeacherDashboardPaths.COURSE_PRODUCT, courseRouteParams);
+    : generatePath(TeacherDashboardPaths.COURSE_PRODUCT, courseRouteParams);
   return {
     id: courseProductRelation.id,
     code: courseProductRelation.course.code,
@@ -67,16 +66,15 @@ const getCourseGlimpsePropsFromJoanieCourse = (
   intl: IntlShape,
   organizationId?: string,
 ): CourseGlimpseCourse => {
-  const getRoutePath = getDashboardRoutePath(intl);
   const courseRouteParams = {
     courseId: course.id,
   };
   const courseRoute = organizationId
-    ? getRoutePath(TeacherDashboardPaths.ORGANIZATION_COURSE_GENERAL_INFORMATION, {
+    ? generatePath(TeacherDashboardPaths.ORGANIZATION_COURSE_GENERAL_INFORMATION, {
         ...courseRouteParams,
         organizationId,
       })
-    : getRoutePath(TeacherDashboardPaths.COURSE_GENERAL_INFORMATION, courseRouteParams);
+    : generatePath(TeacherDashboardPaths.COURSE_GENERAL_INFORMATION, courseRouteParams);
   return {
     id: course.id,
     code: course.code,

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

@@ -1,10 +1,11 @@
 import { Button } from '@openfun/cunningham-react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+import { generatePath } from 'react-router-dom';
 import { SuccessIcon } from 'components/SuccessIcon';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
 import { getDashboardBasename } from 'widgets/Dashboard/hooks/useDashboardRouter/getDashboardBasename';
 import { useSaleTunnelContext } from 'components/SaleTunnel/context';
-import { getDashboardRoutePath } from 'widgets/Dashboard/utils/dashboardRoutes';
+
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
 
 const messages = defineMessages({
   congratulations: {
@@ -72,7 +73,7 @@ export const SaleTunnelStepResume = ({ next }: SaleTunnelStepResumeProps) => {
           <Button
             href={
               getDashboardBasename(intl.locale) +
-              getDashboardRoutePath(intl)(LearnerDashboardPaths.ORDER, { orderId: order!.id })
+              generatePath(LearnerDashboardPaths.ORDER, { orderId: order!.id })
             }
           >
             <FormattedMessage {...messages.ctaSignature} />

package/js/components/SignContractButton/index.tsx

@@ -1,15 +1,16 @@
 import { Button } from '@openfun/cunningham-react';
-import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
+import { FormattedMessage, defineMessages } from 'react-intl';
 import { useState } from 'react';
+import { generatePath } from 'react-router-dom';
 import { LearnerContractFrame } from 'components/ContractFrame';
 import { Contract, ContractState, CredentialOrder, NestedCredentialOrder } from 'types/Joanie';
 import { RouterButton } from 'widgets/Dashboard/components/RouterButton';
-import { getDashboardRoutePath } from 'widgets/Dashboard/utils/dashboardRoutes';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
 import DownloadContractButton from 'components/DownloadContractButton';
 import { Maybe } from 'types/utils';
 import { ContractHelper } from 'utils/ContractHelper';
 
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
+
 const messages = defineMessages({
   contractSignActionLabel: {
     id: 'components.SignContractButton.contractSignActionLabel',
@@ -42,11 +43,10 @@ interface SignContractButtonLinkProps {
 }
 
 const SignContractButtonLink = ({ orderId, className }: SignContractButtonLinkProps) => {
-  const getRoutePath = getDashboardRoutePath(useIntl());
   return (
     <RouterButton
       size="small"
-      href={getRoutePath(LearnerDashboardPaths.ORDER, {
+      href={generatePath(LearnerDashboardPaths.ORDER, {
         orderId,
       })}
       className={className}

package/js/pages/DashboardAddressesManagement/DashboardCreateAddress.spec.tsx

@@ -9,7 +9,6 @@ import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/fac
 import { AddressFactory } from 'utils/test/factories/joanie';
 import { SessionProvider } from 'contexts/SessionContext';
 import { DashboardTest } from 'widgets/Dashboard/components/DashboardTest';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
 import { Address } from 'types/Joanie';
 import { expectFetchCall } from 'utils/test/expectFetchCall';
 import { expectBreadcrumbsToEqualParts } from 'utils/test/expectBreadcrumbsToEqualParts';
@@ -18,6 +17,8 @@ import { expectBannerError } from 'utils/test/expectBanner';
 import { changeSelect } from 'components/Form/test-utils';
 import { HttpStatusCode } from 'utils/errors/HttpError';
 
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
+
 jest.mock('utils/context', () => ({
   __esModule: true,
   default: mockRichieContextFactory({

package/js/pages/DashboardAddressesManagement/DashboardCreateAddressLoader.tsx

@@ -1,5 +1,5 @@
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
 import { useDashboardNavigate } from 'widgets/Dashboard/hooks/useDashboardRouter';
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
 import { DashboardCreateAddress } from './DashboardCreateAddress';
 
 /**

package/js/pages/DashboardAddressesManagement/DashboardEditAddress.spec.tsx

@@ -14,13 +14,14 @@ import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/fac
 import { AddressFactory } from 'utils/test/factories/joanie';
 import { SessionProvider } from 'contexts/SessionContext';
 import { DashboardTest } from 'widgets/Dashboard/components/DashboardTest';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
 import { expectFetchCall } from 'utils/test/expectFetchCall';
 import { expectBreadcrumbsToEqualParts } from 'utils/test/expectBreadcrumbsToEqualParts';
 import JoanieSessionProvider from 'contexts/SessionContext/JoanieSessionProvider';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import { HttpStatusCode } from 'utils/errors/HttpError';
 
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
+
 jest.mock('utils/context', () => ({
   __esModule: true,
   default: mockRichieContextFactory({

package/js/pages/DashboardAddressesManagement/DashboardEditAddressLoader.tsx

@@ -2,9 +2,9 @@ import { useParams } from 'react-router-dom';
 import Banner, { BannerType } from 'components/Banner';
 import { Spinner } from 'components/Spinner';
 import { useAddress } from 'hooks/useAddresses';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
 import { useDashboardNavigate } from 'widgets/Dashboard/hooks/useDashboardRouter';
 import { useBreadcrumbsPlaceholders } from 'hooks/useBreadcrumbsPlaceholders';
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
 import { DashboardEditAddress } from './DashboardEditAddress';
 
 /**

package/js/pages/DashboardAddressesManagement/index.spec.tsx

@@ -15,7 +15,6 @@ import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/fac
 import { AddressFactory } from 'utils/test/factories/joanie';
 import { SessionProvider } from 'contexts/SessionContext';
 import { DashboardTest } from 'widgets/Dashboard/components/DashboardTest';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
 import * as Joanie from 'types/Joanie';
 import { expectBreadcrumbsToEqualParts } from 'utils/test/expectBreadcrumbsToEqualParts';
 import { resolveAll } from 'utils/resolveAll';
@@ -23,6 +22,8 @@ import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import { expectBannerError } from 'utils/test/expectBanner';
 import { HttpStatusCode } from 'utils/errors/HttpError';
 
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
+
 jest.mock('utils/context', () => ({
   __esModule: true,
   default: mockRichieContextFactory({

package/js/pages/DashboardCertificates/index.spec.tsx

@@ -13,10 +13,11 @@ import { Deferred } from 'utils/test/deferred';
 import { History, HistoryContext } from 'hooks/useHistory';
 import { SessionProvider } from 'contexts/SessionContext';
 import { DashboardTest } from 'widgets/Dashboard/components/DashboardTest';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
 import { CertificateFactory } from 'utils/test/factories/joanie';
 import { HttpStatusCode } from 'utils/errors/HttpError';
 
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
+
 jest.mock('utils/context', () => ({
   __esModule: true,
   default: mockRichieContextFactory({

package/js/pages/DashboardContracts/index.spec.tsx

@@ -13,9 +13,10 @@ import { Deferred } from 'utils/test/deferred';
 import { History, HistoryContext } from 'hooks/useHistory';
 import { SessionProvider } from 'contexts/SessionContext';
 import { DashboardTest } from 'widgets/Dashboard/components/DashboardTest';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
 import { ContractFactory } from 'utils/test/factories/joanie';
 
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
+
 jest.mock('utils/context', () => ({
   __esModule: true,
   default: mockRichieContextFactory({

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

@@ -10,7 +10,6 @@ import {
   CredentialOrderFactory,
 } from 'utils/test/factories/joanie';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
 import { CourseLight, CourseProductRelation, Enrollment, CredentialOrder } from 'types/Joanie';
 import { expectNoSpinner, expectSpinner } from 'utils/test/expectSpinner';
 import { expectBannerError, expectBannerInfo, expectNoBannerInfo } from 'utils/test/expectBanner';
@@ -23,6 +22,8 @@ import { setupJoanieSession } from 'utils/test/wrappers/JoanieAppWrapper';
 import { render } from 'utils/test/render';
 import { BaseJoanieAppWrapper } from 'utils/test/wrappers/BaseJoanieAppWrapper';
 
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
+
 jest.mock('utils/context', () => ({
   __esModule: true,
   default: mockRichieContextFactory({

package/js/pages/DashboardCreditCardsManagement/DashboardEditCreditCard.spec.tsx

@@ -14,13 +14,14 @@ import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/fac
 import { CreditCardFactory } from 'utils/test/factories/joanie';
 import { DashboardTest } from 'widgets/Dashboard/components/DashboardTest';
 import { SessionProvider } from 'contexts/SessionContext';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
 import { expectFetchCall } from 'utils/test/expectFetchCall';
 import { expectBreadcrumbsToEqualParts } from 'utils/test/expectBreadcrumbsToEqualParts';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import { expectBannerError } from 'utils/test/expectBanner';
 import { HttpStatusCode } from 'utils/errors/HttpError';
 
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
+
 jest.mock('utils/context', () => ({
   __esModule: true,
   default: mockRichieContextFactory({

package/js/pages/DashboardCreditCardsManagement/DashboardEditCreditCardLoader.tsx

@@ -1,10 +1,10 @@
 import { useParams } from 'react-router-dom';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
 import { useDashboardNavigate } from 'widgets/Dashboard/hooks/useDashboardRouter';
 import { useCreditCard } from 'hooks/useCreditCards';
 import { Spinner } from 'components/Spinner';
 import Banner, { BannerType } from 'components/Banner';
 import { useBreadcrumbsPlaceholders } from 'hooks/useBreadcrumbsPlaceholders';
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
 import { DashboardEditCreditCard } from './DashboardEditCreditCard';
 
 /**

package/js/pages/DashboardCreditCardsManagement/index.spec.tsx

@@ -16,7 +16,6 @@ import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/fac
 import { CreditCardFactory } from 'utils/test/factories/joanie';
 import { SessionProvider } from 'contexts/SessionContext';
 import { DashboardTest } from 'widgets/Dashboard/components/DashboardTest';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
 import { CreditCard } from 'types/Joanie';
 import { confirm } from 'utils/indirection/window';
 import { expectBreadcrumbsToEqualParts } from 'utils/test/expectBreadcrumbsToEqualParts';
@@ -24,6 +23,8 @@ import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import { expectBannerError } from 'utils/test/expectBanner';
 import { HttpStatusCode } from 'utils/errors/HttpError';
 
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
+
 jest.mock('utils/context', () => ({
   __esModule: true,
   default: mockRichieContextFactory({

package/js/pages/DashboardOrderLayout/index.spec.tsx

@@ -6,12 +6,13 @@ import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/fac
 import { CredentialOrder } from 'types/Joanie';
 import { CredentialOrderFactory, TargetCourseFactory } from 'utils/test/factories/joanie';
 import { mockCourseProductWithOrder } from 'utils/test/mockCourseProductWithOrder';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import { SessionProvider } from 'contexts/SessionContext';
 import { DashboardTest } from 'widgets/Dashboard/components/DashboardTest';
 import { expectUrlMatchLocationDisplayed } from 'utils/test/expectUrlMatchLocationDisplayed';
 
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
+
 jest.mock('utils/context', () => ({
   __esModule: true,
   default: mockRichieContextFactory({

package/js/pages/DashboardOrderLayout/index.tsx

@@ -1,11 +1,7 @@
-import { Outlet, useParams } from 'react-router-dom';
+import { generatePath, Outlet, useParams } from 'react-router-dom';
 import { useIntl } from 'react-intl';
 import { useMemo } from 'react';
-import {
-  getDashboardRouteLabel,
-  getDashboardRoutePath,
-} from 'widgets/Dashboard/utils/dashboardRoutes';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
+import { getDashboardRouteLabel } from 'widgets/Dashboard/utils/dashboardRoutes';
 import { DashboardLayout } from 'widgets/Dashboard/components/DashboardLayout';
 import { useOmniscientOrder } from 'hooks/useOrders';
 import { useBreadcrumbsPlaceholders } from 'hooks/useBreadcrumbsPlaceholders';
@@ -13,6 +9,8 @@ import { CourseLight, Product } from 'types/Joanie';
 import { LearnerDashboardSidebar } from 'widgets/Dashboard/components/LearnerDashboardSidebar';
 import { useCourseProduct } from 'hooks/useCourseProducts';
 
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
+
 export const DashboardOrderLayout = () => {
   const params = useParams<{ orderId: string }>();
   const order = useOmniscientOrder(params.orderId);
@@ -23,13 +21,12 @@ export const DashboardOrderLayout = () => {
   });
   const product = courseProduct?.item?.product;
   const intl = useIntl();
-  const getRoutePath = getDashboardRoutePath(intl);
   const getRouteLabel = getDashboardRouteLabel(intl);
 
   const links = useMemo(
     () => [
       {
-        to: getRoutePath(LearnerDashboardPaths.ORDER, { orderId: params.orderId }),
+        to: generatePath(LearnerDashboardPaths.ORDER, { orderId: params.orderId! }),
         label: getRouteLabel(LearnerDashboardPaths.ORDER_RUNS),
       },
     ],

package/js/pages/DashboardPreferences/index.tsx

@@ -1,8 +1,9 @@
 import { DashboardCreditCardsManagement } from 'pages/DashboardCreditCardsManagement';
 import { DashboardAddressesManagement } from 'pages/DashboardAddressesManagement';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
 import { useDashboardNavigate } from 'widgets/Dashboard/hooks/useDashboardRouter';
 
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
+
 /**
  * This component relies on react-router.
  */

package/js/widgets/Dashboard/components/DashboardItem/Enrollment/ProductCertificateFooter/index.spec.tsx

@@ -16,13 +16,13 @@ import {
 } from 'utils/test/factories/joanie';
 import { Priority } from 'types';
 import { DashboardTest } from 'widgets/Dashboard/components/DashboardTest';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
 import { expectNoSpinner } from 'utils/test/expectSpinner';
 import { PER_PAGE } from 'settings';
 import { SaleTunnelProps } from 'components/SaleTunnel';
 import { setupJoanieSession } from 'utils/test/wrappers/JoanieAppWrapper';
 import { render } from 'utils/test/render';
 import { BaseJoanieAppWrapper } from 'utils/test/wrappers/BaseJoanieAppWrapper';
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
 import ProductCertificateFooter from '.';
 
 jest.mock('utils/context', () => ({

package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrder.spec.tsx

@@ -39,7 +39,7 @@ import { HttpStatusCode } from 'utils/errors/HttpError';
 import { setupJoanieSession } from 'utils/test/wrappers/JoanieAppWrapper';
 import { render } from 'utils/test/render';
 import { BaseJoanieAppWrapper } from 'utils/test/wrappers/BaseJoanieAppWrapper';
-import { LearnerDashboardPaths } from '../../../utils/learnerRouteMessages';
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
 import { DashboardTest } from '../../DashboardTest';
 import { DashboardItemOrder } from './DashboardItemOrder';
 

package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrder.tsx

@@ -1,6 +1,7 @@
 import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
 import { Button } from '@openfun/cunningham-react';
 import classNames from 'classnames';
+import { generatePath } from 'react-router-dom';
 import { CourseLight, CredentialOrder, Product } from 'types/Joanie';
 import { Icon, IconTypeEnum } from 'components/Icon';
 import { CoursesHelper } from 'utils/CoursesHelper';
@@ -9,13 +10,12 @@ import { Spinner } from 'components/Spinner';
 import { DashboardSubItem } from 'widgets/Dashboard/components/DashboardItem/DashboardSubItem';
 import { DashboardItemCertificate } from 'widgets/Dashboard/components/DashboardItem/Certificate';
 import { RouterButton } from 'widgets/Dashboard/components/RouterButton';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
-import { getDashboardRoutePath } from 'widgets/Dashboard/utils/dashboardRoutes';
 import { useCourseProduct } from 'hooks/useCourseProducts';
 import { OrderHelper } from 'utils/OrderHelper';
 import ContractStatus from 'components/ContractStatus';
 import SignContractButton from 'components/SignContractButton';
 import { AddressView } from 'components/Address';
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
 import { DashboardSubItemsList } from '../DashboardSubItemsList';
 import { DashboardItemCourseEnrolling } from '../CourseEnrolling';
 import { DashboardItem } from '../index';
@@ -138,7 +138,6 @@ export const DashboardItemOrder = ({
   });
   const { product } = courseProductRelation || {};
   const needsSignature = OrderHelper.orderNeedsSignature(order, product?.contract_definition);
-  const getRoutePath = getDashboardRoutePath(useIntl());
 
   return (
     <div className="dashboard-item-order">
@@ -168,7 +167,7 @@ export const DashboardItemOrder = ({
                 <RouterButton
                   size="small"
                   className="dashboard-item__button"
-                  href={getRoutePath(LearnerDashboardPaths.ORDER, { orderId: order.id })}
+                  href={generatePath(LearnerDashboardPaths.ORDER, { orderId: order.id })}
                   data-testid="dashboard-item-order__button"
                 >
                   {intl.formatMessage(messages.accessCourse)}
@@ -203,7 +202,7 @@ export const DashboardItemOrder = ({
                     targetCourse,
                     order,
                   )}
-                  notEnrolledUrl={getRoutePath(LearnerDashboardPaths.ORDER, {
+                  notEnrolledUrl={generatePath(LearnerDashboardPaths.ORDER, {
                     orderId: order.id,
                   })}
                   hideEnrollButtons={needsSignature}

package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrderContract.spec.tsx

@@ -11,12 +11,13 @@ import {
   TargetCourseFactory,
 } from 'utils/test/factories/joanie';
 import { mockCourseProductWithOrder } from 'utils/test/mockCourseProductWithOrder';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
 import { expectBannerError } from 'utils/test/expectBanner';
 import { setupJoanieSession } from 'utils/test/wrappers/JoanieAppWrapper';
 import { render } from 'utils/test/render';
 import { BaseJoanieAppWrapper } from 'utils/test/wrappers/BaseJoanieAppWrapper';
 
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
+
 jest.mock('utils/context', () => ({
   __esModule: true,
   default: mockRichieContextFactory({

package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrderContract.useUnionResource.cache.spec.tsx

@@ -11,7 +11,6 @@ import {
   TargetCourseFactory,
 } from 'utils/test/factories/joanie';
 import { mockCourseProductWithOrder } from 'utils/test/mockCourseProductWithOrder';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
 import { Deferred } from 'utils/test/deferred';
 import { expectNoSpinner, expectSpinner } from 'utils/test/expectSpinner';
 import { CONTRACT_SETTINGS } from 'settings';
@@ -19,6 +18,8 @@ import { setupJoanieSession } from 'utils/test/wrappers/JoanieAppWrapper';
 import { render } from 'utils/test/render';
 import { BaseJoanieAppWrapper } from 'utils/test/wrappers/BaseJoanieAppWrapper';
 
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
+
 jest.mock('utils/context', () => ({
   __esModule: true,
   default: mockRichieContextFactory({

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

@@ -1,10 +1,7 @@
 import { defineMessages, useIntl } from 'react-intl';
 import { useMemo } from 'react';
-import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
-import {
-  getDashboardRouteLabel,
-  getDashboardRoutePath,
-} from 'widgets/Dashboard/utils/dashboardRoutes';
+import { generatePath } from 'react-router-dom';
+import { getDashboardRouteLabel } from 'widgets/Dashboard/utils/dashboardRoutes';
 import {
   DashboardSidebar,
   DashboardSidebarProps,
@@ -12,6 +9,8 @@ import {
 import { useSession } from 'contexts/SessionContext';
 import { UserHelper } from 'utils/UserHelper';
 
+import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
+
 const messages = defineMessages({
   header: {
     id: 'components.StudentDashboardSidebar.header',
@@ -29,7 +28,6 @@ export const LearnerDashboardSidebar = (props: Partial<DashboardSidebarProps>) =
   const intl = useIntl();
   const { user } = useSession();
 
-  const getRoutePath = getDashboardRoutePath(intl);
   const getRouteLabel = getDashboardRouteLabel(intl);
 
   const links = useMemo(
@@ -40,7 +38,7 @@ export const LearnerDashboardSidebar = (props: Partial<DashboardSidebarProps>) =
         LearnerDashboardPaths.CONTRACTS,
         LearnerDashboardPaths.PREFERENCES,
       ].map((path) => ({
-        to: getRoutePath(path),
+        to: generatePath(path),
         label: getRouteLabel(path),
       })),
     [],

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

@@ -3,11 +3,6 @@ import { screen } from '@testing-library/react';
 import { createIntl } from 'react-intl';
 import { CourseListItem } from 'types/Joanie';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
-import {
-  TEACHER_DASHBOARD_ROUTE_LABELS,
-  TeacherDashboardPaths,
-} from 'widgets/Dashboard/utils/teacherRouteMessages';
-
 import {
   CourseFactory,
   CourseProductRelationFactory,
@@ -16,6 +11,10 @@ import {
 import { expectNoSpinner } from 'utils/test/expectSpinner';
 import { render } from 'utils/test/render';
 import { setupJoanieSession } from 'utils/test/wrappers/JoanieAppWrapper';
+import {
+  TEACHER_DASHBOARD_ROUTE_LABELS,
+  TeacherDashboardPaths,
+} from 'widgets/Dashboard/utils/teacherDashboardPaths';
 import { TeacherDashboardCourseSidebar, messages } from '.';
 
 jest.mock('utils/context', () => ({

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

@@ -1,17 +1,14 @@
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
-import { useParams } from 'react-router-dom';
+import { generatePath, useParams } from 'react-router-dom';
 import { useMemo } from 'react';
 import { capitalize } from 'lodash-es';
 import { DashboardSidebar, MenuLink } from 'widgets/Dashboard/components/DashboardSidebar';
-import {
-  getDashboardRouteLabel,
-  getDashboardRoutePath,
-} from 'widgets/Dashboard/utils/dashboardRoutes';
+import { getDashboardRouteLabel } from 'widgets/Dashboard/utils/dashboardRoutes';
 import { useCourse } from 'hooks/useCourses';
 import { Spinner } from 'components/Spinner';
 import { Icon, IconTypeEnum } from 'components/Icon';
 import { useCourseProductRelation } from 'hooks/useCourseProductRelation';
-import { TeacherDashboardPaths } from 'widgets/Dashboard/utils/teacherRouteMessages';
+import { TeacherDashboardPaths } from 'widgets/Dashboard/utils/teacherDashboardPaths';
 import ContractNavLink from '../DashboardSidebar/components/ContractNavLink';
 import { getMenuRoutes } from './utils';
 
@@ -40,7 +37,6 @@ export const messages = defineMessages({
 
 export const TeacherDashboardCourseSidebar = () => {
   const intl = useIntl();
-  const getRoutePath = getDashboardRoutePath(intl);
   const getRouteLabel = getDashboardRouteLabel(intl);
   const {
     organizationId: routeOrganizationId,
@@ -86,12 +82,11 @@ export const TeacherDashboardCourseSidebar = () => {
   );
 
   const getMenuLinkFromPath = (basePath: TeacherDashboardPaths) => {
-    const path = getRoutePath(basePath, {
-      organizationId: routeOrganizationId,
-      courseId: routeCourseId,
-      courseProductRelationId: routeCourseProductRelationId,
+    const path = generatePath(basePath, {
+      organizationId: routeOrganizationId ?? '',
+      courseId: routeCourseId ?? '',
+      courseProductRelationId: routeCourseProductRelationId ?? '',
     });
-
     const menuLink: MenuLink = {
       to: path,
       label: getRouteLabel(basePath),
@@ -114,7 +109,6 @@ export const TeacherDashboardCourseSidebar = () => {
 
     return menuLink;
   };
-
   const menuLinkList = useMemo(
     () =>
       getMenuRoutes({

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

@@ -1,4 +1,4 @@
-import { TeacherDashboardPaths } from 'widgets/Dashboard/utils/teacherRouteMessages';
+import { TeacherDashboardPaths } from 'widgets/Dashboard/utils/teacherDashboardPaths';
 
 interface GetMenuRoutesArgs {
   courseProductRelationId?: string;

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

@@ -1,13 +1,10 @@
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
-import { useParams } from 'react-router-dom';
+import { generatePath, useParams } from 'react-router-dom';
 import { Spinner } from 'components/Spinner';
 import { useOrganization } from 'hooks/useOrganizations';
 import { DashboardSidebar, MenuLink } from 'widgets/Dashboard/components/DashboardSidebar';
-import {
-  getDashboardRouteLabel,
-  getDashboardRoutePath,
-} from 'widgets/Dashboard/utils/dashboardRoutes';
-import { TeacherDashboardPaths } from 'widgets/Dashboard/utils/teacherRouteMessages';
+import { getDashboardRouteLabel } from 'widgets/Dashboard/utils/dashboardRoutes';
+import { TeacherDashboardPaths } from 'widgets/Dashboard/utils/teacherDashboardPaths';
 import { DashboardAvatar, DashboardAvatarVariantEnum } from '../DashboardAvatar';
 import ContractNavLink from '../DashboardSidebar/components/ContractNavLink';
 
@@ -26,7 +23,6 @@ const messages = defineMessages({
 
 export const TeacherDashboardOrganizationSidebar = () => {
   const intl = useIntl();
-  const getRoutePath = getDashboardRoutePath(intl);
   const getRouteLabel = getDashboardRouteLabel(intl);
   const { organizationId, courseProductRelationId } = useParams<{
     organizationId: string;
@@ -38,7 +34,7 @@ export const TeacherDashboardOrganizationSidebar = () => {
   } = useOrganization(organizationId);
 
   const getMenuLinkFromPath = (basePath: TeacherDashboardPaths) => {
-    const path = getRoutePath(basePath, { organizationId });
+    const path = generatePath(basePath, { organizationId } as any);
 
     const menuLink: MenuLink = {
       to: path,

package/js/widgets/Dashboard/components/TeacherDashboardProfileSidebar/components/OrganizationLinks/index.tsx

@@ -1,10 +1,10 @@
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
-import { Link } from 'react-router-dom';
+import { generatePath, Link } from 'react-router-dom';
 import { Organization } from 'types/Joanie';
-import { getDashboardRoutePath } from 'widgets/Dashboard/utils/dashboardRoutes';
-import { TeacherDashboardPaths } from 'widgets/Dashboard/utils/teacherRouteMessages';
 import { StringHelper } from 'utils/StringHelper';
 
+import { TeacherDashboardPaths } from 'widgets/Dashboard/utils/teacherDashboardPaths';
+
 export const messages = defineMessages({
   organizationsTitle: {
     id: 'components.TeacherDashboardProfileSidebar.OrganizationLinks.organizationsTitle',
@@ -33,7 +33,7 @@ const OrganizationLinks = ({ organizations }: OrganizationLinksProps) => {
         {organizations.map((organization) => (
           <Link
             key={organization.id}
-            to={getDashboardRoutePath(intl)(TeacherDashboardPaths.ORGANIZATION_COURSES, {
+            to={generatePath(TeacherDashboardPaths.ORGANIZATION_COURSES, {
               organizationId: organization.id,
             })}
             className="dashboard-sidebar__organization-section__link"