chore(rr6): remove CompatRouter imports (#5375)

canonical · Mar 26, 2024 · a6e3109 · a6e3109
1 parent 5e2d6fc
commit a6e3109
Show file tree

Hide file tree

Showing 195 changed files with 1,658 additions and 3,167 deletions.
diff --git a/src/app/base/components/AppSideNavigation/AppSideNavigation.test.tsx b/src/app/base/components/AppSideNavigation/AppSideNavigation.test.tsx
@@ -1,12 +1,6 @@
 import { createMemoryHistory } from "history";
 import { Provider } from "react-redux";
-import {
-  BrowserRouter,
-  Router,
-  CompatRouter,
-  Route,
-  Routes,
-} from "react-router-dom";
+import { BrowserRouter, Router, Route, Routes } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import AppSideNavigation from "./AppSideNavigation";
@@ -107,9 +101,7 @@ describe("GlobalSideNav", () => {
     render(
       <Provider store={store}>
         <BrowserRouter>
-          <CompatRouter>
-            <AppSideNavigation />
-          </CompatRouter>
+          <AppSideNavigation />
         </BrowserRouter>
       </Provider>
     );
@@ -344,11 +336,9 @@ describe("GlobalSideNav", () => {
     render(
       <Provider store={store}>
         <Router history={history}>
-          <CompatRouter>
-            <Routes>
-              <Route element={<AppSideNavigation />} path="*" />
-            </Routes>
-          </CompatRouter>
+          <Routes>
+            <Route element={<AppSideNavigation />} path="*" />
+          </Routes>
         </Router>
       </Provider>
     );

diff --git a/src/app/base/components/ControllerLink/ControllerLink.test.tsx b/src/app/base/components/ControllerLink/ControllerLink.test.tsx
@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import ControllerLink, { Labels } from "./ControllerLink";
@@ -19,9 +18,7 @@ it("handles when controllers are loading", () => {
   render(
     <Provider store={store}>
       <MemoryRouter>
-        <CompatRouter>
-          <ControllerLink systemId="abc123" />
-        </CompatRouter>
+        <ControllerLink systemId="abc123" />
       </MemoryRouter>
     </Provider>
   );
@@ -37,9 +34,7 @@ it("handles when a controller does not exist", () => {
   const { container } = render(
     <Provider store={store}>
       <MemoryRouter>
-        <CompatRouter>
-          <ControllerLink systemId="abc123" />
-        </CompatRouter>
+        <ControllerLink systemId="abc123" />
       </MemoryRouter>
     </Provider>
   );
@@ -62,9 +57,7 @@ it("renders a link if controllers have loaded and it exists", () => {
   render(
     <Provider store={store}>
       <MemoryRouter>
-        <CompatRouter>
-          <ControllerLink systemId={controller.system_id} />
-        </CompatRouter>
+        <ControllerLink systemId={controller.system_id} />
       </MemoryRouter>
     </Provider>
   );

diff --git a/src/app/base/components/DHCPTable/DHCPTable.test.tsx b/src/app/base/components/DHCPTable/DHCPTable.test.tsx
@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import DHCPTable, { TestIds } from "./DHCPTable";
@@ -51,12 +50,10 @@ describe("DHCPTable", () => {
         <MemoryRouter
           initialEntries={[{ pathname: "/machine/abc123", key: "testKey" }]}
         >
-          <CompatRouter>
-            <DHCPTable
-              modelName={MachineMeta.MODEL}
-              node={state.machine.items[0]}
-            />
-          </CompatRouter>
+          <DHCPTable
+            modelName={MachineMeta.MODEL}
+            node={state.machine.items[0]}
+          />
         </MemoryRouter>
       </Provider>
     );
@@ -79,12 +76,10 @@ describe("DHCPTable", () => {
         <MemoryRouter
           initialEntries={[{ pathname: "/machine/abc123", key: "testKey" }]}
         >
-          <CompatRouter>
-            <DHCPTable
-              modelName={MachineMeta.MODEL}
-              node={state.machine.items[0]}
-            />
-          </CompatRouter>
+          <DHCPTable
+            modelName={MachineMeta.MODEL}
+            node={state.machine.items[0]}
+          />
         </MemoryRouter>
       </Provider>
     );
@@ -108,9 +103,7 @@ describe("DHCPTable", () => {
         <MemoryRouter
           initialEntries={[{ pathname: "/machine/abc123", key: "testKey" }]}
         >
-          <CompatRouter>
-            <DHCPTable modelName={MachineMeta.MODEL} subnets={subnets} />
-          </CompatRouter>
+          <DHCPTable modelName={MachineMeta.MODEL} subnets={subnets} />
         </MemoryRouter>
       </Provider>
     );
@@ -139,12 +132,10 @@ describe("DHCPTable", () => {
         <MemoryRouter
           initialEntries={[{ pathname: "/machine/abc123", key: "testKey" }]}
         >
-          <CompatRouter>
-            <DHCPTable
-              modelName={MachineMeta.MODEL}
-              node={state.machine.items[0]}
-            />
-          </CompatRouter>
+          <DHCPTable
+            modelName={MachineMeta.MODEL}
+            node={state.machine.items[0]}
+          />
         </MemoryRouter>
       </Provider>
     );

diff --git a/src/app/base/components/DeviceLink/DeviceLink.test.tsx b/src/app/base/components/DeviceLink/DeviceLink.test.tsx
@@ -1,5 +1,5 @@
 import { Provider } from "react-redux";
-import { MemoryRouter, CompatRouter } from "react-router-dom";
+import { MemoryRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import DeviceLink, { Labels } from "./DeviceLink";
@@ -18,9 +18,7 @@ it("handles when devices are loading", () => {
   render(
     <Provider store={store}>
       <MemoryRouter>
-        <CompatRouter>
-          <DeviceLink systemId="abc123" />
-        </CompatRouter>
+        <DeviceLink systemId="abc123" />
       </MemoryRouter>
     </Provider>
   );
@@ -36,9 +34,7 @@ it("handles when a device does not exist", () => {
   const { container } = render(
     <Provider store={store}>
       <MemoryRouter>
-        <CompatRouter>
-          <DeviceLink systemId="abc123" />
-        </CompatRouter>
+        <DeviceLink systemId="abc123" />
       </MemoryRouter>
     </Provider>
   );
@@ -55,9 +51,7 @@ it("renders a link if devices have loaded and it exists", () => {
   render(
     <Provider store={store}>
       <MemoryRouter>
-        <CompatRouter>
-          <DeviceLink systemId={device.system_id} />
-        </CompatRouter>
+        <DeviceLink systemId={device.system_id} />
       </MemoryRouter>
     </Provider>
   );

diff --git a/src/app/base/components/DhcpForm/DhcpForm.test.tsx b/src/app/base/components/DhcpForm/DhcpForm.test.tsx
@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import { Labels as FieldLabels } from "../DhcpFormFields";
@@ -50,9 +49,7 @@ describe("DhcpForm", () => {
     const { unmount } = render(
       <Provider store={store}>
         <MemoryRouter initialEntries={["/"]}>
-          <CompatRouter>
-            <DhcpForm analyticsCategory="settings" />
-          </CompatRouter>
+          <DhcpForm analyticsCategory="settings" />
         </MemoryRouter>
       </Provider>
     );
@@ -71,9 +68,7 @@ describe("DhcpForm", () => {
     render(
       <Provider store={store}>
         <MemoryRouter initialEntries={["/"]}>
-          <CompatRouter>
-            <DhcpForm analyticsCategory="settings" id={dhcpSnippet.id} />
-          </CompatRouter>
+          <DhcpForm analyticsCategory="settings" id={dhcpSnippet.id} />
         </MemoryRouter>
       </Provider>
     );
@@ -104,9 +99,7 @@ describe("DhcpForm", () => {
     render(
       <Provider store={store}>
         <MemoryRouter initialEntries={["/"]}>
-          <CompatRouter>
-            <DhcpForm analyticsCategory="settings" />
-          </CompatRouter>
+          <DhcpForm analyticsCategory="settings" />
         </MemoryRouter>
       </Provider>
     );
@@ -146,9 +139,7 @@ describe("DhcpForm", () => {
     const Proxy = ({ analyticsCategory }: { analyticsCategory: string }) => (
       <Provider store={store}>
         <MemoryRouter initialEntries={["/"]}>
-          <CompatRouter>
-            <DhcpForm analyticsCategory={analyticsCategory} onSave={onSave} />
-          </CompatRouter>
+          <DhcpForm analyticsCategory={analyticsCategory} onSave={onSave} />
         </MemoryRouter>
       </Provider>
     );
@@ -172,9 +163,7 @@ describe("DhcpForm", () => {
     render(
       <Provider store={store}>
         <MemoryRouter initialEntries={["/"]}>
-          <CompatRouter>
-            <DhcpForm analyticsCategory="settings" onSave={onSave} />
-          </CompatRouter>
+          <DhcpForm analyticsCategory="settings" onSave={onSave} />
         </MemoryRouter>
       </Provider>
     );
@@ -194,9 +183,7 @@ describe("DhcpForm", () => {
     render(
       <Provider store={store}>
         <MemoryRouter initialEntries={["/"]}>
-          <CompatRouter>
-            <DhcpForm analyticsCategory="settings" />
-          </CompatRouter>
+          <DhcpForm analyticsCategory="settings" />
         </MemoryRouter>
       </Provider>
     );
@@ -212,12 +199,10 @@ describe("DhcpForm", () => {
     render(
       <Provider store={store}>
         <MemoryRouter initialEntries={["/"]}>
-          <CompatRouter>
-            <DhcpForm
-              analyticsCategory="settings"
-              id={state.dhcpsnippet.items[0].id}
-            />
-          </CompatRouter>
+          <DhcpForm
+            analyticsCategory="settings"
+            id={state.dhcpsnippet.items[0].id}
+          />
         </MemoryRouter>
       </Provider>
     );
@@ -246,12 +231,10 @@ describe("DhcpForm", () => {
     render(
       <Provider store={store}>
         <MemoryRouter initialEntries={["/"]}>
-          <CompatRouter>
-            <DhcpForm
-              analyticsCategory="settings"
-              id={state.dhcpsnippet.items[0].id}
-            />
-          </CompatRouter>
+          <DhcpForm
+            analyticsCategory="settings"
+            id={state.dhcpsnippet.items[0].id}
+          />
         </MemoryRouter>
       </Provider>
     );

diff --git a/src/app/base/components/DhcpFormFields/DhcpFormFields.test.tsx b/src/app/base/components/DhcpFormFields/DhcpFormFields.test.tsx
@@ -1,7 +1,6 @@
 import * as reduxToolkit from "@reduxjs/toolkit";
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import { Labels } from "./DhcpFormFields";
@@ -94,12 +93,10 @@ describe("DhcpFormFields", () => {
     render(
       <Provider store={store}>
         <MemoryRouter initialEntries={[{ pathname: "/", key: "testKey" }]}>
-          <CompatRouter>
-            <DhcpForm
-              analyticsCategory="settings"
-              id={state.dhcpsnippet.items[0].id}
-            />
-          </CompatRouter>
+          <DhcpForm
+            analyticsCategory="settings"
+            id={state.dhcpsnippet.items[0].id}
+          />
         </MemoryRouter>
       </Provider>
     );
@@ -120,9 +117,7 @@ describe("DhcpFormFields", () => {
     render(
       <Provider store={store}>
         <MemoryRouter initialEntries={[{ pathname: "/", key: "testKey" }]}>
-          <CompatRouter>
-            <DhcpForm analyticsCategory="settings" />
-          </CompatRouter>
+          <DhcpForm analyticsCategory="settings" />
         </MemoryRouter>
       </Provider>
     );
@@ -143,9 +138,7 @@ describe("DhcpFormFields", () => {
     render(
       <Provider store={store}>
         <MemoryRouter initialEntries={[{ pathname: "/", key: "testKey" }]}>
-          <CompatRouter>
-            <DhcpForm analyticsCategory="settings" />
-          </CompatRouter>
+          <DhcpForm analyticsCategory="settings" />
         </MemoryRouter>
       </Provider>
     );
@@ -166,9 +159,7 @@ describe("DhcpFormFields", () => {
     render(
       <Provider store={store}>
         <MemoryRouter initialEntries={[{ pathname: "/", key: "testKey" }]}>
-          <CompatRouter>
-            <DhcpForm analyticsCategory="settings" />
-          </CompatRouter>
+          <DhcpForm analyticsCategory="settings" />
         </MemoryRouter>
       </Provider>
     );
@@ -193,9 +184,7 @@ describe("DhcpFormFields", () => {
     render(
       <Provider store={store}>
         <MemoryRouter initialEntries={[{ pathname: "/", key: "testKey" }]}>
-          <CompatRouter>
-            <DhcpForm analyticsCategory="settings" />
-          </CompatRouter>
+          <DhcpForm analyticsCategory="settings" />
         </MemoryRouter>
       </Provider>
     );