diff --git a/package-lock.json b/package-lock.json index 317c8b4fe8..4bfe9cef93 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,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", @@ -3037,6 +3037,7 @@ "version": "1.21.0", "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.21.0.tgz", "integrity": "sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==", + "license": "MIT", "engines": { "node": ">=14.0.0" } @@ -10976,9 +10977,10 @@ } }, "node_modules/react-router": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.0.tgz", - "integrity": "sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==", + "version": "6.28.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.1.tgz", + "integrity": "sha512-2omQTA3rkMljmrvvo6WtewGdVh45SpL9hGiCI9uUrwGGfNFDIvGK4gYJsKlJoNVi6AQZcopSCballL+QGOm7fA==", + "license": "MIT", "dependencies": { "@remix-run/router": "1.21.0" }, @@ -10990,12 +10992,13 @@ } }, "node_modules/react-router-dom": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.0.tgz", - "integrity": "sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==", + "version": "6.28.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.1.tgz", + "integrity": "sha512-YraE27C/RdjcZwl5UCqF/ffXnZDxpJdk9Q6jw38SZHjXs7NNdpViq2l2c7fO7+4uWaEfcwfGCv3RSg4e1By/fQ==", + "license": "MIT", "dependencies": { "@remix-run/router": "1.21.0", - "react-router": "6.28.0" + "react-router": "6.28.1" }, "engines": { "node": ">=14.0.0" diff --git a/package.json b/package.json index f3f5e2ef98..614fdcbc95 100644 --- 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 index 9065075a63..4e1cc4815f 100644 --- a/src/web/routes.jsx +++ b/src/web/routes.jsx @@ -213,9 +213,14 @@ const LoggedInRoutes = () => { } path="/notfound" /> } path="/auditreports" /> - } - path="/auditreport/delta/:id/:deltaid" /> - } path="/auditreport/:id" /> + } + path="/auditreport/delta/:id/:deltaid" + /> + } + path="/auditreport/:id" + /> } path="/" /> } path="*" /> @@ -241,7 +246,16 @@ const AppRoutes = () => { } return ( - {isLoggedIn ? : } + + {isLoggedIn ? : } + ); }; diff --git a/src/web/utils/testing.jsx b/src/web/utils/testing.jsx index ed6cd6afab..a88d0fc9c5 100644 --- a/src/web/utils/testing.jsx +++ b/src/web/utils/testing.jsx @@ -144,7 +144,17 @@ export const rendererWith = ( {router ? ( - {children} + + {children} + ) : ( children )}