chore(deps): migre les imports react-router-dom vers react-router

package.json

@@ -4,7 +4,7 @@
   "private": true,
   "type": "module",
   "engines": {
-    "node": ">=22.0.0"
+    "node": ">=22.22.0"
   },
   "dependencies": {
     "@date-io/moment": "^2.16.1",
@@ -48,7 +48,6 @@
     "react-pdf": "^10.0.1",
     "react-redux": "^9.2.0",
     "react-router": "^8.3.0",
-    "react-router-dom": "^7.17.0",
     "react-use-websocket": "4.13.0",
     "react-window": "^1.8.10",
     "redux": "^5.0.1",

src/__tests__/components/ExportForm.test.tsx

@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { render, screen, waitFor } from '@testing-library/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 
 const dispatch = vi.fn()
 vi.mock('state', () => ({ useAppDispatch: () => dispatch }))

src/__tests__/components/LeftSideBar.test.tsx

@@ -1,13 +1,13 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { render, screen, fireEvent } from '@testing-library/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 import { AppConfig, getConfig } from 'config'
 
 const dispatch = vi.fn()
 const navigate = vi.fn()
 
-vi.mock('react-router-dom', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('react-router-dom')>()
+vi.mock('react-router', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('react-router')>()
   return { ...actual, useNavigate: () => navigate }
 })
 

src/__tests__/components/Login.test.tsx

@@ -1,13 +1,13 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { render, screen, fireEvent } from '@testing-library/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { AppConfig, getConfig } from 'config'
 
 const dispatch = vi.fn()
 const navigate = vi.fn()
-vi.mock('react-router-dom', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('react-router-dom')>()
+vi.mock('react-router', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('react-router')>()
   return { ...actual, useNavigate: () => navigate }
 })
 

src/__tests__/components/PatientHeader.test.tsx

@@ -1,10 +1,10 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { render, screen } from '@testing-library/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 
 const navigate = vi.fn()
-vi.mock('react-router-dom', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('react-router-dom')>()
+vi.mock('react-router', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('react-router')>()
   return { ...actual, useNavigate: () => navigate }
 })
 

src/__tests__/components/ProjectsList.test.tsx

@@ -1,14 +1,14 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { render, screen } from '@testing-library/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 
 vi.mock('react-pdf', () => ({ Document: () => null, Page: () => null, pdfjs: { GlobalWorkerOptions: {} } }))
 vi.mock('components/DocumentViewer/DocumentViewer', () => ({ default: () => <div data-testid="doc-viewer" /> }))
 
 const navigate = vi.fn()
-vi.mock('react-router-dom', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('react-router-dom')>()
+vi.mock('react-router', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('react-router')>()
   return { ...actual, useNavigate: () => navigate }
 })
 

src/__tests__/components/SearchPatientCard.test.tsx

@@ -2,8 +2,8 @@ import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { render, screen, fireEvent } from '@testing-library/react'
 
 const navigate = vi.fn()
-vi.mock('react-router-dom', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('react-router-dom')>()
+vi.mock('react-router', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('react-router')>()
   return { ...actual, useNavigate: () => navigate }
 })
 

src/__tests__/components/TopBar.test.tsx

@@ -1,14 +1,14 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { render, screen } from '@testing-library/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 import { AppConfig, getConfig } from 'config'
 import { URLS } from 'types/exploration'
 import { AccessLevel } from 'components/ui/AccessBadge'
 
 const dispatch = vi.fn()
 const navigate = vi.fn()
-vi.mock('react-router-dom', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('react-router-dom')>()
+vi.mock('react-router', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('react-router')>()
   return { ...actual, useNavigate: () => navigate }
 })
 

src/components/CreationCohort/DiagramView/components/PopulationCard/components/ModalRightError.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { useNavigate } from 'react-router-dom'
+import { useNavigate } from 'react-router'
 
 import Button from '@mui/material/Button'
 import Dialog from '@mui/material/Dialog'

src/components/CreationCohort/Modals/ModalCreateNewRequest/ModalCreateNewRequest.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import { useNavigate } from 'react-router-dom'
+import { useNavigate } from 'react-router'
 
 import { Button, CircularProgress, Dialog, DialogActions, DialogContent, DialogTitle, Grid } from '@mui/material'
 

src/components/CreationCohort/Requeteur.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState, useRef, useContext } from 'react'
 import { CircularProgress } from '@mui/material'
-import { useNavigate, useParams } from 'react-router-dom'
+import { useNavigate, useParams } from 'react-router'
 
 import Grid from '@mui/material/Grid'
 

src/components/Dashboard/Preview/Preview.tsx

@@ -27,7 +27,7 @@ import { format } from 'utils/numbers'
 import { SimpleChartDataType, GenderRepartitionType, AgeRepartitionType, VisiteRepartitionType } from 'types'
 import LocationMap from 'components/Dashboard/Preview/LocationMap'
 import { AppConfig } from 'config'
-import { useSearchParams } from 'react-router-dom'
+import { useSearchParams } from 'react-router'
 import { getCleanGroupId } from 'utils/paginationUtils'
 
 const MAP_WARNING_PERSON_COUNT_THRESHOLD = 1000000

src/components/ErrorView/CohortNoPatient.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { useNavigate } from 'react-router-dom'
+import { useNavigate } from 'react-router'
 
 import Button from '@mui/material/Button'
 import Grid from '@mui/material/Grid'

src/components/ErrorView/CohortRightOrNotExist.tsx

@@ -1,5 +1,5 @@
 import React, { useContext } from 'react'
-import { useNavigate } from 'react-router-dom'
+import { useNavigate } from 'react-router'
 
 import Button from '@mui/material/Button'
 import Grid from '@mui/material/Grid'

src/components/ErrorView/NoRights.tsx

@@ -1,5 +1,5 @@
 import React, { useContext } from 'react'
-import { useNavigate } from 'react-router-dom'
+import { useNavigate } from 'react-router'
 
 import Button from '@mui/material/Button'
 import Grid from '@mui/material/Grid'

src/components/ErrorView/PatientNotExist.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { useNavigate } from 'react-router-dom'
+import { useNavigate } from 'react-router'
 
 import Button from '@mui/material/Button'
 import Grid from '@mui/material/Grid'

src/components/ExplorationBoard/useCleanSearchParams.tsx

@@ -1,5 +1,5 @@
 import { useEffect } from 'react'
-import { useSearchParams, useNavigate, useLocation } from 'react-router-dom'
+import { useSearchParams, useNavigate, useLocation } from 'react-router'
 import { getCleanGroupId } from 'utils/paginationUtils'
 
 const ALLOWED_PARAMS = ['page', 'groupId', 'subtab']

src/components/Patient/PatientHeader/PatientHeader.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { useNavigate } from 'react-router-dom'
+import { useNavigate } from 'react-router'
 import { useAppSelector } from 'state'
 
 import { CohortPatient } from 'types'

src/components/Patient/index.tsx

@@ -1,5 +1,5 @@
 import React, { useContext, useMemo, useState } from 'react'
-import { Link } from 'react-router-dom'
+import { Link } from 'react-router'
 import { Grid, Tab } from '@mui/material'
 import PatientHeader from 'components/Patient/PatientHeader/PatientHeader'
 import PatientPreview from 'components/Patient/PatientPreview/PatientPreview'

src/components/Researches/Breadcrumbs/index.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Link as RouterLink } from 'react-router-dom'
+import { Link as RouterLink } from 'react-router'
 import useBreadcrumbs from 'hooks/researches/useBreadcrumbs'
 import { Link, Typography } from '@mui/material'
 import { StyledBreadcrumbs } from './style'

src/components/Researches/CohortsList.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react'
-import { useNavigate, useParams } from 'react-router-dom'
+import { useNavigate, useParams } from 'react-router'
 
 import AddOrEditItem from './Modals/AddOrEditItem'
 import CohortsTableContent from './CohortsTableContent'

src/components/Researches/CohortsTableContent.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useContext, useMemo } from 'react'
 import { AppConfig } from 'config'
-import { useNavigate, useParams } from 'react-router-dom'
+import { useNavigate, useParams } from 'react-router'
 
 import CenteredCircularProgress from 'components/ui/CenteredCircularProgress'
 import DataTable from 'components/ui/Table'

src/components/Researches/ProjectsList.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import { useNavigate, useSearchParams } from 'react-router-dom'
+import { useNavigate, useSearchParams } from 'react-router'
 import { useAppSelector } from 'state'
 
 import { Grid, Typography } from '@mui/material'

src/components/Researches/RequestsList.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable max-statements */
 import React, { useEffect, useState } from 'react'
-import { useNavigate, useParams, useSearchParams } from 'react-router-dom'
+import { useNavigate, useParams, useSearchParams } from 'react-router'
 import { useAppDispatch, useAppSelector } from 'state'
 import { resetCohortCreation } from 'state/cohortCreation'
 import { setSelectedProject } from 'state/project'

src/components/Researches/RequestsTableContent.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useMemo } from 'react'
-import { useNavigate, useParams } from 'react-router-dom'
+import { useNavigate, useParams } from 'react-router'
 
 import CenteredCircularProgress from 'components/ui/CenteredCircularProgress'
 import DataTable from 'components/ui/Table'

src/components/Researches/SamplesList.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react'
-import { useNavigate, useParams } from 'react-router-dom'
+import { useNavigate, useParams } from 'react-router'
 
 import AddOrEditItem from './Modals/AddOrEditItem'
 import ConfirmDeletion from './Modals/ConfirmDeletion'

src/components/Researches/SamplesTableContent.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useContext, useMemo } from 'react'
 import { AppConfig } from 'config'
-import { useNavigate, useParams } from 'react-router-dom'
+import { useNavigate, useParams } from 'react-router'
 
 import CenteredCircularProgress from 'components/ui/CenteredCircularProgress'
 import DataTable from 'components/ui/Table'

src/components/Routes/AppNavigation/AppNavigation.tsx

@@ -1,5 +1,5 @@
 import React, { PropsWithChildren, useEffect } from 'react'
-import { BrowserRouter as Router, Routes, Route, useNavigate } from 'react-router-dom'
+import { BrowserRouter as Router, Routes, Route, useNavigate } from 'react-router'
 
 import { useAppSelector } from 'state/index'
 

src/components/Routes/AutoLogoutContainer.tsx

@@ -19,7 +19,7 @@
 
 import React, { useContext, useEffect } from 'react'
 import { useIdleTimer } from 'react-idle-timer'
-import { useNavigate } from 'react-router-dom'
+import { useNavigate } from 'react-router'
 
 import { Button, Dialog, DialogActions, DialogContent, DialogContentText } from '@mui/material'
 

src/components/Routes/LeftSideBar/LeftSideBar.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, ReactElement, useContext } from 'react'
-import { useNavigate } from 'react-router-dom'
+import { useNavigate } from 'react-router'
 
 import {
   Box,

src/components/Routes/PrivateRoute.tsx

@@ -32,7 +32,7 @@ import { AppConfig } from 'config'
 import { throttle } from 'lodash'
 import type React from 'react'
 import { useContext, useEffect, useState } from 'react'
-import { Navigate, Outlet, useLocation } from 'react-router-dom'
+import { Navigate, Outlet, useLocation } from 'react-router'
 import useOnboardingEnabled from 'hooks/onboarding/useOnboardingEnabled'
 import useOnboardingStatus from 'hooks/onboarding/useOnboardingStatus'
 import { updateConfigFromFhirMetadata } from 'services/aphp/serviceFhirConfig'

src/components/Routes/__tests__/PrivateRoute.test.tsx

@@ -1,5 +1,5 @@
 import { render, screen } from '@testing-library/react'
-import { MemoryRouter, Route, Routes } from 'react-router-dom'
+import { MemoryRouter, Route, Routes } from 'react-router'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const { mockUseAppSelector, mockUseOnboardingStatus, mockUseOnboardingEnabled } = vi.hoisted(() => ({

src/components/TopBar/TopBar.tsx

@@ -1,5 +1,5 @@
 import React, { useContext, useEffect, useState } from 'react'
-import { useNavigate } from 'react-router-dom'
+import { useNavigate } from 'react-router'
 
 import { IconButton, Menu, MenuItem } from '@mui/material'