Test

mozilla · Oct 31, 2023 · cf1e3cf · cf1e3cf
1 parent 5a6a214
commit cf1e3cf
Show file tree

Hide file tree

Showing 6 changed files with 2,657 additions and 3,151 deletions.
diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "react-lazylog": "4.4.4",
     "react-linkify": "0.2.2",
     "react-redux": "8.0.7",
-    "react-router-dom": "5.1.2",
+    "react-router-dom": "6.17.0",
     "react-split-pane": "0.1.92",
     "react-table": "7.8.0",
     "react-table-6": "6.11.0",

diff --git a/ui/App.jsx b/ui/App.jsx
@@ -1,5 +1,5 @@
 import React, { Suspense, lazy } from 'react';
-import { Route, Switch } from 'react-router-dom';
+import { Route, Routes } from 'react-router-dom';
 import { hot } from 'react-hot-loader/root';
 import { Helmet } from 'react-helmet';
 import { ConnectedRouter } from 'connected-react-router';
@@ -116,14 +116,12 @@ const App = () => {
     <Provider store={configureStore()}>
       <ConnectedRouter history={history}>
         <Suspense fallback={<LoadingSpinner />}>
-          <Switch>
+          <Routes>
             <Route
-              exact
               path="/login"
               render={(props) => <LoginCallback {...props} />}
             />
             <Route
-              exact
               path="/taskcluster-auth"
               render={(props) => <TaskclusterCallback {...props} />}
             />
@@ -152,13 +150,13 @@ const App = () => {
               }
             />
             <Route
-              path="/push-health"
+              path="push-health/*"
               render={(props) =>
                 withFavicon(<PushHealthApp {...props} />, '/push-health')
               }
             />
             <Route
-              path="/intermittent-failures"
+              path="intermittent-failures/*"
               render={(props) =>
                 withFavicon(
                   <IntermittentFailuresApp {...props} />,
@@ -167,7 +165,7 @@ const App = () => {
               }
             />
             <Route
-              path="/perfherder"
+              path="perfherder/*"
               render={(props) =>
                 withFavicon(<PerfherderApp {...props} />, '/perfherder')
               }
@@ -181,7 +179,7 @@ const App = () => {
                 />
               )}
             />
-          </Switch>
+          </Routes>
         </Suspense>
       </ConnectedRouter>
     </Provider>

diff --git a/ui/intermittent-failures/App.jsx b/ui/intermittent-failures/App.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Route, Switch, Redirect } from 'react-router-dom';
+import { Route, Routes, Navigate } from 'react-router-dom';
 import { Container } from 'reactstrap';
 import { hot } from 'react-hot-loader/root';
 
@@ -40,7 +40,7 @@ class IntermittentFailuresApp extends React.Component {
             <ErrorMessages errorMessages={errorMessages} />
           </Container>
         )}
-        <Switch>
+        <Routes>
           <Route
             exact
             path={`${path}/main`}
@@ -70,15 +70,15 @@ class IntermittentFailuresApp extends React.Component {
             )}
           />
           <Route
-            path={`${path}/bugdetails`}
+            path="bugdetails"
             render={(props) => <BugDetailsView {...props} />}
           />
           <Route
-            path={`${path}/bugdetails?startday=:startday&endday=:endday&tree=:tree&failurehash=:failurehash&bug=bug`}
+            path="bugdetails?startday=:startday&endday=:endday&tree=:tree&failurehash=:failurehash&bug=bug"
             render={(props) => <BugDetailsView {...props} />}
           />
-          <Redirect from={`${path}/`} to={`${path}/main`} />
-        </Switch>
+          <Navigate replace from={`${path}/`} to={`${path}/main`} />
+        </Routes>
       </main>
     );
   }

diff --git a/ui/perfherder/App.jsx b/ui/perfherder/App.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Route, Switch, Redirect } from 'react-router-dom';
+import { Route, Routes, Navigate } from 'react-router-dom';
 import { hot } from 'react-hot-loader/root';
 import { Container } from 'reactstrap';
 
@@ -87,9 +87,9 @@ class App extends React.Component {
                   <ErrorMessages errorMessages={errorMessages} />
                 </Container>
               )}
-              <Switch>
+              <Routes>
                 <Route
-                  path={`${path}/alerts`}
+                  path="alerts"
                   render={(props) => (
                     <AlertsView
                       {...props}
@@ -101,7 +101,7 @@ class App extends React.Component {
                   )}
                 />
                 <Route
-                  path={`${path}/graphs`}
+                  path="graphs"
                   render={(props) => (
                     <GraphsView
                       {...props}
@@ -112,7 +112,7 @@ class App extends React.Component {
                   )}
                 />
                 <Route
-                  path={`${path}/comparechooser`}
+                  path="comparechooser"
                   render={(props) => (
                     <CompareSelectorView
                       {...props}
@@ -123,7 +123,7 @@ class App extends React.Component {
                   )}
                 />
                 <Route
-                  path={`${path}/compare`}
+                  path="compare"
                   render={(props) => (
                     <CompareView
                       {...props}
@@ -136,7 +136,7 @@ class App extends React.Component {
                   )}
                 />
                 <Route
-                  path={`${path}/infracompare`}
+                  path="infracompare"
                   render={(props) => (
                     <InfraCompareView
                       {...props}
@@ -149,7 +149,7 @@ class App extends React.Component {
                   )}
                 />
                 <Route
-                  path={`${path}/comparesubtest`}
+                  path="comparesubtest"
                   render={(props) => (
                     <CompareSubtestsView
                       {...props}
@@ -160,7 +160,7 @@ class App extends React.Component {
                   )}
                 />
                 <Route
-                  path={`${path}/comparesubtestdistribution`}
+                  path="comparesubtestdistribution"
                   render={(props) => (
                     <CompareSubtestDistributionView
                       {...props}
@@ -171,7 +171,7 @@ class App extends React.Component {
                   )}
                 />
                 <Route
-                  path={`${path}/tests`}
+                  path="tests"
                   render={(props) => (
                     <TestsView
                       {...props}
@@ -182,11 +182,12 @@ class App extends React.Component {
                     />
                   )}
                 />
-                <Redirect
+                <Navigate
+                  replace
                   from={`${path}/`}
                   to={`${path}/alerts?hideDwnToInv=1&page=1`}
                 />
-              </Switch>
+              </Routes>
             </main>
           )}
       </React.Fragment>

diff --git a/ui/push-health/App.jsx b/ui/push-health/App.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { hot } from 'react-hot-loader/root';
-import { Route, Switch } from 'react-router-dom';
+import { Route, Routes } from 'react-router-dom';
 
 import {
   clearNotificationAtIndex,
@@ -82,10 +82,9 @@ class App extends React.Component {
           notifications={notifications}
           clearNotification={this.clearNotification}
         />
-        <Switch>
+        <Routes>
           <Route
-            exact
-            path={`${path}/`}
+            path="/"
             render={(props) => (
               <MyPushes
                 {...props}
@@ -96,24 +95,21 @@ class App extends React.Component {
             )}
           />
           <Route
-            path={`${path}/push`}
-            render={(props) =>
+            path="push"
+            children={({ props }) =>
               hasProps(props.location.search) ? (
                 <Health
                   {...props}
                   notify={this.notify}
                   clearNotification={this.clearNotification}
                 />
               ) : (
-                (<NotFound />)()
+                <NotFound />
               )
             }
           />
-          <Route
-            path={`${path}/usage`}
-            render={(props) => <Usage {...props} />}
-          />
-        </Switch>
+          <Route path="usage" render={(props) => <Usage {...props} />} />
+        </Routes>
       </ErrorBoundary>
     );
   }