Merge pull request #4290 from greenbone/address-react-router-warnings

Address warnings of React Router
greenbone · Jan 16, 2025 · 3985053 · 3985053
2 parents a41c576 + 2bfa11a
commit 3985053
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
     "react-dom": "^18.3.1",
     "react-i18next": "^15.4.0",
     "react-redux": "^9.1.2",
-    "react-router-dom": "^6.28.0",
+    "react-router-dom": "^6.28.1",
     "redux": "^5.0.1",
     "redux-logger": "^3.0.6",
     "resize-observer-polyfill": "^1.5.1",

diff --git a/src/web/routes.jsx b/src/web/routes.jsx
@@ -213,9 +213,14 @@ const LoggedInRoutes = () => {
 
             <Route element={<PageNotFound />} path="/notfound" />
             <Route element={<AuditReportsPage />} path="/auditreports" />
-            <Route element={<DeltaAuditReportDetailsPage />}
-                        path="/auditreport/delta/:id/:deltaid" />
-            <Route element= {<AuditReportDetailsPage />} path="/auditreport/:id" />
+            <Route
+              element={<DeltaAuditReportDetailsPage />}
+              path="/auditreport/delta/:id/:deltaid"
+            />
+            <Route
+              element={<AuditReportDetailsPage />}
+              path="/auditreport/:id"
+            />
             <Route element={<Navigate to="/dashboards" />} path="/" />
 
             <Route element={<PageNotFound />} path="*" />
@@ -241,7 +246,16 @@ const AppRoutes = () => {
   }
 
   return (
-    <Router>{isLoggedIn ? <LoggedInRoutes /> : <LoggedOutRoutes />}</Router>
+    <Router
+      future={{
+        // eslint-disable-next-line camelcase
+        v7_startTransition: true,
+        // eslint-disable-next-line camelcase
+        v7_relativeSplatPath: false,
+      }}
+    >
+      {isLoggedIn ? <LoggedInRoutes /> : <LoggedOutRoutes />}
+    </Router>
   );
 };
 

diff --git a/src/web/utils/testing.jsx b/src/web/utils/testing.jsx
@@ -144,7 +144,17 @@ export const rendererWith = (
         <TestingLicenseProvider license={license}>
           <TestingStoreProvider store={store}>
             {router ? (
-              <BrowserRouter initialEntries={['/']}>{children}</BrowserRouter>
+              <BrowserRouter
+                future={{
+                  // eslint-disable-next-line camelcase
+                  v7_startTransition: true,
+                  // eslint-disable-next-line camelcase
+                  v7_relativeSplatPath: false,
+                }}
+                initialEntries={['/']}
+              >
+                {children}
+              </BrowserRouter>
             ) : (
               children
             )}